--- gforth/utf-8.fs	2006/12/31 13:39:14	1.25
+++ gforth/utf-8.fs	2007/06/30 23:00:14	1.27
@@ -71,8 +71,11 @@ $80 Value max-single-byte
 
 \ utf key and emit
 
+Defer check-xy  ' noop IS check-xy
+
 : u8key ( -- u )
     defers key dup max-single-byte u< ?EXIT  \ special case ASCII
+    dup $FF = ?EXIT  \ special resize character
     dup $C2 u< IF  UTF-8-err throw  THEN  \ malformed character
     $7F and  $40 >r
     BEGIN  dup r@ and  WHILE  r@ xor
@@ -91,10 +94,14 @@ $80 Value max-single-byte
 
 \ utf-8 stuff for xchars
 
-: +u8/string ( c-addr1 u1 -- c-addr2 u2 )
-    over dup u8>> swap - /string ;
+: u8string+ ( xcaddr u -- xcaddr u' )
+    over + u8>> over - ;
+: u8string- ( xcaddr u -- xcaddr u' )
+    over + u8<< over - ;
 
-: -u8/string ( c-addr1 u1 -- c-addr2 u2 )
+: +u8string ( xc-addr1 u1 -- xc-addr2 u2 )
+    over dup u8>> swap - /string ;
+: -u8string ( xc-addr1 u1 -- xc-addr2 u2 )
     over dup u8<< swap - /string ;
 
 : u8@ ( c-addr -- u )
@@ -287,8 +294,12 @@ here wc-table - Constant #wc-table
     ['] u8key is xkey
     ['] u8>> is xchar+
     ['] u8<< is xchar-
-    ['] +u8/string is +x/string
-    ['] -u8/string is -x/string
+[ [IFDEF] xstring+ ]
+    ['] u8string+ is xstring+
+    ['] u8string- is xstring-
+    ['] +u8string is +xstring
+    ['] -u8string is -xstring
+[ [THEN] ]
     ['] u8@ is xc@
     ['] u8!+? is xc!+?
     ['] u8@+ is xc@+