--- gforth/wf.fs	2006/02/25 14:01:19	1.43
+++ gforth/wf.fs	2006/08/26 12:39:57	1.47
@@ -31,6 +31,7 @@ require string.fs
 : parse" ( -- addr u ) '" parse 2drop '" parse ;
 : .' '' parse postpone SLiteral postpone type ; immediate
 : s' '' parse postpone SLiteral ; immediate
+: .upcase ( addr u -- )  bounds ?DO  I c@ toupper emit  LOOP ;
 
 \ character recoding
 
@@ -42,7 +43,7 @@ require string.fs
 	case
 	    '& of  ." &amp;"  endof
 	    '< of  ." &lt;"   endof
-\	    '¤ of  ." &euro;" endof
+\	    &164 of  ." &euro;" endof
 	    dup emit
 	endcase
     LOOP ;
@@ -67,7 +68,11 @@ s" " default-class $!
 : tagged ( addr1 u1 addr2 u2 -- )  2dup 2>r tag .type 2r> /tag ;
 
 : opt ( addr u opt u -- )  s"  " tag-option $+!
-    tag-option $+! s' ="' tag-option $+! tag-option $+!
+    tag-option $+! s' ="' tag-option $+!
+\    BEGIN  dup  WHILE  '& $split >r >r tag-option $+! r> r>
+\	    dup IF  s" %26" tag-option $+!  THEN
+\    REPEAT  2drop
+    tag-option $+!
     s' "' tag-option $+! ;
 : n>string ( n -- addr u )  0 <# #S #> ;
 : xy>string ( x y -- )  swap 0 <# #S 'x hold 2drop 0 #S 's hold #> ;
@@ -654,7 +659,10 @@ definitions
 \ HTML head
 
 Variable css-file
+Variable print-file
+Variable ie-css-file
 Variable content
+Variable _charset
 Variable _lang
 Variable _favicon
 
@@ -663,10 +671,23 @@ Variable _favicon
 : .css ( -- )
     css-file @ IF  css-file $@len IF
 	    s" StyleSheet" s" rel" opt
-	    css-file $@ href=
+	    css-file $@ href= s" screen" s" media" opt
 	    s" text/css" s" type" opt s" link" tag/ cr
-	THEN  THEN ;
+	THEN  THEN
+    ie-css-file @ IF
+	." <!--[if lt IE 7.0]>" cr
+	.'    <style type="text/css">@import url(' ie-css-file $@ type ." );</style>" cr
+	." <![endif]-->" cr
+    THEN ;
+: .print ( -- )
+    print-file @ IF  print-file $@len IF
+           s" StyleSheet" s" rel" opt
+           print-file $@ href= s" print" s" media" opt
+           s" text/css" s" type" opt s" link" tag/ cr
+       THEN  THEN ;
 : .title ( addr u -- )  1 envs ! oldenv off
+    _charset $@ s" utf-8" str= 0=
+    IF  .' <?xml version="1.0" encoding="' _charset $@ .upcase .' "?>' cr  THEN
     .' <!DOCTYPE html' cr
     .'   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' cr
     .'   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' cr
@@ -675,7 +696,7 @@ Variable _favicon
     s" html" >env cr s" head" >env cr
     s" Content-Type" s" http-equiv" opt
     content $@ s" content" opt
-    s" meta" tag/ cr .css
+    s" meta" tag/ cr .css .print
     _favicon @ IF
 	s" shortcut icon" s" rel" opt
 	_favicon $@ href=
@@ -715,7 +736,7 @@ Variable orig-date
 : pgp-key ( -- )
     bl sword -trailing public-key $! ;
 : charset ( -- )  s" text/xhtml; charset=" content $!
-    bl sword -trailing content $+! ;
+    bl sword -trailing 2dup content $+! _charset $! ;
 
 charset iso-8859-1
 
@@ -744,6 +765,8 @@ Variable style$
 : vlink ( -- ) parse" s" vlink" style ;
 : marginheight ( -- ) parse" s" marginheight" style ;
 : css ( -- ) parse" css-file $! ;
+: print-css ( -- ) parse" print-file $! ;
+: ie-css ( -- ) parse" ie-css-file $! ;
 
 : wf ( -- )
     outfile-id >r
