X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Funicode%2Fcollation%2Fcollation.factor;h=f29adc50eb05ece45a99a415676f636aec0f481d;hp=86f6a719cb72e369e038190e1ec288dbffcd6b8c;hb=e3f197c3bbd776e9bb83d7fa8598687a8842d0b6;hpb=9315bf383d79c37094e414f72cf51fbcf9e9e6b8

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index 86f6a719cb..f29adc50eb 100644
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
-combinators.short-circuit combinators.smart fry kernel locals make
+combinators.short-circuit combinators.smart fry kernel make
 math math.order math.parser namespaces sequences
 simple-flat-file splitting strings unicode.data ;
 IN: unicode.collation
@@ -203,32 +203,32 @@ TUPLE: weight-levels primary secondary tertiary ignorable? ;
 fixup-ducet-for-tibetan
 
 : tangut-block? ( char -- ? )
-    ! Tangut Block, Tangut Components Block
     {
-        [ 0x17000 0x187FF between? ]
-        [ 0x18800 0x18AFF between? ]
-        [ 0x18D00 0x18D08 between? ]
+        [ 0x17000 0x18AFF between? ] ! Tangut and Tangut Components
+        [ 0x18D00 0x18D8F between? ] ! Tangut Supplement
     } 1|| ; inline
 
 : nushu-block? ( char -- ? )
-    0x1b170 0x1B2FB between? ; inline
+    0x1b170 0x1B2FF between? ; inline
 
 : khitan-block? ( char -- ? )
-    0x18b00 0x18cd5 between? ; inline
+    0x18b00 0x18cff between? ; inline
 
 ! https://wiki.computercraft.cc/Module:Unicode_data
 ! Unicode TR10 - Computing Implicit Weights
 : base ( char -- base )
     {
         { [ dup 0x03400 0x04DBF between? ] [ drop 0xFB80 ] } ! Extension A
-        { [ dup 0x20000 0x2A6DD between? ] [ drop 0xFB80 ] } ! Extension B
-        { [ dup 0x2A700 0x2B734 between? ] [ drop 0xFB80 ] } ! Extension C
+        { [ dup 0x20000 0x2A6DF between? ] [ drop 0xFB80 ] } ! Extension B
+        { [ dup 0x2A700 0x2B739 between? ] [ drop 0xFB80 ] } ! Extension C
         { [ dup 0x2B740 0x2B81D between? ] [ drop 0xFB80 ] } ! Extension D
         { [ dup 0x2B820 0x2CEA1 between? ] [ drop 0xFB80 ] } ! Extension E
         { [ dup 0x2CEB0 0x2EBE0 between? ] [ drop 0xFB80 ] } ! Extension F
         { [ dup 0x30000 0x3134A between? ] [ drop 0xFB80 ] } ! Extension G
-        { [ dup 0x03400 0x04DBF between? ] [ drop 0xFB40 ] } ! CJK
-        { [ dup 0x04E00 0x09FFC between? ] [ drop 0xFB40 ] } ! CJK
+        { [ dup 0x31350 0x323AF between? ] [ drop 0xFB80 ] } ! Extension H
+        { [ dup 0x2F800 0x2FA1D between? ] [ drop 0xFB80 ] } ! CJK Compatibility
+        { [ dup 0x04E00 0x09FFF between? ] [ drop 0xFB40 ] } ! CJK
+        { [ dup 0x0F900 0x0FAD9 between? ] [ drop 0xFB40 ] } ! CJK
         [ drop 0xFBC0 ] ! Other
     } cond ;