--- gforth/wf.fs	2006/03/19 23:24:57	1.44
+++ gforth/wf.fs	2006/10/11 19:18:51	1.49
@@ -43,7 +43,7 @@ require string.fs
 	case
 	    '& of  ." &amp;"  endof
 	    '< of  ." &lt;"   endof
-\	    '¤ of  ." &euro;" endof
+\	    &164 of  ." &euro;" endof
 	    dup emit
 	endcase
     LOOP ;
@@ -68,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 #> ;
@@ -682,7 +686,8 @@ Variable _favicon
            s" text/css" s" type" opt s" link" tag/ cr
        THEN  THEN ;
 : .title ( addr u -- )  1 envs ! oldenv off
-    .' <?xml version="1.0" encoding="' _charset $@ .upcase .' "?>' cr
+    _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
