--- gforth/utf-8.fs	2004/12/29 14:15:12	1.8
+++ gforth/utf-8.fs	2005/01/05 16:24:33	1.12
@@ -22,14 +22,16 @@
 
 s" malformed UTF-8 character" exception Constant UTF-8-err
 
+$80 Value maxascii
+
 : u8len ( u8 -- n )
-    dup      $80 u< IF  drop 1  EXIT  THEN \ special case ASCII
+    dup      maxascii u< IF  drop 1  EXIT  THEN \ special case ASCII
     $800  2 >r
     BEGIN  2dup u>=  WHILE  5 lshift r> 1+ >r  REPEAT
     2drop r> ;
 
 : u8@+ ( u8addr -- u8addr' u )
-    count  dup $80 and 0= ?EXIT  \ special case ASCII
+    count  dup maxascii u< ?EXIT  \ special case ASCII
     $7F and  $40 >r
     BEGIN  dup r@ and  WHILE  r@ xor
 	    6 lshift r> 5 lshift >r >r count
@@ -38,7 +40,7 @@ s" malformed UTF-8 character" exception
     REPEAT  rdrop ;
 
 : u8!+ ( u u8addr -- u8addr' )
-    over $80 < IF  tuck c! 1+  EXIT  THEN \ special case ASCII
+    over maxascii u< IF  tuck c! 1+  EXIT  THEN \ special case ASCII
     >r 0 swap  $3F
     BEGIN  2dup u>  WHILE
 	    2/ >r  dup $3F and $80 or swap 6 rshift r>
@@ -47,21 +49,27 @@ s" malformed UTF-8 character" exception
 
 \ plug-in so that char and '<char> work for UTF-8
 
+[ifundef] char@ \ !! bootstrapping help
+    Defer char@ ( addr u -- char addr' u' )
+    :noname  over c@ -rot 1 /string ; IS char@
+[then]
+
 :noname  ( addr u -- char addr' u' )
-    dup 1 u<= IF  defers char@  EXIT  THEN
+    \ !! the if here seems to work around some breakage, but not
+    \ entirely; e.g., try 'ç' with LANG=C.
+    dup 1 u<= IF defers char@ EXIT THEN
     over + >r u8@+ swap r> over - ; IS char@
 
 \ scan to next/previous character
 
-: u8>> ( u8addr -- u8addr' )
-    BEGIN  count $C0 and $80 <>  UNTIL ;
+: u8>> ( u8addr -- u8addr' )  u8@+ drop ;
 : u8<< ( u8addr -- u8addr' )
-    BEGIN  1- dup c@ $C0 and $80 <>  UNTIL ;
+    BEGIN  1- dup c@ $C0 and maxascii <>  UNTIL ;
 
 \ utf key and emit
 
 : u8key ( -- u )
-    defers key dup $80 and 0= ?EXIT  \ special case ASCII
+    defers key dup maxascii u< ?EXIT  \ special case ASCII
     $7F and  $40 >r
     BEGIN  dup r@ and  WHILE  r@ xor
 	    6 lshift r> 5 lshift >r >r defers key
@@ -70,7 +78,7 @@ s" malformed UTF-8 character" exception
     REPEAT  rdrop ;
 
 : u8emit ( u -- )
-    dup $80 < IF  defers emit  EXIT  THEN \ special case ASCII
+    dup maxascii u< IF  defers emit  EXIT  THEN \ special case ASCII
     0 swap  $3F
     BEGIN  2dup u>  WHILE
 	    2/ >r  dup $3F and $80 or swap 6 rshift r>