[BACK]Return to utf-8.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/utf-8.fs between versions 1.28 and 1.34

version 1.28, 2007/07/14 19:57:16 version 1.34, 2007/12/31 18:40:24
Line 1 Line 1
 \ UTF-8 handling                                       12dec04py  \ UTF-8 handling                                       12dec04py
   
 \ Copyright (C) 2004,2005,2006 Free Software Foundation, Inc.  \ Copyright (C) 2004,2005,2006,2007 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
 \ short: u8 means utf-8 encoded address  \ short: u8 means utf-8 encoded address
   
Line 94  Defer check-xy  ' noop IS check-xy Line 93  Defer check-xy  ' noop IS check-xy
   
 \ utf-8 stuff for xchars  \ utf-8 stuff for xchars
   
 : u8string+ ( xcaddr u -- xcaddr u' )  : +u8/string ( xc-addr1 u1 -- xc-addr2 u2 )
     over + u8>> over - ;  
 : u8string- ( xcaddr u -- xcaddr u' )  
     over + u8<< over - ;  
   
 : +u8string ( xc-addr1 u1 -- xc-addr2 u2 )  
     over dup u8>> swap - /string ;      over dup u8>> swap - /string ;
 : -u8string ( xc-addr1 u1 -- xc-addr2 u2 )  : u8\string- ( xcaddr u -- xcaddr u' )
     over dup u8<< swap - /string ;      over + u8<< over - ;
   
 : u8@ ( c-addr -- u )  : u8@ ( c-addr -- u )
     u8@+ nip ;      u8@+ nip ;
Line 295  here wc-table - Constant #wc-table Line 289  here wc-table - Constant #wc-table
     ['] u8>> is xchar+      ['] u8>> is xchar+
     ['] u8<< is xchar-      ['] u8<< is xchar-
 [ [IFDEF] xstring+ ]  [ [IFDEF] xstring+ ]
     ['] u8string+ is xstring+      ['] u8\string- is xstring-
     ['] u8string- is xstring-      ['] +u8/string is +xstring
     ['] +u8string is +xstring  [ [THEN] ]
     ['] -u8string is -xstring  [ [IFDEF] +x/string ]
       ['] u8\string- is x\string-
       ['] +u8/string is +x/string
 [ [THEN] ]  [ [THEN] ]
     ['] u8@ is xc@      ['] u8@ is xc@
     ['] u8!+? is xc!+?      ['] u8!+? is xc!+?
Line 321  here wc-table - Constant #wc-table Line 317  here wc-table - Constant #wc-table
     s" UTF-8" search nip nip      s" UTF-8" search nip nip
     IF  set-encoding-utf-8  ELSE  set-encoding-fixed-width  THEN ;      IF  set-encoding-utf-8  ELSE  set-encoding-fixed-width  THEN ;
   
   environment-wordlist set-current
   : xchar-encoding ( -- addr u ) \ xchar-ext
       \G Returns a printable ASCII string that reperesents the encoding,
       \G and use the preferred MIME name (if any) or the name in
       \G @url{http://www.iana.org/assignments/character-sets} like
       \G ``ISO-LATIN-1'' or ``UTF-8'', with the exception of ``ASCII'', where
       \G we prefer the alias ``ASCII''.
       max-single-byte $80 = IF s" UTF-8" ELSE s" ISO-LATIN-1" THEN ;
   forth definitions
   
 :noname ( -- )  :noname ( -- )
     defers 'cold      defers 'cold
     utf-8-cold      utf-8-cold
Removed from v.1.28  
changed lines
  Added in v.1.34

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>