collation: Adding more character ranges

diff --git a/basis/unicode/collation/collation-tests.factor b/basis/unicode/collation/collation-tests.factor
index d62597b61f48cd623c12ff64fa4d27a0d6bb2a75..6a9c5b5ac74c84c94793a6fa9cd0a77effe8f440 100644 (file)
--- a/basis/unicode/collation/collation-tests.factor
+++ b/basis/unicode/collation/collation-tests.factor
@@ -56,11 +56,12 @@ IN: unicode.collation.tests
     [ string<=> { +lt+ +eq+ } member? ] assoc-reject
 ] unit-test
 
+! FIXME: ducet table is wrong
+{ +lt+ } [ { 4019 98 } { 4019 3953 1 3968 97 } [ >string ] bi@ string<=> ] unit-test
 { +lt+ } [ { 4018 820 3969 } { 3959 33 } [ >string ] bi@ string<=> ] unit-test
 { +lt+ } [ { 4019 3953 820 3968 } { 3961 33 } [ >string ] bi@ string<=> ] unit-test
 { +lt+ } [ { 111355 98 } { 19968 33 } [ >string ] bi@ string<=> ] unit-test
 { +lt+ } [ { 40943 98 } { 64014 33 } [ >string ] bi@ string<=> ] unit-test
-{ +lt+ } [ { 191456 98 } { 888 33 } [ >string ] bi@ string<=> ] unit-test
 
 
 { { 12748 12741 0 32 74 32 0 2 2 2 0 65535 65535 65535 } }
@@ -479,723 +480,3 @@ IN: unicode.collation.tests
 
 { { 64389 60384 7843 0 32 32 0 2 2 0 65535 65535 } }
 [ { 191456 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55296 0 32 0 2 0 65535 614 } }
-[ { 55296 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55296 0 32 0 2 0 65535 620 } }
-[ { 55296 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55296 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55296 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55296 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 55296 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55296 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55296 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55297 0 32 0 2 0 65535 614 } }
-[ { 55297 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55297 0 32 0 2 0 65535 620 } }
-[ { 55297 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55297 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55297 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55297 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 55297 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55297 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55297 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55298 0 32 0 2 0 65535 614 } }
-[ { 55298 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55298 0 32 0 2 0 65535 620 } }
-[ { 55298 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55298 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55298 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55298 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 55298 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55298 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55298 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55299 0 32 0 2 0 65535 614 } }
-[ { 55299 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55299 0 32 0 2 0 65535 620 } }
-[ { 55299 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55299 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55299 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55299 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 55299 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 55299 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 55299 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 56320 0 32 0 2 0 65535 614 } }
-[ { 56320 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 56320 0 32 0 2 0 65535 620 } }
-[ { 56320 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 56320 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 56320 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 56320 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 56320 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 56320 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 56320 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 57343 0 32 0 2 0 65535 614 } }
-[ { 57343 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 57343 0 32 0 2 0 65535 620 } }
-[ { 57343 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 57343 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 57343 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 57343 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 57343 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 57343 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 57343 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64976 0 32 0 2 0 65535 614 } }
-[ { 64976 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64976 0 32 0 2 0 65535 620 } }
-[ { 64976 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64976 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64976 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64976 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 64976 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64976 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64976 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64977 0 32 0 2 0 65535 614 } }
-[ { 64977 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64977 0 32 0 2 0 65535 620 } }
-[ { 64977 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64977 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64977 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64977 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 64977 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64977 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64977 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64978 0 32 0 2 0 65535 614 } }
-[ { 64978 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64978 0 32 0 2 0 65535 620 } }
-[ { 64978 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64978 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64978 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64978 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 64978 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64978 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64978 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64979 0 32 0 2 0 65535 614 } }
-[ { 64979 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64979 0 32 0 2 0 65535 620 } }
-[ { 64979 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64979 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64979 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64979 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 64979 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 64979 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 64979 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65534 0 32 0 2 0 65535 614 } }
-[ { 65534 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65534 0 32 0 2 0 65535 620 } }
-[ { 65534 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 65534 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 65534 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 65534 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65535 0 32 0 2 0 65535 614 } }
-[ { 65535 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65535 0 32 0 2 0 65535 620 } }
-[ { 65535 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 65535 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 65535 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64449 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 65535 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 0 32 0 2 0 65535 614 } }
-[ { 131070 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 0 32 0 2 0 65535 620 } }
-[ { 131070 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 131070 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 131070 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 131070 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 131070 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 0 32 0 2 0 65535 614 } }
-[ { 131071 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 0 32 0 2 0 65535 620 } }
-[ { 131071 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 131071 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 131071 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 131071 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64451 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 131071 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 0 32 0 2 0 65535 614 } }
-[ { 196606 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 0 32 0 2 0 65535 620 } }
-[ { 196606 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 196606 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 196606 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 196606 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 196606 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 0 32 0 2 0 65535 614 } }
-[ { 196607 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 0 32 0 2 0 65535 620 } }
-[ { 196607 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 196607 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 196607 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 196607 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64453 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 196607 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 0 32 0 2 0 65535 614 } }
-[ { 262142 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 0 32 0 2 0 65535 620 } }
-[ { 262142 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 262142 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 262142 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 262142 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 262142 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 0 32 0 2 0 65535 614 } }
-[ { 262143 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 0 32 0 2 0 65535 620 } }
-[ { 262143 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 262143 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 262143 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 262143 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64455 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 262143 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 0 32 0 2 0 65535 614 } }
-[ { 327678 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 0 32 0 2 0 65535 620 } }
-[ { 327678 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 327678 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 327678 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 327678 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 327678 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 0 32 0 2 0 65535 614 } }
-[ { 327679 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 0 32 0 2 0 65535 620 } }
-[ { 327679 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 327679 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 327679 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 327679 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64457 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 327679 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 0 32 0 2 0 65535 614 } }
-[ { 393214 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 0 32 0 2 0 65535 620 } }
-[ { 393214 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 393214 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 393214 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 393214 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 393214 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 0 32 0 2 0 65535 614 } }
-[ { 393215 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 0 32 0 2 0 65535 620 } }
-[ { 393215 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 393215 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 393215 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 393215 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64459 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 393215 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 0 32 0 2 0 65535 614 } }
-[ { 458750 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 0 32 0 2 0 65535 620 } }
-[ { 458750 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 458750 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 458750 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 458750 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 458750 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 0 32 0 2 0 65535 614 } }
-[ { 458751 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 0 32 0 2 0 65535 620 } }
-[ { 458751 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 458751 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 458751 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 458751 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64461 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 458751 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 0 32 0 2 0 65535 614 } }
-[ { 524286 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 0 32 0 2 0 65535 620 } }
-[ { 524286 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 524286 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 524286 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 524286 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 524286 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 0 32 0 2 0 65535 614 } }
-[ { 524287 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 0 32 0 2 0 65535 620 } }
-[ { 524287 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 524287 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 524287 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 524287 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64463 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 524287 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 0 32 0 2 0 65535 614 } }
-[ { 589822 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 0 32 0 2 0 65535 620 } }
-[ { 589822 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 589822 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 589822 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 589822 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 589822 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 0 32 0 2 0 65535 614 } }
-[ { 589823 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 0 32 0 2 0 65535 620 } }
-[ { 589823 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 589823 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 589823 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 589823 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64465 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 589823 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 0 32 0 2 0 65535 614 } }
-[ { 655358 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 0 32 0 2 0 65535 620 } }
-[ { 655358 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 655358 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 655358 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 655358 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 655358 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 0 32 0 2 0 65535 614 } }
-[ { 655359 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 0 32 0 2 0 65535 620 } }
-[ { 655359 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 655359 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 655359 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 655359 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64467 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 655359 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 0 32 0 2 0 65535 614 } }
-[ { 720894 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 0 32 0 2 0 65535 620 } }
-[ { 720894 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 720894 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 720894 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 720894 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 720894 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 0 32 0 2 0 65535 614 } }
-[ { 720895 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 0 32 0 2 0 65535 620 } }
-[ { 720895 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 720895 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 720895 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 720895 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64469 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 720895 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 0 32 0 2 0 65535 614 } }
-[ { 786430 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 0 32 0 2 0 65535 620 } }
-[ { 786430 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 786430 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 786430 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 786430 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 786430 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 0 32 0 2 0 65535 614 } }
-[ { 786431 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 0 32 0 2 0 65535 620 } }
-[ { 786431 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 786431 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 786431 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 786431 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64471 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 786431 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 0 32 0 2 0 65535 614 } }
-[ { 851966 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 0 32 0 2 0 65535 620 } }
-[ { 851966 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 851966 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 851966 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 851966 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 851966 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 0 32 0 2 0 65535 614 } }
-[ { 851967 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 0 32 0 2 0 65535 620 } }
-[ { 851967 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 851967 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 851967 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 851967 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64473 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 851967 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 0 32 0 2 0 65535 614 } }
-[ { 917502 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 0 32 0 2 0 65535 620 } }
-[ { 917502 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 917502 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 917502 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 917502 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 917502 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 0 32 0 2 0 65535 614 } }
-[ { 917503 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 0 32 0 2 0 65535 620 } }
-[ { 917503 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 917503 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 917503 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 917503 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64475 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 917503 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 0 32 0 2 0 65535 614 } }
-[ { 983038 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 0 32 0 2 0 65535 620 } }
-[ { 983038 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 983038 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 983038 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 983038 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 983038 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 0 32 0 2 0 65535 614 } }
-[ { 983039 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 0 32 0 2 0 65535 620 } }
-[ { 983039 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 983039 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 983039 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 983039 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64477 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 983039 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 0 32 0 2 0 65535 614 } }
-[ { 1114110 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 0 32 0 2 0 65535 620 } }
-[ { 1114110 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 0 32 74 0 2 2 0 65535 65535 } }
-[ { 1114110 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 1114110 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 1114110 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65534 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 1114110 98 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 0 32 0 2 0 65535 614 } }
-[ { 1114111 33 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 0 32 0 2 0 65535 620 } }
-[ { 1114111 63 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 0 32 74 0 2 2 0 65535 65535 } }
-[ { 1114111 820 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 7817 0 32 32 0 2 2 0 65535 65535 } }
-[ { 1114111 97 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 7817 0 32 32 0 2 8 0 65535 65535 } }
-[ { 1114111 65 } >string collation-key/nfd drop ] unit-test
-
-{ { 64481 65535 7843 0 32 32 0 2 2 0 65535 65535 } }
-[ { 1114111 98 } >string collation-key/nfd drop ] unit-test

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index fe476282569a97b2510f2ecd8e354a5715778f3e..5de933ac8166701bd3a819db3ba66fc101faea4e 100644 (file)
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -203,6 +203,7 @@ fixup-ducet
     ! Tangut Block, Tangut Components Block
     { [ 0x17000 0x187FF between? ] [ 0x18800 0x18AFF between? ] } 1|| ; inline
 
+! https://wiki.computercraft.cc/Module:Unicode_data
 ! Unicode TR10 - Computing Implicit Weights
 : base ( char -- base )
     {
@@ -211,6 +212,7 @@ fixup-ducet
         { [ dup 0x2A700 0x2B734 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 0x04E00 0x09FD5 between? ] [ drop 0xFB40 ] } ! CJK
         [ drop 0xFBC0 ] ! Other
     } cond ;