--- gforth/utf-8.fs	2007/07/14 19:57:16	1.28
+++ gforth/utf-8.fs	2007/09/15 20:51:37	1.30
@@ -94,15 +94,10 @@ Defer check-xy  ' noop IS check-xy
 
 \ utf-8 stuff for xchars
 
-: u8string+ ( xcaddr u -- xcaddr u' )
-    over + u8>> over - ;
-: u8string- ( xcaddr u -- xcaddr u' )
-    over + u8<< over - ;
-
-: +u8string ( xc-addr1 u1 -- xc-addr2 u2 )
+: +u8/string ( xc-addr1 u1 -- xc-addr2 u2 )
     over dup u8>> swap - /string ;
-: -u8string ( xc-addr1 u1 -- xc-addr2 u2 )
-    over dup u8<< swap - /string ;
+: u8\string- ( xcaddr u -- xcaddr u' )
+    over + u8<< over - ;
 
 : u8@ ( c-addr -- u )
     u8@+ nip ;
@@ -295,10 +290,12 @@ here wc-table - Constant #wc-table
     ['] u8>> is xchar+
     ['] u8<< is xchar-
 [ [IFDEF] xstring+ ]
-    ['] u8string+ is xstring+
-    ['] u8string- is xstring-
-    ['] +u8string is +xstring
-    ['] -u8string is -xstring
+    ['] u8\string- is xstring-
+    ['] +u8/string is +xstring
+[ [THEN] ]
+[ [IFDEF] x/string+ ]
+    ['] u8\string- is x\string-
+    ['] +u8/string is +x/string
 [ [THEN] ]
     ['] u8@ is xc@
     ['] u8!+? is xc!+?
@@ -321,6 +318,11 @@ here wc-table - Constant #wc-table
     s" UTF-8" search nip nip
     IF  set-encoding-utf-8  ELSE  set-encoding-fixed-width  THEN ;
 
+environment-wordlist set-current
+: xchar-encoding
+    max-single-byte $80 = IF  s" UTF-8"  ELSE  s" ISO-LATIN-1"  THEN ;
+forth definitions
+
 :noname ( -- )
     defers 'cold
     utf-8-cold