From 91b3b7e8fc5fabfc4592e08db79d78fba5917d8f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 20 Oct 2008 04:13:52 -0500
Subject: [PATCH 01/86] add function

---
 basis/unix/stat/netbsd/netbsd.factor | 1 +
 1 file changed, 1 insertion(+)

diff --git a/basis/unix/stat/netbsd/netbsd.factor b/basis/unix/stat/netbsd/netbsd.factor
index aefa9fd2cf..0bcb886417 100644
--- a/basis/unix/stat/netbsd/netbsd.factor
+++ b/basis/unix/stat/netbsd/netbsd.factor
@@ -35,3 +35,4 @@ C-STRUCT: statvfs
     { { "char" _VFS_NAMELEN } "f_mntonname" }
     { { "char" _VFS_NAMELEN } "f_mntfromname" } ;
 
+FUNCTION: int statvfs ( char* path, statvfs* buf ) ;

From 001dc3b2518d6549b93ff7c493040b84e997f69e Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Mon, 22 Dec 2008 06:42:08 -0800
Subject: [PATCH 02/86] Cleanup uuid a bit more, thanks Slava!

---
 basis/uuid/uuid.factor | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/basis/uuid/uuid.factor b/basis/uuid/uuid.factor
index 337ea22df5..209485b3bc 100644
--- a/basis/uuid/uuid.factor
+++ b/basis/uuid/uuid.factor
@@ -52,13 +52,10 @@ IN: uuid
 : string>uuid ( string -- n )
     [ CHAR: - = not ] filter 16 base> ;
 
-: uuid>byte-array ( n -- byte-array ) 
-    16 >be ;
-
 PRIVATE>
 
 : uuid-parse ( string -- byte-array ) 
-    string>uuid uuid>byte-array ;
+    string>uuid 16 >be ;
 
 : uuid-unparse ( byte-array -- string ) 
     be> uuid>string ;

From 8bb9429589055b51434a8147a5b1ddb93313253e Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 26 Jan 2009 15:47:52 -0800
Subject: [PATCH 03/86] ensure accumulator comes back as a vector from literals

---
 extra/literals/literals-tests.factor | 6 ++++++
 extra/literals/literals.factor       | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extra/literals/literals-tests.factor b/extra/literals/literals-tests.factor
index 185d672dd3..34ea4d6415 100644
--- a/extra/literals/literals-tests.factor
+++ b/extra/literals/literals-tests.factor
@@ -11,4 +11,10 @@ IN: literals.tests
 [ { 7 11 } ] [ { $ seven-eleven } ] unit-test
 [ { 6 6 6 } ] [ { $ six-six-six } ] unit-test
 
+[ { 6 6 6 7 } ] [ { $ six-six-six 7 } ] unit-test
+
 [ { 8 8 8 } ] [ { $[ six-six-six [ 2 + ] tri@ ] } ] unit-test
+
+[ { 0.5 2.0 } ] [ { $[ 1.0 2.0 / ] 2.0 } ] unit-test
+
+[ { 1.0 { 0.5 1.5 } 4.0 } ] [ { 1.0 { $[ 1.0 2.0 / ] 1.5 } $[ 2.0 2.0 * ] } ] unit-test
diff --git a/extra/literals/literals.factor b/extra/literals/literals.factor
index a450c2118e..6df51a35ef 100644
--- a/extra/literals/literals.factor
+++ b/extra/literals/literals.factor
@@ -1,6 +1,6 @@
 ! (c) Joe Groff, see license for details
-USING: continuations kernel parser words quotations ;
+USING: continuations kernel parser words quotations vectors ;
 IN: literals
 
-: $ scan-word [ execute ] curry with-datastack ; parsing
-: $[ \ ] parse-until >quotation with-datastack ; parsing
+: $ scan-word [ execute ] curry with-datastack >vector ; parsing
+: $[ \ ] parse-until >quotation with-datastack >vector ; parsing

From 3ad52dd85b3f371f8fdb4ad9924979a74596c6ec Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Wed, 28 Jan 2009 21:23:21 +0100
Subject: [PATCH 04/86] FUEL: New refactoring: extract region as ARTICLE:
 (C-cC-xa).

---
 misc/fuel/README           |  1 +
 misc/fuel/fuel-mode.el     |  1 +
 misc/fuel/fuel-refactor.el | 47 ++++++++++++++++++++++++++++++--------
 misc/fuel/fuel-syntax.el   |  7 +++---
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/misc/fuel/README b/misc/fuel/README
index cf96e29f52..198c9bb275 100644
--- a/misc/fuel/README
+++ b/misc/fuel/README
@@ -129,6 +129,7 @@ beast.
     |                 | (fuel-refactor-extract-vocab)                              |
     | C-cC-xi         | replace word by its definition (fuel-refactor-inline-word) |
     | C-cC-xw         | rename all uses of a word (fuel-refactor-rename-word)      |
+    | C-cC-xa         | extract region as a separate ARTICLE: form                 |
     |-----------------+------------------------------------------------------------|
 
 *** In the listener:
diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el
index 88ad73864a..504308fccd 100644
--- a/misc/fuel/fuel-mode.el
+++ b/misc/fuel/fuel-mode.el
@@ -198,6 +198,7 @@ interacting with a factor listener is at your disposal.
 (fuel-mode--key ?e ?w 'fuel-edit-word)
 (fuel-mode--key ?e ?x 'fuel-eval-definition)
 
+(fuel-mode--key ?x ?a 'fuel-refactor-extract-article)
 (fuel-mode--key ?x ?i 'fuel-refactor-inline-word)
 (fuel-mode--key ?x ?r 'fuel-refactor-extract-region)
 (fuel-mode--key ?x ?s 'fuel-refactor-extract-sexp)
diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el
index 061adbb82c..bd62227755 100644
--- a/misc/fuel/fuel-refactor.el
+++ b/misc/fuel/fuel-refactor.el
@@ -78,17 +78,19 @@
         (when found (setq result (fuel-refactor--reuse-p (car found)))))
       (and result found))))
 
+(defsubst fuel-refactor--insertion-point ()
+  (max (save-excursion (fuel-syntax--beginning-of-defun) (point))
+       (save-excursion
+         (re-search-backward fuel-syntax--end-of-def-regex nil t)
+         (forward-line 1)
+         (skip-syntax-forward "-"))))
+
 (defun fuel-refactor--insert-word (word stack-effect code)
-  (let ((beg (save-excursion (fuel-syntax--beginning-of-defun) (point)))
-        (end (save-excursion
-               (re-search-backward fuel-syntax--end-of-def-regex nil t)
-               (forward-line 1)
-               (skip-syntax-forward "-"))))
-    (let ((start (goto-char (max beg end))))
-      (open-line 1)
-      (insert ": " word " " stack-effect "\n" code " ;\n")
-      (indent-region start (point))
-      (move-overlay fuel-stack--overlay start (point)))))
+  (let ((start (goto-char (fuel-refactor--insertion-point))))
+    (open-line 1)
+    (insert ": " word " " stack-effect "\n" code " ;\n")
+    (indent-region start (point))
+    (move-overlay fuel-stack--overlay start (point))))
 
 (defun fuel-refactor--extract-other (start end code)
   (unwind-protect
@@ -233,5 +235,30 @@ The region is extended to the closest definition boundaries."
                                                 (mark-defun)
                                                 (mark))))
 
+;;; Extract article:
+
+(defun fuel-refactor-extract-article (begin end)
+  "Extracts region as a new ARTICLE form."
+  (interactive "r")
+  (let ((topic (read-string "Article topic: "))
+        (title (read-string "Article title: ")))
+    (kill-region begin end)
+    (insert (format "{ $subsection %s }\n" topic))
+    (end-of-line 0)
+    (save-excursion
+      (goto-char (fuel-refactor--insertion-point))
+      (open-line 1)
+      (let ((start (point)))
+        (insert (format "ARTICLE: %S %S\n" topic title))
+        (yank)
+        (when (looking-at "^ *$") (end-of-line 0))
+        (insert " ;")
+        (unwind-protect
+            (progn
+              (move-overlay fuel-stack--overlay start (point))
+              (sit-for fuel-stack-highlight-period))
+          (delete-overlay fuel-stack--overlay))))))
+
+
 (provide 'fuel-refactor)
 ;;; fuel-refactor.el ends here
diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el
index ad5a025a88..80bfd0afcb 100644
--- a/misc/fuel/fuel-syntax.el
+++ b/misc/fuel/fuel-syntax.el
@@ -158,7 +158,9 @@
                                            "PREDICATE" "PRIMITIVE"
                                            "UNION"))
 
-(defconst fuel-syntax--no-indent-def-starts '("SINGLETONS"
+(defconst fuel-syntax--no-indent-def-starts '("ARTICLE"
+                                              "HELP"
+                                              "SINGLETONS"
                                               "SYMBOLS"
                                               "TUPLE"
                                               "VARS"))
@@ -179,13 +181,12 @@
 
 (defconst fuel-syntax--single-liner-regex
   (regexp-opt '("ABOUT:"
-                "ARTICLE:"
                 "ALIAS:"
                 "CONSTANT:" "C:"
                 "DEFER:"
                 "FORGET:"
                 "GENERIC:" "GENERIC#"
-                "HELP:" "HEX:" "HOOK:"
+                "HEX:" "HOOK:"
                 "IN:" "INSTANCE:"
                 "LIBRARY:"
                 "MAIN:" "MATH:" "MIXIN:"

From 3cd8fbc6835b73d849da5251956c6178d297a371 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Wed, 28 Jan 2009 21:32:19 +0100
Subject: [PATCH 05/86] FUEL: Note about .factor-boot-rc added.

---
 misc/fuel/README | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/misc/fuel/README b/misc/fuel/README
index 198c9bb275..d712560b03 100644
--- a/misc/fuel/README
+++ b/misc/fuel/README
@@ -53,6 +53,14 @@ beast.
     factor image (overwriting the current one) with all the needed
     vocabs.
 
+    Alternatively, you can add the following line to your
+    .factor-boot-rc file:
+
+       "fuel" require
+
+    This will ensure that the image generated while bootstrapping
+    Factor contains fuel and the vocabularies it depends on.
+
 *** Connecting to a running Factor
 
     'run-factor' starts a new factor listener process managed by Emacs.

From 2ea9d0bce1f401229f9b58bb1a1fac96f312a3bc Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 00:20:58 +0100
Subject: [PATCH 06/86] FUEL: Better handling of $see in help browser.

---
 extra/fuel/help/help.factor | 12 ++++++------
 misc/fuel/fuel-markup.el    |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor
index e70327bd35..55183734b3 100644
--- a/extra/fuel/help/help.factor
+++ b/extra/fuel/help/help.factor
@@ -2,15 +2,15 @@
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors arrays assocs combinators help help.crossref
-help.markup help.topics io io.streams.string kernel make memoize
-namespaces parser prettyprint sequences summary tools.vocabs
-tools.vocabs.browser vocabs vocabs.loader words ;
+help.markup help.topics io io.streams.string kernel make namespaces
+parser prettyprint sequences summary tools.vocabs tools.vocabs.browser
+vocabs vocabs.loader words ;
 
 IN: fuel.help
 
 <PRIVATE
 
-MEMO: fuel-find-word ( name -- word/f )
+: fuel-find-word ( name -- word/f )
     [ [ name>> ] dip = ] curry all-words swap filter
     dup empty? not [ first ] [ drop f ] if ;
 
@@ -102,11 +102,11 @@ PRIVATE>
 : (fuel-vocab-help) ( name -- str )
     dup empty? [ fuel-vocab-children-help ] [ (fuel-vocab-element) ] if ;
 
-MEMO: (fuel-get-vocabs/author) ( author -- element )
+: (fuel-get-vocabs/author) ( author -- element )
     [ "Vocabularies by " prepend \ $heading swap 2array ]
     [ authored fuel-vocab-list ] bi 2array ;
 
-MEMO: (fuel-get-vocabs/tag) ( tag -- element )
+: (fuel-get-vocabs/tag) ( tag -- element )
     [ "Vocabularies tagged " prepend \ $heading swap 2array ]
     [ tagged fuel-vocab-list ] bi 2array ;
 
diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 7a8fa0c234..2784335fbb 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -585,12 +585,13 @@
 
 (defun fuel-markup--see (e)
   (let* ((word (nth 1 e))
-         (cmd (and word `(:fuel* (,(format "%s" word) fuel-word-see) "fuel" t)))
-         (res (and cmd
-                   (fuel-eval--retort-result (fuel-eval--send/wait cmd 100)))))
+         (cmd (and word `(:fuel* ((:quote ,(format "%S" word)) see) "fuel")))
+         (ret (and cmd (fuel-eval--send/wait cmd)))
+         (res (and (not (fuel-eval--retort-error ret))
+                   (fuel-eval--retort-output ret))))
     (if res
         (fuel-markup--code (list '$code res))
-      (fuel-markup--snippet (list '$snippet word)))))
+      (fuel-markup--snippet (list '$snippet " " word)))))
 
 (defun fuel-markup--null (e))
 

From a5cc358f196a1674aae07154c9cccbfb8e458d98 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 00:33:13 +0100
Subject: [PATCH 07/86] FUEL: Bug fix: escape ';' in fuel pretty print.

---
 extra/fuel/pprint/pprint.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/fuel/pprint/pprint.factor b/extra/fuel/pprint/pprint.factor
index 25f3aec14d..9dcbd76368 100644
--- a/extra/fuel/pprint/pprint.factor
+++ b/extra/fuel/pprint/pprint.factor
@@ -12,7 +12,7 @@ GENERIC: fuel-pprint ( obj -- )
 <PRIVATE
 
 : fuel-maybe-scape ( ch -- seq )
-    dup "\\\"?#()[]'`" member? [ CHAR: \ swap 2array ] [ 1array ] if ;
+    dup "\\\"?#()[]'`;" member? [ CHAR: \ swap 2array ] [ 1array ] if ;
 
 SYMBOL: :restarts
 

From a950bc0d7619591e1ec7fe8d56f409c4b7e099c3 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 00:40:17 +0100
Subject: [PATCH 08/86] FUEL: Even better $see handling in help browser.

---
 misc/fuel/fuel-markup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 2784335fbb..9e508b802d 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -585,7 +585,7 @@
 
 (defun fuel-markup--see (e)
   (let* ((word (nth 1 e))
-         (cmd (and word `(:fuel* ((:quote ,(format "%S" word)) see) "fuel")))
+         (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) see) "fuel")))
          (ret (and cmd (fuel-eval--send/wait cmd)))
          (res (and (not (fuel-eval--retort-error ret))
                    (fuel-eval--retort-output ret))))

From 8d522caa82967e2d97bd50cf2a03cb7828528eea Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 00:44:15 +0100
Subject: [PATCH 09/86] FUEL: $synopsis markup implemented.

---
 misc/fuel/fuel-markup.el | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 9e508b802d..4a5df8e7ea 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -593,10 +593,17 @@
         (fuel-markup--code (list '$code res))
       (fuel-markup--snippet (list '$snippet " " word)))))
 
-(defun fuel-markup--null (e))
-
 (defun fuel-markup--synopsis (e)
-  (insert (format " %S " e)))
+  (let* ((word (nth 1 e))
+         (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) synopsis) "fuel")))
+         (ret (and cmd (fuel-eval--send/wait cmd)))
+         (res (and (not (fuel-eval--retort-error ret))
+                   (fuel-eval--retort-output ret))))
+    (if res
+        (fuel-markup--code (list '$code res))
+      (fuel-markup--snippet (list '$snippet " " word)))))
+
+(defun fuel-markup--null (e))
 
 
 (provide 'fuel-markup)

From ba3c188b3cc1615dc5c95579ff3dab7de052b371 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 00:48:24 +0100
Subject: [PATCH 10/86] FUEL: Small refactoring.

---
 misc/fuel/fuel-markup.el | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 4a5df8e7ea..0c2fe91551 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -583,9 +583,9 @@
 (defun fuel-markup--notes (e)
   (fuel-markup--elem-with-heading e "Notes"))
 
-(defun fuel-markup--see (e)
+(defun fuel-markup--word-info (e s)
   (let* ((word (nth 1 e))
-         (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) see) "fuel")))
+         (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) ,s) "fuel")))
          (ret (and cmd (fuel-eval--send/wait cmd)))
          (res (and (not (fuel-eval--retort-error ret))
                    (fuel-eval--retort-output ret))))
@@ -593,15 +593,11 @@
         (fuel-markup--code (list '$code res))
       (fuel-markup--snippet (list '$snippet " " word)))))
 
+(defun fuel-markup--see (e)
+  (fuel-markup--word-info e 'see))
+
 (defun fuel-markup--synopsis (e)
-  (let* ((word (nth 1 e))
-         (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) synopsis) "fuel")))
-         (ret (and cmd (fuel-eval--send/wait cmd)))
-         (res (and (not (fuel-eval--retort-error ret))
-                   (fuel-eval--retort-output ret))))
-    (if res
-        (fuel-markup--code (list '$code res))
-      (fuel-markup--snippet (list '$snippet " " word)))))
+  (fuel-markup--word-info e 'synopsis))
 
 (defun fuel-markup--null (e))
 

From eccabfea120debfadad1550390eaae8176b271a5 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Thu, 29 Jan 2009 21:41:08 -0600
Subject: [PATCH 11/86] Making XML 30% faster

---
 basis/xml/char-classes/char-classes.factor |   7 +-
 basis/xml/errors/errors-tests.factor       |  14 +--
 basis/xml/state/state.factor               |   6 +-
 basis/xml/tests/state-parser-tests.factor  |   2 +-
 basis/xml/tokenize/tokenize.factor         | 114 ++++++++++++---------
 5 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/basis/xml/char-classes/char-classes.factor b/basis/xml/char-classes/char-classes.factor
index b47d4c66df..d510c8a881 100644
--- a/basis/xml/char-classes/char-classes.factor
+++ b/basis/xml/char-classes/char-classes.factor
@@ -1,6 +1,7 @@
-! Copyright (C) 2005, 2007 Daniel Ehrenberg
+! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences unicode.syntax math math.order combinators ;
+USING: kernel sequences unicode.syntax math math.order combinators
+hints ;
 IN: xml.char-classes
 
 CATEGORY: 1.0name-start* Ll Lu Lo Lt Nl \u000559\u0006E5\u0006E6_: ;
@@ -31,3 +32,5 @@ CATEGORY: 1.1name-char Ll Lu Lo Lm Ln Nl Mc Mn Nd Pc Cf _-.\u0000b7: ;
         { [ dup HEX: E000 < ] [ drop f ] }
         [ { HEX: FFFE HEX: FFFF } member? not ]
     } cond ;
+
+HINTS: text? { object fixnum } ;
diff --git a/basis/xml/errors/errors-tests.factor b/basis/xml/errors/errors-tests.factor
index 4204979941..8a469bc08f 100644
--- a/basis/xml/errors/errors-tests.factor
+++ b/basis/xml/errors/errors-tests.factor
@@ -6,11 +6,11 @@ IN: xml.errors.tests
     '[ _ string>xml ] swap '[ _ = ] must-fail-with ;
 
 T{ no-entity f 1 10 "nbsp" } "<x>&nbsp;</x>" xml-error-test
-T{ mismatched f 1 8 T{ name f "" "x" "" } T{ name f "" "y" "" } }
+T{ mismatched f 1 7 T{ name f "" "x" "" } T{ name f "" "y" "" } }
     "<x></y>" xml-error-test
-T{ unclosed f 1 4 V{ T{ name f "" "x" "" } } } "<x>" xml-error-test
+T{ unclosed f 1 3 V{ T{ name f "" "x" "" } } } "<x>" xml-error-test
 T{ nonexist-ns f 1 5 "x" } "<x:y/>" xml-error-test
-T{ unopened f 1 5 } "</x>" xml-error-test
+T{ unopened f 1 4 } "</x>" xml-error-test
 T{ not-yes/no f 1 41 "maybe" }
     "<?xml version='1.0' standalone='maybe'?><x/>" xml-error-test
 T{ extra-attrs f 1 32 V{ T{ name f "" "foo" f } }
@@ -19,13 +19,13 @@ T{ bad-version f 1 28 "5 million" }
     "<?xml version='5 million'?><x/>" xml-error-test
 T{ notags f } "" xml-error-test
 T{ multitags } "<x/><y/>" xml-error-test
-T{ bad-prolog  f 1 26 T{ prolog f "1.0" "UTF-8" f } }
+T{ bad-prolog  f 1 25 T{ prolog f "1.0" "UTF-8" f } }
     "<x/><?xml version='1.0'?>" xml-error-test
 T{ capitalized-prolog f 1 6 "XmL" } "<?XmL version='1.0'?><x/>"
     xml-error-test
 T{ pre/post-content f "x" t } "x<y/>" xml-error-test
 T{ versionless-prolog f 1 8 } "<?xml?><x/>" xml-error-test
-T{ unclosed-quote f 1 13 } "<x value='/>" xml-error-test
+T{ unclosed-quote f 1 12 } "<x value='/>" xml-error-test
 T{ bad-name f 1 3 "-" } "<-/>" xml-error-test
 T{ quoteless-attr f 1 12 } "<x value=<->/>" xml-error-test
 T{ quoteless-attr f 1 10 } "<x value=3/>" xml-error-test
@@ -37,6 +37,6 @@ T{ bad-cdata f 1 7 } "<x/><![CDATA[]]>" xml-error-test
 T{ pre/post-content f "&" t } "&#32;<x/>" xml-error-test
 T{ bad-doctype f 1 17 "a" } "<!DOCTYPE foo [ a ]><x/>" xml-error-test
 T{ bad-doctype f 1 22 T{ opener { name T{ name f "" "foo" "" } } { attrs T{ attrs } } } } "<!DOCTYPE foo [ <foo> ]><x/>" xml-error-test
-T{ disallowed-char f 1 3 1 } "<x>\u000001</x>" xml-error-test
-T{ missing-close f 1 9 } "<!-- foo" xml-error-test
+T{ disallowed-char f 1 4 1 } "<x>\u000001</x>" xml-error-test
+T{ missing-close f 1 8 } "<!-- foo" xml-error-test
 T{ misplaced-directive f 1 9 "ENTITY" } "<!ENTITY foo 'bar'><x/>" xml-error-test
diff --git a/basis/xml/state/state.factor b/basis/xml/state/state.factor
index eba94220e3..a31565c8ad 100644
--- a/basis/xml/state/state.factor
+++ b/basis/xml/state/state.factor
@@ -1,9 +1,11 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel namespaces io ;
+USING: accessors kernel namespaces io math ;
 IN: xml.state
 
-TUPLE: spot char line column next check version-1.0? ;
+TUPLE: spot
+    char { line fixnum } { column fixnum }
+    next check version-1.0? ;
 
 C: <spot> spot
 
diff --git a/basis/xml/tests/state-parser-tests.factor b/basis/xml/tests/state-parser-tests.factor
index 24c3bc4b69..7616efaf1d 100644
--- a/basis/xml/tests/state-parser-tests.factor
+++ b/basis/xml/tests/state-parser-tests.factor
@@ -11,7 +11,7 @@ IN: xml.test.state
     1string take-to ;
 
 [ "hello" ] [ "hello" [ take-rest ] string-parse ] unit-test
-[ 2 4 ] [ "12\n123" [ take-rest drop get-line get-column ] string-parse ] unit-test
+[ 2 3 ] [ "12\n123" [ take-rest drop get-line get-column ] string-parse ] unit-test
 [ "hi" " how are you?" ] [ "hi how are you?" [ [ get-char blank? ] take-until take-rest ] string-parse ] unit-test
 [ "foo" ";bar" ] [ "foo;bar" [ CHAR: ; take-char take-rest ] string-parse ] unit-test
 [ "foo " " bar" ] [ "foo and bar" [ "and" take-string take-rest ] string-parse ] unit-test
diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index 50ab43ca7b..c38a313b80 100644
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -3,111 +3,131 @@
 USING: namespaces xml.state kernel sequences accessors
 xml.char-classes xml.errors math io sbufs fry strings ascii
 circular xml.entities assocs make splitting math.parser
-locals combinators arrays ;
+locals combinators arrays hints ;
 IN: xml.tokenize
 
-: assure-good-char ( ch -- ch )
-    [
-        version-1.0? over text? not get-check and
-        [ disallowed-char ] when
-    ] [ f ] if* ;
-
 ! * Basic utility words
 
-: record ( char -- )
-    CHAR: \n =
-    [ 0 get-line 1+ set-line ] [ get-column 1+ ] if
-    set-column ;
+: assure-good-char ( spot ch -- )
+    [
+        swap
+        [ version-1.0?>> over text? not ]
+        [ check>> ] bi and [
+            spot get [ 1+ ] change-column drop
+            disallowed-char
+        ] [ drop ] if
+    ] [ drop ] if* ;
 
-! (next) normalizes \r\n and \r
-: (next) ( -- char )
-    get-next read1
-    2dup swap CHAR: \r = [
+HINTS: assure-good-char { spot fixnum } ;
+
+: record ( spot char -- spot )
+    over char>> [
         CHAR: \n =
-        [ nip read1 ] [ nip CHAR: \n swap ] if
-    ] [ drop ] if
-    set-next dup set-char assure-good-char ;
+        [ [ 1+ ] change-line -1 ] [ dup column>> 1+ ] if
+        >>column
+    ] [ drop ] if ;
+
+HINTS: record { spot fixnum } ;
+
+:: (next) ( spot -- spot char )
+    spot next>> :> old-next
+    read1 :> new-next
+    old-next CHAR: \r = [
+        spot CHAR: \n >>char
+        new-next CHAR: \n =
+        [ read1 >>next ]
+        [ new-next >>next ] if
+    ] [ spot old-next >>char new-next >>next ] if
+    spot next>> ; inline
+
+: next* ( spot -- )
+    dup char>> [ unexpected-end ] unless
+    (next) [ record ] keep assure-good-char ;
+
+HINTS: next* { spot } ;
 
 : next ( -- )
-    #! Increment spot.
-    get-char [ unexpected-end ] unless (next) record ;
+    spot get next* ;
 
 : init-parser ( -- )
-    0 1 0 f f t <spot> spot set
+    0 1 0 0 f t <spot> spot set
     read1 set-next next ;
 
 : with-state ( stream quot -- )
     ! with-input-stream implicitly creates a new scope which we use
     swap [ init-parser call ] with-input-stream ; inline
 
+:: (skip-until) ( quot: ( -- ? ) spot -- )
+    spot char>> [
+        quot call [
+            spot next* quot spot (skip-until)
+        ] unless
+    ] when ; inline recursive
+
 : skip-until ( quot: ( -- ? ) -- )
-    get-char [
-        [ call ] keep swap [ drop ] [
-            next skip-until
-        ] if
-    ] [ drop ] if ; inline recursive
+    spot get (skip-until) ; inline
 
 : take-until ( quot -- string )
     #! Take the substring of a string starting at spot
     #! from code until the quotation given is true and
     #! advance spot to after the substring.
     10 <sbuf> [
-        '[ @ [ t ] [ get-char _ push f ] if ] skip-until
+        spot get swap
+        '[ @ [ t ] [ _ char>> _ push f ] if ] skip-until
     ] keep >string ; inline
 
 : take-to ( seq -- string )
-    '[ get-char _ member? ] take-until ;
+    spot get swap '[ _ char>> _ member? ] take-until ;
 
 : pass-blank ( -- )
     #! Advance code past any whitespace, including newlines
-    [ get-char blank? not ] skip-until ;
+    spot get '[ _ char>> blank? not ] skip-until ;
 
-: string-matches? ( string circular -- ? )
-    get-char over push-circular
-    sequence= ;
+: string-matches? ( string circular spot -- ? )
+    char>> over push-circular sequence= ;
 
 : take-string ( match -- string )
     dup length <circular-string>
-    [ 2dup string-matches? ] take-until nip
+    spot get '[ 2dup _ string-matches? ] take-until nip
     dup length rot length 1- - head
     get-char [ missing-close ] unless next ;
 
 : expect ( string -- )
-    dup [ get-char next ] replicate 2dup =
-    [ 2drop ] [ expected ] if ;
+    dup spot get '[ _ [ char>> ] keep next* ] replicate
+    2dup = [ 2drop ] [ expected ] if ;
 
 ! Suddenly XML-specific
 
-: parse-named-entity ( string -- )
-    dup entities at [ , ] [
+: parse-named-entity ( accum string -- )
+    dup entities at [ swap push ] [
         dup extra-entities get at
-        [ % ] [ no-entity ] ?if
+        [ swap push-all ] [ no-entity ] ?if
     ] ?if ;
 
 : take-; ( -- string )
     next ";" take-to next ;
 
-: parse-entity ( -- )
+: parse-entity ( accum -- )
     take-; "#" ?head [
-        "x" ?head 16 10 ? base> ,
+        "x" ?head 16 10 ? base> swap push
     ] [ parse-named-entity ] if ;
 
-: parse-pe ( -- )
+: parse-pe ( accum -- )
     take-; dup pe-table get at
-    [ % ] [ no-entity ] ?if ;
+    [ swap push-all ] [ no-entity ] ?if ;
 
-:: (parse-char) ( quot: ( ch -- ? ) -- )
+:: (parse-char) ( quot: ( ch -- ? ) accum -- )
     get-char :> char
     {
         { [ char not ] [ ] }
         { [ char quot call ] [ next ] }
-        { [ char CHAR: & = ] [ parse-entity quot (parse-char) ] }
-        { [ in-dtd? get char CHAR: % = and ] [ parse-pe quot (parse-char) ] }
-        [ char , next quot (parse-char) ]
+        { [ char CHAR: & = ] [ accum parse-entity quot accum (parse-char) ] }
+        { [ in-dtd? get char CHAR: % = and ] [ accum parse-pe quot accum (parse-char) ] }
+        [ char accum push next quot accum (parse-char) ]
     } cond ; inline recursive
 
 : parse-char ( quot: ( ch -- ? ) -- seq )
-    [ (parse-char) ] "" make ; inline
+    1024 <sbuf> [ (parse-char) ] keep >string ; inline
 
 : assure-no-]]> ( circular -- )
     "]]>" sequence= [ text-w/]]> ] when ;

From b7975de956a3d3e62e482bb2e40350c40e0f4c86 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Thu, 29 Jan 2009 22:17:55 -0600
Subject: [PATCH 12/86] Making XML slightly faster

---
 basis/xml/autoencoding/autoencoding.factor | 21 +++++++------
 basis/xml/state/state.factor               |  3 +-
 basis/xml/tokenize/tokenize.factor         | 34 +++++++++++++++-------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/basis/xml/autoencoding/autoencoding.factor b/basis/xml/autoencoding/autoencoding.factor
index 20a661cfa7..fe4762acbe 100644
--- a/basis/xml/autoencoding/autoencoding.factor
+++ b/basis/xml/autoencoding/autoencoding.factor
@@ -6,11 +6,14 @@ io.encodings.string io.encodings combinators accessors
 xml.data io.encodings.iana ;
 IN: xml.autoencoding
 
+: decode-stream ( encoding -- )
+    spot get [ swap re-decode ] change-stream drop ;
+
 : continue-make-tag ( str -- tag )
     parse-name-starting middle-tag end-tag ;
 
 : start-utf16le ( -- tag )
-    utf16le decode-input
+    utf16le decode-stream
     "?\0" expect
     check instruct ;
 
@@ -22,25 +25,25 @@ IN: xml.autoencoding
     ! that the first letter of the document is < and second is
     ! not ASCII
     ascii?
-    [ utf8 decode-input next make-tag ] [
+    [ utf8 decode-stream next make-tag ] [
         next
         [ get-next 10xxxxxx? not ] take-until
         get-char suffix utf8 decode
-        utf8 decode-input next
+        utf8 decode-stream next
         continue-make-tag
     ] if ;
 
 : prolog-encoding ( prolog -- )
     encoding>> dup "UTF-16" =
-    [ drop ] [ name>encoding [ decode-input ] when* ] if ;
+    [ drop ] [ name>encoding [ decode-stream ] when* ] if ;
 
 : instruct-encoding ( instruct/prolog -- )
     dup prolog?
     [ prolog-encoding ]
-    [ drop utf8 decode-input ] if ;
+    [ drop utf8 decode-stream ] if ;
 
 : go-utf8 ( -- )
-    check utf8 decode-input next next ;
+    check utf8 decode-stream next next ;
 
 : start< ( -- tag )
     ! What if first letter of processing instruction is non-ASCII?
@@ -52,11 +55,11 @@ IN: xml.autoencoding
     } case ;
 
 : skip-utf8-bom ( -- tag )
-    "\u0000bb\u0000bf" expect utf8 decode-input
+    "\u0000bb\u0000bf" expect utf8 decode-stream
     "<" expect check make-tag ;
 
 : decode-expecting ( encoding string -- tag )
-    [ decode-input next ] [ expect ] bi* check make-tag ;
+    [ decode-stream next ] [ expect ] bi* check make-tag ;
 
 : start-utf16be ( -- tag )
     utf16be "<" decode-expecting ;
@@ -74,6 +77,6 @@ IN: xml.autoencoding
         { HEX: EF [ skip-utf8-bom ] }
         { HEX: FF [ skip-utf16le-bom ] }
         { HEX: FE [ skip-utf16be-bom ] }
-        [ drop utf8 decode-input check f ]
+        [ drop utf8 decode-stream check f ]
     } case ;
 
diff --git a/basis/xml/state/state.factor b/basis/xml/state/state.factor
index a31565c8ad..cf103f141b 100644
--- a/basis/xml/state/state.factor
+++ b/basis/xml/state/state.factor
@@ -4,8 +4,7 @@ USING: accessors kernel namespaces io math ;
 IN: xml.state
 
 TUPLE: spot
-    char { line fixnum } { column fixnum }
-    next check version-1.0? ;
+    char line column next check version-1.0? stream ;
 
 C: <spot> spot
 
diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index c38a313b80..052cab15c2 100644
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces xml.state kernel sequences accessors
 xml.char-classes xml.errors math io sbufs fry strings ascii
-circular xml.entities assocs make splitting math.parser
+circular xml.entities assocs splitting math.parser
 locals combinators arrays hints ;
 IN: xml.tokenize
 
@@ -31,11 +31,11 @@ HINTS: record { spot fixnum } ;
 
 :: (next) ( spot -- spot char )
     spot next>> :> old-next
-    read1 :> new-next
+    spot stream>> stream-read1 :> new-next
     old-next CHAR: \r = [
         spot CHAR: \n >>char
         new-next CHAR: \n =
-        [ read1 >>next ]
+        [ spot stream>> stream-read1 >>next ]
         [ new-next >>next ] if
     ] [ spot old-next >>char new-next >>next ] if
     spot next>> ; inline
@@ -50,7 +50,9 @@ HINTS: next* { spot } ;
     spot get next* ;
 
 : init-parser ( -- )
-    0 1 0 0 f t <spot> spot set
+    0 1 0 0 f t f <spot>
+        input-stream get >>stream
+    spot set
     read1 set-next next ;
 
 : with-state ( stream quot -- )
@@ -116,18 +118,28 @@ HINTS: next* { spot } ;
     take-; dup pe-table get at
     [ swap push-all ] [ no-entity ] ?if ;
 
-:: (parse-char) ( quot: ( ch -- ? ) accum -- )
-    get-char :> char
+:: (parse-char) ( quot: ( ch -- ? ) accum spot -- )
+    spot char>> :> char
     {
         { [ char not ] [ ] }
-        { [ char quot call ] [ next ] }
-        { [ char CHAR: & = ] [ accum parse-entity quot accum (parse-char) ] }
-        { [ in-dtd? get char CHAR: % = and ] [ accum parse-pe quot accum (parse-char) ] }
-        [ char accum push next quot accum (parse-char) ]
+        { [ char quot call ] [ spot next* ] }
+        { [ char CHAR: & = ] [
+            accum parse-entity
+            quot accum spot (parse-char)
+        ] }
+        { [ in-dtd? get char CHAR: % = and ] [
+            accum parse-pe
+            quot accum spot (parse-char)
+        ] }
+        [
+            char accum push
+            spot next*
+            quot accum spot (parse-char)
+        ]
     } cond ; inline recursive
 
 : parse-char ( quot: ( ch -- ? ) -- seq )
-    1024 <sbuf> [ (parse-char) ] keep >string ; inline
+    1024 <sbuf> [ spot get (parse-char) ] keep >string ; inline
 
 : assure-no-]]> ( circular -- )
     "]]>" sequence= [ text-w/]]> ] when ;

From aad17e43efe9fb52349eb610011c5c51ffb48e35 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 09:39:15 -0600
Subject: [PATCH 13/86] math.affine-transforms, sequences.squish, and svg
 vocabs

---
 .../affine-transforms-tests.factor            |  48 ++++
 .../affine-transforms.factor                  |  70 ++++++
 extra/sequences/squish/squish.factor          |  12 +
 extra/svg/svg-tests.factor                    |  95 ++++++++
 extra/svg/svg.factor                          | 223 ++++++++++++++++++
 5 files changed, 448 insertions(+)
 create mode 100644 extra/math/affine-transforms/affine-transforms-tests.factor
 create mode 100644 extra/math/affine-transforms/affine-transforms.factor
 create mode 100644 extra/sequences/squish/squish.factor
 create mode 100644 extra/svg/svg-tests.factor
 create mode 100644 extra/svg/svg.factor

diff --git a/extra/math/affine-transforms/affine-transforms-tests.factor b/extra/math/affine-transforms/affine-transforms-tests.factor
new file mode 100644
index 0000000000..f79c0fa63b
--- /dev/null
+++ b/extra/math/affine-transforms/affine-transforms-tests.factor
@@ -0,0 +1,48 @@
+USING: arrays kernel literals tools.test math math.affine-transforms
+math.constants math.functions ;
+IN: math.affine-transforms.tests
+
+[ { 7.25 4.25 } ] [
+    { 0.75 0.75 } { 0.75 -0.75 } { 5.0 5.0 } <affine-transform>
+    { 1.0 2.0 } a.v
+] unit-test
+
+[ -1.125 ] [
+    { 0.75 0.75 } { 0.75 -0.75 } { 5.0 5.0 } <affine-transform>
+    |a|
+] unit-test
+
+{ 1.0 3.0 } { 2.0 4.0 } { 5.0 6.0 } <affine-transform> 1array [
+    { 1.0 2.0 } { 3.0 4.0 } { 5.0 6.0 } <affine-transform>
+    transpose-axes
+] unit-test
+
+{ 1.0 -1.0 } { 1.0 1.0 } { 0.0 0.0 } <affine-transform> 1array [
+    { 0.5 0.5 } { -0.5 0.5 } { 5.0 5.0 } <affine-transform>
+    inverse-axes
+] unit-test
+
+{ 1.0 -1.0 } { 1.0 1.0 } { -10.0 0.0 } <affine-transform> 1array [
+    { 0.5 0.5 } { -0.5 0.5 } { 5.0 5.0 } <affine-transform>
+    inverse-transform
+] unit-test
+
+{ 1.0 0.0 } { 0.0 1.0 } { 0.0 0.0 } <affine-transform> 1array [
+    { 0.5 0.5 } { -0.5 0.5 } { 5.0 5.0 } <affine-transform>
+    dup inverse-transform a.
+] unit-test
+
+[ t ] [
+    { 0.01  0.02  } { 0.03  0.04  } { 0.05  0.06  } <affine-transform>
+    { 0.011 0.021 } { 0.031 0.041 } { 0.051 0.061 } <affine-transform> 0.01 a~
+] unit-test
+
+{ 1.0 0.0 } { 0.0 1.0 } { 5.0 10.0 } <affine-transform> 1array [
+    { 5.0 10.0 } <translation>
+] unit-test
+
+{ $[ pi  0.25 * cos ] $[ pi 0.25 * sin ] }
+{ $[ pi -0.25 * sin ] $[ pi 0.25 * cos ] }
+{ 0.0 0.0 } <affine-transform> 1array [
+    pi 0.25 * <rotation>
+] unit-test
diff --git a/extra/math/affine-transforms/affine-transforms.factor b/extra/math/affine-transforms/affine-transforms.factor
new file mode 100644
index 0000000000..141dbf9634
--- /dev/null
+++ b/extra/math/affine-transforms/affine-transforms.factor
@@ -0,0 +1,70 @@
+USING: accessors arrays combinators combinators.short-circuit kernel math math.vectors
+math.functions sequences ;
+IN: math.affine-transforms
+
+TUPLE: affine-transform x y origin ;
+C: <affine-transform> affine-transform
+
+CONSTANT: identity-transform T{ affine-transform f { 1.0 0.0 } { 0.0 1.0 } { 0.0 0.0 } }
+
+: a.v ( a v -- v )
+    [ [ x>> ] [ first  ] bi* v*n ]
+    [ [ y>> ] [ second ] bi* v*n ]
+    [ drop origin>> ] 2tri
+    v+ v+ ;
+
+: <translation> ( origin -- a )
+    [ { 1.0 0.0 } { 0.0 1.0 } ] dip <affine-transform> ;
+: <rotation> ( theta -- transform )
+    [ cos ] [ sin ] bi
+    [ 2array ] [ neg swap 2array ] 2bi { 0.0 0.0 } <affine-transform> ;
+: <scale> ( x y -- transform )
+    [ 0.0 2array ] [ 0.0 swap 2array ] bi* { 0.0 0.0 } <affine-transform> ;
+
+: center-rotation ( transform center -- transform )
+    [ clone dup ] dip [ vneg a.v ] [ v+ ] bi >>origin ;
+    
+: flatten-transform ( transform -- array )
+    [ x>> ] [ y>> ] [ origin>> ] tri 3append ;
+
+: |a| ( a -- det )
+    [ [ x>> first  ] [ y>> second ] bi * ]
+    [ [ x>> second ] [ y>> first  ] bi * ] bi - ;
+
+: (inverted-axes) ( a -- x y )
+    [ [ y>> second     ] [ x>> second neg ] bi 2array ]
+    [ [ y>> first  neg ] [ x>> first      ] bi 2array ]
+    [ |a| ] tri
+    tuck [ v/n ] 2bi@ ;
+
+: inverse-axes ( a -- a^-1 )
+    (inverted-axes) { 0.0 0.0 } <affine-transform> ;
+
+: inverse-transform ( a -- a^-1 )
+    [ inverse-axes dup ] [ origin>> ] bi
+    a.v vneg >>origin ;
+
+: transpose-axes ( a -- a^T )
+    [ [ x>> first  ] [ y>> first  ] bi 2array ]
+    [ [ x>> second ] [ y>> second ] bi 2array ]
+    [ origin>> ] tri <affine-transform> ;
+
+: a. ( a a -- a )
+    transpose-axes {
+        [ [ x>> ] [ x>> ] bi* v. ]
+        [ [ x>> ] [ y>> ] bi* v. ]
+        [ [ y>> ] [ x>> ] bi* v. ]
+        [ [ y>> ] [ y>> ] bi* v. ]
+        [ origin>> a.v ]
+    } 2cleave
+    [ [ 2array ] 2bi@ ] dip <affine-transform> ;
+
+: v~ ( a b epsilon -- ? )
+    [ ~ ] curry 2all? ;
+
+: a~ ( a b epsilon -- ? )
+    {
+        [ [ [ x>>      ] bi@ ] dip v~ ]
+        [ [ [ y>>      ] bi@ ] dip v~ ]
+        [ [ [ origin>> ] bi@ ] dip v~ ]
+    } 3&& ;
diff --git a/extra/sequences/squish/squish.factor b/extra/sequences/squish/squish.factor
new file mode 100644
index 0000000000..6a7ffb49f8
--- /dev/null
+++ b/extra/sequences/squish/squish.factor
@@ -0,0 +1,12 @@
+USING: combinators.short-circuit fry make math kernel sequences ;
+IN: sequences.squish
+
+: (squish) ( seq quot: ( obj -- ? ) -- )
+    2dup call [ '[ _ (squish) ] each ] [ drop , ] if ; inline recursive
+
+: squish ( seq quot exemplar -- seq' )
+    [ [ (squish) ] ] dip make ; inline
+
+: squish-strings ( seq -- seq' )
+    [ { [ sequence? ] [ integer? not ] } 1&& ] "" squish ;
+
diff --git a/extra/svg/svg-tests.factor b/extra/svg/svg-tests.factor
new file mode 100644
index 0000000000..4ad1514d38
--- /dev/null
+++ b/extra/svg/svg-tests.factor
@@ -0,0 +1,95 @@
+USING: arrays literals math math.affine-transforms math.functions multiline
+svg tools.test ;
+IN: svg.tests
+
+{ 1.0 2.25 } { -3.0 4.0 } { 5.5 0.000001 } <affine-transform> 1array [
+    "matrix ( 1 +2.25 -3  , 0.4e+1  ,5.5, 1e-6 )" svg-transform>affine-transform
+] unit-test
+
+{ 1.0 0.0 } { 0.0 1.0 } { 5.0 10.0 } <affine-transform> 1array [
+    "translate(5.0, 1e1 )" svg-transform>affine-transform
+] unit-test
+
+{ 1.0 0.0 } { 0.0 1.0 } { 5.0 10.0 } <affine-transform> 1array [
+    "translate( 5.0  1e+1)" svg-transform>affine-transform
+] unit-test
+
+{ 2.0 0.0 } { 0.0 2.0 } { 0.0 0.0 } <affine-transform> 1array [
+    "scale(2.0)" svg-transform>affine-transform
+] unit-test
+
+{ 2.0 0.0 } { 0.0 4.0 } { 0.0 0.0 } <affine-transform> 1array [
+    "scale(2.0 4.0)" svg-transform>affine-transform
+] unit-test
+
+{ 2.0 0.0 } { 0.0 4.0 } { 0.0 0.0 } <affine-transform> 1array [
+    "scale(2.0 4.0)" svg-transform>affine-transform
+] unit-test
+
+{ 1.0 0.0 } { $[ 45 degrees tan ] 1.0 } { 0.0 0.0 } <affine-transform> 1array [
+    "skewX(45)" svg-transform>affine-transform
+] unit-test
+
+{ 1.0 $[ -45 degrees tan ] } { 0.0 1.0 } { 0.0 0.0 } <affine-transform> 1array [
+    "skewY(-4.5e1)" svg-transform>affine-transform
+] unit-test
+
+{ $[  30 degrees cos ] $[ 30 degrees sin ] }
+{ $[ -30 degrees sin ] $[ 30 degrees cos ] } { 0.0 0.0 } <affine-transform> 1array [
+    "rotate(30)" svg-transform>affine-transform
+] unit-test
+
+[ t ] [
+    "rotate(30 1.0,2.0)" svg-transform>affine-transform
+    { $[  30 degrees cos ] $[ 30 degrees sin ] }
+    { $[ -30 degrees sin ] $[ 30 degrees cos ] } {
+        $[ 1.0 30 degrees cos 1.0 * - 30 degrees sin 2.0 * + ]
+        $[ 2.0 30 degrees cos 2.0 * - 30 degrees sin 1.0 * - ]
+    } <affine-transform> 0.001 a~
+] unit-test
+
+{ $[  30 degrees cos ] $[ 30 degrees sin ] }
+{ $[ -30 degrees sin ] $[ 30 degrees cos ] }
+{ 1.0 2.0 } <affine-transform> 1array [
+    "translate(1 2) rotate(30)" svg-transform>affine-transform
+] unit-test
+
+[ {
+    T{ moveto f { 1.0  1.0 } f }
+    T{ lineto f { 3.0 -1.0 } f }
+
+    T{ lineto f { 2.0  2.0 } t }
+    T{ lineto f { 2.0 -2.0 } t }
+    T{ lineto f { 2.0  2.0 } t }
+
+    T{ vertical-lineto f -9.0 t }
+    T{ vertical-lineto f  1.0 t }
+    T{ horizontal-lineto f 9.0 f }
+    T{ horizontal-lineto f 8.0 f }
+
+    T{ closepath }
+
+    T{ moveto f { 0.0 0.0 } f }
+
+    T{ curveto f { -4.0 0.0 } { -8.0 4.0 } { -8.0 8.0 } f }
+    T{ curveto f { -8.0 4.0 } { -12.0 8.0 } { -16.0 8.0 } f }
+
+    T{ smooth-curveto f { 0.0 2.0 } { 2.0 0.0 } t }
+
+    T{ quadratic-bezier-curveto f { -2.0 0.0 } { 0.0 -2.0 } f }
+    T{ quadratic-bezier-curveto f { -3.0 0.0 } { 0.0  3.0 } f }
+
+    T{ smooth-quadratic-bezier-curveto f { 1.0 2.0 } t }
+    T{ smooth-quadratic-bezier-curveto f { 3.0 4.0 } t }
+
+    T{ elliptical-arc f { 5.0 6.0 } 7.0 t f { 8.0 9.0 } f }
+} ] [
+    <"
+    M 1.0,+1 3,-10e-1  l 2 2, 2 -2, 2 2   v -9 1 H 9 8  z 
+    M 0 0  C -4.0 0.0 -8.0 4.0 -8.0 8.0  -8.0 4.0 -12.0 8.0 -16.0 8.0
+    s 0.0,2.0 2.0,0.0
+    Q -2 0 0 -2 -3. 0 0 3
+    t 1 2 3 4
+    A 5 6 7 1 0 8 9
+    "> svg-path>array
+] unit-test
diff --git a/extra/svg/svg.factor b/extra/svg/svg.factor
new file mode 100644
index 0000000000..b5c5e96e90
--- /dev/null
+++ b/extra/svg/svg.factor
@@ -0,0 +1,223 @@
+USING: accessors arrays assocs fry kernel math math.affine-transforms math.constants
+math.functions math.parser math.vectors memoize peg.ebnf sequences sequences.squish
+splitting strings xml.data xml.utilities ;
+IN: svg
+
+XML-NS: svg-name http://www.w3.org/2000/svg
+XML-NS: xlink-name http://www.w3.org/1999/xlink
+XML-NS: sodipodi-name http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd
+XML-NS: inkscape-name http://www.inkscape.org/namespaces/inkscape
+
+: svg-string>number ( string -- number )
+    { { CHAR: E CHAR: e } } substitute "e" split1
+    [ string>number ] [ [ string>number 10 swap ^ ] [ 1 ] if* ] bi* *
+    >float ;
+
+: degrees ( deg -- rad ) pi * 180.0 / ;
+
+EBNF: svg-transform>affine-transform
+
+transforms =
+    transform:m comma-wsp+ transforms:n => [[ m n a. ]]
+    | transform
+transform =
+    matrix
+    | translate
+    | scale
+    | rotate
+    | skewX
+    | skewY
+matrix =
+    "matrix" wsp* "(" wsp*
+       number:xx comma-wsp
+       number:xy comma-wsp
+       number:yx comma-wsp
+       number:yy comma-wsp
+       number:ox comma-wsp
+       number:oy wsp* ")"
+        => [[ { xx xy } { yx yy } { ox oy } <affine-transform> ]]
+translate =
+    "translate" wsp* "(" wsp* number:tx ( comma-wsp number:ty => [[ ty ]] )?:ty wsp* ")"
+        => [[ tx ty 0.0 or 2array <translation> ]]
+scale =
+    "scale" wsp* "(" wsp* number:sx ( comma-wsp number:sy => [[ sy ]] )?:sy wsp* ")"
+        => [[ sx sy sx or <scale> ]]
+rotate =
+    "rotate" wsp* "(" wsp* number:a ( comma-wsp number:cx comma-wsp number:cy => [[ cx cy 2array ]])?:c wsp* ")"
+        => [[ a degrees <rotation> c [ center-rotation ] when* ]]
+skewX =
+    "skewX" wsp* "(" wsp* number:a wsp* ")"
+        => [[ { 1.0 0.0 } a degrees tan 1.0 2array { 0.0 0.0 } <affine-transform> ]]
+skewY =
+    "skewY" wsp* "(" wsp* number:a wsp* ")"
+        => [[ 1.0 a degrees tan 2array { 0.0 1.0 } { 0.0 0.0 } <affine-transform> ]]
+number =
+    sign? (floating-point-constant | integer-constant) => [[ squish-strings svg-string>number ]]
+comma-wsp =
+    (wsp+ comma? wsp*) | (comma wsp*)
+comma =
+    ","
+integer-constant =
+    digit-sequence
+floating-point-constant =
+    fractional-constant exponent?
+    | digit-sequence exponent
+fractional-constant =
+    digit-sequence? "." digit-sequence
+    | digit-sequence "."
+exponent =
+    ( "e" | "E" ) sign? digit-sequence
+sign =
+    "+" => [[ f ]] | "-"
+digit-sequence = [0-9]+ => [[ >string ]]
+wsp = (" " | "\t" | "\r" | "\n")
+
+transform-list = wsp* transforms?:t wsp*
+    => [[ t [ identity-transform ] unless* ]]
+
+;EBNF
+
+: tag-transform ( tag -- transform )
+    "transform" svg-name swap at svg-transform>affine-transform ;
+
+TUPLE: moveto p relative? ;
+TUPLE: closepath ;
+TUPLE: lineto p relative? ;
+TUPLE: horizontal-lineto x relative? ;
+TUPLE: vertical-lineto y relative? ;
+TUPLE: curveto p1 p2 p relative? ;
+TUPLE: smooth-curveto p2 p relative? ;
+TUPLE: quadratic-bezier-curveto p1 p relative? ;
+TUPLE: smooth-quadratic-bezier-curveto p relative? ;
+TUPLE: elliptical-arc radii x-axis-rotation large-arc? sweep? p relative? ;
+
+: (set-relative) ( args rel -- args )
+    '[ [ _ >>relative? drop ] each ] keep ;
+
+EBNF: svg-path>array
+
+moveto-drawto-command-groups =
+    moveto-drawto-command-group:first wsp* moveto-drawto-command-groups:rest
+        => [[ first rest append ]]
+    | moveto-drawto-command-group
+moveto-drawto-command-group =
+    moveto:m wsp* drawto-commands?:d => [[ m d append ]]
+drawto-commands =
+    drawto-command:first wsp* drawto-commands:rest => [[ first rest append ]]
+    | drawto-command
+drawto-command =
+    closepath
+    | lineto
+    | horizontal-lineto
+    | vertical-lineto
+    | curveto
+    | smooth-curveto
+    | quadratic-bezier-curveto
+    | smooth-quadratic-bezier-curveto
+    | elliptical-arc
+moveto =
+    ("M" => [[ f ]] | "m" => [[ t ]]):rel wsp* moveto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+moveto-argument = coordinate-pair => [[ f moveto boa ]]
+moveto-argument-sequence =
+    moveto-argument:first comma-wsp? lineto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | moveto-argument => [[ 1array ]]
+closepath =
+    ("Z" | "z") => [[ drop closepath boa 1array ]]
+lineto =
+    ("L" => [[ f ]] | "l" => [[ t ]]):rel wsp* lineto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+lineto-argument = coordinate-pair => [[ f lineto boa ]]
+lineto-argument-sequence =
+    lineto-argument:first comma-wsp? lineto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | lineto-argument => [[ 1array ]]
+horizontal-lineto =
+    ( "H" => [[ f ]] | "h" => [[ t ]]):rel wsp* horizontal-lineto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+horizontal-lineto-argument = coordinate => [[ f horizontal-lineto boa ]]
+horizontal-lineto-argument-sequence =
+    horizontal-lineto-argument:first comma-wsp? horizontal-lineto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | horizontal-lineto-argument => [[ 1array ]]
+vertical-lineto =
+    ( "V" => [[ f ]] | "v" => [[ t ]]):rel wsp* vertical-lineto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+vertical-lineto-argument = coordinate => [[ f vertical-lineto boa ]]
+vertical-lineto-argument-sequence =
+    vertical-lineto-argument:first comma-wsp? vertical-lineto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | vertical-lineto-argument => [[ 1array ]]
+curveto =
+    ( "C" => [[ f ]] | "c" => [[ t ]]):rel wsp* curveto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+curveto-argument-sequence =
+    curveto-argument:first comma-wsp? curveto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | curveto-argument => [[ 1array ]]
+curveto-argument =
+    coordinate-pair:pone comma-wsp? coordinate-pair:ptwo comma-wsp? coordinate-pair:p
+        => [[ pone ptwo p f curveto boa ]]
+smooth-curveto =
+    ( "S" => [[ f ]] | "s" => [[ t ]] ):rel wsp* smooth-curveto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+smooth-curveto-argument-sequence =
+    smooth-curveto-argument:first comma-wsp? smooth-curveto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | smooth-curveto-argument => [[ 1array ]]
+smooth-curveto-argument =
+    coordinate-pair:ptwo comma-wsp? coordinate-pair:p
+        => [[ ptwo p f smooth-curveto boa ]]
+quadratic-bezier-curveto =
+    ( "Q" => [[ f ]] | "q" => [[ t ]] ):rel wsp* quadratic-bezier-curveto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+quadratic-bezier-curveto-argument-sequence =
+    quadratic-bezier-curveto-argument:first comma-wsp? 
+        quadratic-bezier-curveto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | quadratic-bezier-curveto-argument => [[ 1array ]]
+quadratic-bezier-curveto-argument =
+    coordinate-pair:pone comma-wsp? coordinate-pair:p
+        => [[ pone p f quadratic-bezier-curveto boa ]]
+smooth-quadratic-bezier-curveto =
+    ( "T" => [[ f ]] | "t" => [[ t ]] ):rel wsp* smooth-quadratic-bezier-curveto-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+smooth-quadratic-bezier-curveto-argument-sequence =
+    smooth-quadratic-bezier-curveto-argument:first comma-wsp? smooth-quadratic-bezier-curveto-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | smooth-quadratic-bezier-curveto-argument => [[ 1array ]]
+smooth-quadratic-bezier-curveto-argument = coordinate-pair => [[ f smooth-quadratic-bezier-curveto boa ]]
+elliptical-arc =
+    ( "A" => [[ f ]] | "a" => [[ t ]] ):rel wsp* elliptical-arc-argument-sequence:args
+        => [[ args rel (set-relative) ]]
+elliptical-arc-argument-sequence =
+    elliptical-arc-argument:first comma-wsp? elliptical-arc-argument-sequence:rest
+        => [[ rest first prefix ]]
+    | elliptical-arc-argument => [[ 1array ]]
+elliptical-arc-argument =
+    nonnegative-number:radiix comma-wsp? nonnegative-number:radiiy comma-wsp? 
+        number:xrot comma-wsp flag:large comma-wsp flag:sweep
+        comma-wsp coordinate-pair:p
+        => [[ radiix radiiy 2array xrot large sweep p f elliptical-arc boa ]]
+coordinate-pair = coordinate:x comma-wsp? coordinate:y => [[ x y 2array ]]
+coordinate = number
+nonnegative-number = (floating-point-constant | integer-constant) => [[ squish-strings svg-string>number ]]
+number = sign? (floating-point-constant | integer-constant) => [[ squish-strings svg-string>number ]]
+flag = "0" => [[ f ]] | "1" => [[ t ]]
+comma-wsp = (wsp+ comma? wsp*) | (comma wsp*)
+comma = ","
+integer-constant = digit-sequence
+floating-point-constant = fractional-constant exponent?  | digit-sequence exponent
+fractional-constant = digit-sequence? "." digit-sequence | digit-sequence "."
+exponent = ( "e" | "E" ) sign? digit-sequence
+sign = "+" => [[ drop f ]] | "-"
+digit-sequence = [0-9]+ => [[ >string ]]
+wsp = (" " | "\t" | "\r" | "\n")
+
+svg-path = wsp* moveto-drawto-command-groups?:x wsp* => [[ x ]]
+
+;EBNF
+
+: tag-d ( tag -- d )
+    "d" svg-name swap at svg-path>array ;

From cbdcadc45d3db0598afae00bbec1ea608903688b Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 09:41:50 -0600
Subject: [PATCH 14/86] Moving back ui.gadgets.slate

---
 {unmaintained => extra}/ui/gadgets/slate/authors.txt  | 0
 {unmaintained => extra}/ui/gadgets/slate/slate.factor | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {unmaintained => extra}/ui/gadgets/slate/authors.txt (100%)
 rename {unmaintained => extra}/ui/gadgets/slate/slate.factor (100%)

diff --git a/unmaintained/ui/gadgets/slate/authors.txt b/extra/ui/gadgets/slate/authors.txt
similarity index 100%
rename from unmaintained/ui/gadgets/slate/authors.txt
rename to extra/ui/gadgets/slate/authors.txt
diff --git a/unmaintained/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
similarity index 100%
rename from unmaintained/ui/gadgets/slate/slate.factor
rename to extra/ui/gadgets/slate/slate.factor

From 84a2ad091e2f26e9ae84cefcb00917d024ef36b1 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 09:51:59 -0600
Subject: [PATCH 15/86] Fixing ui.gadgets.slate docs

---
 extra/ui/gadgets/slate/slate-docs.factor | 13 ++++++++++++
 extra/ui/gadgets/slate/slate.factor      | 27 +++---------------------
 2 files changed, 16 insertions(+), 24 deletions(-)
 create mode 100644 extra/ui/gadgets/slate/slate-docs.factor

diff --git a/extra/ui/gadgets/slate/slate-docs.factor b/extra/ui/gadgets/slate/slate-docs.factor
new file mode 100644
index 0000000000..0225c20a1e
--- /dev/null
+++ b/extra/ui/gadgets/slate/slate-docs.factor
@@ -0,0 +1,13 @@
+! Copyright (C) 2009 Eduardo Cavazos
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax multiline ;
+IN: ui.gadgets.slate
+
+ARTICLE: "ui.gadgets.slate" "Slate gadget"
+{ $description "A gadget with an 'action' slot which should be set to a callable."}
+{ $heading "Example" }
+{ $code <" USING: processing.shapes ui.gadgets.slate ui.gadgets.panes ;
+[ { { 10 10 } { 50 30 } { 10 50 } } polygon fill-mode ] <slate>
+gadget."> } ;
+
+ABOUT: "ui.gadgets.slate"
diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
index af2dfcccc2..6813388afc 100644
--- a/extra/ui/gadgets/slate/slate.factor
+++ b/extra/ui/gadgets/slate/slate.factor
@@ -1,32 +1,11 @@
-
-USING: kernel namespaces opengl ui.render ui.gadgets accessors
-       help.syntax
-       easy-help ;
+! Copyright (C) 2009 Eduardo Cavazos
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel namespaces opengl ui.render ui.gadgets accessors ;
 
 IN: ui.gadgets.slate
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-ARTICLE: "slate" "Slate Gadget"
-
-Summary:
-
-    A gadget with an 'action' slot which should be set to a callable.  ..
-
-Example:
-
-    ! Load the right vocabs for the examples
-
-    USING: processing.shapes ui.gadgets.slate ;    ..
-
-Example:
-
-    [ { { 10 10 } { 50 30 } { 10 50 } } polygon fill-mode ] <slate>
-    gadget.  ..
-
-;
-
-ABOUT: "slate"
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From b06ff3750d3f7483c1afedf66208f279a09ce354 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 10:15:26 -0600
Subject: [PATCH 16/86] Metadata for svg, sequences.squish,
 math.affine-transforms

---
 .../affine-transforms-tests.factor            |   1 +
 .../affine-transforms.factor                  |   1 +
 extra/math/affine-transforms/authors.txt      |   1 +
 extra/math/affine-transforms/summary.txt      |   1 +
 extra/math/affine-transforms/tags.txt         |   1 +
 extra/sequences/product/product-tests.factor  |  19 ++++++++++++++++++
 extra/sequences/squish/.squish.factor.swo     | Bin 0 -> 12288 bytes
 extra/sequences/squish/authors.txt            |   2 ++
 extra/sequences/squish/squish-tests.factor    |   8 ++++++++
 extra/sequences/squish/squish.factor          |   1 +
 extra/sequences/squish/summary.txt            |   1 +
 extra/sequences/squish/tags.txt               |   1 +
 extra/svg/authors.txt                         |   1 +
 extra/svg/summary.txt                         |   1 +
 extra/svg/svg-tests.factor                    |   1 +
 extra/svg/tags.txt                            |   3 +++
 16 files changed, 43 insertions(+)
 create mode 100644 extra/math/affine-transforms/authors.txt
 create mode 100644 extra/math/affine-transforms/summary.txt
 create mode 100644 extra/math/affine-transforms/tags.txt
 create mode 100644 extra/sequences/product/product-tests.factor
 create mode 100644 extra/sequences/squish/.squish.factor.swo
 create mode 100644 extra/sequences/squish/authors.txt
 create mode 100644 extra/sequences/squish/squish-tests.factor
 create mode 100644 extra/sequences/squish/summary.txt
 create mode 100644 extra/sequences/squish/tags.txt
 create mode 100644 extra/svg/authors.txt
 create mode 100644 extra/svg/summary.txt
 create mode 100644 extra/svg/tags.txt

diff --git a/extra/math/affine-transforms/affine-transforms-tests.factor b/extra/math/affine-transforms/affine-transforms-tests.factor
index f79c0fa63b..1d10e07cea 100644
--- a/extra/math/affine-transforms/affine-transforms-tests.factor
+++ b/extra/math/affine-transforms/affine-transforms-tests.factor
@@ -1,3 +1,4 @@
+! (c)2009 Joe Groff, see BSD license
 USING: arrays kernel literals tools.test math math.affine-transforms
 math.constants math.functions ;
 IN: math.affine-transforms.tests
diff --git a/extra/math/affine-transforms/affine-transforms.factor b/extra/math/affine-transforms/affine-transforms.factor
index 141dbf9634..822af51614 100644
--- a/extra/math/affine-transforms/affine-transforms.factor
+++ b/extra/math/affine-transforms/affine-transforms.factor
@@ -1,3 +1,4 @@
+! (c)2009 Joe Groff, see BSD license
 USING: accessors arrays combinators combinators.short-circuit kernel math math.vectors
 math.functions sequences ;
 IN: math.affine-transforms
diff --git a/extra/math/affine-transforms/authors.txt b/extra/math/affine-transforms/authors.txt
new file mode 100644
index 0000000000..f13c9c1e77
--- /dev/null
+++ b/extra/math/affine-transforms/authors.txt
@@ -0,0 +1 @@
+Joe Groff
diff --git a/extra/math/affine-transforms/summary.txt b/extra/math/affine-transforms/summary.txt
new file mode 100644
index 0000000000..054d98a5e3
--- /dev/null
+++ b/extra/math/affine-transforms/summary.txt
@@ -0,0 +1 @@
+Affine transforms for two-dimensional vectors
diff --git a/extra/math/affine-transforms/tags.txt b/extra/math/affine-transforms/tags.txt
new file mode 100644
index 0000000000..ede10ab61b
--- /dev/null
+++ b/extra/math/affine-transforms/tags.txt
@@ -0,0 +1 @@
+math
diff --git a/extra/sequences/product/product-tests.factor b/extra/sequences/product/product-tests.factor
new file mode 100644
index 0000000000..dfabc166ac
--- /dev/null
+++ b/extra/sequences/product/product-tests.factor
@@ -0,0 +1,19 @@
+USING: arrays kernel sequences sequences.cartesian-product tools.test ;
+IN: sequences.product.tests
+
+[
+    { { 0 "a" } { 1 "a" } { 2 "a" } { 0 "b" } { 1 "b" } { 2 "b" } }
+] [ { { 0 1 2 } { "a" "b" } } [ ] cartesian-product-map ] unit-test
+
+[
+    {
+        { 0 "a" t } { 1 "a" t } { 2 "a" t } { 0 "b" t } { 1 "b" t } { 2 "b" t }
+        { 0 "a" f } { 1 "a" f } { 2 "a" f } { 0 "b" f } { 1 "b" f } { 2 "b" f }
+    }
+] [ { { 0 1 2 } { "a" "b" } { t f } } [ ] cartesian-product-map ] unit-test
+
+[
+    { "012012" "aaabbb" }
+] [ { { "0" "1" "2" } { "a" "b" } } [ [ first2 ] bi* [ append ] bi@ 2array ] cartesian-product-each ] unit-test
+
+
diff --git a/extra/sequences/squish/.squish.factor.swo b/extra/sequences/squish/.squish.factor.swo
new file mode 100644
index 0000000000000000000000000000000000000000..71a1d2add76591b46e66acf75ed3a2f34376dc7d
GIT binary patch
literal 12288
zcmeI&&u`N(6bEo`oHr2s18+s@T4_nTasakNC73jo9}`lwai}KbIxmg4G)`@&8k)w1
z8xj{T{2_4VKj6fbKL%b%R}fN#xK_{7S592#IsP0Qk2)v)=Wsvl3Tn56_||;e|M)%@
zU+DJCU^V*BHb`YYwmNtw!^|j|EqmY%6^ssyDkqqG7d<vHM#iUTU6e@Wjg9caTNyc=
zmY6Gak(-v<rSmSVCoQYa<1D}eO9e`w1P?aEz3y)3Zet7X+&*49m49FX7GMDuU;!3j
z0Ty5Z7FbOIU#y8Aw6%5024!s?>bS803$OqSumB6N01L1H3$OqSumB6Jh=7cR*xVH2
zgi?L~ul@u0dQ*sZl#=2pPboJj>y+;_?=$5S<pbp<<=3+-;=$Ws0Ty5Z7GMDuU;!3j
z0Ty5Z7Wgj#pf-d{%JpIH9-Pvh&OMIN_8>Q&2CiVY*`&VFfcmI6?2EnmW#GKk`Pf0L
zssTYzb=%MuqAos!R{czy3Y<c$3z*1rgne2h(>X2*%?nIRS`sgCQe@KpU9KCK1<=v;
zjNWm32(SLEjZ&qwzz||<3fQ4boh()Xi>kCv&#LtnFI2yBwIU6I8J$(@^`KpKw1NH+
zZSwk%dsy#691r?OhkKyRWTbORr{P`bQe%Cfv{j|{kl5Gt4kyy5aE>;|>~|TG+k%#A
mcRQVjFv#Rg!V7fX%%BNR48ox`NwP!p5grW=AkzwShvFx={J9_i

literal 0
HcmV?d00001

diff --git a/extra/sequences/squish/authors.txt b/extra/sequences/squish/authors.txt
new file mode 100644
index 0000000000..580f882c8d
--- /dev/null
+++ b/extra/sequences/squish/authors.txt
@@ -0,0 +1,2 @@
+Slava Pestov
+Joe Groff
diff --git a/extra/sequences/squish/squish-tests.factor b/extra/sequences/squish/squish-tests.factor
new file mode 100644
index 0000000000..21c8864974
--- /dev/null
+++ b/extra/sequences/squish/squish-tests.factor
@@ -0,0 +1,8 @@
+! (c)2009 Slava Pestov & Joe Groff, see BSD license
+USING: kernel sequences sequences.squish strings tools.test ;
+IN: sequences.squish.tests
+
+[ { { 1 2 3 } { 4 } { 5 6 } } ] [
+    V{ { 1 2 3 } V{ { 4 } { 5 6 } } }  
+    [ vector? ] { } squish ;
+] unit-test
diff --git a/extra/sequences/squish/squish.factor b/extra/sequences/squish/squish.factor
index 6a7ffb49f8..c42747af47 100644
--- a/extra/sequences/squish/squish.factor
+++ b/extra/sequences/squish/squish.factor
@@ -1,3 +1,4 @@
+! (c)2009 Slava Pestov & Joe Groff, see BSD license
 USING: combinators.short-circuit fry make math kernel sequences ;
 IN: sequences.squish
 
diff --git a/extra/sequences/squish/summary.txt b/extra/sequences/squish/summary.txt
new file mode 100644
index 0000000000..946116716b
--- /dev/null
+++ b/extra/sequences/squish/summary.txt
@@ -0,0 +1 @@
+Sequence flattening with parameterized descent predicate
diff --git a/extra/sequences/squish/tags.txt b/extra/sequences/squish/tags.txt
new file mode 100644
index 0000000000..63926bbb49
--- /dev/null
+++ b/extra/sequences/squish/tags.txt
@@ -0,0 +1 @@
+sequences
diff --git a/extra/svg/authors.txt b/extra/svg/authors.txt
new file mode 100644
index 0000000000..f13c9c1e77
--- /dev/null
+++ b/extra/svg/authors.txt
@@ -0,0 +1 @@
+Joe Groff
diff --git a/extra/svg/summary.txt b/extra/svg/summary.txt
new file mode 100644
index 0000000000..e329d1aaaf
--- /dev/null
+++ b/extra/svg/summary.txt
@@ -0,0 +1 @@
+Parsers for SVG data
diff --git a/extra/svg/svg-tests.factor b/extra/svg/svg-tests.factor
index 4ad1514d38..2e1f88b29b 100644
--- a/extra/svg/svg-tests.factor
+++ b/extra/svg/svg-tests.factor
@@ -1,3 +1,4 @@
+! (c)2009 Joe Groff, see BSD license
 USING: arrays literals math math.affine-transforms math.functions multiline
 svg tools.test ;
 IN: svg.tests
diff --git a/extra/svg/tags.txt b/extra/svg/tags.txt
new file mode 100644
index 0000000000..0cf061a252
--- /dev/null
+++ b/extra/svg/tags.txt
@@ -0,0 +1,3 @@
+xml
+graphics
+svg

From 9d44f16ff6e6bfbf9de732e56e64ae6dac957fdb Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 10:29:25 -0600
Subject: [PATCH 17/86] fix sequences.squish test

---
 extra/sequences/squish/squish-tests.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/sequences/squish/squish-tests.factor b/extra/sequences/squish/squish-tests.factor
index 21c8864974..6697ea7c92 100644
--- a/extra/sequences/squish/squish-tests.factor
+++ b/extra/sequences/squish/squish-tests.factor
@@ -1,8 +1,8 @@
 ! (c)2009 Slava Pestov & Joe Groff, see BSD license
-USING: kernel sequences sequences.squish strings tools.test ;
+USING: kernel sequences sequences.squish tools.test vectors ;
 IN: sequences.squish.tests
 
 [ { { 1 2 3 } { 4 } { 5 6 } } ] [
     V{ { 1 2 3 } V{ { 4 } { 5 6 } } }  
-    [ vector? ] { } squish ;
+    [ vector? ] { } squish
 ] unit-test

From 4a31f6f0e606605386777cf38c3d9a6eb1e791a7 Mon Sep 17 00:00:00 2001
From: Jeff Bigot <jeff.bigot@wanadoo.fr>
Date: Fri, 30 Jan 2009 17:29:46 +0100
Subject: [PATCH 18/86] doc correction

---
 extra/4DNav/4DNav-docs.factor                 | 267 +++---------------
 extra/4DNav/4DNav.factor                      | 180 +++++++-----
 extra/4DNav/camera/camera-docs.factor         |  10 +-
 extra/4DNav/camera/camera.factor              |  14 +-
 extra/4DNav/deep/deep-docs.factor             |   2 +-
 extra/4DNav/deep/deep.factor                  |   6 +-
 extra/4DNav/file-chooser/file-chooser.factor  |  39 ++-
 .../space-file-decoder-docs.factor            |  17 +-
 .../space-file-decoder.factor                 |  41 ++-
 extra/4DNav/turtle/turtle-docs.factor         | 220 +--------------
 extra/4DNav/turtle/turtle.factor              |  30 +-
 extra/4DNav/window3D/window3D-docs.factor     |  10 +-
 extra/4DNav/window3D/window3D.factor          |   7 +-
 extra/adsoda/adsoda-docs.factor               |  19 +-
 extra/adsoda/adsoda.factor                    | 131 +++++----
 .../combinators/combinators-docs.factor       |   4 +-
 extra/adsoda/combinators/combinators.factor   |   5 +-
 extra/adsoda/tools/tools-docs.factor          |  28 +-
 extra/adsoda/tools/tools.factor               |  15 +-
 19 files changed, 346 insertions(+), 699 deletions(-)

diff --git a/extra/4DNav/4DNav-docs.factor b/extra/4DNav/4DNav-docs.factor
index d4bf1db87d..95f231ecb9 100755
--- a/extra/4DNav/4DNav-docs.factor
+++ b/extra/4DNav/4DNav-docs.factor
@@ -3,210 +3,62 @@
 USING: help.markup help.syntax kernel quotations strings ;
 IN: 4DNav
 
-HELP: (mvt-4D)
-{ $values
-     { "quot" quotation }
-}
-{ $description "" } ;
-
-HELP: 4D-Rxw
-{ $values
-     { "angle" null }
-     { "Rz" null }
-}
-{ $description "" } ;
-
-HELP: 4D-Rxy
-{ $values
-     { "angle" null }
-     { "Rx" null }
-}
-{ $description "" } ;
-
-HELP: 4D-Rxz
-{ $values
-     { "angle" null }
-     { "Ry" null }
-}
-{ $description "" } ;
-
-HELP: 4D-Ryw
-{ $values
-     { "angle" null }
-     { "Ry" null }
-}
-{ $description "" } ;
-
-HELP: 4D-Ryz
-{ $values
-     { "angle" null }
-     { "Rx" null }
-}
-{ $description "" } ;
-
-HELP: 4D-Rzw
-{ $values
-     { "angle" null }
-     { "Rz" null }
-}
-{ $description "" } ;
-
-HELP: 4DNav
-{ $description "" } ;
-
-HELP: >observer3d
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: >present-space
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-
-HELP: >view1
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: >view2
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: >view3
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: >view4
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: add-keyboard-delegate
-{ $values
-     { "obj" object }
-     { "obj" object }
-}
-{ $description "" } ;
-
-HELP: button*
-{ $values
-     { "string" string } { "quot" quotation }
-     { "button" null }
-}
-{ $description "" } ;
-
-HELP: camera-action
-{ $values
-     { "quot" quotation }
-     { "quot" quotation }
-}
-{ $description "" } ;
-
-HELP: camera-button
-{ $values
-     { "string" string } { "quot" quotation }
-     { "button" null }
-}
-{ $description "" } ;
-
-HELP: controller-window*
-{ $values
-     { "gadget" "a gadget" } 
-}
-{ $description "" } ;
-
-
-HELP: init-models
-{ $description "" } ;
-
-HELP: init-variables
-{ $description "" } ;
 
 HELP: menu-3D
 { $values
-     { "gadget" null }
+     { "gadget" "gadget" }
 }
 { $description "The menu dedicated to 3D movements of the camera" } ;
 
 HELP: menu-4D
 { $values
     
-     { "gadget" null }
+     { "gadget" "gadget" }
 }
 { $description "The menu dedicated to 4D movements of space" } ;
 
 HELP: menu-bar
 { $values
     
-     { "gadget" null }
+     { "gadget" "gadget" }
 }
 { $description "return gadget containing menu buttons" } ;
 
 HELP: model-projection
 { $values
-     { "x" null }
-     { "space" null }
+     { "x" "interger" }
+     { "space" "space" }
 }
 { $description "Project space following coordinate x" } ;
 
 HELP: mvt-3D-1
 { $values
     
-     { "quot" quotation }
+     { "quot" "quotation" }
 }
 { $description "return a quotation to orientate space to see it from first point of view" } ;
 
 HELP: mvt-3D-2
 { $values
     
-     { "quot" quotation }
+     { "quot" "quotation" }
 }
 { $description "return a quotation to orientate space to see it from second point of view" } ;
 
 HELP: mvt-3D-3
 { $values
     
-     { "quot" quotation }
+     { "quot" "quotation" }
 }
 { $description "return a quotation to orientate space to see it from third point of view" } ;
 
 HELP: mvt-3D-4
 { $values
     
-     { "quot" quotation }
+     { "quot" "quotation" }
 }
 { $description "return a quotation to orientate space to see it from first point of view" } ;
 
-HELP: observer3d
-{ $description "" } ;
-
-HELP: observer3d>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: present-space
-{ $description "" } ;
-
-HELP: present-space>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
 HELP: load-model-file
 { $description "load space from file" } ;
 
@@ -218,70 +70,23 @@ HELP: rotation-4D
 
 HELP: translation-4D
 { $values
-     { "v" null }
+     { "v" "vector" }
 }
-{ $description "" } ;
+{ $description "Apply a 4D translation" } ;
 
-HELP: update-model-projections
-{ $description "" } ;
 
-HELP: update-observer-projections
-{ $description "" } ;
+ARTICLE: "implementation details" "How 4DNav is done"
+"4DNav is build using :"
 
-HELP: view1
-{ $description "" } ;
-
-HELP: view1>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: view2
-{ $description "" } ;
-
-HELP: view2>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: view3
-{ $description "" } ;
-
-HELP: view3>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: view4
-{ $description "" } ;
-
-HELP: view4>
-{ $values
-    
-     { "value" null }
-}
-{ $description "" } ;
-
-HELP: viewer-windows*
-{ $description "" } ;
-
-HELP: win3D
-{ $values
-     { "text" null } { "gadget" null }
-}
-{ $description "" } ;
-
-HELP: windows
-{ $description "" } ;
+{ $subsection "4DNav.camera" }
+{ $subsection "adsoda-main-page" }
+;
 
 ARTICLE: "Space file" "Create a new space file"
-"\nTo build a new space, create an XML file using " { $vocab-link "adsoda" } " model description. \nAn example is:"
+"To build a new space, create an XML file using " { $vocab-link "adsoda" } " model description. A solid is not caracterized by its corners but is defined as the intersection of hyperplanes."
+
+$nl
+"An example is:"
 $nl
 
 "\n<model>"
@@ -336,10 +141,8 @@ $nl
 
 
 ;
-
 ARTICLE: "TODO" "Todo"
 { $list 
-    "A file chooser"
     "A vocab to initialize parameters"
     "an editor mode" 
         { $list "add a face to a solid"
@@ -357,43 +160,41 @@ ARTICLE: "TODO" "Todo"
     "add a tool wich give an hyperplane normal vector with enought points. Will use adsoda.intersect-hyperplanes with { { 0 } { 0 } { 1 } } "
     "decorrelate 3D camera and activate them with select buttons"
 
-
-
 } ;
 
 
-ARTICLE: "4DNav" "4DNav"
+ARTICLE: "4DNav" "The 4DNav app"
 { $vocab-link "4DNav" }
 $nl
 { $heading "4D Navigator" }
 "4DNav is a simple tool to visualize 4 dimensionnal objects."
 "\n"
 "It uses " { $vocab-link "adsoda" } " library to display a 4D space and navigate thru it."
-
+$nl
 "It will display:"
 { $list
     { "a menu window" }
     {  "4 visualization windows" }
 }
-"Each window represents the projection of the 4D space on a particular 3D space."
-$nl
+"Each visualization window represents the projection of the 4D space on a particular 3D space."
+
+{ $heading "Start" }
+"type:" { $code "\"4DNav\" run" } 
 
-{ $heading "Initialization" }
-"put the space file " { $strong "space-exemple.xml" } "  in temp directory"
-" and then type:" { $code "\"4DNav\" run" } 
 { $heading "Navigation" }
-"4D submenu move the space in translations and rotation."
-"\n3D submenu move the camera in 3D space. Cameras in every 3D spaces are manipulated as a single one"
-$nl
-
-
-
+"Menu window is divided in 4 areas"
+{ $list
+    { "a space-file chooser to select the file to display" }
+    { "a parametrization area to select the projection mode" }
+    { "4D submenu to translate and rotate the 4D space" }
+    { "3D submenu to move the camera in 3D space. Cameras in every 3D spaces are manipulated as a single one" }
+    }
 
 { $heading "Links" }
 { $subsection "Space file" }
 
 { $subsection "TODO" }
-
+{ $subsection "implementation details" }
 
 ;
 
diff --git a/extra/4DNav/4DNav.factor b/extra/4DNav/4DNav.factor
index 3a0543df1a..91c1c94b35 100755
--- a/extra/4DNav/4DNav.factor
+++ b/extra/4DNav/4DNav.factor
@@ -109,34 +109,36 @@ VAR: present-space
 [ dup cos  , 0.0 , dup sin neg  , 0.0 ,
   0.0       , 1.0 , 0.0           , 0.0 ,
   dup sin  , 0.0 , dup cos     , 0.0 ,
-  0.0       , 0.0 , 0.0           , 1.0 ,  ] 4 make-matrix nip ;
+  0.0       , 0.0 , 0.0        , 1.0 ,  ] 4 make-matrix nip ;
 
 : 4D-Rzw ( angle -- Rz ) deg>rad
 [ dup cos  , dup sin neg  , 0.0 , 0.0 ,
   dup sin  , dup cos     , 0.0 , 0.0 ,
   0.0       , 0.0           , 1.0 , 0.0 ,
-  0.0       , 0.0           , 0.0 , 1.0 ,  ] 4 make-matrix nip ;
+  0.0       , 0.0          , 0.0 , 1.0 ,  ] 4 make-matrix nip ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! UI
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: button* ( string quot -- button ) closed-quot <repeat-button>  ;
+: button* ( string quot -- button ) 
+    closed-quot <repeat-button>  ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : model-projection-chooser ( -- gadget )
    observer3d> projection-mode>>
-   { { 1 "perspective" } { 0 "orthogonal" }  } <toggle-buttons> ;
+   { { 1 "perspective" } { 0 "orthogonal" } } 
+   <toggle-buttons> ;
 
 : collision-detection-chooser ( -- gadget )
    observer3d> collision-mode>>
-   { { t "on" } { f "off" }  } <toggle-buttons>
-;
+   { { t "on" } { f "off" }  } <toggle-buttons> ;
 
-: model-projection ( x -- space ) present-space>  swap space-project ;
+: model-projection ( x -- space ) 
+    present-space>  swap space-project ;
 
 : update-observer-projections (  -- )
     view1> relayout-1 
@@ -151,14 +153,16 @@ VAR: present-space
     3 model-projection <model> view4> (>>model) ;
 
 : camera-action ( quot -- quot ) 
-    [ drop [ ] observer3d>  with-self update-observer-projections ] 
+    [ drop [ ] observer3d>  
+    with-self update-observer-projections ] 
     make* closed-quot ;
 
-: win3D ( text gadget -- ) "navigateur 4D : " rot append open-window ;
+: win3D ( text gadget -- ) 
+    "navigateur 4D : " rot append open-window ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! 4D object manipulation
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : (mvt-4D) ( quot -- )   
     present-space>  
@@ -168,42 +172,55 @@ VAR: present-space
     update-observer-projections ;
 
 : rotation-4D ( m -- ) 
-    '[ _ [ [ middle-of-space dup vneg ] keep swap space-translate ] dip
+    '[ _ [ [ middle-of-space dup vneg ] keep 
+        swap space-translate ] dip
          space-transform 
          swap space-translate
     ] (mvt-4D) ;
 
 : translation-4D ( v -- ) '[ _ space-translate ] (mvt-4D) ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! menu
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : menu-rotations-4D ( -- gadget )
     <frame>
          <pile> 1 >>fill
-          "XY +" [ drop rotation-step 4D-Rxy rotation-4D ] button* add-gadget
-          "XY -" [ drop rotation-step neg 4D-Rxy rotation-4D ] button* add-gadget 
+          "XY +" [ drop rotation-step 4D-Rxy rotation-4D ] 
+                button* add-gadget
+          "XY -" [ drop rotation-step neg 4D-Rxy rotation-4D ] 
+                button* add-gadget 
        @top-left grid-add    
         <pile> 1 >>fill
-          "XZ +" [ drop rotation-step 4D-Rxz rotation-4D ] button* add-gadget
-          "XZ -" [ drop rotation-step neg 4D-Rxz rotation-4D ] button* add-gadget 
+          "XZ +" [ drop rotation-step 4D-Rxz rotation-4D ] 
+                button* add-gadget
+          "XZ -" [ drop rotation-step neg 4D-Rxz rotation-4D ] 
+                button* add-gadget 
        @top grid-add    
         <pile> 1 >>fill
-          "YZ +" [ drop rotation-step 4D-Ryz rotation-4D ] button* add-gadget
-          "YZ -" [ drop rotation-step neg 4D-Ryz rotation-4D ] button* add-gadget 
+          "YZ +" [ drop rotation-step 4D-Ryz rotation-4D ] 
+                button* add-gadget
+          "YZ -" [ drop rotation-step neg 4D-Ryz rotation-4D ] 
+                button* add-gadget 
         @center grid-add
          <pile> 1 >>fill
-          "XW +" [ drop rotation-step 4D-Rxw rotation-4D ] button* add-gadget
-          "XW -" [ drop rotation-step neg 4D-Rxw rotation-4D ] button* add-gadget 
+          "XW +" [ drop rotation-step 4D-Rxw rotation-4D ] 
+                button* add-gadget
+          "XW -" [ drop rotation-step neg 4D-Rxw rotation-4D ] 
+                button* add-gadget 
         @top-right grid-add   
          <pile> 1 >>fill
-          "YW +" [ drop rotation-step 4D-Ryw rotation-4D ] button* add-gadget
-          "YW -" [ drop rotation-step neg 4D-Ryw rotation-4D ] button* add-gadget 
+          "YW +" [ drop rotation-step 4D-Ryw rotation-4D ] 
+                button* add-gadget
+          "YW -" [ drop rotation-step neg 4D-Ryw rotation-4D ] 
+                button* add-gadget 
        @right grid-add    
          <pile> 1 >>fill
-          "ZW +" [ drop rotation-step 4D-Rzw rotation-4D ] button* add-gadget
-          "ZW -" [ drop rotation-step neg 4D-Rzw rotation-4D ] button* add-gadget 
+          "ZW +" [ drop rotation-step 4D-Rzw rotation-4D ] 
+                button* add-gadget
+          "ZW -" [ drop rotation-step neg 4D-Rzw rotation-4D ] 
+                button* add-gadget 
        @bottom-right grid-add    
 ;
 
@@ -211,9 +228,11 @@ VAR: present-space
     <frame> 
         <pile> 1 >>fill
             <shelf> 1 >>fill  
-                "X+" [ drop {  1 0 0 0 } translation-step v*n translation-4D ] 
+                "X+" [ drop {  1 0 0 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget
-                "X-" [ drop { -1 0 0 0 } translation-step v*n translation-4D ] 
+                "X-" [ drop { -1 0 0 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget 
             add-gadget
             "YZW" <label> add-gadget
@@ -221,26 +240,32 @@ VAR: present-space
          <pile> 1 >>fill
             "XZW" <label> add-gadget
             <shelf> 1 >>fill
-                "Y+" [ drop  { 0  1 0 0 } translation-step v*n translation-4D ] 
+                "Y+" [ drop  { 0  1 0 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget
-                "Y-" [ drop  { 0 -1 0 0 } translation-step v*n translation-4D ] 
+                "Y-" [ drop  { 0 -1 0 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget 
                 add-gadget
          @top-right grid-add
          <pile> 1 >>fill
             "XYW" <label> add-gadget
             <shelf> 1 >>fill
-                "Z+" [ drop { 0 0  1 0 } translation-step v*n translation-4D ] 
+                "Z+" [ drop { 0 0  1 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget
-                "Z-" [ drop { 0 0 -1 0 } translation-step v*n translation-4D ] 
+                "Z-" [ drop { 0 0 -1 0 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget 
                 add-gadget                 
         @top-left grid-add     
         <pile> 1 >>fill
             <shelf> 1 >>fill
-                "W+" [ drop { 0 0 0 1  } translation-step v*n translation-4D ] 
+                "W+" [ drop { 0 0 0 1  } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget
-                "W-" [ drop { 0 0 0 -1 } translation-step v*n translation-4D ] 
+                "W-" [ drop { 0 0 0 -1 } translation-step v*n 
+                    translation-4D ] 
                     button* add-gadget 
                 add-gadget
             "XYZ" <label> add-gadget
@@ -267,7 +292,8 @@ VAR: present-space
     update-observer-projections ;
 
 : load-model-file ( -- )
-  selected-file dup selected-file-model> set-model read-model-file 
+  selected-file dup selected-file-model> set-model 
+  read-model-file 
   redraw-model ;
 
 : mvt-3D-X ( turn pitch -- quot )
@@ -305,37 +331,38 @@ VAR: present-space
 
 : menu-rotations-3D ( -- gadget )
     <frame>
-        "Turn\n left"  [ rotation-step  turn-left  ] camera-button      
-            @left grid-add     
-        "Turn\n right" [ rotation-step turn-right ] camera-button      
-            @right grid-add     
-        "Pitch down"   [ rotation-step  pitch-down ] camera-button      
-            @bottom grid-add     
-        "Pitch up"     [ rotation-step  pitch-up   ] camera-button      
-            @top grid-add     
+        "Turn\n left"  [ rotation-step  turn-left  ] 
+            camera-button   @left grid-add     
+        "Turn\n right" [ rotation-step turn-right ] 
+            camera-button   @right grid-add     
+        "Pitch down"   [ rotation-step  pitch-down ] 
+            camera-button   @bottom grid-add     
+        "Pitch up"     [ rotation-step  pitch-up   ] 
+            camera-button   @top grid-add     
         <shelf>  1 >>fill
-            "Roll left\n (ctl)"  [ rotation-step  roll-left  ] camera-button
-                add-gadget  
-            "Roll right\n(ctl)"  [ rotation-step  roll-right ] camera-button 
-                add-gadget  
+            "Roll left\n (ctl)"  [ rotation-step  roll-left  ] 
+                camera-button   add-gadget  
+            "Roll right\n(ctl)"  [ rotation-step  roll-right ] 
+                camera-button   add-gadget  
         @center grid-add 
 ;
 
 : menu-translations-3D ( -- gadget )
     <frame>
-        "left\n(alt)"          [ translation-step  strafe-left  ] camera-button
-            @left grid-add  
-        "right\n(alt)"         [ translation-step  strafe-right ] camera-button
-            @right grid-add     
-        "Strafe up \n (alt)"   [ translation-step strafe-up    ] camera-button
-            @top grid-add
-        "Strafe down \n (alt)" [ translation-step strafe-down  ] camera-button
-            @bottom grid-add    
+        "left\n(alt)"        [ translation-step  strafe-left  ]
+            camera-button @left grid-add  
+        "right\n(alt)"       [ translation-step  strafe-right ]
+            camera-button @right grid-add     
+        "Strafe up \n (alt)" [ translation-step strafe-up    ] 
+            camera-button @top grid-add
+        "Strafe down\n (alt)" [ translation-step strafe-down  ]
+            camera-button @bottom grid-add    
         <pile>  1 >>fill
-            "Forward (ctl)"  [  translation-step step-turtle ] camera-button
-                add-gadget
-            "Backward (ctl)" [ translation-step neg step-turtle ] camera-button
-                add-gadget
+            "Forward (ctl)"  [  translation-step step-turtle ] 
+                camera-button add-gadget
+            "Backward (ctl)" 
+                [ translation-step neg step-turtle ] 
+                camera-button   add-gadget
         @center grid-add
 ;
 
@@ -370,22 +397,23 @@ VAR: present-space
             [ [ rotation-step pitch-up ] camera-action ] }
 
         { T{ key-down f { C+ } "UP" } 
-            [ [ translation-step step-turtle ] camera-action ] }
+           [ [ translation-step step-turtle ] camera-action ] }
         { T{ key-down f { C+ } "DOWN" } 
-            [ [ translation-step neg step-turtle ] camera-action ] }
+            [ [ translation-step neg step-turtle ] 
+                    camera-action ] }
         { T{ key-down f { C+ } "LEFT" } 
             [ [ rotation-step roll-left ] camera-action ] }
         { T{ key-down f { C+ } "RIGHT" } 
             [ [ rotation-step roll-right ] camera-action ] }
 
         { T{ key-down f { A+ } "LEFT" }  
-            [ [ translation-step strafe-left ] camera-action ] }
+           [ [ translation-step strafe-left ] camera-action ] }
         { T{ key-down f { A+ } "RIGHT" } 
-            [ [ translation-step strafe-right ] camera-action ] }
+          [ [ translation-step strafe-right ] camera-action ] }
         { T{ key-down f { A+ } "UP" }    
             [ [ translation-step strafe-up ] camera-action ] }
         { T{ key-down f { A+ } "DOWN" }  
-            [ [ translation-step strafe-down ] camera-action ] }
+           [ [ translation-step strafe-down ] camera-action ] }
 
 
         { T{ key-down f f "1" } [ mvt-3D-1 camera-action ] }
@@ -422,23 +450,26 @@ M: solid adsoda-display-model
         [ name>> "solid called : " pprint . ] 
         [ color>> "color : " pprint . ]
         [ dimension>> "dimension : " pprint . ]
-        [ faces>> "composed of faces : " pprint [ adsoda-display-model ] each ]
+        [ faces>> "composed of faces : " pprint 
+            [ adsoda-display-model ] each ]
     }   cleave
     ;
 M: space adsoda-display-model 
      {
         [ dimension>> "dimension : " pprint . ] 
         [ ambient-color>> "ambient-color : " pprint . ]
-        [ solids>> "composed of solids : " pprint [ adsoda-display-model ] each ]
-        [ lights>> "composed of lights : " pprint [ adsoda-display-model ] each ] 
+        [ solids>> "composed of solids : " pprint 
+            [ adsoda-display-model ] each ]
+        [ lights>> "composed of lights : " pprint 
+            [ adsoda-display-model ] each ] 
     }   cleave
     ;
 
 ! ----------------------------------------------
 : menu-bar ( -- gadget )
        <shelf>
-             "reinit" [ drop load-model-file ] button* add-gadget
-             selected-file-model> <label-control> add-gadget
+          "reinit" [ drop load-model-file ] button* add-gadget
+          selected-file-model> <label-control> add-gadget
     ;
 
 
@@ -454,7 +485,8 @@ M: space adsoda-display-model
             model-projection-chooser add-gadget
         f track-add
         <shelf>
-            "Collision detection (slow and buggy ) : " <label> add-gadget
+            "Collision detection (slow and buggy ) : " 
+                <label> add-gadget
             collision-detection-chooser add-gadget
         f track-add
         <pile>
diff --git a/extra/4DNav/camera/camera-docs.factor b/extra/4DNav/camera/camera-docs.factor
index 422148aebe..4898c4e580 100755
--- a/extra/4DNav/camera/camera-docs.factor
+++ b/extra/4DNav/camera/camera-docs.factor
@@ -6,31 +6,31 @@ IN: 4DNav.camera
 HELP: camera-eye
 { $values
     
-     { "point" null }
+     { "point" "position" }
 }
 { $description "return the position of the camera" } ;
 
 HELP: camera-focus
 { $values
     
-     { "point" null }
+     { "point" "position" }
 }
 { $description "return the point the camera looks at" } ;
 
 HELP: camera-up
 { $values
     
-     { "dirvec" null }
+     { "dirvec" "upside direction" }
 }
 { $description "In order to precise the roling position of camera give an upward vector" } ;
 
 HELP: do-look-at
 { $values
-     { "camera" null }
+     { "camera" "direction" }
 }
 { $description "Word to use in replacement of gl-look-at when using a camera" } ;
 
-ARTICLE: "4DNav.camera" "4DNav.camera"
+ARTICLE: "4DNav.camera" "Camera"
 { $vocab-link "4DNav.camera" }
 "\n"
 "A camera is defined by:"
diff --git a/extra/4DNav/camera/camera.factor b/extra/4DNav/camera/camera.factor
index 93e8271f1b..1e492fe8d9 100755
--- a/extra/4DNav/camera/camera.factor
+++ b/extra/4DNav/camera/camera.factor
@@ -1,15 +1,19 @@
-USING: kernel namespaces math.vectors opengl 4DNav.turtle self ;
+USING: kernel namespaces math.vectors opengl 4DNav.turtle 
+self ;
 
 IN: 4DNav.camera
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : camera-eye ( -- point ) turtle-pos> ;
 
-: camera-focus ( -- point ) [ 1 step-turtle turtle-pos> ] save-self ;
+: camera-focus ( -- point ) 
+    [ 1 step-turtle turtle-pos> ] save-self ;
 
 : camera-up ( -- dirvec )
-[ 90 pitch-up turtle-pos> 1 step-turtle turtle-pos> swap v- ] save-self ;
+[ 90 pitch-up turtle-pos> 1 step-turtle turtle-pos> swap v- ] 
+    save-self ;
 
 : do-look-at ( camera -- )
-[ >self camera-eye camera-focus camera-up gl-look-at ] with-scope ;
+[ >self camera-eye camera-focus camera-up gl-look-at ] 
+    with-scope ;
diff --git a/extra/4DNav/deep/deep-docs.factor b/extra/4DNav/deep/deep-docs.factor
index 0332f77e66..78439c6c0f 100755
--- a/extra/4DNav/deep/deep-docs.factor
+++ b/extra/4DNav/deep/deep-docs.factor
@@ -24,7 +24,7 @@ IN: 4DNav.deep
 ! } }
 ! ;
 
-ARTICLE: "4DNav.deep" "4DNav.deep"
+ARTICLE: "4DNav.deep" "Deep"
 { $vocab-link "4DNav.deep" }
 ;
 
diff --git a/extra/4DNav/deep/deep.factor b/extra/4DNav/deep/deep.factor
index 65e15180bc..b18000a84c 100755
--- a/extra/4DNav/deep/deep.factor
+++ b/extra/4DNav/deep/deep.factor
@@ -1,4 +1,5 @@
-USING: macros quotations math math.functions math.trig sequences.deep kernel make fry combinators grouping ;
+USING: macros quotations math math.functions math.trig 
+sequences.deep kernel make fry combinators grouping ;
 IN: 4DNav.deep
 
 ! USING: bake ;
@@ -7,5 +8,6 @@ IN: 4DNav.deep
 !    [ [ dup quotation? [ drop , ] when ] deep-map ]
 !    bi '[ _ cleave _ bake ] ;
 
-: make-matrix ( quot width -- matrix ) [ { } make ] dip group ; inline
+: make-matrix ( quot width -- matrix ) 
+    [ { } make ] dip group ; inline
 
diff --git a/extra/4DNav/file-chooser/file-chooser.factor b/extra/4DNav/file-chooser/file-chooser.factor
index 2056b728d7..d7c869ce2f 100755
--- a/extra/4DNav/file-chooser/file-chooser.factor
+++ b/extra/4DNav/file-chooser/file-chooser.factor
@@ -45,18 +45,26 @@ TUPLE: file-chooser < track
     [ file-chooser? ] find-parent list>> ;
 
 file-chooser H{
-    { T{ key-down f f "UP" } [ find-file-list select-previous ] }
-    { T{ key-down f f "DOWN" } [ find-file-list select-next ] }
-    { T{ key-down f f "PAGE_UP" } [ find-file-list list-page-up ] }
-    { T{ key-down f f "PAGE_DOWN" } [ find-file-list list-page-down ] }
-    { T{ key-down f f "RET" } [ find-file-list invoke-value-action ] }
-    { T{ button-down } request-focus }
-    { T{ button-down f 1 } [ find-file-list invoke-value-action ]  }
+    { T{ key-down f f "UP" } 
+        [ find-file-list select-previous ] }
+    { T{ key-down f f "DOWN" } 
+        [ find-file-list select-next ] }
+    { T{ key-down f f "PAGE_UP" } 
+        [ find-file-list list-page-up ] }
+    { T{ key-down f f "PAGE_DOWN" } 
+        [ find-file-list list-page-down ] }
+    { T{ key-down f f "RET" } 
+        [ find-file-list invoke-value-action ] }
+    { T{ button-down } 
+        request-focus }
+    { T{ button-down f 1 } 
+        [ find-file-list invoke-value-action ]  }
 } set-gestures
 
 : list-of-files ( file-chooser -- seq )
      [ path>> value>> directory-entries ] [ extension>> ] bi
-     '[ [ name>> _ [ tail? ] with contains? ] [ directory? ] bi or ]  filter
+     '[ [ name>> _ [ tail? ] with any? ] 
+     [ directory? ] bi or ]  filter
 ;
 
 : update-filelist-model ( file-chooser -- file-chooser )
@@ -123,15 +131,19 @@ file-chooser H{
     dup <file-list> >>list
     "choose a file in directory " <label> f track-add
     dup path>> <label-control> f track-add
-    dup extension>> ", " join "limited to : " prepend <label> f track-add
+    dup extension>> ", " join "limited to : " prepend 
+        <label> f track-add
     <shelf> 
         "selected file : " <label> add-gadget
         over selected-file>> <label-control> add-gadget
     f track-add
     <shelf> 
-        over [  swap fc-go-parent ] curry  "go up" swap <bevel-button> add-gadget
-        over [  swap fc-go-home ] curry  "go home" swap <bevel-button> add-gadget
-    !    over [ swap fc-ok-action ] curry "OK" swap <bevel-button> add-gadget
+        over [  swap fc-go-parent ] curry  "go up" 
+            swap <bevel-button> add-gadget
+        over [  swap fc-go-home ] curry  "go home" 
+            swap <bevel-button> add-gadget
+    !    over [ swap fc-ok-action ] curry "OK" 
+    !    swap <bevel-button> add-gadget
     !    [ drop ]  "Cancel" swap <bevel-button> add-gadget
     f track-add
     dup list>> <scroller> 1 track-add
@@ -140,5 +152,6 @@ file-chooser H{
 M: file-chooser pref-dim* drop { 400 200 } ;
 
 : file-chooser-window ( -- )
-[ . ] home { "xml" "txt" }   <file-chooser> "Choose a file" open-window ;
+    [ . ] home { "xml" "txt" }   <file-chooser> 
+    "Choose a file" open-window ;
 
diff --git a/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor b/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor
index ce66375759..0a7816636f 100755
--- a/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor
+++ b/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor
@@ -3,28 +3,17 @@
 USING: help.markup help.syntax kernel ;
 IN: 4DNav.space-file-decoder
 
-HELP: adsoda-read-model
-{ $values
-     { "tag" null }
-}
-{ $description "" } ;
 
-HELP: decode-number-array
-{ $values
-     { "x" null }
-     { "y" null }
-}
-{ $description "" } ;
 
 HELP: read-model-file
 { $values
     
      { "path" "path to the file to read" }
-     { "x" null }
+     { "x" "value" }
 }
-{ $description "" } ;
+{ $description "Read a file containing the xml description of the model" } ;
 
-ARTICLE: "4DNav.space-file-decoder" "4DNav.space-file-decoder"
+ARTICLE: "4DNav.space-file-decoder" "Space XMLfile decoder"
 { $vocab-link "4DNav.space-file-decoder" }
 ;
 
diff --git a/extra/4DNav/space-file-decoder/space-file-decoder.factor b/extra/4DNav/space-file-decoder/space-file-decoder.factor
index 8ef5c9e906..872ddbcee3 100755
--- a/extra/4DNav/space-file-decoder/space-file-decoder.factor
+++ b/extra/4DNav/space-file-decoder/space-file-decoder.factor
@@ -1,26 +1,34 @@
 ! Copyright (C) 2008 Jeff Bigot
 ! See http://factorcode.org/license.txt for BSD license.
-USING: adsoda xml xml.utilities xml.dispatch accessors combinators
-sequences math.parser kernel splitting values continuations ;
+USING: adsoda xml xml.utilities xml.dispatch accessors 
+combinators sequences math.parser kernel splitting values 
+continuations ;
 IN: 4DNav.space-file-decoder
 
-: decode-number-array ( x -- y )  "," split [ string>number ] map ;
+: decode-number-array ( x -- y )  
+    "," split [ string>number ] map ;
 
 PROCESS: adsoda-read-model ( tag -- )
 
-TAG: dimension adsoda-read-model children>> first string>number ;
-TAG: direction adsoda-read-model children>> first decode-number-array ;
-TAG: color     adsoda-read-model children>> first decode-number-array ;
-TAG: name      adsoda-read-model children>> first ;
-TAG: face      adsoda-read-model children>> first decode-number-array ;
+TAG: dimension adsoda-read-model 
+    children>> first string>number ;
+TAG: direction adsoda-read-model 
+    children>> first decode-number-array ;
+TAG: color     adsoda-read-model 
+    children>> first decode-number-array ;
+TAG: name      adsoda-read-model 
+    children>> first ;
+TAG: face      adsoda-read-model 
+    children>> first decode-number-array ;
 
 TAG: solid adsoda-read-model 
     <solid> swap  
     { 
-        [ "dimension" tag-named adsoda-read-model >>dimension ] 
+        [ "dimension" tag-named adsoda-read-model >>dimension ]
         [ "name"      tag-named adsoda-read-model >>name ] 
         [ "color"     tag-named adsoda-read-model >>color ] 
-        [ "face"      tags-named [ adsoda-read-model cut-solid ] each ] 
+        [ "face"      
+            tags-named [ adsoda-read-model cut-solid ] each ] 
     } cleave
     ensure-adjacencies
 ;
@@ -28,7 +36,7 @@ TAG: solid adsoda-read-model
 TAG: light adsoda-read-model 
    <light> swap  
     { 
-        [ "direction" tag-named adsoda-read-model >>direction ] 
+        [ "direction" tag-named adsoda-read-model >>direction ]
         [ "color"     tag-named adsoda-read-model >>color ] 
     } cleave
 ;
@@ -36,11 +44,14 @@ TAG: light adsoda-read-model
 TAG: space adsoda-read-model 
     <space> swap  
     { 
-        [ "dimension" tag-named adsoda-read-model >>dimension ] 
+        [ "dimension" tag-named adsoda-read-model >>dimension ]
         [ "name"      tag-named adsoda-read-model >>name ] 
-        [ "color"     tag-named adsoda-read-model >>ambient-color ] 
-        [ "solid"     tags-named [ adsoda-read-model suffix-solids ] each ] 
-        [ "light"     tags-named [ adsoda-read-model suffix-lights ] each ]         
+        [ "color"     tag-named 
+            adsoda-read-model >>ambient-color ] 
+        [ "solid"     tags-named 
+            [ adsoda-read-model suffix-solids ] each ] 
+        [ "light"     tags-named 
+            [ adsoda-read-model suffix-lights ] each ]
     } cleave
 ;
 
diff --git a/extra/4DNav/turtle/turtle-docs.factor b/extra/4DNav/turtle/turtle-docs.factor
index e6f57972b9..b94ed99673 100755
--- a/extra/4DNav/turtle/turtle-docs.factor
+++ b/extra/4DNav/turtle/turtle-docs.factor
@@ -3,226 +3,8 @@
 USING: arrays help.markup help.syntax kernel sequences ;
 IN: 4DNav.turtle
 
-HELP: <turtle>
-{ $values
-    
-     { "turtle" null }
-}
-{ $description "" } ;
 
-HELP: >turtle-ori
-{ $values
-     { "val" null }
-}
-{ $description "" } ;
-
-HELP: >turtle-pos
-{ $values
-     { "val" null }
-}
-{ $description "" } ;
-
-HELP: Rx
-{ $values
-     { "angle" null }
-     { "Rz" null }
-}
-{ $description "" } ;
-
-HELP: Ry
-{ $values
-     { "angle" null }
-     { "Ry" null }
-}
-{ $description "" } ;
-
-HELP: Rz
-{ $values
-     { "angle" null }
-     { "Rx" null }
-}
-{ $description "" } ;
-
-HELP: V
-{ $values
-    
-     { "V" null }
-}
-{ $description "" } ;
-
-HELP: X
-{ $values
-    
-     { "3array" null }
-}
-{ $description "" } ;
-
-HELP: Y
-{ $values
-    
-     { "3array" null }
-}
-{ $description "" } ;
-
-HELP: Z
-{ $values
-    
-     { "3array" null }
-}
-{ $description "" } ;
-
-HELP: apply-rotation
-{ $values
-     { "rotation" null }
-}
-{ $description "" } ;
-
-HELP: distance
-{ $values
-     { "turtle" null } { "turtle" null }
-     { "n" null }
-}
-{ $description "" } ;
-
-HELP: move-by
-{ $values
-     { "point" null }
-}
-{ $description "" } ;
-
-HELP: pitch-down
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: pitch-up
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: reset-turtle
-{ $description "" } ;
-
-HELP: roll-left
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: roll-right
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: roll-until-horizontal
-{ $description "" } ;
-
-HELP: rotate-x
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: rotate-y
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: rotate-z
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: set-X
-{ $values
-     { "seq" sequence }
-}
-{ $description "" } ;
-
-HELP: set-Y
-{ $values
-     { "seq" sequence }
-}
-{ $description "" } ;
-
-HELP: set-Z
-{ $values
-     { "seq" sequence }
-}
-{ $description "" } ;
-
-HELP: step-turtle
-{ $values
-     { "length" null }
-}
-{ $description "" } ;
-
-HELP: step-vector
-{ $values
-     { "length" null }
-     { "array" array }
-}
-{ $description "" } ;
-
-HELP: strafe-down
-{ $values
-     { "length" null }
-}
-{ $description "" } ;
-
-HELP: strafe-left
-{ $values
-     { "length" null }
-}
-{ $description "" } ;
-
-HELP: strafe-right
-{ $values
-     { "length" null }
-}
-{ $description "" } ;
-
-HELP: strafe-up
-{ $values
-     { "length" null }
-}
-{ $description "" } ;
-
-HELP: turn-left
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: turn-right
-{ $values
-     { "angle" null }
-}
-{ $description "" } ;
-
-HELP: turtle
-{ $description "" } ;
-
-HELP: turtle-ori>
-{ $values
-    
-     { "val" null }
-}
-{ $description "" } ;
-
-HELP: turtle-pos>
-{ $values
-    
-     { "val" null }
-}
-{ $description "" } ;
-
-ARTICLE: "4DNav.turtle" "4DNav.turtle"
+ARTICLE: "4DNav.turtle" "Turtle"
 { $vocab-link "4DNav.turtle" }
 ;
 
diff --git a/extra/4DNav/turtle/turtle.factor b/extra/4DNav/turtle/turtle.factor
index 72a2e58e9b..62c25c4344 100755
--- a/extra/4DNav/turtle/turtle.factor
+++ b/extra/4DNav/turtle/turtle.factor
@@ -6,7 +6,7 @@ splitting grouping self math.trig
   sequences accessors 4DNav.deep models ;
 IN: 4DNav.turtle
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 TUPLE: turtle pos ori ;
 
@@ -32,7 +32,7 @@ TUPLE: observer < turtle projection-mode collision-mode ;
 : turtle-ori> ( -- val ) self> ori>> ;
 : >turtle-ori ( val -- ) self> (>>ori) ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 ! These rotation matrices are from
 ! `Computer Graphics: Principles and Practice'
@@ -74,15 +74,15 @@ TUPLE: observer < turtle projection-mode collision-mode ;
   0 ,           dup sin ,       dup cos , ] 3 make-matrix nip ;
 
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: apply-rotation ( rotation -- ) turtle-ori> swap m. >turtle-ori ;
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: apply-rotation ( rotation -- ) 
+    turtle-ori> swap m. >turtle-ori ;
 : rotate-x ( angle -- ) Rx apply-rotation ;
 : rotate-y ( angle -- ) Ry apply-rotation ;
 : rotate-z ( angle -- ) Rz apply-rotation ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : pitch-up   ( angle -- ) neg rotate-x ;
 : pitch-down ( angle -- )     rotate-x ;
@@ -93,9 +93,9 @@ TUPLE: observer < turtle projection-mode collision-mode ;
 : roll-left  ( angle -- ) neg rotate-z ;
 : roll-right ( angle -- )     rotate-z ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! roll-until-horizontal
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : V ( -- V ) { 0 1 0 } ;
 
@@ -111,25 +111,27 @@ TUPLE: observer < turtle projection-mode collision-mode ;
     V Z cross normalize set-X
     Z X cross normalize set-Y ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: distance ( turtle turtle -- n ) pos>> swap pos>> v- [ sq ] map sum sqrt ;
+: distance ( turtle turtle -- n ) 
+    pos>> swap pos>> v- [ sq ] map sum sqrt ;
 
 : move-by ( point -- ) turtle-pos> v+ >turtle-pos ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : reset-turtle ( -- ) 
     { 0 0 0 } clone >turtle-pos 3 identity-matrix >turtle-ori ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : step-vector ( length -- array ) { 0 0 1 } n*v ;
 
 : step-turtle ( length -- ) 
-    step-vector turtle-ori> swap m.v turtle-pos> v+ >turtle-pos ;
+    step-vector turtle-ori> swap m.v 
+    turtle-pos> v+ >turtle-pos ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : strafe-up ( length -- )
     90 pitch-up
diff --git a/extra/4DNav/window3D/window3D-docs.factor b/extra/4DNav/window3D/window3D-docs.factor
index d57df6a8d8..a534d2e9ec 100755
--- a/extra/4DNav/window3D/window3D-docs.factor
+++ b/extra/4DNav/window3D/window3D-docs.factor
@@ -3,17 +3,9 @@
 USING: help.markup help.syntax kernel ;
 IN: 4DNav.window3D
 
-HELP: <window3D>
-{ $values
-     { "model" null } { "observer" null }
-     { "gadget" null }
-}
-{ $description "" } ;
 
-HELP: window3D
-{ $description "" } ;
 
-ARTICLE: "4DNav.window3D" "4DNav.window3D"
+ARTICLE: "4DNav.window3D" "Window3D"
 { $vocab-link "4DNav.window3D" }
 ;
 
diff --git a/extra/4DNav/window3D/window3D.factor b/extra/4DNav/window3D/window3D.factor
index 6db5d7c2f5..a5ca5f2a9a 100755
--- a/extra/4DNav/window3D/window3D.factor
+++ b/extra/4DNav/window3D/window3D.factor
@@ -21,9 +21,9 @@ prettyprint
 
 IN: 4DNav.window3D
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! drawing functions 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 TUPLE: window3D  < gadget observer ; 
 
@@ -63,7 +63,8 @@ M: window3D draw-gadget* ( gadget -- )
             GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc
             GL_LINE_SMOOTH_HINT GL_NICEST glHint
             1.25 glLineWidth
-            GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
+            GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor 
+                glClear
             glLoadIdentity
             GL_LIGHTING glEnable
             GL_LIGHT0 glEnable
diff --git a/extra/adsoda/adsoda-docs.factor b/extra/adsoda/adsoda-docs.factor
index d90beb7c7b..9ab874d370 100755
--- a/extra/adsoda/adsoda-docs.factor
+++ b/extra/adsoda/adsoda-docs.factor
@@ -9,7 +9,7 @@ IN: adsoda
 ! --------------------------------------------------------------
 ! faces
 ! --------------------------------------------------------------
-ARTICLE: "face-page" "face in ADSODA"
+ARTICLE: "face-page" "Face in ADSODA"
 "explanation of faces"
 $nl
 "link to functions"
@@ -65,7 +65,7 @@ HELP: face-transform
 ! --------------------------------
 ! solid
 ! --------------------------------------------------------------
-ARTICLE: "solid-page" "solid in ADSODA"
+ARTICLE: "solid-page" "Solid in ADSODA"
 "explanation of solids"
 $nl
 "link to functions"
@@ -133,13 +133,13 @@ $nl
 
 HELP: subtract 
 { $values { "solid1" "initial shape" } { "solid2" "shape to remove" } { "solids" "resulting shape" } }
-{ $description  " " } ;
+{ $description  "Substract solid2 from solid1" } ;
 
 
 ! --------------------------------------------------------------
 ! space 
 ! --------------------------------------------------------------
-ARTICLE: "space-page" "space in ADSODA"
+ARTICLE: "space-page" "Space in ADSODA"
 "A space is a collection of solids and lights."
 $nl
 "link to functions"
@@ -211,7 +211,7 @@ HELP: space-project
 ! --------------------------------------------------------------
 ! 3D rendering
 ! --------------------------------------------------------------
-ARTICLE: "3D-rendering-page" "3D rendering in ADSODA"
+ARTICLE: "3D-rendering-page" "The 3D rendering in ADSODA"
 "explanation of 3D rendering"
 $nl
 "link to functions"
@@ -223,21 +223,21 @@ $nl
 
 HELP: face->GL 
 { $values { "face" "a face" } { "color" "3 3 values array" } }
-{ $description "" } ;
+{ $description "display a face" } ;
 
 HELP: solid->GL 
 { $values { "solid" "a solid" } }
-{ $description "" } ;
+{ $description "display a solid" } ;
 
 HELP: space->GL 
 { $values { "space" "a space" } }
-{ $description "" } ;
+{ $description "display a space" } ;
 
 ! --------------------------------------------------------------
 ! light
 ! --------------------------------------------------------------
 
-ARTICLE: "light-page" "light in ADSODA"
+ARTICLE: "light-page" "Light in ADSODA"
 "explanation of light"
 $nl
 "link to functions"
@@ -274,7 +274,6 @@ ARTICLE: { "adsoda" "light" } "ADSODA : lights"
 
 
 ARTICLE: { "adsoda" "halfspace" } "ADSODA : halfspace"
-"! demi espace défini par un vecteur normal et une constante"
 " defined by the concatenation of the normal vector and a constant"  
  ;
 
diff --git a/extra/adsoda/adsoda.factor b/extra/adsoda/adsoda.factor
index e586087e48..01e437bc7d 100755
--- a/extra/adsoda/adsoda.factor
+++ b/extra/adsoda/adsoda.factor
@@ -41,7 +41,7 @@ DEFER: combinations
 VAR: pv
 
 
-! ---------------------------------------------------------------------
+! -------------------------------------------------------------
 ! global values
 VALUE: remove-hidden-solids?
 VALUE: VERY-SMALL-NUM
@@ -52,25 +52,26 @@ t to: remove-hidden-solids?
 0.0000001 to: VERY-SMALL-NUM
 0.0000001 to: ZERO-VALUE
 4 to: MAX-FACE-PER-CORNER
-! ---------------------------------------------------------------------
+! -------------------------------------------------------------
 ! sequence complement
 
 : with-pv ( i quot -- ) [ swap >pv call ] with-scope  ; inline
 
 : dimension ( array -- x )      length 1- ; inline 
-: last ( seq -- x )             [ dimension ] [ nth ] bi ; inline
-: change-last ( seq quot --  )  [ [ dimension ] keep ] dip change-nth  ; 
+: last ( seq -- x )           [ dimension ] [ nth ] bi ; inline
+: change-last ( seq quot -- ) 
+    [ [ dimension ] keep ] dip change-nth  ; 
 
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 ! light
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 
 TUPLE: light name { direction array } color ;
 : <light> ( -- tuple ) light new ;
 
-! -----------------------------------------------------------------------
+! -------------------------------------------------------------
 ! halfspace manipulation
-! -----------------------------------------------------------------------
+! -------------------------------------------------------------
 
 : constant+ ( v x -- w )  '[ [ _ + ] change-last ] keep ;
 : translate ( u v -- w )   dupd     v* sum     constant+ ; 
@@ -78,7 +79,8 @@ TUPLE: light name { direction array } color ;
 : transform ( u matrix -- w )
     [ swap m.v ] 2keep ! compute new normal vector    
     [
-        [ [ abs ZERO-VALUE > ] find ] keep ! find a point on the frontier
+        [ [ abs ZERO-VALUE > ] find ] keep 
+        ! find a point on the frontier
         ! be sure it's not null vector
         last ! get constant
         swap /f neg swap ! intercept value
@@ -97,8 +99,10 @@ TUPLE: light name { direction array } color ;
     position-point VERY-SMALL-NUM  > ; 
 : point-inside-or-on-halfspace? ( halfspace v -- ? ) 
     position-point VERY-SMALL-NUM neg > ;
-: project-vector (  seq -- seq )     pv> [ head ] [ 1+  tail ] 2bi append ; 
-: get-intersection ( matrice -- seq )     [ 1 tail* ] map     flip first ;
+: project-vector (  seq -- seq )     
+    pv> [ head ] [ 1+  tail ] 2bi append ; 
+: get-intersection ( matrice -- seq )     
+    [ 1 tail* ] map     flip first ;
 
 : islenght=? ( seq n -- seq n ? ) 2dup [ length ] [ = ] bi*  ;
 
@@ -117,29 +121,33 @@ TUPLE: light name { direction array } color ;
     [ solution dup ] [ first dimension ] bi
     valid-solution?     [ get-intersection ] [ drop f ] if ;
 
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 ! faces
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 
-TUPLE: face { halfspace array } touching-corners adjacent-faces ;
+TUPLE: face { halfspace array } 
+    touching-corners adjacent-faces ;
 : <face> ( v -- tuple )       face new swap >>halfspace ;
 : flip-face ( face -- face ) [ vneg ] change-halfspace ;
-: erase-face-touching-corners ( face -- face ) f >>touching-corners ;
-: erase-face-adjacent-faces ( face -- face )   f >>adjacent-faces ;
+: erase-face-touching-corners ( face -- face ) 
+    f >>touching-corners ;
+: erase-face-adjacent-faces ( face -- face )   
+    f >>adjacent-faces ;
 : faces-intersection ( faces -- v )  
     [ halfspace>> ] map intersect-hyperplanes ;
 : face-translate ( face v -- face ) 
     [ translate ] curry change-halfspace ; inline
 : face-transform ( face m -- face )
     [ transform ] curry change-halfspace ; inline
-: face-orientation ( face -- x )  pv> swap halfspace>> nth sgn ;
+: face-orientation ( face -- x ) pv> swap halfspace>> nth sgn ;
 : backface? ( face -- face ? )      dup face-orientation 0 <= ;
 : pv-factor ( face -- f face )     
     halfspace>> [ pv> swap nth [ * ] curry ] keep ; inline
 : suffix-touching-corner ( face corner -- face ) 
     [ suffix ] curry   change-touching-corners ; inline
 : real-face? ( face -- ? )
-    [ touching-corners>> length ] [ halfspace>> dimension ] bi >= ;
+    [ touching-corners>> length ] 
+    [ halfspace>> dimension ] bi >= ;
 
 : (add-to-adjacent-faces) ( face face -- face )
     over adjacent-faces>> 2dup member?
@@ -203,7 +211,8 @@ TUPLE: face { halfspace array } touching-corners adjacent-faces ;
     [ ] (intersection-into-face) ;
 
 : intersections-into-faces ( face -- faces )
-    clone dup  adjacent-faces>> [ intersection-into-face ] with map 
+    clone dup  
+    adjacent-faces>> [ intersection-into-face ] with map 
     [ ] filter ;
 
 : (face-silhouette) ( face -- faces )
@@ -219,30 +228,32 @@ TUPLE: face { halfspace array } touching-corners adjacent-faces ;
 
 ! --------------------------------
 ! solid
-! --------------------------------------------------------------
-TUPLE: solid dimension silhouettes faces corners adjacencies-valid color name ;
+! -------------------------------------------------------------
+TUPLE: solid dimension silhouettes 
+    faces corners adjacencies-valid color name ;
 
 : <solid> ( -- tuple ) solid new ;
 
 : suffix-silhouettes ( solid silhouette -- solid )  
     [ suffix ] curry change-silhouettes ;
 
-: suffix-face ( solid face -- solid )     [ suffix ] curry change-faces ;
-
-: suffix-corner ( solid corner -- solid ) [ suffix ] curry change-corners ; 
-
+: suffix-face ( solid face -- solid )     
+    [ suffix ] curry change-faces ;
+: suffix-corner ( solid corner -- solid ) 
+    [ suffix ] curry change-corners ; 
 : erase-solid-corners ( solid -- solid )  f >>corners ;
 
-: erase-silhouettes ( solid -- solid ) dup dimension>> f <array> >>silhouettes ;
-
-: filter-real-faces ( solid -- solid ) [ [ real-face? ] filter ] change-faces ;
-
+: erase-silhouettes ( solid -- solid ) 
+    dup dimension>> f <array> >>silhouettes ;
+: filter-real-faces ( solid -- solid ) 
+    [ [ real-face? ] filter ] change-faces ;
 : initiate-solid-from-face ( face -- solid ) 
     face-project-dim  <solid> swap >>dimension ;
 
 : erase-old-adjacencies ( solid -- solid )
     erase-solid-corners
-    [ dup [ erase-face-touching-corners erase-face-adjacent-faces drop ] each ]
+    [ dup [ erase-face-touching-corners 
+        erase-face-adjacent-faces drop ] each ]
     change-faces ;
 
 : point-inside-or-on-face? ( face v -- ? ) 
@@ -252,13 +263,15 @@ TUPLE: solid dimension silhouettes faces corners adjacencies-valid color name ;
     [ halfspace>> ] dip  point-inside-halfspace? ;
 
 : point-inside-solid? ( solid point -- ? )
-    [ faces>> ] dip [ point-inside-face? ] curry  all?   ; inline
+    [ faces>> ] dip [ point-inside-face? ] curry all? ; inline
 
 : point-inside-or-on-solid? ( solid point -- ? )
-    [ faces>> ] dip [ point-inside-or-on-face? ] curry  all?   ; inline
+    [ faces>> ] dip 
+    [ point-inside-or-on-face? ] curry  all?   ; inline
 
 : unvalid-adjacencies ( solid -- solid )  
-    erase-old-adjacencies f >>adjacencies-valid erase-silhouettes ;
+    erase-old-adjacencies f >>adjacencies-valid 
+    erase-silhouettes ;
 
 : add-face ( solid face -- solid ) 
     suffix-face unvalid-adjacencies ; 
@@ -338,8 +351,10 @@ TUPLE: solid dimension silhouettes faces corners adjacencies-valid color name ;
     ensure-silhouettes
     ;
 
-: (non-empty-solid?) ( solid -- ? ) [ dimension>> ] [ corners>> length ] bi < ;
-: non-empty-solid? ( solid -- ? )   ensure-adjacencies (non-empty-solid?) ;
+: (non-empty-solid?) ( solid -- ? ) 
+    [ dimension>> ] [ corners>> length ] bi < ;
+: non-empty-solid? ( solid -- ? )   
+    ensure-adjacencies (non-empty-solid?) ;
 
 : compare-corners-roughly ( corner corner -- ? )
     2drop t ;
@@ -367,8 +382,10 @@ TUPLE: solid dimension silhouettes faces corners adjacencies-valid color name ;
    [ dup faces>> ] dip call drop  
    unvalid-adjacencies ; inline
 
-: solid-translate ( solid v -- solid ) [ face-translate ] (solid-move) ; 
-: solid-transform ( solid m -- solid ) [ face-transform ] (solid-move) ; 
+: solid-translate ( solid v -- solid ) 
+    [ face-translate ] (solid-move) ; 
+: solid-transform ( solid m -- solid ) 
+    [ face-transform ] (solid-move) ; 
 
 : find-corner-in-silhouette ( s1 s2 -- elt bool )
     pv> swap silhouettes>> nth     
@@ -402,13 +419,15 @@ TUPLE: solid dimension silhouettes faces corners adjacencies-valid color name ;
     [ ensure-adjacencies ] map
 ; inline
 
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 ! space 
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 TUPLE: space name dimension solids ambient-color lights ;
 : <space> ( -- space )      space new ;
-: suffix-solids ( space solid -- space ) [ suffix ] curry change-solids ; inline
-: suffix-lights ( space light -- space ) [ suffix ] curry change-lights ; inline
+: suffix-solids ( space solid -- space ) 
+    [ suffix ] curry change-solids ; inline
+: suffix-lights ( space light -- space ) 
+    [ suffix ] curry change-lights ; inline
 : clear-space-solids ( space -- space )     f >>solids ;
 
 : space-ensure-solids ( space -- space ) 
@@ -417,19 +436,24 @@ TUPLE: space name dimension solids ambient-color lights ;
     [ [ non-empty-solid? ] filter ] change-solids ;
 
 : projected-space ( space solids -- space ) 
-   swap dimension>> 1-  <space>    swap >>dimension    swap  >>solids ;
+   swap dimension>> 1-  <space>    
+   swap >>dimension    swap  >>solids ;
 
-: get-silhouette ( solid -- silhouette )    silhouettes>> pv> swap nth ;
-: solid= ( solid solid -- ? )               [ corners>> ]  bi@ = ;
+: get-silhouette ( solid -- silhouette )    
+    silhouettes>> pv> swap nth ;
+: solid= ( solid solid -- ? )            [ corners>> ]  bi@ = ;
 
 : space-apply ( space m quot -- space ) 
         curry [ map ] curry [ dup solids>> ] dip
         [ call ] [ drop ] recover drop ;
-: space-transform ( space m -- space ) [ solid-transform ] space-apply ;
-: space-translate ( space v -- space ) [ solid-translate ] space-apply ; 
+: space-transform ( space m -- space ) 
+    [ solid-transform ] space-apply ;
+: space-translate ( space v -- space ) 
+    [ solid-translate ] space-apply ; 
 
 : describe-space ( space -- ) 
-    solids>>  [  [ corners>>  [ pprint ] each ] [ name>> . ] bi ] each ;
+    solids>>  
+    [  [ corners>>  [ pprint ] each ] [ name>> . ] bi ] each ;
 
 : clip-solid ( solid solid -- solids )
     [ ]
@@ -451,7 +475,8 @@ TUPLE: space name dimension solids ambient-color lights ;
 ; inline 
 
 : remove-hidden-solids ( space -- space ) 
-! We must include each solid in a sequence because during substration 
+! We must include each solid in a sequence because 
+! during substration 
 ! a solid can be divided in more than on solid
     [ 
         [ [ 1array ] map ] 
@@ -489,9 +514,9 @@ TUPLE: space name dimension solids ambient-color lights ;
     [ [ ] [ v+ ] map-reduce ] [ length ] bi v/n
 ;
 
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 ! 3D rendering
-! --------------------------------------------------------------
+! -------------------------------------------------------------
 
 : face-reference ( face -- halfspace point vect )
        [ halfspace>> ] 
@@ -523,8 +548,10 @@ TUPLE: space name dimension solids ambient-color lights ;
 
 : face->GL ( face color -- )
    [ ordered-face-points ] dip
-   [ first3 1.0 glColor4d GL_POLYGON [ [ point->GL  ] each ] do-state ] curry
-   [  0 0 0 1 glColor4d GL_LINE_LOOP [ [ point->GL  ] each ] do-state ]
+   [ first3 1.0 glColor4d GL_POLYGON 
+        [ [ point->GL  ] each ] do-state ] curry
+   [  0 0 0 1 glColor4d GL_LINE_LOOP 
+        [ [ point->GL  ] each ] do-state ]
    bi
    ; inline
 
diff --git a/extra/adsoda/combinators/combinators-docs.factor b/extra/adsoda/combinators/combinators-docs.factor
index e6bb52ac24..0121dce32b 100755
--- a/extra/adsoda/combinators/combinators-docs.factor
+++ b/extra/adsoda/combinators/combinators-docs.factor
@@ -5,7 +5,7 @@ IN: adsoda.combinators
 
 HELP: among
 { $values
-     { "array" array } { "n" null }
+     { "array" array } { "n" "number of value to select" }
      { "array" array }
 }
 { $description "returns an array containings every possibilities of n choices among a given sequence" } ;
@@ -32,7 +32,7 @@ HELP: do-cycle
 { $description "Copy the first element at the end of the sequence in order to close the cycle." } ;
 
 
-ARTICLE: "adsoda.combinators" "adsoda.combinators"
+ARTICLE: "adsoda.combinators" "Combinators"
 { $vocab-link "adsoda.combinators" }
 ;
 
diff --git a/extra/adsoda/combinators/combinators.factor b/extra/adsoda/combinators/combinators.factor
index 5838c30698..4e4bbff72d 100755
--- a/extra/adsoda/combinators/combinators.factor
+++ b/extra/adsoda/combinators/combinators.factor
@@ -4,7 +4,7 @@ USING: kernel arrays sequences fry math combinators ;
 
 IN: adsoda.combinators
 
-! : (combinations) ( seq -- seq ) [ 1 tail ] dip combinations ; 
+! : (combinations) ( seq -- seq ) [ 1 tail ] dip combinations ;
 
 ! : prefix-each [ prefix ] curry map ; inline
 
@@ -34,7 +34,8 @@ IN: adsoda.combinators
     } cond
 ;
 
-: concat-nth ( seq1 seq2 -- seq )  [ nth append ] curry map-index ;
+: concat-nth ( seq1 seq2 -- seq )  
+    [ nth append ] curry map-index ;
 
 : do-cycle   ( array -- array )   dup first suffix ;
 
diff --git a/extra/adsoda/tools/tools-docs.factor b/extra/adsoda/tools/tools-docs.factor
index 6fb617a0c4..1d952e329b 100755
--- a/extra/adsoda/tools/tools-docs.factor
+++ b/extra/adsoda/tools/tools-docs.factor
@@ -9,7 +9,7 @@ HELP: 3cube
     { "solid" "solid" } 
 }
 { $description "array : xmin xmax ymin ymax zmin zmax" 
-"\n returns a 3D solid with given limits"
+"returns a 3D solid with given limits"
 } ;
 
 HELP: 4cube
@@ -18,24 +18,10 @@ HELP: 4cube
     { "solid" "solid" } 
 }
 { $description "array : xmin xmax ymin ymax zmin zmax wmin wmax"  
-"\n returns a 4D solid with given limits"
+"returns a 4D solid with given limits"
 } ;
 
 
-HELP: coord-max
-{ $values
-     { "x" null } { "array" array }
-     { "array" array }
-}
-{ $description "" } ;
-
-HELP: coord-min
-{ $values
-     { "x" null } { "array" array }
-     { "array" array }
-}
-{ $description "" } ;
-
 HELP: equation-system-for-normal
 { $values
      { "points" "a list of n points" }
@@ -51,8 +37,8 @@ HELP: normal-vector
      { "v" "a vector" }
 }
 { $description "From a list of points, returns the vector normal to the plan defined by the points" 
-"\nWith n points, creates n-1 vectors and then find a vector orthogonal to every others"
-"\n returns { f } if a normal vector can not be found" } 
+"With n points, creates n-1 vectors and then find a vector orthogonal to every others"
+"returns { f } if a normal vector can not be found" } 
 ;
 
 HELP: points-to-hyperplane
@@ -61,14 +47,14 @@ HELP: points-to-hyperplane
      { "hyperplane" "an hyperplane equation" }
 }
 { $description "From a list of points, returns the equation of the hyperplan"
-"\n Finds a normal vector and then translate it so that it includes one of the points"
+"Finds a normal vector and then translate it so that it includes one of the points"
 
 } 
 ;
 
-ARTICLE: "adsoda.tools" "adsoda.tools"
+ARTICLE: "adsoda.tools" "Tools"
 { $vocab-link "adsoda.tools" }
-"\nTools to help in building an " { $vocab-link "adsoda" } "-space"
+"Tools to help in building an " { $vocab-link "adsoda" } "-space"
 ;
 
 ABOUT: "adsoda.tools"
diff --git a/extra/adsoda/tools/tools.factor b/extra/adsoda/tools/tools.factor
index efa3a55013..6c4f4c3029 100755
--- a/extra/adsoda/tools/tools.factor
+++ b/extra/adsoda/tools/tools.factor
@@ -79,7 +79,8 @@ IN: adsoda.tools
     translate ;
 
 : refs-to-points ( points faces -- faces )
-   [ swap [ nth 10 v*n { 100 100 100 } v+ ] curry map    ] with map
+   [ swap [ nth 10 v*n { 100 100 100 } v+ ] curry map ] 
+   with map
 ;
 ! V{ { 0.1 0.2 } { 1.1 1.3 } } V{ { 1 0 } { 0 1 } }
 ! V{ { { 1.1 1.3 } { 0.1 0.2 } } { { 0.1 0.2 } { 1.1 1.3 } } }
@@ -102,13 +103,15 @@ refs-to-points
 ;
 : 2-faces-to-prism ( seq seq -- seq )
   2dup
-    [ do-cycle 2 clump ] bi@ concat-nth  !  3 faces rectangulaires
+    [ do-cycle 2 clump ] bi@ concat-nth  
+    !  3 faces rectangulaires
     swap prefix
     swap prefix
 ;    
 
 : Xpoints-to-prisme ( seq height -- cube )
-    ! from 3 points gives a list of faces representing a cube of height "height"
+    ! from 3 points gives a list of faces representing 
+    ! a cube of height "height"
     ! and of based on the three points
     ! a face is a group of 3 or mode points.   
     [ dup dup  3points-to-normal ] dip 
@@ -121,7 +124,8 @@ refs-to-points
 
 
 : Xpoints-to-plane4D ( seq x y -- 4Dplane )
-    ! from 3 points gives a list of faces representing a cube in 4th dim
+    ! from 3 points gives a list of faces representing 
+    ! a cube in 4th dim
     ! from x to y (height = y-x)
     ! and of based on the X points
     ! a face is a group of 3 or mode points.   
@@ -130,7 +134,8 @@ refs-to-points
 ;
 
 : 3pointsfaces-to-3Dsolidfaces ( seq -- seq )
-    [ 1 Xpoints-to-prisme [ 100 110 Xpoints-to-plane4D ] map concat ] map 
+    [ 1 Xpoints-to-prisme [ 100 
+        110 Xpoints-to-plane4D ] map concat ] map 
 
 ;
 

From 09d1e6400b4ba6d0904db8251553a26d539a9461 Mon Sep 17 00:00:00 2001
From: Jeff Bigot <jeff.bigot@wanadoo.fr>
Date: Fri, 30 Jan 2009 17:42:59 +0100
Subject: [PATCH 19/86] move to unmaintained

---
 unmaintained/4DNav/4DNav-docs.factor          | 201 ------
 unmaintained/4DNav/4DNav.factor               | 556 -----------------
 unmaintained/4DNav/authors.txt                |   1 -
 unmaintained/4DNav/camera/authors.txt         |   1 -
 unmaintained/4DNav/camera/camera-docs.factor  |  88 ---
 unmaintained/4DNav/camera/camera.factor       |  19 -
 unmaintained/4DNav/deep/deep-docs.factor      |  31 -
 unmaintained/4DNav/deep/deep.factor           |  13 -
 unmaintained/4DNav/deploy.factor              |  15 -
 unmaintained/4DNav/file-chooser/authors.txt   |   1 -
 .../4DNav/file-chooser/file-chooser.factor    | 157 -----
 unmaintained/4DNav/hypercube.xml              |  37 --
 unmaintained/4DNav/light_test.xml             |  62 --
 unmaintained/4DNav/multi solids.xml           |  50 --
 unmaintained/4DNav/prismetriagone.xml         |  25 -
 .../4DNav/space-file-decoder/authors.txt      |   1 -
 .../space-file-decoder-docs.factor            |  20 -
 .../space-file-decoder.factor                 |  66 --
 unmaintained/4DNav/summary.txt                |   1 -
 unmaintained/4DNav/tags.txt                   |   1 -
 unmaintained/4DNav/triancube.xml              |  23 -
 unmaintained/4DNav/turtle/authors.txt         |   1 -
 unmaintained/4DNav/turtle/turtle-docs.factor  |  11 -
 unmaintained/4DNav/turtle/turtle.factor       | 154 -----
 unmaintained/4DNav/window3D/authors.txt       |   1 -
 .../4DNav/window3D/window3D-docs.factor       |  12 -
 unmaintained/4DNav/window3D/window3D.factor   |  83 ---
 unmaintained/adsoda/adsoda-docs.factor        | 299 ---------
 unmaintained/adsoda/adsoda-tests.factor       | 310 ----------
 unmaintained/adsoda/adsoda.factor             | 570 ------------------
 unmaintained/adsoda/adsoda.tests              | 147 -----
 unmaintained/adsoda/authors.txt               |   2 -
 unmaintained/adsoda/combinators/authors.txt   |   1 -
 .../combinators/combinators-docs.factor       |  39 --
 .../combinators/combinators-tests.factor      |  11 -
 .../adsoda/combinators/combinators.factor     |  45 --
 .../adsoda/solution2/solution2.factor         | 126 ----
 unmaintained/adsoda/solution2/summary.txt     |   1 -
 unmaintained/adsoda/summary.txt               |   1 -
 unmaintained/adsoda/tags.txt                  |   1 -
 unmaintained/adsoda/tools/authors.txt         |   1 -
 unmaintained/adsoda/tools/tools-docs.factor   |  62 --
 unmaintained/adsoda/tools/tools-tests.factor  |  14 -
 unmaintained/adsoda/tools/tools.factor        | 150 -----
 44 files changed, 3411 deletions(-)
 delete mode 100755 unmaintained/4DNav/4DNav-docs.factor
 delete mode 100755 unmaintained/4DNav/4DNav.factor
 delete mode 100755 unmaintained/4DNav/authors.txt
 delete mode 100755 unmaintained/4DNav/camera/authors.txt
 delete mode 100755 unmaintained/4DNav/camera/camera-docs.factor
 delete mode 100755 unmaintained/4DNav/camera/camera.factor
 delete mode 100755 unmaintained/4DNav/deep/deep-docs.factor
 delete mode 100755 unmaintained/4DNav/deep/deep.factor
 delete mode 100755 unmaintained/4DNav/deploy.factor
 delete mode 100755 unmaintained/4DNav/file-chooser/authors.txt
 delete mode 100755 unmaintained/4DNav/file-chooser/file-chooser.factor
 delete mode 100755 unmaintained/4DNav/hypercube.xml
 delete mode 100755 unmaintained/4DNav/light_test.xml
 delete mode 100755 unmaintained/4DNav/multi solids.xml
 delete mode 100755 unmaintained/4DNav/prismetriagone.xml
 delete mode 100755 unmaintained/4DNav/space-file-decoder/authors.txt
 delete mode 100755 unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
 delete mode 100755 unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
 delete mode 100755 unmaintained/4DNav/summary.txt
 delete mode 100755 unmaintained/4DNav/tags.txt
 delete mode 100755 unmaintained/4DNav/triancube.xml
 delete mode 100755 unmaintained/4DNav/turtle/authors.txt
 delete mode 100755 unmaintained/4DNav/turtle/turtle-docs.factor
 delete mode 100755 unmaintained/4DNav/turtle/turtle.factor
 delete mode 100755 unmaintained/4DNav/window3D/authors.txt
 delete mode 100755 unmaintained/4DNav/window3D/window3D-docs.factor
 delete mode 100755 unmaintained/4DNav/window3D/window3D.factor
 delete mode 100755 unmaintained/adsoda/adsoda-docs.factor
 delete mode 100755 unmaintained/adsoda/adsoda-tests.factor
 delete mode 100755 unmaintained/adsoda/adsoda.factor
 delete mode 100755 unmaintained/adsoda/adsoda.tests
 delete mode 100755 unmaintained/adsoda/authors.txt
 delete mode 100755 unmaintained/adsoda/combinators/authors.txt
 delete mode 100755 unmaintained/adsoda/combinators/combinators-docs.factor
 delete mode 100755 unmaintained/adsoda/combinators/combinators-tests.factor
 delete mode 100755 unmaintained/adsoda/combinators/combinators.factor
 delete mode 100755 unmaintained/adsoda/solution2/solution2.factor
 delete mode 100755 unmaintained/adsoda/solution2/summary.txt
 delete mode 100755 unmaintained/adsoda/summary.txt
 delete mode 100755 unmaintained/adsoda/tags.txt
 delete mode 100755 unmaintained/adsoda/tools/authors.txt
 delete mode 100755 unmaintained/adsoda/tools/tools-docs.factor
 delete mode 100755 unmaintained/adsoda/tools/tools-tests.factor
 delete mode 100755 unmaintained/adsoda/tools/tools.factor

diff --git a/unmaintained/4DNav/4DNav-docs.factor b/unmaintained/4DNav/4DNav-docs.factor
deleted file mode 100755
index 95f231ecb9..0000000000
--- a/unmaintained/4DNav/4DNav-docs.factor
+++ /dev/null
@@ -1,201 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel quotations strings ;
-IN: 4DNav
-
-
-HELP: menu-3D
-{ $values
-     { "gadget" "gadget" }
-}
-{ $description "The menu dedicated to 3D movements of the camera" } ;
-
-HELP: menu-4D
-{ $values
-    
-     { "gadget" "gadget" }
-}
-{ $description "The menu dedicated to 4D movements of space" } ;
-
-HELP: menu-bar
-{ $values
-    
-     { "gadget" "gadget" }
-}
-{ $description "return gadget containing menu buttons" } ;
-
-HELP: model-projection
-{ $values
-     { "x" "interger" }
-     { "space" "space" }
-}
-{ $description "Project space following coordinate x" } ;
-
-HELP: mvt-3D-1
-{ $values
-    
-     { "quot" "quotation" }
-}
-{ $description "return a quotation to orientate space to see it from first point of view" } ;
-
-HELP: mvt-3D-2
-{ $values
-    
-     { "quot" "quotation" }
-}
-{ $description "return a quotation to orientate space to see it from second point of view" } ;
-
-HELP: mvt-3D-3
-{ $values
-    
-     { "quot" "quotation" }
-}
-{ $description "return a quotation to orientate space to see it from third point of view" } ;
-
-HELP: mvt-3D-4
-{ $values
-    
-     { "quot" "quotation" }
-}
-{ $description "return a quotation to orientate space to see it from first point of view" } ;
-
-HELP: load-model-file
-{ $description "load space from file" } ;
-
-HELP: rotation-4D
-{ $values
-     { "m" "a rotation matrix" }
-}
-{ $description "Apply a 4D rotation matrix" } ;
-
-HELP: translation-4D
-{ $values
-     { "v" "vector" }
-}
-{ $description "Apply a 4D translation" } ;
-
-
-ARTICLE: "implementation details" "How 4DNav is done"
-"4DNav is build using :"
-
-{ $subsection "4DNav.camera" }
-{ $subsection "adsoda-main-page" }
-;
-
-ARTICLE: "Space file" "Create a new space file"
-"To build a new space, create an XML file using " { $vocab-link "adsoda" } " model description. A solid is not caracterized by its corners but is defined as the intersection of hyperplanes."
-
-$nl
-"An example is:"
-$nl
-
-"\n<model>"
-"\n<space>"
-"\n <dimension>4</dimension>"
-"\n <solid>"
-"\n     <name>4cube1</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,100</face>"
-"\n     <face>-1,0,0,0,-150</face>"
-"\n     <face>0,1,0,0,100</face>"
-"\n     <face>0,-1,0,0,-150</face>"
-"\n     <face>0,0,1,0,100</face>"
-"\n     <face>0,0,-1,0,-150</face>"
-"\n     <face>0,0,0,1,100</face>"
-"\n     <face>0,0,0,-1,-150</face>"
-"\n     <color>1,0,0</color>"
-"\n </solid>"
-"\n <solid>"
-"\n     <name>4triancube</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,160</face>"
-"\n     <face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>"
-"\n     <face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>"
-"\n     <face>0,0,1,0,140</face>"
-"\n     <face>0,0,-1,0,-180</face>"
-"\n     <face>0,0,0,1,110</face>"
-"\n     <face>0,0,0,-1,-180</face>"
-"\n     <color>0,1,0</color>"
-"\n </solid>"
-"\n <solid>"
-"\n     <name>triangone</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,60</face>"
-"\n     <face>0.5,0.8660254037844386,0,0,60</face>"
-"\n     <face>-0.5,0.8660254037844387,0,0,-20</face>"
-"\n     <face>-1.0,0,0,0,-100</face>"
-"\n     <face>-0.5,-0.8660254037844384,0,0,-100</face>"
-"\n     <face>0.5,-0.8660254037844387,0,0,-20</face>"
-"\n     <face>0,0,1,0,120</face>"
-"\n     <face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>"
-"\n     <face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>"
-"\n     <color>0,1,1</color>"
-"\n </solid>"
-"\n <light>"
-"\n     <direction>1,1,1,1</direction>"
-"\n     <color>0.2,0.2,0.6</color>"
-"\n </light>"
-"\n <color>0.8,0.9,0.9</color>"
-"\n</space>"
-"\n</model>"
-
-
-;
-ARTICLE: "TODO" "Todo"
-{ $list 
-    "A vocab to initialize parameters"
-    "an editor mode" 
-        { $list "add a face to a solid"
-                "add a solid to the space"
-                "move a face"
-                "move a solid"
-                "select a solid in a list"
-                "select a face"
-                "display selected face"
-                "edit a solid color"
-                "add a light"
-                "edit a light color"
-                "move a light"
-                }
-    "add a tool wich give an hyperplane normal vector with enought points. Will use adsoda.intersect-hyperplanes with { { 0 } { 0 } { 1 } } "
-    "decorrelate 3D camera and activate them with select buttons"
-
-} ;
-
-
-ARTICLE: "4DNav" "The 4DNav app"
-{ $vocab-link "4DNav" }
-$nl
-{ $heading "4D Navigator" }
-"4DNav is a simple tool to visualize 4 dimensionnal objects."
-"\n"
-"It uses " { $vocab-link "adsoda" } " library to display a 4D space and navigate thru it."
-$nl
-"It will display:"
-{ $list
-    { "a menu window" }
-    {  "4 visualization windows" }
-}
-"Each visualization window represents the projection of the 4D space on a particular 3D space."
-
-{ $heading "Start" }
-"type:" { $code "\"4DNav\" run" } 
-
-{ $heading "Navigation" }
-"Menu window is divided in 4 areas"
-{ $list
-    { "a space-file chooser to select the file to display" }
-    { "a parametrization area to select the projection mode" }
-    { "4D submenu to translate and rotate the 4D space" }
-    { "3D submenu to move the camera in 3D space. Cameras in every 3D spaces are manipulated as a single one" }
-    }
-
-{ $heading "Links" }
-{ $subsection "Space file" }
-
-{ $subsection "TODO" }
-{ $subsection "implementation details" }
-
-;
-
-ABOUT: "4DNav"
diff --git a/unmaintained/4DNav/4DNav.factor b/unmaintained/4DNav/4DNav.factor
deleted file mode 100755
index 91c1c94b35..0000000000
--- a/unmaintained/4DNav/4DNav.factor
+++ /dev/null
@@ -1,556 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel 
-namespaces
-accessors
-make
-math
-math.functions
-math.trig
-math.parser
-hashtables
-sequences
-combinators
-continuations
-colors
-prettyprint
-vars
-quotations
-io
-io.directories
-io.pathnames
-help.markup
-io.files
-ui.gadgets.panes
- ui
-       ui.gadgets
-       ui.traverse
-       ui.gadgets.borders
-       ui.gadgets.handler
-       ui.gadgets.slate
-       ui.gadgets.theme
-       ui.gadgets.frames
-       ui.gadgets.tracks
-       ui.gadgets.labels
-       ui.gadgets.labelled       
-       ui.gadgets.lists
-       ui.gadgets.buttons
-       ui.gadgets.packs
-       ui.gadgets.grids
-       ui.gestures
-       ui.tools.workspace
-       ui.gadgets.scrollers
-splitting
-vectors
-math.vectors
-rewrite-closures
-self
-values
-4DNav.turtle
-4DNav.window3D
-4DNav.deep
-4DNav.space-file-decoder
-models
-fry
-adsoda
-adsoda.tools
-;
-
-IN: 4DNav
-VALUE: selected-file
-VALUE: translation-step
-VALUE: rotation-step
-
-3 to: translation-step 
-5 to: rotation-step
-
-VAR: selected-file-model
-VAR: observer3d 
-VAR: view1 
-VAR: view2
-VAR: view3
-VAR: view4
-VAR: present-space
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! replacement of namespaces.lib
-    
-: make* ( seq -- seq ) [ dup quotation? [ call ] [ ] if ] map ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! waiting for deep-cleave-quots
-
-: 4D-Rxy ( angle -- Rx ) deg>rad
-[ 1.0 , 0.0 , 0.0       , 0.0 ,
-  0.0 , 1.0 , 0.0       , 0.0 ,
-  0.0 , 0.0 , dup cos  , dup sin neg  ,
-  0.0 , 0.0 , dup sin  , dup cos  ,  ] 4 make-matrix nip ;
-
-: 4D-Rxz ( angle -- Ry ) deg>rad
-[ 1.0 , 0.0       , 0.0 , 0.0 ,
-  0.0 , dup cos  , 0.0 , dup sin neg  ,
-  0.0 , 0.0       , 1.0 , 0.0 ,
-  0.0 , dup sin  , 0.0 , dup cos  ,  ] 4 make-matrix nip ;
-
-: 4D-Rxw ( angle -- Rz ) deg>rad
-[ 1.0 , 0.0       , 0.0           , 0.0 ,
-  0.0 , dup cos  , dup sin neg  , 0.0 ,
-  0.0 , dup sin  , dup cos     , 0.0 ,
-  0.0 , 0.0       , 0.0           , 1.0 , ] 4 make-matrix nip ;
-
-: 4D-Ryz ( angle -- Rx ) deg>rad
-[ dup cos  , 0.0 , 0.0 , dup sin neg  ,
-  0.0       , 1.0 , 0.0 , 0.0 ,
-  0.0       , 0.0 , 1.0 , 0.0 ,
-  dup sin  , 0.0 , 0.0 , dup cos  ,   ] 4 make-matrix nip ;
-
-: 4D-Ryw ( angle -- Ry ) deg>rad
-[ dup cos  , 0.0 , dup sin neg  , 0.0 ,
-  0.0       , 1.0 , 0.0           , 0.0 ,
-  dup sin  , 0.0 , dup cos     , 0.0 ,
-  0.0       , 0.0 , 0.0        , 1.0 ,  ] 4 make-matrix nip ;
-
-: 4D-Rzw ( angle -- Rz ) deg>rad
-[ dup cos  , dup sin neg  , 0.0 , 0.0 ,
-  dup sin  , dup cos     , 0.0 , 0.0 ,
-  0.0       , 0.0           , 1.0 , 0.0 ,
-  0.0       , 0.0          , 0.0 , 1.0 ,  ] 4 make-matrix nip ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! UI
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: button* ( string quot -- button ) 
-    closed-quot <repeat-button>  ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: model-projection-chooser ( -- gadget )
-   observer3d> projection-mode>>
-   { { 1 "perspective" } { 0 "orthogonal" } } 
-   <toggle-buttons> ;
-
-: collision-detection-chooser ( -- gadget )
-   observer3d> collision-mode>>
-   { { t "on" } { f "off" }  } <toggle-buttons> ;
-
-: model-projection ( x -- space ) 
-    present-space>  swap space-project ;
-
-: update-observer-projections (  -- )
-    view1> relayout-1 
-    view2> relayout-1 
-    view3> relayout-1 
-    view4> relayout-1 ;
-
-: update-model-projections (  -- )
-    0 model-projection <model> view1> (>>model)
-    1 model-projection <model> view2> (>>model)
-    2 model-projection <model> view3> (>>model)
-    3 model-projection <model> view4> (>>model) ;
-
-: camera-action ( quot -- quot ) 
-    [ drop [ ] observer3d>  
-    with-self update-observer-projections ] 
-    make* closed-quot ;
-
-: win3D ( text gadget -- ) 
-    "navigateur 4D : " rot append open-window ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! 4D object manipulation
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: (mvt-4D) ( quot -- )   
-    present-space>  
-        swap call space-ensure-solids 
-    >present-space 
-    update-model-projections 
-    update-observer-projections ;
-
-: rotation-4D ( m -- ) 
-    '[ _ [ [ middle-of-space dup vneg ] keep 
-        swap space-translate ] dip
-         space-transform 
-         swap space-translate
-    ] (mvt-4D) ;
-
-: translation-4D ( v -- ) '[ _ space-translate ] (mvt-4D) ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! menu
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: menu-rotations-4D ( -- gadget )
-    <frame>
-         <pile> 1 >>fill
-          "XY +" [ drop rotation-step 4D-Rxy rotation-4D ] 
-                button* add-gadget
-          "XY -" [ drop rotation-step neg 4D-Rxy rotation-4D ] 
-                button* add-gadget 
-       @top-left grid-add    
-        <pile> 1 >>fill
-          "XZ +" [ drop rotation-step 4D-Rxz rotation-4D ] 
-                button* add-gadget
-          "XZ -" [ drop rotation-step neg 4D-Rxz rotation-4D ] 
-                button* add-gadget 
-       @top grid-add    
-        <pile> 1 >>fill
-          "YZ +" [ drop rotation-step 4D-Ryz rotation-4D ] 
-                button* add-gadget
-          "YZ -" [ drop rotation-step neg 4D-Ryz rotation-4D ] 
-                button* add-gadget 
-        @center grid-add
-         <pile> 1 >>fill
-          "XW +" [ drop rotation-step 4D-Rxw rotation-4D ] 
-                button* add-gadget
-          "XW -" [ drop rotation-step neg 4D-Rxw rotation-4D ] 
-                button* add-gadget 
-        @top-right grid-add   
-         <pile> 1 >>fill
-          "YW +" [ drop rotation-step 4D-Ryw rotation-4D ] 
-                button* add-gadget
-          "YW -" [ drop rotation-step neg 4D-Ryw rotation-4D ] 
-                button* add-gadget 
-       @right grid-add    
-         <pile> 1 >>fill
-          "ZW +" [ drop rotation-step 4D-Rzw rotation-4D ] 
-                button* add-gadget
-          "ZW -" [ drop rotation-step neg 4D-Rzw rotation-4D ] 
-                button* add-gadget 
-       @bottom-right grid-add    
-;
-
-: menu-translations-4D ( -- gadget )
-    <frame> 
-        <pile> 1 >>fill
-            <shelf> 1 >>fill  
-                "X+" [ drop {  1 0 0 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget
-                "X-" [ drop { -1 0 0 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget 
-            add-gadget
-            "YZW" <label> add-gadget
-         @bottom-right grid-add
-         <pile> 1 >>fill
-            "XZW" <label> add-gadget
-            <shelf> 1 >>fill
-                "Y+" [ drop  { 0  1 0 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget
-                "Y-" [ drop  { 0 -1 0 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget 
-                add-gadget
-         @top-right grid-add
-         <pile> 1 >>fill
-            "XYW" <label> add-gadget
-            <shelf> 1 >>fill
-                "Z+" [ drop { 0 0  1 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget
-                "Z-" [ drop { 0 0 -1 0 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget 
-                add-gadget                 
-        @top-left grid-add     
-        <pile> 1 >>fill
-            <shelf> 1 >>fill
-                "W+" [ drop { 0 0 0 1  } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget
-                "W-" [ drop { 0 0 0 -1 } translation-step v*n 
-                    translation-4D ] 
-                    button* add-gadget 
-                add-gadget
-            "XYZ" <label> add-gadget
-        @bottom-left grid-add 
-        "X" <label> @center grid-add
-;
-
-: menu-4D ( -- gadget )  
-    <shelf> 
-        "rotations" <label>     add-gadget
-        menu-rotations-4D       add-gadget
-        "translations" <label>  add-gadget
-        menu-translations-4D    add-gadget
-        0.5 >>align
-        { 0 10 } >>gap
-;
-
-
-! ------------------------------------------------------
-
-: redraw-model ( space -- )
-    >present-space 
-    update-model-projections 
-    update-observer-projections ;
-
-: load-model-file ( -- )
-  selected-file dup selected-file-model> set-model 
-  read-model-file 
-  redraw-model ;
-
-: mvt-3D-X ( turn pitch -- quot )
-    '[ turtle-pos> norm neg reset-turtle 
-        _ turn-left 
-        _ pitch-up 
-        step-turtle ] ;
-
-: mvt-3D-1 ( -- quot )      90  0 mvt-3D-X ; inline
-: mvt-3D-2 ( -- quot )      0  90 mvt-3D-X ; inline
-: mvt-3D-3 ( -- quot )      0   0 mvt-3D-X ; inline
-: mvt-3D-4 ( -- quot )      45 45 mvt-3D-X ; inline
-
-: camera-button ( string quot -- button ) 
-    [ <label>  ] dip camera-action <repeat-button> ;
-
-! ----------------------------------------------------------
-! file chooser
-! ----------------------------------------------------------
-: <run-file-button> ( file-name -- button )
-  dup '[ drop  _  \ selected-file set-value load-model-file 
-   ] 
- closed-quot  <roll-button> { 0 0 } >>align ;
-
-: <list-runner> ( -- gadget )
-    "resource:extra/4DNav" 
-  <pile> 1 >>fill 
-    over dup directory-files  
-    [ ".xml" tail? ] filter 
-    [ append-path ] with map
-    [ <run-file-button> add-gadget ] each
-    swap <labelled-gadget> ;
-
-! -----------------------------------------------------
-
-: menu-rotations-3D ( -- gadget )
-    <frame>
-        "Turn\n left"  [ rotation-step  turn-left  ] 
-            camera-button   @left grid-add     
-        "Turn\n right" [ rotation-step turn-right ] 
-            camera-button   @right grid-add     
-        "Pitch down"   [ rotation-step  pitch-down ] 
-            camera-button   @bottom grid-add     
-        "Pitch up"     [ rotation-step  pitch-up   ] 
-            camera-button   @top grid-add     
-        <shelf>  1 >>fill
-            "Roll left\n (ctl)"  [ rotation-step  roll-left  ] 
-                camera-button   add-gadget  
-            "Roll right\n(ctl)"  [ rotation-step  roll-right ] 
-                camera-button   add-gadget  
-        @center grid-add 
-;
-
-: menu-translations-3D ( -- gadget )
-    <frame>
-        "left\n(alt)"        [ translation-step  strafe-left  ]
-            camera-button @left grid-add  
-        "right\n(alt)"       [ translation-step  strafe-right ]
-            camera-button @right grid-add     
-        "Strafe up \n (alt)" [ translation-step strafe-up    ] 
-            camera-button @top grid-add
-        "Strafe down\n (alt)" [ translation-step strafe-down  ]
-            camera-button @bottom grid-add    
-        <pile>  1 >>fill
-            "Forward (ctl)"  [  translation-step step-turtle ] 
-                camera-button add-gadget
-            "Backward (ctl)" 
-                [ translation-step neg step-turtle ] 
-                camera-button   add-gadget
-        @center grid-add
-;
-
-: menu-quick-views ( -- gadget )
-    <shelf>
-        "View 1 (1)" mvt-3D-1 camera-button   add-gadget
-        "View 2 (2)" mvt-3D-2 camera-button   add-gadget
-        "View 3 (3)" mvt-3D-3 camera-button   add-gadget 
-        "View 4 (4)" mvt-3D-4 camera-button   add-gadget 
-;
-
-: menu-3D ( -- gadget ) 
-    <pile>
-        <shelf>   
-            menu-rotations-3D    add-gadget
-            menu-translations-3D add-gadget
-            0.5 >>align
-            { 0 10 } >>gap
-        add-gadget
-        menu-quick-views add-gadget ; 
-
-: add-keyboard-delegate ( obj -- obj )
- <handler>
-{
-        { T{ key-down f f "LEFT" }  
-            [ [ rotation-step turn-left ] camera-action ] }
-        { T{ key-down f f "RIGHT" } 
-            [ [ rotation-step turn-right ] camera-action ] }
-        { T{ key-down f f "UP" }    
-            [ [ rotation-step pitch-down ] camera-action ] }
-        { T{ key-down f f "DOWN" }  
-            [ [ rotation-step pitch-up ] camera-action ] }
-
-        { T{ key-down f { C+ } "UP" } 
-           [ [ translation-step step-turtle ] camera-action ] }
-        { T{ key-down f { C+ } "DOWN" } 
-            [ [ translation-step neg step-turtle ] 
-                    camera-action ] }
-        { T{ key-down f { C+ } "LEFT" } 
-            [ [ rotation-step roll-left ] camera-action ] }
-        { T{ key-down f { C+ } "RIGHT" } 
-            [ [ rotation-step roll-right ] camera-action ] }
-
-        { T{ key-down f { A+ } "LEFT" }  
-           [ [ translation-step strafe-left ] camera-action ] }
-        { T{ key-down f { A+ } "RIGHT" } 
-          [ [ translation-step strafe-right ] camera-action ] }
-        { T{ key-down f { A+ } "UP" }    
-            [ [ translation-step strafe-up ] camera-action ] }
-        { T{ key-down f { A+ } "DOWN" }  
-           [ [ translation-step strafe-down ] camera-action ] }
-
-
-        { T{ key-down f f "1" } [ mvt-3D-1 camera-action ] }
-        { T{ key-down f f "2" } [ mvt-3D-2 camera-action ] }
-        { T{ key-down f f "3" } [ mvt-3D-3  camera-action ] }
-        { T{ key-down f f "4" } [ mvt-3D-4  camera-action ] }
-
-    } [ make* ] map >hashtable >>table
-    ;    
-
-! --------------------------------------------
-! print elements 
-! --------------------------------------------
-! print-content
-
-GENERIC: adsoda-display-model ( x -- ) 
-
-M: light adsoda-display-model 
-"\n light : " .
-     { 
-        [ direction>> "direction : " pprint . ] 
-        [ color>> "color : " pprint . ]
-    }   cleave
-    ;
-
-M: face adsoda-display-model 
-     {
-        [ halfspace>> "halfspace : " pprint . ] 
-        [ touching-corners>> "touching corners : " pprint . ]
-    }   cleave
-    ;
-M: solid adsoda-display-model 
-     {
-        [ name>> "solid called : " pprint . ] 
-        [ color>> "color : " pprint . ]
-        [ dimension>> "dimension : " pprint . ]
-        [ faces>> "composed of faces : " pprint 
-            [ adsoda-display-model ] each ]
-    }   cleave
-    ;
-M: space adsoda-display-model 
-     {
-        [ dimension>> "dimension : " pprint . ] 
-        [ ambient-color>> "ambient-color : " pprint . ]
-        [ solids>> "composed of solids : " pprint 
-            [ adsoda-display-model ] each ]
-        [ lights>> "composed of lights : " pprint 
-            [ adsoda-display-model ] each ] 
-    }   cleave
-    ;
-
-! ----------------------------------------------
-: menu-bar ( -- gadget )
-       <shelf>
-          "reinit" [ drop load-model-file ] button* add-gadget
-          selected-file-model> <label-control> add-gadget
-    ;
-
-
-: controller-window* ( -- gadget )
-    { 0 1 } <track>
-        menu-bar f track-add
-        <list-runner>  
-            <limited-scroller>  
-            { 200 400 } >>max-dim
-        f track-add
-        <shelf>
-            "Projection mode : " <label> add-gadget
-            model-projection-chooser add-gadget
-        f track-add
-        <shelf>
-            "Collision detection (slow and buggy ) : " 
-                <label> add-gadget
-            collision-detection-chooser add-gadget
-        f track-add
-        <pile>
-            0.5 >>align    
-            menu-4D add-gadget 
-            light-purple solid-interior
-            "4D movements" <labelled-gadget>
-        f track-add
-        <pile>
-            0.5 >>align
-            { 2 2 } >>gap
-            menu-3D add-gadget
-            light-purple solid-interior 
-            "Camera 3D" <labelled-gadget>
-        f track-add      
-        gray solid-interior
- ;
- 
-: viewer-windows* ( --  )
-    "YZW" view1> win3D 
-    "XZW" view2> win3D 
-    "XYW" view3> win3D 
-    "XYZ" view4> win3D   
-;
-
-: navigator-window* ( -- )
-    controller-window*
-    viewer-windows*   
-    add-keyboard-delegate
-    "navigateur 4D" open-window
-;
-
-: windows ( -- ) [ [ navigator-window* ] with-scope ] with-ui ;
-
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: init-variables ( -- )
-    "choose a file" <model> >selected-file-model  
-    <observer> >observer3d
-    [ observer3d> >self
-      reset-turtle 
-      45 turn-left 
-      45 pitch-up 
-      -300 step-turtle 
-    ] with-scope
-    
-;
-
-
-: init-models ( -- )
-    0 model-projection observer3d> <window3D> >view1
-    1 model-projection observer3d> <window3D> >view2
-    2 model-projection observer3d> <window3D> >view3
-    3 model-projection observer3d> <window3D> >view4
-;
-
-: 4DNav ( -- ) 
-    init-variables
-    selected-file read-model-file >present-space
-    init-models
-    windows
-;
-
-MAIN: 4DNav
-
-
diff --git a/unmaintained/4DNav/authors.txt b/unmaintained/4DNav/authors.txt
deleted file mode 100755
index a6a96933f4..0000000000
--- a/unmaintained/4DNav/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/camera/authors.txt b/unmaintained/4DNav/camera/authors.txt
deleted file mode 100755
index bbc876e7b6..0000000000
--- a/unmaintained/4DNav/camera/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adam Wendt
diff --git a/unmaintained/4DNav/camera/camera-docs.factor b/unmaintained/4DNav/camera/camera-docs.factor
deleted file mode 100755
index 4898c4e580..0000000000
--- a/unmaintained/4DNav/camera/camera-docs.factor
+++ /dev/null
@@ -1,88 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel ;
-IN: 4DNav.camera
-
-HELP: camera-eye
-{ $values
-    
-     { "point" "position" }
-}
-{ $description "return the position of the camera" } ;
-
-HELP: camera-focus
-{ $values
-    
-     { "point" "position" }
-}
-{ $description "return the point the camera looks at" } ;
-
-HELP: camera-up
-{ $values
-    
-     { "dirvec" "upside direction" }
-}
-{ $description "In order to precise the roling position of camera give an upward vector" } ;
-
-HELP: do-look-at
-{ $values
-     { "camera" "direction" }
-}
-{ $description "Word to use in replacement of gl-look-at when using a camera" } ;
-
-ARTICLE: "4DNav.camera" "Camera"
-{ $vocab-link "4DNav.camera" }
-"\n"
-"A camera is defined by:"
-{ $list
-{ "a position (" { $link camera-eye } ")" }
-{ "a focus direction (" { $link camera-focus } ")\n" }
-{ "an attitude information (" { $link camera-up } ")\n" }
-}
-"\nUse " { $link do-look-at } " in opengl statement in placement of gl-look-at"
-"\n\n"
-"A camera is a " { $vocab-link "4DNav.turtle" } " object. Its a special vocab to handle mouvements of a 3D object:"
-{ $list
-{ "To define a camera"
-{
-    $unchecked-example
-    
-"VAR: my-camera"
-": init-my-camera ( -- )"
-"    <turtle> >my-camera"
-"    [ my-camera> >self"
-"      reset-turtle "
-"    ] with-scope ;"
-} }
-{ "To move it"
-{
-    $unchecked-example
-
-"    [ my-camera> >self"
-"      45 pitch-up "
-"      5 step-turtle" 
-"    ] with-scope "
-} }
-{ "or"
-{
-    $unchecked-example
-
-"    [ my-camera> >self"
-"      5 strafe-left"
-"    ] with-scope "
-}
-}
-{
-"to use it in an opengl statement"
-{
-    $unchecked-example
-  "my-camera> do-look-at"
-
-}
-}
-}
-
-
-;
-
-ABOUT: "4DNav.camera"
diff --git a/unmaintained/4DNav/camera/camera.factor b/unmaintained/4DNav/camera/camera.factor
deleted file mode 100755
index 1e492fe8d9..0000000000
--- a/unmaintained/4DNav/camera/camera.factor
+++ /dev/null
@@ -1,19 +0,0 @@
-USING: kernel namespaces math.vectors opengl 4DNav.turtle 
-self ;
-
-IN: 4DNav.camera
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: camera-eye ( -- point ) turtle-pos> ;
-
-: camera-focus ( -- point ) 
-    [ 1 step-turtle turtle-pos> ] save-self ;
-
-: camera-up ( -- dirvec )
-[ 90 pitch-up turtle-pos> 1 step-turtle turtle-pos> swap v- ] 
-    save-self ;
-
-: do-look-at ( camera -- )
-[ >self camera-eye camera-focus camera-up gl-look-at ] 
-    with-scope ;
diff --git a/unmaintained/4DNav/deep/deep-docs.factor b/unmaintained/4DNav/deep/deep-docs.factor
deleted file mode 100755
index 78439c6c0f..0000000000
--- a/unmaintained/4DNav/deep/deep-docs.factor
+++ /dev/null
@@ -1,31 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel quotations sequences ;
-IN: 4DNav.deep
-
-! HELP: deep-cleave-quots
-! { $values
-!     { "seq" sequence }
-!     { "quot" quotation }
-! }
-! { $description "A word to build a soquence from a sequence of quotation" }
-! 
-! { $examples
-! "It is useful to build matrix"
-! { $example "USING: math math.trig ; "
-!     " 30 deg>rad "
-!    "  {  { [ cos ] [ sin neg ]   0 } "
-!    "     { [ sin ] [ cos ]       0 } "
-!    "     {   0       0           1 } "
-!    "  } deep-cleave-quots " 
-!     " "
-! 
-! 
-! } }
-! ;
-
-ARTICLE: "4DNav.deep" "Deep"
-{ $vocab-link "4DNav.deep" }
-;
-
-ABOUT: "4DNav.deep"
diff --git a/unmaintained/4DNav/deep/deep.factor b/unmaintained/4DNav/deep/deep.factor
deleted file mode 100755
index b18000a84c..0000000000
--- a/unmaintained/4DNav/deep/deep.factor
+++ /dev/null
@@ -1,13 +0,0 @@
-USING: macros quotations math math.functions math.trig 
-sequences.deep kernel make fry combinators grouping ;
-IN: 4DNav.deep
-
-! USING: bake ;
-! MACRO: deep-cleave-quots ( seq -- quot )
-!    [ [ quotation? ] deep-filter ]
-!    [ [ dup quotation? [ drop , ] when ] deep-map ]
-!    bi '[ _ cleave _ bake ] ;
-
-: make-matrix ( quot width -- matrix ) 
-    [ { } make ] dip group ; inline
-
diff --git a/unmaintained/4DNav/deploy.factor b/unmaintained/4DNav/deploy.factor
deleted file mode 100755
index e39f91acf6..0000000000
--- a/unmaintained/4DNav/deploy.factor
+++ /dev/null
@@ -1,15 +0,0 @@
-USING: tools.deploy.config ;
-H{
-    { deploy-c-types? t }
-    { deploy-word-props? t }
-    { deploy-name "4DNav" }
-    { deploy-ui? t }
-    { deploy-math? t }
-    { deploy-threads? t }
-    { deploy-reflection 3 }
-    { deploy-compiler? t }
-    { deploy-unicode? t }
-    { deploy-io 3 }
-    { "stop-after-last-window?" t }
-    { deploy-word-defs? t }
-}
diff --git a/unmaintained/4DNav/file-chooser/authors.txt b/unmaintained/4DNav/file-chooser/authors.txt
deleted file mode 100755
index a6a96933f4..0000000000
--- a/unmaintained/4DNav/file-chooser/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/file-chooser/file-chooser.factor b/unmaintained/4DNav/file-chooser/file-chooser.factor
deleted file mode 100755
index d7c869ce2f..0000000000
--- a/unmaintained/4DNav/file-chooser/file-chooser.factor
+++ /dev/null
@@ -1,157 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING:
-kernel
-io.files
-io.backend
-io.directories
-io.files.info
-io.pathnames
-sequences
-models
-strings
-ui
-ui.operations
-ui.commands
-ui.gestures
-ui.gadgets
-ui.gadgets.buttons
-ui.gadgets.lists
-ui.gadgets.labels
-ui.gadgets.tracks
-ui.gadgets.packs
-ui.gadgets.panes
-ui.gadgets.scrollers
-prettyprint
-combinators
-rewrite-closures
-accessors
-values
-tools.walker
-fry
-;
-IN: 4DNav.file-chooser
-
-TUPLE: file-chooser < track 
-    path
-    extension 
-    selected-file
-    presenter
-    hook  
-    list
-    ;
-
-: find-file-list ( gadget -- list )
-    [ file-chooser? ] find-parent list>> ;
-
-file-chooser H{
-    { T{ key-down f f "UP" } 
-        [ find-file-list select-previous ] }
-    { T{ key-down f f "DOWN" } 
-        [ find-file-list select-next ] }
-    { T{ key-down f f "PAGE_UP" } 
-        [ find-file-list list-page-up ] }
-    { T{ key-down f f "PAGE_DOWN" } 
-        [ find-file-list list-page-down ] }
-    { T{ key-down f f "RET" } 
-        [ find-file-list invoke-value-action ] }
-    { T{ button-down } 
-        request-focus }
-    { T{ button-down f 1 } 
-        [ find-file-list invoke-value-action ]  }
-} set-gestures
-
-: list-of-files ( file-chooser -- seq )
-     [ path>> value>> directory-entries ] [ extension>> ] bi
-     '[ [ name>> _ [ tail? ] with any? ] 
-     [ directory? ] bi or ]  filter
-;
-
-: update-filelist-model ( file-chooser -- file-chooser )
-    [ list-of-files ] [ model>> ] bi set-model ;
-
-: init-filelist-model ( file-chooser -- file-chooser )
-    dup list-of-files <model> >>model ; 
-
-: (fc-go) ( file-chooser quot -- )
-    [ [ file-chooser? ] find-parent dup path>> ] dip
-    call
-    normalize-path swap set-model
-    update-filelist-model
-    drop ;
-
-: fc-go-parent ( file-chooser -- )
-    [ dup value>> parent-directory ] (fc-go) ;
-
-: fc-go-home ( file-chooser -- )
-    [ home ] (fc-go) ;
-
-: fc-change-directory ( file-chooser file -- file-chooser )
-    dupd [ path>> value>> normalize-path ] [ name>> ] bi* 
-    append-path over path>> set-model    
-    update-filelist-model
-;
-
-: fc-load-file ( file-chooser file -- )
-  dupd [ selected-file>> ] [ name>> ] bi* swap set-model 
-  [ path>> value>> ] 
-  [ selected-file>> value>> append ] 
-  [ hook>> ] tri
-  call
-; inline
-
-! : fc-ok-action ( file-chooser -- quot )
-!  dup selected-file>> value>>  "" =
-!    [ drop [ drop ] ] [    
-!            [ path>> value>> ] 
-!            [ selected-file>> value>> append ] 
-!            [ hook>> prefix ] tri
-!        [ drop ] prepend
-!    ]  if ; 
-
-: line-selected-action ( file-chooser -- )
-     dup list>> list-value
-     dup directory? 
-     [ fc-change-directory ] [ fc-load-file ] if ;
-
-: present-dir-element ( element -- string )
-    [ name>> ] [ directory? ] bi   [ "-> " prepend ] when ;
-
-: <file-list> ( file-chooser -- list )
-  dup [ nip line-selected-action ] curry 
-  [ present-dir-element ] rot model>> <list> ;
-
-: <file-chooser> ( hook path extension -- gadget )
-    { 0 1 } file-chooser new-track
-    swap >>extension
-    swap <model> >>path
-    "" <model> >>selected-file
-    swap >>hook
-    init-filelist-model
-    dup <file-list> >>list
-    "choose a file in directory " <label> f track-add
-    dup path>> <label-control> f track-add
-    dup extension>> ", " join "limited to : " prepend 
-        <label> f track-add
-    <shelf> 
-        "selected file : " <label> add-gadget
-        over selected-file>> <label-control> add-gadget
-    f track-add
-    <shelf> 
-        over [  swap fc-go-parent ] curry  "go up" 
-            swap <bevel-button> add-gadget
-        over [  swap fc-go-home ] curry  "go home" 
-            swap <bevel-button> add-gadget
-    !    over [ swap fc-ok-action ] curry "OK" 
-    !    swap <bevel-button> add-gadget
-    !    [ drop ]  "Cancel" swap <bevel-button> add-gadget
-    f track-add
-    dup list>> <scroller> 1 track-add
-;
-
-M: file-chooser pref-dim* drop { 400 200 } ;
-
-: file-chooser-window ( -- )
-    [ . ] home { "xml" "txt" }   <file-chooser> 
-    "Choose a file" open-window ;
-
diff --git a/unmaintained/4DNav/hypercube.xml b/unmaintained/4DNav/hypercube.xml
deleted file mode 100755
index 0d46e3b315..0000000000
--- a/unmaintained/4DNav/hypercube.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<model>
-<space>
-	<name>hypercube</name>
-	<dimension>4</dimension>
-	<solid>
-		<name>4cube1</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,100</face>
-		<face>-1,0,0,0,-150</face>
-		<face>0,1,0,0,100</face>
-		<face>0,-1,0,0,-150</face>
-		<face>0,0,1,0,100</face>
-		<face>0,0,-1,0,-150</face>
-		<face>0,0,0,1,100</face>
-		<face>0,0,0,-1,-150</face>
-		<color>1,0,0</color>
-	</solid>
-	<solid>
-		<name>4cube1</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,100</face>
-		<face>-1,0,0,0,-150</face>
-		<face>0,1,0,0,100</face>
-		<face>0,-1,0,0,-150</face>
-		<face>0,0,1,0,100</face>
-		<face>0,0,-1,0,-150</face>
-		<face>0,0,0,1,100</face>
-		<face>0,0,0,-1,-150</face>
-		<color>1,0,0</color>
-	</solid>
-	<light>
-		<direction>1,1,1,1</direction>
-		<color>0.2,0.2,0.6</color>
-	</light>
-	<color>0.8,0.9,0.9</color>
-</space>
-</model>
diff --git a/unmaintained/4DNav/light_test.xml b/unmaintained/4DNav/light_test.xml
deleted file mode 100755
index b7d750ddaa..0000000000
--- a/unmaintained/4DNav/light_test.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<model>
-<space>
-	<name>multi solids</name>
-	<dimension>4</dimension>
-	<solid>
-		<name>4cube1</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,100</face>
-		<face>-1,0,0,0,-150</face>
-		<face>0,1,0,0,100</face>
-		<face>0,-1,0,0,-150</face>
-		<face>0,0,1,0,100</face>
-		<face>0,0,-1,0,-150</face>
-		<face>0,0,0,1,100</face>
-		<face>0,0,0,-1,-150</face>
-		<color>1,1,1</color>
-	</solid>
-	<solid>
-		<name>4triancube</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,160</face>
-        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
-		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
-		<face>0,0,1,0,140</face>
-		<face>0,0,-1,0,-180</face>
-		<face>0,0,0,1,110</face>
-		<face>0,0,0,-1,-180</face>
-		<color>1,1,1</color>
-	</solid>
-	<solid>
-		<name>triangone</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,60</face>
-		<face>0.5,0.8660254037844386,0,0,60</face>
-		<face>-0.5,0.8660254037844387,0,0,-20</face>
-		<face>-1.0,0,0,0,-100</face>
-		<face>-0.5,-0.8660254037844384,0,0,-100</face>
-		<face>0.5,-0.8660254037844387,0,0,-20</face>
-		<face>0,0,1,0,120</face>
-        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
-		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
-		<color>1,1,1</color>
-	</solid>
-	<light>
-		<direction>1,0,0,0</direction>
-		<color>0,0,0,0.6</color>
-	</light>
-	<light>
-		<direction>0,1,0,0</direction>
-		<color>0,0.6,0,0</color>
-	</light>
-	<light>
-		<direction>0,0,1,0</direction>
-		<color>0,0,0.6,0</color>
-	</light>
-	<light>
-		<direction>0,0,0,1</direction>
-		<color>0.6,0.6,0.6</color>
-	</light>
-	<color>0.99,0.99,0.99</color>
-</space>
-</model>
diff --git a/unmaintained/4DNav/multi solids.xml b/unmaintained/4DNav/multi solids.xml
deleted file mode 100755
index b401e988b9..0000000000
--- a/unmaintained/4DNav/multi solids.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<model>
-<space>
-	<name>multi solids</name>
-	<dimension>4</dimension>
-	<solid>
-		<name>4cube1</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,100</face>
-		<face>-1,0,0,0,-150</face>
-		<face>0,1,0,0,100</face>
-		<face>0,-1,0,0,-150</face>
-		<face>0,0,1,0,100</face>
-		<face>0,0,-1,0,-150</face>
-		<face>0,0,0,1,100</face>
-		<face>0,0,0,-1,-150</face>
-		<color>1,0,0</color>
-	</solid>
-	<solid>
-		<name>4triancube</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,160</face>
-        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
-		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
-		<face>0,0,1,0,140</face>
-		<face>0,0,-1,0,-180</face>
-		<face>0,0,0,1,110</face>
-		<face>0,0,0,-1,-180</face>
-		<color>0,1,0</color>
-	</solid>
-	<solid>
-		<name>triangone</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,60</face>
-		<face>0.5,0.8660254037844386,0,0,60</face>
-		<face>-0.5,0.8660254037844387,0,0,-20</face>
-		<face>-1.0,0,0,0,-100</face>
-		<face>-0.5,-0.8660254037844384,0,0,-100</face>
-		<face>0.5,-0.8660254037844387,0,0,-20</face>
-		<face>0,0,1,0,120</face>
-        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
-		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
-		<color>0,1,1</color>
-	</solid>
-	<light>
-		<direction>1,1,1,1</direction>
-		<color>0.2,0.2,0.6</color>
-	</light>
-	<color>0.8,0.9,0.9</color>
-</space>
-</model>
diff --git a/unmaintained/4DNav/prismetriagone.xml b/unmaintained/4DNav/prismetriagone.xml
deleted file mode 100755
index cbdc071f97..0000000000
--- a/unmaintained/4DNav/prismetriagone.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<model>
-<space>
-	<name>Prismetragone</name>		
-	<dimension>4</dimension>
-	<solid>
-		<name>triangone</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,60</face>
-		<face>0.5,0.8660254037844386,0,0,60</face>
-		<face>-0.5,0.8660254037844387,0,0,-20</face>
-		<face>-1.0,0,0,0,-100</face>
-		<face>-0.5,-0.8660254037844384,0,0,-100</face>
-		<face>0.5,-0.8660254037844387,0,0,-20</face>
-		<face>0,0,1,0,120</face>
-        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
-		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
-		<color>0,1,1</color>
-	</solid>
-	<light>
-		<direction>1,1,1,1</direction>
-		<color>0.2,0.2,0.6</color>
-	</light>
-	<color>0.8,0.9,0.9</color>
-</space>
-</model>
diff --git a/unmaintained/4DNav/space-file-decoder/authors.txt b/unmaintained/4DNav/space-file-decoder/authors.txt
deleted file mode 100755
index a6a96933f4..0000000000
--- a/unmaintained/4DNav/space-file-decoder/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor b/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
deleted file mode 100755
index 0a7816636f..0000000000
--- a/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
+++ /dev/null
@@ -1,20 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel ;
-IN: 4DNav.space-file-decoder
-
-
-
-HELP: read-model-file
-{ $values
-    
-     { "path" "path to the file to read" }
-     { "x" "value" }
-}
-{ $description "Read a file containing the xml description of the model" } ;
-
-ARTICLE: "4DNav.space-file-decoder" "Space XMLfile decoder"
-{ $vocab-link "4DNav.space-file-decoder" }
-;
-
-ABOUT: "4DNav.space-file-decoder"
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor b/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
deleted file mode 100755
index 872ddbcee3..0000000000
--- a/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
+++ /dev/null
@@ -1,66 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: adsoda xml xml.utilities xml.dispatch accessors 
-combinators sequences math.parser kernel splitting values 
-continuations ;
-IN: 4DNav.space-file-decoder
-
-: decode-number-array ( x -- y )  
-    "," split [ string>number ] map ;
-
-PROCESS: adsoda-read-model ( tag -- )
-
-TAG: dimension adsoda-read-model 
-    children>> first string>number ;
-TAG: direction adsoda-read-model 
-    children>> first decode-number-array ;
-TAG: color     adsoda-read-model 
-    children>> first decode-number-array ;
-TAG: name      adsoda-read-model 
-    children>> first ;
-TAG: face      adsoda-read-model 
-    children>> first decode-number-array ;
-
-TAG: solid adsoda-read-model 
-    <solid> swap  
-    { 
-        [ "dimension" tag-named adsoda-read-model >>dimension ]
-        [ "name"      tag-named adsoda-read-model >>name ] 
-        [ "color"     tag-named adsoda-read-model >>color ] 
-        [ "face"      
-            tags-named [ adsoda-read-model cut-solid ] each ] 
-    } cleave
-    ensure-adjacencies
-;
-
-TAG: light adsoda-read-model 
-   <light> swap  
-    { 
-        [ "direction" tag-named adsoda-read-model >>direction ]
-        [ "color"     tag-named adsoda-read-model >>color ] 
-    } cleave
-;
-
-TAG: space adsoda-read-model 
-    <space> swap  
-    { 
-        [ "dimension" tag-named adsoda-read-model >>dimension ]
-        [ "name"      tag-named adsoda-read-model >>name ] 
-        [ "color"     tag-named 
-            adsoda-read-model >>ambient-color ] 
-        [ "solid"     tags-named 
-            [ adsoda-read-model suffix-solids ] each ] 
-        [ "light"     tags-named 
-            [ adsoda-read-model suffix-lights ] each ]
-    } cleave
-;
-
-: read-model-file ( path -- x )
-  dup
-  [
-    [ file>xml "space" tags-named first adsoda-read-model ] 
-    [ drop <space> ] recover 
-  ] [  drop <space> ] if 
-
-;
-
diff --git a/unmaintained/4DNav/summary.txt b/unmaintained/4DNav/summary.txt
deleted file mode 100755
index 5b5a452cde..0000000000
--- a/unmaintained/4DNav/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-4DNav : simmple tool to navigate thru a 4D space view as projections on 4 3D spaces.
\ No newline at end of file
diff --git a/unmaintained/4DNav/tags.txt b/unmaintained/4DNav/tags.txt
deleted file mode 100755
index 0c63a72fc9..0000000000
--- a/unmaintained/4DNav/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-4D viewer
\ No newline at end of file
diff --git a/unmaintained/4DNav/triancube.xml b/unmaintained/4DNav/triancube.xml
deleted file mode 100755
index 8551bed24c..0000000000
--- a/unmaintained/4DNav/triancube.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<model>
-<space>
-	<name>triancube</name>		
-	<dimension>4</dimension>
-	<solid>
-		<name>triancube</name>
-		<dimension>4</dimension>
-		<face>1,0,0,0,160</face>
-        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
-		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
-		<face>0,0,1,0,140</face>
-		<face>0,0,-1,0,-180</face>
-		<face>0,0,0,1,110</face>
-		<face>0,0,0,-1,-180</face>
-		<color>0,1,0</color>
-	</solid>
-	<light>
-		<direction>1,1,1,1</direction>
-		<color>0.2,0.2,0.6</color>
-	</light>
-	<color>0.8,0.9,0.9</color>
-</space>
-</model>
diff --git a/unmaintained/4DNav/turtle/authors.txt b/unmaintained/4DNav/turtle/authors.txt
deleted file mode 100755
index 6cfd5da273..0000000000
--- a/unmaintained/4DNav/turtle/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Eduardo Cavazos
diff --git a/unmaintained/4DNav/turtle/turtle-docs.factor b/unmaintained/4DNav/turtle/turtle-docs.factor
deleted file mode 100755
index b94ed99673..0000000000
--- a/unmaintained/4DNav/turtle/turtle-docs.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: arrays help.markup help.syntax kernel sequences ;
-IN: 4DNav.turtle
-
-
-ARTICLE: "4DNav.turtle" "Turtle"
-{ $vocab-link "4DNav.turtle" }
-;
-
-ABOUT: "4DNav.turtle"
diff --git a/unmaintained/4DNav/turtle/turtle.factor b/unmaintained/4DNav/turtle/turtle.factor
deleted file mode 100755
index 62c25c4344..0000000000
--- a/unmaintained/4DNav/turtle/turtle.factor
+++ /dev/null
@@ -1,154 +0,0 @@
-USING: kernel math arrays math.vectors math.matrices
-namespaces make
-math.constants math.functions
-math.vectors
-splitting grouping self math.trig
-  sequences accessors 4DNav.deep models ;
-IN: 4DNav.turtle
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-TUPLE: turtle pos ori ;
-
-: <turtle> ( -- turtle )
-    turtle new
-    { 0 0 0 } clone >>pos
-    3 identity-matrix >>ori
-;
-
-
-TUPLE: observer < turtle projection-mode collision-mode ;
-
-: <observer> ( -- object ) 
-     observer new
-    0 <model> >>projection-mode 
-    f <model> >>collision-mode
-    ;
-
-
-: turtle-pos> ( -- val ) self> pos>> ;
-: >turtle-pos ( val -- ) self> (>>pos) ;
-
-: turtle-ori> ( -- val ) self> ori>> ;
-: >turtle-ori ( val -- ) self> (>>ori) ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! These rotation matrices are from
-! `Computer Graphics: Principles and Practice'
-
-
-! waiting for deep-cleave-quots  
-
-! : Rz ( angle -- Rx ) deg>rad
-!    {   { [ cos ] [ sin neg ]   0 }
-!        { [ sin ] [ cos ]      0  }
-!        {   0       0           1 } 
-!    } deep-cleave-quots  ;
-
-! : Ry ( angle -- Ry ) deg>rad
-!    {   { [ cos ]      0 [ sin ] }
-!        {   0          1 0       }
-!        { [  sin neg ] 0 [ cos ] }
-!    } deep-cleave-quots  ;
-  
-! : Rx ( angle -- Rz ) deg>rad
-!   {   { 1     0        0        }
-!        { 0   [ cos ] [ sin neg ] }
-!        { 0   [ sin ] [ cos ]     }
-!    } deep-cleave-quots ;
-
-: Rz ( angle -- Rx ) deg>rad
-[ dup cos ,     dup sin neg ,   0 ,
-  dup sin ,     dup cos ,       0 ,
-  0 ,           0 ,             1 , ] 3 make-matrix nip ;
-
-: Ry ( angle -- Ry ) deg>rad
-[ dup cos ,     0 ,             dup sin ,
-  0 ,           1 ,             0 ,
-  dup sin neg , 0 ,             dup cos , ] 3 make-matrix nip ;
-
-: Rx ( angle -- Rz ) deg>rad
-[ 1 ,           0 ,             0 ,
-  0 ,           dup cos ,       dup sin neg ,
-  0 ,           dup sin ,       dup cos , ] 3 make-matrix nip ;
-
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: apply-rotation ( rotation -- ) 
-    turtle-ori> swap m. >turtle-ori ;
-: rotate-x ( angle -- ) Rx apply-rotation ;
-: rotate-y ( angle -- ) Ry apply-rotation ;
-: rotate-z ( angle -- ) Rz apply-rotation ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: pitch-up   ( angle -- ) neg rotate-x ;
-: pitch-down ( angle -- )     rotate-x ;
-
-: turn-left ( angle -- )      rotate-y ;
-: turn-right ( angle -- ) neg rotate-y ;
-
-: roll-left  ( angle -- ) neg rotate-z ;
-: roll-right ( angle -- )     rotate-z ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! roll-until-horizontal
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: V ( -- V ) { 0 1 0 } ;
-
-: X ( -- 3array ) turtle-ori> [ first  ] map ;
-: Y ( -- 3array ) turtle-ori> [ second ] map ;
-: Z ( -- 3array ) turtle-ori> [ third  ] map ;
-
-: set-X ( seq -- ) turtle-ori> [ set-first ] 2each ;
-: set-Y ( seq -- ) turtle-ori> [ set-second ] 2each ;
-: set-Z ( seq -- ) turtle-ori> [ set-third ] 2each ;
-
-: roll-until-horizontal ( -- )
-    V Z cross normalize set-X
-    Z X cross normalize set-Y ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: distance ( turtle turtle -- n ) 
-    pos>> swap pos>> v- [ sq ] map sum sqrt ;
-
-: move-by ( point -- ) turtle-pos> v+ >turtle-pos ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: reset-turtle ( -- ) 
-    { 0 0 0 } clone >turtle-pos 3 identity-matrix >turtle-ori ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: step-vector ( length -- array ) { 0 0 1 } n*v ;
-
-: step-turtle ( length -- ) 
-    step-vector turtle-ori> swap m.v 
-    turtle-pos> v+ >turtle-pos ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: strafe-up ( length -- )
-    90 pitch-up
-    step-turtle
-    90 pitch-down ;
-
-: strafe-down ( length -- )
-    90 pitch-down
-    step-turtle
-    90 pitch-up ;
-
-: strafe-left ( length -- )
-    90 turn-left
-    step-turtle
-    90 turn-right ;
-
-: strafe-right ( length -- )
-    90 turn-right
-    step-turtle
-    90 turn-left ;
diff --git a/unmaintained/4DNav/window3D/authors.txt b/unmaintained/4DNav/window3D/authors.txt
deleted file mode 100755
index a6a96933f4..0000000000
--- a/unmaintained/4DNav/window3D/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/window3D/window3D-docs.factor b/unmaintained/4DNav/window3D/window3D-docs.factor
deleted file mode 100755
index a534d2e9ec..0000000000
--- a/unmaintained/4DNav/window3D/window3D-docs.factor
+++ /dev/null
@@ -1,12 +0,0 @@
-! Copyright (C) 2008 Jean-François Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel ;
-IN: 4DNav.window3D
-
-
-
-ARTICLE: "4DNav.window3D" "Window3D"
-{ $vocab-link "4DNav.window3D" }
-;
-
-ABOUT: "4DNav.window3D"
diff --git a/unmaintained/4DNav/window3D/window3D.factor b/unmaintained/4DNav/window3D/window3D.factor
deleted file mode 100755
index a5ca5f2a9a..0000000000
--- a/unmaintained/4DNav/window3D/window3D.factor
+++ /dev/null
@@ -1,83 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel 
-ui.gadgets
-ui.render
-opengl
-opengl.gl
-opengl.glu
-4DNav.camera
-4DNav.turtle
-math
-values
-alien.c-types
-accessors
-namespaces
-adsoda 
-models
-accessors
-prettyprint
-;
-
-IN: 4DNav.window3D
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! drawing functions 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-TUPLE: window3D  < gadget observer ; 
-
-: <window3D>  ( model observer -- gadget )
-    window3D  new-gadget 
-    swap 2dup 
-    projection-mode>> add-connection
-    2dup 
-    collision-mode>> add-connection
-    >>observer 
-    swap <model> >>model 
-    t >>root?
-;
-
-M: window3D pref-dim* ( gadget -- dim )  drop { 300 300 } ;
-
-M: window3D draw-gadget* ( gadget -- )
-
-    GL_PROJECTION glMatrixMode
-        glLoadIdentity
-        0.6 0.6 0.6 .9 glClearColor
-        dup observer>> projection-mode>> value>> 1 =    
-        [ 60.0 1.0 0.1 3000.0 gluPerspective ]
-        [ -400.0 400.0 -400.0 400.0 0.0 4000.0 glOrtho ] if
-        dup observer>> collision-mode>> value>> 
-        \ remove-hidden-solids?   
-        set-value
-        dup  observer>> do-look-at
-        GL_MODELVIEW glMatrixMode
-            glLoadIdentity  
-            0.9 0.9 0.9 1.0 glClearColor
-            1.0 glClearDepth
-            GL_LINE_SMOOTH glEnable
-            GL_BLEND glEnable
-            GL_DEPTH_TEST glEnable       
-            GL_LEQUAL glDepthFunc
-            GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc
-            GL_LINE_SMOOTH_HINT GL_NICEST glHint
-            1.25 glLineWidth
-            GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor 
-                glClear
-            glLoadIdentity
-            GL_LIGHTING glEnable
-            GL_LIGHT0 glEnable
-            GL_COLOR_MATERIAL glEnable
-            GL_FRONT GL_AMBIENT_AND_DIFFUSE glColorMaterial
-            ! *************************
-            
-            model>> value>> 
-            [ space->GL ] when*
-
-            ! *************************
-;
-
-M: window3D graft* drop ;
-
-M: window3D model-changed nip relayout ; 
diff --git a/unmaintained/adsoda/adsoda-docs.factor b/unmaintained/adsoda/adsoda-docs.factor
deleted file mode 100755
index 9ab874d370..0000000000
--- a/unmaintained/adsoda/adsoda-docs.factor
+++ /dev/null
@@ -1,299 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax ;
-
-IN: adsoda
-
-
-
-! --------------------------------------------------------------
-! faces
-! --------------------------------------------------------------
-ARTICLE: "face-page" "Face in ADSODA"
-"explanation of faces"
-$nl
-"link to functions"
-"what is an halfspace"
-"halfspace touching-corners adjacent-faces"
-"touching-corners list of pointers to the corners which touch this face\n"
-
-"adjacent-faces list of pointers to the faces which touch this face\n"
-{ $subsection face }
-{ $subsection <face> }
-"test relative position"
-{ $subsection point-inside-or-on-face? } 
-{ $subsection point-inside-face? }
-"handling face"
-{ $subsection flip-face }
-{ $subsection face-translate  }
-{ $subsection  face-transform }
-
-;
-
-HELP: face
-{ $class-description "a face is defined by"
-{ $list "halfspace equation" }
-{ $list "list of touching corners" }
-{ $list "list of adjacent faces" }
-$nl
-"Touching corners and adjacent faces are defined by algorithm thanks to other faces of the solid"
-}
-
-
-;
-HELP: <face> 
-{ $values { "v" "an halfspace equation" } { "tuple" "a face" }  }   ;
-HELP: flip-face 
-{ $values { "face" "a face" } { "face" "flipped face" } }
-{ $description "change the orientation of a face" }
-;
-
-HELP: face-translate 
-{ $values { "face" "a face" } { "v" "a vector" } }
-{ $description 
-"translate a face following a vector"
-$nl
-"a translation of an halfspace doesn't change the normal vector. this word just compute the new constant term" }
-
- 
- ;
-HELP: face-transform 
-{ $values { "face" "a face" } { "m" "a transformation matrix" } }
-{ $description  "compute the transformation of a face using a transformation matrix" }
- 
- ;
-! --------------------------------
-! solid
-! --------------------------------------------------------------
-ARTICLE: "solid-page" "Solid in ADSODA"
-"explanation of solids"
-$nl
-"link to functions"
-{ $subsection solid }
-{ $subsection <solid> }
-"test relative position"
-{ $subsection point-inside-solid? }
-{ $subsection point-inside-or-on-solid? }
-"playing with faces and solids"
-{ $subsection add-face }
-{ $subsection cut-solid }
-{ $subsection slice-solid }
-"solid handling"
-{ $subsection solid-project }
-{ $subsection solid-translate }
-{ $subsection solid-transform }
-{ $subsection subtract }
-
-{ $subsection get-silhouette  }
-
-{ $subsection  solid= }
-
-
-;
-
-HELP: solid 
-{ $class-description "dimension" $nl "silhouettes" $nl "faces" $nl "corners" $nl "adjacencies-valid" $nl "color" $nl "name" 
-}
-;
-
-HELP: add-face 
-{ $values { "solid" "a solid" } { "face" "a face" } }
-{ $description "reshape a solid with a face. The face truncate the solid." } ;
-
-HELP: cut-solid
-{ $values { "solid" "a solid" } { "halfspace" "an halfspace" } }
-{ $description "like add-face but just with halfspace equation" } ;
-
-HELP: slice-solid
-{ $values { "solid" "a solid" } { "face" "a face" } { "solid1" "the outer part of the former solid" } { "solid2" "the inner part of the former solid" } }
-{ $description "cut a solid into two parts. The face acts like a knife"
-}  ;
-
-
-HELP: solid-project
-{ $values { "lights" "lights" } { "ambient" "ambient" } { "solid" "solid" } { "solids" "projection of solid" } }
-{ $description "Project the solid using pv vector" 
-$nl
-"TODO: explain how to use lights"
-} ;
-
-HELP: solid-translate 
-{ $values { "solid" "a solid" } { "v" "translating vector" } }
-{ $description "Translate a solid using a vector" 
-$nl
-"v and solid must have the same dimension "
-} ;
-
-HELP: solid-transform 
-{ $values { "solid" "a solid" } { "m" "transformation matrix" } }
-{ $description "Transform a solid using a matrix"
-$nl
-"v and solid must have the same dimension "
-} ;
-
-HELP: subtract 
-{ $values { "solid1" "initial shape" } { "solid2" "shape to remove" } { "solids" "resulting shape" } }
-{ $description  "Substract solid2 from solid1" } ;
-
-
-! --------------------------------------------------------------
-! space 
-! --------------------------------------------------------------
-ARTICLE: "space-page" "Space in ADSODA"
-"A space is a collection of solids and lights."
-$nl
-"link to functions"
-$nl
-"Defining words"
-{ $subsection space }
-{ $subsection <space> } 
-{ $subsection suffix-solids  }
-{ $subsection suffix-lights }
-{ $subsection clear-space-solids  }
-{ $subsection describe-space }
-
-
-"Handling space"
-{ $subsection space-ensure-solids }
-{ $subsection eliminate-empty-solids  }
-{ $subsection space-transform }
-{ $subsection space-translate }
-{ $subsection remove-hidden-solids }
-{ $subsection space-project }
-
-
-;
-
-HELP: space 
-{ $class-description 
-"dimension" $nl " solids" $nl " ambient-color" $nl "lights" 
-}
-;
-
-HELP: suffix-solids 
-"( space solid -- space )"
-{ $values { "space" "a space" } { "solid" "a solid to add" } }
-{ $description "Add solid to space definition" } ;
-
-HELP: suffix-lights 
-"( space light -- space ) "
-{ $values { "space" "a space" } { "light" "a light to add" } }
-{ $description "Add a light to space definition" } ;
-
-HELP: clear-space-solids 
-"( space -- space )"   
-{ $values { "space" "a space" } }
-{ $description "remove all solids in space" } ;
-
-HELP: space-ensure-solids 
-{ $values { "space" "a space" } }
-{ $description "rebuild corners of all solids in space" } ;
-
-
-
-HELP: space-transform 
-" ( space m -- space )" 
-{ $values { "space" "a space" } { "m" "a matrix" } }
-{ $description "Transform a space using a matrix" } ;
-
-HELP: space-translate 
-{ $values { "space" "a space" } { "v" "a vector" } }
-{ $description "Translate a space following a vector" } ;
-
-HELP: describe-space " ( space -- )"
-{ $values { "space" "a space" } }
-{ $description "return a description of space" } ;
-
-HELP: space-project 
-{ $values { "space" "a space" } { "i" "an integer" } }
-{ $description "Project a space along ith coordinate" } ;
-
-! --------------------------------------------------------------
-! 3D rendering
-! --------------------------------------------------------------
-ARTICLE: "3D-rendering-page" "The 3D rendering in ADSODA"
-"explanation of 3D rendering"
-$nl
-"link to functions"
-{ $subsection face->GL }
-{ $subsection solid->GL }
-{ $subsection space->GL }
-
-;
-
-HELP: face->GL 
-{ $values { "face" "a face" } { "color" "3 3 values array" } }
-{ $description "display a face" } ;
-
-HELP: solid->GL 
-{ $values { "solid" "a solid" } }
-{ $description "display a solid" } ;
-
-HELP: space->GL 
-{ $values { "space" "a space" } }
-{ $description "display a space" } ;
-
-! --------------------------------------------------------------
-! light
-! --------------------------------------------------------------
-
-ARTICLE: "light-page" "Light in ADSODA"
-"explanation of light"
-$nl
-"link to functions"
-;
-
-ARTICLE: { "adsoda" "light" } "ADSODA : lights"
-"! HELP: light position color" 
-"! <light> ( -- tuple ) light new ;"
-
-"! light est un vecteur avec 3 variables pour les couleurs\n"
-
-" void Light::Apply(Vector& normal, double &cRed, double &cGreen, double &cBlue)\n"
-" { \n"
-"   // Dot the light direction with the normalized normal of Face."
-"   register double intensity = -(normal * (*this));"
-
-"   // Face is a backface, from light's perspective"
-"   if (intensity < 0)"
-"     return;"
-"   "
-"   // Add the intensity componentwise"
-"   cRed += red * intensity;"
-"   cGreen += green * intensity;"
-"   cBlue += blue * intensity;"
-
-"   // Clip to unit range"
-"  if (cRed > 1.0) cRed = 1.0;"
-"   if (cGreen > 1.0) cGreen = 1.0;"
-"   if (cBlue > 1.0) cBlue = 1.0;"
-
-
-;
-
-
-
-ARTICLE: { "adsoda" "halfspace" } "ADSODA : halfspace"
-" defined by the concatenation of the normal vector and a constant"  
- ;
-
-
-
-ARTICLE:  "adsoda-main-page"  "ADSODA : Arbitrary-Dimensional Solid Object Display Algorithm"
-"multidimensional handler :" 
-$nl
-"design a solid using face delimitations. Only works on convex shapes"
-$nl
-{ $emphasis "written in C++ by Greg Ferrar" }
-$nl
-"full explanation on adsoda page at " { $url "http://www.flowerfire.com/ADSODA/" }
-$nl
-"Useful words are describe on the following pages: "
-{ $subsection "face-page" }
-{ $subsection "solid-page" }
-{ $subsection "space-page" }
-{ $subsection "light-page" }
-{ $subsection "3D-rendering-page" }
- ;
-
-ABOUT: "adsoda-main-page"
diff --git a/unmaintained/adsoda/adsoda-tests.factor b/unmaintained/adsoda/adsoda-tests.factor
deleted file mode 100755
index f8881dfebb..0000000000
--- a/unmaintained/adsoda/adsoda-tests.factor
+++ /dev/null
@@ -1,310 +0,0 @@
-USING: adsoda
-kernel
-math
-accessors
-sequences
-    adsoda.solution2
-    fry
-    tools.test 
-    arrays ;
-
-IN: adsoda.tests
-
-
-
-: s1 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "s1" >>name
-    { 1 1 1 } >>color
-    { 1 -1 -5 } cut-solid 
-    { -1 -1 -21 } cut-solid 
-    { -1 0 -12 } cut-solid 
-    { 1 2 16 } cut-solid
-;
-: solid1 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "solid1" >>name
-    { 1 -1 -5 } cut-solid 
-    { -1 -1 -21 } cut-solid 
-    { -1 0 -12 } cut-solid 
-    { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-;
-: solid2 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "solid2" >>name
-    { -1 1 -10 } cut-solid 
-    { -1 -1 -28 } cut-solid 
-    { 1 0 13 } cut-solid 
- !   { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-;
-
-: solid3 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid3" >>name
-    { 1 1 1 } >>color
-    { 1 0 16 } cut-solid 
-    { -1 0 -36 } cut-solid 
-    { 0 1 1 } cut-solid 
-    { 0 -1  -17 } cut-solid 
- !   { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-
-;
-
-: solid4 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid4" >>name
-    { 1 1 1 } >>color
-    { 1 0 21 } cut-solid 
-    { -1 0 -36 } cut-solid 
-    { 0 1 1 } cut-solid 
-    { 0 -1  -17 } cut-solid 
-    ensure-adjacencies
-    
-;
-
-: solid5 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid5" >>name
-    { 1 1 1 } >>color
-    { 1 0 6 } cut-solid 
-    { -1 0 -17 } cut-solid 
-    { 0 1 17 } cut-solid 
-    { 0 -1  -19 } cut-solid 
-    ensure-adjacencies
-    
-;
-
-: solid7 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid7" >>name
-    { 1 1 1 } >>color
-    { 1 0 38 } cut-solid 
-    { 1 -5 -66 } cut-solid 
-    { -2 1 -75 } cut-solid
-    ensure-adjacencies
-    
-;
-
-: solid6s ( -- seq )
-  solid3 clone solid2 clone subtract
-;
-
-: space1 ( -- space )
-    <space>
-        2 >>dimension
-     !    solid3 suffix-solids
-        solid1 suffix-solids
-        solid2 suffix-solids
-    !   solid6s [ suffix-solids ] each 
-        solid4 suffix-solids
-     !   solid5 suffix-solids
-        solid7 suffix-solids
-        { 1 1 1 } >>ambient-color
-            <light>
-        { -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-;
-
-: space2 ( -- space )
-    <space>
-        4 >>dimension
-       ! 4cube suffix-solids
-        { 1 1 1 } >>ambient-color
-            <light>
-        { -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-
-       ;
-
-
-
-! {
-!        { 1 0 0 0 }
-!        { 0 1 0 0 }
-!        { 0 0 0.984807753012208 -0.1736481776669303 }
-!        { 0 0 0.1736481776669303 0.984807753012208 }
-!    }
-
-! ------------------------------------------------------------
-! constant+
-[ { 1 2 5 } ] [ { 1 2 3 } 2 constant+ ] unit-test
-
-! ------------------------------------------------------------
-! translate
-[ { 1 -1 0 } ] [ { 1 -1 -5 } { 3 -2 } translate ] unit-test
-
-! ------------------------------------------------------------
-! transform
-[ { -1 -1 -5 21.0 } ] [ { -1 -1 -5 21 }
-  { { 1 0 0 }
-    { 0 1 0 }
-    { 0 0 1 }
-    } transform  
-] unit-test
-
-! ------------------------------------------------------------
-! compare-nleft-to-identity-matrix
-[ t ] [ 
-    { 
-        { 1 0 0 1232 } 
-        { 0 1 0 0 321 } 
-        { 0 0 1 0 } } 
-        3 compare-nleft-to-identity-matrix 
-]  unit-test
-
-[ f ] [ 
-    { { 1 0 0 } { 0 1 0 } { 0 0 0 } } 
-    3 compare-nleft-to-identity-matrix 
-] unit-test
-
-[ f ] [ 
-    { { 2 0 0 } { 0 1 0 } { 0 0 1 } } 
-    3 compare-nleft-to-identity-matrix 
-] unit-test
-! ------------------------------------------------------------
-[ t ] [ 
-  { { 1 0 0 }
-    { 0 1 0 }
-    { 0 0 1 } } 3 valid-solution? 
-] unit-test
-
-[ f ] [ 
-  { { 1 0 0 1 }
-    { 0 0 0 1 }
-    { 0 0 1 0 } } 3 valid-solution? 
-] unit-test
-
-[ f ] [ 
-  { { 1 0 0 1 }
-    { 0 0 0 1 } } 3 valid-solution? 
-] unit-test
-
-[ f ] [ 
-  { { 1 0 0 1 }
-    { 0 0 0 1 }
-    { 0 0 1 0 } } 2 valid-solution? 
-] unit-test
-
-! ------------------------------------------------------------
-[ 3 ] [ { 1 2 3 } last ] unit-test 
-
-[ { 1 2 5 } ] [ { 1 2 3 } dup [ 2 + ] change-last ] unit-test 
-
-! ------------------------------------------------------------
-! position-point 
-[ 0 ] [ 
-    { 1 -1 -5 } { 2 7 } position-point 
-] unit-test
-
-! ------------------------------------------------------------
-
-! transform
-! TODO construire un exemple
-
-
-! ------------------------------------------------------------
-! slice-solid 
-
-! ------------------------------------------------------------
-! solve-equation 
-! deux cas de tests, avec solution et sans solution
-
-[ { 2 7 } ] 
-[ { { 1 -1 -5 } { 1 2 16 } } intersect-hyperplanes ] 
-unit-test
-
-[ f ] 
-[ { { 1 -1 -5 } { 1 2 16 } { -1 -1 -21 } } intersect-hyperplanes  ]
-unit-test
-
-[ f ] 
-[ { { 1 0 -5 } { 1 0 16 }  } intersect-hyperplanes  ]
-unit-test
-
-! ------------------------------------------------------------
-! point-inside-halfspace
-[ t ] [ { 1 -1 -5 } { 0 0 }  point-inside-halfspace? ] 
-unit-test
-[ f ] [ { 1 -1 -5 } { 8 13 }  point-inside-halfspace? ] 
-unit-test
-[ t ] [ { 1 -1 -5 } { 8 13 }  point-inside-or-on-halfspace? ] 
-unit-test
-
-
-! ------------------------------
-! order solid
-
-[  1 ] [ 0 >pv solid1 solid2 order-solid ] unit-test
-[ -1 ] [ 0 >pv solid2 solid1 order-solid ] unit-test
-[  f ] [ 1 >pv solid1 solid2 order-solid ] unit-test
-[  f ] [ 1 >pv solid2 solid1 order-solid ] unit-test
-
-
-! clip-solid
-[ { { 13 15 } { 15 13 } { 13 13 } } ]
-    [ 0 >pv solid2 solid1 clip-solid first corners>> ] unit-test
-
-solid1 corners>> '[ _ ]
-    [ 0 >pv solid1 solid1 clip-solid first corners>> ] unit-test
-
-solid1 corners>> '[ _ ]
-    [ 0 >pv solid1 solid2 clip-solid first corners>> ] unit-test
-
-solid1 corners>> '[ _ ]
-    [ 1 >pv solid1 solid2 clip-solid first corners>> ] unit-test
-solid2 corners>> '[ _ ]
-    [ 1 >pv solid2 solid1 clip-solid first corners>> ] unit-test
-
-!
-[
-    {
-        { { 13 15 } { 15 13 } { 13 13 } }
-        { { 16 17 } { 16 13 } { 36 17 } { 36 13 } }
-        { { 16 1 } { 16 2 } { 36 1 } { 36 2 } }
-    }
-] [     0 >pv solid2 solid3  2array 
-        solid1 (solids-silhouette-subtract) 
-        [ corners>> ] map
-  ] unit-test
-
-
-[
-{
-    { { 8 13 } { 2 7 } { 12 9 } { 12 2 } }
-    { { 13 15 } { 15 13 } { 13 13 } }
-    { { 16 17 } { 16 15 } { 36 17 } { 36 15 } }
-    { { 16 1 } { 16 2 } { 36 1 } { 36 2 } }
-}
-] [ 
-    0 >pv  <space> solid1 suffix-solids 
-        solid2 suffix-solids 
-        solid3 suffix-solids
-     remove-hidden-solids
-    solids>> [ corners>> ] map
-] unit-test
-
-! { }
-! { }
-! <light> { 0.2 0.3 0.4 } >>color { 1 -1 1 } >>direction     suffix
-! <light> { 0.4 0.3 0.1 } >>color { -1 -1 -1 } >>direction   suffix
-! suffix 
-! { 0.1 0.1 0.1 } suffix ! ambient color
-! { 0.23 0.32 0.17 } suffix ! solid color
-! solid3 faces>> first 
-
-! enlight-projection
diff --git a/unmaintained/adsoda/adsoda.factor b/unmaintained/adsoda/adsoda.factor
deleted file mode 100755
index 01e437bc7d..0000000000
--- a/unmaintained/adsoda/adsoda.factor
+++ /dev/null
@@ -1,570 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors
-arrays 
-assocs
-combinators
-kernel 
-fry
-math 
-math.constants
-math.functions
-math.libm
-math.order
-math.vectors 
-math.matrices 
-math.parser
-namespaces
-prettyprint
-sequences
-sequences.deep
-sets
-slots
-sorting
-tools.time
-vars
-continuations
-words
-opengl
-opengl.gl
-colors
-adsoda.solution2
-adsoda.combinators
-opengl.demo-support
-values
-tools.walker
-;
-
-IN: adsoda
-
-DEFER: combinations
-VAR: pv
-
-
-! -------------------------------------------------------------
-! global values
-VALUE: remove-hidden-solids?
-VALUE: VERY-SMALL-NUM
-VALUE: ZERO-VALUE
-VALUE: MAX-FACE-PER-CORNER
-
-t to: remove-hidden-solids?
-0.0000001 to: VERY-SMALL-NUM
-0.0000001 to: ZERO-VALUE
-4 to: MAX-FACE-PER-CORNER
-! -------------------------------------------------------------
-! sequence complement
-
-: with-pv ( i quot -- ) [ swap >pv call ] with-scope  ; inline
-
-: dimension ( array -- x )      length 1- ; inline 
-: last ( seq -- x )           [ dimension ] [ nth ] bi ; inline
-: change-last ( seq quot -- ) 
-    [ [ dimension ] keep ] dip change-nth  ; 
-
-! -------------------------------------------------------------
-! light
-! -------------------------------------------------------------
-
-TUPLE: light name { direction array } color ;
-: <light> ( -- tuple ) light new ;
-
-! -------------------------------------------------------------
-! halfspace manipulation
-! -------------------------------------------------------------
-
-: constant+ ( v x -- w )  '[ [ _ + ] change-last ] keep ;
-: translate ( u v -- w )   dupd     v* sum     constant+ ; 
-
-: transform ( u matrix -- w )
-    [ swap m.v ] 2keep ! compute new normal vector    
-    [
-        [ [ abs ZERO-VALUE > ] find ] keep 
-        ! find a point on the frontier
-        ! be sure it's not null vector
-        last ! get constant
-        swap /f neg swap ! intercept value
-    ] dip  
-    flip 
-    nth
-    [ * ] with map ! apply intercep value
-    over v*
-    sum  neg
-    suffix ! add value as constant at the end of equation
-;
-
-: position-point ( halfspace v -- x ) 
-    -1 suffix v* sum  ; inline
-: point-inside-halfspace? ( halfspace v -- ? )       
-    position-point VERY-SMALL-NUM  > ; 
-: point-inside-or-on-halfspace? ( halfspace v -- ? ) 
-    position-point VERY-SMALL-NUM neg > ;
-: project-vector (  seq -- seq )     
-    pv> [ head ] [ 1+  tail ] 2bi append ; 
-: get-intersection ( matrice -- seq )     
-    [ 1 tail* ] map     flip first ;
-
-: islenght=? ( seq n -- seq n ? ) 2dup [ length ] [ = ] bi*  ;
-
-: compare-nleft-to-identity-matrix ( seq n -- ? ) 
-    [ [ head ] curry map ] keep  identity-matrix m- 
-    flatten
-    [ abs ZERO-VALUE < ] all?
-;
-
-: valid-solution? ( matrice n -- ? )
-    islenght=?
-    [ compare-nleft-to-identity-matrix ]  
-    [ 2drop f ] if ; inline
-
-: intersect-hyperplanes ( matrice -- seq )
-    [ solution dup ] [ first dimension ] bi
-    valid-solution?     [ get-intersection ] [ drop f ] if ;
-
-! -------------------------------------------------------------
-! faces
-! -------------------------------------------------------------
-
-TUPLE: face { halfspace array } 
-    touching-corners adjacent-faces ;
-: <face> ( v -- tuple )       face new swap >>halfspace ;
-: flip-face ( face -- face ) [ vneg ] change-halfspace ;
-: erase-face-touching-corners ( face -- face ) 
-    f >>touching-corners ;
-: erase-face-adjacent-faces ( face -- face )   
-    f >>adjacent-faces ;
-: faces-intersection ( faces -- v )  
-    [ halfspace>> ] map intersect-hyperplanes ;
-: face-translate ( face v -- face ) 
-    [ translate ] curry change-halfspace ; inline
-: face-transform ( face m -- face )
-    [ transform ] curry change-halfspace ; inline
-: face-orientation ( face -- x ) pv> swap halfspace>> nth sgn ;
-: backface? ( face -- face ? )      dup face-orientation 0 <= ;
-: pv-factor ( face -- f face )     
-    halfspace>> [ pv> swap nth [ * ] curry ] keep ; inline
-: suffix-touching-corner ( face corner -- face ) 
-    [ suffix ] curry   change-touching-corners ; inline
-: real-face? ( face -- ? )
-    [ touching-corners>> length ] 
-    [ halfspace>> dimension ] bi >= ;
-
-: (add-to-adjacent-faces) ( face face -- face )
-    over adjacent-faces>> 2dup member?
-    [ 2drop ] [ swap suffix >>adjacent-faces ] if ;
-
-: add-to-adjacent-faces ( face face -- face )
-    2dup =   [ drop ] [ (add-to-adjacent-faces) ] if ;
-
-: update-adjacent-faces ( faces corner -- )
-   '[ [ _ suffix-touching-corner drop ] each ] keep 
-    2 among [ 
-        [ first ] keep second  
-        [ add-to-adjacent-faces drop ] 2keep 
-        swap add-to-adjacent-faces drop  
-    ] each ; inline
-
-: face-project-dim ( face -- x )  halfspace>> length 2 -  ;
-
-: apply-light ( color light normal -- u )
-    over direction>>  v. 
-    neg dup 0 > 
-    [ 
-        [ color>> swap ] dip 
-        [ * ] curry map v+ 
-        [ 1 min ] map 
-    ] 
-    [ 2drop ] 
-    if
-;
-
-: enlight-projection ( array face -- color )
-    ! array = lights + ambient color
-    [ [ third ] [ second ] [ first ] tri ]
-    [ halfspace>> project-vector normalize ] bi*
-    [ apply-light ] curry each
-    v*
-;
-
-: (intersection-into-face) ( face-init face-adja quot -- face )
-    [
-    [  [ pv-factor ] bi@ 
-        roll 
-        [ map ] 2bi@
-        v-
-    ] 2keep
-    [ touching-corners>> ] bi@
-    [ swap  [ = ] curry find  nip f = ] curry find nip
-    ] dip  over
-     [
-        call
-        dupd
-        point-inside-halfspace? [ vneg ] unless 
-        <face> 
-     ] [ 3drop f ] if 
-    ; inline
-
-: intersection-into-face ( face-init face-adja -- face )
-    [ [ project-vector ] bi@ ]     (intersection-into-face) ;
-
-: intersection-into-silhouette-face ( face-init face-adja -- face )
-    [ ] (intersection-into-face) ;
-
-: intersections-into-faces ( face -- faces )
-    clone dup  
-    adjacent-faces>> [ intersection-into-face ] with map 
-    [ ] filter ;
-
-: (face-silhouette) ( face -- faces )
-    clone dup adjacent-faces>>
-    [   backface?
-        [ intersection-into-silhouette-face ] [ 2drop f ]  if  
-    ] with map 
-    [ ] filter
-; inline
-
-: face-silhouette ( face -- faces )     
-    backface? [ drop f ] [ (face-silhouette) ] if ;
-
-! --------------------------------
-! solid
-! -------------------------------------------------------------
-TUPLE: solid dimension silhouettes 
-    faces corners adjacencies-valid color name ;
-
-: <solid> ( -- tuple ) solid new ;
-
-: suffix-silhouettes ( solid silhouette -- solid )  
-    [ suffix ] curry change-silhouettes ;
-
-: suffix-face ( solid face -- solid )     
-    [ suffix ] curry change-faces ;
-: suffix-corner ( solid corner -- solid ) 
-    [ suffix ] curry change-corners ; 
-: erase-solid-corners ( solid -- solid )  f >>corners ;
-
-: erase-silhouettes ( solid -- solid ) 
-    dup dimension>> f <array> >>silhouettes ;
-: filter-real-faces ( solid -- solid ) 
-    [ [ real-face? ] filter ] change-faces ;
-: initiate-solid-from-face ( face -- solid ) 
-    face-project-dim  <solid> swap >>dimension ;
-
-: erase-old-adjacencies ( solid -- solid )
-    erase-solid-corners
-    [ dup [ erase-face-touching-corners 
-        erase-face-adjacent-faces drop ] each ]
-    change-faces ;
-
-: point-inside-or-on-face? ( face v -- ? ) 
-    [ halfspace>> ] dip point-inside-or-on-halfspace?  ;
-
-: point-inside-face? ( face v -- ? ) 
-    [ halfspace>> ] dip  point-inside-halfspace? ;
-
-: point-inside-solid? ( solid point -- ? )
-    [ faces>> ] dip [ point-inside-face? ] curry all? ; inline
-
-: point-inside-or-on-solid? ( solid point -- ? )
-    [ faces>> ] dip 
-    [ point-inside-or-on-face? ] curry  all?   ; inline
-
-: unvalid-adjacencies ( solid -- solid )  
-    erase-old-adjacencies f >>adjacencies-valid 
-    erase-silhouettes ;
-
-: add-face ( solid face -- solid ) 
-    suffix-face unvalid-adjacencies ; 
-
-: cut-solid ( solid halfspace -- solid )    <face> add-face ; 
-
-: slice-solid ( solid face  -- solid1 solid2 )
-    [ [ clone ] bi@ flip-face add-face 
-    [ "/outer/" append ] change-name  ] 2keep
-    add-face [ "/inner/" append ] change-name ;
-
-! -------------
-
-
-: add-silhouette ( solid  -- solid )
-   dup 
-   ! find-adjacencies 
-   faces>> { } 
-   [ face-silhouette append ] reduce
-   [ ] filter 
-   <solid> 
-        swap >>faces
-        over dimension>> >>dimension 
-        over name>> " silhouette " append 
-                 pv> number>string append 
-        >>name
-     !   ensure-adjacencies
-   suffix-silhouettes ; inline
-
-: find-silhouettes ( solid -- solid )
-    { } >>silhouettes 
-    dup dimension>> [ [ add-silhouette ] with-pv ] each ;
-
-: ensure-silhouettes ( solid  -- solid )
-    dup  silhouettes>>  [ f = ] all?
-    [ find-silhouettes  ]  when ; 
-
-! ------------
-
-: corner-added? ( solid corner -- ? ) 
-    ! add corner to solid if it is inside solid
-    [ ] 
-    [ point-inside-or-on-solid? ] 
-    [ swap corners>> member? not ] 
-    2tri and
-    [ suffix-corner drop t ] [ 2drop f ] if ;
-
-: process-corner ( solid faces corner -- )
-    swapd 
-    [ corner-added? ] keep swap ! test if corner is inside solid
-    [ update-adjacent-faces ] 
-    [ 2drop ]
-    if ;
-
-: compute-intersection ( solid faces -- )
-    dup faces-intersection
-    dup f = [ 3drop ] [ process-corner ]  if ;
-
-: test-faces-combinaisons ( solid n -- )
-    [ dup faces>> ] dip among   
-    [ compute-intersection ] with each ;
-
-: compute-adjacencies ( solid -- solid )
-    dup dimension>> [ >= ] curry 
-    [ keep swap ] curry MAX-FACE-PER-CORNER swap
-    [ [ test-faces-combinaisons ] 2keep 1- ] [ ] while drop ;
-
-: find-adjacencies ( solid -- solid ) 
-    erase-old-adjacencies   
-    compute-adjacencies
-    filter-real-faces 
-    t >>adjacencies-valid ;
-
-: ensure-adjacencies ( solid -- solid ) 
-    dup adjacencies-valid>> 
-    [ find-adjacencies ] unless 
-    ensure-silhouettes
-    ;
-
-: (non-empty-solid?) ( solid -- ? ) 
-    [ dimension>> ] [ corners>> length ] bi < ;
-: non-empty-solid? ( solid -- ? )   
-    ensure-adjacencies (non-empty-solid?) ;
-
-: compare-corners-roughly ( corner corner -- ? )
-    2drop t ;
-! : remove-inner-faces ( -- ) ;
-: face-project ( array face -- seq )
-    backface? 
-  [ 2drop f ]
-    [   [ enlight-projection ] 
-        [ initiate-solid-from-face ]
-        [ intersections-into-faces ]  tri
-        >>faces
-        swap >>color        
-    ]    if ;
-
-: solid-project ( lights ambient solid -- solids )
-  ensure-adjacencies
-    [ color>> ] [ faces>> ] bi [ 3array  ] dip
-    [ face-project ] with map 
-    [ ] filter 
-    [ ensure-adjacencies ] map
-;
-
-: (solid-move) ( solid v move -- solid ) 
-   curry [ map ] curry 
-   [ dup faces>> ] dip call drop  
-   unvalid-adjacencies ; inline
-
-: solid-translate ( solid v -- solid ) 
-    [ face-translate ] (solid-move) ; 
-: solid-transform ( solid m -- solid ) 
-    [ face-transform ] (solid-move) ; 
-
-: find-corner-in-silhouette ( s1 s2 -- elt bool )
-    pv> swap silhouettes>> nth     
-    swap corners>>
-    [ point-inside-solid? ] with find swap ;
-
-: valid-face-for-order ( solid point -- face )
-    [ point-inside-face? not ] 
-    [ drop face-orientation  0 = not ] 2bi and ;
-
-: check-orientation ( s1 s2 pt -- int )
-    [ nip faces>> ] dip
-    [ valid-face-for-order ] curry find swap
-    [ face-orientation ] [ drop f ] if ;
-
-: (order-solid) ( s1 s2 -- int )
-    2dup find-corner-in-silhouette
-    [ check-orientation ] [ 3drop f ] if ;
-
-: order-solid ( solid solid  -- i ) 
-    2dup (order-solid)
-    [ 2nip ]
-    [   swap (order-solid)
-        [ neg ] [ f ] if*
-    ] if* ;
-
-: subtract ( solid1 solid2 -- solids )
-    faces>> swap clone ensure-adjacencies ensure-silhouettes  
-    [ swap slice-solid drop ]  curry map
-    [ non-empty-solid? ] filter
-    [ ensure-adjacencies ] map
-; inline
-
-! -------------------------------------------------------------
-! space 
-! -------------------------------------------------------------
-TUPLE: space name dimension solids ambient-color lights ;
-: <space> ( -- space )      space new ;
-: suffix-solids ( space solid -- space ) 
-    [ suffix ] curry change-solids ; inline
-: suffix-lights ( space light -- space ) 
-    [ suffix ] curry change-lights ; inline
-: clear-space-solids ( space -- space )     f >>solids ;
-
-: space-ensure-solids ( space -- space ) 
-    [ [ ensure-adjacencies ] map ] change-solids ;
-: eliminate-empty-solids ( space -- space ) 
-    [ [ non-empty-solid? ] filter ] change-solids ;
-
-: projected-space ( space solids -- space ) 
-   swap dimension>> 1-  <space>    
-   swap >>dimension    swap  >>solids ;
-
-: get-silhouette ( solid -- silhouette )    
-    silhouettes>> pv> swap nth ;
-: solid= ( solid solid -- ? )            [ corners>> ]  bi@ = ;
-
-: space-apply ( space m quot -- space ) 
-        curry [ map ] curry [ dup solids>> ] dip
-        [ call ] [ drop ] recover drop ;
-: space-transform ( space m -- space ) 
-    [ solid-transform ] space-apply ;
-: space-translate ( space v -- space ) 
-    [ solid-translate ] space-apply ; 
-
-: describe-space ( space -- ) 
-    solids>>  
-    [  [ corners>>  [ pprint ] each ] [ name>> . ] bi ] each ;
-
-: clip-solid ( solid solid -- solids )
-    [ ]
-    [ solid= not ]
-    [ order-solid -1 = ] 2tri 
-    and
-    [ get-silhouette subtract ] 
-    [  drop 1array ] 
-    if 
-    
-    ;
-
-: (solids-silhouette-subtract) ( solids solid -- solids ) 
-     [  clip-solid append ] curry { } -rot each ; inline
-
-: solids-silhouette-subtract ( solids i solid -- solids )
-! solids is an array of 1 solid arrays
-      [ (solids-silhouette-subtract) ] curry map-but 
-; inline 
-
-: remove-hidden-solids ( space -- space ) 
-! We must include each solid in a sequence because 
-! during substration 
-! a solid can be divided in more than on solid
-    [ 
-        [ [ 1array ] map ] 
-        [ length ] 
-        [ ] 
-        tri     
-        [ solids-silhouette-subtract ] 2each
-        { } [ append ] reduce 
-    ] change-solids
-    eliminate-empty-solids ! TODO include into change-solids
-;
-
-: space-project ( space i -- space )
-  [
-  [ clone  
-    remove-hidden-solids? [ remove-hidden-solids ] when
-    dup 
-        [ solids>> ] 
-        [ lights>> ] 
-        [ ambient-color>> ]  tri 
-        [ rot solid-project ] 2curry 
-        map 
-        [ append ] { } -rot each 
-        ! TODO project lights
-        projected-space 
-      ! remove-inner-faces 
-      ! 
-      eliminate-empty-solids
-    ] with-pv 
-    ] [ 3drop <space> ] recover
-    ; inline
-
-: middle-of-space ( space -- point )
-    solids>> [ corners>> ] map concat
-    [ [ ] [ v+ ] map-reduce ] [ length ] bi v/n
-;
-
-! -------------------------------------------------------------
-! 3D rendering
-! -------------------------------------------------------------
-
-: face-reference ( face -- halfspace point vect )
-       [ halfspace>> ] 
-       [ touching-corners>> first ] 
-       [ touching-corners>> second ] tri 
-       over v-
-;
-
-: theta ( v halfspace point vect -- v x )
-   [ [ over ] dip v- ] dip    
-   [ cross dup norm >float ]
-   [ v. >float ]  
-   2bi 
-   fatan2
-   -rot v. 
-   0 < [ neg ] when
-;
-
-: ordered-face-points ( face -- corners )  
-    [ touching-corners>> 1 head ] 
-    [ touching-corners>> 1 tail ] 
-    [ face-reference [ theta ] 3curry ]         tri
-    { } map>assoc    sort-values keys 
-    append
-    ; inline
-
-: point->GL  ( point -- )   gl-vertex ;
-: points->GL ( array -- )   do-cycle [ point->GL ] each ;
-
-: face->GL ( face color -- )
-   [ ordered-face-points ] dip
-   [ first3 1.0 glColor4d GL_POLYGON 
-        [ [ point->GL  ] each ] do-state ] curry
-   [  0 0 0 1 glColor4d GL_LINE_LOOP 
-        [ [ point->GL  ] each ] do-state ]
-   bi
-   ; inline
-
-: solid->GL ( solid -- )    
-    [ faces>> ]    
-    [ color>> ] bi
-    [ face->GL ] curry each ; inline
-
-: space->GL ( space -- )
-    solids>>
-    [ solid->GL ] each ;
-
-
-
-
-
diff --git a/unmaintained/adsoda/adsoda.tests b/unmaintained/adsoda/adsoda.tests
deleted file mode 100755
index f0b0c54953..0000000000
--- a/unmaintained/adsoda/adsoda.tests
+++ /dev/null
@@ -1,147 +0,0 @@
-! : init-4D-demo ( -- space )
-! OK
-! espace de dimension 4 et de couleur 0,3 0.3 0.3
-<space> 
-    4 >>dimension
-    { 0.3 0.3 0.3 } >>ambient-color
-    { 100 150 100  150 100 150 100 150 } "4cube1" 4cube suffix-solids
-   { 160 180  160 180 160 180 160 180 } "4cube2" 4cube suffix-solids
-    <light>
-        { -100 -100 -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-! ;
-! : init-3D-demo ( -- space )
-! OK
-! espace de dimension 4 et de couleur 0,3 0.3 0.3
-<space> 
-    3 >>dimension
-    { 0.3 0.3 0.3 } >>ambient-color
-    { 100 150 100  150 100 150 } "3cube1" 3cube suffix-solids
-  !  { -150 -10  -150 -10 -150 -10 -150 -10 } "4cube2" 4cube suffix-solids
-    <light>
-        { -100 -100 -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-! ;
-
-
-: s1 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "s1" >>name
-    { 1 1 1 } >>color
-    { 1 -1 -5 } cut-solid 
-    { -1 -1 -21 } cut-solid 
-    { -1 0 -12 } cut-solid 
-    { 1 2 16 } cut-solid
-;
-: solid1 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "solid1" >>name
-    { 1 -1 -5 } cut-solid 
-    { -1 -1 -21 } cut-solid 
-    { -1 0 -12 } cut-solid 
-    { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-;
-: solid2 ( -- solid )
-    <solid> 
-    2 >>dimension
-    "solid2" >>name
-    { -1 1 -10 } cut-solid 
-    { -1 -1 -28 } cut-solid 
-    { 1 0 13 } cut-solid 
- !   { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-;
-
-: solid3 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid3" >>name
-    { 1 1 1 } >>color
-    { 1 0 16 } cut-solid 
-    { -1 0 -36 } cut-solid 
-    { 0 1 1 } cut-solid 
-    { 0 -1  -17 } cut-solid 
- !   { 1 2 16 } cut-solid
-    ensure-adjacencies
-    
-
-;
-
-: solid4 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid4" >>name
-    { 1 1 1 } >>color
-    { 1 0 21 } cut-solid 
-    { -1 0 -36 } cut-solid 
-    { 0 1 1 } cut-solid 
-    { 0 -1  -17 } cut-solid 
-    ensure-adjacencies
-    
-;
-
-: solid5 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid5" >>name
-    { 1 1 1 } >>color
-    { 1 0 6 } cut-solid 
-    { -1 0 -17 } cut-solid 
-    { 0 1 17 } cut-solid 
-    { 0 -1  -19 } cut-solid 
-    ensure-adjacencies
-    
-;
-
-: solid7 ( -- solid )
-      <solid> 
-    2 >>dimension
-    "solid7" >>name
-    { 1 1 1 } >>color
-    { 1 0 38 } cut-solid 
-    { 1 -5 -66 } cut-solid 
-    { -2 1 -75 } cut-solid
-    ensure-adjacencies
-    
-;
-
-: solid6s ( -- seq )
-  solid3 clone solid2 clone subtract
-;
-
-: space1 ( -- space )
-    <space>
-        2 >>dimension
-     !    solid3 suffix-solids
-        solid1 suffix-solids
-        solid2 suffix-solids
-    !   solid6s [ suffix-solids ] each 
-        solid4 suffix-solids
-     !   solid5 suffix-solids
-        solid7 suffix-solids
-        { 1 1 1 } >>ambient-color
-            <light>
-        { -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-;
-
-: space2 ( -- space )
-    <space>
-        4 >>dimension
-       ! 4cube suffix-solids
-        { 1 1 1 } >>ambient-color
-            <light>
-        { -100 -100 } >>position
-        { 0.2 0.7 0.1 } >>color
-        suffix-lights
-
-       ;
-
diff --git a/unmaintained/adsoda/authors.txt b/unmaintained/adsoda/authors.txt
deleted file mode 100755
index 856f3b05fc..0000000000
--- a/unmaintained/adsoda/authors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Jeff Bigot
-Greg Ferrar
\ No newline at end of file
diff --git a/unmaintained/adsoda/combinators/authors.txt b/unmaintained/adsoda/combinators/authors.txt
deleted file mode 100755
index e7f4cdeb7c..0000000000
--- a/unmaintained/adsoda/combinators/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-JF Bigot, after Greg Ferrar
\ No newline at end of file
diff --git a/unmaintained/adsoda/combinators/combinators-docs.factor b/unmaintained/adsoda/combinators/combinators-docs.factor
deleted file mode 100755
index 0121dce32b..0000000000
--- a/unmaintained/adsoda/combinators/combinators-docs.factor
+++ /dev/null
@@ -1,39 +0,0 @@
-! Copyright (C) 2008 Your name.
-! See http://factorcode.org/license.txt for BSD license.
-USING: arrays help.markup help.syntax kernel sequences ;
-IN: adsoda.combinators
-
-HELP: among
-{ $values
-     { "array" array } { "n" "number of value to select" }
-     { "array" array }
-}
-{ $description "returns an array containings every possibilities of n choices among a given sequence" } ;
-
-HELP: columnize
-{ $values
-     { "array" array }
-     { "array" array }
-}
-{ $description "flip a sequence into a sequence of 1 element sequences" } ;
-
-HELP: concat-nth
-{ $values
-     { "seq1" sequence } { "seq2" sequence }
-     { "seq" sequence }
-}
-{ $description "merges 2 sequences of sequences appending corresponding elements" } ;
-
-HELP: do-cycle
-{ $values
-     { "array" array }
-     { "array" array }
-}
-{ $description "Copy the first element at the end of the sequence in order to close the cycle." } ;
-
-
-ARTICLE: "adsoda.combinators" "Combinators"
-{ $vocab-link "adsoda.combinators" }
-;
-
-ABOUT: "adsoda.combinators"
diff --git a/unmaintained/adsoda/combinators/combinators-tests.factor b/unmaintained/adsoda/combinators/combinators-tests.factor
deleted file mode 100755
index 6796929a74..0000000000
--- a/unmaintained/adsoda/combinators/combinators-tests.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-USING: adsoda.combinators
-sequences
-    tools.test 
- ;
-
-IN: adsoda.combinators.tests
-
-
-[ { "atoto" "b" "ctoto" } ] [ { "a" "b" "c" } 1 [ "toto" append ] map-but ] 
-    unit-test
-
diff --git a/unmaintained/adsoda/combinators/combinators.factor b/unmaintained/adsoda/combinators/combinators.factor
deleted file mode 100755
index 4e4bbff72d..0000000000
--- a/unmaintained/adsoda/combinators/combinators.factor
+++ /dev/null
@@ -1,45 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel arrays sequences fry math combinators ;
-
-IN: adsoda.combinators
-
-! : (combinations) ( seq -- seq ) [ 1 tail ] dip combinations ;
-
-! : prefix-each [ prefix ] curry map ; inline
-
-! : combinations ( seq n -- seqs )
-!    {
-!        { [ dup 0 = ] [ 2drop { { } } ] }
-!        { [ over empty? ] [ 2drop { } ] }
-!        { [ t ] [ 
-!            [ [ 1- (combinations) ] [ drop first ] 2bi prefix-each ]
-!            [ (combinations) ] 2bi append
-!        ] }
-!    } cond ;
-
-: columnize ( array -- array ) [ 1array ] map ; inline
-
-: among ( array n -- array )
-    2dup swap length 
-    {
-        { [ over 1 = ] [ 3drop columnize ] }
-        { [ over 0 = ] [ 2drop 2drop { } ] }
-        { [ 2dup < ] [ 2drop [ 1 cut ] dip  
-                         [ 1- among [ append ] with map  ] 
-                         [ among append ] 2bi
-                       ] }
-        { [ 2dup = ] [ 3drop 1array ] }
-        { [ 2dup > ] [ 2drop 2drop {  } ] } 
-    } cond
-;
-
-: concat-nth ( seq1 seq2 -- seq )  
-    [ nth append ] curry map-index ;
-
-: do-cycle   ( array -- array )   dup first suffix ;
-
-: map-but ( seq i quot -- seq )
-    ! quot : ( seq x -- seq )
-    '[ _ = [ @ ] unless ] map-index ; inline
-
diff --git a/unmaintained/adsoda/solution2/solution2.factor b/unmaintained/adsoda/solution2/solution2.factor
deleted file mode 100755
index 3e0648128d..0000000000
--- a/unmaintained/adsoda/solution2/solution2.factor
+++ /dev/null
@@ -1,126 +0,0 @@
-USING: kernel
-sequences
-namespaces
-
-math
-math.vectors
-math.matrices
-;
-IN: adsoda.solution2
-
-! -------------------
-! correctif solution
-! ---------------
-SYMBOL: matrix
-: MIN-VAL-adsoda ( -- x ) 0.00000001
-! 0.000000000001 
-;
-
-: zero? ( x -- ? ) 
-    abs MIN-VAL-adsoda <
-;
-
-! [ number>string string>number ] map 
-
-: with-matrix ( matrix quot -- )
-    [ swap matrix set call matrix get ] with-scope ; inline
-
-: nth-row ( row# -- seq ) matrix get nth ;
-
-: change-row ( row# quot -- seq ) ! row# quot -- | quot: seq -- seq )
-    matrix get swap change-nth ; inline
-
-: exchange-rows ( row# row# -- ) matrix get exchange ;
-
-: rows ( -- n ) matrix get length ;
-
-: cols ( -- n ) 0 nth-row length ;
-
-: skip ( i seq quot -- n )
-    over [ find-from drop ] dip length or ; inline
-
-: first-col ( row# -- n )
-    #! First non-zero column
-    0 swap nth-row [ zero? not ] skip ;
-
-: clear-scale ( col# pivot-row i-row -- n )
-    [ over ] dip nth dup zero? [
-        3drop 0
-    ] [
-        [ nth dup zero? ] dip swap [
-            2drop 0
-        ] [
-            swap / neg
-        ] if
-    ] if ;
-
-: (clear-col) ( col# pivot-row i -- )
-    [ [ clear-scale ] 2keep [ n*v ] dip v+ ] change-row ;
-
-: rows-from ( row# -- slice )
-    rows dup <slice> ;
-
-: clear-col ( col# row# rows -- )
-    [ nth-row ] dip [ [ 2dup ] dip (clear-col) ] each 2drop ;
-
-: do-row ( exchange-with row# -- )
-    [ exchange-rows ] keep
-    [ first-col ] keep
-    dup 1+ rows-from clear-col ;
-
-: find-row ( row# quot -- i elt )
-    [ rows-from ] dip find ; inline
-
-: pivot-row ( col# row# -- n )
-    [ dupd nth-row nth zero? not ] find-row 2nip ;
-
-: (echelon) ( col# row# -- )
-    over cols < over rows < and [
-        2dup pivot-row [ over do-row 1+ ] when*
-        [ 1+ ] dip (echelon)
-    ] [
-        2drop
-    ] if ;
-
-: echelon ( matrix -- matrix' )
-    [ 0 0 (echelon) ] with-matrix ;
-
-: nonzero-rows ( matrix -- matrix' )
-    [ [ zero? ] all? not ] filter ;
-
-: null/rank ( matrix -- null rank )
-    echelon dup length swap nonzero-rows length [ - ] keep ;
-
-: leading ( seq -- n elt ) [ zero? not ] find ;
-
-: reduced ( matrix' -- matrix'' )
-    [
-        rows <reversed> [
-            dup nth-row leading drop
-            dup [ swap dup clear-col ] [ 2drop ] if
-        ] each
-    ] with-matrix ;
-
-: basis-vector ( row col# -- )
-    [ clone ] dip
-    [ swap nth neg recip ] 2keep
-    [ 0 spin set-nth ] 2keep
-    [ n*v ] dip
-    matrix get set-nth ;
-
-: nullspace ( matrix -- seq )
-    echelon reduced dup empty? [
-        dup first length identity-matrix [
-            [
-                dup leading drop
-                dup [ basis-vector ] [ 2drop ] if
-            ] each
-        ] with-matrix flip nonzero-rows
-    ] unless ;
-
-: 1-pivots ( matrix -- matrix )
-    [ dup leading nip [ recip v*n ] when* ] map ;
-
-: solution ( matrix -- matrix )
-    echelon nonzero-rows reduced 1-pivots ;
-
diff --git a/unmaintained/adsoda/solution2/summary.txt b/unmaintained/adsoda/solution2/summary.txt
deleted file mode 100755
index a25a451f3c..0000000000
--- a/unmaintained/adsoda/solution2/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-A modification of solution to approximate solutions
\ No newline at end of file
diff --git a/unmaintained/adsoda/summary.txt b/unmaintained/adsoda/summary.txt
deleted file mode 100755
index ee666bc787..0000000000
--- a/unmaintained/adsoda/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-ADSODA : Arbitrary-Dimensional Solid Object Display Algorithm
\ No newline at end of file
diff --git a/unmaintained/adsoda/tags.txt b/unmaintained/adsoda/tags.txt
deleted file mode 100755
index 6e25b2f44b..0000000000
--- a/unmaintained/adsoda/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-adsoda 4D viewer
\ No newline at end of file
diff --git a/unmaintained/adsoda/tools/authors.txt b/unmaintained/adsoda/tools/authors.txt
deleted file mode 100755
index a6a96933f4..0000000000
--- a/unmaintained/adsoda/tools/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/adsoda/tools/tools-docs.factor b/unmaintained/adsoda/tools/tools-docs.factor
deleted file mode 100755
index 1d952e329b..0000000000
--- a/unmaintained/adsoda/tools/tools-docs.factor
+++ /dev/null
@@ -1,62 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot.
-! See http://factorcode.org/license.txt for BSD license.
-USING: arrays help.markup help.syntax kernel sequences ;
-IN: adsoda.tools
-
-HELP: 3cube
-{ $values 
-    { "array" "array" } { "name" "name" } 
-    { "solid" "solid" } 
-}
-{ $description "array : xmin xmax ymin ymax zmin zmax" 
-"returns a 3D solid with given limits"
-} ;
-
-HELP: 4cube
-{ $values 
-    { "array" "array" } { "name" "name" } 
-    { "solid" "solid" } 
-}
-{ $description "array : xmin xmax ymin ymax zmin zmax wmin wmax"  
-"returns a 4D solid with given limits"
-} ;
-
-
-HELP: equation-system-for-normal
-{ $values
-     { "points" "a list of n points" }
-     { "matrix" "matrix" }
-}
-{ $description "From a list of points, return the matrix" 
-"to solve in order to find the vector normal to the plan defined by the points" } 
-;
-
-HELP: normal-vector
-{ $values
-     { "points" "a list of n points" }
-     { "v" "a vector" }
-}
-{ $description "From a list of points, returns the vector normal to the plan defined by the points" 
-"With n points, creates n-1 vectors and then find a vector orthogonal to every others"
-"returns { f } if a normal vector can not be found" } 
-;
-
-HELP: points-to-hyperplane
-{ $values
-     { "points" "a list of n points" }
-     { "hyperplane" "an hyperplane equation" }
-}
-{ $description "From a list of points, returns the equation of the hyperplan"
-"Finds a normal vector and then translate it so that it includes one of the points"
-
-} 
-;
-
-ARTICLE: "adsoda.tools" "Tools"
-{ $vocab-link "adsoda.tools" }
-"Tools to help in building an " { $vocab-link "adsoda" } "-space"
-;
-
-ABOUT: "adsoda.tools"
-
-
diff --git a/unmaintained/adsoda/tools/tools-tests.factor b/unmaintained/adsoda/tools/tools-tests.factor
deleted file mode 100755
index bb5419417c..0000000000
--- a/unmaintained/adsoda/tools/tools-tests.factor
+++ /dev/null
@@ -1,14 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: 
-adsoda.tools
-tools.test
-;
-
-IN: adsoda.tools.tests
-
-
- [ { 1 0 } ] [ { { 0 0 } { 0 1 } }  normal-vector    ] unit-test
- [ f ] [ { { 0 0 } { 0 0 } }  normal-vector    ] unit-test
-
- [  { 1/2 1/2 1+1/2 }  ] [ { { 1 2 } { 2 1 } }  points-to-hyperplane ] unit-test
diff --git a/unmaintained/adsoda/tools/tools.factor b/unmaintained/adsoda/tools/tools.factor
deleted file mode 100755
index 6c4f4c3029..0000000000
--- a/unmaintained/adsoda/tools/tools.factor
+++ /dev/null
@@ -1,150 +0,0 @@
-! Copyright (C) 2008 Jeff Bigot
-! See http://factorcode.org/license.txt for BSD license.
-USING: 
-kernel
-sequences
-math
-accessors
-adsoda
-math.vectors 
-math.matrices
-bunny.model
-io.encodings.ascii
-io.files
-sequences.deep
-combinators
-adsoda.combinators
-fry
-io.files.temp
-grouping
-;
-
-IN: adsoda.tools
-
-
-
-
-
-! ---------------------------------
-: coord-min ( x array -- array )  swap suffix  ;
-: coord-max ( x array -- array )  swap neg suffix ;
-
-: 4cube ( array name -- solid )
-! array : xmin xmax ymin ymax zmin zmax wmin wmax
-    <solid> 
-    4 >>dimension
-    swap >>name
-    swap
-    { 
-       [ { 1 0 0 0 } coord-min ] [ { -1 0 0 0 } coord-max ] 
-       [ { 0 1 0 0 } coord-min ] [ { 0 -1 0 0 } coord-max ]
-       [ { 0 0 1 0 } coord-min ] [ { 0 0 -1 0 } coord-max ] 
-       [ { 0 0 0 1 } coord-min ] [ { 0 0 0 -1 } coord-max ]
-    }
-    [ curry call ] 2map 
-    [ cut-solid ] each 
-    ensure-adjacencies
-    
-; inline
-
-: 3cube ( array name -- solid )
-! array : xmin xmax ymin ymax zmin zmax wmin wmax
-    <solid> 
-    3 >>dimension
-    swap >>name
-    swap
-    { 
-       [ { 1 0 0 } coord-min ] [ { -1 0 0 } coord-max ] 
-       [ { 0 1 0 } coord-min ] [ { 0 -1 0 } coord-max ]
-       [ { 0 0 1 } coord-min ] [ { 0 0 -1 } coord-max ] 
-    }
-    [ curry call ] 2map 
-    [ cut-solid ] each 
-    ensure-adjacencies
-    
-; inline
-
-
-: equation-system-for-normal ( points -- matrix )
-    unclip [ v- 0 suffix ] curry map
-    dup first [ drop 1 ] map     suffix
-;
-
-: normal-vector ( points -- v ) 
-    equation-system-for-normal
-    intersect-hyperplanes ;
-
-: points-to-hyperplane ( points -- hyperplane )
-    [ normal-vector 0 suffix ] [ first ] bi
-    translate ;
-
-: refs-to-points ( points faces -- faces )
-   [ swap [ nth 10 v*n { 100 100 100 } v+ ] curry map ] 
-   with map
-;
-! V{ { 0.1 0.2 } { 1.1 1.3 } } V{ { 1 0 } { 0 1 } }
-! V{ { { 1.1 1.3 } { 0.1 0.2 } } { { 0.1 0.2 } { 1.1 1.3 } } }
-
-: ply-model-path ( -- path )
-
-! "bun_zipper.ply" 
-"screw2.ply"
-temp-file 
-;
-
-: read-bunny-model ( -- v )
-ply-model-path ascii [  parse-model ] with-file-reader
-
-refs-to-points
-;
-
-: 3points-to-normal ( seq -- v )
-    unclip [ v- ] curry map first2 cross normalize
-;
-: 2-faces-to-prism ( seq seq -- seq )
-  2dup
-    [ do-cycle 2 clump ] bi@ concat-nth  
-    !  3 faces rectangulaires
-    swap prefix
-    swap prefix
-;    
-
-: Xpoints-to-prisme ( seq height -- cube )
-    ! from 3 points gives a list of faces representing 
-    ! a cube of height "height"
-    ! and of based on the three points
-    ! a face is a group of 3 or mode points.   
-    [ dup dup  3points-to-normal ] dip 
-    v*n [ v+ ] curry map ! 2 eme face triangulaire 
-    2-faces-to-prism  
-
-! [ dup number? [ 1 + ] when ] deep-map
-! dup keep 
-;
-
-
-: Xpoints-to-plane4D ( seq x y -- 4Dplane )
-    ! from 3 points gives a list of faces representing 
-    ! a cube in 4th dim
-    ! from x to y (height = y-x)
-    ! and of based on the X points
-    ! a face is a group of 3 or mode points.   
-    '[ [ [ _ suffix ] map ] [ [ _ suffix ] map ] bi ] call
-    2-faces-to-prism
-;
-
-: 3pointsfaces-to-3Dsolidfaces ( seq -- seq )
-    [ 1 Xpoints-to-prisme [ 100 
-        110 Xpoints-to-plane4D ] map concat ] map 
-
-;
-
-: test-figure ( -- solid )
-    <solid> 
-    2 >>dimension
-    { 1 -1 -5 } cut-solid 
-    { -1 -1 -21 } cut-solid 
-    { -1 0 -12 } cut-solid 
-    { 1 2 16 } cut-solid
-;
-

From 202e6df46f74a7f8b882ec73184bf07751c58cd3 Mon Sep 17 00:00:00 2001
From: Jeff Bigot <jeff.bigot@wanadoo.fr>
Date: Fri, 30 Jan 2009 17:55:36 +0100
Subject: [PATCH 20/86] update 4dnav doc

---
 unmaintained/4DNav/4DNav-docs.factor          | 201 ++++++
 unmaintained/4DNav/4DNav.factor               | 556 +++++++++++++++++
 unmaintained/4DNav/authors.txt                |   1 +
 unmaintained/4DNav/camera/authors.txt         |   1 +
 unmaintained/4DNav/camera/camera-docs.factor  |  88 +++
 unmaintained/4DNav/camera/camera.factor       |  19 +
 unmaintained/4DNav/deep/deep-docs.factor      |  31 +
 unmaintained/4DNav/deep/deep.factor           |  13 +
 unmaintained/4DNav/deploy.factor              |  15 +
 unmaintained/4DNav/file-chooser/authors.txt   |   1 +
 .../4DNav/file-chooser/file-chooser.factor    | 157 +++++
 unmaintained/4DNav/hypercube.xml              |  37 ++
 unmaintained/4DNav/light_test.xml             |  62 ++
 unmaintained/4DNav/multi solids.xml           |  50 ++
 unmaintained/4DNav/prismetriagone.xml         |  25 +
 .../4DNav/space-file-decoder/authors.txt      |   1 +
 .../space-file-decoder-docs.factor            |  20 +
 .../space-file-decoder.factor                 |  66 ++
 unmaintained/4DNav/summary.txt                |   1 +
 unmaintained/4DNav/tags.txt                   |   1 +
 unmaintained/4DNav/triancube.xml              |  23 +
 unmaintained/4DNav/turtle/authors.txt         |   1 +
 unmaintained/4DNav/turtle/turtle-docs.factor  |  11 +
 unmaintained/4DNav/turtle/turtle.factor       | 154 +++++
 unmaintained/4DNav/window3D/authors.txt       |   1 +
 .../4DNav/window3D/window3D-docs.factor       |  12 +
 unmaintained/4DNav/window3D/window3D.factor   |  83 +++
 unmaintained/adsoda/adsoda-docs.factor        | 299 +++++++++
 unmaintained/adsoda/adsoda-tests.factor       | 310 ++++++++++
 unmaintained/adsoda/adsoda.factor             | 570 ++++++++++++++++++
 unmaintained/adsoda/adsoda.tests              | 147 +++++
 unmaintained/adsoda/authors.txt               |   2 +
 unmaintained/adsoda/combinators/authors.txt   |   1 +
 .../combinators/combinators-docs.factor       |  39 ++
 .../combinators/combinators-tests.factor      |  11 +
 .../adsoda/combinators/combinators.factor     |  45 ++
 .../adsoda/solution2/solution2.factor         | 126 ++++
 unmaintained/adsoda/solution2/summary.txt     |   1 +
 unmaintained/adsoda/summary.txt               |   1 +
 unmaintained/adsoda/tags.txt                  |   1 +
 unmaintained/adsoda/tools/authors.txt         |   1 +
 unmaintained/adsoda/tools/tools-docs.factor   |  62 ++
 unmaintained/adsoda/tools/tools-tests.factor  |  14 +
 unmaintained/adsoda/tools/tools.factor        | 150 +++++
 44 files changed, 3411 insertions(+)
 create mode 100755 unmaintained/4DNav/4DNav-docs.factor
 create mode 100755 unmaintained/4DNav/4DNav.factor
 create mode 100755 unmaintained/4DNav/authors.txt
 create mode 100755 unmaintained/4DNav/camera/authors.txt
 create mode 100755 unmaintained/4DNav/camera/camera-docs.factor
 create mode 100755 unmaintained/4DNav/camera/camera.factor
 create mode 100755 unmaintained/4DNav/deep/deep-docs.factor
 create mode 100755 unmaintained/4DNav/deep/deep.factor
 create mode 100755 unmaintained/4DNav/deploy.factor
 create mode 100755 unmaintained/4DNav/file-chooser/authors.txt
 create mode 100755 unmaintained/4DNav/file-chooser/file-chooser.factor
 create mode 100755 unmaintained/4DNav/hypercube.xml
 create mode 100755 unmaintained/4DNav/light_test.xml
 create mode 100755 unmaintained/4DNav/multi solids.xml
 create mode 100755 unmaintained/4DNav/prismetriagone.xml
 create mode 100755 unmaintained/4DNav/space-file-decoder/authors.txt
 create mode 100755 unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
 create mode 100755 unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
 create mode 100755 unmaintained/4DNav/summary.txt
 create mode 100755 unmaintained/4DNav/tags.txt
 create mode 100755 unmaintained/4DNav/triancube.xml
 create mode 100755 unmaintained/4DNav/turtle/authors.txt
 create mode 100755 unmaintained/4DNav/turtle/turtle-docs.factor
 create mode 100755 unmaintained/4DNav/turtle/turtle.factor
 create mode 100755 unmaintained/4DNav/window3D/authors.txt
 create mode 100755 unmaintained/4DNav/window3D/window3D-docs.factor
 create mode 100755 unmaintained/4DNav/window3D/window3D.factor
 create mode 100755 unmaintained/adsoda/adsoda-docs.factor
 create mode 100755 unmaintained/adsoda/adsoda-tests.factor
 create mode 100755 unmaintained/adsoda/adsoda.factor
 create mode 100755 unmaintained/adsoda/adsoda.tests
 create mode 100755 unmaintained/adsoda/authors.txt
 create mode 100755 unmaintained/adsoda/combinators/authors.txt
 create mode 100755 unmaintained/adsoda/combinators/combinators-docs.factor
 create mode 100755 unmaintained/adsoda/combinators/combinators-tests.factor
 create mode 100755 unmaintained/adsoda/combinators/combinators.factor
 create mode 100755 unmaintained/adsoda/solution2/solution2.factor
 create mode 100755 unmaintained/adsoda/solution2/summary.txt
 create mode 100755 unmaintained/adsoda/summary.txt
 create mode 100755 unmaintained/adsoda/tags.txt
 create mode 100755 unmaintained/adsoda/tools/authors.txt
 create mode 100755 unmaintained/adsoda/tools/tools-docs.factor
 create mode 100755 unmaintained/adsoda/tools/tools-tests.factor
 create mode 100755 unmaintained/adsoda/tools/tools.factor

diff --git a/unmaintained/4DNav/4DNav-docs.factor b/unmaintained/4DNav/4DNav-docs.factor
new file mode 100755
index 0000000000..95f231ecb9
--- /dev/null
+++ b/unmaintained/4DNav/4DNav-docs.factor
@@ -0,0 +1,201 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel quotations strings ;
+IN: 4DNav
+
+
+HELP: menu-3D
+{ $values
+     { "gadget" "gadget" }
+}
+{ $description "The menu dedicated to 3D movements of the camera" } ;
+
+HELP: menu-4D
+{ $values
+    
+     { "gadget" "gadget" }
+}
+{ $description "The menu dedicated to 4D movements of space" } ;
+
+HELP: menu-bar
+{ $values
+    
+     { "gadget" "gadget" }
+}
+{ $description "return gadget containing menu buttons" } ;
+
+HELP: model-projection
+{ $values
+     { "x" "interger" }
+     { "space" "space" }
+}
+{ $description "Project space following coordinate x" } ;
+
+HELP: mvt-3D-1
+{ $values
+    
+     { "quot" "quotation" }
+}
+{ $description "return a quotation to orientate space to see it from first point of view" } ;
+
+HELP: mvt-3D-2
+{ $values
+    
+     { "quot" "quotation" }
+}
+{ $description "return a quotation to orientate space to see it from second point of view" } ;
+
+HELP: mvt-3D-3
+{ $values
+    
+     { "quot" "quotation" }
+}
+{ $description "return a quotation to orientate space to see it from third point of view" } ;
+
+HELP: mvt-3D-4
+{ $values
+    
+     { "quot" "quotation" }
+}
+{ $description "return a quotation to orientate space to see it from first point of view" } ;
+
+HELP: load-model-file
+{ $description "load space from file" } ;
+
+HELP: rotation-4D
+{ $values
+     { "m" "a rotation matrix" }
+}
+{ $description "Apply a 4D rotation matrix" } ;
+
+HELP: translation-4D
+{ $values
+     { "v" "vector" }
+}
+{ $description "Apply a 4D translation" } ;
+
+
+ARTICLE: "implementation details" "How 4DNav is done"
+"4DNav is build using :"
+
+{ $subsection "4DNav.camera" }
+{ $subsection "adsoda-main-page" }
+;
+
+ARTICLE: "Space file" "Create a new space file"
+"To build a new space, create an XML file using " { $vocab-link "adsoda" } " model description. A solid is not caracterized by its corners but is defined as the intersection of hyperplanes."
+
+$nl
+"An example is:"
+$nl
+
+"\n<model>"
+"\n<space>"
+"\n <dimension>4</dimension>"
+"\n <solid>"
+"\n     <name>4cube1</name>"
+"\n     <dimension>4</dimension>"
+"\n     <face>1,0,0,0,100</face>"
+"\n     <face>-1,0,0,0,-150</face>"
+"\n     <face>0,1,0,0,100</face>"
+"\n     <face>0,-1,0,0,-150</face>"
+"\n     <face>0,0,1,0,100</face>"
+"\n     <face>0,0,-1,0,-150</face>"
+"\n     <face>0,0,0,1,100</face>"
+"\n     <face>0,0,0,-1,-150</face>"
+"\n     <color>1,0,0</color>"
+"\n </solid>"
+"\n <solid>"
+"\n     <name>4triancube</name>"
+"\n     <dimension>4</dimension>"
+"\n     <face>1,0,0,0,160</face>"
+"\n     <face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>"
+"\n     <face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>"
+"\n     <face>0,0,1,0,140</face>"
+"\n     <face>0,0,-1,0,-180</face>"
+"\n     <face>0,0,0,1,110</face>"
+"\n     <face>0,0,0,-1,-180</face>"
+"\n     <color>0,1,0</color>"
+"\n </solid>"
+"\n <solid>"
+"\n     <name>triangone</name>"
+"\n     <dimension>4</dimension>"
+"\n     <face>1,0,0,0,60</face>"
+"\n     <face>0.5,0.8660254037844386,0,0,60</face>"
+"\n     <face>-0.5,0.8660254037844387,0,0,-20</face>"
+"\n     <face>-1.0,0,0,0,-100</face>"
+"\n     <face>-0.5,-0.8660254037844384,0,0,-100</face>"
+"\n     <face>0.5,-0.8660254037844387,0,0,-20</face>"
+"\n     <face>0,0,1,0,120</face>"
+"\n     <face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>"
+"\n     <face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>"
+"\n     <color>0,1,1</color>"
+"\n </solid>"
+"\n <light>"
+"\n     <direction>1,1,1,1</direction>"
+"\n     <color>0.2,0.2,0.6</color>"
+"\n </light>"
+"\n <color>0.8,0.9,0.9</color>"
+"\n</space>"
+"\n</model>"
+
+
+;
+ARTICLE: "TODO" "Todo"
+{ $list 
+    "A vocab to initialize parameters"
+    "an editor mode" 
+        { $list "add a face to a solid"
+                "add a solid to the space"
+                "move a face"
+                "move a solid"
+                "select a solid in a list"
+                "select a face"
+                "display selected face"
+                "edit a solid color"
+                "add a light"
+                "edit a light color"
+                "move a light"
+                }
+    "add a tool wich give an hyperplane normal vector with enought points. Will use adsoda.intersect-hyperplanes with { { 0 } { 0 } { 1 } } "
+    "decorrelate 3D camera and activate them with select buttons"
+
+} ;
+
+
+ARTICLE: "4DNav" "The 4DNav app"
+{ $vocab-link "4DNav" }
+$nl
+{ $heading "4D Navigator" }
+"4DNav is a simple tool to visualize 4 dimensionnal objects."
+"\n"
+"It uses " { $vocab-link "adsoda" } " library to display a 4D space and navigate thru it."
+$nl
+"It will display:"
+{ $list
+    { "a menu window" }
+    {  "4 visualization windows" }
+}
+"Each visualization window represents the projection of the 4D space on a particular 3D space."
+
+{ $heading "Start" }
+"type:" { $code "\"4DNav\" run" } 
+
+{ $heading "Navigation" }
+"Menu window is divided in 4 areas"
+{ $list
+    { "a space-file chooser to select the file to display" }
+    { "a parametrization area to select the projection mode" }
+    { "4D submenu to translate and rotate the 4D space" }
+    { "3D submenu to move the camera in 3D space. Cameras in every 3D spaces are manipulated as a single one" }
+    }
+
+{ $heading "Links" }
+{ $subsection "Space file" }
+
+{ $subsection "TODO" }
+{ $subsection "implementation details" }
+
+;
+
+ABOUT: "4DNav"
diff --git a/unmaintained/4DNav/4DNav.factor b/unmaintained/4DNav/4DNav.factor
new file mode 100755
index 0000000000..91c1c94b35
--- /dev/null
+++ b/unmaintained/4DNav/4DNav.factor
@@ -0,0 +1,556 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel 
+namespaces
+accessors
+make
+math
+math.functions
+math.trig
+math.parser
+hashtables
+sequences
+combinators
+continuations
+colors
+prettyprint
+vars
+quotations
+io
+io.directories
+io.pathnames
+help.markup
+io.files
+ui.gadgets.panes
+ ui
+       ui.gadgets
+       ui.traverse
+       ui.gadgets.borders
+       ui.gadgets.handler
+       ui.gadgets.slate
+       ui.gadgets.theme
+       ui.gadgets.frames
+       ui.gadgets.tracks
+       ui.gadgets.labels
+       ui.gadgets.labelled       
+       ui.gadgets.lists
+       ui.gadgets.buttons
+       ui.gadgets.packs
+       ui.gadgets.grids
+       ui.gestures
+       ui.tools.workspace
+       ui.gadgets.scrollers
+splitting
+vectors
+math.vectors
+rewrite-closures
+self
+values
+4DNav.turtle
+4DNav.window3D
+4DNav.deep
+4DNav.space-file-decoder
+models
+fry
+adsoda
+adsoda.tools
+;
+
+IN: 4DNav
+VALUE: selected-file
+VALUE: translation-step
+VALUE: rotation-step
+
+3 to: translation-step 
+5 to: rotation-step
+
+VAR: selected-file-model
+VAR: observer3d 
+VAR: view1 
+VAR: view2
+VAR: view3
+VAR: view4
+VAR: present-space
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+! replacement of namespaces.lib
+    
+: make* ( seq -- seq ) [ dup quotation? [ call ] [ ] if ] map ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! waiting for deep-cleave-quots
+
+: 4D-Rxy ( angle -- Rx ) deg>rad
+[ 1.0 , 0.0 , 0.0       , 0.0 ,
+  0.0 , 1.0 , 0.0       , 0.0 ,
+  0.0 , 0.0 , dup cos  , dup sin neg  ,
+  0.0 , 0.0 , dup sin  , dup cos  ,  ] 4 make-matrix nip ;
+
+: 4D-Rxz ( angle -- Ry ) deg>rad
+[ 1.0 , 0.0       , 0.0 , 0.0 ,
+  0.0 , dup cos  , 0.0 , dup sin neg  ,
+  0.0 , 0.0       , 1.0 , 0.0 ,
+  0.0 , dup sin  , 0.0 , dup cos  ,  ] 4 make-matrix nip ;
+
+: 4D-Rxw ( angle -- Rz ) deg>rad
+[ 1.0 , 0.0       , 0.0           , 0.0 ,
+  0.0 , dup cos  , dup sin neg  , 0.0 ,
+  0.0 , dup sin  , dup cos     , 0.0 ,
+  0.0 , 0.0       , 0.0           , 1.0 , ] 4 make-matrix nip ;
+
+: 4D-Ryz ( angle -- Rx ) deg>rad
+[ dup cos  , 0.0 , 0.0 , dup sin neg  ,
+  0.0       , 1.0 , 0.0 , 0.0 ,
+  0.0       , 0.0 , 1.0 , 0.0 ,
+  dup sin  , 0.0 , 0.0 , dup cos  ,   ] 4 make-matrix nip ;
+
+: 4D-Ryw ( angle -- Ry ) deg>rad
+[ dup cos  , 0.0 , dup sin neg  , 0.0 ,
+  0.0       , 1.0 , 0.0           , 0.0 ,
+  dup sin  , 0.0 , dup cos     , 0.0 ,
+  0.0       , 0.0 , 0.0        , 1.0 ,  ] 4 make-matrix nip ;
+
+: 4D-Rzw ( angle -- Rz ) deg>rad
+[ dup cos  , dup sin neg  , 0.0 , 0.0 ,
+  dup sin  , dup cos     , 0.0 , 0.0 ,
+  0.0       , 0.0           , 1.0 , 0.0 ,
+  0.0       , 0.0          , 0.0 , 1.0 ,  ] 4 make-matrix nip ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! UI
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: button* ( string quot -- button ) 
+    closed-quot <repeat-button>  ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: model-projection-chooser ( -- gadget )
+   observer3d> projection-mode>>
+   { { 1 "perspective" } { 0 "orthogonal" } } 
+   <toggle-buttons> ;
+
+: collision-detection-chooser ( -- gadget )
+   observer3d> collision-mode>>
+   { { t "on" } { f "off" }  } <toggle-buttons> ;
+
+: model-projection ( x -- space ) 
+    present-space>  swap space-project ;
+
+: update-observer-projections (  -- )
+    view1> relayout-1 
+    view2> relayout-1 
+    view3> relayout-1 
+    view4> relayout-1 ;
+
+: update-model-projections (  -- )
+    0 model-projection <model> view1> (>>model)
+    1 model-projection <model> view2> (>>model)
+    2 model-projection <model> view3> (>>model)
+    3 model-projection <model> view4> (>>model) ;
+
+: camera-action ( quot -- quot ) 
+    [ drop [ ] observer3d>  
+    with-self update-observer-projections ] 
+    make* closed-quot ;
+
+: win3D ( text gadget -- ) 
+    "navigateur 4D : " rot append open-window ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! 4D object manipulation
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: (mvt-4D) ( quot -- )   
+    present-space>  
+        swap call space-ensure-solids 
+    >present-space 
+    update-model-projections 
+    update-observer-projections ;
+
+: rotation-4D ( m -- ) 
+    '[ _ [ [ middle-of-space dup vneg ] keep 
+        swap space-translate ] dip
+         space-transform 
+         swap space-translate
+    ] (mvt-4D) ;
+
+: translation-4D ( v -- ) '[ _ space-translate ] (mvt-4D) ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! menu
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: menu-rotations-4D ( -- gadget )
+    <frame>
+         <pile> 1 >>fill
+          "XY +" [ drop rotation-step 4D-Rxy rotation-4D ] 
+                button* add-gadget
+          "XY -" [ drop rotation-step neg 4D-Rxy rotation-4D ] 
+                button* add-gadget 
+       @top-left grid-add    
+        <pile> 1 >>fill
+          "XZ +" [ drop rotation-step 4D-Rxz rotation-4D ] 
+                button* add-gadget
+          "XZ -" [ drop rotation-step neg 4D-Rxz rotation-4D ] 
+                button* add-gadget 
+       @top grid-add    
+        <pile> 1 >>fill
+          "YZ +" [ drop rotation-step 4D-Ryz rotation-4D ] 
+                button* add-gadget
+          "YZ -" [ drop rotation-step neg 4D-Ryz rotation-4D ] 
+                button* add-gadget 
+        @center grid-add
+         <pile> 1 >>fill
+          "XW +" [ drop rotation-step 4D-Rxw rotation-4D ] 
+                button* add-gadget
+          "XW -" [ drop rotation-step neg 4D-Rxw rotation-4D ] 
+                button* add-gadget 
+        @top-right grid-add   
+         <pile> 1 >>fill
+          "YW +" [ drop rotation-step 4D-Ryw rotation-4D ] 
+                button* add-gadget
+          "YW -" [ drop rotation-step neg 4D-Ryw rotation-4D ] 
+                button* add-gadget 
+       @right grid-add    
+         <pile> 1 >>fill
+          "ZW +" [ drop rotation-step 4D-Rzw rotation-4D ] 
+                button* add-gadget
+          "ZW -" [ drop rotation-step neg 4D-Rzw rotation-4D ] 
+                button* add-gadget 
+       @bottom-right grid-add    
+;
+
+: menu-translations-4D ( -- gadget )
+    <frame> 
+        <pile> 1 >>fill
+            <shelf> 1 >>fill  
+                "X+" [ drop {  1 0 0 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget
+                "X-" [ drop { -1 0 0 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget 
+            add-gadget
+            "YZW" <label> add-gadget
+         @bottom-right grid-add
+         <pile> 1 >>fill
+            "XZW" <label> add-gadget
+            <shelf> 1 >>fill
+                "Y+" [ drop  { 0  1 0 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget
+                "Y-" [ drop  { 0 -1 0 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget 
+                add-gadget
+         @top-right grid-add
+         <pile> 1 >>fill
+            "XYW" <label> add-gadget
+            <shelf> 1 >>fill
+                "Z+" [ drop { 0 0  1 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget
+                "Z-" [ drop { 0 0 -1 0 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget 
+                add-gadget                 
+        @top-left grid-add     
+        <pile> 1 >>fill
+            <shelf> 1 >>fill
+                "W+" [ drop { 0 0 0 1  } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget
+                "W-" [ drop { 0 0 0 -1 } translation-step v*n 
+                    translation-4D ] 
+                    button* add-gadget 
+                add-gadget
+            "XYZ" <label> add-gadget
+        @bottom-left grid-add 
+        "X" <label> @center grid-add
+;
+
+: menu-4D ( -- gadget )  
+    <shelf> 
+        "rotations" <label>     add-gadget
+        menu-rotations-4D       add-gadget
+        "translations" <label>  add-gadget
+        menu-translations-4D    add-gadget
+        0.5 >>align
+        { 0 10 } >>gap
+;
+
+
+! ------------------------------------------------------
+
+: redraw-model ( space -- )
+    >present-space 
+    update-model-projections 
+    update-observer-projections ;
+
+: load-model-file ( -- )
+  selected-file dup selected-file-model> set-model 
+  read-model-file 
+  redraw-model ;
+
+: mvt-3D-X ( turn pitch -- quot )
+    '[ turtle-pos> norm neg reset-turtle 
+        _ turn-left 
+        _ pitch-up 
+        step-turtle ] ;
+
+: mvt-3D-1 ( -- quot )      90  0 mvt-3D-X ; inline
+: mvt-3D-2 ( -- quot )      0  90 mvt-3D-X ; inline
+: mvt-3D-3 ( -- quot )      0   0 mvt-3D-X ; inline
+: mvt-3D-4 ( -- quot )      45 45 mvt-3D-X ; inline
+
+: camera-button ( string quot -- button ) 
+    [ <label>  ] dip camera-action <repeat-button> ;
+
+! ----------------------------------------------------------
+! file chooser
+! ----------------------------------------------------------
+: <run-file-button> ( file-name -- button )
+  dup '[ drop  _  \ selected-file set-value load-model-file 
+   ] 
+ closed-quot  <roll-button> { 0 0 } >>align ;
+
+: <list-runner> ( -- gadget )
+    "resource:extra/4DNav" 
+  <pile> 1 >>fill 
+    over dup directory-files  
+    [ ".xml" tail? ] filter 
+    [ append-path ] with map
+    [ <run-file-button> add-gadget ] each
+    swap <labelled-gadget> ;
+
+! -----------------------------------------------------
+
+: menu-rotations-3D ( -- gadget )
+    <frame>
+        "Turn\n left"  [ rotation-step  turn-left  ] 
+            camera-button   @left grid-add     
+        "Turn\n right" [ rotation-step turn-right ] 
+            camera-button   @right grid-add     
+        "Pitch down"   [ rotation-step  pitch-down ] 
+            camera-button   @bottom grid-add     
+        "Pitch up"     [ rotation-step  pitch-up   ] 
+            camera-button   @top grid-add     
+        <shelf>  1 >>fill
+            "Roll left\n (ctl)"  [ rotation-step  roll-left  ] 
+                camera-button   add-gadget  
+            "Roll right\n(ctl)"  [ rotation-step  roll-right ] 
+                camera-button   add-gadget  
+        @center grid-add 
+;
+
+: menu-translations-3D ( -- gadget )
+    <frame>
+        "left\n(alt)"        [ translation-step  strafe-left  ]
+            camera-button @left grid-add  
+        "right\n(alt)"       [ translation-step  strafe-right ]
+            camera-button @right grid-add     
+        "Strafe up \n (alt)" [ translation-step strafe-up    ] 
+            camera-button @top grid-add
+        "Strafe down\n (alt)" [ translation-step strafe-down  ]
+            camera-button @bottom grid-add    
+        <pile>  1 >>fill
+            "Forward (ctl)"  [  translation-step step-turtle ] 
+                camera-button add-gadget
+            "Backward (ctl)" 
+                [ translation-step neg step-turtle ] 
+                camera-button   add-gadget
+        @center grid-add
+;
+
+: menu-quick-views ( -- gadget )
+    <shelf>
+        "View 1 (1)" mvt-3D-1 camera-button   add-gadget
+        "View 2 (2)" mvt-3D-2 camera-button   add-gadget
+        "View 3 (3)" mvt-3D-3 camera-button   add-gadget 
+        "View 4 (4)" mvt-3D-4 camera-button   add-gadget 
+;
+
+: menu-3D ( -- gadget ) 
+    <pile>
+        <shelf>   
+            menu-rotations-3D    add-gadget
+            menu-translations-3D add-gadget
+            0.5 >>align
+            { 0 10 } >>gap
+        add-gadget
+        menu-quick-views add-gadget ; 
+
+: add-keyboard-delegate ( obj -- obj )
+ <handler>
+{
+        { T{ key-down f f "LEFT" }  
+            [ [ rotation-step turn-left ] camera-action ] }
+        { T{ key-down f f "RIGHT" } 
+            [ [ rotation-step turn-right ] camera-action ] }
+        { T{ key-down f f "UP" }    
+            [ [ rotation-step pitch-down ] camera-action ] }
+        { T{ key-down f f "DOWN" }  
+            [ [ rotation-step pitch-up ] camera-action ] }
+
+        { T{ key-down f { C+ } "UP" } 
+           [ [ translation-step step-turtle ] camera-action ] }
+        { T{ key-down f { C+ } "DOWN" } 
+            [ [ translation-step neg step-turtle ] 
+                    camera-action ] }
+        { T{ key-down f { C+ } "LEFT" } 
+            [ [ rotation-step roll-left ] camera-action ] }
+        { T{ key-down f { C+ } "RIGHT" } 
+            [ [ rotation-step roll-right ] camera-action ] }
+
+        { T{ key-down f { A+ } "LEFT" }  
+           [ [ translation-step strafe-left ] camera-action ] }
+        { T{ key-down f { A+ } "RIGHT" } 
+          [ [ translation-step strafe-right ] camera-action ] }
+        { T{ key-down f { A+ } "UP" }    
+            [ [ translation-step strafe-up ] camera-action ] }
+        { T{ key-down f { A+ } "DOWN" }  
+           [ [ translation-step strafe-down ] camera-action ] }
+
+
+        { T{ key-down f f "1" } [ mvt-3D-1 camera-action ] }
+        { T{ key-down f f "2" } [ mvt-3D-2 camera-action ] }
+        { T{ key-down f f "3" } [ mvt-3D-3  camera-action ] }
+        { T{ key-down f f "4" } [ mvt-3D-4  camera-action ] }
+
+    } [ make* ] map >hashtable >>table
+    ;    
+
+! --------------------------------------------
+! print elements 
+! --------------------------------------------
+! print-content
+
+GENERIC: adsoda-display-model ( x -- ) 
+
+M: light adsoda-display-model 
+"\n light : " .
+     { 
+        [ direction>> "direction : " pprint . ] 
+        [ color>> "color : " pprint . ]
+    }   cleave
+    ;
+
+M: face adsoda-display-model 
+     {
+        [ halfspace>> "halfspace : " pprint . ] 
+        [ touching-corners>> "touching corners : " pprint . ]
+    }   cleave
+    ;
+M: solid adsoda-display-model 
+     {
+        [ name>> "solid called : " pprint . ] 
+        [ color>> "color : " pprint . ]
+        [ dimension>> "dimension : " pprint . ]
+        [ faces>> "composed of faces : " pprint 
+            [ adsoda-display-model ] each ]
+    }   cleave
+    ;
+M: space adsoda-display-model 
+     {
+        [ dimension>> "dimension : " pprint . ] 
+        [ ambient-color>> "ambient-color : " pprint . ]
+        [ solids>> "composed of solids : " pprint 
+            [ adsoda-display-model ] each ]
+        [ lights>> "composed of lights : " pprint 
+            [ adsoda-display-model ] each ] 
+    }   cleave
+    ;
+
+! ----------------------------------------------
+: menu-bar ( -- gadget )
+       <shelf>
+          "reinit" [ drop load-model-file ] button* add-gadget
+          selected-file-model> <label-control> add-gadget
+    ;
+
+
+: controller-window* ( -- gadget )
+    { 0 1 } <track>
+        menu-bar f track-add
+        <list-runner>  
+            <limited-scroller>  
+            { 200 400 } >>max-dim
+        f track-add
+        <shelf>
+            "Projection mode : " <label> add-gadget
+            model-projection-chooser add-gadget
+        f track-add
+        <shelf>
+            "Collision detection (slow and buggy ) : " 
+                <label> add-gadget
+            collision-detection-chooser add-gadget
+        f track-add
+        <pile>
+            0.5 >>align    
+            menu-4D add-gadget 
+            light-purple solid-interior
+            "4D movements" <labelled-gadget>
+        f track-add
+        <pile>
+            0.5 >>align
+            { 2 2 } >>gap
+            menu-3D add-gadget
+            light-purple solid-interior 
+            "Camera 3D" <labelled-gadget>
+        f track-add      
+        gray solid-interior
+ ;
+ 
+: viewer-windows* ( --  )
+    "YZW" view1> win3D 
+    "XZW" view2> win3D 
+    "XYW" view3> win3D 
+    "XYZ" view4> win3D   
+;
+
+: navigator-window* ( -- )
+    controller-window*
+    viewer-windows*   
+    add-keyboard-delegate
+    "navigateur 4D" open-window
+;
+
+: windows ( -- ) [ [ navigator-window* ] with-scope ] with-ui ;
+
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: init-variables ( -- )
+    "choose a file" <model> >selected-file-model  
+    <observer> >observer3d
+    [ observer3d> >self
+      reset-turtle 
+      45 turn-left 
+      45 pitch-up 
+      -300 step-turtle 
+    ] with-scope
+    
+;
+
+
+: init-models ( -- )
+    0 model-projection observer3d> <window3D> >view1
+    1 model-projection observer3d> <window3D> >view2
+    2 model-projection observer3d> <window3D> >view3
+    3 model-projection observer3d> <window3D> >view4
+;
+
+: 4DNav ( -- ) 
+    init-variables
+    selected-file read-model-file >present-space
+    init-models
+    windows
+;
+
+MAIN: 4DNav
+
+
diff --git a/unmaintained/4DNav/authors.txt b/unmaintained/4DNav/authors.txt
new file mode 100755
index 0000000000..a6a96933f4
--- /dev/null
+++ b/unmaintained/4DNav/authors.txt
@@ -0,0 +1 @@
+Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/camera/authors.txt b/unmaintained/4DNav/camera/authors.txt
new file mode 100755
index 0000000000..bbc876e7b6
--- /dev/null
+++ b/unmaintained/4DNav/camera/authors.txt
@@ -0,0 +1 @@
+Adam Wendt
diff --git a/unmaintained/4DNav/camera/camera-docs.factor b/unmaintained/4DNav/camera/camera-docs.factor
new file mode 100755
index 0000000000..4898c4e580
--- /dev/null
+++ b/unmaintained/4DNav/camera/camera-docs.factor
@@ -0,0 +1,88 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel ;
+IN: 4DNav.camera
+
+HELP: camera-eye
+{ $values
+    
+     { "point" "position" }
+}
+{ $description "return the position of the camera" } ;
+
+HELP: camera-focus
+{ $values
+    
+     { "point" "position" }
+}
+{ $description "return the point the camera looks at" } ;
+
+HELP: camera-up
+{ $values
+    
+     { "dirvec" "upside direction" }
+}
+{ $description "In order to precise the roling position of camera give an upward vector" } ;
+
+HELP: do-look-at
+{ $values
+     { "camera" "direction" }
+}
+{ $description "Word to use in replacement of gl-look-at when using a camera" } ;
+
+ARTICLE: "4DNav.camera" "Camera"
+{ $vocab-link "4DNav.camera" }
+"\n"
+"A camera is defined by:"
+{ $list
+{ "a position (" { $link camera-eye } ")" }
+{ "a focus direction (" { $link camera-focus } ")\n" }
+{ "an attitude information (" { $link camera-up } ")\n" }
+}
+"\nUse " { $link do-look-at } " in opengl statement in placement of gl-look-at"
+"\n\n"
+"A camera is a " { $vocab-link "4DNav.turtle" } " object. Its a special vocab to handle mouvements of a 3D object:"
+{ $list
+{ "To define a camera"
+{
+    $unchecked-example
+    
+"VAR: my-camera"
+": init-my-camera ( -- )"
+"    <turtle> >my-camera"
+"    [ my-camera> >self"
+"      reset-turtle "
+"    ] with-scope ;"
+} }
+{ "To move it"
+{
+    $unchecked-example
+
+"    [ my-camera> >self"
+"      45 pitch-up "
+"      5 step-turtle" 
+"    ] with-scope "
+} }
+{ "or"
+{
+    $unchecked-example
+
+"    [ my-camera> >self"
+"      5 strafe-left"
+"    ] with-scope "
+}
+}
+{
+"to use it in an opengl statement"
+{
+    $unchecked-example
+  "my-camera> do-look-at"
+
+}
+}
+}
+
+
+;
+
+ABOUT: "4DNav.camera"
diff --git a/unmaintained/4DNav/camera/camera.factor b/unmaintained/4DNav/camera/camera.factor
new file mode 100755
index 0000000000..1e492fe8d9
--- /dev/null
+++ b/unmaintained/4DNav/camera/camera.factor
@@ -0,0 +1,19 @@
+USING: kernel namespaces math.vectors opengl 4DNav.turtle 
+self ;
+
+IN: 4DNav.camera
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: camera-eye ( -- point ) turtle-pos> ;
+
+: camera-focus ( -- point ) 
+    [ 1 step-turtle turtle-pos> ] save-self ;
+
+: camera-up ( -- dirvec )
+[ 90 pitch-up turtle-pos> 1 step-turtle turtle-pos> swap v- ] 
+    save-self ;
+
+: do-look-at ( camera -- )
+[ >self camera-eye camera-focus camera-up gl-look-at ] 
+    with-scope ;
diff --git a/unmaintained/4DNav/deep/deep-docs.factor b/unmaintained/4DNav/deep/deep-docs.factor
new file mode 100755
index 0000000000..78439c6c0f
--- /dev/null
+++ b/unmaintained/4DNav/deep/deep-docs.factor
@@ -0,0 +1,31 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel quotations sequences ;
+IN: 4DNav.deep
+
+! HELP: deep-cleave-quots
+! { $values
+!     { "seq" sequence }
+!     { "quot" quotation }
+! }
+! { $description "A word to build a soquence from a sequence of quotation" }
+! 
+! { $examples
+! "It is useful to build matrix"
+! { $example "USING: math math.trig ; "
+!     " 30 deg>rad "
+!    "  {  { [ cos ] [ sin neg ]   0 } "
+!    "     { [ sin ] [ cos ]       0 } "
+!    "     {   0       0           1 } "
+!    "  } deep-cleave-quots " 
+!     " "
+! 
+! 
+! } }
+! ;
+
+ARTICLE: "4DNav.deep" "Deep"
+{ $vocab-link "4DNav.deep" }
+;
+
+ABOUT: "4DNav.deep"
diff --git a/unmaintained/4DNav/deep/deep.factor b/unmaintained/4DNav/deep/deep.factor
new file mode 100755
index 0000000000..b18000a84c
--- /dev/null
+++ b/unmaintained/4DNav/deep/deep.factor
@@ -0,0 +1,13 @@
+USING: macros quotations math math.functions math.trig 
+sequences.deep kernel make fry combinators grouping ;
+IN: 4DNav.deep
+
+! USING: bake ;
+! MACRO: deep-cleave-quots ( seq -- quot )
+!    [ [ quotation? ] deep-filter ]
+!    [ [ dup quotation? [ drop , ] when ] deep-map ]
+!    bi '[ _ cleave _ bake ] ;
+
+: make-matrix ( quot width -- matrix ) 
+    [ { } make ] dip group ; inline
+
diff --git a/unmaintained/4DNav/deploy.factor b/unmaintained/4DNav/deploy.factor
new file mode 100755
index 0000000000..e39f91acf6
--- /dev/null
+++ b/unmaintained/4DNav/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-c-types? t }
+    { deploy-word-props? t }
+    { deploy-name "4DNav" }
+    { deploy-ui? t }
+    { deploy-math? t }
+    { deploy-threads? t }
+    { deploy-reflection 3 }
+    { deploy-compiler? t }
+    { deploy-unicode? t }
+    { deploy-io 3 }
+    { "stop-after-last-window?" t }
+    { deploy-word-defs? t }
+}
diff --git a/unmaintained/4DNav/file-chooser/authors.txt b/unmaintained/4DNav/file-chooser/authors.txt
new file mode 100755
index 0000000000..a6a96933f4
--- /dev/null
+++ b/unmaintained/4DNav/file-chooser/authors.txt
@@ -0,0 +1 @@
+Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/file-chooser/file-chooser.factor b/unmaintained/4DNav/file-chooser/file-chooser.factor
new file mode 100755
index 0000000000..d7c869ce2f
--- /dev/null
+++ b/unmaintained/4DNav/file-chooser/file-chooser.factor
@@ -0,0 +1,157 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING:
+kernel
+io.files
+io.backend
+io.directories
+io.files.info
+io.pathnames
+sequences
+models
+strings
+ui
+ui.operations
+ui.commands
+ui.gestures
+ui.gadgets
+ui.gadgets.buttons
+ui.gadgets.lists
+ui.gadgets.labels
+ui.gadgets.tracks
+ui.gadgets.packs
+ui.gadgets.panes
+ui.gadgets.scrollers
+prettyprint
+combinators
+rewrite-closures
+accessors
+values
+tools.walker
+fry
+;
+IN: 4DNav.file-chooser
+
+TUPLE: file-chooser < track 
+    path
+    extension 
+    selected-file
+    presenter
+    hook  
+    list
+    ;
+
+: find-file-list ( gadget -- list )
+    [ file-chooser? ] find-parent list>> ;
+
+file-chooser H{
+    { T{ key-down f f "UP" } 
+        [ find-file-list select-previous ] }
+    { T{ key-down f f "DOWN" } 
+        [ find-file-list select-next ] }
+    { T{ key-down f f "PAGE_UP" } 
+        [ find-file-list list-page-up ] }
+    { T{ key-down f f "PAGE_DOWN" } 
+        [ find-file-list list-page-down ] }
+    { T{ key-down f f "RET" } 
+        [ find-file-list invoke-value-action ] }
+    { T{ button-down } 
+        request-focus }
+    { T{ button-down f 1 } 
+        [ find-file-list invoke-value-action ]  }
+} set-gestures
+
+: list-of-files ( file-chooser -- seq )
+     [ path>> value>> directory-entries ] [ extension>> ] bi
+     '[ [ name>> _ [ tail? ] with any? ] 
+     [ directory? ] bi or ]  filter
+;
+
+: update-filelist-model ( file-chooser -- file-chooser )
+    [ list-of-files ] [ model>> ] bi set-model ;
+
+: init-filelist-model ( file-chooser -- file-chooser )
+    dup list-of-files <model> >>model ; 
+
+: (fc-go) ( file-chooser quot -- )
+    [ [ file-chooser? ] find-parent dup path>> ] dip
+    call
+    normalize-path swap set-model
+    update-filelist-model
+    drop ;
+
+: fc-go-parent ( file-chooser -- )
+    [ dup value>> parent-directory ] (fc-go) ;
+
+: fc-go-home ( file-chooser -- )
+    [ home ] (fc-go) ;
+
+: fc-change-directory ( file-chooser file -- file-chooser )
+    dupd [ path>> value>> normalize-path ] [ name>> ] bi* 
+    append-path over path>> set-model    
+    update-filelist-model
+;
+
+: fc-load-file ( file-chooser file -- )
+  dupd [ selected-file>> ] [ name>> ] bi* swap set-model 
+  [ path>> value>> ] 
+  [ selected-file>> value>> append ] 
+  [ hook>> ] tri
+  call
+; inline
+
+! : fc-ok-action ( file-chooser -- quot )
+!  dup selected-file>> value>>  "" =
+!    [ drop [ drop ] ] [    
+!            [ path>> value>> ] 
+!            [ selected-file>> value>> append ] 
+!            [ hook>> prefix ] tri
+!        [ drop ] prepend
+!    ]  if ; 
+
+: line-selected-action ( file-chooser -- )
+     dup list>> list-value
+     dup directory? 
+     [ fc-change-directory ] [ fc-load-file ] if ;
+
+: present-dir-element ( element -- string )
+    [ name>> ] [ directory? ] bi   [ "-> " prepend ] when ;
+
+: <file-list> ( file-chooser -- list )
+  dup [ nip line-selected-action ] curry 
+  [ present-dir-element ] rot model>> <list> ;
+
+: <file-chooser> ( hook path extension -- gadget )
+    { 0 1 } file-chooser new-track
+    swap >>extension
+    swap <model> >>path
+    "" <model> >>selected-file
+    swap >>hook
+    init-filelist-model
+    dup <file-list> >>list
+    "choose a file in directory " <label> f track-add
+    dup path>> <label-control> f track-add
+    dup extension>> ", " join "limited to : " prepend 
+        <label> f track-add
+    <shelf> 
+        "selected file : " <label> add-gadget
+        over selected-file>> <label-control> add-gadget
+    f track-add
+    <shelf> 
+        over [  swap fc-go-parent ] curry  "go up" 
+            swap <bevel-button> add-gadget
+        over [  swap fc-go-home ] curry  "go home" 
+            swap <bevel-button> add-gadget
+    !    over [ swap fc-ok-action ] curry "OK" 
+    !    swap <bevel-button> add-gadget
+    !    [ drop ]  "Cancel" swap <bevel-button> add-gadget
+    f track-add
+    dup list>> <scroller> 1 track-add
+;
+
+M: file-chooser pref-dim* drop { 400 200 } ;
+
+: file-chooser-window ( -- )
+    [ . ] home { "xml" "txt" }   <file-chooser> 
+    "Choose a file" open-window ;
+
diff --git a/unmaintained/4DNav/hypercube.xml b/unmaintained/4DNav/hypercube.xml
new file mode 100755
index 0000000000..0d46e3b315
--- /dev/null
+++ b/unmaintained/4DNav/hypercube.xml
@@ -0,0 +1,37 @@
+<model>
+<space>
+	<name>hypercube</name>
+	<dimension>4</dimension>
+	<solid>
+		<name>4cube1</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,100</face>
+		<face>-1,0,0,0,-150</face>
+		<face>0,1,0,0,100</face>
+		<face>0,-1,0,0,-150</face>
+		<face>0,0,1,0,100</face>
+		<face>0,0,-1,0,-150</face>
+		<face>0,0,0,1,100</face>
+		<face>0,0,0,-1,-150</face>
+		<color>1,0,0</color>
+	</solid>
+	<solid>
+		<name>4cube1</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,100</face>
+		<face>-1,0,0,0,-150</face>
+		<face>0,1,0,0,100</face>
+		<face>0,-1,0,0,-150</face>
+		<face>0,0,1,0,100</face>
+		<face>0,0,-1,0,-150</face>
+		<face>0,0,0,1,100</face>
+		<face>0,0,0,-1,-150</face>
+		<color>1,0,0</color>
+	</solid>
+	<light>
+		<direction>1,1,1,1</direction>
+		<color>0.2,0.2,0.6</color>
+	</light>
+	<color>0.8,0.9,0.9</color>
+</space>
+</model>
diff --git a/unmaintained/4DNav/light_test.xml b/unmaintained/4DNav/light_test.xml
new file mode 100755
index 0000000000..b7d750ddaa
--- /dev/null
+++ b/unmaintained/4DNav/light_test.xml
@@ -0,0 +1,62 @@
+<model>
+<space>
+	<name>multi solids</name>
+	<dimension>4</dimension>
+	<solid>
+		<name>4cube1</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,100</face>
+		<face>-1,0,0,0,-150</face>
+		<face>0,1,0,0,100</face>
+		<face>0,-1,0,0,-150</face>
+		<face>0,0,1,0,100</face>
+		<face>0,0,-1,0,-150</face>
+		<face>0,0,0,1,100</face>
+		<face>0,0,0,-1,-150</face>
+		<color>1,1,1</color>
+	</solid>
+	<solid>
+		<name>4triancube</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,160</face>
+        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
+		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
+		<face>0,0,1,0,140</face>
+		<face>0,0,-1,0,-180</face>
+		<face>0,0,0,1,110</face>
+		<face>0,0,0,-1,-180</face>
+		<color>1,1,1</color>
+	</solid>
+	<solid>
+		<name>triangone</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,60</face>
+		<face>0.5,0.8660254037844386,0,0,60</face>
+		<face>-0.5,0.8660254037844387,0,0,-20</face>
+		<face>-1.0,0,0,0,-100</face>
+		<face>-0.5,-0.8660254037844384,0,0,-100</face>
+		<face>0.5,-0.8660254037844387,0,0,-20</face>
+		<face>0,0,1,0,120</face>
+        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
+		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
+		<color>1,1,1</color>
+	</solid>
+	<light>
+		<direction>1,0,0,0</direction>
+		<color>0,0,0,0.6</color>
+	</light>
+	<light>
+		<direction>0,1,0,0</direction>
+		<color>0,0.6,0,0</color>
+	</light>
+	<light>
+		<direction>0,0,1,0</direction>
+		<color>0,0,0.6,0</color>
+	</light>
+	<light>
+		<direction>0,0,0,1</direction>
+		<color>0.6,0.6,0.6</color>
+	</light>
+	<color>0.99,0.99,0.99</color>
+</space>
+</model>
diff --git a/unmaintained/4DNav/multi solids.xml b/unmaintained/4DNav/multi solids.xml
new file mode 100755
index 0000000000..b401e988b9
--- /dev/null
+++ b/unmaintained/4DNav/multi solids.xml	
@@ -0,0 +1,50 @@
+<model>
+<space>
+	<name>multi solids</name>
+	<dimension>4</dimension>
+	<solid>
+		<name>4cube1</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,100</face>
+		<face>-1,0,0,0,-150</face>
+		<face>0,1,0,0,100</face>
+		<face>0,-1,0,0,-150</face>
+		<face>0,0,1,0,100</face>
+		<face>0,0,-1,0,-150</face>
+		<face>0,0,0,1,100</face>
+		<face>0,0,0,-1,-150</face>
+		<color>1,0,0</color>
+	</solid>
+	<solid>
+		<name>4triancube</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,160</face>
+        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
+		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
+		<face>0,0,1,0,140</face>
+		<face>0,0,-1,0,-180</face>
+		<face>0,0,0,1,110</face>
+		<face>0,0,0,-1,-180</face>
+		<color>0,1,0</color>
+	</solid>
+	<solid>
+		<name>triangone</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,60</face>
+		<face>0.5,0.8660254037844386,0,0,60</face>
+		<face>-0.5,0.8660254037844387,0,0,-20</face>
+		<face>-1.0,0,0,0,-100</face>
+		<face>-0.5,-0.8660254037844384,0,0,-100</face>
+		<face>0.5,-0.8660254037844387,0,0,-20</face>
+		<face>0,0,1,0,120</face>
+        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
+		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
+		<color>0,1,1</color>
+	</solid>
+	<light>
+		<direction>1,1,1,1</direction>
+		<color>0.2,0.2,0.6</color>
+	</light>
+	<color>0.8,0.9,0.9</color>
+</space>
+</model>
diff --git a/unmaintained/4DNav/prismetriagone.xml b/unmaintained/4DNav/prismetriagone.xml
new file mode 100755
index 0000000000..cbdc071f97
--- /dev/null
+++ b/unmaintained/4DNav/prismetriagone.xml
@@ -0,0 +1,25 @@
+<model>
+<space>
+	<name>Prismetragone</name>		
+	<dimension>4</dimension>
+	<solid>
+		<name>triangone</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,60</face>
+		<face>0.5,0.8660254037844386,0,0,60</face>
+		<face>-0.5,0.8660254037844387,0,0,-20</face>
+		<face>-1.0,0,0,0,-100</face>
+		<face>-0.5,-0.8660254037844384,0,0,-100</face>
+		<face>0.5,-0.8660254037844387,0,0,-20</face>
+		<face>0,0,1,0,120</face>
+        	<face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
+		<face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
+		<color>0,1,1</color>
+	</solid>
+	<light>
+		<direction>1,1,1,1</direction>
+		<color>0.2,0.2,0.6</color>
+	</light>
+	<color>0.8,0.9,0.9</color>
+</space>
+</model>
diff --git a/unmaintained/4DNav/space-file-decoder/authors.txt b/unmaintained/4DNav/space-file-decoder/authors.txt
new file mode 100755
index 0000000000..a6a96933f4
--- /dev/null
+++ b/unmaintained/4DNav/space-file-decoder/authors.txt
@@ -0,0 +1 @@
+Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor b/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
new file mode 100755
index 0000000000..0a7816636f
--- /dev/null
+++ b/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
@@ -0,0 +1,20 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel ;
+IN: 4DNav.space-file-decoder
+
+
+
+HELP: read-model-file
+{ $values
+    
+     { "path" "path to the file to read" }
+     { "x" "value" }
+}
+{ $description "Read a file containing the xml description of the model" } ;
+
+ARTICLE: "4DNav.space-file-decoder" "Space XMLfile decoder"
+{ $vocab-link "4DNav.space-file-decoder" }
+;
+
+ABOUT: "4DNav.space-file-decoder"
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor b/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
new file mode 100755
index 0000000000..872ddbcee3
--- /dev/null
+++ b/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
@@ -0,0 +1,66 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: adsoda xml xml.utilities xml.dispatch accessors 
+combinators sequences math.parser kernel splitting values 
+continuations ;
+IN: 4DNav.space-file-decoder
+
+: decode-number-array ( x -- y )  
+    "," split [ string>number ] map ;
+
+PROCESS: adsoda-read-model ( tag -- )
+
+TAG: dimension adsoda-read-model 
+    children>> first string>number ;
+TAG: direction adsoda-read-model 
+    children>> first decode-number-array ;
+TAG: color     adsoda-read-model 
+    children>> first decode-number-array ;
+TAG: name      adsoda-read-model 
+    children>> first ;
+TAG: face      adsoda-read-model 
+    children>> first decode-number-array ;
+
+TAG: solid adsoda-read-model 
+    <solid> swap  
+    { 
+        [ "dimension" tag-named adsoda-read-model >>dimension ]
+        [ "name"      tag-named adsoda-read-model >>name ] 
+        [ "color"     tag-named adsoda-read-model >>color ] 
+        [ "face"      
+            tags-named [ adsoda-read-model cut-solid ] each ] 
+    } cleave
+    ensure-adjacencies
+;
+
+TAG: light adsoda-read-model 
+   <light> swap  
+    { 
+        [ "direction" tag-named adsoda-read-model >>direction ]
+        [ "color"     tag-named adsoda-read-model >>color ] 
+    } cleave
+;
+
+TAG: space adsoda-read-model 
+    <space> swap  
+    { 
+        [ "dimension" tag-named adsoda-read-model >>dimension ]
+        [ "name"      tag-named adsoda-read-model >>name ] 
+        [ "color"     tag-named 
+            adsoda-read-model >>ambient-color ] 
+        [ "solid"     tags-named 
+            [ adsoda-read-model suffix-solids ] each ] 
+        [ "light"     tags-named 
+            [ adsoda-read-model suffix-lights ] each ]
+    } cleave
+;
+
+: read-model-file ( path -- x )
+  dup
+  [
+    [ file>xml "space" tags-named first adsoda-read-model ] 
+    [ drop <space> ] recover 
+  ] [  drop <space> ] if 
+
+;
+
diff --git a/unmaintained/4DNav/summary.txt b/unmaintained/4DNav/summary.txt
new file mode 100755
index 0000000000..5b5a452cde
--- /dev/null
+++ b/unmaintained/4DNav/summary.txt
@@ -0,0 +1 @@
+4DNav : simmple tool to navigate thru a 4D space view as projections on 4 3D spaces.
\ No newline at end of file
diff --git a/unmaintained/4DNav/tags.txt b/unmaintained/4DNav/tags.txt
new file mode 100755
index 0000000000..0c63a72fc9
--- /dev/null
+++ b/unmaintained/4DNav/tags.txt
@@ -0,0 +1 @@
+4D viewer
\ No newline at end of file
diff --git a/unmaintained/4DNav/triancube.xml b/unmaintained/4DNav/triancube.xml
new file mode 100755
index 0000000000..8551bed24c
--- /dev/null
+++ b/unmaintained/4DNav/triancube.xml
@@ -0,0 +1,23 @@
+<model>
+<space>
+	<name>triancube</name>		
+	<dimension>4</dimension>
+	<solid>
+		<name>triancube</name>
+		<dimension>4</dimension>
+		<face>1,0,0,0,160</face>
+        	<face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
+		<face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
+		<face>0,0,1,0,140</face>
+		<face>0,0,-1,0,-180</face>
+		<face>0,0,0,1,110</face>
+		<face>0,0,0,-1,-180</face>
+		<color>0,1,0</color>
+	</solid>
+	<light>
+		<direction>1,1,1,1</direction>
+		<color>0.2,0.2,0.6</color>
+	</light>
+	<color>0.8,0.9,0.9</color>
+</space>
+</model>
diff --git a/unmaintained/4DNav/turtle/authors.txt b/unmaintained/4DNav/turtle/authors.txt
new file mode 100755
index 0000000000..6cfd5da273
--- /dev/null
+++ b/unmaintained/4DNav/turtle/authors.txt
@@ -0,0 +1 @@
+Eduardo Cavazos
diff --git a/unmaintained/4DNav/turtle/turtle-docs.factor b/unmaintained/4DNav/turtle/turtle-docs.factor
new file mode 100755
index 0000000000..b94ed99673
--- /dev/null
+++ b/unmaintained/4DNav/turtle/turtle-docs.factor
@@ -0,0 +1,11 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays help.markup help.syntax kernel sequences ;
+IN: 4DNav.turtle
+
+
+ARTICLE: "4DNav.turtle" "Turtle"
+{ $vocab-link "4DNav.turtle" }
+;
+
+ABOUT: "4DNav.turtle"
diff --git a/unmaintained/4DNav/turtle/turtle.factor b/unmaintained/4DNav/turtle/turtle.factor
new file mode 100755
index 0000000000..62c25c4344
--- /dev/null
+++ b/unmaintained/4DNav/turtle/turtle.factor
@@ -0,0 +1,154 @@
+USING: kernel math arrays math.vectors math.matrices
+namespaces make
+math.constants math.functions
+math.vectors
+splitting grouping self math.trig
+  sequences accessors 4DNav.deep models ;
+IN: 4DNav.turtle
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: turtle pos ori ;
+
+: <turtle> ( -- turtle )
+    turtle new
+    { 0 0 0 } clone >>pos
+    3 identity-matrix >>ori
+;
+
+
+TUPLE: observer < turtle projection-mode collision-mode ;
+
+: <observer> ( -- object ) 
+     observer new
+    0 <model> >>projection-mode 
+    f <model> >>collision-mode
+    ;
+
+
+: turtle-pos> ( -- val ) self> pos>> ;
+: >turtle-pos ( val -- ) self> (>>pos) ;
+
+: turtle-ori> ( -- val ) self> ori>> ;
+: >turtle-ori ( val -- ) self> (>>ori) ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+! These rotation matrices are from
+! `Computer Graphics: Principles and Practice'
+
+
+! waiting for deep-cleave-quots  
+
+! : Rz ( angle -- Rx ) deg>rad
+!    {   { [ cos ] [ sin neg ]   0 }
+!        { [ sin ] [ cos ]      0  }
+!        {   0       0           1 } 
+!    } deep-cleave-quots  ;
+
+! : Ry ( angle -- Ry ) deg>rad
+!    {   { [ cos ]      0 [ sin ] }
+!        {   0          1 0       }
+!        { [  sin neg ] 0 [ cos ] }
+!    } deep-cleave-quots  ;
+  
+! : Rx ( angle -- Rz ) deg>rad
+!   {   { 1     0        0        }
+!        { 0   [ cos ] [ sin neg ] }
+!        { 0   [ sin ] [ cos ]     }
+!    } deep-cleave-quots ;
+
+: Rz ( angle -- Rx ) deg>rad
+[ dup cos ,     dup sin neg ,   0 ,
+  dup sin ,     dup cos ,       0 ,
+  0 ,           0 ,             1 , ] 3 make-matrix nip ;
+
+: Ry ( angle -- Ry ) deg>rad
+[ dup cos ,     0 ,             dup sin ,
+  0 ,           1 ,             0 ,
+  dup sin neg , 0 ,             dup cos , ] 3 make-matrix nip ;
+
+: Rx ( angle -- Rz ) deg>rad
+[ 1 ,           0 ,             0 ,
+  0 ,           dup cos ,       dup sin neg ,
+  0 ,           dup sin ,       dup cos , ] 3 make-matrix nip ;
+
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: apply-rotation ( rotation -- ) 
+    turtle-ori> swap m. >turtle-ori ;
+: rotate-x ( angle -- ) Rx apply-rotation ;
+: rotate-y ( angle -- ) Ry apply-rotation ;
+: rotate-z ( angle -- ) Rz apply-rotation ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: pitch-up   ( angle -- ) neg rotate-x ;
+: pitch-down ( angle -- )     rotate-x ;
+
+: turn-left ( angle -- )      rotate-y ;
+: turn-right ( angle -- ) neg rotate-y ;
+
+: roll-left  ( angle -- ) neg rotate-z ;
+: roll-right ( angle -- )     rotate-z ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! roll-until-horizontal
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: V ( -- V ) { 0 1 0 } ;
+
+: X ( -- 3array ) turtle-ori> [ first  ] map ;
+: Y ( -- 3array ) turtle-ori> [ second ] map ;
+: Z ( -- 3array ) turtle-ori> [ third  ] map ;
+
+: set-X ( seq -- ) turtle-ori> [ set-first ] 2each ;
+: set-Y ( seq -- ) turtle-ori> [ set-second ] 2each ;
+: set-Z ( seq -- ) turtle-ori> [ set-third ] 2each ;
+
+: roll-until-horizontal ( -- )
+    V Z cross normalize set-X
+    Z X cross normalize set-Y ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: distance ( turtle turtle -- n ) 
+    pos>> swap pos>> v- [ sq ] map sum sqrt ;
+
+: move-by ( point -- ) turtle-pos> v+ >turtle-pos ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: reset-turtle ( -- ) 
+    { 0 0 0 } clone >turtle-pos 3 identity-matrix >turtle-ori ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: step-vector ( length -- array ) { 0 0 1 } n*v ;
+
+: step-turtle ( length -- ) 
+    step-vector turtle-ori> swap m.v 
+    turtle-pos> v+ >turtle-pos ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: strafe-up ( length -- )
+    90 pitch-up
+    step-turtle
+    90 pitch-down ;
+
+: strafe-down ( length -- )
+    90 pitch-down
+    step-turtle
+    90 pitch-up ;
+
+: strafe-left ( length -- )
+    90 turn-left
+    step-turtle
+    90 turn-right ;
+
+: strafe-right ( length -- )
+    90 turn-right
+    step-turtle
+    90 turn-left ;
diff --git a/unmaintained/4DNav/window3D/authors.txt b/unmaintained/4DNav/window3D/authors.txt
new file mode 100755
index 0000000000..a6a96933f4
--- /dev/null
+++ b/unmaintained/4DNav/window3D/authors.txt
@@ -0,0 +1 @@
+Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/4DNav/window3D/window3D-docs.factor b/unmaintained/4DNav/window3D/window3D-docs.factor
new file mode 100755
index 0000000000..a534d2e9ec
--- /dev/null
+++ b/unmaintained/4DNav/window3D/window3D-docs.factor
@@ -0,0 +1,12 @@
+! Copyright (C) 2008 Jean-François Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel ;
+IN: 4DNav.window3D
+
+
+
+ARTICLE: "4DNav.window3D" "Window3D"
+{ $vocab-link "4DNav.window3D" }
+;
+
+ABOUT: "4DNav.window3D"
diff --git a/unmaintained/4DNav/window3D/window3D.factor b/unmaintained/4DNav/window3D/window3D.factor
new file mode 100755
index 0000000000..a5ca5f2a9a
--- /dev/null
+++ b/unmaintained/4DNav/window3D/window3D.factor
@@ -0,0 +1,83 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel 
+ui.gadgets
+ui.render
+opengl
+opengl.gl
+opengl.glu
+4DNav.camera
+4DNav.turtle
+math
+values
+alien.c-types
+accessors
+namespaces
+adsoda 
+models
+accessors
+prettyprint
+;
+
+IN: 4DNav.window3D
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! drawing functions 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: window3D  < gadget observer ; 
+
+: <window3D>  ( model observer -- gadget )
+    window3D  new-gadget 
+    swap 2dup 
+    projection-mode>> add-connection
+    2dup 
+    collision-mode>> add-connection
+    >>observer 
+    swap <model> >>model 
+    t >>root?
+;
+
+M: window3D pref-dim* ( gadget -- dim )  drop { 300 300 } ;
+
+M: window3D draw-gadget* ( gadget -- )
+
+    GL_PROJECTION glMatrixMode
+        glLoadIdentity
+        0.6 0.6 0.6 .9 glClearColor
+        dup observer>> projection-mode>> value>> 1 =    
+        [ 60.0 1.0 0.1 3000.0 gluPerspective ]
+        [ -400.0 400.0 -400.0 400.0 0.0 4000.0 glOrtho ] if
+        dup observer>> collision-mode>> value>> 
+        \ remove-hidden-solids?   
+        set-value
+        dup  observer>> do-look-at
+        GL_MODELVIEW glMatrixMode
+            glLoadIdentity  
+            0.9 0.9 0.9 1.0 glClearColor
+            1.0 glClearDepth
+            GL_LINE_SMOOTH glEnable
+            GL_BLEND glEnable
+            GL_DEPTH_TEST glEnable       
+            GL_LEQUAL glDepthFunc
+            GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc
+            GL_LINE_SMOOTH_HINT GL_NICEST glHint
+            1.25 glLineWidth
+            GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor 
+                glClear
+            glLoadIdentity
+            GL_LIGHTING glEnable
+            GL_LIGHT0 glEnable
+            GL_COLOR_MATERIAL glEnable
+            GL_FRONT GL_AMBIENT_AND_DIFFUSE glColorMaterial
+            ! *************************
+            
+            model>> value>> 
+            [ space->GL ] when*
+
+            ! *************************
+;
+
+M: window3D graft* drop ;
+
+M: window3D model-changed nip relayout ; 
diff --git a/unmaintained/adsoda/adsoda-docs.factor b/unmaintained/adsoda/adsoda-docs.factor
new file mode 100755
index 0000000000..9ab874d370
--- /dev/null
+++ b/unmaintained/adsoda/adsoda-docs.factor
@@ -0,0 +1,299 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax ;
+
+IN: adsoda
+
+
+
+! --------------------------------------------------------------
+! faces
+! --------------------------------------------------------------
+ARTICLE: "face-page" "Face in ADSODA"
+"explanation of faces"
+$nl
+"link to functions"
+"what is an halfspace"
+"halfspace touching-corners adjacent-faces"
+"touching-corners list of pointers to the corners which touch this face\n"
+
+"adjacent-faces list of pointers to the faces which touch this face\n"
+{ $subsection face }
+{ $subsection <face> }
+"test relative position"
+{ $subsection point-inside-or-on-face? } 
+{ $subsection point-inside-face? }
+"handling face"
+{ $subsection flip-face }
+{ $subsection face-translate  }
+{ $subsection  face-transform }
+
+;
+
+HELP: face
+{ $class-description "a face is defined by"
+{ $list "halfspace equation" }
+{ $list "list of touching corners" }
+{ $list "list of adjacent faces" }
+$nl
+"Touching corners and adjacent faces are defined by algorithm thanks to other faces of the solid"
+}
+
+
+;
+HELP: <face> 
+{ $values { "v" "an halfspace equation" } { "tuple" "a face" }  }   ;
+HELP: flip-face 
+{ $values { "face" "a face" } { "face" "flipped face" } }
+{ $description "change the orientation of a face" }
+;
+
+HELP: face-translate 
+{ $values { "face" "a face" } { "v" "a vector" } }
+{ $description 
+"translate a face following a vector"
+$nl
+"a translation of an halfspace doesn't change the normal vector. this word just compute the new constant term" }
+
+ 
+ ;
+HELP: face-transform 
+{ $values { "face" "a face" } { "m" "a transformation matrix" } }
+{ $description  "compute the transformation of a face using a transformation matrix" }
+ 
+ ;
+! --------------------------------
+! solid
+! --------------------------------------------------------------
+ARTICLE: "solid-page" "Solid in ADSODA"
+"explanation of solids"
+$nl
+"link to functions"
+{ $subsection solid }
+{ $subsection <solid> }
+"test relative position"
+{ $subsection point-inside-solid? }
+{ $subsection point-inside-or-on-solid? }
+"playing with faces and solids"
+{ $subsection add-face }
+{ $subsection cut-solid }
+{ $subsection slice-solid }
+"solid handling"
+{ $subsection solid-project }
+{ $subsection solid-translate }
+{ $subsection solid-transform }
+{ $subsection subtract }
+
+{ $subsection get-silhouette  }
+
+{ $subsection  solid= }
+
+
+;
+
+HELP: solid 
+{ $class-description "dimension" $nl "silhouettes" $nl "faces" $nl "corners" $nl "adjacencies-valid" $nl "color" $nl "name" 
+}
+;
+
+HELP: add-face 
+{ $values { "solid" "a solid" } { "face" "a face" } }
+{ $description "reshape a solid with a face. The face truncate the solid." } ;
+
+HELP: cut-solid
+{ $values { "solid" "a solid" } { "halfspace" "an halfspace" } }
+{ $description "like add-face but just with halfspace equation" } ;
+
+HELP: slice-solid
+{ $values { "solid" "a solid" } { "face" "a face" } { "solid1" "the outer part of the former solid" } { "solid2" "the inner part of the former solid" } }
+{ $description "cut a solid into two parts. The face acts like a knife"
+}  ;
+
+
+HELP: solid-project
+{ $values { "lights" "lights" } { "ambient" "ambient" } { "solid" "solid" } { "solids" "projection of solid" } }
+{ $description "Project the solid using pv vector" 
+$nl
+"TODO: explain how to use lights"
+} ;
+
+HELP: solid-translate 
+{ $values { "solid" "a solid" } { "v" "translating vector" } }
+{ $description "Translate a solid using a vector" 
+$nl
+"v and solid must have the same dimension "
+} ;
+
+HELP: solid-transform 
+{ $values { "solid" "a solid" } { "m" "transformation matrix" } }
+{ $description "Transform a solid using a matrix"
+$nl
+"v and solid must have the same dimension "
+} ;
+
+HELP: subtract 
+{ $values { "solid1" "initial shape" } { "solid2" "shape to remove" } { "solids" "resulting shape" } }
+{ $description  "Substract solid2 from solid1" } ;
+
+
+! --------------------------------------------------------------
+! space 
+! --------------------------------------------------------------
+ARTICLE: "space-page" "Space in ADSODA"
+"A space is a collection of solids and lights."
+$nl
+"link to functions"
+$nl
+"Defining words"
+{ $subsection space }
+{ $subsection <space> } 
+{ $subsection suffix-solids  }
+{ $subsection suffix-lights }
+{ $subsection clear-space-solids  }
+{ $subsection describe-space }
+
+
+"Handling space"
+{ $subsection space-ensure-solids }
+{ $subsection eliminate-empty-solids  }
+{ $subsection space-transform }
+{ $subsection space-translate }
+{ $subsection remove-hidden-solids }
+{ $subsection space-project }
+
+
+;
+
+HELP: space 
+{ $class-description 
+"dimension" $nl " solids" $nl " ambient-color" $nl "lights" 
+}
+;
+
+HELP: suffix-solids 
+"( space solid -- space )"
+{ $values { "space" "a space" } { "solid" "a solid to add" } }
+{ $description "Add solid to space definition" } ;
+
+HELP: suffix-lights 
+"( space light -- space ) "
+{ $values { "space" "a space" } { "light" "a light to add" } }
+{ $description "Add a light to space definition" } ;
+
+HELP: clear-space-solids 
+"( space -- space )"   
+{ $values { "space" "a space" } }
+{ $description "remove all solids in space" } ;
+
+HELP: space-ensure-solids 
+{ $values { "space" "a space" } }
+{ $description "rebuild corners of all solids in space" } ;
+
+
+
+HELP: space-transform 
+" ( space m -- space )" 
+{ $values { "space" "a space" } { "m" "a matrix" } }
+{ $description "Transform a space using a matrix" } ;
+
+HELP: space-translate 
+{ $values { "space" "a space" } { "v" "a vector" } }
+{ $description "Translate a space following a vector" } ;
+
+HELP: describe-space " ( space -- )"
+{ $values { "space" "a space" } }
+{ $description "return a description of space" } ;
+
+HELP: space-project 
+{ $values { "space" "a space" } { "i" "an integer" } }
+{ $description "Project a space along ith coordinate" } ;
+
+! --------------------------------------------------------------
+! 3D rendering
+! --------------------------------------------------------------
+ARTICLE: "3D-rendering-page" "The 3D rendering in ADSODA"
+"explanation of 3D rendering"
+$nl
+"link to functions"
+{ $subsection face->GL }
+{ $subsection solid->GL }
+{ $subsection space->GL }
+
+;
+
+HELP: face->GL 
+{ $values { "face" "a face" } { "color" "3 3 values array" } }
+{ $description "display a face" } ;
+
+HELP: solid->GL 
+{ $values { "solid" "a solid" } }
+{ $description "display a solid" } ;
+
+HELP: space->GL 
+{ $values { "space" "a space" } }
+{ $description "display a space" } ;
+
+! --------------------------------------------------------------
+! light
+! --------------------------------------------------------------
+
+ARTICLE: "light-page" "Light in ADSODA"
+"explanation of light"
+$nl
+"link to functions"
+;
+
+ARTICLE: { "adsoda" "light" } "ADSODA : lights"
+"! HELP: light position color" 
+"! <light> ( -- tuple ) light new ;"
+
+"! light est un vecteur avec 3 variables pour les couleurs\n"
+
+" void Light::Apply(Vector& normal, double &cRed, double &cGreen, double &cBlue)\n"
+" { \n"
+"   // Dot the light direction with the normalized normal of Face."
+"   register double intensity = -(normal * (*this));"
+
+"   // Face is a backface, from light's perspective"
+"   if (intensity < 0)"
+"     return;"
+"   "
+"   // Add the intensity componentwise"
+"   cRed += red * intensity;"
+"   cGreen += green * intensity;"
+"   cBlue += blue * intensity;"
+
+"   // Clip to unit range"
+"  if (cRed > 1.0) cRed = 1.0;"
+"   if (cGreen > 1.0) cGreen = 1.0;"
+"   if (cBlue > 1.0) cBlue = 1.0;"
+
+
+;
+
+
+
+ARTICLE: { "adsoda" "halfspace" } "ADSODA : halfspace"
+" defined by the concatenation of the normal vector and a constant"  
+ ;
+
+
+
+ARTICLE:  "adsoda-main-page"  "ADSODA : Arbitrary-Dimensional Solid Object Display Algorithm"
+"multidimensional handler :" 
+$nl
+"design a solid using face delimitations. Only works on convex shapes"
+$nl
+{ $emphasis "written in C++ by Greg Ferrar" }
+$nl
+"full explanation on adsoda page at " { $url "http://www.flowerfire.com/ADSODA/" }
+$nl
+"Useful words are describe on the following pages: "
+{ $subsection "face-page" }
+{ $subsection "solid-page" }
+{ $subsection "space-page" }
+{ $subsection "light-page" }
+{ $subsection "3D-rendering-page" }
+ ;
+
+ABOUT: "adsoda-main-page"
diff --git a/unmaintained/adsoda/adsoda-tests.factor b/unmaintained/adsoda/adsoda-tests.factor
new file mode 100755
index 0000000000..f8881dfebb
--- /dev/null
+++ b/unmaintained/adsoda/adsoda-tests.factor
@@ -0,0 +1,310 @@
+USING: adsoda
+kernel
+math
+accessors
+sequences
+    adsoda.solution2
+    fry
+    tools.test 
+    arrays ;
+
+IN: adsoda.tests
+
+
+
+: s1 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "s1" >>name
+    { 1 1 1 } >>color
+    { 1 -1 -5 } cut-solid 
+    { -1 -1 -21 } cut-solid 
+    { -1 0 -12 } cut-solid 
+    { 1 2 16 } cut-solid
+;
+: solid1 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "solid1" >>name
+    { 1 -1 -5 } cut-solid 
+    { -1 -1 -21 } cut-solid 
+    { -1 0 -12 } cut-solid 
+    { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+;
+: solid2 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "solid2" >>name
+    { -1 1 -10 } cut-solid 
+    { -1 -1 -28 } cut-solid 
+    { 1 0 13 } cut-solid 
+ !   { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+;
+
+: solid3 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid3" >>name
+    { 1 1 1 } >>color
+    { 1 0 16 } cut-solid 
+    { -1 0 -36 } cut-solid 
+    { 0 1 1 } cut-solid 
+    { 0 -1  -17 } cut-solid 
+ !   { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+
+;
+
+: solid4 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid4" >>name
+    { 1 1 1 } >>color
+    { 1 0 21 } cut-solid 
+    { -1 0 -36 } cut-solid 
+    { 0 1 1 } cut-solid 
+    { 0 -1  -17 } cut-solid 
+    ensure-adjacencies
+    
+;
+
+: solid5 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid5" >>name
+    { 1 1 1 } >>color
+    { 1 0 6 } cut-solid 
+    { -1 0 -17 } cut-solid 
+    { 0 1 17 } cut-solid 
+    { 0 -1  -19 } cut-solid 
+    ensure-adjacencies
+    
+;
+
+: solid7 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid7" >>name
+    { 1 1 1 } >>color
+    { 1 0 38 } cut-solid 
+    { 1 -5 -66 } cut-solid 
+    { -2 1 -75 } cut-solid
+    ensure-adjacencies
+    
+;
+
+: solid6s ( -- seq )
+  solid3 clone solid2 clone subtract
+;
+
+: space1 ( -- space )
+    <space>
+        2 >>dimension
+     !    solid3 suffix-solids
+        solid1 suffix-solids
+        solid2 suffix-solids
+    !   solid6s [ suffix-solids ] each 
+        solid4 suffix-solids
+     !   solid5 suffix-solids
+        solid7 suffix-solids
+        { 1 1 1 } >>ambient-color
+            <light>
+        { -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+;
+
+: space2 ( -- space )
+    <space>
+        4 >>dimension
+       ! 4cube suffix-solids
+        { 1 1 1 } >>ambient-color
+            <light>
+        { -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+
+       ;
+
+
+
+! {
+!        { 1 0 0 0 }
+!        { 0 1 0 0 }
+!        { 0 0 0.984807753012208 -0.1736481776669303 }
+!        { 0 0 0.1736481776669303 0.984807753012208 }
+!    }
+
+! ------------------------------------------------------------
+! constant+
+[ { 1 2 5 } ] [ { 1 2 3 } 2 constant+ ] unit-test
+
+! ------------------------------------------------------------
+! translate
+[ { 1 -1 0 } ] [ { 1 -1 -5 } { 3 -2 } translate ] unit-test
+
+! ------------------------------------------------------------
+! transform
+[ { -1 -1 -5 21.0 } ] [ { -1 -1 -5 21 }
+  { { 1 0 0 }
+    { 0 1 0 }
+    { 0 0 1 }
+    } transform  
+] unit-test
+
+! ------------------------------------------------------------
+! compare-nleft-to-identity-matrix
+[ t ] [ 
+    { 
+        { 1 0 0 1232 } 
+        { 0 1 0 0 321 } 
+        { 0 0 1 0 } } 
+        3 compare-nleft-to-identity-matrix 
+]  unit-test
+
+[ f ] [ 
+    { { 1 0 0 } { 0 1 0 } { 0 0 0 } } 
+    3 compare-nleft-to-identity-matrix 
+] unit-test
+
+[ f ] [ 
+    { { 2 0 0 } { 0 1 0 } { 0 0 1 } } 
+    3 compare-nleft-to-identity-matrix 
+] unit-test
+! ------------------------------------------------------------
+[ t ] [ 
+  { { 1 0 0 }
+    { 0 1 0 }
+    { 0 0 1 } } 3 valid-solution? 
+] unit-test
+
+[ f ] [ 
+  { { 1 0 0 1 }
+    { 0 0 0 1 }
+    { 0 0 1 0 } } 3 valid-solution? 
+] unit-test
+
+[ f ] [ 
+  { { 1 0 0 1 }
+    { 0 0 0 1 } } 3 valid-solution? 
+] unit-test
+
+[ f ] [ 
+  { { 1 0 0 1 }
+    { 0 0 0 1 }
+    { 0 0 1 0 } } 2 valid-solution? 
+] unit-test
+
+! ------------------------------------------------------------
+[ 3 ] [ { 1 2 3 } last ] unit-test 
+
+[ { 1 2 5 } ] [ { 1 2 3 } dup [ 2 + ] change-last ] unit-test 
+
+! ------------------------------------------------------------
+! position-point 
+[ 0 ] [ 
+    { 1 -1 -5 } { 2 7 } position-point 
+] unit-test
+
+! ------------------------------------------------------------
+
+! transform
+! TODO construire un exemple
+
+
+! ------------------------------------------------------------
+! slice-solid 
+
+! ------------------------------------------------------------
+! solve-equation 
+! deux cas de tests, avec solution et sans solution
+
+[ { 2 7 } ] 
+[ { { 1 -1 -5 } { 1 2 16 } } intersect-hyperplanes ] 
+unit-test
+
+[ f ] 
+[ { { 1 -1 -5 } { 1 2 16 } { -1 -1 -21 } } intersect-hyperplanes  ]
+unit-test
+
+[ f ] 
+[ { { 1 0 -5 } { 1 0 16 }  } intersect-hyperplanes  ]
+unit-test
+
+! ------------------------------------------------------------
+! point-inside-halfspace
+[ t ] [ { 1 -1 -5 } { 0 0 }  point-inside-halfspace? ] 
+unit-test
+[ f ] [ { 1 -1 -5 } { 8 13 }  point-inside-halfspace? ] 
+unit-test
+[ t ] [ { 1 -1 -5 } { 8 13 }  point-inside-or-on-halfspace? ] 
+unit-test
+
+
+! ------------------------------
+! order solid
+
+[  1 ] [ 0 >pv solid1 solid2 order-solid ] unit-test
+[ -1 ] [ 0 >pv solid2 solid1 order-solid ] unit-test
+[  f ] [ 1 >pv solid1 solid2 order-solid ] unit-test
+[  f ] [ 1 >pv solid2 solid1 order-solid ] unit-test
+
+
+! clip-solid
+[ { { 13 15 } { 15 13 } { 13 13 } } ]
+    [ 0 >pv solid2 solid1 clip-solid first corners>> ] unit-test
+
+solid1 corners>> '[ _ ]
+    [ 0 >pv solid1 solid1 clip-solid first corners>> ] unit-test
+
+solid1 corners>> '[ _ ]
+    [ 0 >pv solid1 solid2 clip-solid first corners>> ] unit-test
+
+solid1 corners>> '[ _ ]
+    [ 1 >pv solid1 solid2 clip-solid first corners>> ] unit-test
+solid2 corners>> '[ _ ]
+    [ 1 >pv solid2 solid1 clip-solid first corners>> ] unit-test
+
+!
+[
+    {
+        { { 13 15 } { 15 13 } { 13 13 } }
+        { { 16 17 } { 16 13 } { 36 17 } { 36 13 } }
+        { { 16 1 } { 16 2 } { 36 1 } { 36 2 } }
+    }
+] [     0 >pv solid2 solid3  2array 
+        solid1 (solids-silhouette-subtract) 
+        [ corners>> ] map
+  ] unit-test
+
+
+[
+{
+    { { 8 13 } { 2 7 } { 12 9 } { 12 2 } }
+    { { 13 15 } { 15 13 } { 13 13 } }
+    { { 16 17 } { 16 15 } { 36 17 } { 36 15 } }
+    { { 16 1 } { 16 2 } { 36 1 } { 36 2 } }
+}
+] [ 
+    0 >pv  <space> solid1 suffix-solids 
+        solid2 suffix-solids 
+        solid3 suffix-solids
+     remove-hidden-solids
+    solids>> [ corners>> ] map
+] unit-test
+
+! { }
+! { }
+! <light> { 0.2 0.3 0.4 } >>color { 1 -1 1 } >>direction     suffix
+! <light> { 0.4 0.3 0.1 } >>color { -1 -1 -1 } >>direction   suffix
+! suffix 
+! { 0.1 0.1 0.1 } suffix ! ambient color
+! { 0.23 0.32 0.17 } suffix ! solid color
+! solid3 faces>> first 
+
+! enlight-projection
diff --git a/unmaintained/adsoda/adsoda.factor b/unmaintained/adsoda/adsoda.factor
new file mode 100755
index 0000000000..01e437bc7d
--- /dev/null
+++ b/unmaintained/adsoda/adsoda.factor
@@ -0,0 +1,570 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors
+arrays 
+assocs
+combinators
+kernel 
+fry
+math 
+math.constants
+math.functions
+math.libm
+math.order
+math.vectors 
+math.matrices 
+math.parser
+namespaces
+prettyprint
+sequences
+sequences.deep
+sets
+slots
+sorting
+tools.time
+vars
+continuations
+words
+opengl
+opengl.gl
+colors
+adsoda.solution2
+adsoda.combinators
+opengl.demo-support
+values
+tools.walker
+;
+
+IN: adsoda
+
+DEFER: combinations
+VAR: pv
+
+
+! -------------------------------------------------------------
+! global values
+VALUE: remove-hidden-solids?
+VALUE: VERY-SMALL-NUM
+VALUE: ZERO-VALUE
+VALUE: MAX-FACE-PER-CORNER
+
+t to: remove-hidden-solids?
+0.0000001 to: VERY-SMALL-NUM
+0.0000001 to: ZERO-VALUE
+4 to: MAX-FACE-PER-CORNER
+! -------------------------------------------------------------
+! sequence complement
+
+: with-pv ( i quot -- ) [ swap >pv call ] with-scope  ; inline
+
+: dimension ( array -- x )      length 1- ; inline 
+: last ( seq -- x )           [ dimension ] [ nth ] bi ; inline
+: change-last ( seq quot -- ) 
+    [ [ dimension ] keep ] dip change-nth  ; 
+
+! -------------------------------------------------------------
+! light
+! -------------------------------------------------------------
+
+TUPLE: light name { direction array } color ;
+: <light> ( -- tuple ) light new ;
+
+! -------------------------------------------------------------
+! halfspace manipulation
+! -------------------------------------------------------------
+
+: constant+ ( v x -- w )  '[ [ _ + ] change-last ] keep ;
+: translate ( u v -- w )   dupd     v* sum     constant+ ; 
+
+: transform ( u matrix -- w )
+    [ swap m.v ] 2keep ! compute new normal vector    
+    [
+        [ [ abs ZERO-VALUE > ] find ] keep 
+        ! find a point on the frontier
+        ! be sure it's not null vector
+        last ! get constant
+        swap /f neg swap ! intercept value
+    ] dip  
+    flip 
+    nth
+    [ * ] with map ! apply intercep value
+    over v*
+    sum  neg
+    suffix ! add value as constant at the end of equation
+;
+
+: position-point ( halfspace v -- x ) 
+    -1 suffix v* sum  ; inline
+: point-inside-halfspace? ( halfspace v -- ? )       
+    position-point VERY-SMALL-NUM  > ; 
+: point-inside-or-on-halfspace? ( halfspace v -- ? ) 
+    position-point VERY-SMALL-NUM neg > ;
+: project-vector (  seq -- seq )     
+    pv> [ head ] [ 1+  tail ] 2bi append ; 
+: get-intersection ( matrice -- seq )     
+    [ 1 tail* ] map     flip first ;
+
+: islenght=? ( seq n -- seq n ? ) 2dup [ length ] [ = ] bi*  ;
+
+: compare-nleft-to-identity-matrix ( seq n -- ? ) 
+    [ [ head ] curry map ] keep  identity-matrix m- 
+    flatten
+    [ abs ZERO-VALUE < ] all?
+;
+
+: valid-solution? ( matrice n -- ? )
+    islenght=?
+    [ compare-nleft-to-identity-matrix ]  
+    [ 2drop f ] if ; inline
+
+: intersect-hyperplanes ( matrice -- seq )
+    [ solution dup ] [ first dimension ] bi
+    valid-solution?     [ get-intersection ] [ drop f ] if ;
+
+! -------------------------------------------------------------
+! faces
+! -------------------------------------------------------------
+
+TUPLE: face { halfspace array } 
+    touching-corners adjacent-faces ;
+: <face> ( v -- tuple )       face new swap >>halfspace ;
+: flip-face ( face -- face ) [ vneg ] change-halfspace ;
+: erase-face-touching-corners ( face -- face ) 
+    f >>touching-corners ;
+: erase-face-adjacent-faces ( face -- face )   
+    f >>adjacent-faces ;
+: faces-intersection ( faces -- v )  
+    [ halfspace>> ] map intersect-hyperplanes ;
+: face-translate ( face v -- face ) 
+    [ translate ] curry change-halfspace ; inline
+: face-transform ( face m -- face )
+    [ transform ] curry change-halfspace ; inline
+: face-orientation ( face -- x ) pv> swap halfspace>> nth sgn ;
+: backface? ( face -- face ? )      dup face-orientation 0 <= ;
+: pv-factor ( face -- f face )     
+    halfspace>> [ pv> swap nth [ * ] curry ] keep ; inline
+: suffix-touching-corner ( face corner -- face ) 
+    [ suffix ] curry   change-touching-corners ; inline
+: real-face? ( face -- ? )
+    [ touching-corners>> length ] 
+    [ halfspace>> dimension ] bi >= ;
+
+: (add-to-adjacent-faces) ( face face -- face )
+    over adjacent-faces>> 2dup member?
+    [ 2drop ] [ swap suffix >>adjacent-faces ] if ;
+
+: add-to-adjacent-faces ( face face -- face )
+    2dup =   [ drop ] [ (add-to-adjacent-faces) ] if ;
+
+: update-adjacent-faces ( faces corner -- )
+   '[ [ _ suffix-touching-corner drop ] each ] keep 
+    2 among [ 
+        [ first ] keep second  
+        [ add-to-adjacent-faces drop ] 2keep 
+        swap add-to-adjacent-faces drop  
+    ] each ; inline
+
+: face-project-dim ( face -- x )  halfspace>> length 2 -  ;
+
+: apply-light ( color light normal -- u )
+    over direction>>  v. 
+    neg dup 0 > 
+    [ 
+        [ color>> swap ] dip 
+        [ * ] curry map v+ 
+        [ 1 min ] map 
+    ] 
+    [ 2drop ] 
+    if
+;
+
+: enlight-projection ( array face -- color )
+    ! array = lights + ambient color
+    [ [ third ] [ second ] [ first ] tri ]
+    [ halfspace>> project-vector normalize ] bi*
+    [ apply-light ] curry each
+    v*
+;
+
+: (intersection-into-face) ( face-init face-adja quot -- face )
+    [
+    [  [ pv-factor ] bi@ 
+        roll 
+        [ map ] 2bi@
+        v-
+    ] 2keep
+    [ touching-corners>> ] bi@
+    [ swap  [ = ] curry find  nip f = ] curry find nip
+    ] dip  over
+     [
+        call
+        dupd
+        point-inside-halfspace? [ vneg ] unless 
+        <face> 
+     ] [ 3drop f ] if 
+    ; inline
+
+: intersection-into-face ( face-init face-adja -- face )
+    [ [ project-vector ] bi@ ]     (intersection-into-face) ;
+
+: intersection-into-silhouette-face ( face-init face-adja -- face )
+    [ ] (intersection-into-face) ;
+
+: intersections-into-faces ( face -- faces )
+    clone dup  
+    adjacent-faces>> [ intersection-into-face ] with map 
+    [ ] filter ;
+
+: (face-silhouette) ( face -- faces )
+    clone dup adjacent-faces>>
+    [   backface?
+        [ intersection-into-silhouette-face ] [ 2drop f ]  if  
+    ] with map 
+    [ ] filter
+; inline
+
+: face-silhouette ( face -- faces )     
+    backface? [ drop f ] [ (face-silhouette) ] if ;
+
+! --------------------------------
+! solid
+! -------------------------------------------------------------
+TUPLE: solid dimension silhouettes 
+    faces corners adjacencies-valid color name ;
+
+: <solid> ( -- tuple ) solid new ;
+
+: suffix-silhouettes ( solid silhouette -- solid )  
+    [ suffix ] curry change-silhouettes ;
+
+: suffix-face ( solid face -- solid )     
+    [ suffix ] curry change-faces ;
+: suffix-corner ( solid corner -- solid ) 
+    [ suffix ] curry change-corners ; 
+: erase-solid-corners ( solid -- solid )  f >>corners ;
+
+: erase-silhouettes ( solid -- solid ) 
+    dup dimension>> f <array> >>silhouettes ;
+: filter-real-faces ( solid -- solid ) 
+    [ [ real-face? ] filter ] change-faces ;
+: initiate-solid-from-face ( face -- solid ) 
+    face-project-dim  <solid> swap >>dimension ;
+
+: erase-old-adjacencies ( solid -- solid )
+    erase-solid-corners
+    [ dup [ erase-face-touching-corners 
+        erase-face-adjacent-faces drop ] each ]
+    change-faces ;
+
+: point-inside-or-on-face? ( face v -- ? ) 
+    [ halfspace>> ] dip point-inside-or-on-halfspace?  ;
+
+: point-inside-face? ( face v -- ? ) 
+    [ halfspace>> ] dip  point-inside-halfspace? ;
+
+: point-inside-solid? ( solid point -- ? )
+    [ faces>> ] dip [ point-inside-face? ] curry all? ; inline
+
+: point-inside-or-on-solid? ( solid point -- ? )
+    [ faces>> ] dip 
+    [ point-inside-or-on-face? ] curry  all?   ; inline
+
+: unvalid-adjacencies ( solid -- solid )  
+    erase-old-adjacencies f >>adjacencies-valid 
+    erase-silhouettes ;
+
+: add-face ( solid face -- solid ) 
+    suffix-face unvalid-adjacencies ; 
+
+: cut-solid ( solid halfspace -- solid )    <face> add-face ; 
+
+: slice-solid ( solid face  -- solid1 solid2 )
+    [ [ clone ] bi@ flip-face add-face 
+    [ "/outer/" append ] change-name  ] 2keep
+    add-face [ "/inner/" append ] change-name ;
+
+! -------------
+
+
+: add-silhouette ( solid  -- solid )
+   dup 
+   ! find-adjacencies 
+   faces>> { } 
+   [ face-silhouette append ] reduce
+   [ ] filter 
+   <solid> 
+        swap >>faces
+        over dimension>> >>dimension 
+        over name>> " silhouette " append 
+                 pv> number>string append 
+        >>name
+     !   ensure-adjacencies
+   suffix-silhouettes ; inline
+
+: find-silhouettes ( solid -- solid )
+    { } >>silhouettes 
+    dup dimension>> [ [ add-silhouette ] with-pv ] each ;
+
+: ensure-silhouettes ( solid  -- solid )
+    dup  silhouettes>>  [ f = ] all?
+    [ find-silhouettes  ]  when ; 
+
+! ------------
+
+: corner-added? ( solid corner -- ? ) 
+    ! add corner to solid if it is inside solid
+    [ ] 
+    [ point-inside-or-on-solid? ] 
+    [ swap corners>> member? not ] 
+    2tri and
+    [ suffix-corner drop t ] [ 2drop f ] if ;
+
+: process-corner ( solid faces corner -- )
+    swapd 
+    [ corner-added? ] keep swap ! test if corner is inside solid
+    [ update-adjacent-faces ] 
+    [ 2drop ]
+    if ;
+
+: compute-intersection ( solid faces -- )
+    dup faces-intersection
+    dup f = [ 3drop ] [ process-corner ]  if ;
+
+: test-faces-combinaisons ( solid n -- )
+    [ dup faces>> ] dip among   
+    [ compute-intersection ] with each ;
+
+: compute-adjacencies ( solid -- solid )
+    dup dimension>> [ >= ] curry 
+    [ keep swap ] curry MAX-FACE-PER-CORNER swap
+    [ [ test-faces-combinaisons ] 2keep 1- ] [ ] while drop ;
+
+: find-adjacencies ( solid -- solid ) 
+    erase-old-adjacencies   
+    compute-adjacencies
+    filter-real-faces 
+    t >>adjacencies-valid ;
+
+: ensure-adjacencies ( solid -- solid ) 
+    dup adjacencies-valid>> 
+    [ find-adjacencies ] unless 
+    ensure-silhouettes
+    ;
+
+: (non-empty-solid?) ( solid -- ? ) 
+    [ dimension>> ] [ corners>> length ] bi < ;
+: non-empty-solid? ( solid -- ? )   
+    ensure-adjacencies (non-empty-solid?) ;
+
+: compare-corners-roughly ( corner corner -- ? )
+    2drop t ;
+! : remove-inner-faces ( -- ) ;
+: face-project ( array face -- seq )
+    backface? 
+  [ 2drop f ]
+    [   [ enlight-projection ] 
+        [ initiate-solid-from-face ]
+        [ intersections-into-faces ]  tri
+        >>faces
+        swap >>color        
+    ]    if ;
+
+: solid-project ( lights ambient solid -- solids )
+  ensure-adjacencies
+    [ color>> ] [ faces>> ] bi [ 3array  ] dip
+    [ face-project ] with map 
+    [ ] filter 
+    [ ensure-adjacencies ] map
+;
+
+: (solid-move) ( solid v move -- solid ) 
+   curry [ map ] curry 
+   [ dup faces>> ] dip call drop  
+   unvalid-adjacencies ; inline
+
+: solid-translate ( solid v -- solid ) 
+    [ face-translate ] (solid-move) ; 
+: solid-transform ( solid m -- solid ) 
+    [ face-transform ] (solid-move) ; 
+
+: find-corner-in-silhouette ( s1 s2 -- elt bool )
+    pv> swap silhouettes>> nth     
+    swap corners>>
+    [ point-inside-solid? ] with find swap ;
+
+: valid-face-for-order ( solid point -- face )
+    [ point-inside-face? not ] 
+    [ drop face-orientation  0 = not ] 2bi and ;
+
+: check-orientation ( s1 s2 pt -- int )
+    [ nip faces>> ] dip
+    [ valid-face-for-order ] curry find swap
+    [ face-orientation ] [ drop f ] if ;
+
+: (order-solid) ( s1 s2 -- int )
+    2dup find-corner-in-silhouette
+    [ check-orientation ] [ 3drop f ] if ;
+
+: order-solid ( solid solid  -- i ) 
+    2dup (order-solid)
+    [ 2nip ]
+    [   swap (order-solid)
+        [ neg ] [ f ] if*
+    ] if* ;
+
+: subtract ( solid1 solid2 -- solids )
+    faces>> swap clone ensure-adjacencies ensure-silhouettes  
+    [ swap slice-solid drop ]  curry map
+    [ non-empty-solid? ] filter
+    [ ensure-adjacencies ] map
+; inline
+
+! -------------------------------------------------------------
+! space 
+! -------------------------------------------------------------
+TUPLE: space name dimension solids ambient-color lights ;
+: <space> ( -- space )      space new ;
+: suffix-solids ( space solid -- space ) 
+    [ suffix ] curry change-solids ; inline
+: suffix-lights ( space light -- space ) 
+    [ suffix ] curry change-lights ; inline
+: clear-space-solids ( space -- space )     f >>solids ;
+
+: space-ensure-solids ( space -- space ) 
+    [ [ ensure-adjacencies ] map ] change-solids ;
+: eliminate-empty-solids ( space -- space ) 
+    [ [ non-empty-solid? ] filter ] change-solids ;
+
+: projected-space ( space solids -- space ) 
+   swap dimension>> 1-  <space>    
+   swap >>dimension    swap  >>solids ;
+
+: get-silhouette ( solid -- silhouette )    
+    silhouettes>> pv> swap nth ;
+: solid= ( solid solid -- ? )            [ corners>> ]  bi@ = ;
+
+: space-apply ( space m quot -- space ) 
+        curry [ map ] curry [ dup solids>> ] dip
+        [ call ] [ drop ] recover drop ;
+: space-transform ( space m -- space ) 
+    [ solid-transform ] space-apply ;
+: space-translate ( space v -- space ) 
+    [ solid-translate ] space-apply ; 
+
+: describe-space ( space -- ) 
+    solids>>  
+    [  [ corners>>  [ pprint ] each ] [ name>> . ] bi ] each ;
+
+: clip-solid ( solid solid -- solids )
+    [ ]
+    [ solid= not ]
+    [ order-solid -1 = ] 2tri 
+    and
+    [ get-silhouette subtract ] 
+    [  drop 1array ] 
+    if 
+    
+    ;
+
+: (solids-silhouette-subtract) ( solids solid -- solids ) 
+     [  clip-solid append ] curry { } -rot each ; inline
+
+: solids-silhouette-subtract ( solids i solid -- solids )
+! solids is an array of 1 solid arrays
+      [ (solids-silhouette-subtract) ] curry map-but 
+; inline 
+
+: remove-hidden-solids ( space -- space ) 
+! We must include each solid in a sequence because 
+! during substration 
+! a solid can be divided in more than on solid
+    [ 
+        [ [ 1array ] map ] 
+        [ length ] 
+        [ ] 
+        tri     
+        [ solids-silhouette-subtract ] 2each
+        { } [ append ] reduce 
+    ] change-solids
+    eliminate-empty-solids ! TODO include into change-solids
+;
+
+: space-project ( space i -- space )
+  [
+  [ clone  
+    remove-hidden-solids? [ remove-hidden-solids ] when
+    dup 
+        [ solids>> ] 
+        [ lights>> ] 
+        [ ambient-color>> ]  tri 
+        [ rot solid-project ] 2curry 
+        map 
+        [ append ] { } -rot each 
+        ! TODO project lights
+        projected-space 
+      ! remove-inner-faces 
+      ! 
+      eliminate-empty-solids
+    ] with-pv 
+    ] [ 3drop <space> ] recover
+    ; inline
+
+: middle-of-space ( space -- point )
+    solids>> [ corners>> ] map concat
+    [ [ ] [ v+ ] map-reduce ] [ length ] bi v/n
+;
+
+! -------------------------------------------------------------
+! 3D rendering
+! -------------------------------------------------------------
+
+: face-reference ( face -- halfspace point vect )
+       [ halfspace>> ] 
+       [ touching-corners>> first ] 
+       [ touching-corners>> second ] tri 
+       over v-
+;
+
+: theta ( v halfspace point vect -- v x )
+   [ [ over ] dip v- ] dip    
+   [ cross dup norm >float ]
+   [ v. >float ]  
+   2bi 
+   fatan2
+   -rot v. 
+   0 < [ neg ] when
+;
+
+: ordered-face-points ( face -- corners )  
+    [ touching-corners>> 1 head ] 
+    [ touching-corners>> 1 tail ] 
+    [ face-reference [ theta ] 3curry ]         tri
+    { } map>assoc    sort-values keys 
+    append
+    ; inline
+
+: point->GL  ( point -- )   gl-vertex ;
+: points->GL ( array -- )   do-cycle [ point->GL ] each ;
+
+: face->GL ( face color -- )
+   [ ordered-face-points ] dip
+   [ first3 1.0 glColor4d GL_POLYGON 
+        [ [ point->GL  ] each ] do-state ] curry
+   [  0 0 0 1 glColor4d GL_LINE_LOOP 
+        [ [ point->GL  ] each ] do-state ]
+   bi
+   ; inline
+
+: solid->GL ( solid -- )    
+    [ faces>> ]    
+    [ color>> ] bi
+    [ face->GL ] curry each ; inline
+
+: space->GL ( space -- )
+    solids>>
+    [ solid->GL ] each ;
+
+
+
+
+
diff --git a/unmaintained/adsoda/adsoda.tests b/unmaintained/adsoda/adsoda.tests
new file mode 100755
index 0000000000..f0b0c54953
--- /dev/null
+++ b/unmaintained/adsoda/adsoda.tests
@@ -0,0 +1,147 @@
+! : init-4D-demo ( -- space )
+! OK
+! espace de dimension 4 et de couleur 0,3 0.3 0.3
+<space> 
+    4 >>dimension
+    { 0.3 0.3 0.3 } >>ambient-color
+    { 100 150 100  150 100 150 100 150 } "4cube1" 4cube suffix-solids
+   { 160 180  160 180 160 180 160 180 } "4cube2" 4cube suffix-solids
+    <light>
+        { -100 -100 -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+! ;
+! : init-3D-demo ( -- space )
+! OK
+! espace de dimension 4 et de couleur 0,3 0.3 0.3
+<space> 
+    3 >>dimension
+    { 0.3 0.3 0.3 } >>ambient-color
+    { 100 150 100  150 100 150 } "3cube1" 3cube suffix-solids
+  !  { -150 -10  -150 -10 -150 -10 -150 -10 } "4cube2" 4cube suffix-solids
+    <light>
+        { -100 -100 -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+! ;
+
+
+: s1 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "s1" >>name
+    { 1 1 1 } >>color
+    { 1 -1 -5 } cut-solid 
+    { -1 -1 -21 } cut-solid 
+    { -1 0 -12 } cut-solid 
+    { 1 2 16 } cut-solid
+;
+: solid1 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "solid1" >>name
+    { 1 -1 -5 } cut-solid 
+    { -1 -1 -21 } cut-solid 
+    { -1 0 -12 } cut-solid 
+    { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+;
+: solid2 ( -- solid )
+    <solid> 
+    2 >>dimension
+    "solid2" >>name
+    { -1 1 -10 } cut-solid 
+    { -1 -1 -28 } cut-solid 
+    { 1 0 13 } cut-solid 
+ !   { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+;
+
+: solid3 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid3" >>name
+    { 1 1 1 } >>color
+    { 1 0 16 } cut-solid 
+    { -1 0 -36 } cut-solid 
+    { 0 1 1 } cut-solid 
+    { 0 -1  -17 } cut-solid 
+ !   { 1 2 16 } cut-solid
+    ensure-adjacencies
+    
+
+;
+
+: solid4 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid4" >>name
+    { 1 1 1 } >>color
+    { 1 0 21 } cut-solid 
+    { -1 0 -36 } cut-solid 
+    { 0 1 1 } cut-solid 
+    { 0 -1  -17 } cut-solid 
+    ensure-adjacencies
+    
+;
+
+: solid5 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid5" >>name
+    { 1 1 1 } >>color
+    { 1 0 6 } cut-solid 
+    { -1 0 -17 } cut-solid 
+    { 0 1 17 } cut-solid 
+    { 0 -1  -19 } cut-solid 
+    ensure-adjacencies
+    
+;
+
+: solid7 ( -- solid )
+      <solid> 
+    2 >>dimension
+    "solid7" >>name
+    { 1 1 1 } >>color
+    { 1 0 38 } cut-solid 
+    { 1 -5 -66 } cut-solid 
+    { -2 1 -75 } cut-solid
+    ensure-adjacencies
+    
+;
+
+: solid6s ( -- seq )
+  solid3 clone solid2 clone subtract
+;
+
+: space1 ( -- space )
+    <space>
+        2 >>dimension
+     !    solid3 suffix-solids
+        solid1 suffix-solids
+        solid2 suffix-solids
+    !   solid6s [ suffix-solids ] each 
+        solid4 suffix-solids
+     !   solid5 suffix-solids
+        solid7 suffix-solids
+        { 1 1 1 } >>ambient-color
+            <light>
+        { -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+;
+
+: space2 ( -- space )
+    <space>
+        4 >>dimension
+       ! 4cube suffix-solids
+        { 1 1 1 } >>ambient-color
+            <light>
+        { -100 -100 } >>position
+        { 0.2 0.7 0.1 } >>color
+        suffix-lights
+
+       ;
+
diff --git a/unmaintained/adsoda/authors.txt b/unmaintained/adsoda/authors.txt
new file mode 100755
index 0000000000..856f3b05fc
--- /dev/null
+++ b/unmaintained/adsoda/authors.txt
@@ -0,0 +1,2 @@
+Jeff Bigot
+Greg Ferrar
\ No newline at end of file
diff --git a/unmaintained/adsoda/combinators/authors.txt b/unmaintained/adsoda/combinators/authors.txt
new file mode 100755
index 0000000000..e7f4cdeb7c
--- /dev/null
+++ b/unmaintained/adsoda/combinators/authors.txt
@@ -0,0 +1 @@
+JF Bigot, after Greg Ferrar
\ No newline at end of file
diff --git a/unmaintained/adsoda/combinators/combinators-docs.factor b/unmaintained/adsoda/combinators/combinators-docs.factor
new file mode 100755
index 0000000000..0121dce32b
--- /dev/null
+++ b/unmaintained/adsoda/combinators/combinators-docs.factor
@@ -0,0 +1,39 @@
+! Copyright (C) 2008 Your name.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays help.markup help.syntax kernel sequences ;
+IN: adsoda.combinators
+
+HELP: among
+{ $values
+     { "array" array } { "n" "number of value to select" }
+     { "array" array }
+}
+{ $description "returns an array containings every possibilities of n choices among a given sequence" } ;
+
+HELP: columnize
+{ $values
+     { "array" array }
+     { "array" array }
+}
+{ $description "flip a sequence into a sequence of 1 element sequences" } ;
+
+HELP: concat-nth
+{ $values
+     { "seq1" sequence } { "seq2" sequence }
+     { "seq" sequence }
+}
+{ $description "merges 2 sequences of sequences appending corresponding elements" } ;
+
+HELP: do-cycle
+{ $values
+     { "array" array }
+     { "array" array }
+}
+{ $description "Copy the first element at the end of the sequence in order to close the cycle." } ;
+
+
+ARTICLE: "adsoda.combinators" "Combinators"
+{ $vocab-link "adsoda.combinators" }
+;
+
+ABOUT: "adsoda.combinators"
diff --git a/unmaintained/adsoda/combinators/combinators-tests.factor b/unmaintained/adsoda/combinators/combinators-tests.factor
new file mode 100755
index 0000000000..6796929a74
--- /dev/null
+++ b/unmaintained/adsoda/combinators/combinators-tests.factor
@@ -0,0 +1,11 @@
+USING: adsoda.combinators
+sequences
+    tools.test 
+ ;
+
+IN: adsoda.combinators.tests
+
+
+[ { "atoto" "b" "ctoto" } ] [ { "a" "b" "c" } 1 [ "toto" append ] map-but ] 
+    unit-test
+
diff --git a/unmaintained/adsoda/combinators/combinators.factor b/unmaintained/adsoda/combinators/combinators.factor
new file mode 100755
index 0000000000..4e4bbff72d
--- /dev/null
+++ b/unmaintained/adsoda/combinators/combinators.factor
@@ -0,0 +1,45 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel arrays sequences fry math combinators ;
+
+IN: adsoda.combinators
+
+! : (combinations) ( seq -- seq ) [ 1 tail ] dip combinations ;
+
+! : prefix-each [ prefix ] curry map ; inline
+
+! : combinations ( seq n -- seqs )
+!    {
+!        { [ dup 0 = ] [ 2drop { { } } ] }
+!        { [ over empty? ] [ 2drop { } ] }
+!        { [ t ] [ 
+!            [ [ 1- (combinations) ] [ drop first ] 2bi prefix-each ]
+!            [ (combinations) ] 2bi append
+!        ] }
+!    } cond ;
+
+: columnize ( array -- array ) [ 1array ] map ; inline
+
+: among ( array n -- array )
+    2dup swap length 
+    {
+        { [ over 1 = ] [ 3drop columnize ] }
+        { [ over 0 = ] [ 2drop 2drop { } ] }
+        { [ 2dup < ] [ 2drop [ 1 cut ] dip  
+                         [ 1- among [ append ] with map  ] 
+                         [ among append ] 2bi
+                       ] }
+        { [ 2dup = ] [ 3drop 1array ] }
+        { [ 2dup > ] [ 2drop 2drop {  } ] } 
+    } cond
+;
+
+: concat-nth ( seq1 seq2 -- seq )  
+    [ nth append ] curry map-index ;
+
+: do-cycle   ( array -- array )   dup first suffix ;
+
+: map-but ( seq i quot -- seq )
+    ! quot : ( seq x -- seq )
+    '[ _ = [ @ ] unless ] map-index ; inline
+
diff --git a/unmaintained/adsoda/solution2/solution2.factor b/unmaintained/adsoda/solution2/solution2.factor
new file mode 100755
index 0000000000..3e0648128d
--- /dev/null
+++ b/unmaintained/adsoda/solution2/solution2.factor
@@ -0,0 +1,126 @@
+USING: kernel
+sequences
+namespaces
+
+math
+math.vectors
+math.matrices
+;
+IN: adsoda.solution2
+
+! -------------------
+! correctif solution
+! ---------------
+SYMBOL: matrix
+: MIN-VAL-adsoda ( -- x ) 0.00000001
+! 0.000000000001 
+;
+
+: zero? ( x -- ? ) 
+    abs MIN-VAL-adsoda <
+;
+
+! [ number>string string>number ] map 
+
+: with-matrix ( matrix quot -- )
+    [ swap matrix set call matrix get ] with-scope ; inline
+
+: nth-row ( row# -- seq ) matrix get nth ;
+
+: change-row ( row# quot -- seq ) ! row# quot -- | quot: seq -- seq )
+    matrix get swap change-nth ; inline
+
+: exchange-rows ( row# row# -- ) matrix get exchange ;
+
+: rows ( -- n ) matrix get length ;
+
+: cols ( -- n ) 0 nth-row length ;
+
+: skip ( i seq quot -- n )
+    over [ find-from drop ] dip length or ; inline
+
+: first-col ( row# -- n )
+    #! First non-zero column
+    0 swap nth-row [ zero? not ] skip ;
+
+: clear-scale ( col# pivot-row i-row -- n )
+    [ over ] dip nth dup zero? [
+        3drop 0
+    ] [
+        [ nth dup zero? ] dip swap [
+            2drop 0
+        ] [
+            swap / neg
+        ] if
+    ] if ;
+
+: (clear-col) ( col# pivot-row i -- )
+    [ [ clear-scale ] 2keep [ n*v ] dip v+ ] change-row ;
+
+: rows-from ( row# -- slice )
+    rows dup <slice> ;
+
+: clear-col ( col# row# rows -- )
+    [ nth-row ] dip [ [ 2dup ] dip (clear-col) ] each 2drop ;
+
+: do-row ( exchange-with row# -- )
+    [ exchange-rows ] keep
+    [ first-col ] keep
+    dup 1+ rows-from clear-col ;
+
+: find-row ( row# quot -- i elt )
+    [ rows-from ] dip find ; inline
+
+: pivot-row ( col# row# -- n )
+    [ dupd nth-row nth zero? not ] find-row 2nip ;
+
+: (echelon) ( col# row# -- )
+    over cols < over rows < and [
+        2dup pivot-row [ over do-row 1+ ] when*
+        [ 1+ ] dip (echelon)
+    ] [
+        2drop
+    ] if ;
+
+: echelon ( matrix -- matrix' )
+    [ 0 0 (echelon) ] with-matrix ;
+
+: nonzero-rows ( matrix -- matrix' )
+    [ [ zero? ] all? not ] filter ;
+
+: null/rank ( matrix -- null rank )
+    echelon dup length swap nonzero-rows length [ - ] keep ;
+
+: leading ( seq -- n elt ) [ zero? not ] find ;
+
+: reduced ( matrix' -- matrix'' )
+    [
+        rows <reversed> [
+            dup nth-row leading drop
+            dup [ swap dup clear-col ] [ 2drop ] if
+        ] each
+    ] with-matrix ;
+
+: basis-vector ( row col# -- )
+    [ clone ] dip
+    [ swap nth neg recip ] 2keep
+    [ 0 spin set-nth ] 2keep
+    [ n*v ] dip
+    matrix get set-nth ;
+
+: nullspace ( matrix -- seq )
+    echelon reduced dup empty? [
+        dup first length identity-matrix [
+            [
+                dup leading drop
+                dup [ basis-vector ] [ 2drop ] if
+            ] each
+        ] with-matrix flip nonzero-rows
+    ] unless ;
+
+: 1-pivots ( matrix -- matrix )
+    [ dup leading nip [ recip v*n ] when* ] map ;
+
+: solution ( matrix -- matrix )
+    echelon nonzero-rows reduced 1-pivots ;
+
diff --git a/unmaintained/adsoda/solution2/summary.txt b/unmaintained/adsoda/solution2/summary.txt
new file mode 100755
index 0000000000..a25a451f3c
--- /dev/null
+++ b/unmaintained/adsoda/solution2/summary.txt
@@ -0,0 +1 @@
+A modification of solution to approximate solutions
\ No newline at end of file
diff --git a/unmaintained/adsoda/summary.txt b/unmaintained/adsoda/summary.txt
new file mode 100755
index 0000000000..ee666bc787
--- /dev/null
+++ b/unmaintained/adsoda/summary.txt
@@ -0,0 +1 @@
+ADSODA : Arbitrary-Dimensional Solid Object Display Algorithm
\ No newline at end of file
diff --git a/unmaintained/adsoda/tags.txt b/unmaintained/adsoda/tags.txt
new file mode 100755
index 0000000000..6e25b2f44b
--- /dev/null
+++ b/unmaintained/adsoda/tags.txt
@@ -0,0 +1 @@
+adsoda 4D viewer
\ No newline at end of file
diff --git a/unmaintained/adsoda/tools/authors.txt b/unmaintained/adsoda/tools/authors.txt
new file mode 100755
index 0000000000..a6a96933f4
--- /dev/null
+++ b/unmaintained/adsoda/tools/authors.txt
@@ -0,0 +1 @@
+Jeff Bigot
\ No newline at end of file
diff --git a/unmaintained/adsoda/tools/tools-docs.factor b/unmaintained/adsoda/tools/tools-docs.factor
new file mode 100755
index 0000000000..1d952e329b
--- /dev/null
+++ b/unmaintained/adsoda/tools/tools-docs.factor
@@ -0,0 +1,62 @@
+! Copyright (C) 2008 Jeff Bigot.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays help.markup help.syntax kernel sequences ;
+IN: adsoda.tools
+
+HELP: 3cube
+{ $values 
+    { "array" "array" } { "name" "name" } 
+    { "solid" "solid" } 
+}
+{ $description "array : xmin xmax ymin ymax zmin zmax" 
+"returns a 3D solid with given limits"
+} ;
+
+HELP: 4cube
+{ $values 
+    { "array" "array" } { "name" "name" } 
+    { "solid" "solid" } 
+}
+{ $description "array : xmin xmax ymin ymax zmin zmax wmin wmax"  
+"returns a 4D solid with given limits"
+} ;
+
+
+HELP: equation-system-for-normal
+{ $values
+     { "points" "a list of n points" }
+     { "matrix" "matrix" }
+}
+{ $description "From a list of points, return the matrix" 
+"to solve in order to find the vector normal to the plan defined by the points" } 
+;
+
+HELP: normal-vector
+{ $values
+     { "points" "a list of n points" }
+     { "v" "a vector" }
+}
+{ $description "From a list of points, returns the vector normal to the plan defined by the points" 
+"With n points, creates n-1 vectors and then find a vector orthogonal to every others"
+"returns { f } if a normal vector can not be found" } 
+;
+
+HELP: points-to-hyperplane
+{ $values
+     { "points" "a list of n points" }
+     { "hyperplane" "an hyperplane equation" }
+}
+{ $description "From a list of points, returns the equation of the hyperplan"
+"Finds a normal vector and then translate it so that it includes one of the points"
+
+} 
+;
+
+ARTICLE: "adsoda.tools" "Tools"
+{ $vocab-link "adsoda.tools" }
+"Tools to help in building an " { $vocab-link "adsoda" } "-space"
+;
+
+ABOUT: "adsoda.tools"
+
+
diff --git a/unmaintained/adsoda/tools/tools-tests.factor b/unmaintained/adsoda/tools/tools-tests.factor
new file mode 100755
index 0000000000..bb5419417c
--- /dev/null
+++ b/unmaintained/adsoda/tools/tools-tests.factor
@@ -0,0 +1,14 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: 
+adsoda.tools
+tools.test
+;
+
+IN: adsoda.tools.tests
+
+
+ [ { 1 0 } ] [ { { 0 0 } { 0 1 } }  normal-vector    ] unit-test
+ [ f ] [ { { 0 0 } { 0 0 } }  normal-vector    ] unit-test
+
+ [  { 1/2 1/2 1+1/2 }  ] [ { { 1 2 } { 2 1 } }  points-to-hyperplane ] unit-test
diff --git a/unmaintained/adsoda/tools/tools.factor b/unmaintained/adsoda/tools/tools.factor
new file mode 100755
index 0000000000..6c4f4c3029
--- /dev/null
+++ b/unmaintained/adsoda/tools/tools.factor
@@ -0,0 +1,150 @@
+! Copyright (C) 2008 Jeff Bigot
+! See http://factorcode.org/license.txt for BSD license.
+USING: 
+kernel
+sequences
+math
+accessors
+adsoda
+math.vectors 
+math.matrices
+bunny.model
+io.encodings.ascii
+io.files
+sequences.deep
+combinators
+adsoda.combinators
+fry
+io.files.temp
+grouping
+;
+
+IN: adsoda.tools
+
+
+
+
+
+! ---------------------------------
+: coord-min ( x array -- array )  swap suffix  ;
+: coord-max ( x array -- array )  swap neg suffix ;
+
+: 4cube ( array name -- solid )
+! array : xmin xmax ymin ymax zmin zmax wmin wmax
+    <solid> 
+    4 >>dimension
+    swap >>name
+    swap
+    { 
+       [ { 1 0 0 0 } coord-min ] [ { -1 0 0 0 } coord-max ] 
+       [ { 0 1 0 0 } coord-min ] [ { 0 -1 0 0 } coord-max ]
+       [ { 0 0 1 0 } coord-min ] [ { 0 0 -1 0 } coord-max ] 
+       [ { 0 0 0 1 } coord-min ] [ { 0 0 0 -1 } coord-max ]
+    }
+    [ curry call ] 2map 
+    [ cut-solid ] each 
+    ensure-adjacencies
+    
+; inline
+
+: 3cube ( array name -- solid )
+! array : xmin xmax ymin ymax zmin zmax wmin wmax
+    <solid> 
+    3 >>dimension
+    swap >>name
+    swap
+    { 
+       [ { 1 0 0 } coord-min ] [ { -1 0 0 } coord-max ] 
+       [ { 0 1 0 } coord-min ] [ { 0 -1 0 } coord-max ]
+       [ { 0 0 1 } coord-min ] [ { 0 0 -1 } coord-max ] 
+    }
+    [ curry call ] 2map 
+    [ cut-solid ] each 
+    ensure-adjacencies
+    
+; inline
+
+
+: equation-system-for-normal ( points -- matrix )
+    unclip [ v- 0 suffix ] curry map
+    dup first [ drop 1 ] map     suffix
+;
+
+: normal-vector ( points -- v ) 
+    equation-system-for-normal
+    intersect-hyperplanes ;
+
+: points-to-hyperplane ( points -- hyperplane )
+    [ normal-vector 0 suffix ] [ first ] bi
+    translate ;
+
+: refs-to-points ( points faces -- faces )
+   [ swap [ nth 10 v*n { 100 100 100 } v+ ] curry map ] 
+   with map
+;
+! V{ { 0.1 0.2 } { 1.1 1.3 } } V{ { 1 0 } { 0 1 } }
+! V{ { { 1.1 1.3 } { 0.1 0.2 } } { { 0.1 0.2 } { 1.1 1.3 } } }
+
+: ply-model-path ( -- path )
+
+! "bun_zipper.ply" 
+"screw2.ply"
+temp-file 
+;
+
+: read-bunny-model ( -- v )
+ply-model-path ascii [  parse-model ] with-file-reader
+
+refs-to-points
+;
+
+: 3points-to-normal ( seq -- v )
+    unclip [ v- ] curry map first2 cross normalize
+;
+: 2-faces-to-prism ( seq seq -- seq )
+  2dup
+    [ do-cycle 2 clump ] bi@ concat-nth  
+    !  3 faces rectangulaires
+    swap prefix
+    swap prefix
+;    
+
+: Xpoints-to-prisme ( seq height -- cube )
+    ! from 3 points gives a list of faces representing 
+    ! a cube of height "height"
+    ! and of based on the three points
+    ! a face is a group of 3 or mode points.   
+    [ dup dup  3points-to-normal ] dip 
+    v*n [ v+ ] curry map ! 2 eme face triangulaire 
+    2-faces-to-prism  
+
+! [ dup number? [ 1 + ] when ] deep-map
+! dup keep 
+;
+
+
+: Xpoints-to-plane4D ( seq x y -- 4Dplane )
+    ! from 3 points gives a list of faces representing 
+    ! a cube in 4th dim
+    ! from x to y (height = y-x)
+    ! and of based on the X points
+    ! a face is a group of 3 or mode points.   
+    '[ [ [ _ suffix ] map ] [ [ _ suffix ] map ] bi ] call
+    2-faces-to-prism
+;
+
+: 3pointsfaces-to-3Dsolidfaces ( seq -- seq )
+    [ 1 Xpoints-to-prisme [ 100 
+        110 Xpoints-to-plane4D ] map concat ] map 
+
+;
+
+: test-figure ( -- solid )
+    <solid> 
+    2 >>dimension
+    { 1 -1 -5 } cut-solid 
+    { -1 -1 -21 } cut-solid 
+    { -1 0 -12 } cut-solid 
+    { 1 2 16 } cut-solid
+;
+

From de49f6fc745e2cda3c2554828b1428d53b4db32b Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 11:29:30 -0600
Subject: [PATCH 21/86] Moving xml.interpolate to xml.literals

---
 basis/farkup/farkup.factor                    |  2 +-
 basis/html/components/authors.txt             |  1 +
 basis/html/components/components.factor       |  4 ++--
 basis/html/elements/elements.factor           |  2 +-
 basis/lcs/diff2html/diff2html.factor          |  2 +-
 basis/syndication/syndication.factor          |  2 +-
 basis/xml-rpc/xml-rpc.factor                  |  4 ++--
 .../xml/{interpolate => literals}/authors.txt |  0
 .../literals-docs.factor}                     | 24 +++++++++----------
 .../literals-tests.factor}                    |  6 ++---
 .../literals.factor}                          |  2 +-
 .../xml/{interpolate => literals}/summary.txt |  0
 basis/xml/{interpolate => literals}/tags.txt  |  0
 basis/xml/writer/writer-docs.factor           |  4 ++--
 basis/xmode/code2html/code2html.factor        |  2 +-
 15 files changed, 28 insertions(+), 27 deletions(-)
 rename basis/xml/{interpolate => literals}/authors.txt (100%)
 rename basis/xml/{interpolate/interpolate-docs.factor => literals/literals-docs.factor} (59%)
 rename basis/xml/{interpolate/interpolate-tests.factor => literals/literals-tests.factor} (92%)
 rename basis/xml/{interpolate/interpolate.factor => literals/literals.factor} (99%)
 rename basis/xml/{interpolate => literals}/summary.txt (100%)
 rename basis/xml/{interpolate => literals}/tags.txt (100%)

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index b9e62717eb..5c446c6a22 100644
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators html.elements io
 io.streams.string kernel math namespaces peg peg.ebnf
-sequences sequences.deep strings xml.entities xml.interpolate
+sequences sequences.deep strings xml.entities xml.literals
 vectors splitting xmode.code2html urls.encoding xml.data
 xml.writer ;
 IN: farkup
diff --git a/basis/html/components/authors.txt b/basis/html/components/authors.txt
index 1901f27a24..a44f8d7f8d 100644
--- a/basis/html/components/authors.txt
+++ b/basis/html/components/authors.txt
@@ -1 +1,2 @@
 Slava Pestov
+Daniel Ehrenberg
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index 462c9b3c78..eec7508c5e 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -1,10 +1,10 @@
-! Copyright (C) 2008 Slava Pestov
+! Copyright (C) 2008, 2009 Slava Pestov, Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel namespaces io math.parser assocs classes
 classes.tuple words arrays sequences splitting mirrors
 hashtables combinators continuations math strings inspector
 fry locals calendar calendar.format xml.entities xml.data
-validators urls present xml.writer xml.interpolate xml
+validators urls present xml.writer xml.literals xml
 xmode.code2html lcs.diff2html farkup io.streams.string
 html.elements html.streams html.forms ;
 IN: html.components
diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor
index a6e1928f83..005d67f221 100644
--- a/basis/html/elements/elements.factor
+++ b/basis/html/elements/elements.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.styles kernel namespaces prettyprint quotations
 sequences strings words xml.entities compiler.units effects
-xml.data xml.interpolate urls math math.parser combinators
+xml.data xml.literals urls math math.parser combinators
 present fry io.streams.string xml.writer ;
 
 IN: html.elements
diff --git a/basis/lcs/diff2html/diff2html.factor b/basis/lcs/diff2html/diff2html.factor
index ee303cc5a5..16e6cc8d97 100644
--- a/basis/lcs/diff2html/diff2html.factor
+++ b/basis/lcs/diff2html/diff2html.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: lcs xml.interpolate xml.writer kernel strings ;
+USING: lcs xml.literals xml.writer kernel strings ;
 FROM: accessors => item>> ;
 FROM: io => write ;
 FROM: sequences => each if-empty when-empty map ;
diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor
index b23910e200..13312d6cf2 100644
--- a/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor
@@ -4,7 +4,7 @@
 USING: xml.utilities kernel assocs math.order
     strings sequences xml.data xml.writer
     io.streams.string combinators xml xml.entities.html io.files io
-    http.client namespaces make xml.interpolate hashtables
+    http.client namespaces make xml.literals hashtables
     calendar.format accessors continuations urls present ;
 IN: syndication
 
diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
index 52e175ca3a..d9028756f2 100644
--- a/basis/xml-rpc/xml-rpc.factor
+++ b/basis/xml-rpc/xml-rpc.factor
@@ -1,9 +1,9 @@
-! Copyright (C) 2005, 2006 Daniel Ehrenberg
+! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel xml arrays math generic http.client
 combinators hashtables namespaces io base64 sequences strings
 calendar xml.data xml.writer xml.utilities assocs math.parser
-debugger calendar.format math.order xml.interpolate xml.dispatch ;
+debugger calendar.format math.order xml.literals xml.dispatch ;
 IN: xml-rpc
 
 ! * Sending RPC requests
diff --git a/basis/xml/interpolate/authors.txt b/basis/xml/literals/authors.txt
similarity index 100%
rename from basis/xml/interpolate/authors.txt
rename to basis/xml/literals/authors.txt
diff --git a/basis/xml/interpolate/interpolate-docs.factor b/basis/xml/literals/literals-docs.factor
similarity index 59%
rename from basis/xml/interpolate/interpolate-docs.factor
rename to basis/xml/literals/literals-docs.factor
index 23972ba7a4..a37fcbd711 100644
--- a/basis/xml/interpolate/interpolate-docs.factor
+++ b/basis/xml/literals/literals-docs.factor
@@ -1,29 +1,29 @@
-USING: help.markup help.syntax present multiline ;
-IN: xml.interpolate
+USING: help.markup help.syntax present multiline xml.data ;
+IN: xml.literals
 
-ABOUT: "xml.interpolate"
+ABOUT: "xml.literals"
 
-ARTICLE: "xml.interpolate" "XML literal interpolation"
-"The " { $vocab-link "xml.interpolate" } " vocabulary provides a convenient syntax for generating XML documents and chunks. It defines the following parsing words:"
+ARTICLE: "xml.literals" "XML literals"
+"The " { $vocab-link "xml.literals" } " vocabulary provides a convenient syntax for generating XML documents and chunks. It defines the following parsing words:"
 { $subsection POSTPONE: <XML }
 { $subsection POSTPONE: [XML }
-"For a description of the common syntax of these two, see"
-{ $subsection { "xml.interpolate" "in-depth" } } ;
+"These can be used for creating an XML literal, which can be used with variables or a fry-like syntax to interpolate data into XML."
+{ $subsection { "xml.literals" "interpolation" } } ;
 
 HELP: <XML
 { $syntax "<XML <?xml version=\"1.0\"?><document>...</document> XML>" }
-{ $description "This syntax allows the interpolation of XML documents. When evaluated, there is an XML document on the stack. For more information about XML interpolation, see " { $link { "xml.interpolate" "in-depth" } } "." } ;
+{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML document (" { $link xml } ") on the stack. It can be used for interpolation as well, if interpolation slots are used. For more information about XML interpolation, see " { $link { "xml.literals" "interpolation" } } "." } ;
 
 HELP: [XML
 { $syntax "[XML foo <x>...</x> bar <y>...</y> baz XML]" }
-{ $description "This syntax allows the interpolation of XML chunks. When evaluated, there is a sequence of XML elements (tags, strings, comments, etc) on the stack. For more information about XML interpolation, see " { $link { "xml.interpolate" "in-depth" } } "." } ;
+{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML chunk (" { $link xml-chunk } ") on the stack. For more information about XML interpolation, see " { $link { "xml.literals" "interpolation" } } "." } ;
 
-ARTICLE: { "xml.interpolate" "in-depth" } "XML interpolation syntax"
+ARTICLE: { "xml.literals" "interpolation" } "XML interpolation syntax"
 "XML interpolation has two forms for each of the words " { $link POSTPONE: <XML } " and " { $link POSTPONE: [XML } ": a fry-like form and a locals form. To splice locals in, use the syntax " { $snippet "<-variable->" } ". To splice something in from the stack, in the style of " { $vocab-link "fry" } ", use the syntax " { $snippet "<->" } ". An XML interpolation form may only use one of these styles."
 $nl
 "These forms can be used where a tag might go, as in " { $snippet "[XML <foo><-></foo> XML]" } " or where an attribute might go, as in " { $snippet "[XML <foo bar=<->/> XML]" } ". When an attribute is spliced in, it is not included if the value is " { $snippet "f" } " and if the value is not a string, the value is put through " { $link present } ". Here is an example of the fry style of XML interpolation:"
 { $example 
-{" USING: splitting sequences xml.writer xml.interpolate ;
+{" USING: splitting sequences xml.writer xml.literals ;
 "one two three" " " split
 [ [XML <item><-></item> XML] ] map
 <XML <doc><-></doc> XML> pprint-xml"}
@@ -41,7 +41,7 @@ $nl
 </doc>"} }
 "Here is an example of the locals version:"
 { $example
-{" USING: locals urls xml.interpolate xml.writer ;
+{" USING: locals urls xml.literals xml.writer ;
 [let |
     number [ 3 ]
     false [ f ]
diff --git a/basis/xml/interpolate/interpolate-tests.factor b/basis/xml/literals/literals-tests.factor
similarity index 92%
rename from basis/xml/interpolate/interpolate-tests.factor
rename to basis/xml/literals/literals-tests.factor
index 9be85a11e2..59bd178f39 100644
--- a/basis/xml/interpolate/interpolate-tests.factor
+++ b/basis/xml/literals/literals-tests.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test xml.interpolate multiline kernel assocs
-sequences accessors xml.writer xml.interpolate.private
+USING: tools.test xml.literals multiline kernel assocs
+sequences accessors xml.writer xml.literals.private
 locals splitting urls xml.data classes ;
-IN: xml.interpolate.tests
+IN: xml.literals.tests
 
 [ "a" "c" { "a" "c" f } ] [
     "<?xml version='1.0'?><x><-a-><b val=<-c->/><-></x>"
diff --git a/basis/xml/interpolate/interpolate.factor b/basis/xml/literals/literals.factor
similarity index 99%
rename from basis/xml/interpolate/interpolate.factor
rename to basis/xml/literals/literals.factor
index 0e551bddfa..f245c7a542 100644
--- a/basis/xml/interpolate/interpolate.factor
+++ b/basis/xml/literals/literals.factor
@@ -4,7 +4,7 @@ USING: xml xml.state kernel sequences fry assocs xml.data
 accessors strings make multiline parser namespaces macros
 sequences.deep generalizations words combinators
 math present arrays unicode.categories ;
-IN: xml.interpolate
+IN: xml.literals
 
 <PRIVATE
 
diff --git a/basis/xml/interpolate/summary.txt b/basis/xml/literals/summary.txt
similarity index 100%
rename from basis/xml/interpolate/summary.txt
rename to basis/xml/literals/summary.txt
diff --git a/basis/xml/interpolate/tags.txt b/basis/xml/literals/tags.txt
similarity index 100%
rename from basis/xml/interpolate/tags.txt
rename to basis/xml/literals/tags.txt
diff --git a/basis/xml/writer/writer-docs.factor b/basis/xml/writer/writer-docs.factor
index 38f97bd5f8..cc45528cec 100644
--- a/basis/xml/writer/writer-docs.factor
+++ b/basis/xml/writer/writer-docs.factor
@@ -41,7 +41,7 @@ HELP: pprint-xml
 
 HELP: indenter
 { $var-description "Contains the string which is used for indenting in the XML prettyprinter. For example, to print an XML document using " { $snippet "%%%%" } " for indentation, you can use the following:" }
-{ $example {" USING: xml.interpolate xml.writer namespaces ;
+{ $example {" USING: xml.literals xml.writer namespaces ;
 [XML <foo>bar</foo> XML] "%%%%" indenter [ pprint-xml ] with-variable "} {"
 <foo>
 %%%%bar
@@ -49,7 +49,7 @@ HELP: indenter
 
 HELP: sensitive-tags
 { $var-description "Contains a sequence of " { $link name } "s where whitespace should be considered significant for prettyprinting purposes. The sequence can contain " { $link string } "s in place of names. For example, to preserve whitespace inside a " { $snippet "pre" } " tag:" }
-{ $example {" USING: xml.interpolate xml.writer namespaces ;
+{ $example {" USING: xml.literals xml.writer namespaces ;
 [XML <html> <head>   <title> something</title></head><body><pre>bing
 bang
    bong</pre></body></html> XML] { "pre" } sensitive-tags [ pprint-xml ] with-variable "} {"
diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor
index 962b0e9fbf..665d334fd2 100644
--- a/basis/xmode/code2html/code2html.factor
+++ b/basis/xmode/code2html/code2html.factor
@@ -1,6 +1,6 @@
 USING: xmode.tokens xmode.marker xmode.catalog kernel locals
 html.elements io io.files sequences words io.encodings.utf8
-namespaces xml.entities accessors xml.interpolate locals xml.writer ;
+namespaces xml.entities accessors xml.literals locals xml.writer ;
 IN: xmode.code2html
 
 : htmlize-tokens ( tokens -- xml )

From b9a5183b42a2dd98784856f59892392cd0d7c41f Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 11:39:39 -0600
Subject: [PATCH 22/86] Moving 4DNav out of unmaintained and fixing docs

---
 .../4DNav/4DNav-docs.factor                   | 107 +++++++++---------
 {unmaintained => extra}/4DNav/4DNav.factor    |   0
 {unmaintained => extra}/4DNav/authors.txt     |   0
 .../4DNav/camera/authors.txt                  |   0
 .../4DNav/camera/camera-docs.factor           |  10 +-
 .../4DNav/camera/camera.factor                |   0
 .../4DNav/deep/deep-docs.factor               |   0
 .../4DNav/deep/deep.factor                    |   0
 {unmaintained => extra}/4DNav/deploy.factor   |   0
 .../4DNav/file-chooser/authors.txt            |   0
 .../4DNav/file-chooser/file-chooser.factor    |   0
 {unmaintained => extra}/4DNav/hypercube.xml   |   0
 {unmaintained => extra}/4DNav/light_test.xml  |   0
 .../4DNav/multi solids.xml                    |   0
 .../4DNav/prismetriagone.xml                  |   0
 .../4DNav/space-file-decoder/authors.txt      |   0
 .../space-file-decoder-docs.factor            |   0
 .../space-file-decoder.factor                 |   0
 {unmaintained => extra}/4DNav/summary.txt     |   0
 {unmaintained => extra}/4DNav/tags.txt        |   0
 {unmaintained => extra}/4DNav/triancube.xml   |   0
 .../4DNav/turtle/authors.txt                  |   0
 .../4DNav/turtle/turtle-docs.factor           |   0
 .../4DNav/turtle/turtle.factor                |   0
 .../4DNav/window3D/authors.txt                |   0
 .../4DNav/window3D/window3D-docs.factor       |   0
 .../4DNav/window3D/window3D.factor            |   0
 .../adsoda/adsoda-docs.factor                 |   0
 .../adsoda/adsoda-tests.factor                |   0
 {unmaintained => extra}/adsoda/adsoda.factor  |   0
 {unmaintained => extra}/adsoda/adsoda.tests   |   0
 {unmaintained => extra}/adsoda/authors.txt    |   0
 .../adsoda/combinators/authors.txt            |   0
 .../combinators/combinators-docs.factor       |   0
 .../combinators/combinators-tests.factor      |   0
 .../adsoda/combinators/combinators.factor     |   0
 .../adsoda/solution2/solution2.factor         |   0
 .../adsoda/solution2/summary.txt              |   0
 {unmaintained => extra}/adsoda/summary.txt    |   0
 {unmaintained => extra}/adsoda/tags.txt       |   0
 .../adsoda/tools/authors.txt                  |   0
 .../adsoda/tools/tools-docs.factor            |   0
 .../adsoda/tools/tools-tests.factor           |   0
 .../adsoda/tools/tools.factor                 |   0
 44 files changed, 57 insertions(+), 60 deletions(-)
 rename {unmaintained => extra}/4DNav/4DNav-docs.factor (68%)
 rename {unmaintained => extra}/4DNav/4DNav.factor (100%)
 rename {unmaintained => extra}/4DNav/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/camera/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/camera/camera-docs.factor (88%)
 rename {unmaintained => extra}/4DNav/camera/camera.factor (100%)
 rename {unmaintained => extra}/4DNav/deep/deep-docs.factor (100%)
 rename {unmaintained => extra}/4DNav/deep/deep.factor (100%)
 rename {unmaintained => extra}/4DNav/deploy.factor (100%)
 rename {unmaintained => extra}/4DNav/file-chooser/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/file-chooser/file-chooser.factor (100%)
 rename {unmaintained => extra}/4DNav/hypercube.xml (100%)
 rename {unmaintained => extra}/4DNav/light_test.xml (100%)
 rename {unmaintained => extra}/4DNav/multi solids.xml (100%)
 rename {unmaintained => extra}/4DNav/prismetriagone.xml (100%)
 rename {unmaintained => extra}/4DNav/space-file-decoder/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/space-file-decoder/space-file-decoder-docs.factor (100%)
 rename {unmaintained => extra}/4DNav/space-file-decoder/space-file-decoder.factor (100%)
 rename {unmaintained => extra}/4DNav/summary.txt (100%)
 rename {unmaintained => extra}/4DNav/tags.txt (100%)
 rename {unmaintained => extra}/4DNav/triancube.xml (100%)
 rename {unmaintained => extra}/4DNav/turtle/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/turtle/turtle-docs.factor (100%)
 rename {unmaintained => extra}/4DNav/turtle/turtle.factor (100%)
 rename {unmaintained => extra}/4DNav/window3D/authors.txt (100%)
 rename {unmaintained => extra}/4DNav/window3D/window3D-docs.factor (100%)
 rename {unmaintained => extra}/4DNav/window3D/window3D.factor (100%)
 rename {unmaintained => extra}/adsoda/adsoda-docs.factor (100%)
 rename {unmaintained => extra}/adsoda/adsoda-tests.factor (100%)
 rename {unmaintained => extra}/adsoda/adsoda.factor (100%)
 rename {unmaintained => extra}/adsoda/adsoda.tests (100%)
 rename {unmaintained => extra}/adsoda/authors.txt (100%)
 rename {unmaintained => extra}/adsoda/combinators/authors.txt (100%)
 rename {unmaintained => extra}/adsoda/combinators/combinators-docs.factor (100%)
 rename {unmaintained => extra}/adsoda/combinators/combinators-tests.factor (100%)
 rename {unmaintained => extra}/adsoda/combinators/combinators.factor (100%)
 rename {unmaintained => extra}/adsoda/solution2/solution2.factor (100%)
 rename {unmaintained => extra}/adsoda/solution2/summary.txt (100%)
 rename {unmaintained => extra}/adsoda/summary.txt (100%)
 rename {unmaintained => extra}/adsoda/tags.txt (100%)
 rename {unmaintained => extra}/adsoda/tools/authors.txt (100%)
 rename {unmaintained => extra}/adsoda/tools/tools-docs.factor (100%)
 rename {unmaintained => extra}/adsoda/tools/tools-tests.factor (100%)
 rename {unmaintained => extra}/adsoda/tools/tools.factor (100%)

diff --git a/unmaintained/4DNav/4DNav-docs.factor b/extra/4DNav/4DNav-docs.factor
similarity index 68%
rename from unmaintained/4DNav/4DNav-docs.factor
rename to extra/4DNav/4DNav-docs.factor
index 95f231ecb9..6d7ebe4cfc 100755
--- a/unmaintained/4DNav/4DNav-docs.factor
+++ b/extra/4DNav/4DNav-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Jean-François Bigot.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel quotations strings ;
+USING: help.markup help.syntax kernel quotations strings multiline ;
 IN: 4DNav
 
 
@@ -87,60 +87,57 @@ ARTICLE: "Space file" "Create a new space file"
 
 $nl
 "An example is:"
-$nl
+{ $code <"
+<model>
+<space>
+ <dimension>4</dimension>
+ <solid>
+     <name>4cube1</name>
+     <dimension>4</dimension>
+     <face>1,0,0,0,100</face>
+     <face>-1,0,0,0,-150</face>
+     <face>0,1,0,0,100</face>
+     <face>0,-1,0,0,-150</face>
+     <face>0,0,1,0,100</face>
+     <face>0,0,-1,0,-150</face>
+     <face>0,0,0,1,100</face>
+     <face>0,0,0,-1,-150</face>
+     <color>1,0,0</color>
+ </solid>
+ <solid>
+     <name>4triancube</name>
+     <dimension>4</dimension>
+     <face>1,0,0,0,160</face>
+     <face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>
+     <face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>
+     <face>0,0,1,0,140</face>
+     <face>0,0,-1,0,-180</face>
+     <face>0,0,0,1,110</face>
+     <face>0,0,0,-1,-180</face>
+     <color>0,1,0</color>
+ </solid>
+ <solid>
+     <name>triangone</name>
+     <dimension>4</dimension>
+     <face>1,0,0,0,60</face>
+     <face>0.5,0.8660254037844386,0,0,60</face>
+     <face>-0.5,0.8660254037844387,0,0,-20</face>
+     <face>-1.0,0,0,0,-100</face>
+     <face>-0.5,-0.8660254037844384,0,0,-100</face>
+     <face>0.5,-0.8660254037844387,0,0,-20</face>
+     <face>0,0,1,0,120</face>
+     <face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>
+     <face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>
+     <color>0,1,1</color>
+ </solid>
+ <light>
+     <direction>1,1,1,1</direction>
+     <color>0.2,0.2,0.6</color>
+ </light>
+ <color>0.8,0.9,0.9</color>
+</space>
+</model> "> } ;
 
-"\n<model>"
-"\n<space>"
-"\n <dimension>4</dimension>"
-"\n <solid>"
-"\n     <name>4cube1</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,100</face>"
-"\n     <face>-1,0,0,0,-150</face>"
-"\n     <face>0,1,0,0,100</face>"
-"\n     <face>0,-1,0,0,-150</face>"
-"\n     <face>0,0,1,0,100</face>"
-"\n     <face>0,0,-1,0,-150</face>"
-"\n     <face>0,0,0,1,100</face>"
-"\n     <face>0,0,0,-1,-150</face>"
-"\n     <color>1,0,0</color>"
-"\n </solid>"
-"\n <solid>"
-"\n     <name>4triancube</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,160</face>"
-"\n     <face>-0.4999999999999998,-0.8660254037844387,0,0,-130</face>"
-"\n     <face>-0.5000000000000004,0.8660254037844384,0,0,-130</face>"
-"\n     <face>0,0,1,0,140</face>"
-"\n     <face>0,0,-1,0,-180</face>"
-"\n     <face>0,0,0,1,110</face>"
-"\n     <face>0,0,0,-1,-180</face>"
-"\n     <color>0,1,0</color>"
-"\n </solid>"
-"\n <solid>"
-"\n     <name>triangone</name>"
-"\n     <dimension>4</dimension>"
-"\n     <face>1,0,0,0,60</face>"
-"\n     <face>0.5,0.8660254037844386,0,0,60</face>"
-"\n     <face>-0.5,0.8660254037844387,0,0,-20</face>"
-"\n     <face>-1.0,0,0,0,-100</face>"
-"\n     <face>-0.5,-0.8660254037844384,0,0,-100</face>"
-"\n     <face>0.5,-0.8660254037844387,0,0,-20</face>"
-"\n     <face>0,0,1,0,120</face>"
-"\n     <face>0,0,-0.4999999999999998,-0.8660254037844387,-120</face>"
-"\n     <face>0,0,-0.5000000000000004,0.8660254037844384,-120</face>"
-"\n     <color>0,1,1</color>"
-"\n </solid>"
-"\n <light>"
-"\n     <direction>1,1,1,1</direction>"
-"\n     <color>0.2,0.2,0.6</color>"
-"\n </light>"
-"\n <color>0.8,0.9,0.9</color>"
-"\n</space>"
-"\n</model>"
-
-
-;
 ARTICLE: "TODO" "Todo"
 { $list 
     "A vocab to initialize parameters"
@@ -168,7 +165,7 @@ ARTICLE: "4DNav" "The 4DNav app"
 $nl
 { $heading "4D Navigator" }
 "4DNav is a simple tool to visualize 4 dimensionnal objects."
-"\n"
+$nl
 "It uses " { $vocab-link "adsoda" } " library to display a 4D space and navigate thru it."
 $nl
 "It will display:"
diff --git a/unmaintained/4DNav/4DNav.factor b/extra/4DNav/4DNav.factor
similarity index 100%
rename from unmaintained/4DNav/4DNav.factor
rename to extra/4DNav/4DNav.factor
diff --git a/unmaintained/4DNav/authors.txt b/extra/4DNav/authors.txt
similarity index 100%
rename from unmaintained/4DNav/authors.txt
rename to extra/4DNav/authors.txt
diff --git a/unmaintained/4DNav/camera/authors.txt b/extra/4DNav/camera/authors.txt
similarity index 100%
rename from unmaintained/4DNav/camera/authors.txt
rename to extra/4DNav/camera/authors.txt
diff --git a/unmaintained/4DNav/camera/camera-docs.factor b/extra/4DNav/camera/camera-docs.factor
similarity index 88%
rename from unmaintained/4DNav/camera/camera-docs.factor
rename to extra/4DNav/camera/camera-docs.factor
index 4898c4e580..65afafc141 100755
--- a/unmaintained/4DNav/camera/camera-docs.factor
+++ b/extra/4DNav/camera/camera-docs.factor
@@ -32,15 +32,15 @@ HELP: do-look-at
 
 ARTICLE: "4DNav.camera" "Camera"
 { $vocab-link "4DNav.camera" }
-"\n"
+$nl
 "A camera is defined by:"
 { $list
 { "a position (" { $link camera-eye } ")" }
-{ "a focus direction (" { $link camera-focus } ")\n" }
-{ "an attitude information (" { $link camera-up } ")\n" }
+{ "a focus direction (" { $link camera-focus } ")" }
+{ "an attitude information (" { $link camera-up } ")" }
 }
-"\nUse " { $link do-look-at } " in opengl statement in placement of gl-look-at"
-"\n\n"
+"Use " { $link do-look-at } " in opengl statement in placement of gl-look-at"
+$nl
 "A camera is a " { $vocab-link "4DNav.turtle" } " object. Its a special vocab to handle mouvements of a 3D object:"
 { $list
 { "To define a camera"
diff --git a/unmaintained/4DNav/camera/camera.factor b/extra/4DNav/camera/camera.factor
similarity index 100%
rename from unmaintained/4DNav/camera/camera.factor
rename to extra/4DNav/camera/camera.factor
diff --git a/unmaintained/4DNav/deep/deep-docs.factor b/extra/4DNav/deep/deep-docs.factor
similarity index 100%
rename from unmaintained/4DNav/deep/deep-docs.factor
rename to extra/4DNav/deep/deep-docs.factor
diff --git a/unmaintained/4DNav/deep/deep.factor b/extra/4DNav/deep/deep.factor
similarity index 100%
rename from unmaintained/4DNav/deep/deep.factor
rename to extra/4DNav/deep/deep.factor
diff --git a/unmaintained/4DNav/deploy.factor b/extra/4DNav/deploy.factor
similarity index 100%
rename from unmaintained/4DNav/deploy.factor
rename to extra/4DNav/deploy.factor
diff --git a/unmaintained/4DNav/file-chooser/authors.txt b/extra/4DNav/file-chooser/authors.txt
similarity index 100%
rename from unmaintained/4DNav/file-chooser/authors.txt
rename to extra/4DNav/file-chooser/authors.txt
diff --git a/unmaintained/4DNav/file-chooser/file-chooser.factor b/extra/4DNav/file-chooser/file-chooser.factor
similarity index 100%
rename from unmaintained/4DNav/file-chooser/file-chooser.factor
rename to extra/4DNav/file-chooser/file-chooser.factor
diff --git a/unmaintained/4DNav/hypercube.xml b/extra/4DNav/hypercube.xml
similarity index 100%
rename from unmaintained/4DNav/hypercube.xml
rename to extra/4DNav/hypercube.xml
diff --git a/unmaintained/4DNav/light_test.xml b/extra/4DNav/light_test.xml
similarity index 100%
rename from unmaintained/4DNav/light_test.xml
rename to extra/4DNav/light_test.xml
diff --git a/unmaintained/4DNav/multi solids.xml b/extra/4DNav/multi solids.xml
similarity index 100%
rename from unmaintained/4DNav/multi solids.xml
rename to extra/4DNav/multi solids.xml
diff --git a/unmaintained/4DNav/prismetriagone.xml b/extra/4DNav/prismetriagone.xml
similarity index 100%
rename from unmaintained/4DNav/prismetriagone.xml
rename to extra/4DNav/prismetriagone.xml
diff --git a/unmaintained/4DNav/space-file-decoder/authors.txt b/extra/4DNav/space-file-decoder/authors.txt
similarity index 100%
rename from unmaintained/4DNav/space-file-decoder/authors.txt
rename to extra/4DNav/space-file-decoder/authors.txt
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor b/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor
similarity index 100%
rename from unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor
rename to extra/4DNav/space-file-decoder/space-file-decoder-docs.factor
diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor b/extra/4DNav/space-file-decoder/space-file-decoder.factor
similarity index 100%
rename from unmaintained/4DNav/space-file-decoder/space-file-decoder.factor
rename to extra/4DNav/space-file-decoder/space-file-decoder.factor
diff --git a/unmaintained/4DNav/summary.txt b/extra/4DNav/summary.txt
similarity index 100%
rename from unmaintained/4DNav/summary.txt
rename to extra/4DNav/summary.txt
diff --git a/unmaintained/4DNav/tags.txt b/extra/4DNav/tags.txt
similarity index 100%
rename from unmaintained/4DNav/tags.txt
rename to extra/4DNav/tags.txt
diff --git a/unmaintained/4DNav/triancube.xml b/extra/4DNav/triancube.xml
similarity index 100%
rename from unmaintained/4DNav/triancube.xml
rename to extra/4DNav/triancube.xml
diff --git a/unmaintained/4DNav/turtle/authors.txt b/extra/4DNav/turtle/authors.txt
similarity index 100%
rename from unmaintained/4DNav/turtle/authors.txt
rename to extra/4DNav/turtle/authors.txt
diff --git a/unmaintained/4DNav/turtle/turtle-docs.factor b/extra/4DNav/turtle/turtle-docs.factor
similarity index 100%
rename from unmaintained/4DNav/turtle/turtle-docs.factor
rename to extra/4DNav/turtle/turtle-docs.factor
diff --git a/unmaintained/4DNav/turtle/turtle.factor b/extra/4DNav/turtle/turtle.factor
similarity index 100%
rename from unmaintained/4DNav/turtle/turtle.factor
rename to extra/4DNav/turtle/turtle.factor
diff --git a/unmaintained/4DNav/window3D/authors.txt b/extra/4DNav/window3D/authors.txt
similarity index 100%
rename from unmaintained/4DNav/window3D/authors.txt
rename to extra/4DNav/window3D/authors.txt
diff --git a/unmaintained/4DNav/window3D/window3D-docs.factor b/extra/4DNav/window3D/window3D-docs.factor
similarity index 100%
rename from unmaintained/4DNav/window3D/window3D-docs.factor
rename to extra/4DNav/window3D/window3D-docs.factor
diff --git a/unmaintained/4DNav/window3D/window3D.factor b/extra/4DNav/window3D/window3D.factor
similarity index 100%
rename from unmaintained/4DNav/window3D/window3D.factor
rename to extra/4DNav/window3D/window3D.factor
diff --git a/unmaintained/adsoda/adsoda-docs.factor b/extra/adsoda/adsoda-docs.factor
similarity index 100%
rename from unmaintained/adsoda/adsoda-docs.factor
rename to extra/adsoda/adsoda-docs.factor
diff --git a/unmaintained/adsoda/adsoda-tests.factor b/extra/adsoda/adsoda-tests.factor
similarity index 100%
rename from unmaintained/adsoda/adsoda-tests.factor
rename to extra/adsoda/adsoda-tests.factor
diff --git a/unmaintained/adsoda/adsoda.factor b/extra/adsoda/adsoda.factor
similarity index 100%
rename from unmaintained/adsoda/adsoda.factor
rename to extra/adsoda/adsoda.factor
diff --git a/unmaintained/adsoda/adsoda.tests b/extra/adsoda/adsoda.tests
similarity index 100%
rename from unmaintained/adsoda/adsoda.tests
rename to extra/adsoda/adsoda.tests
diff --git a/unmaintained/adsoda/authors.txt b/extra/adsoda/authors.txt
similarity index 100%
rename from unmaintained/adsoda/authors.txt
rename to extra/adsoda/authors.txt
diff --git a/unmaintained/adsoda/combinators/authors.txt b/extra/adsoda/combinators/authors.txt
similarity index 100%
rename from unmaintained/adsoda/combinators/authors.txt
rename to extra/adsoda/combinators/authors.txt
diff --git a/unmaintained/adsoda/combinators/combinators-docs.factor b/extra/adsoda/combinators/combinators-docs.factor
similarity index 100%
rename from unmaintained/adsoda/combinators/combinators-docs.factor
rename to extra/adsoda/combinators/combinators-docs.factor
diff --git a/unmaintained/adsoda/combinators/combinators-tests.factor b/extra/adsoda/combinators/combinators-tests.factor
similarity index 100%
rename from unmaintained/adsoda/combinators/combinators-tests.factor
rename to extra/adsoda/combinators/combinators-tests.factor
diff --git a/unmaintained/adsoda/combinators/combinators.factor b/extra/adsoda/combinators/combinators.factor
similarity index 100%
rename from unmaintained/adsoda/combinators/combinators.factor
rename to extra/adsoda/combinators/combinators.factor
diff --git a/unmaintained/adsoda/solution2/solution2.factor b/extra/adsoda/solution2/solution2.factor
similarity index 100%
rename from unmaintained/adsoda/solution2/solution2.factor
rename to extra/adsoda/solution2/solution2.factor
diff --git a/unmaintained/adsoda/solution2/summary.txt b/extra/adsoda/solution2/summary.txt
similarity index 100%
rename from unmaintained/adsoda/solution2/summary.txt
rename to extra/adsoda/solution2/summary.txt
diff --git a/unmaintained/adsoda/summary.txt b/extra/adsoda/summary.txt
similarity index 100%
rename from unmaintained/adsoda/summary.txt
rename to extra/adsoda/summary.txt
diff --git a/unmaintained/adsoda/tags.txt b/extra/adsoda/tags.txt
similarity index 100%
rename from unmaintained/adsoda/tags.txt
rename to extra/adsoda/tags.txt
diff --git a/unmaintained/adsoda/tools/authors.txt b/extra/adsoda/tools/authors.txt
similarity index 100%
rename from unmaintained/adsoda/tools/authors.txt
rename to extra/adsoda/tools/authors.txt
diff --git a/unmaintained/adsoda/tools/tools-docs.factor b/extra/adsoda/tools/tools-docs.factor
similarity index 100%
rename from unmaintained/adsoda/tools/tools-docs.factor
rename to extra/adsoda/tools/tools-docs.factor
diff --git a/unmaintained/adsoda/tools/tools-tests.factor b/extra/adsoda/tools/tools-tests.factor
similarity index 100%
rename from unmaintained/adsoda/tools/tools-tests.factor
rename to extra/adsoda/tools/tools-tests.factor
diff --git a/unmaintained/adsoda/tools/tools.factor b/extra/adsoda/tools/tools.factor
similarity index 100%
rename from unmaintained/adsoda/tools/tools.factor
rename to extra/adsoda/tools/tools.factor

From ebf6cbaa0d7dd114aa2b29113d25addfdbae9f79 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 11:42:43 -0600
Subject: [PATCH 23/86] remove math.blas.syntax and merge parsing words into
 math.blas.vectors/matrices

---
 basis/math/blas/matrices/matrices-docs.factor |  52 +++++++++++-
 .../math/blas/matrices/matrices-tests.factor  |   2 +-
 basis/math/blas/matrices/matrices.factor      |  12 ++-
 basis/math/blas/syntax/authors.txt            |   1 -
 basis/math/blas/syntax/summary.txt            |   1 -
 basis/math/blas/syntax/syntax-docs.factor     |  78 ------------------
 basis/math/blas/syntax/syntax.factor          |  44 ----------
 basis/math/blas/syntax/tags.txt               |   1 -
 basis/math/blas/vectors/vectors-docs.factor   |  29 ++++++-
 basis/math/blas/vectors/vectors-tests.factor  |   2 +-
 basis/math/blas/vectors/vectors.factor        |  11 ++-
 extra/sequences/squish/.squish.factor.swo     | Bin 12288 -> 12288 bytes
 extra/sequences/squish/squish.factor          |   1 -
 13 files changed, 99 insertions(+), 135 deletions(-)
 delete mode 100644 basis/math/blas/syntax/authors.txt
 delete mode 100644 basis/math/blas/syntax/summary.txt
 delete mode 100644 basis/math/blas/syntax/syntax-docs.factor
 delete mode 100644 basis/math/blas/syntax/syntax.factor
 delete mode 100644 basis/math/blas/syntax/tags.txt

diff --git a/basis/math/blas/matrices/matrices-docs.factor b/basis/math/blas/matrices/matrices-docs.factor
index 01e0997405..f20a565e1f 100644
--- a/basis/math/blas/matrices/matrices-docs.factor
+++ b/basis/math/blas/matrices/matrices-docs.factor
@@ -1,4 +1,4 @@
-USING: alien byte-arrays help.markup help.syntax math math.blas.vectors sequences strings ;
+USING: alien byte-arrays help.markup help.syntax math math.blas.vectors sequences strings multiline ;
 IN: math.blas.matrices
 
 ARTICLE: "math.blas-summary" "Basic Linear Algebra Subroutines (BLAS) interface"
@@ -21,8 +21,6 @@ ARTICLE: "math.blas-types" "BLAS interface types"
 { $subsection double-blas-matrix }
 { $subsection float-complex-blas-matrix }
 { $subsection double-complex-blas-matrix } 
-"Syntax words are provided for constructing literal vectors and matrices in the " { $vocab-link "math.blas.syntax" } " vocabulary:"
-{ $subsection "math.blas.syntax" }
 "There are BOA constructors for all vector and matrix types, which provide the most flexibility in specifying memory layout:"
 { $subsection <float-blas-vector> }
 { $subsection <double-blas-vector> }
@@ -74,7 +72,13 @@ ARTICLE: "math.blas.matrices" "BLAS interface matrix operations"
 { $subsection n*M! }
 { $subsection n*M }
 { $subsection M*n }
-{ $subsection M/n } ;
+{ $subsection M/n }
+"Literal syntax:"
+{ $subsection POSTPONE: smatrix{ }
+{ $subsection POSTPONE: dmatrix{ }
+{ $subsection POSTPONE: cmatrix{ }
+{ $subsection POSTPONE: zmatrix{ } ;
+
 
 ABOUT: "math.blas.matrices"
 
@@ -243,3 +247,43 @@ HELP: <empty-vector>
 { $values { "length" "The length of the new vector" } { "exemplar" blas-vector-base blas-matrix-base } { "vector" blas-vector-base } }
 { $description "Return a vector of zeros with the given " { $snippet "length" } " and the same element type as " { $snippet "v" } "." } ;
 
+HELP: smatrix{
+{ $syntax <" smatrix{
+    { 1.0 0.0 0.0 1.0 }
+    { 0.0 1.0 0.0 2.0 }
+    { 0.0 0.0 1.0 3.0 }
+    { 0.0 0.0 0.0 1.0 }
+} "> }
+{ $description "Construct a literal " { $link float-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
+
+HELP: dmatrix{
+{ $syntax <" dmatrix{
+    { 1.0 0.0 0.0 1.0 }
+    { 0.0 1.0 0.0 2.0 }
+    { 0.0 0.0 1.0 3.0 }
+    { 0.0 0.0 0.0 1.0 }
+} "> }
+{ $description "Construct a literal " { $link double-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
+
+HELP: cmatrix{
+{ $syntax <" cmatrix{
+    { 1.0 0.0           0.0 1.0           }
+    { 0.0 C{ 0.0 1.0 }  0.0 2.0           }
+    { 0.0 0.0          -1.0 3.0           }
+    { 0.0 0.0           0.0 C{ 0.0 -1.0 } }
+} "> }
+{ $description "Construct a literal " { $link float-complex-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
+
+HELP: zmatrix{
+{ $syntax <" zmatrix{
+    { 1.0 0.0           0.0 1.0           }
+    { 0.0 C{ 0.0 1.0 }  0.0 2.0           }
+    { 0.0 0.0          -1.0 3.0           }
+    { 0.0 0.0           0.0 C{ 0.0 -1.0 } }
+} "> }
+{ $description "Construct a literal " { $link double-complex-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
+
+{
+    POSTPONE: smatrix{ POSTPONE: dmatrix{
+    POSTPONE: cmatrix{ POSTPONE: zmatrix{
+} related-words
diff --git a/basis/math/blas/matrices/matrices-tests.factor b/basis/math/blas/matrices/matrices-tests.factor
index dabf3c3ee9..cf0c25745e 100644
--- a/basis/math/blas/matrices/matrices-tests.factor
+++ b/basis/math/blas/matrices/matrices-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math.blas.matrices math.blas.vectors math.blas.syntax
+USING: kernel math.blas.matrices math.blas.vectors
 sequences tools.test ;
 IN: math.blas.matrices.tests
 
diff --git a/basis/math/blas/matrices/matrices.factor b/basis/math/blas/matrices/matrices.factor
index f6b98e3ae2..7b03ddf42a 100755
--- a/basis/math/blas/matrices/matrices.factor
+++ b/basis/math/blas/matrices/matrices.factor
@@ -4,7 +4,8 @@ math math.blas.cblas math.blas.vectors math.blas.vectors.private
 math.complex math.functions math.order functors words
 sequences sequences.merged sequences.private shuffle
 specialized-arrays.direct.float specialized-arrays.direct.double
-specialized-arrays.float specialized-arrays.double ;
+specialized-arrays.float specialized-arrays.double
+parser prettyprint.backend prettyprint.custom ;
 IN: math.blas.matrices
 
 TUPLE: blas-matrix-base underlying ld rows cols transpose ;
@@ -258,6 +259,7 @@ XGERC       IS cblas_${T}ger${C}
 MATRIX      DEFINES ${TYPE}-blas-matrix
 <MATRIX>    DEFINES <${TYPE}-blas-matrix>
 >MATRIX     DEFINES >${TYPE}-blas-matrix
+XMATRIX{    DEFINES ${T}matrix{
 
 WHERE
 
@@ -291,6 +293,11 @@ M: MATRIX n*V(*)Vconj+M!
     [ TYPE>ARG ] (prepare-ger)
     [ XGERC ] dip ;
 
+: XMATRIX{ \ } [ >MATRIX ] parse-literal ; parsing
+
+M: MATRIX pprint-delims
+    drop \ XMATRIX{ \ } ;
+
 ;FUNCTOR
 
 
@@ -305,3 +312,6 @@ M: MATRIX n*V(*)Vconj+M!
 "double-complex" "z" define-complex-blas-matrix
 
 >>
+
+M: blas-matrix-base >pprint-sequence Mrows ;
+M: blas-matrix-base pprint* pprint-object ;
diff --git a/basis/math/blas/syntax/authors.txt b/basis/math/blas/syntax/authors.txt
deleted file mode 100644
index f13c9c1e77..0000000000
--- a/basis/math/blas/syntax/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Joe Groff
diff --git a/basis/math/blas/syntax/summary.txt b/basis/math/blas/syntax/summary.txt
deleted file mode 100644
index a71bebb50f..0000000000
--- a/basis/math/blas/syntax/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Literal syntax for BLAS vectors and matrices
diff --git a/basis/math/blas/syntax/syntax-docs.factor b/basis/math/blas/syntax/syntax-docs.factor
deleted file mode 100644
index 6b58df738a..0000000000
--- a/basis/math/blas/syntax/syntax-docs.factor
+++ /dev/null
@@ -1,78 +0,0 @@
-USING: help.markup help.syntax math.blas.matrices math.blas.vectors multiline ;
-IN: math.blas.syntax
-
-ARTICLE: "math.blas.syntax" "BLAS interface literal syntax"
-"Vectors:"
-{ $subsection POSTPONE: svector{ }
-{ $subsection POSTPONE: dvector{ }
-{ $subsection POSTPONE: cvector{ }
-{ $subsection POSTPONE: zvector{ }
-"Matrices:"
-{ $subsection POSTPONE: smatrix{ }
-{ $subsection POSTPONE: dmatrix{ }
-{ $subsection POSTPONE: cmatrix{ }
-{ $subsection POSTPONE: zmatrix{ } ;
-
-ABOUT: "math.blas.syntax"
-
-HELP: svector{
-{ $syntax "svector{ 1.0 -2.0 3.0 }" }
-{ $description "Construct a literal " { $link float-blas-vector } "." } ;
-
-HELP: dvector{
-{ $syntax "dvector{ 1.0 -2.0 3.0 }" }
-{ $description "Construct a literal " { $link double-blas-vector } "." } ;
-
-HELP: cvector{
-{ $syntax "cvector{ 1.0 -2.0 C{ 3.0 -1.0 } }" }
-{ $description "Construct a literal " { $link float-complex-blas-vector } "." } ;
-
-HELP: zvector{
-{ $syntax "dvector{ 1.0 -2.0 C{ 3.0 -1.0 } }" }
-{ $description "Construct a literal " { $link double-complex-blas-vector } "." } ;
-
-{
-    POSTPONE: svector{ POSTPONE: dvector{
-    POSTPONE: cvector{ POSTPONE: zvector{
-} related-words
-
-HELP: smatrix{
-{ $syntax <" smatrix{
-    { 1.0 0.0 0.0 1.0 }
-    { 0.0 1.0 0.0 2.0 }
-    { 0.0 0.0 1.0 3.0 }
-    { 0.0 0.0 0.0 1.0 }
-} "> }
-{ $description "Construct a literal " { $link float-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
-
-HELP: dmatrix{
-{ $syntax <" dmatrix{
-    { 1.0 0.0 0.0 1.0 }
-    { 0.0 1.0 0.0 2.0 }
-    { 0.0 0.0 1.0 3.0 }
-    { 0.0 0.0 0.0 1.0 }
-} "> }
-{ $description "Construct a literal " { $link double-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
-
-HELP: cmatrix{
-{ $syntax <" cmatrix{
-    { 1.0 0.0           0.0 1.0           }
-    { 0.0 C{ 0.0 1.0 }  0.0 2.0           }
-    { 0.0 0.0          -1.0 3.0           }
-    { 0.0 0.0           0.0 C{ 0.0 -1.0 } }
-} "> }
-{ $description "Construct a literal " { $link float-complex-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
-
-HELP: zmatrix{
-{ $syntax <" zmatrix{
-    { 1.0 0.0           0.0 1.0           }
-    { 0.0 C{ 0.0 1.0 }  0.0 2.0           }
-    { 0.0 0.0          -1.0 3.0           }
-    { 0.0 0.0           0.0 C{ 0.0 -1.0 } }
-} "> }
-{ $description "Construct a literal " { $link double-complex-blas-matrix } ". Note that although BLAS matrices are stored in column-major order, the literal is specified in row-major order." } ;
-
-{
-    POSTPONE: smatrix{ POSTPONE: dmatrix{
-    POSTPONE: cmatrix{ POSTPONE: zmatrix{
-} related-words
diff --git a/basis/math/blas/syntax/syntax.factor b/basis/math/blas/syntax/syntax.factor
deleted file mode 100644
index 2d171a801b..0000000000
--- a/basis/math/blas/syntax/syntax.factor
+++ /dev/null
@@ -1,44 +0,0 @@
-USING: kernel math.blas.vectors math.blas.matrices parser
-arrays prettyprint.backend prettyprint.custom sequences ;
-IN: math.blas.syntax
-
-: svector{
-    \ } [ >float-blas-vector ] parse-literal ; parsing
-: dvector{
-    \ } [ >double-blas-vector ] parse-literal ; parsing
-: cvector{
-    \ } [ >float-complex-blas-vector ] parse-literal ; parsing
-: zvector{
-    \ } [ >double-complex-blas-vector ] parse-literal ; parsing
-
-: smatrix{
-    \ } [ >float-blas-matrix ] parse-literal ; parsing
-: dmatrix{
-    \ } [ >double-blas-matrix ] parse-literal ; parsing
-: cmatrix{
-    \ } [ >float-complex-blas-matrix ] parse-literal ; parsing
-: zmatrix{
-    \ } [ >double-complex-blas-matrix ] parse-literal ; parsing
-
-M: float-blas-vector pprint-delims
-    drop \ svector{ \ } ;
-M: double-blas-vector pprint-delims
-    drop \ dvector{ \ } ;
-M: float-complex-blas-vector pprint-delims
-    drop \ cvector{ \ } ;
-M: double-complex-blas-vector pprint-delims
-    drop \ zvector{ \ } ;
-
-M: float-blas-matrix pprint-delims
-    drop \ smatrix{ \ } ;
-M: double-blas-matrix pprint-delims
-    drop \ dmatrix{ \ } ;
-M: float-complex-blas-matrix pprint-delims
-    drop \ cmatrix{ \ } ;
-M: double-complex-blas-matrix pprint-delims
-    drop \ zmatrix{ \ } ;
-
-M: blas-vector-base >pprint-sequence ;
-M: blas-vector-base pprint* pprint-object ;
-M: blas-matrix-base >pprint-sequence Mrows ;
-M: blas-matrix-base pprint* pprint-object ;
diff --git a/basis/math/blas/syntax/tags.txt b/basis/math/blas/syntax/tags.txt
deleted file mode 100644
index ede10ab61b..0000000000
--- a/basis/math/blas/syntax/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-math
diff --git a/basis/math/blas/vectors/vectors-docs.factor b/basis/math/blas/vectors/vectors-docs.factor
index cb26d67334..b37a4b966e 100644
--- a/basis/math/blas/vectors/vectors-docs.factor
+++ b/basis/math/blas/vectors/vectors-docs.factor
@@ -23,7 +23,12 @@ ARTICLE: "math.blas.vectors" "BLAS interface vector operations"
 { $subsection V- }
 "Vector inner products:"
 { $subsection V. }
-{ $subsection V.conj } ;
+{ $subsection V.conj }
+"Literal syntax:"
+{ $subsection POSTPONE: svector{ }
+{ $subsection POSTPONE: dvector{ }
+{ $subsection POSTPONE: cvector{ }
+{ $subsection POSTPONE: zvector{ } ;
 
 ABOUT: "math.blas.vectors"
 
@@ -129,3 +134,25 @@ HELP: V/n
 HELP: Vsub
 { $values { "v" blas-vector-base } { "start" integer } { "length" integer } { "sub" blas-vector-base } }
 { $description "Slice a subvector out of " { $snippet "v" } " starting at " { $snippet "start" } " with the given " { $snippet "length" } ". The subvector will share storage with the parent vector." } ;
+
+HELP: svector{
+{ $syntax "svector{ 1.0 -2.0 3.0 }" }
+{ $description "Construct a literal " { $link float-blas-vector } "." } ;
+
+HELP: dvector{
+{ $syntax "dvector{ 1.0 -2.0 3.0 }" }
+{ $description "Construct a literal " { $link double-blas-vector } "." } ;
+
+HELP: cvector{
+{ $syntax "cvector{ 1.0 -2.0 C{ 3.0 -1.0 } }" }
+{ $description "Construct a literal " { $link float-complex-blas-vector } "." } ;
+
+HELP: zvector{
+{ $syntax "dvector{ 1.0 -2.0 C{ 3.0 -1.0 } }" }
+{ $description "Construct a literal " { $link double-complex-blas-vector } "." } ;
+
+{
+    POSTPONE: svector{ POSTPONE: dvector{
+    POSTPONE: cvector{ POSTPONE: zvector{
+} related-words
+
diff --git a/basis/math/blas/vectors/vectors-tests.factor b/basis/math/blas/vectors/vectors-tests.factor
index 5f9e8fdc42..da271a4fc7 100644
--- a/basis/math/blas/vectors/vectors-tests.factor
+++ b/basis/math/blas/vectors/vectors-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math.blas.vectors math.blas.syntax sequences tools.test ;
+USING: kernel math.blas.vectors sequences tools.test ;
 IN: math.blas.vectors.tests
 
 ! clone
diff --git a/basis/math/blas/vectors/vectors.factor b/basis/math/blas/vectors/vectors.factor
index c86fa30115..3b7f89f730 100755
--- a/basis/math/blas/vectors/vectors.factor
+++ b/basis/math/blas/vectors/vectors.factor
@@ -2,7 +2,7 @@ USING: accessors alien alien.c-types arrays byte-arrays combinators
 combinators.short-circuit fry kernel math math.blas.cblas
 math.complex math.functions math.order sequences.complex
 sequences.complex-components sequences sequences.private
-functors words locals
+functors words locals parser prettyprint.backend prettyprint.custom
 specialized-arrays.float specialized-arrays.double
 specialized-arrays.direct.float specialized-arrays.direct.double ;
 IN: math.blas.vectors
@@ -138,6 +138,8 @@ VECTOR         DEFINES ${TYPE}-blas-vector
 <VECTOR>       DEFINES <${TYPE}-blas-vector>
 >VECTOR        DEFINES >${TYPE}-blas-vector
 
+XVECTOR{       DEFINES ${T}vector{
+
 WHERE
 
 TUPLE: VECTOR < blas-vector-base ;
@@ -165,6 +167,11 @@ M: VECTOR (blas-direct-array)
     [ [ length>> ] [ inc>> ] bi * ] bi
     <DIRECT-ARRAY> ;
 
+: XVECTOR{ \ } [ >VECTOR ] parse-literal ; parsing
+
+M: VECTOR pprint-delims
+    drop \ XVECTOR{ \ } ;
+
 ;FUNCTOR
 
 
@@ -270,3 +277,5 @@ M: VECTOR n*V!
 
 >>
 
+M: blas-vector-base >pprint-sequence ;
+M: blas-vector-base pprint* pprint-object ;
diff --git a/extra/sequences/squish/.squish.factor.swo b/extra/sequences/squish/.squish.factor.swo
index 71a1d2add76591b46e66acf75ed3a2f34376dc7d..ca9453dd0caf1e72273bb82674e6c764e9f681da 100644
GIT binary patch
delta 69
zcmZojXh@JxG6?hZRWR2xVgLdG28JB7W>23fDGYmo+^qc6i3e3Tx}4x=<k`$C@SUGm
Tn2&)W9Ed?Gc{U3wyypi1W(5$5

delta 69
zcmZojXh@JxG6?hZRWR2xVgLdG28K&&&7RYHQyBIFxmo$C6A!9xbUDG#$h(<W;5$Dr
TA0Gol7!ZS0@@^JXc+U?2fuj*0

diff --git a/extra/sequences/squish/squish.factor b/extra/sequences/squish/squish.factor
index c42747af47..214c6895e2 100644
--- a/extra/sequences/squish/squish.factor
+++ b/extra/sequences/squish/squish.factor
@@ -10,4 +10,3 @@ IN: sequences.squish
 
 : squish-strings ( seq -- seq' )
     [ { [ sequence? ] [ integer? not ] } 1&& ] "" squish ;
-

From a622d6113ee4b0b394159d3eb732a3d2e3027a97 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 11:45:55 -0600
Subject: [PATCH 24/86] Fixing adsoda docs

---
 extra/adsoda/adsoda-docs.factor | 62 ++++++++++++++-------------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/extra/adsoda/adsoda-docs.factor b/extra/adsoda/adsoda-docs.factor
index 9ab874d370..89fbbd5b26 100755
--- a/extra/adsoda/adsoda-docs.factor
+++ b/extra/adsoda/adsoda-docs.factor
@@ -1,23 +1,19 @@
 ! Copyright (C) 2008 Jeff Bigot
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax ;
-
+USING: help.markup help.syntax multiline ;
 IN: adsoda
 
-
-
 ! --------------------------------------------------------------
 ! faces
 ! --------------------------------------------------------------
 ARTICLE: "face-page" "Face in ADSODA"
 "explanation of faces"
 $nl
-"link to functions"
-"what is an halfspace"
-"halfspace touching-corners adjacent-faces"
-"touching-corners list of pointers to the corners which touch this face\n"
-
-"adjacent-faces list of pointers to the faces which touch this face\n"
+"link to functions" $nl
+"what is an halfspace" $nl
+"halfspace touching-corners adjacent-faces" $nl
+"touching-corners list of pointers to the corners which touch this face" $nl
+"adjacent-faces list of pointers to the faces which touch this face"
 { $subsection face }
 { $subsection <face> }
 "test relative position"
@@ -244,31 +240,27 @@ $nl
 ;
 
 ARTICLE: { "adsoda" "light" } "ADSODA : lights"
-"! HELP: light position color" 
-"! <light> ( -- tuple ) light new ;"
-
-"! light est un vecteur avec 3 variables pour les couleurs\n"
-
-" void Light::Apply(Vector& normal, double &cRed, double &cGreen, double &cBlue)\n"
-" { \n"
-"   // Dot the light direction with the normalized normal of Face."
-"   register double intensity = -(normal * (*this));"
-
-"   // Face is a backface, from light's perspective"
-"   if (intensity < 0)"
-"     return;"
-"   "
-"   // Add the intensity componentwise"
-"   cRed += red * intensity;"
-"   cGreen += green * intensity;"
-"   cBlue += blue * intensity;"
-
-"   // Clip to unit range"
-"  if (cRed > 1.0) cRed = 1.0;"
-"   if (cGreen > 1.0) cGreen = 1.0;"
-"   if (cBlue > 1.0) cBlue = 1.0;"
-
-
+{ $code <"
+! HELP: light position color
+! <light> ( -- tuple ) light new ;
+! light est un vecteur avec 3 variables pour les couleurs\n
+ void Light::Apply(Vector& normal, double &cRed, double &cGreen, double &cBlue)\n
+ { \n
+   // Dot the light direction with the normalized normal of Face.
+   register double intensity = -(normal * (*this));
+   // Face is a backface, from light's perspective
+   if (intensity < 0)
+     return;
+   
+   // Add the intensity componentwise
+   cRed += red * intensity;
+   cGreen += green * intensity;
+   cBlue += blue * intensity;
+   // Clip to unit range
+  if (cRed > 1.0) cRed = 1.0;
+   if (cGreen > 1.0) cGreen = 1.0;
+   if (cBlue > 1.0) cBlue = 1.0;
+"> }
 ;
 
 

From 4d15909fb7d13e7152380ad241783efdf58aec90 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 12:49:22 -0600
Subject: [PATCH 25/86] rename a word

---
 extra/benchmark/knucleotide/knucleotide.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/extra/benchmark/knucleotide/knucleotide.factor
index 5264cd26de..99b0ee15f4 100644
--- a/extra/benchmark/knucleotide/knucleotide.factor
+++ b/extra/benchmark/knucleotide/knucleotide.factor
@@ -46,7 +46,7 @@ IN: benchmark.knucleotide
     tuck length
     small-groups H{ } tally
     at [ 0 ] unless*
-    number>string 8 CHAR: \s pad-right write ;
+    number>string 8 CHAR: \s pad-tail write ;
 
 : process-input ( input -- )
     dup 1 handle-table nl

From a46d7b34f2bdb33e9767e287c13e8cd3eefd5898 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 14:40:08 -0600
Subject: [PATCH 26/86] Constructors experiment

---
 extra/constructors/authors.txt               |  1 +
 extra/constructors/constructors-tests.factor | 21 ++++++++++++++++++++
 extra/constructors/constructors.factor       | 21 ++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 extra/constructors/authors.txt
 create mode 100644 extra/constructors/constructors-tests.factor
 create mode 100644 extra/constructors/constructors.factor

diff --git a/extra/constructors/authors.txt b/extra/constructors/authors.txt
new file mode 100644
index 0000000000..d4f5d6b3ae
--- /dev/null
+++ b/extra/constructors/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
\ No newline at end of file
diff --git a/extra/constructors/constructors-tests.factor b/extra/constructors/constructors-tests.factor
new file mode 100644
index 0000000000..367f0ad143
--- /dev/null
+++ b/extra/constructors/constructors-tests.factor
@@ -0,0 +1,21 @@
+! Copyright (C) 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test constructors calendar kernel accessors
+combinators.short-circuit ;
+IN: constructors.tests
+
+TUPLE: stock-spread stock spread timestamp ;
+
+CONSTRUCTOR: stock-spread ( stock spread -- stock-spread )
+   now >>timestamp ;
+
+SYMBOL: AAPL
+
+[ t ] [
+    AAPL 1234 <stock-spread>
+    {
+        [ stock>> AAPL eq? ]
+        [ spread>> 1234 = ]
+        [ timestamp>> timestamp? ]
+    } 1&&
+] unit-test
\ No newline at end of file
diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor
new file mode 100644
index 0000000000..6968fd7eda
--- /dev/null
+++ b/extra/constructors/constructors.factor
@@ -0,0 +1,21 @@
+! Copyright (C) 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: slots kernel sequences fry accessors parser lexer words
+effects.parser ;
+IN: constructors
+
+! An experiment
+
+: constructor-quot ( class slot-names body -- quot )
+    [ <reversed> [ setter-word '[ swap _ execute ] ] map [ ] join ] dip
+    '[ _ new @ @ ] ;
+
+: define-constructor ( name class effect body -- )
+    [ [ in>> ] dip constructor-quot ] [ drop ] 2bi
+    define-declared ;
+
+: CONSTRUCTOR:
+    scan-word [ name>> "<" ">" surround create-in ] keep
+    "(" expect ")" parse-effect
+    parse-definition
+    define-constructor ; parsing
\ No newline at end of file

From 67a1734f8b8c596528e552485a7cb1220141dc4f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 14:43:12 -0600
Subject: [PATCH 27/86] Add .swo to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a7cbeeeef3..05a53c02c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ work
 build-support/wordsize
 *.bak
 .#*
+*.swo

From fbc69718a7239cc03f5d0017e4b4dc9c8ff4267f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 14:44:39 -0600
Subject: [PATCH 28/86] Remove .swo file

---
 extra/sequences/squish/.squish.factor.swo | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 extra/sequences/squish/.squish.factor.swo

diff --git a/extra/sequences/squish/.squish.factor.swo b/extra/sequences/squish/.squish.factor.swo
deleted file mode 100644
index ca9453dd0caf1e72273bb82674e6c764e9f681da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&2G~`5XZOW%9rR1OoNmrQf;R};-fu8DwV20sgR<ULsX&7dK_<Sd!5~NRD|Hd
zjU(bs;L02D20RRm<uo9qh<lll{u+C;`=6cPF`h~9boc@ug?&MBSBUK4hvCuZSbU?`
zbA$EjKVy{2Vrq48B*V-onXNkTo(!V{qpBPW@1mzB#>n^-t&0+=ys;5pdMhJ`vkD7^
zE^@O<yL6GlX45KnUS|SKU?qXdC&A-e;z56>cfYj>8~09DZsi}C025#WOn?b60Vco%
zm;e*Fo&<ckCVo<D>!h2cwS_2gFaajO1egF5U;<2l2`~XBzyz286JP?@gn*2N*tjjk
zD^mUazy1&4`yC-Zk}8rXJty5Dt&@JxzOSS&q)(*!+$o8J2`~XBzyz286JP>NfC(@G
zCcp&#O9DVKhPR}vVeSE((VH$jPSFmaFrF6P!A`qPxz&PZ)EoB1?&2|U-s)oNpi_H5
z5Y%Z4x<WMOW9T$zx@2$$u`VH(7YKV)B+~^hjTQ#8ib~=o=4B@B-*)}DDuG7VGrHr}
z7+(MBjZ&plU<|P}C2Z59PL@@`qN=RZ^Sa*hLd})yinIu3a$eUPK(|iR!0?!wyc%*3
zn=Zu3Xn1_M3(DjZT}YaSccDv-^?}k>RoX*h-!vWO(x-5Nw!rMS4UyY~j_US%y(cir
g<Xpl_bl%LN4bKe1p*2aeP5Tk{M+cB;g@r@$3lZ_SiU0rr


From c1347699c407ea0eb8310a414c5cd44694dddcc2 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 14:56:44 -0600
Subject: [PATCH 29/86] Clean up CONSTRUCTOR: with Dan's idea: introduce
 set-slots and construct macros

---
 extra/constructors/constructors.factor | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor
index 6968fd7eda..30d286eb96 100644
--- a/extra/constructors/constructors.factor
+++ b/extra/constructors/constructors.factor
@@ -1,17 +1,19 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: slots kernel sequences fry accessors parser lexer words
-effects.parser ;
+effects.parser macros ;
 IN: constructors
 
 ! An experiment
 
-: constructor-quot ( class slot-names body -- quot )
-    [ <reversed> [ setter-word '[ swap _ execute ] ] map [ ] join ] dip
-    '[ _ new @ @ ] ;
+MACRO: set-slots ( slots -- quot )
+    <reversed> [ setter-word '[ swap _ execute ] ] map [ ] join ;
+
+: construct ( ... class slots -- instance )
+    [ new ] dip set-slots ; inline
 
 : define-constructor ( name class effect body -- )
-    [ [ in>> ] dip constructor-quot ] [ drop ] 2bi
+    [ [ in>> ] dip '[ _ _ construct @ ] ] [ drop ] 2bi
     define-declared ;
 
 : CONSTRUCTOR:

From 43672d90cb29f289b8db658160edf203e580f5bf Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 15:16:05 -0600
Subject: [PATCH 30/86] Minor tweak

---
 extra/constructors/constructors.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor
index 30d286eb96..2eab91310f 100644
--- a/extra/constructors/constructors.factor
+++ b/extra/constructors/constructors.factor
@@ -13,7 +13,7 @@ MACRO: set-slots ( slots -- quot )
     [ new ] dip set-slots ; inline
 
 : define-constructor ( name class effect body -- )
-    [ [ in>> ] dip '[ _ _ construct @ ] ] [ drop ] 2bi
+    [ [ in>> '[ _ _ construct ] ] dip compose ] [ drop ] 2bi
     define-declared ;
 
 : CONSTRUCTOR:

From f31cf8e9a93ba065db0ee4a7725d9375c451f1dd Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 15:21:46 -0600
Subject: [PATCH 31/86] fix empty description

---
 basis/math/bitwise/bitwise-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/math/bitwise/bitwise-docs.factor b/basis/math/bitwise/bitwise-docs.factor
index 18ae8e1497..358c984276 100644
--- a/basis/math/bitwise/bitwise-docs.factor
+++ b/basis/math/bitwise/bitwise-docs.factor
@@ -242,7 +242,7 @@ HELP: shift-mod
      { "n" integer } { "s" integer } { "w" integer }
      { "n" integer }
 }
-{ $description "" } ;
+{ $description "Calls " { $link shift } " on " { $snippet "n" } " and " { $snippet "s" } ", wrapping the result to " { $snippet "w" } " bits." } ;
 
 HELP: unmask
 { $values

From 16c1f210a66d88a5e07ddc1d00a8f53b788b03b7 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 22:24:53 +0100
Subject: [PATCH 32/86] FUEL: Fix for $vocab-link markup.

---
 misc/fuel/fuel-markup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 0c2fe91551..3aee2dc912 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -323,7 +323,7 @@
         (sort-lines nil start (point))))))
 
 (defun fuel-markup--vocab-link (e)
-  (fuel-markup--insert-button (cadr e) (cadr e) 'vocab))
+  (fuel-markup--insert-button (cadr e) (car (cddr e)) 'vocab))
 
 (defun fuel-markup--vocab-links (e)
   (dolist (link (cdr e))

From e5897b5ef740c9559fd7b48055201d279fec9aa5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 15:28:53 -0600
Subject: [PATCH 33/86] Remove bogus dependencies

---
 basis/html/streams/streams.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 24d9dceb80..43fa8bda85 100644
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators generic assocs help http io io.styles
+USING: combinators generic assocs io io.styles
 io.files continuations io.streams.string kernel math math.order
 math.parser namespaces make quotations assocs sequences strings
 words html.elements xml.entities sbufs continuations destructors

From e872eb1e8e1b5f5e2fe81b53d6088048d0eba81d Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 15:29:28 -0600
Subject: [PATCH 34/86] fix docs for environment

---
 basis/environment/environment-docs.factor | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/basis/environment/environment-docs.factor b/basis/environment/environment-docs.factor
index e539b446f3..b48a7a01ad 100644
--- a/basis/environment/environment-docs.factor
+++ b/basis/environment/environment-docs.factor
@@ -7,12 +7,14 @@ HELP: (os-envs)
 { $values
     
      { "seq" sequence } }
-{ $description "" } ;
+{ $description "Returns a sequence of key/value pairs from the operating system." }
+{ $notes "In most cases, use " { $link os-envs } " instead." } ;
 
 HELP: (set-os-envs)
 { $values
      { "seq" sequence } }
-{ $description "" } ;
+{ $description "Low-level word for replacing the current set of environment variables." }
+{ $notes "In most cases, use " { $link set-os-envs } " instead." } ;
 
 
 HELP: os-env ( key -- value )

From 23d4699d5c59cefffe26b61c1720df927f98a9b3 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 30 Jan 2009 22:32:20 +0100
Subject: [PATCH 35/86] FUEL: Fix the previous fix.

---
 misc/fuel/fuel-markup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 3aee2dc912..4844233ae7 100644
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -323,7 +323,7 @@
         (sort-lines nil start (point))))))
 
 (defun fuel-markup--vocab-link (e)
-  (fuel-markup--insert-button (cadr e) (car (cddr e)) 'vocab))
+  (fuel-markup--insert-button (cadr e) (or (car (cddr e)) (cadr e)) 'vocab))
 
 (defun fuel-markup--vocab-links (e)
   (dolist (link (cdr e))

From 267e24676602f7d3789cb4dfb0004e869aebbd0f Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 30 Jan 2009 14:17:12 -0800
Subject: [PATCH 36/86] Support "%s" for numbers, and add support for sequences
 and assocs formatting.

---
 basis/formatting/formatting-docs.factor | 32 ++++++++++++++++---------
 basis/formatting/formatting.factor      | 14 +++++++----
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/basis/formatting/formatting-docs.factor b/basis/formatting/formatting-docs.factor
index cfa322fb53..95b24ae351 100644
--- a/basis/formatting/formatting-docs.factor
+++ b/basis/formatting/formatting-docs.factor
@@ -12,17 +12,19 @@ HELP: printf
     "specifying attributes for the result string, including such things as maximum width, "
     "padding, and decimals.\n"
     { $table
-        { "%%"      "Single %"                   "" }
-        { "%P.Ds"   "String format"              "string" }
-        { "%P.DS"   "String format uppercase"    "string" }
-        { "%c"      "Character format"           "char" } 
-        { "%C"      "Character format uppercase" "char" } 
-        { "%+Pd"    "Integer format"             "fixnum" }
-        { "%+P.De"  "Scientific notation"        "fixnum, float" }
-        { "%+P.DE"  "Scientific notation"        "fixnum, float" }
-        { "%+P.Df"  "Fixed format"               "fixnum, float" }
-        { "%+Px"    "Hexadecimal"                "hex" }
-        { "%+PX"    "Hexadecimal uppercase"      "hex" }
+        { "%%"          "Single %"                   "" }
+        { "%P.Ds"       "String format"              "string" }
+        { "%P.DS"       "String format uppercase"    "string" }
+        { "%c"          "Character format"           "char" } 
+        { "%C"          "Character format uppercase" "char" } 
+        { "%+Pd"        "Integer format"             "fixnum" }
+        { "%+P.De"      "Scientific notation"        "fixnum, float" }
+        { "%+P.DE"      "Scientific notation"        "fixnum, float" }
+        { "%+P.Df"      "Fixed format"               "fixnum, float" }
+        { "%+Px"        "Hexadecimal"                "hex" }
+        { "%+PX"        "Hexadecimal uppercase"      "hex" }
+        { "%[%?, %]"    "Sequence format"            "sequence" }
+        { "%[%?: %? %]" "Assocs format"              "assocs" }
     }
     $nl
     "A plus sign ('+') is used to optionally specify that the number should be "
@@ -72,6 +74,14 @@ HELP: printf
         "USING: formatting ;"
         "1234 \"%+d\" printf"
         "+1234" }
+    { $example
+        "USING: formatting ;"
+        "{ 1 2 3 } \"%[%d, %]\" printf"
+        "{ 1, 2, 3 }" }
+    { $example
+        "USING: formatting ;"
+        "H{ { 1 2 } { 3 4 } } \"%[%d: %d %]\" printf"
+        "{ 1:2, 3:4 }" }
 } ;
 
 HELP: sprintf
diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index a55f0c77c5..5a1e3650fe 100644
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors arrays ascii calendar combinators fry kernel 
+USING: accessors arrays ascii assocs calendar combinators fry kernel 
 generalizations io io.encodings.ascii io.files io.streams.string
 macros math math.functions math.parser peg.ebnf quotations
 sequences splitting strings unicode.case vectors ;
@@ -75,8 +75,8 @@ digits    = (digits_)?           => [[ 6 or ]]
 fmt-%     = "%"                  => [[ [ "%" ] ]] 
 fmt-c     = "c"                  => [[ [ 1string ] ]]
 fmt-C     = "C"                  => [[ [ 1string >upper ] ]]
-fmt-s     = "s"                  => [[ [ ] ]]
-fmt-S     = "S"                  => [[ [ >upper ] ]]
+fmt-s     = "s"                  => [[ [ dup number? [ number>string ] when ] ]]
+fmt-S     = "S"                  => [[ [ dup number? [ number>string ] when >upper ] ]]
 fmt-d     = "d"                  => [[ [ >fixnum number>string ] ]]
 fmt-e     = digits "e"           => [[ first '[ >exp _ exp>string ] ]]
 fmt-E     = digits "E"           => [[ first '[ >exp _ exp>string >upper ] ]]
@@ -91,7 +91,13 @@ strings   = pad width strings_   => [[ reverse compose-all ]]
 numbers_  = fmt-d|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
 numbers   = sign pad numbers_    => [[ unclip-last prefix compose-all [ fix-sign ] append ]]
 
-formats   = "%" (strings|numbers|fmt-%|unknown) => [[ second '[ _ dip ] ]]
+types     = strings|numbers 
+
+lists     = "[%" types ", %]"    => [[ second '[ _ map ", " join "{ " prepend " }" append ] ]] 
+
+assocs    = "[%" types ": %" types " %]" => [[ [ second ] [ fourth ] bi '[ unzip [ _ map ] dip _ map zip [ ":" join ] map ", " join "{ " prepend " }" append ] ]]
+
+formats   = "%" (types|fmt-%|lists|assocs|unknown) => [[ second '[ _ dip ] ]]
 
 plain-text = (!("%").)+          => [[ >string '[ _ swap ] ]]
 

From 2b6f9f31ff2f523c34cafb916db57390552d2d9f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 16:17:50 -0600
Subject: [PATCH 37/86] fix help-lint docs for db

---
 basis/db/db-docs.factor          |  2 +-
 basis/db/types/types-docs.factor | 93 ++++----------------------------
 2 files changed, 10 insertions(+), 85 deletions(-)

diff --git a/basis/db/db-docs.factor b/basis/db/db-docs.factor
index 08544b3367..c392ec6b85 100644
--- a/basis/db/db-docs.factor
+++ b/basis/db/db-docs.factor
@@ -173,7 +173,7 @@ HELP: with-db
 HELP: with-transaction
 { $values
      { "quot" quotation } }
-{ $description "" } ;
+{ $description "Calls the quotation inside a database transaction and commits the result to the database after the quotation finishes. If the quotation throws an error, the transaction is aborted." } ;
 
 ARTICLE: "db" "Database library"
 "Accessing a database:"
diff --git a/basis/db/types/types-docs.factor b/basis/db/types/types-docs.factor
index b8ccbd976f..4d3be1d592 100644
--- a/basis/db/types/types-docs.factor
+++ b/basis/db/types/types-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: classes hashtables help.markup help.syntax io.streams.string
-kernel sequences strings math ;
+kernel sequences strings math db.tuples db.tuples.private ;
 IN: db.types
 
 HELP: +db-assigned-id+
@@ -27,15 +27,11 @@ HELP: +user-assigned-id+
 
 HELP: <generator-bind>
 { $values { "slot-name" object } { "key" object } { "generator-singleton" object } { "type" object } { "generator-bind" generator-bind } }
-{ $description "" } ;
+{ $description "An internal constructor for creating objects containing parameters used for binding generated values to a tuple query." } ;
 
 HELP: <literal-bind>
 { $values { "key" object } { "type" object } { "value" object } { "literal-bind" literal-bind } }
-{ $description "" } ;
-
-HELP: <low-level-binding>
-{ $values { "value" object } { "low-level-binding" low-level-binding } }
-{ $description "" } ;
+{ $description "An internal constructor for creating objects containing parameters used for binding literal values to a tuple query." } ;
 
 HELP: BIG-INTEGER
 { $description "A 64-bit integer. Whether this number is signed or unsigned depends on the database backend." } ;
@@ -100,18 +96,12 @@ HELP: user-assigned-id-spec?
 HELP: bind#
 { $values
      { "spec" "a sql spec" } { "obj" object } }
-{ $description "" } ;
+{ $description "A generic word that lets a database construct a literal binding." } ;
 
 HELP: bind%
 { $values
      { "spec" "a sql spec" } }
-{ $description "" } ;
-
-HELP: compound
-{ $values
-     { "string" string } { "obj" object }
-     { "hash" hashtable } }
-{ $description "" } ;
+{ $description "A generic word that lets a database output a binding." } ;
 
 HELP: db-assigned-id-spec?
 { $values
@@ -126,45 +116,12 @@ HELP: find-primary-key
 { $description "Returns the rows from the sql-specs array that are part of the primary key. Composite primary keys are supported, so this word must return a sequence." }
 { $notes "This is a low-level word." } ;
 
-HELP: generator-bind
-{ $description "" } ;
-
 HELP: get-slot-named
 { $values
      { "name" "a slot name" } { "tuple" tuple }
      { "value" "the value stored in the slot" } }
 { $description "Returns the value stored in a tuple slot, where the tuple slot is a string." } ;
 
-HELP: literal-bind
-{ $description "" } ;
-
-HELP: lookup-create-type
-{ $values
-     { "obj" object }
-     { "string" string } }
-{ $description "" } ;
-
-HELP: lookup-modifier
-{ $values
-     { "obj" object }
-     { "string" string } }
-{ $description "" } ;
-
-HELP: lookup-type
-{ $values
-     { "obj" object }
-     { "string" string } }
-{ $description "" } ;
-
-HELP: low-level-binding
-{ $description "" } ;
-
-HELP: modifiers
-{ $values
-     { "spec" "a sql spec" }
-     { "string" string } }
-{ $description "" } ;
-
 HELP: no-sql-type
 { $values
      { "type" "a sql type" } }
@@ -173,7 +130,7 @@ HELP: no-sql-type
 HELP: normalize-spec
 { $values
      { "spec" "a sql spec" } }
-{ $description "" } ;
+{ $description "Normalizes a sql spec." } ;
 
 HELP: offset-of-slot
 { $values
@@ -181,52 +138,20 @@ HELP: offset-of-slot
      { "n" integer } }
 { $description "Returns the offset of a tuple slot accessed by name." } ;
 
-HELP: persistent-table
-{ $values
-    
-     { "hash" hashtable } }
-{ $description "" } ;
-
 HELP: primary-key?
 { $values
      { "spec" "a sql spec" }
      { "?" "a boolean" } }
-{ $description "" } ;
+{ $description "Returns true if a sql spec is a primary key." } ;
 
 HELP: random-id-generator
-{ $description "" } ;
+{ $description "Used to tell " { $link eval-generator } " to generate a random number for use as a key." } ;
 
 HELP: relation?
 { $values
      { "spec" "a sql spec" }
      { "?" "a boolean" } }
-{ $description "" } ;
-
-HELP: remove-db-assigned-id
-{ $values
-     { "specs" "a sequence of sql specs" }
-     { "obj" object } }
-{ $description "" } ;
-
-HELP: remove-id
-{ $values
-     { "specs" "a sequence of sql specs" }
-     { "obj" object } }
-{ $description "" } ;
-
-HELP: set-slot-named
-{ $values
-     { "value" object } { "name" string } { "obj" object } }
-{ $description "" } ;
-
-HELP: spec>tuple
-{ $values
-     { "class" class } { "spec" "a sql spec" }
-     { "tuple" tuple } }
-{ $description "" } ;
-
-HELP: sql-spec
-{ $description "" } ;
+{ $description "Returns true if a sql spec is a relation." } ;
 
 HELP: unknown-modifier
 { $values { "modifier" string } }

From a60e11b89e328b57b5121f6cc0fd6c0a9a9ae9c8 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 16:45:30 -0600
Subject: [PATCH 38/86] add RTLD_GLOBAL to dlopen flags. load atlas before
 cblas on freebsd

---
 basis/math/blas/cblas/cblas.factor | 12 +++++++++---
 vm/os-unix.c                       |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index 4c0a88f929..3914c5b2ec 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -1,13 +1,19 @@
 USING: alien alien.c-types alien.syntax kernel system combinators ;
 IN: math.blas.cblas
 
-<< "cblas" {
+<<
+: load-atlas ( -- )
+    "atlas" "libatlas.so" "cdecl" add-library
+    "atlas" load-library drop ;
+
+"cblas" {
     { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
     { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
     { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library ] }
-    { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library ] }
+    { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
     [ "libblas.so" "cdecl" add-library ]
-} cond >>
+} cond
+>>
 
 LIBRARY: cblas
 
diff --git a/vm/os-unix.c b/vm/os-unix.c
index 97c29d8c6e..b49f7637af 100755
--- a/vm/os-unix.c
+++ b/vm/os-unix.c
@@ -36,7 +36,7 @@ void init_ffi(void)
 
 void ffi_dlopen(F_DLL *dll)
 {
-	dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY);
+	dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY|RTLD_GLOBAL);
 }
 
 void *ffi_dlsym(F_DLL *dll, F_SYMBOL *symbol)

From 7a4b03821b995332cb2a023557f697e9efd36de0 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 16:52:03 -0600
Subject: [PATCH 39/86] Fix furnace help lint warning

---
 basis/furnace/utilities/utilities-docs.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/furnace/utilities/utilities-docs.factor b/basis/furnace/utilities/utilities-docs.factor
index 1402e9c0ca..d2291786df 100644
--- a/basis/furnace/utilities/utilities-docs.factor
+++ b/basis/furnace/utilities/utilities-docs.factor
@@ -57,7 +57,7 @@ HELP: modify-redirect-query
 
 HELP: nested-responders
 { $values { "seq" "a sequence of responders" } }
-{ $description "" } ;
+{ $description "Outputs a sequence of responders which participated in the processing of the current request, with the main responder first and the innermost responder last." } ;
 
 HELP: referrer
 { $values { "referrer/f" { $maybe string } } }
@@ -69,11 +69,11 @@ HELP: request-params
 
 HELP: resolve-base-path
 { $values { "string" string } { "string'" string } }
-{ $description "" } ;
+{ $description "Resolves a responder-relative URL." } ;
 
 HELP: resolve-template-path
 { $values { "pair" "a pair with shape " { $snippet "{ class string }" } } { "path" "a pathname string" } }
-{ $description "" } ;
+{ $description "Resolves a responder-relative template path." } ;
 
 HELP: same-host?
 { $values { "url" url } { "?" "a boolean" } }
@@ -85,7 +85,7 @@ HELP: user-agent
 
 HELP: vocab-path
 { $values { "vocab" "a vocabulary specifier" } { "path" "a pathname string" } }
-{ $description "" } ;
+{ $description "Outputs the full pathname of the vocabulary's source directory." } ;
 
 HELP: exit-with
 { $values { "value" object } }

From 658743bb00c2a7e5357a4db2e3e7228f107a6d43 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 17:13:12 -0600
Subject: [PATCH 40/86] add missing copyright to svg.factor

---
 extra/svg/svg.factor | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra/svg/svg.factor b/extra/svg/svg.factor
index b5c5e96e90..6df7314653 100644
--- a/extra/svg/svg.factor
+++ b/extra/svg/svg.factor
@@ -1,3 +1,4 @@
+! (c)2009 Joe Groff, see BSD license
 USING: accessors arrays assocs fry kernel math math.affine-transforms math.constants
 math.functions math.parser math.vectors memoize peg.ebnf sequences sequences.squish
 splitting strings xml.data xml.utilities ;

From 8b68e80254e35c3b5ef862b0aac9bcb255e8d2db Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 17:13:40 -0600
Subject: [PATCH 41/86] load libblas before libcblas on openbsd

---
 basis/math/blas/cblas/cblas.factor | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index 3914c5b2ec..54616d42de 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -3,13 +3,14 @@ IN: math.blas.cblas
 
 <<
 : load-atlas ( -- )
-    "atlas" "libatlas.so" "cdecl" add-library
-    "atlas" load-library drop ;
+    "atlas" "libatlas.so" "cdecl" add-library ;
+: load-blas ( -- )
+    "blas" "libblas.so" "cdecl" add-library ;
 
 "cblas" {
     { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
     { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
-    { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library ] }
+    { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library load-blas ] }
     { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
     [ "libblas.so" "cdecl" add-library ]
 } cond

From f1182ef800c429a68ff9afc370fabff3e161189d Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 17:28:06 -0600
Subject: [PATCH 42/86] use CONSTANT: for cblas constants

---
 basis/math/blas/cblas/cblas.factor | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index 54616d42de..11552d67bb 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -19,25 +19,25 @@ IN: math.blas.cblas
 LIBRARY: cblas
 
 TYPEDEF: int CBLAS_ORDER
-: CblasRowMajor 101 ; inline
-: CblasColMajor 102 ; inline
+CONSTANT: CblasRowMajor 101
+CONSTANT: CblasColMajor 102
 
 TYPEDEF: int CBLAS_TRANSPOSE
-: CblasNoTrans   111 ; inline
-: CblasTrans     112 ; inline
-: CblasConjTrans 113 ; inline
+CONSTANT: CblasNoTrans   111
+CONSTANT: CblasTrans     112
+CONSTANT: CblasConjTrans 113
 
 TYPEDEF: int CBLAS_UPLO
-: CblasUpper 121 ; inline
-: CblasLower 122 ; inline
+CONSTANT: CblasUpper 121
+CONSTANT: CblasLower 122
 
 TYPEDEF: int CBLAS_DIAG
-: CblasNonUnit 131 ; inline
-: CblasUnit    132 ; inline
+CONSTANT: CblasNonUnit 131
+CONSTANT: CblasUnit    132
 
 TYPEDEF: int CBLAS_SIDE
-: CblasLeft  141 ; inline
-: CblasRight 142 ; inline
+CONSTANT: CblasLeft  141
+CONSTANT: CblasRight 142
 
 TYPEDEF: int CBLAS_INDEX
 

From f1a1760e6ead33bef83ca823cf0f1e874e7a2aa8 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 19:23:04 -0600
Subject: [PATCH 43/86] add csv>file and file>csv words, better docs for csv, a
 few cleanups

---
 basis/csv/csv-docs.factor  | 48 ++++++++++++++-----
 basis/csv/csv-tests.factor | 16 ++++++-
 basis/csv/csv.factor       | 95 ++++++++++++++++++++++----------------
 3 files changed, 106 insertions(+), 53 deletions(-)

diff --git a/basis/csv/csv-docs.factor b/basis/csv/csv-docs.factor
index e4741f4810..6ae75b6b2f 100644
--- a/basis/csv/csv-docs.factor
+++ b/basis/csv/csv-docs.factor
@@ -1,28 +1,52 @@
-USING: help.syntax help.markup kernel prettyprint sequences ;
+USING: help.syntax help.markup kernel prettyprint sequences
+io.pathnames ;
 IN: csv
 
 HELP: csv
 { $values { "stream" "an input stream" }
           { "rows" "an array of arrays of fields" } } 
-{ $description "parses a csv stream into an array of row arrays"
-} ;
+{ $description "Parses a csv stream into an array of row arrays." } ;
+
+HELP: file>csv
+{ $values
+    { "path" pathname } { "encoding" "an encoding descriptor" }
+    { "csv" "csv" }
+}
+{ $description "Opens a file and parses it into a sequence of comma-separated-value fields." } ;
+
+HELP: csv>file
+{ $values
+    { "rows" "a sequence of sequences of strings" }
+    { "path" pathname } { "encoding" "an encoding descriptor" }
+}
+{ $description "Writes a comma-separated-value structure to a file." } ;
 
 HELP: csv-row
 { $values { "stream" "an input stream" }
           { "row" "an array of fields" } } 
-{ $description "parses a row from a csv stream"
-} ;
+{ $description "parses a row from a csv stream" } ;
 
 HELP: write-csv
-{ $values { "rows" "an sequence of sequences of strings" }
+{ $values { "rows" "a sequence of sequences of strings" }
           { "stream" "an output stream" } } 
-{ $description "writes csv to the output stream, escaping where necessary"
-} ;
-
+{ $description "Writes a sequence of sequences of comma-separated-values to the output stream, escaping where necessary." } ;
 
 HELP: with-delimiter
-{ $values { "char" "field delimiter (e.g. CHAR: \t)" }
+{ $values { "ch" "field delimiter (e.g. CHAR: \t)" }
           { "quot" "a quotation" } }
-{ $description "Sets the field delimiter for csv or csv-row words "
-} ;
+{ $description "Sets the field delimiter for csv or csv-row words." } ;
 
+ARTICLE: "csv" "Comma-separated-values parsing and writing"
+"The " { $vocab-link "csv" } " vocabulary can read and write CSV (comma-separated-value) files." $nl
+"Reading a csv file:"
+{ $subsection file>csv }
+"Writing a csv file:"
+{ $subsection csv>file }
+"Changing the delimiter from a comma:"
+{ $subsection with-delimiter }
+"Reading from a stream:"
+{ $subsection csv }
+"Writing to a stream:"
+{ $subsection write-csv } ;
+
+ABOUT: "csv"
diff --git a/basis/csv/csv-tests.factor b/basis/csv/csv-tests.factor
index 8261ae104a..4d78c2af86 100644
--- a/basis/csv/csv-tests.factor
+++ b/basis/csv/csv-tests.factor
@@ -1,5 +1,7 @@
+USING: io.streams.string csv tools.test shuffle kernel strings
+io.pathnames io.files.unique io.encodings.utf8 io.files
+io.directories ;
 IN: csv.tests
-USING: io.streams.string csv tools.test shuffle kernel strings ;
 
 ! I like to name my unit tests
 : named-unit-test ( name output input -- ) 
@@ -76,3 +78,15 @@ USING: io.streams.string csv tools.test shuffle kernel strings ;
 "escapes quotes commas and newlines when writing"
 [ "\"fo\"\"o1\",bar1\n\"fo\no2\",\"b,ar2\"\n" ]
 [ { { "fo\"o1" "bar1" } { "fo\no2" "b,ar2" } } <string-writer> tuck write-csv >string ] named-unit-test ! "
+
+[ { { "writing" "some" "csv" "tests" } } ]
+[
+    "writing,some,csv,tests"
+    "csv-test1-" unique-file utf8
+    [ set-file-contents ] [ file>csv ] [ drop delete-file ] 2tri
+] unit-test
+
+[ t ] [
+    { { "writing,some,csv,tests" } } dup "csv-test2-"
+    unique-file utf8 [ csv>file ] [ file>csv ] 2bi =
+] unit-test
diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index bc3c25d347..7789f015d9 100755
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -1,89 +1,104 @@
 ! Copyright (C) 2007, 2008 Phil Dawes
 ! See http://factorcode.org/license.txt for BSD license.
-
-! Simple CSV Parser
-! Phil Dawes phil@phildawes.net
-
-USING: kernel sequences io namespaces make
-combinators unicode.categories ;
+USING: kernel sequences io namespaces make combinators
+unicode.categories io.files combinators.short-circuit ;
 IN: csv
 
 SYMBOL: delimiter
 
 CHAR: , delimiter set-global
 
+<PRIVATE
+
 : delimiter> ( -- delimiter ) delimiter get ; inline
     
 DEFER: quoted-field ( -- endchar )
     
-! trims whitespace from either end of string
 : trim-whitespace ( str -- str )
-  [ blank? ] trim ; inline
+    [ blank? ] trim ; inline
 
 : skip-to-field-end ( -- endchar )
   "\n" delimiter> suffix read-until nip ; inline
   
 : not-quoted-field ( -- endchar )
-  "\"\n" delimiter> suffix read-until   ! "
-  dup
-  { { CHAR: "     [ drop drop quoted-field ] }  ! " 
-    { delimiter> [ swap trim-whitespace % ] } 
-    { CHAR: \n    [ swap trim-whitespace % ] }    
-    { f           [ swap trim-whitespace % ] }       ! eof
-  } case ;
+    "\"\n" delimiter> suffix read-until
+    dup {
+        { CHAR: "    [ 2drop quoted-field ] }
+        { delimiter> [ swap trim-whitespace % ] }
+        { CHAR: \n   [ swap trim-whitespace % ] }
+        { f          [ swap trim-whitespace % ] }
+    } case ;
   
 : maybe-escaped-quote ( -- endchar )
-  read1 dup 
-  { { CHAR: "    [ , quoted-field ] }  ! " is an escaped quote
-    { delimiter> [ ] }                 ! end of quoted field 
-    { CHAR: \n   [ ] }
-    [ 2drop skip-to-field-end ]       ! end of quoted field + padding
-  } case ;
+    read1 dup {
+        { CHAR: "    [ , quoted-field ] }
+        { delimiter> [ ] }
+        { CHAR: \n   [ ] }
+        [ 2drop skip-to-field-end ]
+    } case ;
   
 : quoted-field ( -- endchar )
-  "\"" read-until                                 ! "
-  drop % maybe-escaped-quote ;
+    "\"" read-until
+    drop % maybe-escaped-quote ;
 
 : field ( -- sep string )
-  [ not-quoted-field ] "" make  ; ! trim-whitespace
+    [ not-quoted-field ] "" make  ;
 
 : (row) ( -- sep )
-  field , 
-  dup delimiter get = [ drop (row) ] when ;
+    field , 
+    dup delimiter get = [ drop (row) ] when ;
 
 : row ( -- eof? array[string] )
-  [ (row) ] { } make ;
+    [ (row) ] { } make ;
 
 : append-if-row-not-empty ( row -- )
-  dup { "" } = [ drop ] [ , ] if ;
+    dup { "" } = [ drop ] [ , ] if ;
 
 : (csv) ( -- )
-  row append-if-row-not-empty
-  [ (csv) ] when ;
+    row append-if-row-not-empty
+    [ (csv) ] when ;
   
+PRIVATE>
+
 : csv-row ( stream -- row )
-  [ row nip ] with-input-stream ;
+    [ row nip ] with-input-stream ;
 
 : csv ( stream -- rows )
-  [ [ (csv) ] { } make ] with-input-stream ;
+    [ [ (csv) ] { } make ] with-input-stream ;
 
-: with-delimiter ( char quot -- )
-  delimiter swap with-variable ; inline
+: file>csv ( path encoding -- csv )
+    <file-reader> csv ;
+
+: with-delimiter ( ch quot -- )
+    [ delimiter ] dip with-variable ; inline
+
+<PRIVATE
 
 : needs-escaping? ( cell -- ? )
-  [ [ "\n\"" member? ] [ delimiter get = ] bi or ] any? ; inline
+    [ { [ "\n\"" member? ] [ delimiter get = ] } 1|| ] any? ; inline
 
 : escape-quotes ( cell -- cell' )
-  [ [ dup , CHAR: " = [ CHAR: " , ] when ] each ] "" make ; inline
+    [
+        [
+            [ , ]
+            [ dup CHAR: " = [ , ] [ drop ] if ] bi
+        ] each
+    ] "" make ; inline
 
 : enclose-in-quotes ( cell -- cell' )
-  CHAR: " [ prefix ] [ suffix ] bi ; inline ! "
+    "\"" dup surround ; inline
     
 : escape-if-required ( cell -- cell' )
-  dup needs-escaping? [ escape-quotes enclose-in-quotes ] when ; inline
+    dup needs-escaping?
+    [ escape-quotes enclose-in-quotes ] when ; inline
+
+PRIVATE>
     
 : write-row ( row -- )
-  [ delimiter get write1 ] [ escape-if-required write ] interleave nl ; inline
+    [ delimiter get write1 ]
+    [ escape-if-required write ] interleave nl ; inline
     
 : write-csv ( rows stream -- )
-  [ [ write-row ] each ] with-output-stream ;
+    [ [ write-row ] each ] with-output-stream ;
+
+: csv>file ( rows path encoding -- ) <file-writer> write-csv ;

From 9c2a476d98751840a31ad3beb855eeafcca6694b Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 19:24:35 -0600
Subject: [PATCH 44/86] minor cleanup

---
 basis/csv/csv.factor | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index 7789f015d9..152b3dcbba 100755
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -51,12 +51,8 @@ DEFER: quoted-field ( -- endchar )
 : row ( -- eof? array[string] )
     [ (row) ] { } make ;
 
-: append-if-row-not-empty ( row -- )
-    dup { "" } = [ drop ] [ , ] if ;
-
 : (csv) ( -- )
-    row append-if-row-not-empty
-    [ (csv) ] when ;
+    row harvest [ , ] unless-empty [ (csv) ] when ;
   
 PRIVATE>
 

From d4f865d5f063d0b0e5ece331990c00fea049d7b4 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 19:28:16 -0600
Subject: [PATCH 45/86] Fixing some things I broke

---
 basis/farkup/farkup.factor                    |  2 +-
 basis/furnace/actions/actions.factor          |  1 -
 basis/furnace/chloe-tags/chloe-tags.factor    | 19 ++++++-----
 basis/help/html/html.factor                   |  4 +--
 basis/html/components/components.factor       |  2 +-
 basis/html/elements/elements-docs.factor      |  2 +-
 basis/html/elements/elements.factor           | 32 +----------------
 basis/html/forms/forms.factor                 |  9 +++--
 basis/html/html.factor                        | 34 +++++++++++++++++++
 basis/html/streams/streams.factor             |  2 +-
 basis/html/templates/chloe/chloe.factor       |  3 +-
 .../html/templates/chloe/syntax/syntax.factor |  1 -
 basis/html/templates/fhtml/fhtml.factor       |  2 +-
 basis/html/templates/templates.factor         | 14 +++++---
 basis/http/server/responses/responses.factor  | 14 ++++----
 basis/http/server/server.factor               |  7 ++--
 basis/http/server/static/static.factor        | 16 ++++-----
 basis/xmode/code2html/code2html.factor        |  2 +-
 18 files changed, 86 insertions(+), 80 deletions(-)
 create mode 100644 basis/html/html.factor

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index a752694764..bad41296ee 100755
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators html.elements io
+USING: accessors arrays combinators io
 io.streams.string kernel math namespaces peg peg.ebnf
 sequences sequences.deep strings xml.entities xml.literals
 vectors splitting xmode.code2html urls.encoding xml.data
diff --git a/basis/furnace/actions/actions.factor b/basis/furnace/actions/actions.factor
index 72a7b76d23..97cb73c9cb 100644
--- a/basis/furnace/actions/actions.factor
+++ b/basis/furnace/actions/actions.factor
@@ -10,7 +10,6 @@ furnace.utilities
 furnace.redirection
 furnace.conversations
 html.forms
-html.elements
 html.components
 html.components
 html.templates.chloe
diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor
index 1c320182bf..dd24d8dcde 100644
--- a/basis/furnace/chloe-tags/chloe-tags.factor
+++ b/basis/furnace/chloe-tags/chloe-tags.factor
@@ -8,6 +8,7 @@ xml.data
 xml.entities
 xml.writer
 xml.utilities
+xml.literals
 html.components
 html.elements
 html.forms
@@ -20,7 +21,6 @@ http.server
 http.server.redirection
 http.server.responses
 furnace.utilities ;
-QUALIFIED-WITH: assocs a
 IN: furnace.chloe-tags
 
 ! Chloe tags
@@ -56,11 +56,11 @@ CHLOE: write-atom drop [ write-atom-feeds ] [code] ;
 
 : compile-link-attrs ( tag -- )
     #! Side-effects current namespace.
-    attrs>> '[ [ [ _ ] dip link-attr ] each-responder ] [code] ;
+    '[ [ [ _ ] dip link-attr ] each-responder ] [code] ;
 
 : a-start-tag ( tag -- )
     [ <a ] [code]
-    [ non-chloe-attrs-only compile-attrs ]
+    [ attrs>> non-chloe-attrs-only compile-attrs ]
     [ compile-link-attrs ]
     [ compile-a-url ]
     tri
@@ -116,17 +116,18 @@ CHLOE: form
         } cleave
     ] compile-with-scope ;
 
-STRING: button-tag-markup
-<t:form class="inline" xmlns:t="http://factorcode.org/chloe/1.0">
-    <div style="display: inline;"><button type="submit"></button></div>
-</t:form>
-;
+: button-tag-markup ( -- xml )
+    <XML
+        <t:form class="inline" xmlns:t="http://factorcode.org/chloe/1.0">
+            <div style="display: inline;"><button type="submit"></button></div>
+        </t:form>
+    XML> ;
 
 : add-tag-attrs ( attrs tag -- )
     attrs>> swap update ;
 
 CHLOE: button
-    button-tag-markup string>xml body>>
+    button-tag-markup body>>
     {
         [ [ attrs>> chloe-attrs-only ] dip add-tag-attrs ]
         [ [ attrs>> non-chloe-attrs-only ] dip "button" deep-tag-named add-tag-attrs ]
diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index ec52264643..820261dd32 100644
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.encodings.utf8 io.encodings.ascii io.encodings.binary
-io.files io.files.temp io.directories html.streams html.elements help kernel
+io.files io.files.temp io.directories html.streams help kernel
 assocs sequences make words accessors arrays help.topics vocabs
 tools.vocabs tools.vocabs.browser namespaces prettyprint io
 vocabs.loader serialize fry memoize unicode.case math.order
-sorting debugger ;
+sorting debugger html.elements html ;
 IN: help.html
 
 : escape-char ( ch -- )
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index eec7508c5e..be197d10e6 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -6,7 +6,7 @@ hashtables combinators continuations math strings inspector
 fry locals calendar calendar.format xml.entities xml.data
 validators urls present xml.writer xml.literals xml
 xmode.code2html lcs.diff2html farkup io.streams.string
-html.elements html.streams html.forms ;
+html html.streams html.forms ;
 IN: html.components
 
 GENERIC: render* ( value name renderer -- xml )
diff --git a/basis/html/elements/elements-docs.factor b/basis/html/elements/elements-docs.factor
index dab9376413..05b202e08e 100644
--- a/basis/html/elements/elements-docs.factor
+++ b/basis/html/elements/elements-docs.factor
@@ -1,5 +1,5 @@
+USING: help.markup help.syntax io present html ;
 IN: html.elements
-USING: help.markup help.syntax io present ;
 
 ARTICLE: "html.elements" "HTML elements"
 "The " { $vocab-link "html.elements" } " vocabulary provides words for writing HTML tags to the " { $link output-stream } " with a familiar look and feel in the code."
diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor
index 005d67f221..b0e46984d7 100644
--- a/basis/html/elements/elements.factor
+++ b/basis/html/elements/elements.factor
@@ -3,18 +3,9 @@
 USING: io io.styles kernel namespaces prettyprint quotations
 sequences strings words xml.entities compiler.units effects
 xml.data xml.literals urls math math.parser combinators
-present fry io.streams.string xml.writer ;
-
+present fry io.streams.string xml.writer html ;
 IN: html.elements
 
-SYMBOL: html
-
-: write-html ( str -- )
-    H{ { html t } } format ;
-
-: print-html ( str -- )
-    write-html "\n" write-html ;
-
 <<
 
 : elements-vocab ( -- vocab-name ) "html.elements" ;
@@ -127,24 +118,3 @@ SYMBOL: html
 ] [ define-attribute-word ] each
 
 >>
-
-: xhtml-preamble ( -- )
-    "<?xml version=\"1.0\"?>" write-html
-    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">" write-html ;
-
-: simple-page ( title head-quot body-quot -- )
-    [ with-string-writer <unescaped> ] bi@
-    <XML
-        <?xml version="1.0"?>
-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-            <head>
-                <title><-></title>
-                <->
-            </head>
-            <body><-></body>
-        </html>
-    XML> write-xml ; inline
-
-: render-error ( message -- )
-    [XML <span class="error"><-></span> XML] write-xml ;
diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor
index f92f8d0764..0a69e2ed70 100644
--- a/basis/html/forms/forms.factor
+++ b/basis/html/forms/forms.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors strings namespaces assocs hashtables io
-mirrors math fry sequences words continuations html.elements
-xml.entities ;
+mirrors math fry sequences words continuations
+xml.entities xml.writer xml.literals ;
 IN: html.forms
 
 TUPLE: form errors values validation-failed ;
@@ -109,7 +109,6 @@ C: <validation-error> validation-error
 : render-validation-errors ( -- )
     form get errors>>
     [
-        <ul "errors" =class ul>
-            [ <li> escape-string write </li> ] each
-        </ul>
+        [ [XML <li><-></li> XML] ] map
+        [XML <ul class="errors"><-></ul> XML] write-xml
     ] unless-empty ;
diff --git a/basis/html/html.factor b/basis/html/html.factor
new file mode 100644
index 0000000000..5469941972
--- /dev/null
+++ b/basis/html/html.factor
@@ -0,0 +1,34 @@
+! Copyright (C) 2004, 2009 Chris Double, Daniel Ehrenberg.
+! See http://factorcode.org/license.txt for BSD license.
+USING: io kernel xml.data xml.writer io.streams.string
+xml.literals io.styles ;
+IN: html
+
+SYMBOL: html
+
+: write-html ( str -- )
+    H{ { html t } } format ;
+
+: print-html ( str -- )
+    write-html "\n" write-html ;
+
+: xhtml-preamble ( -- )
+    "<?xml version=\"1.0\"?>" write-html
+    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">" write-html ;
+
+: simple-page ( title head-quot body-quot -- )
+    [ with-string-writer <unescaped> ] bi@
+    <XML
+        <?xml version="1.0"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+            <head>
+                <title><-></title>
+                <->
+            </head>
+            <body><-></body>
+        </html>
+    XML> write-xml ; inline
+
+: render-error ( message -- )
+    [XML <span class="error"><-></span> XML] write-xml ;
diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 24d9dceb80..483ace064e 100644
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -4,7 +4,7 @@ USING: combinators generic assocs help http io io.styles
 io.files continuations io.streams.string kernel math math.order
 math.parser namespaces make quotations assocs sequences strings
 words html.elements xml.entities sbufs continuations destructors
-accessors arrays urls.encoding ;
+accessors arrays urls.encoding html ;
 IN: html.streams
 
 GENERIC: browser-link-href ( presented -- href )
diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor
index c3c1ec2b9e..47c7934c83 100644
--- a/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@ -5,8 +5,9 @@ namespaces make classes.tuple assocs splitting words arrays io
 io.files io.files.info io.encodings.utf8 io.streams.string
 unicode.case mirrors math urls present multiline quotations xml
 logging continuations
-xml.data
+xml.data xml.writer xml.literals strings
 html.forms
+html
 html.elements
 html.components
 html.templates
diff --git a/basis/html/templates/chloe/syntax/syntax.factor b/basis/html/templates/chloe/syntax/syntax.factor
index fb457ff1df..c2ecd4506b 100644
--- a/basis/html/templates/chloe/syntax/syntax.factor
+++ b/basis/html/templates/chloe/syntax/syntax.factor
@@ -6,7 +6,6 @@ classes.tuple assocs splitting words arrays memoize parser lexer
 io io.files io.encodings.utf8 io.streams.string
 unicode.case mirrors fry math urls
 multiline xml xml.data xml.writer xml.utilities
-html.elements
 html.components
 html.templates ;
 
diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor
index 992b660070..23bb469627 100644
--- a/basis/html/templates/fhtml/fhtml.factor
+++ b/basis/html/templates/fhtml/fhtml.factor
@@ -5,7 +5,7 @@ USING: continuations sequences kernel namespaces debugger
 combinators math quotations generic strings splitting
 accessors assocs fry vocabs.parser
 parser lexer io io.files io.streams.string io.encodings.utf8
-html.elements
+html
 html.templates ;
 IN: html.templates.fhtml
 
diff --git a/basis/html/templates/templates.factor b/basis/html/templates/templates.factor
index 57418a3e02..6951f09efe 100644
--- a/basis/html/templates/templates.factor
+++ b/basis/html/templates/templates.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel fry io io.encodings.utf8 io.files
 debugger prettyprint continuations namespaces boxes sequences
-arrays strings html.elements io.streams.string
-quotations xml.data xml.writer ;
+arrays strings html io.streams.string
+quotations xml.data xml.writer xml.literals ;
 IN: html.templates
 
 MIXIN: template
@@ -53,9 +53,13 @@ SYMBOL: atom-feeds
 
 : write-atom-feeds ( -- )
     atom-feeds get [
-        <link "alternate" =rel "application/atom+xml" =type
-        first2 [ =title ] [ =href ] bi*
-        link/>
+        first2 [XML
+            <link
+                rel="alternate"
+                type="application/atom+xml"
+                title=<->
+                href=<->/>
+        XML] write-xml
     ] each ;
 
 SYMBOL: nested-template?
diff --git a/basis/http/server/responses/responses.factor b/basis/http/server/responses/responses.factor
index 4056f0c7f0..c9b4600ac8 100644
--- a/basis/http/server/responses/responses.factor
+++ b/basis/http/server/responses/responses.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: html.elements math.parser http accessors kernel
+USING: math.parser http accessors kernel xml.literals xml.writer
 io io.streams.string io.encodings.utf8 ;
 IN: http.server.responses
 
@@ -13,11 +13,13 @@ IN: http.server.responses
         swap >>body ;
     
 : trivial-response-body ( code message -- )
-    <html>
-        <body>
-            <h1> [ number>string write bl ] [ write ] bi* </h1>
-        </body>
-    </html> ;
+    <XML
+        <html>
+            <body>
+                <h1><-> <-></h1>
+            </body>
+        </html>
+    XML> write-xml ;
 
 : <trivial-response> ( code message -- response )
     2dup [ trivial-response-body ] with-string-writer
diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index a886d7bae7..90a8ddb51a 100755
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -24,7 +24,7 @@ http.parsers
 http.server.responses
 http.server.remapping
 html.templates
-html.elements
+html
 html.streams ;
 IN: http.server
 
@@ -174,8 +174,9 @@ main-responder global [ <404> <trivial-responder> or ] change-at
     [ add-responder-nesting ] [ call-responder* ] 2bi ;
 
 : http-error. ( error -- )
-    "Internal server error" [ ] [
-        [ print-error nl :c ] with-html-writer
+    ! TODO: get rid of rot
+    "Internal server error" [ ] rot '[
+        [ _ print-error nl :c ] with-html-writer
     ] simple-page ;
 
 : <500> ( error -- response )
diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor
index c910529d73..67ce0237a4 100644
--- a/basis/http/server/static/static.factor
+++ b/basis/http/server/static/static.factor
@@ -4,9 +4,9 @@ USING: calendar kernel math math.order math.parser namespaces
 parser sequences strings assocs hashtables debugger mime.types
 sorting logging calendar.format accessors splitting io io.files
 io.files.info io.directories io.pathnames io.encodings.binary
-fry xml.entities destructors urls html.elements
+fry xml.entities destructors urls html xml.literals
 html.templates.fhtml http http.server http.server.responses
-http.server.redirection ;
+http.server.redirection xml.writer ;
 IN: http.server.static
 
 TUPLE: file-responder root hook special allow-listings ;
@@ -56,18 +56,14 @@ TUPLE: file-responder root hook special allow-listings ;
 
 \ serve-file NOTICE add-input-logging
 
-: file. ( name -- )
+: file. ( name -- xml )
     dup link-info directory? [ "/" append ] when
-    dup <a =href a> escape-string write </a> ;
+    dup [XML <li><a href=<->><-></a></li> XML] ;
 
 : directory. ( path -- )
     dup file-name [ ] [
-        [ <h1> file-name escape-string write </h1> ]
-        [
-            <ul>
-                directory-files [ <li> file. </li> ] each
-            </ul>
-        ] bi
+        [ file-name ] [ directory-files [ file. ] map ] bi
+        [XML <h1><-></h1> <ul><-></ul> XML] write-xml
     ] simple-page ;
 
 : list-directory ( directory -- response )
diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor
index 665d334fd2..9889a98a99 100644
--- a/basis/xmode/code2html/code2html.factor
+++ b/basis/xmode/code2html/code2html.factor
@@ -1,5 +1,5 @@
 USING: xmode.tokens xmode.marker xmode.catalog kernel locals
-html.elements io io.files sequences words io.encodings.utf8
+io io.files sequences words io.encodings.utf8
 namespaces xml.entities accessors xml.literals locals xml.writer ;
 IN: xmode.code2html
 

From f8092480a6b1488c397d2c69b616a4342f487c56 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 19:34:31 -0600
Subject: [PATCH 46/86] Fix a couple of bugs in xmode and add a unit test

---
 basis/xmode/catalog/catalog.factor           | 36 +++++++++++---------
 basis/xmode/code2html/code2html-tests.factor |  9 ++++-
 basis/xmode/code2html/code2html.factor       |  6 ++--
 basis/xmode/loader/loader.factor             | 16 ++++-----
 basis/xmode/loader/syntax/syntax.factor      | 13 +++----
 basis/xmode/marker/context/context.factor    |  4 +--
 basis/xmode/marker/marker.factor             |  4 +--
 7 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index 8a8e5fad4a..4e3af0af56 100644
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -52,9 +52,15 @@ SYMBOL: rule-sets
     dup "::" split1 [ swap (load-mode) ] [ rule-sets get ] if*
     dup -roll at* [ nip ] [ drop no-such-rule-set ] if ;
 
+DEFER: finalize-rule-set
+
 : resolve-delegate ( rule -- )
-    dup delegate>> dup string?
-    [ get-rule-set nip swap (>>delegate) ] [ 2drop ] if ;
+    dup delegate>> dup string? [
+        get-rule-set
+        dup rule-set? [ "not a rule set" throw ] unless
+        swap rule-sets [ dup finalize-rule-set ] with-variable
+        >>delegate drop
+    ] [ 2drop ] if ;
 
 : each-rule ( rule-set quot -- )
     [ rules>> values concat ] dip each ; inline
@@ -74,26 +80,22 @@ SYMBOL: rule-sets
 : resolve-imports ( ruleset -- )
     dup imports>> [
         get-rule-set swap rule-sets [
-            dup resolve-delegates
-            2dup import-keywords
-            import-rules
+            [ nip resolve-delegates ]
+            [ import-keywords ]
+            [ import-rules ]
+            2tri
         ] with-variable
     ] with each ;
 
 ERROR: mutually-recursive-rulesets ruleset ;
+
 : finalize-rule-set ( ruleset -- )
-    dup finalized?>> {
-        { f [
-            {
-                [ 1 >>finalized? drop ]
-                [ resolve-imports ]
-                [ resolve-delegates ]
-                [ t >>finalized? drop ]
-            } cleave
-        ] }
-        { t [ drop ] }
-        { 1 [ mutually-recursive-rulesets ] }
-    } case ;
+    dup finalized?>> [ drop ] [
+        t >>finalized?
+        [ resolve-imports ]
+        [ resolve-delegates ]
+        bi
+    ] if ;
 
 : finalize-mode ( rulesets -- )
     rule-sets [
diff --git a/basis/xmode/code2html/code2html-tests.factor b/basis/xmode/code2html/code2html-tests.factor
index cd11ba50d0..c0b8a1b560 100644
--- a/basis/xmode/code2html/code2html-tests.factor
+++ b/basis/xmode/code2html/code2html-tests.factor
@@ -1,7 +1,7 @@
 IN: xmode.code2html.tests
 USING: xmode.code2html xmode.catalog
 tools.test multiline splitting memoize
-kernel ;
+kernel io.streams.string xml.writer ;
 
 [ ] [ \ (load-mode) reset-memoized ] unit-test
 
@@ -9,4 +9,11 @@ kernel ;
     <" <style type="text/css" media="screen" >
     *        {margin:0; padding:0; border:0;} ">
     string-lines "html" htmlize-lines drop
+] unit-test
+
+[ ] [
+    "test.c"
+    <" int x = "hi";
+/* a comment */ "> <string-reader> htmlize-stream
+    write-xml
 ] unit-test
\ No newline at end of file
diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor
index 665d334fd2..22ffc04824 100644
--- a/basis/xmode/code2html/code2html.factor
+++ b/basis/xmode/code2html/code2html.factor
@@ -8,14 +8,14 @@ IN: xmode.code2html
         [ str>> ] [ id>> ] bi [
             name>> swap
             [XML <span class=<->><-></span> XML]
-        ] [ ] if*
+        ] when*
     ] map ;
 
 : htmlize-line ( line-context line rules -- line-context' xml )
     tokenize-line htmlize-tokens ;
 
 : htmlize-lines ( lines mode -- xml )
-    [ f ] 2dip load-mode [ htmlize-line ] curry map nip ;
+    [ f ] 2dip load-mode [ htmlize-line "\n" suffix ] curry map nip ;
 
 : default-stylesheet ( -- xml )
     "resource:basis/xmode/code2html/stylesheet.css"
@@ -24,7 +24,7 @@ IN: xmode.code2html
 
 :: htmlize-stream ( path stream -- xml )
     stream lines
-    [ "" ] [ first find-mode path swap htmlize-lines ]
+    [ "" ] [ path over first find-mode htmlize-lines ]
     if-empty :> input
     default-stylesheet :> stylesheet
     <XML <html>
diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor
index 64c4234bd3..b661f4eb3f 100644
--- a/basis/xmode/loader/loader.factor
+++ b/basis/xmode/loader/loader.factor
@@ -43,17 +43,17 @@ RULE: MARK_PREVIOUS mark-previous-rule
     shared-tag-attrs match-type-attr literal-start ;
 
 TAG: KEYWORDS ( rule-set tag -- key value )
-    ignore-case? get <keyword-map>
+    rule-set get ignore-case?>> <keyword-map>
     swap child-tags [ over parse-keyword-tag ] each
     swap (>>keywords) ;
 
 TAGS>
 
 : ?<regexp> ( string/f -- regexp/f )
-    dup [ ignore-case? get <regexp> ] when ;
+    dup [ rule-set get ignore-case?>> <regexp> ] when ;
 
 : (parse-rules-tag) ( tag -- rule-set )
-    <rule-set>
+    <rule-set> dup rule-set set
     {
         { "SET" string>rule-set-name (>>name) }
         { "IGNORE_CASE" string>boolean (>>ignore-case?) }
@@ -65,11 +65,11 @@ TAGS>
     } init-from-tag ;
 
 : parse-rules-tag ( tag -- rule-set )
-    dup (parse-rules-tag) [
-        dup ignore-case?>> ignore-case? [
-            swap child-tags [ parse-rule-tag ] with each
-        ] with-variable
-    ] keep ;
+    [
+        [ (parse-rules-tag) ] [ child-tags ] bi
+        [ parse-rule-tag ] with each
+        rule-set get
+    ] with-scope ;
 
 : merge-rule-set-props ( props rule-set -- )
     [ assoc-union ] change-props drop ;
diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor
index f63191d5f6..b546969a37 100644
--- a/basis/xmode/loader/syntax/syntax.factor
+++ b/basis/xmode/loader/syntax/syntax.factor
@@ -1,13 +1,11 @@
-! Copyright (C) 2007, 2008 Slava Pestov.
+! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors xmode.tokens xmode.rules xmode.keyword-map
 xml.data xml.utilities xml assocs kernel combinators sequences
 math.parser namespaces make parser lexer xmode.utilities
-parser-combinators.regexp io.files ;
+parser-combinators.regexp io.files splitting arrays ;
 IN: xmode.loader.syntax
 
-SYMBOL: ignore-case?
-
 ! Rule tag parsing utilities
 : (parse-rule-tag) ( rule-set tag specs class -- )
     new swap init-from-tag swap add-rule ; inline
@@ -44,16 +42,19 @@ SYMBOL: ignore-case?
 
 : parse-literal-matcher ( tag -- matcher )
     dup children>string
-    ignore-case? get <string-matcher>
+    rule-set get ignore-case?>> <string-matcher>
     swap position-attrs <matcher> ;
 
 : parse-regexp-matcher ( tag -- matcher )
-    dup children>string ignore-case? get <regexp>
+    dup children>string rule-set get ignore-case?>> <regexp>
     swap position-attrs <matcher> ;
 
 : shared-tag-attrs ( -- )
     { "TYPE" string>token (>>body-token) } , ; inline
 
+: parse-delegate ( string -- pair )
+    "::" split1 [ rule-set get swap ] unless* 2array ;
+
 : delegate-attr ( -- )
     { "DELEGATE" f (>>delegate) } , ;
 
diff --git a/basis/xmode/marker/context/context.factor b/basis/xmode/marker/context/context.factor
index da20503fcb..cc3b5096e8 100644
--- a/basis/xmode/marker/context/context.factor
+++ b/basis/xmode/marker/context/context.factor
@@ -1,4 +1,4 @@
-USING: accessors kernel ;
+USING: accessors kernel xmode.rules ;
 IN: xmode.marker.context
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker.LineContext
@@ -10,7 +10,7 @@ end
 ;
 
 : <line-context> ( ruleset parent -- line-context )
-    over [ "no context" throw ] unless
+    over rule-set? [ "not a rule-set" throw ] unless
     line-context new
         swap >>parent
         swap >>in-rule-set ;
diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index cff0af2a98..4fdde60976 100755
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -157,7 +157,7 @@ M: seq-rule handle-rule-start
     mark-token
     add-remaining-token
     tuck body-token>> next-token,
-    delegate>> [ push-context ] when* ;
+    get-delegate [ push-context ] when* ;
 
 UNION: abstract-span-rule span-rule eol-span-rule ;
 
@@ -168,7 +168,7 @@ M: abstract-span-rule handle-rule-start
     tuck rule-match-token* next-token,
     ! ... end subst ...
     dup context get (>>in-rule)
-    delegate>> push-context ;
+    get-delegate push-context ;
 
 M: span-rule handle-rule-end
     2drop ;

From e701e66399d8868e5b0e74104b51bd98d81758ad Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 30 Jan 2009 21:46:47 -0600
Subject: [PATCH 47/86] Load right blas libraries on netbsd

---
 basis/math/blas/cblas/cblas.factor | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index 11552d67bb..f14c6cfd43 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -1,4 +1,5 @@
-USING: alien alien.c-types alien.syntax kernel system combinators ;
+USING: alien alien.c-types alien.syntax kernel system
+combinators combinators.short-circuit ;
 IN: math.blas.cblas
 
 <<
@@ -10,7 +11,10 @@ IN: math.blas.cblas
 "cblas" {
     { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
     { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
-    { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library load-blas ] }
+    {
+        [ os { [ openbsd? ] [ netbsd? ] } 1|| ]
+        [ "libcblas.so" "cdecl" add-library load-blas ]
+    }
     { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
     [ "libblas.so" "cdecl" add-library ]
 } cond

From 12ca0eec41540f3569afe4673f18732310561885 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 22:42:36 -0600
Subject: [PATCH 48/86] blas from netbsd pkgsrc depends on f2c runtime libs

---
 basis/math/blas/cblas/cblas.factor | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index f14c6cfd43..2a2e9e3a72 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -1,20 +1,24 @@
 USING: alien alien.c-types alien.syntax kernel system
-combinators combinators.short-circuit ;
+combinators ;
 IN: math.blas.cblas
 
 <<
 : load-atlas ( -- )
     "atlas" "libatlas.so" "cdecl" add-library ;
+: load-fortran ( -- )
+    "I77" "libI77.so" "cdecl" add-library
+    "F77" "libF77.so" "cdecl" add-library ;
 : load-blas ( -- )
     "blas" "libblas.so" "cdecl" add-library ;
 
 "cblas" {
     { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
     { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
-    {
-        [ os { [ openbsd? ] [ netbsd? ] } 1|| ]
-        [ "libcblas.so" "cdecl" add-library load-blas ]
-    }
+    { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library load-blas ] }
+    { [ os netbsd? ] [ 
+        load-fortran load-blas
+        "/usr/local/lib/libcblas.so" "cdecl" add-library
+    ] }
     { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
     [ "libblas.so" "cdecl" add-library ]
 } cond

From b2ee879c07c84d39c4125f2cfed5cb1881cd5654 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 23:26:41 -0600
Subject: [PATCH 49/86] Fix load error

---
 basis/xmode/marker/marker.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index 4fdde60976..cff0af2a98 100755
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -157,7 +157,7 @@ M: seq-rule handle-rule-start
     mark-token
     add-remaining-token
     tuck body-token>> next-token,
-    get-delegate [ push-context ] when* ;
+    delegate>> [ push-context ] when* ;
 
 UNION: abstract-span-rule span-rule eol-span-rule ;
 
@@ -168,7 +168,7 @@ M: abstract-span-rule handle-rule-start
     tuck rule-match-token* next-token,
     ! ... end subst ...
     dup context get (>>in-rule)
-    get-delegate push-context ;
+    delegate>> push-context ;
 
 M: span-rule handle-rule-end
     2drop ;

From 30b2dd2e20d3aef272c947578cb83dc9ce296514 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 23:26:50 -0600
Subject: [PATCH 50/86] Fix typo, we're Unicode 5.1 not 5.0

---
 core/strings/strings-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/strings/strings-docs.factor b/core/strings/strings-docs.factor
index 3a519e143b..d40cd982d8 100644
--- a/core/strings/strings-docs.factor
+++ b/core/strings/strings-docs.factor
@@ -4,7 +4,7 @@ sbufs math ;
 IN: strings
 
 ARTICLE: "strings" "Strings"
-"A string is a fixed-size mutable sequence of Unicode 5.0 code points."
+"A string is a fixed-size mutable sequence of Unicode 5.1 code points."
 $nl
 "Characters are not a first-class type; they are simply represented as integers between 0 and 16777216 (2^24). Only characters up to 2097152 (2^21) have a defined meaning in Unicode."
 $nl

From 58d6e6885525fbce2a58c8ce8ac87a6e771a6979 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Sat, 31 Jan 2009 01:01:54 -0600
Subject: [PATCH 51/86] Minor changes to web framework; fixing
 websites.concatenative:init-testing

---
 basis/furnace/auth/auth-docs.factor                    |  3 +--
 basis/html/templates/chloe/chloe.factor                |  1 -
 basis/html/templates/chloe/compiler/compiler.factor    |  6 +++---
 .../html/templates/chloe/components/components.factor  |  3 ++-
 extra/websites/concatenative/concatenative.factor      | 10 +++++-----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/basis/furnace/auth/auth-docs.factor b/basis/furnace/auth/auth-docs.factor
index f1f68c975d..3f1bcb6085 100644
--- a/basis/furnace/auth/auth-docs.factor
+++ b/basis/furnace/auth/auth-docs.factor
@@ -105,9 +105,8 @@ ARTICLE: "furnace.auth.realm-config" "Authentication realm configuration"
 "Instances of subclasses of " { $link realm } " have the following slots which may be set:"
 { $table
     { { $slot "name" } "A string identifying the realm for user interface purposes" }
-    { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } ". By default, the " { $link users-in-db } " provider is used." } }
+    { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } "). By default, the " { $link users-in-db } " provider is used." } }
     { { $slot "checksum" } { "An implementation of the checksum protocol used for verifying passwords (see " { $link "checksums" } "). The " { $link sha-256 } " checksum is used by default." } }
-    { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } } }
     { { $slot "secure" } { "A boolean, that when set to a true value, forces the client to access the authentication realm via HTTPS. An attempt to access the realm via HTTP results in a redirect to the corresponding HTTPS URL. On by default." } }
 } ;
 
diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor
index 47c7934c83..e5b40fcfaa 100644
--- a/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@ -16,7 +16,6 @@ html.templates.chloe.components
 html.templates.chloe.syntax ;
 IN: html.templates.chloe
 
-! Chloe is Ed's favorite web designer
 TUPLE: chloe path ;
 
 C: <chloe> chloe
diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor
index 4034b67d45..7180e8cdbc 100644
--- a/basis/html/templates/chloe/compiler/compiler.factor
+++ b/basis/html/templates/chloe/compiler/compiler.factor
@@ -73,8 +73,8 @@ DEFER: compile-element
         [ compile-start-tag ]
         [ compile-children ]
         [ compile-end-tag ]
-        [ drop tag-stack get pop* ]
-    } cleave ;
+    } cleave
+    tag-stack get pop* ;
 
 ERROR: unknown-chloe-tag tag ;
 
@@ -116,7 +116,7 @@ ERROR: unknown-chloe-tag tag ;
     [ [ compile-children ] compile-quot ] [ % ] bi* ; inline
 
 : compile-children>string ( tag -- )
-     [ with-string-writer ] process-children ;
+    [ with-string-writer ] process-children ;
 
 : compile-with-scope ( quot -- )
     compile-quot [ with-scope ] [code] ; inline
diff --git a/basis/html/templates/chloe/components/components.factor b/basis/html/templates/chloe/components/components.factor
index 3041120d43..19f2019266 100644
--- a/basis/html/templates/chloe/components/components.factor
+++ b/basis/html/templates/chloe/components/components.factor
@@ -21,7 +21,8 @@ M: singleton-class component-tag ( tag class -- )
     bi ;
 
 M: tuple-class component-tag ( tag class -- )
-    [ drop "name" required-attr compile-attr ] [ compile-component-attrs ] 2bi
+    [ drop "name" required-attr compile-attr ]
+    [ compile-component-attrs ] 2bi
     [ render ] [code] ;
 
 : COMPONENT:
diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 302967969f..3e53a51d54 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -55,8 +55,6 @@ TUPLE: factor-website < dispatcher ;
 
 : <factor-website> ( -- responder )
     factor-website new-dispatcher
-        <wiki> "wiki" add-responder
-        <user-admin> "user-admin" add-responder
         URL" /wiki/view/Front Page" <redirect-responder> "" add-responder ;
 
 SYMBOL: key-password
@@ -76,8 +74,10 @@ SYMBOL: dh-file
     "password" key-password set-global
     common-configuration
     <factor-website>
-        <pastebin> <factor-boilerplate> <login-config> "pastebin" add-responder
-        <planet> <factor-boilerplate> <login-config> "planet" add-responder
+        <wiki> <login-config> <factor-boilerplate> "wiki" add-responder
+        <user-admin> <login-config> <factor-boilerplate> "user-admin" add-responder
+        <pastebin> <login-config> <factor-boilerplate> "pastebin" add-responder
+        <planet> <login-config> <factor-boilerplate> "planet" add-responder
         "/tmp/docs/" <help-webapp> "docs" add-responder
     test-db <alloy>
     main-responder set-global ;
@@ -90,7 +90,7 @@ SYMBOL: dh-file
 : init-production ( -- )
     common-configuration
     <vhost-dispatcher>
-        <factor-website> <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
+        <factor-website> <wiki> <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
         <pastebin> <login-config> <factor-boilerplate> test-db <alloy> "paste.factorcode.org" add-responder
         <planet> <login-config> <factor-boilerplate> test-db <alloy> "planet.factorcode.org" add-responder
         home "docs" append-path <help-webapp> test-db <alloy> "docs.factorcode.org" add-responder

From b88f537bc97d468087f42558a43403b856a3bd82 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 03:01:56 -0600
Subject: [PATCH 52/86] Fix circular dependency between db.tuples and db.types
 docs

---
 basis/db/tuples/tuples-docs.factor |  6 ++++-
 basis/db/types/types-docs.factor   | 41 ++++++++++++++----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor
index 3d2971bf9c..bd88c56431 100644
--- a/basis/db/tuples/tuples-docs.factor
+++ b/basis/db/tuples/tuples-docs.factor
@@ -1,9 +1,13 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: classes help.markup help.syntax io.streams.string kernel
-quotations sequences strings multiline math db.types db ;
+quotations sequences strings multiline math db.types
+db.tuples.private db ;
 IN: db.tuples
 
+HELP: random-id-generator
+{ $description "Used to tell " { $link eval-generator } " to generate a random number for use as a key." } ;
+
 HELP: create-sql-statement
 { $values
      { "class" class }
diff --git a/basis/db/types/types-docs.factor b/basis/db/types/types-docs.factor
index 4d3be1d592..60d92717e8 100644
--- a/basis/db/types/types-docs.factor
+++ b/basis/db/types/types-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: classes hashtables help.markup help.syntax io.streams.string
-kernel sequences strings math db.tuples db.tuples.private ;
+kernel sequences strings math ;
 IN: db.types
 
 HELP: +db-assigned-id+
@@ -89,31 +89,31 @@ HELP: VARCHAR
 
 HELP: user-assigned-id-spec?
 { $values
-     { "specs" "a sequence of sql specs" }
+     { "specs" "a sequence of SQL specs" }
      { "?" "a boolean" } }
-{ $description "Tests if any of the sql specs has the type " { $link +user-assigned-id+ } "." } ;
+{ $description "Tests if any of the SQL specs has the type " { $link +user-assigned-id+ } "." } ;
 
 HELP: bind#
 { $values
-     { "spec" "a sql spec" } { "obj" object } }
+     { "spec" "a SQL spec" } { "obj" object } }
 { $description "A generic word that lets a database construct a literal binding." } ;
 
 HELP: bind%
 { $values
-     { "spec" "a sql spec" } }
+     { "spec" "a SQL spec" } }
 { $description "A generic word that lets a database output a binding." } ;
 
 HELP: db-assigned-id-spec?
 { $values
-     { "specs" "a sequence of sql specs" }
+     { "specs" "a sequence of SQL specs" }
      { "?" "a boolean" } }
-{ $description "Tests if any of the sql specs has the type " { $link +db-assigned-id+ } "." } ;
+{ $description "Tests if any of the SQL specs has the type " { $link +db-assigned-id+ } "." } ;
 
 HELP: find-primary-key
 { $values
-     { "specs" "a sequence of sql-specs" }
-     { "seq" "a sequence of sql-specs" } }
-{ $description "Returns the rows from the sql-specs array that are part of the primary key. Composite primary keys are supported, so this word must return a sequence." }
+     { "specs" "a sequence of SQL specs" }
+     { "seq" "a sequence of SQL specs" } }
+{ $description "Returns the rows from the SQL specs array that are part of the primary key. Composite primary keys are supported, so this word must return a sequence." }
 { $notes "This is a low-level word." } ;
 
 HELP: get-slot-named
@@ -124,13 +124,13 @@ HELP: get-slot-named
 
 HELP: no-sql-type
 { $values
-     { "type" "a sql type" } }
-{ $description "Throws an error containing a sql type that is unsupported or the result of a typo." } ;
+     { "type" "a SQL type" } }
+{ $description "Throws an error containing a SQL type that is unsupported or the result of a typo." } ;
 
 HELP: normalize-spec
 { $values
-     { "spec" "a sql spec" } }
-{ $description "Normalizes a sql spec." } ;
+     { "spec" "a SQL spec" } }
+{ $description "Normalizes a SQL spec." } ;
 
 HELP: offset-of-slot
 { $values
@@ -140,22 +140,19 @@ HELP: offset-of-slot
 
 HELP: primary-key?
 { $values
-     { "spec" "a sql spec" }
+     { "spec" "a SQL spec" }
      { "?" "a boolean" } }
-{ $description "Returns true if a sql spec is a primary key." } ;
-
-HELP: random-id-generator
-{ $description "Used to tell " { $link eval-generator } " to generate a random number for use as a key." } ;
+{ $description "Returns true if a SQL spec is a primary key." } ;
 
 HELP: relation?
 { $values
-     { "spec" "a sql spec" }
+     { "spec" "a SQL spec" }
      { "?" "a boolean" } }
-{ $description "Returns true if a sql spec is a relation." } ;
+{ $description "Returns true if a SQL spec is a relation." } ;
 
 HELP: unknown-modifier
 { $values { "modifier" string } }
-{ $description "Throws an error containing an unknown sql modifier." } ;
+{ $description "Throws an error containing an unknown SQL modifier." } ;
 
 ARTICLE: "db.types" "Database types"
 "The " { $vocab-link "db.types" } " vocabulary maps Factor types to database types." $nl

From ad4004266324d7f968c87e9cb1c3e6508fedce26 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 03:02:10 -0600
Subject: [PATCH 53/86] Fix regression in xmode.code2html:htmlize-lines

---
 basis/xmode/code2html/code2html.factor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor
index 5e032846b0..2f35cd6d76 100644
--- a/basis/xmode/code2html/code2html.factor
+++ b/basis/xmode/code2html/code2html.factor
@@ -15,7 +15,8 @@ IN: xmode.code2html
     tokenize-line htmlize-tokens ;
 
 : htmlize-lines ( lines mode -- xml )
-    [ f ] 2dip load-mode [ htmlize-line "\n" suffix ] curry map nip ;
+    [ f ] 2dip load-mode [ htmlize-line ] curry map nip
+    { "\n" } join ;
 
 : default-stylesheet ( -- xml )
     "resource:basis/xmode/code2html/stylesheet.css"

From 26a35540a50952c15132f0fcfeb8609d962b5da9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 03:02:21 -0600
Subject: [PATCH 54/86] Update lint for Dan's html vocab change

---
 extra/lint/lint.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor
index 998f2d42d7..60e3332ee4 100755
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.accessors arrays assocs
-combinators.short-circuit fry hashtables html.elements io
+combinators.short-circuit fry hashtables html io
 kernel math namespaces prettyprint quotations sequences
 sequences.deep sets slots.private vectors vocabs words
 kernel.private ;

From d95e275b6388e023890ec1d154e9d10d61f5b84a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 03:02:29 -0600
Subject: [PATCH 55/86] Fix websites.concatenative:init-production

---
 extra/websites/concatenative/concatenative.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 3e53a51d54..c1d62c6cda 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -90,7 +90,7 @@ SYMBOL: dh-file
 : init-production ( -- )
     common-configuration
     <vhost-dispatcher>
-        <factor-website> <wiki> <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
+        <factor-website> <wiki> <login-config> <factor-boilerplate> "wiki" add-responder test-db <alloy> "concatenative.org" add-responder
         <pastebin> <login-config> <factor-boilerplate> test-db <alloy> "paste.factorcode.org" add-responder
         <planet> <login-config> <factor-boilerplate> test-db <alloy> "planet.factorcode.org" add-responder
         home "docs" append-path <help-webapp> test-db <alloy> "docs.factorcode.org" add-responder

From 6b7a05013a304f53fe14d9f26d6ef969e85366c2 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 31 Jan 2009 09:18:44 -0600
Subject: [PATCH 56/86] Update svg for xml api changes

---
 extra/svg/svg.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/svg/svg.factor b/extra/svg/svg.factor
index 6df7314653..4d8a6e6a17 100644
--- a/extra/svg/svg.factor
+++ b/extra/svg/svg.factor
@@ -79,7 +79,7 @@ transform-list = wsp* transforms?:t wsp*
 ;EBNF
 
 : tag-transform ( tag -- transform )
-    "transform" svg-name swap at svg-transform>affine-transform ;
+    "transform" svg-name attr svg-transform>affine-transform ;
 
 TUPLE: moveto p relative? ;
 TUPLE: closepath ;
@@ -221,4 +221,4 @@ svg-path = wsp* moveto-drawto-command-groups?:x wsp* => [[ x ]]
 ;EBNF
 
 : tag-d ( tag -- d )
-    "d" svg-name swap at svg-path>array ;
+    "d" svg-name attr svg-path>array ;

From 5f681d4f3399e7c2c3dac4f500c2ced83bab6a82 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 31 Jan 2009 17:29:04 -0600
Subject: [PATCH 57/86] add test cases to svg to cover recent breakage

---
 extra/svg/svg-tests.factor | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/extra/svg/svg-tests.factor b/extra/svg/svg-tests.factor
index 2e1f88b29b..3a28310d71 100644
--- a/extra/svg/svg-tests.factor
+++ b/extra/svg/svg-tests.factor
@@ -1,6 +1,6 @@
 ! (c)2009 Joe Groff, see BSD license
-USING: arrays literals math math.affine-transforms math.functions multiline
-svg tools.test ;
+USING: accessors arrays literals math math.affine-transforms
+math.functions multiline sequences svg tools.test xml xml.utilities ;
 IN: svg.tests
 
 { 1.0 2.25 } { -3.0 4.0 } { 5.5 0.000001 } <affine-transform> 1array [
@@ -94,3 +94,18 @@ IN: svg.tests
     A 5 6 7 1 0 8 9
     "> svg-path>array
 ] unit-test
+
+STRING: test-svg-string
+<svg xmlns="http://www.w3.org/2000/svg">
+        <path transform="translate(1 2)" d="M -1 -1 l 2 2" />
+</svg>
+;
+
+: test-svg-path
+    test-svg-string string>xml body>> children-tags first ;
+
+[ { T{ moveto f { -1.0 -1.0 } f } T{ lineto f { 2.0 2.0 } t } } ]
+[ test-svg-path tag-d ] unit-test
+
+[ T{ affine-transform f { 1.0 0.0 } { 0.0 1.0 } { 1.0 2.0 } } ]
+[ test-svg-path tag-transform ] unit-test

From 04087885184199ed8e3f018f39b605a4cb9c7d75 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 20:44:17 -0600
Subject: [PATCH 58/86] Rewrite html.streams to use xml.literals

---
 basis/html/components/components-docs.factor  |   4 +-
 basis/html/components/components-tests.factor |   7 +-
 basis/html/components/components.factor       |  13 +-
 basis/html/elements/elements-docs.factor      |   6 +-
 basis/html/elements/elements.factor           |   8 +
 basis/html/html.factor                        |  30 +--
 basis/html/streams/streams-docs.factor        |  34 ++--
 basis/html/streams/streams-tests.factor       |  36 ++--
 basis/html/streams/streams.factor             | 182 ++++++++----------
 basis/html/templates/fhtml/fhtml.factor       |  14 +-
 basis/html/templates/templates.factor         |   2 +-
 11 files changed, 145 insertions(+), 191 deletions(-)

diff --git a/basis/html/components/components-docs.factor b/basis/html/components/components-docs.factor
index 39c17a4708..ce4bddde6a 100644
--- a/basis/html/components/components-docs.factor
+++ b/basis/html/components/components-docs.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2008 Your name.
+! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.markup help.syntax io.streams.string kernel strings
 urls lcs inspector present io ;
@@ -100,6 +100,6 @@ $nl
 { $subsection farkup }
 "Creating custom components:"
 { $subsection render* }
-"Custom components can emit HTML using the " { $vocab-link "html.elements" } " vocabulary." ;
+"Custom components can emit HTML using the " { $vocab-link "xml.literals" } " vocabulary." ;
 
 ABOUT: "html.components"
diff --git a/basis/html/components/components-tests.factor b/basis/html/components/components-tests.factor
index 09bb5860ad..b3ea0319a8 100644
--- a/basis/html/components/components-tests.factor
+++ b/basis/html/components/components-tests.factor
@@ -1,7 +1,8 @@
 IN: html.components.tests
 USING: tools.test kernel io.streams.string
 io.streams.null accessors inspector html.streams
-html.elements html.components html.forms namespaces ;
+html.components html.forms namespaces
+xml.writer ;
 
 [ ] [ begin-form ] unit-test
 
@@ -163,9 +164,7 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ;
 
 [ t ] [
     [ "object" inspector render ] with-string-writer
-    USING: splitting sequences ;
-    "\"" split "'" join ! replace " with ' for now
-    [ "object" value [ describe ] with-html-writer ] with-string-writer
+    "object" value [ describe ] with-html-writer xml>string
     =
 ] unit-test
 
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index be197d10e6..40621bc29f 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -22,13 +22,6 @@ GENERIC: render* ( value name renderer -- xml )
     render* write-xml
     [ render-error ] when* ;
 
-<PRIVATE
-
-: render-input ( value name type -- xml )
-    [XML <input value=<-> name=<-> type=<->/> XML] ;
-
-PRIVATE>
-
 SINGLETON: label
 
 M: label render*
@@ -37,7 +30,7 @@ M: label render*
 SINGLETON: hidden
 
 M: hidden render*
-    drop "hidden" render-input ;
+    drop [XML <input value=<-> name=<-> type="hidden"/> XML] ;
 
 : render-field ( value name size type -- xml )
     [XML <input value=<-> name=<-> size=<-> type=<->/> XML] ;
@@ -163,9 +156,7 @@ M: farkup render*
 SINGLETON: inspector
 
 M: inspector render*
-    2drop [
-        [ describe ] with-html-writer
-    ] with-string-writer <unescaped> ;
+    2drop [ describe ] with-html-writer ;
 
 ! Diff component
 SINGLETON: comparison
diff --git a/basis/html/elements/elements-docs.factor b/basis/html/elements/elements-docs.factor
index 05b202e08e..7f60eca93f 100644
--- a/basis/html/elements/elements-docs.factor
+++ b/basis/html/elements/elements-docs.factor
@@ -20,10 +20,6 @@ $nl
 $nl
 "Writing unescaped HTML to " { $vocab-link "html.streams" } ":"
 { $subsection write-html }
-{ $subsection print-html }
-"Writing some common HTML patterns:"
-{ $subsection xhtml-preamble }
-{ $subsection simple-page }
-{ $subsection render-error } ;
+{ $subsection print-html } ;
 
 ABOUT: "html.elements"
diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor
index b0e46984d7..e23d929d6d 100644
--- a/basis/html/elements/elements.factor
+++ b/basis/html/elements/elements.factor
@@ -6,6 +6,14 @@ xml.data xml.literals urls math math.parser combinators
 present fry io.streams.string xml.writer html ;
 IN: html.elements
 
+SYMBOL: html
+
+: write-html ( str -- )
+    H{ { html t } } format ;
+
+: print-html ( str -- )
+    write-html "\n" write-html ;
+
 <<
 
 : elements-vocab ( -- vocab-name ) "html.elements" ;
diff --git a/basis/html/html.factor b/basis/html/html.factor
index 5469941972..5e86add10e 100644
--- a/basis/html/html.factor
+++ b/basis/html/html.factor
@@ -1,23 +1,10 @@
-! Copyright (C) 2004, 2009 Chris Double, Daniel Ehrenberg.
+! Copyright (C) 2004, 2009 Chris Double, Daniel Ehrenberg,
+! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io kernel xml.data xml.writer io.streams.string
-xml.literals io.styles ;
+USING: kernel xml.data xml.writer xml.literals urls.encoding ;
 IN: html
 
-SYMBOL: html
-
-: write-html ( str -- )
-    H{ { html t } } format ;
-
-: print-html ( str -- )
-    write-html "\n" write-html ;
-
-: xhtml-preamble ( -- )
-    "<?xml version=\"1.0\"?>" write-html
-    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">" write-html ;
-
-: simple-page ( title head-quot body-quot -- )
-    [ with-string-writer <unescaped> ] bi@
+: simple-page ( title head body -- xml )
     <XML
         <?xml version="1.0"?>
         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -28,7 +15,10 @@ SYMBOL: html
             </head>
             <body><-></body>
         </html>
-    XML> write-xml ; inline
+    XML> ; inline
 
-: render-error ( message -- )
-    [XML <span class="error"><-></span> XML] write-xml ;
+: render-error ( message -- xml )
+    [XML <span class="error"><-></span> XML] ;
+
+: simple-link ( xml url -- xml' )
+    url-encode swap [XML <a href=<->><-></a> XML] ;
\ No newline at end of file
diff --git a/basis/html/streams/streams-docs.factor b/basis/html/streams/streams-docs.factor
index f05eeb30fc..c85ab739b8 100644
--- a/basis/html/streams/streams-docs.factor
+++ b/basis/html/streams/streams-docs.factor
@@ -1,33 +1,33 @@
 IN: html.streams
 USING: help.markup help.syntax kernel strings io io.styles
-quotations ;
+quotations xml.data ;
 
-HELP: browser-link-href
-{ $values { "presented" object } { "href" string } }
-{ $contract "Outputs a link to a page displaying a presentation of the given object. This word is called when " { $link write-object } " is called on " { $link html-stream } " instances." } ;
+HELP: url-of
+{ $values { "object" object } { "url" string } }
+{ $contract "Outputs a link to a page displaying a presentation of the given object. This word is called when " { $link write-object } " is called on " { $link html-writer } " instances." } ;
 
-HELP: html-stream
-{ $class-description "A formatted output stream which emits HTML markup." } ;
+HELP: html-writer
+{ $class-description "A formatted output stream which accumulates HTML markup as " { $vocab-link "xml.data" } " types. The " { $slot "data" } " slot contains a sequence with all markup so far." } ;
 
-HELP: <html-stream>
-{ $values { "stream" "an output stream" } { "html-stream" html-stream } }
-{ $description "Creates a new formatted output stream which emits HTML markup on " { $snippet "stream" } "." } ;
+HELP: <html-writer>
+{ $values { "html-writer" html-writer } }
+{ $description "Creates a new formatted output stream which accumulates HTML markup in its " { $snippet "data" } " slot." } ;
 
 HELP: with-html-writer
-{ $values { "quot" quotation } }
-{ $description "Calls the quotation in a new dynamic scope with " { $link output-stream } " rebound to an " { $link html-stream } " wrapping the current " { $link output-stream } "." }
+{ $values { "quot" quotation } { "xml" xml-chunk } }
+{ $description "Calls the quotation in a new dynamic scope with " { $link output-stream } " rebound to an " { $link html-writer } ". When the quotation returns, outputs the accumulated HTML markup." }
 { $examples
     { $example
-        "USING: io io.styles html.streams ;"
-        "[ \"Hello\" { { font-style bold } } format nl ] with-html-writer"
-        "<span style='font-style: normal; font-weight: bold; '>Hello</span><br/>"
+        "USING: io io.styles html.streams xml.writer ;"
+        "[ \"Hello\" { { font-style bold } } format nl ] with-html-writer write-xml"
+        "<span style=\"font-style: normal; font-weight: bold; \">Hello</span><br/>"
     }
 } ;
 
 ARTICLE: "html.streams" "HTML streams"
-"The " { $vocab-link "html.streams" } " vocabulary provides a stream which implements " { $link "styles" } " by writing HTML markup to the wrapped stream."
-{ $subsection html-stream }
-{ $subsection <html-stream> }
+"The " { $vocab-link "html.streams" } " vocabulary provides a stream which implements " { $link "io.styles" } " by constructing HTML markup in the form of " { $vocab-link "xml.data" } " types."
+{ $subsection html-writer }
+{ $subsection <html-writer> }
 { $subsection with-html-writer } ;
 
 ABOUT: "html.streams"
diff --git a/basis/html/streams/streams-tests.factor b/basis/html/streams/streams-tests.factor
index 94229b3aea..249861b12a 100644
--- a/basis/html/streams/streams-tests.factor
+++ b/basis/html/streams/streams-tests.factor
@@ -1,17 +1,14 @@
 USING: html.streams html.streams.private accessors io
 io.streams.string io.styles kernel namespaces tools.test
-xml.writer sbufs sequences inspector colors ;
+xml.writer sbufs sequences inspector colors xml.writer
+classes.predicate prettyprint ;
 IN: html.streams.tests
 
-: make-html-string
-    [ with-html-writer ] with-string-writer ; inline
+: make-html-string ( quot -- string )
+    [ with-html-writer write-xml ] with-string-writer ; inline
 
 [ [ ] make-html-string ] must-infer
 
-[ ] [
-    512 <sbuf> <html-stream> drop
-] unit-test
-
 [ "" ] [
     [ "" write ] make-html-string
 ] unit-test
@@ -24,31 +21,26 @@ IN: html.streams.tests
     [ "<" write ] make-html-string
 ] unit-test
 
-[ "<" ] [
-    [ "<" H{ } output-stream get format-html-span ] make-html-string
-] unit-test
-
 TUPLE: funky town ;
 
-M: funky browser-link-href
-    "http://www.funky-town.com/" swap town>> append ;
+M: funky url-of "http://www.funky-town.com/" swap town>> append ;
 
-[ "<a href='http://www.funky-town.com/austin'>&lt;</a>" ] [
+[ "<a href=\"http://www.funky-town.com/austin\">&lt;</a>" ] [
     [
         "<" "austin" funky boa write-object
     ] make-html-string
 ] unit-test
 
-[ "<span style='font-family: monospace; '>car</span>" ]
+[ "<span style=\"font-family: monospace; \">car</span>" ]
 [
     [
         "car"
-        H{ { font "monospace" } }
+        H{ { font-name "monospace" } }
         format
     ] make-html-string
 ] unit-test
 
-[ "<span style='color: #ff00ff; '>car</span>" ]
+[ "<span style=\"color: #ff00ff; \">car</span>" ]
 [
     [
         "car"
@@ -57,7 +49,7 @@ M: funky browser-link-href
     ] make-html-string
 ] unit-test
 
-[ "<div style='background-color: #ff00ff; white-space: pre; font-family: monospace; '>cdr</div>" ]
+[ "<div style=\"background-color: #ff00ff; white-space: pre; font-family: monospace;\">cdr</div>" ]
 [
     [
         H{ { page-color T{ rgba f 1 0 1 1 } } }
@@ -65,10 +57,10 @@ M: funky browser-link-href
     ] make-html-string
 ] unit-test
 
-[
-    "<div style='white-space: pre; font-family: monospace; '></div>"
-] [
+[ "<div style=\"white-space: pre; font-family: monospace;\"></div>" ] [
     [ H{ } [ ] with-nesting nl ] make-html-string
 ] unit-test
 
-[ ] [ [ { 1 2 3 } describe ] with-html-writer ] unit-test
+[ ] [ [ { 1 2 3 } describe ] with-html-writer drop ] unit-test
+
+[ ] [ [ \ predicate-instance? def>> . ] with-html-writer drop ] unit-test
diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 51eb37b83d..768f2bbaa8 100644
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -1,17 +1,17 @@
-! Copyright (C) 2004, 2008 Slava Pestov.
+! Copyright (C) 2004, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators generic assocs io io.styles
-io.files continuations io.streams.string kernel math math.order
-math.parser namespaces make quotations assocs sequences strings
-words html.elements xml.entities sbufs continuations destructors
-accessors arrays urls.encoding html ;
+USING: accessors kernel assocs io io.styles math math.order math.parser
+sequences strings make words combinators macros xml.literals html fry
+destructors ;
 IN: html.streams
 
-GENERIC: browser-link-href ( presented -- href )
+GENERIC: url-of ( object -- url )
 
-M: object browser-link-href drop f ;
+M: object url-of drop f ;
 
-TUPLE: html-stream stream last-div ;
+TUPLE: html-writer data last-div ;
+
+<PRIVATE
 
 ! stream-nl after with-nesting or tabular-output is
 ! ignored, so that HTML stream output looks like
@@ -25,37 +25,28 @@ TUPLE: html-stream stream last-div ;
 : a-div ( stream -- stream )
     t >>last-div ; inline
 
-: <html-stream> ( stream -- html-stream )
-    f html-stream boa ;
+: new-html-writer ( class -- html-writer )
+    new V{ } clone >>data ; inline
 
-<PRIVATE
-
-TUPLE: html-sub-stream < html-stream style parent ;
+TUPLE: html-sub-stream < html-writer style parent ;
 
 : new-html-sub-stream ( style stream class -- stream )
-    new
-        512 <sbuf> >>stream
+    new-html-writer
         swap >>parent
         swap >>style ; inline
 
 : end-sub-stream ( substream -- string style stream )
-    [ stream>> >string ] [ style>> ] [ parent>> ] tri ;
+    [ data>> ] [ style>> ] [ parent>> ] tri ;
 
-: object-link-tag ( style quot -- )
-    presented pick at [
-        browser-link-href [
-            <a url-encode =href a> call </a>
-        ] [ call ] if*
-    ] [ call ] if* ; inline
+: object-link-tag ( xml style -- xml )
+    presented swap at [ url-of [ simple-link ] when* ] when* ;
 
-: href-link-tag ( style quot -- )
-    href pick at [
-        <a url-encode =href a> call </a>
-    ] [ call ] if* ; inline
+: href-link-tag ( xml style -- xml )
+    href swap at [ simple-link ] when* ;
 
 : hex-color, ( color -- )
     [ red>> ] [ green>> ] [ blue>> ] tri
-    [ 255 * >fixnum >hex 2 CHAR: 0 pad-head % ] tri@ ;
+    [ 255 * >integer >hex 2 CHAR: 0 pad-head % ] tri@ ;
 
 : fg-css, ( color -- )
     "color: #" % hex-color, "; " % ;
@@ -76,32 +67,29 @@ TUPLE: html-sub-stream < html-stream style parent ;
 : font-css, ( font -- )
     "font-family: " % % "; " % ;
 
-: apply-style ( style key quot -- style gadget )
-    [ over at ] dip when* ; inline
-
-: make-css ( style quot -- str )
-    "" make nip ; inline
+MACRO: make-css ( pairs -- str )
+    [ '[ _ swap at [ _ execute ] when* ] ] { } assoc>map
+    '[ [ _ cleave ] "" make ] ;
 
 : span-css-style ( style -- str )
-    [
-        foreground [ fg-css,    ] apply-style
-        background [ bg-css,    ] apply-style
-        font       [ font-css,  ] apply-style
-        font-style [ style-css, ] apply-style
-        font-size  [ size-css,  ] apply-style
-    ] make-css ;
+    {
+        { foreground fg-css, }
+        { background bg-css, }
+        { font-name font-css, }
+        { font-style style-css, }
+        { font-size size-css, }
+    } make-css ;
 
-: span-tag ( style quot -- )
-    over span-css-style [
-        call
-    ] [
-        <span =style span> call </span>
-    ] if-empty ; inline
+: span-tag ( xml style -- xml )
+    span-css-style
+    [ swap [XML <span style=<->><-></span> XML] ] unless-empty ; inline
+
+: emit-html ( quot stream -- )
+    dip data>> push ; inline
 
 : format-html-span ( string style stream -- )
-    stream>> [
-        [ [ [ drop write ] span-tag ] href-link-tag ] object-link-tag
-    ] with-output-stream* ;
+    [ [ span-tag ] [ href-link-tag ] [ object-link-tag ] tri ]
+    emit-html ;
 
 TUPLE: html-span-stream < html-sub-stream ;
 
@@ -113,28 +101,26 @@ M: html-span-stream dispose
 
 : padding-css, ( padding -- ) "padding: " % # "px; " % ;
 
-: pre-css, ( margin -- )
-    [ "white-space: pre; font-family: monospace; " % ] unless ;
+CONSTANT: pre-css "white-space: pre; font-family: monospace;"
 
 : div-css-style ( style -- str )
     [
-        page-color   [ bg-css,      ] apply-style
-        border-color [ border-css,  ] apply-style
-        border-width [ padding-css, ] apply-style
-        wrap-margin over at pre-css,
-    ] make-css ;
-
-: div-tag ( style quot -- )
-    swap div-css-style [
-        call
+        {
+            { page-color bg-css, }
+            { border-color border-css, }
+            { border-width padding-css, }
+        } make-css
     ] [
-        <div =style div> call </div>
-    ] if-empty ; inline
+        wrap-margin swap at
+        [ pre-css append ] unless
+    ] bi ;
+
+: div-tag ( xml style -- xml' )
+    div-css-style
+    [ swap [XML <div style=<->><-></div> XML] ] unless-empty ;
 
 : format-html-div ( string style stream -- )
-    stream>> [
-        [ [ write ] div-tag ] object-link-tag
-    ] with-output-stream* ;
+    [ [ div-tag ] [ object-link-tag ] bi ] emit-html ;
 
 TUPLE: html-block-stream < html-sub-stream ;
 
@@ -145,57 +131,51 @@ M: html-block-stream dispose ( quot style stream -- )
     "padding: " % first2 max 2 /i # "px; " % ;
 
 : table-style ( style -- str )
-    [
-        table-border [ border-css,         ] apply-style
-        table-gap    [ border-spacing-css, ] apply-style
-    ] make-css ;
-
-: table-attrs ( style -- )
-    table-style " border-collapse: collapse;" append =style ;
-
-: do-escaping ( string style -- string )
-    html swap at [ escape-string ] unless ;
+    {
+        { table-border border-css, }
+        { table-gap border-spacing-css, }
+    } make-css
+    " border-collapse: collapse;" append ;
 
 PRIVATE>
 
 ! Stream protocol
-M: html-stream stream-flush
-    stream>> stream-flush ;
+M: html-writer stream-flush drop ;
 
-M: html-stream stream-write1
-    [ 1string ] dip stream-write ;
+M: html-writer stream-write1
+    not-a-div [ 1string ] emit-html ;
 
-M: html-stream stream-write
-    not-a-div [ escape-string ] dip stream>> stream-write ;
+M: html-writer stream-write
+    not-a-div [ ] emit-html ;
 
-M: html-stream stream-format
-    [ html over at [ [ escape-string ] dip ] unless ] dip
+M: html-writer stream-format
     format-html-span ;
 
-M: html-stream stream-nl
-    dup last-div? [ drop ] [ [ <br/> ] with-output-stream* ] if ;
+M: html-writer stream-nl
+    dup last-div? [ drop ] [ [ [XML <br/> XML] ] emit-html ] if ;
 
-M: html-stream make-span-stream
+M: html-writer make-span-stream
     html-span-stream new-html-sub-stream ;
 
-M: html-stream make-block-stream
+M: html-writer make-block-stream
     html-block-stream new-html-sub-stream ;
 
-M: html-stream make-cell-stream
+M: html-writer make-cell-stream
     html-sub-stream new-html-sub-stream ;
 
-M: html-stream stream-write-table
-    a-div stream>> [
-        <table dup table-attrs table> swap [
-            <tr> [
-                <td "top" =valign swap table-style =style td>
-                    stream>> >string write
-                </td>
-            ] with each </tr>
-        ] with each </table>
-    ] with-output-stream* ;
+M: html-writer stream-write-table
+    a-div [
+        table-style swap [
+            [ data>> [XML <td valign="top" style=<->><-></td> XML] ] with map
+            [XML <tr><-></tr> XML]
+        ] with map
+        [XML <table><-></table> XML]
+    ] emit-html ;
 
-M: html-stream dispose stream>> dispose ;
+M: html-writer dispose drop ;
 
-: with-html-writer ( quot -- )
-    output-stream get <html-stream> swap with-output-stream* ; inline
+: <html-writer> ( -- html-writer )
+    html-writer new-html-writer ;
+
+: with-html-writer ( quot -- xml )
+    <html-writer> [ swap with-output-stream* ] keep data>> ; inline
diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor
index 23bb469627..c419c4a197 100644
--- a/basis/html/templates/fhtml/fhtml.factor
+++ b/basis/html/templates/fhtml/fhtml.factor
@@ -1,12 +1,10 @@
 ! Copyright (C) 2005 Alex Chapman
-! Copyright (C) 2006, 2008 Slava Pestov
+! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations sequences kernel namespaces debugger
-combinators math quotations generic strings splitting
-accessors assocs fry vocabs.parser
-parser lexer io io.files io.streams.string io.encodings.utf8
-html
-html.templates ;
+combinators math quotations generic strings splitting accessors
+assocs fry vocabs.parser parser lexer io io.files
+io.streams.string io.encodings.utf8 html.templates ;
 IN: html.templates.fhtml
 
 ! We use a custom lexer so that %> ends a token even if not
@@ -34,13 +32,13 @@ DEFER: <% delimiter
     [
         over line-text>>
         [ column>> ] 2dip subseq parsed
-        \ write-html parsed
+        \ write parsed
     ] 2keep 2 + >>column drop ;
 
 : still-looking ( accum lexer -- accum )
     [
         [ line-text>> ] [ column>> ] bi tail
-        parsed \ print-html parsed
+        parsed \ print parsed
     ] keep next-line ;
 
 : parse-%> ( accum lexer -- accum )
diff --git a/basis/html/templates/templates.factor b/basis/html/templates/templates.factor
index 6951f09efe..efaf8d6a62 100644
--- a/basis/html/templates/templates.factor
+++ b/basis/html/templates/templates.factor
@@ -67,7 +67,7 @@ SYMBOL: nested-template?
 SYMBOL: next-template
 
 : call-next-template ( -- )
-    next-template get write-html ;
+    next-template get write ;
 
 M: f call-template* drop call-next-template ;
 

From 938d9c733e75644d1fe667265490f6fa9a81fcd3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 20:44:30 -0600
Subject: [PATCH 59/86] Fix help.html for Dan's recent changes

---
 basis/help/html/html-tests.factor |  5 ++---
 basis/help/html/html.factor       | 28 ++++++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/basis/help/html/html-tests.factor b/basis/help/html/html-tests.factor
index 475b2114b3..61414cdfa2 100644
--- a/basis/help/html/html-tests.factor
+++ b/basis/help/html/html-tests.factor
@@ -1,5 +1,4 @@
 IN: help.html.tests
-USING: html.streams classes.predicate help.topics help.markup
-io.streams.string accessors prettyprint kernel tools.test ;
+USING: help.html tools.test help.topics kernel ;
 
-[ ] [ [ [ \ predicate-instance? def>> . ] with-html-writer ] with-string-writer drop ] unit-test
+[ ] [ "xml" >link help>html drop ] unit-test
diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index 820261dd32..26fc4e2637 100644
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -1,11 +1,11 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.encodings.utf8 io.encodings.ascii io.encodings.binary
 io.files io.files.temp io.directories html.streams help kernel
 assocs sequences make words accessors arrays help.topics vocabs
 tools.vocabs tools.vocabs.browser namespaces prettyprint io
 vocabs.loader serialize fry memoize unicode.case math.order
-sorting debugger html.elements html ;
+sorting debugger html xml.literals xml.writer ;
 IN: help.html
 
 : escape-char ( ch -- )
@@ -51,17 +51,21 @@ M: f topic>filename* drop \ f topic>filename* ;
         ] "" make
     ] [ 2drop f ] if ;
 
-M: topic browser-link-href topic>filename ;
+M: topic url-of topic>filename ;
 
-: help-stylesheet ( -- )
-    "resource:basis/help/html/stylesheet.css" ascii file-contents write ;
+: help-stylesheet ( -- string )
+    "resource:basis/help/html/stylesheet.css" ascii file-contents
+    [XML <style><-></style> XML] ;
 
-: help>html ( topic -- )
-    dup topic>filename utf8 [
-        dup article-title
-        [ <style> help-stylesheet </style> ]
-        [ [ help ] with-html-writer ] simple-page
-    ] with-file-writer ;
+: help>html ( topic -- xml )
+    [ article-title ]
+    [ drop help-stylesheet ]
+    [ [ help ] with-html-writer ]
+    tri simple-page ;
+          
+: generate-help-file ( topic -- )
+    dup .
+    dup topic>filename utf8 [ help>html write-xml ] with-file-writer ;
 
 : all-vocabs-really ( -- seq )
     #! Hack.
@@ -87,7 +91,7 @@ M: topic browser-link-href topic>filename ;
     all-vocabs-really [ dup vocab-name ] { } map>assoc "vocabs.idx" serialize-index ;
 
 : generate-help-files ( -- )
-    all-topics [ '[ _ help>html ] try ] each ;
+    all-topics [ '[ _ generate-help-file ] try ] each ;
 
 : generate-help ( -- )
     "docs" temp-file

From 7a8dc804267988acd4293d0f7bc83bafd2f4d66b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 20:54:49 -0600
Subject: [PATCH 60/86] Fix some issues in http.server

---
 basis/http/http-tests.factor                    |  7 ++++---
 .../server/dispatchers/dispatchers-tests.factor |  1 -
 basis/http/server/server-tests.factor           |  2 ++
 basis/http/server/server.factor                 | 17 +++++++++--------
 basis/http/server/static/static-tests.factor    |  4 ++++
 basis/http/server/static/static.factor          | 17 ++++++++++-------
 6 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 basis/http/server/static/static-tests.factor

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index 6103fb622f..c4ea23ea0a 100644
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -298,7 +298,7 @@ test-db [
 
 [ "Goodbye" ] [ "http://localhost/quit" add-port http-get nip ] unit-test
 
-USING: html.components html.elements html.forms
+USING: html.components html.forms
 xml xml.utilities validators
 furnace furnace.conversations ;
 
@@ -308,7 +308,7 @@ SYMBOL: a
     <dispatcher>
         <action>
             [ a get-global "a" set-value ] >>init
-            [ [ <html> "a" <field> render </html> ] "text/html" <content> ] >>display
+            [ [ "a" <field> render ] "text/html" <content> ] >>display
             [ { { "a" [ v-integer ] } } validate-params ] >>validate
             [ "a" value a set-global URL" " <redirect> ] >>submit
         <conversations>
@@ -322,7 +322,8 @@ SYMBOL: a
 
 3 a set-global
 
-: test-a string>xml "input" tag-named "value" attr ;
+: test-a ( xml -- value )
+    string>xml body>> "input" deep-tag-named "value" attr ;
 
 [ "3" ] [
     "http://localhost/" add-port http-get
diff --git a/basis/http/server/dispatchers/dispatchers-tests.factor b/basis/http/server/dispatchers/dispatchers-tests.factor
index 5b5b30adde..2c8db27259 100644
--- a/basis/http/server/dispatchers/dispatchers-tests.factor
+++ b/basis/http/server/dispatchers/dispatchers-tests.factor
@@ -4,7 +4,6 @@ assocs arrays classes words urls ;
 IN: http.server.dispatchers.tests
 
 \ find-responder must-infer
-\ http-error. must-infer
 
 TUPLE: mock-responder path ;
 
diff --git a/basis/http/server/server-tests.factor b/basis/http/server/server-tests.factor
index c29912b8c7..fdba9a63ef 100644
--- a/basis/http/server/server-tests.factor
+++ b/basis/http/server/server-tests.factor
@@ -2,3 +2,5 @@ USING: http http.server math sequences continuations tools.test ;
 IN: http.server.tests
 
 [ t ] [ [ \ + first ] [ <500> ] recover response? ] unit-test
+
+\ make-http-error must-infer
diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index 90a8ddb51a..97c14a6457 100755
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -24,8 +24,9 @@ http.parsers
 http.server.responses
 http.server.remapping
 html.templates
+html.streams
 html
-html.streams ;
+xml.writer ;
 IN: http.server
 
 : check-absolute ( url -- url )
@@ -173,15 +174,14 @@ main-responder global [ <404> <trivial-responder> or ] change-at
 : call-responder ( path responder -- response )
     [ add-responder-nesting ] [ call-responder* ] 2bi ;
 
-: http-error. ( error -- )
-    ! TODO: get rid of rot
-    "Internal server error" [ ] rot '[
-        [ _ print-error nl :c ] with-html-writer
-    ] simple-page ;
+: make-http-error ( error -- xml )
+    [ "Internal server error" f ] dip
+    [ print-error nl :c ] with-html-writer
+    simple-page ;
 
 : <500> ( error -- response )
     500 "Internal server error" <trivial-response>
-    swap development? get [ '[ _ http-error. ] >>body ] [ drop ] if ;
+    swap development? get [ make-http-error >>body ] [ drop ] if ;
 
 : do-response ( response -- )
     [ request get swap write-full-response ]
@@ -190,7 +190,8 @@ main-responder global [ <404> <trivial-responder> or ] change-at
         [
             utf8 [
                 development? get
-                [ http-error. ] [ drop "Response error" write ] if
+                [ make-http-error ] [ drop "Response error" ] if
+                write-xml
             ] with-encoded-output
         ] bi
     ] recover ;
diff --git a/basis/http/server/static/static-tests.factor b/basis/http/server/static/static-tests.factor
new file mode 100644
index 0000000000..d54be03698
--- /dev/null
+++ b/basis/http/server/static/static-tests.factor
@@ -0,0 +1,4 @@
+IN: http.server.static.tests
+USING: http.server.static tools.test xml.writer ;
+
+[ ] [ "resource:basis" directory>html write-xml ] unit-test
\ No newline at end of file
diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor
index 67ce0237a4..2df8838061 100644
--- a/basis/http/server/static/static.factor
+++ b/basis/http/server/static/static.factor
@@ -56,19 +56,22 @@ TUPLE: file-responder root hook special allow-listings ;
 
 \ serve-file NOTICE add-input-logging
 
-: file. ( name -- xml )
+: file>html ( name -- xml )
     dup link-info directory? [ "/" append ] when
     dup [XML <li><a href=<->><-></a></li> XML] ;
 
-: directory. ( path -- )
-    dup file-name [ ] [
-        [ file-name ] [ directory-files [ file. ] map ] bi
-        [XML <h1><-></h1> <ul><-></ul> XML] write-xml
-    ] simple-page ;
+: directory>html ( path -- xml )
+    [ file-name ]
+    [ drop f ]
+    [
+        [ file-name ] [ [ [ file>html ] map ] with-directory-files ] bi
+        [XML <h1><-></h1> <ul><-></ul> XML]
+    ] tri
+    simple-page ;
 
 : list-directory ( directory -- response )
     file-responder get allow-listings>> [
-        '[ _ directory. ] "text/html" <content>
+        directory>html "text/html" <content>
     ] [
         drop <403>
     ] if ;

From 335f0d99bfe1609fdb72f6fe45db5a405bfe4a26 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 20:56:00 -0600
Subject: [PATCH 61/86] Add unit tests for msxml-to-csv

---
 extra/msxml-to-csv/msxml-to-csv-tests.factor | 10 ++++++++++
 extra/msxml-to-csv/test.csv                  |  2 ++
 extra/msxml-to-csv/test.xml                  |  1 +
 3 files changed, 13 insertions(+)
 create mode 100644 extra/msxml-to-csv/msxml-to-csv-tests.factor
 create mode 100644 extra/msxml-to-csv/test.csv
 create mode 100644 extra/msxml-to-csv/test.xml

diff --git a/extra/msxml-to-csv/msxml-to-csv-tests.factor b/extra/msxml-to-csv/msxml-to-csv-tests.factor
new file mode 100644
index 0000000000..57c2c775b0
--- /dev/null
+++ b/extra/msxml-to-csv/msxml-to-csv-tests.factor
@@ -0,0 +1,10 @@
+IN: msxml-to-csv.tests
+USING: msxml-to-csv tools.test csv io.encodings.utf8
+io.files.temp kernel ;
+
+[ t ] [
+    "test.csv" temp-file
+    "resource:extra/msxml-to-csv/test.xml" msxml>csv
+    "test.csv" temp-file utf8 file>csv
+    "resource:extra/msxml-to-csv/test.csv" utf8 file>csv =
+] unit-test
\ No newline at end of file
diff --git a/extra/msxml-to-csv/test.csv b/extra/msxml-to-csv/test.csv
new file mode 100644
index 0000000000..51880af275
--- /dev/null
+++ b/extra/msxml-to-csv/test.csv
@@ -0,0 +1,2 @@
+A,B
+C,D
\ No newline at end of file
diff --git a/extra/msxml-to-csv/test.xml b/extra/msxml-to-csv/test.xml
new file mode 100644
index 0000000000..2c4ca42448
--- /dev/null
+++ b/extra/msxml-to-csv/test.xml
@@ -0,0 +1 @@
+<Worksheet><Table><Row><Cell>A</Cell><Cell>B</Cell></Row><Row><Cell>C</Cell><Cell>D</Cell></Row></Table></Worksheet>

From 55bbbd0ff0f9c87cb2368dc1ec8199d33b34d1e8 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 20:58:23 -0600
Subject: [PATCH 62/86] Fix msxml-to-csv

---
 extra/msxml-to-csv/msxml-to-csv.factor | 1 -
 extra/msxml-to-csv/test.xml            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/extra/msxml-to-csv/msxml-to-csv.factor b/extra/msxml-to-csv/msxml-to-csv.factor
index 839fcaaf54..855275efcc 100644
--- a/extra/msxml-to-csv/msxml-to-csv.factor
+++ b/extra/msxml-to-csv/msxml-to-csv.factor
@@ -3,7 +3,6 @@ io.encodings.ascii kernel ;
 IN: msxml-to-csv
 
 : (msxml>csv) ( xml -- table )
-    "Worksheet" tag-named
     "Table" tag-named
     "Row" tags-named [
         "Cell" tags-named [
diff --git a/extra/msxml-to-csv/test.xml b/extra/msxml-to-csv/test.xml
index 2c4ca42448..cd97905e13 100644
--- a/extra/msxml-to-csv/test.xml
+++ b/extra/msxml-to-csv/test.xml
@@ -1 +1 @@
-<Worksheet><Table><Row><Cell>A</Cell><Cell>B</Cell></Row><Row><Cell>C</Cell><Cell>D</Cell></Row></Table></Worksheet>
+<Worksheet><Table><Row><Cell><Data>A</Data></Cell><Cell><Data>B</Data></Cell></Row><Row><Cell><Data>C</Data></Cell><Cell><Data>D</Data></Cell></Row></Table></Worksheet>

From 1194ce38aa979e60d694f953b41c89fe2fad014c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 21:01:55 -0600
Subject: [PATCH 63/86] Fix some bugs in xml.utilities and add new unit tests

---
 basis/xml/utilities/utilities-tests.factor | 10 +++++-
 basis/xml/utilities/utilities.factor       | 36 +++++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/basis/xml/utilities/utilities-tests.factor b/basis/xml/utilities/utilities-tests.factor
index 7b0989611c..673bf47f6e 100644
--- a/basis/xml/utilities/utilities-tests.factor
+++ b/basis/xml/utilities/utilities-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: xml xml.utilities tools.test xml.data ;
+USING: xml xml.utilities tools.test xml.data sequences ;
 IN: xml.utilities.tests
 
 [ "bar" ] [ "<foo>bar</foo>" string>xml children>string ] unit-test
@@ -12,3 +12,11 @@ IN: xml.utilities.tests
 XML-NS: foo http://blah.com
 
 [ T{ name { main "bling" } { url "http://blah.com" } } ] [ "bling" foo ] unit-test
+
+[ "blah" ] [ "<foo attr='blah'/>" string>xml-chunk "foo" deep-tag-named "attr" attr ] unit-test
+
+[ { "blah" } ] [ "<foo attr='blah'/>" string>xml-chunk "foo" deep-tags-named [ "attr" attr ] map ] unit-test
+
+[ "blah" ] [ "<foo attr='blah'/>" string>xml "foo" deep-tag-named "attr" attr ] unit-test
+
+[ { "blah" } ] [ "<foo attr='blah'/>" string>xml "foo" deep-tags-named [ "attr" attr ] map ] unit-test
\ No newline at end of file
diff --git a/basis/xml/utilities/utilities.factor b/basis/xml/utilities/utilities.factor
index d286072be6..1249da8c36 100755
--- a/basis/xml/utilities/utilities.factor
+++ b/basis/xml/utilities/utilities.factor
@@ -8,8 +8,10 @@ IN: xml.utilities
 : children>string ( tag -- string )
     children>> {
         { [ dup empty? ] [ drop "" ] }
-        { [ dup [ string? not ] any? ]
-          [ "XML tag unexpectedly contains non-text children" throw ] }
+        {
+            [ dup [ string? not ] any? ]
+            [ "XML tag unexpectedly contains non-text children" throw ]
+        }
         [ concat ]
     } cond ;
 
@@ -22,20 +24,24 @@ IN: xml.utilities
 : tag-named? ( name elem -- ? )
     dup tag? [ names-match? ] [ 2drop f ] if ;
 
-: tags@ ( tag name -- children name )
-    [ { } like ] dip assure-name ;
-
-: deep-tag-named ( tag name/string -- matching-tag )
-    assure-name '[ _ swap tag-named? ] deep-find ;
-
-: deep-tags-named ( tag name/string -- tags-seq )
-    tags@ '[ _ swap tag-named? ] deep-filter ;
-
 : tag-named ( tag name/string -- matching-tag )
-    assure-name swap [ tag-named? ] with find nip ;
+    assure-name '[ _ swap tag-named? ] find nip ;
 
 : tags-named ( tag name/string -- tags-seq )
-    tags@ swap [ tag-named? ] with filter ;
+    assure-name '[ _ swap tag-named? ] filter { } like ;
+
+<PRIVATE
+
+: prepare-deep ( xml name/string -- tag name/string )
+    [ dup xml? [ body>> ] when ] [ assure-name ] bi* ;
+
+PRIVATE>
+
+: deep-tag-named ( tag name/string -- matching-tag )
+    prepare-deep '[ _ swap tag-named? ] deep-find ;
+
+: deep-tags-named ( tag name/string -- tags-seq )
+    prepare-deep '[ _ swap tag-named? ] deep-filter { } like ;
 
 : tag-with-attr? ( elem attr-value attr-name -- ? )
     rot dup tag? [ swap attr = ] [ 3drop f ] if ;
@@ -44,13 +50,13 @@ IN: xml.utilities
     assure-name '[ _ _ tag-with-attr? ] find nip ;
 
 : tags-with-attr ( tag attr-value attr-name -- tags-seq )
-    tags@ '[ _ _ tag-with-attr? ] filter children>> ;
+    assure-name '[ _ _ tag-with-attr? ] filter children>> ;
 
 : deep-tag-with-attr ( tag attr-value attr-name -- matching-tag )
     assure-name '[ _ _ tag-with-attr? ] deep-find ;
 
 : deep-tags-with-attr ( tag attr-value attr-name -- tags-seq )
-    tags@ '[ _ _ tag-with-attr? ] deep-filter ;
+    assure-name '[ _ _ tag-with-attr? ] deep-filter ;
 
 : get-id ( tag id -- elem )
     "id" deep-tag-with-attr ;

From 83116c64395f72408a0b0ca773ba10458ac7430e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 21:02:13 -0600
Subject: [PATCH 64/86] Change example to unchecked-example since on netbsd
 math functions return 0 instead of NaN on domain errors

---
 basis/math/libm/libm-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/math/libm/libm-docs.factor b/basis/math/libm/libm-docs.factor
index 72c114487b..bf4c608d77 100644
--- a/basis/math/libm/libm-docs.factor
+++ b/basis/math/libm/libm-docs.factor
@@ -6,7 +6,7 @@ ARTICLE: "math.libm" "C standard library math functions"
 $nl
 "They can be called directly, however there is little reason to do so, since they only implement real-valued functions, and in some cases place restrictions on the domain:"
 { $example "USE: math.functions" "2 acos ." "C{ 0.0 1.316957896924817 }" }
-{ $example "USE: math.libm" "2 facos ." "0.0/0.0" }
+{ $unchecked-example "USE: math.libm" "2 facos ." "0.0/0.0" }
 "Trigonometric functions:"
 { $subsection fcos }
 { $subsection fsin }

From 4e779820b87e46e922406ad54493ea13e1404bbf Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 21:23:56 -0600
Subject: [PATCH 65/86] Fix load error

---
 basis/html/streams/streams-tests.factor | 2 +-
 basis/html/streams/streams.factor       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/basis/html/streams/streams-tests.factor b/basis/html/streams/streams-tests.factor
index 249861b12a..18ab17218f 100644
--- a/basis/html/streams/streams-tests.factor
+++ b/basis/html/streams/streams-tests.factor
@@ -35,7 +35,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ;
 [
     [
         "car"
-        H{ { font-name "monospace" } }
+        H{ { font "monospace" } }
         format
     ] make-html-string
 ] unit-test
diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 768f2bbaa8..0a4b8eddd4 100644
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -75,7 +75,7 @@ MACRO: make-css ( pairs -- str )
     {
         { foreground fg-css, }
         { background bg-css, }
-        { font-name font-css, }
+        { font font-css, }
         { font-style style-css, }
         { font-size size-css, }
     } make-css ;

From fae0d8bac1e7301df59660b59953ec409449a4d7 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 21:56:39 -0600
Subject: [PATCH 66/86] Fix validation error rendering

---
 basis/html/components/components-tests.factor | 11 +++++++++++
 basis/html/components/components.factor       |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/basis/html/components/components-tests.factor b/basis/html/components/components-tests.factor
index b3ea0319a8..410c3ce223 100644
--- a/basis/html/components/components-tests.factor
+++ b/basis/html/components/components-tests.factor
@@ -32,6 +32,11 @@ TUPLE: color red green blue ;
     ] with-string-writer
 ] unit-test
 
+[ "<input value=\"&lt;jimmy>\" name=\"red\" type=\"hidden\"/>" ] [
+    [
+        "red" hidden render
+    ] with-string-writer
+] unit-test
 [ "<input value=\"&lt;jimmy>\" name=\"red\" type=\"hidden\"/>" ] [
     [
         "red" hidden render
@@ -184,3 +189,9 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ;
         }
     }
 ] [ values ] unit-test
+
+[ ] [ "error" "blah" <validation-error> "error" set-value ] unit-test
+
+[ ] [
+    "error" hidden render
+] unit-test
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index 40621bc29f..f811343df2 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -15,12 +15,12 @@ GENERIC: render* ( value name renderer -- xml )
     prepare-value
     [
         dup validation-error?
-        [ [ message>> ] [ value>> ] bi ]
+        [ [ message>> render-error ] [ value>> ] bi ]
         [ f swap ]
         if
     ] 2dip
-    render* write-xml
-    [ render-error ] when* ;
+    render*
+    swap 2array write-xml ;
 
 SINGLETON: label
 

From 83cbe7c04fc9810c7bee10260451f6fac2c77ee5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 31 Jan 2009 23:11:07 -0600
Subject: [PATCH 67/86] Fix lint

---
 extra/lint/lint.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor
index 60e3332ee4..849cc540a3 100755
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.accessors arrays assocs
-combinators.short-circuit fry hashtables html io
+combinators.short-circuit fry hashtables io
 kernel math namespaces prettyprint quotations sequences
 sequences.deep sets slots.private vectors vocabs words
 kernel.private ;
@@ -54,7 +54,7 @@ SYMBOL: def-hash-keys
         [ drop f ]
         [ "cdecl" ]
         [ first ] [ second ] [ third ] [ fourth ]
-        [ ">" write-html ] [ "/>" write-html ]
+        [ ">" write ] [ "/>" write ]
     } ;
 
 ! ! Add definitions

From e089ce6df0d1195103e69a33482aaba0811327a6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 1 Feb 2009 02:02:09 -0600
Subject: [PATCH 68/86] Fix http test

---
 basis/http/http-tests.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index c4ea23ea0a..f593980467 100644
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -308,7 +308,7 @@ SYMBOL: a
     <dispatcher>
         <action>
             [ a get-global "a" set-value ] >>init
-            [ [ "a" <field> render ] "text/html" <content> ] >>display
+            [ [ "<html>" write "a" <field> render "</html>" write ] "text/html" <content> ] >>display
             [ { { "a" [ v-integer ] } } validate-params ] >>validate
             [ "a" value a set-global URL" " <redirect> ] >>submit
         <conversations>

From ec22af4dbd57fa6d4585c8aad47739f25926344c Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Sun, 1 Feb 2009 15:36:07 -0600
Subject: [PATCH 69/86] UTF-32 encoding/decoding

---
 basis/io/encodings/utf16/utf16-docs.factor  |  2 +
 basis/io/encodings/utf16/utf16-tests.factor |  4 +-
 basis/io/encodings/utf16/utf16.factor       |  4 -
 basis/io/encodings/utf32/authors.txt        |  1 +
 basis/io/encodings/utf32/summary.txt        |  1 +
 basis/io/encodings/utf32/tags.txt           |  1 +
 basis/io/encodings/utf32/utf32-docs.factor  | 27 +++++++
 basis/io/encodings/utf32/utf32-tests.factor | 30 +++++++
 basis/io/encodings/utf32/utf32.factor       | 87 +++++++++++++++++++++
 9 files changed, 151 insertions(+), 6 deletions(-)
 create mode 100644 basis/io/encodings/utf32/authors.txt
 create mode 100644 basis/io/encodings/utf32/summary.txt
 create mode 100644 basis/io/encodings/utf32/tags.txt
 create mode 100644 basis/io/encodings/utf32/utf32-docs.factor
 create mode 100644 basis/io/encodings/utf32/utf32-tests.factor
 create mode 100644 basis/io/encodings/utf32/utf32.factor

diff --git a/basis/io/encodings/utf16/utf16-docs.factor b/basis/io/encodings/utf16/utf16-docs.factor
index dc499b5ed4..9622200a68 100644
--- a/basis/io/encodings/utf16/utf16-docs.factor
+++ b/basis/io/encodings/utf16/utf16-docs.factor
@@ -1,3 +1,5 @@
+! Copyright (C) 2008 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
 USING: help.markup help.syntax io.encodings strings ;
 IN: io.encodings.utf16
 
diff --git a/basis/io/encodings/utf16/utf16-tests.factor b/basis/io/encodings/utf16/utf16-tests.factor
index bde92a260d..230612cc77 100644
--- a/basis/io/encodings/utf16/utf16-tests.factor
+++ b/basis/io/encodings/utf16/utf16-tests.factor
@@ -1,6 +1,7 @@
+! Copyright (C) 2008 Daniel Ehrenberg.
+! See http://factorcode.org/license.txt for BSD license.
 USING: kernel tools.test io.encodings.utf16 arrays sbufs
 io.streams.byte-array sequences io.encodings io
-bootstrap.unicode
 io.encodings.string alien.c-types alien.strings accessors classes ;
 IN: io.encodings.utf16.tests
 
@@ -15,7 +16,6 @@ IN: io.encodings.utf16.tests
 [ { 119070 } ] [ { HEX: 34 HEX: D8 HEX: 1E HEX: DD } utf16le decode >array ] unit-test
 [ { CHAR: replacement-character } ] [ { 0 BIN: 11011111 } utf16le decode >array ] unit-test
 [ { CHAR: replacement-character } ] [ { 0 BIN: 11011011 0 0 } utf16le decode >array ] unit-test
-[ { 119070 } ] [ { HEX: 34 HEX: D8 HEX: 1E HEX: DD } utf16le decode >array ] unit-test
 
 [ { 120 0 52 216 30 221 } ] [ { CHAR: x HEX: 1d11e } utf16le encode >array ] unit-test
 
diff --git a/basis/io/encodings/utf16/utf16.factor b/basis/io/encodings/utf16/utf16.factor
index 167d7534d1..d8c553684e 100644
--- a/basis/io/encodings/utf16/utf16.factor
+++ b/basis/io/encodings/utf16/utf16.factor
@@ -105,10 +105,6 @@ M: utf16le encode-char ( char stream encoding -- )
 
 : bom-be B{ HEX: fe HEX: ff } ; inline
 
-: start-utf16le? ( seq1 -- seq2 ? ) bom-le ?head ;
-
-: start-utf16be? ( seq1 -- seq2 ? ) bom-be ?head ;
-
 : bom>le/be ( bom -- le/be )
     dup bom-le sequence= [ drop utf16le ] [
         bom-be sequence= [ utf16be ] [ missing-bom ] if
diff --git a/basis/io/encodings/utf32/authors.txt b/basis/io/encodings/utf32/authors.txt
new file mode 100644
index 0000000000..f990dd0ed2
--- /dev/null
+++ b/basis/io/encodings/utf32/authors.txt
@@ -0,0 +1 @@
+Daniel Ehrenberg
diff --git a/basis/io/encodings/utf32/summary.txt b/basis/io/encodings/utf32/summary.txt
new file mode 100644
index 0000000000..1266c8c520
--- /dev/null
+++ b/basis/io/encodings/utf32/summary.txt
@@ -0,0 +1 @@
+UTF32 encoding/decoding
diff --git a/basis/io/encodings/utf32/tags.txt b/basis/io/encodings/utf32/tags.txt
new file mode 100644
index 0000000000..8e27be7d61
--- /dev/null
+++ b/basis/io/encodings/utf32/tags.txt
@@ -0,0 +1 @@
+text
diff --git a/basis/io/encodings/utf32/utf32-docs.factor b/basis/io/encodings/utf32/utf32-docs.factor
new file mode 100644
index 0000000000..8cdb2ef1e5
--- /dev/null
+++ b/basis/io/encodings/utf32/utf32-docs.factor
@@ -0,0 +1,27 @@
+! Copyright (C) 2009 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax io.encodings strings ;
+IN: io.encodings.utf32
+
+ARTICLE: "io.encodings.utf32" "UTF-32 encoding"
+"The UTF-32 encoding is a fixed-width encoding. Unicode code points are encoded as 4 byte sequences. There are three encoding descriptor classes for working with UTF-32, depending on endianness or the presence of a BOM:"
+{ $subsection utf32 }
+{ $subsection utf32le }
+{ $subsection utf32be } ;
+
+ABOUT: "io.encodings.utf32"
+
+HELP: utf32le
+{ $class-description "The encoding descriptor for UTF-32LE, that is, UTF-32 in little endian, without a byte order mark. Streams can be made which read or write wth this encoding." }
+{ $see-also "encodings-introduction" } ;
+
+HELP: utf32be
+{ $class-description "The encoding descriptor for UTF-32BE, that is, UTF-32 in big endian, without a byte order mark. Streams can be made which read or write wth this encoding." }
+{ $see-also "encodings-introduction" } ;
+
+HELP: utf32
+{ $class-description "The encoding descriptor for UTF-32, that is, UTF-32 with a byte order mark. This is the most useful for general input and output in UTF-32. Streams can be made which read or write wth this encoding." }
+{ $see-also "encodings-introduction" } ;
+
+{ utf32 utf32le utf32be } related-words
+
diff --git a/basis/io/encodings/utf32/utf32-tests.factor b/basis/io/encodings/utf32/utf32-tests.factor
new file mode 100644
index 0000000000..be1111e242
--- /dev/null
+++ b/basis/io/encodings/utf32/utf32-tests.factor
@@ -0,0 +1,30 @@
+! Copyright (C) 2009 Daniel Ehrenberg.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel tools.test io.encodings.utf32 arrays sbufs
+io.streams.byte-array sequences io.encodings io
+io.encodings.string alien.c-types alien.strings accessors classes ;
+IN: io.encodings.utf32.tests
+
+[ { CHAR: x } ] [ { 0 0 0 CHAR: x } utf32be decode >array ] unit-test
+[ { HEX: 1D11E } ] [ { 0 1 HEX: D1 HEX: 1E } utf32be decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { 0 1 HEX: D1 } utf32be decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { 0 1 } utf32be decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { 0 } utf32be decode >array ] unit-test
+[ { } ] [ { } utf32be decode >array ] unit-test
+
+[ { 0 0 0 CHAR: x 0 1 HEX: D1 HEX: 1E } ] [ { CHAR: x HEX: 1d11e } utf32be encode >array ] unit-test
+
+[ { CHAR: x } ] [ { CHAR: x 0 0 0 } utf32le decode >array ] unit-test
+[ { HEX: 1d11e } ] [ { HEX: 1e HEX: d1 1 0 } utf32le decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { HEX: 1e HEX: d1 1 } utf32le decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { HEX: 1e HEX: d1 } utf32le decode >array ] unit-test
+[ { CHAR: replacement-character } ] [ { HEX: 1e } utf32le decode >array ] unit-test
+[ { } ] [ { } utf32le decode >array ] unit-test
+
+[ { 120 0 0 0 HEX: 1e HEX: d1 1 0 } ] [ { CHAR: x HEX: 1d11e } utf32le encode >array ] unit-test
+
+[ { CHAR: x } ] [ { HEX: ff HEX: fe 0 0 CHAR: x 0 0 0 } utf32 decode >array ] unit-test
+[ { CHAR: x } ] [ { 0 0 HEX: fe HEX: ff 0 0 0 CHAR: x } utf32 decode >array ] unit-test
+
+[ { HEX: ff HEX: fe 0 0 120 0 0 0 HEX: 1e HEX: d1 1 0 } ] [ { CHAR: x HEX: 1d11e } utf32 encode >array ] unit-test
+
diff --git a/basis/io/encodings/utf32/utf32.factor b/basis/io/encodings/utf32/utf32.factor
new file mode 100644
index 0000000000..68fb6cd2f6
--- /dev/null
+++ b/basis/io/encodings/utf32/utf32.factor
@@ -0,0 +1,87 @@
+! Copyright (C) 2009 Daniel Ehrenberg.
+! See http://factorcode.org/license.txt for BSD license.
+USING: math kernel io.encodings combinators io io.encodings.utf16
+generalizations sequences ;
+IN: io.encodings.utf32
+
+SINGLETON: utf32be
+
+SINGLETON: utf32le
+
+SINGLETON: utf32
+
+<PRIVATE
+
+: 4spin ( a b c d -- b c d a )
+    4 nrev ; inline
+
+! Decoding
+
+: stream-read4 ( stream -- a b c d )
+    {
+        [ stream-read1 ]
+        [ stream-read1 ]
+        [ stream-read1 ]
+        [ stream-read1 ]
+    } cleave ;
+
+: with-replacement ( _ _ _ ch quot -- new-ch )
+    [ 3drop replacement-char ] if* ; inline
+
+: >char ( d c b a -- abcd )
+    [
+        24 shift -roll [
+            16 shift -rot [
+                8 shift swap [
+                    bitor bitor bitor
+                ] with-replacement
+            ] with-replacement
+        ] with-replacement
+    ] with-replacement ;
+
+M: utf32be decode-char
+    drop stream-read4 4spin
+    [ >char ] [ 3drop f ] if* ;
+
+M: utf32le decode-char
+    drop stream-read4 4 npick
+    [ >char ] [ 2drop 2drop f ] if ;
+
+! Encoding
+
+: split-off ( ab -- b a )
+    [ HEX: FF bitand ] [ -8 shift ] bi ;
+
+: char> ( abcd -- d b c a )
+    split-off split-off split-off ;
+
+: stream-write4 ( d c b a stream -- )
+    {
+        [ stream-write1 ]
+        [ stream-write1 ]
+        [ stream-write1 ]
+        [ stream-write1 ]
+    } cleave ;
+
+M: utf32be encode-char
+    drop [ char> ] dip stream-write4 ;
+
+M: utf32le encode-char
+    drop [ char> 4spin ] dip stream-write4 ;
+
+! UTF-32
+
+: bom-le B{ HEX: ff HEX: fe 0 0 } ; inline
+
+: bom-be B{ 0 0 HEX: fe HEX: ff } ; inline
+
+: bom>le/be ( bom -- le/be )
+    dup bom-le sequence= [ drop utf32le ] [
+        bom-be sequence= [ utf32be ] [ missing-bom ] if
+    ] if ;
+
+M: utf32 <decoder> ( stream utf32 -- decoder )
+    drop 4 over stream-read bom>le/be <decoder> ;
+
+M: utf32 <encoder> ( stream utf32 -- encoder )
+    drop bom-le over stream-write utf32le <encoder> ;

From f660c7e7e82a02ebfcc14d95a7d6aa114fb2830e Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Sun, 1 Feb 2009 18:54:06 -0600
Subject: [PATCH 70/86] Cleanup of io.encodings.utf32

---
 basis/io/encodings/utf32/utf32.factor   | 57 ++++++-------------------
 core/io/encodings/encodings-docs.factor |  1 +
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/basis/io/encodings/utf32/utf32.factor b/basis/io/encodings/utf32/utf32.factor
index 68fb6cd2f6..1eaccb3e6b 100644
--- a/basis/io/encodings/utf32/utf32.factor
+++ b/basis/io/encodings/utf32/utf32.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel io.encodings combinators io io.encodings.utf16
-generalizations sequences ;
+sequences io.binary ;
 IN: io.encodings.utf32
 
 SINGLETON: utf32be
@@ -12,62 +12,31 @@ SINGLETON: utf32
 
 <PRIVATE
 
-: 4spin ( a b c d -- b c d a )
-    4 nrev ; inline
-
 ! Decoding
 
-: stream-read4 ( stream -- a b c d )
-    {
-        [ stream-read1 ]
-        [ stream-read1 ]
-        [ stream-read1 ]
-        [ stream-read1 ]
-    } cleave ;
-
-: with-replacement ( _ _ _ ch quot -- new-ch )
-    [ 3drop replacement-char ] if* ; inline
-
-: >char ( d c b a -- abcd )
-    [
-        24 shift -roll [
-            16 shift -rot [
-                8 shift swap [
-                    bitor bitor bitor
-                ] with-replacement
-            ] with-replacement
-        ] with-replacement
-    ] with-replacement ;
+: char> ( stream encoding quot -- ch )
+    nip swap 4 swap stream-read dup length {
+        { 0 [ 2drop f ] }
+        { 4 [ swap call ] }
+        [ 3drop replacement-char ]
+    } case ; inline
 
 M: utf32be decode-char
-    drop stream-read4 4spin
-    [ >char ] [ 3drop f ] if* ;
+    [ be> ] char> ;
 
 M: utf32le decode-char
-    drop stream-read4 4 npick
-    [ >char ] [ 2drop 2drop f ] if ;
+    [ le> ] char> ;
 
 ! Encoding
 
-: split-off ( ab -- b a )
-    [ HEX: FF bitand ] [ -8 shift ] bi ;
-
-: char> ( abcd -- d b c a )
-    split-off split-off split-off ;
-
-: stream-write4 ( d c b a stream -- )
-    {
-        [ stream-write1 ]
-        [ stream-write1 ]
-        [ stream-write1 ]
-        [ stream-write1 ]
-    } cleave ;
+: >char ( char stream encoding quot -- )
+    nip 4 swap curry dip stream-write ; inline
 
 M: utf32be encode-char
-    drop [ char> ] dip stream-write4 ;
+    [ >be ] >char ;
 
 M: utf32le encode-char
-    drop [ char> 4spin ] dip stream-write4 ;
+    [ >le ] >char ;
 
 ! UTF-32
 
diff --git a/core/io/encodings/encodings-docs.factor b/core/io/encodings/encodings-docs.factor
index ed39e74878..509757c68a 100644
--- a/core/io/encodings/encodings-docs.factor
+++ b/core/io/encodings/encodings-docs.factor
@@ -78,6 +78,7 @@ ARTICLE: "encodings-descriptors" "Encoding descriptors"
 { $subsection "io.encodings.binary" }
 { $subsection "io.encodings.utf8" }
 { $subsection "io.encodings.utf16" }
+{ $vocab-subsection "UTF-32 encoding" "io.encodings.utf32" }
 { $vocab-subsection "Strict encodings" "io.encodings.strict" }
 "Legacy encodings:"
 { $vocab-subsection "8-bit encodings" "io.encodings.8-bit" }

From 3c75dfd2e08d59e9f4fb963032f3c73b2950adee Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Sun, 1 Feb 2009 23:47:36 -0600
Subject: [PATCH 71/86] Shift-JIS support; minor cleanup of io.binary

---
 basis/io/encodings/8-bit/8-bit.factor         |    2 +-
 basis/io/encodings/japanese/CP932.TXT         | 7998 +++++++++++++++
 basis/io/encodings/japanese/authors.txt       |    1 +
 .../encodings/japanese/japanese-docs.factor   |   19 +
 .../encodings/japanese/japanese-tests.factor  |   17 +
 basis/io/encodings/japanese/japanese.factor   |   65 +
 .../encodings/japanese/sjis-0208-1997-std.txt | 9066 +++++++++++++++++
 basis/io/encodings/japanese/summary.txt       |    1 +
 basis/io/encodings/japanese/tags.txt          |    1 +
 core/io/binary/binary-tests.factor            |    4 +
 core/io/binary/binary.factor                  |   12 +-
 11 files changed, 17179 insertions(+), 7 deletions(-)
 create mode 100644 basis/io/encodings/japanese/CP932.TXT
 create mode 100644 basis/io/encodings/japanese/authors.txt
 create mode 100644 basis/io/encodings/japanese/japanese-docs.factor
 create mode 100644 basis/io/encodings/japanese/japanese-tests.factor
 create mode 100644 basis/io/encodings/japanese/japanese.factor
 create mode 100644 basis/io/encodings/japanese/sjis-0208-1997-std.txt
 create mode 100644 basis/io/encodings/japanese/summary.txt
 create mode 100644 basis/io/encodings/japanese/tags.txt

diff --git a/basis/io/encodings/8-bit/8-bit.factor b/basis/io/encodings/8-bit/8-bit.factor
index 6ac0ed399e..f5b102ba31 100644
--- a/basis/io/encodings/8-bit/8-bit.factor
+++ b/basis/io/encodings/8-bit/8-bit.factor
@@ -45,7 +45,7 @@ IN: io.encodings.8-bit
 : ch>byte ( assoc -- newassoc )
     [ swap ] assoc-map >hashtable ;
 
-: parse-file ( path -- byte>ch ch>byte )
+: parse-file ( stream -- byte>ch ch>byte )
     lines process-contents
     [ byte>ch ] [ ch>byte ] bi ;
 
diff --git a/basis/io/encodings/japanese/CP932.TXT b/basis/io/encodings/japanese/CP932.TXT
new file mode 100644
index 0000000000..7ff471bcd1
--- /dev/null
+++ b/basis/io/encodings/japanese/CP932.TXT
@@ -0,0 +1,7998 @@
+#
+#    Name:     cp932 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       Shawn.Steele@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp932 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp932 order
+#
+0x00	0x0000	#NULL
+0x01	0x0001	#START OF HEADING
+0x02	0x0002	#START OF TEXT
+0x03	0x0003	#END OF TEXT
+0x04	0x0004	#END OF TRANSMISSION
+0x05	0x0005	#ENQUIRY
+0x06	0x0006	#ACKNOWLEDGE
+0x07	0x0007	#BELL
+0x08	0x0008	#BACKSPACE
+0x09	0x0009	#HORIZONTAL TABULATION
+0x0A	0x000A	#LINE FEED
+0x0B	0x000B	#VERTICAL TABULATION
+0x0C	0x000C	#FORM FEED
+0x0D	0x000D	#CARRIAGE RETURN
+0x0E	0x000E	#SHIFT OUT
+0x0F	0x000F	#SHIFT IN
+0x10	0x0010	#DATA LINK ESCAPE
+0x11	0x0011	#DEVICE CONTROL ONE
+0x12	0x0012	#DEVICE CONTROL TWO
+0x13	0x0013	#DEVICE CONTROL THREE
+0x14	0x0014	#DEVICE CONTROL FOUR
+0x15	0x0015	#NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#SYNCHRONOUS IDLE
+0x17	0x0017	#END OF TRANSMISSION BLOCK
+0x18	0x0018	#CANCEL
+0x19	0x0019	#END OF MEDIUM
+0x1A	0x001A	#SUBSTITUTE
+0x1B	0x001B	#ESCAPE
+0x1C	0x001C	#FILE SEPARATOR
+0x1D	0x001D	#GROUP SEPARATOR
+0x1E	0x001E	#RECORD SEPARATOR
+0x1F	0x001F	#UNIT SEPARATOR
+0x20	0x0020	#SPACE
+0x21	0x0021	#EXCLAMATION MARK
+0x22	0x0022	#QUOTATION MARK
+0x23	0x0023	#NUMBER SIGN
+0x24	0x0024	#DOLLAR SIGN
+0x25	0x0025	#PERCENT SIGN
+0x26	0x0026	#AMPERSAND
+0x27	0x0027	#APOSTROPHE
+0x28	0x0028	#LEFT PARENTHESIS
+0x29	0x0029	#RIGHT PARENTHESIS
+0x2A	0x002A	#ASTERISK
+0x2B	0x002B	#PLUS SIGN
+0x2C	0x002C	#COMMA
+0x2D	0x002D	#HYPHEN-MINUS
+0x2E	0x002E	#FULL STOP
+0x2F	0x002F	#SOLIDUS
+0x30	0x0030	#DIGIT ZERO
+0x31	0x0031	#DIGIT ONE
+0x32	0x0032	#DIGIT TWO
+0x33	0x0033	#DIGIT THREE
+0x34	0x0034	#DIGIT FOUR
+0x35	0x0035	#DIGIT FIVE
+0x36	0x0036	#DIGIT SIX
+0x37	0x0037	#DIGIT SEVEN
+0x38	0x0038	#DIGIT EIGHT
+0x39	0x0039	#DIGIT NINE
+0x3A	0x003A	#COLON
+0x3B	0x003B	#SEMICOLON
+0x3C	0x003C	#LESS-THAN SIGN
+0x3D	0x003D	#EQUALS SIGN
+0x3E	0x003E	#GREATER-THAN SIGN
+0x3F	0x003F	#QUESTION MARK
+0x40	0x0040	#COMMERCIAL AT
+0x41	0x0041	#LATIN CAPITAL LETTER A
+0x42	0x0042	#LATIN CAPITAL LETTER B
+0x43	0x0043	#LATIN CAPITAL LETTER C
+0x44	0x0044	#LATIN CAPITAL LETTER D
+0x45	0x0045	#LATIN CAPITAL LETTER E
+0x46	0x0046	#LATIN CAPITAL LETTER F
+0x47	0x0047	#LATIN CAPITAL LETTER G
+0x48	0x0048	#LATIN CAPITAL LETTER H
+0x49	0x0049	#LATIN CAPITAL LETTER I
+0x4A	0x004A	#LATIN CAPITAL LETTER J
+0x4B	0x004B	#LATIN CAPITAL LETTER K
+0x4C	0x004C	#LATIN CAPITAL LETTER L
+0x4D	0x004D	#LATIN CAPITAL LETTER M
+0x4E	0x004E	#LATIN CAPITAL LETTER N
+0x4F	0x004F	#LATIN CAPITAL LETTER O
+0x50	0x0050	#LATIN CAPITAL LETTER P
+0x51	0x0051	#LATIN CAPITAL LETTER Q
+0x52	0x0052	#LATIN CAPITAL LETTER R
+0x53	0x0053	#LATIN CAPITAL LETTER S
+0x54	0x0054	#LATIN CAPITAL LETTER T
+0x55	0x0055	#LATIN CAPITAL LETTER U
+0x56	0x0056	#LATIN CAPITAL LETTER V
+0x57	0x0057	#LATIN CAPITAL LETTER W
+0x58	0x0058	#LATIN CAPITAL LETTER X
+0x59	0x0059	#LATIN CAPITAL LETTER Y
+0x5A	0x005A	#LATIN CAPITAL LETTER Z
+0x5B	0x005B	#LEFT SQUARE BRACKET
+0x5C	0x005C	#REVERSE SOLIDUS
+0x5D	0x005D	#RIGHT SQUARE BRACKET
+0x5E	0x005E	#CIRCUMFLEX ACCENT
+0x5F	0x005F	#LOW LINE
+0x60	0x0060	#GRAVE ACCENT
+0x61	0x0061	#LATIN SMALL LETTER A
+0x62	0x0062	#LATIN SMALL LETTER B
+0x63	0x0063	#LATIN SMALL LETTER C
+0x64	0x0064	#LATIN SMALL LETTER D
+0x65	0x0065	#LATIN SMALL LETTER E
+0x66	0x0066	#LATIN SMALL LETTER F
+0x67	0x0067	#LATIN SMALL LETTER G
+0x68	0x0068	#LATIN SMALL LETTER H
+0x69	0x0069	#LATIN SMALL LETTER I
+0x6A	0x006A	#LATIN SMALL LETTER J
+0x6B	0x006B	#LATIN SMALL LETTER K
+0x6C	0x006C	#LATIN SMALL LETTER L
+0x6D	0x006D	#LATIN SMALL LETTER M
+0x6E	0x006E	#LATIN SMALL LETTER N
+0x6F	0x006F	#LATIN SMALL LETTER O
+0x70	0x0070	#LATIN SMALL LETTER P
+0x71	0x0071	#LATIN SMALL LETTER Q
+0x72	0x0072	#LATIN SMALL LETTER R
+0x73	0x0073	#LATIN SMALL LETTER S
+0x74	0x0074	#LATIN SMALL LETTER T
+0x75	0x0075	#LATIN SMALL LETTER U
+0x76	0x0076	#LATIN SMALL LETTER V
+0x77	0x0077	#LATIN SMALL LETTER W
+0x78	0x0078	#LATIN SMALL LETTER X
+0x79	0x0079	#LATIN SMALL LETTER Y
+0x7A	0x007A	#LATIN SMALL LETTER Z
+0x7B	0x007B	#LEFT CURLY BRACKET
+0x7C	0x007C	#VERTICAL LINE
+0x7D	0x007D	#RIGHT CURLY BRACKET
+0x7E	0x007E	#TILDE
+0x7F	0x007F	#DELETE
+0x80	      	#UNDEFINED
+0x81	      	#DBCS LEAD BYTE
+0x82	      	#DBCS LEAD BYTE
+0x83	      	#DBCS LEAD BYTE
+0x84	      	#DBCS LEAD BYTE
+0x85	      	#DBCS LEAD BYTE
+0x86	      	#DBCS LEAD BYTE
+0x87	      	#DBCS LEAD BYTE
+0x88	      	#DBCS LEAD BYTE
+0x89	      	#DBCS LEAD BYTE
+0x8A	      	#DBCS LEAD BYTE
+0x8B	      	#DBCS LEAD BYTE
+0x8C	      	#DBCS LEAD BYTE
+0x8D	      	#DBCS LEAD BYTE
+0x8E	      	#DBCS LEAD BYTE
+0x8F	      	#DBCS LEAD BYTE
+0x90	      	#DBCS LEAD BYTE
+0x91	      	#DBCS LEAD BYTE
+0x92	      	#DBCS LEAD BYTE
+0x93	      	#DBCS LEAD BYTE
+0x94	      	#DBCS LEAD BYTE
+0x95	      	#DBCS LEAD BYTE
+0x96	      	#DBCS LEAD BYTE
+0x97	      	#DBCS LEAD BYTE
+0x98	      	#DBCS LEAD BYTE
+0x99	      	#DBCS LEAD BYTE
+0x9A	      	#DBCS LEAD BYTE
+0x9B	      	#DBCS LEAD BYTE
+0x9C	      	#DBCS LEAD BYTE
+0x9D	      	#DBCS LEAD BYTE
+0x9E	      	#DBCS LEAD BYTE
+0x9F	      	#DBCS LEAD BYTE
+0xA0	      	#UNDEFINED
+0xA1	0xFF61	#HALFWIDTH IDEOGRAPHIC FULL STOP
+0xA2	0xFF62	#HALFWIDTH LEFT CORNER BRACKET
+0xA3	0xFF63	#HALFWIDTH RIGHT CORNER BRACKET
+0xA4	0xFF64	#HALFWIDTH IDEOGRAPHIC COMMA
+0xA5	0xFF65	#HALFWIDTH KATAKANA MIDDLE DOT
+0xA6	0xFF66	#HALFWIDTH KATAKANA LETTER WO
+0xA7	0xFF67	#HALFWIDTH KATAKANA LETTER SMALL A
+0xA8	0xFF68	#HALFWIDTH KATAKANA LETTER SMALL I
+0xA9	0xFF69	#HALFWIDTH KATAKANA LETTER SMALL U
+0xAA	0xFF6A	#HALFWIDTH KATAKANA LETTER SMALL E
+0xAB	0xFF6B	#HALFWIDTH KATAKANA LETTER SMALL O
+0xAC	0xFF6C	#HALFWIDTH KATAKANA LETTER SMALL YA
+0xAD	0xFF6D	#HALFWIDTH KATAKANA LETTER SMALL YU
+0xAE	0xFF6E	#HALFWIDTH KATAKANA LETTER SMALL YO
+0xAF	0xFF6F	#HALFWIDTH KATAKANA LETTER SMALL TU
+0xB0	0xFF70	#HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+0xB1	0xFF71	#HALFWIDTH KATAKANA LETTER A
+0xB2	0xFF72	#HALFWIDTH KATAKANA LETTER I
+0xB3	0xFF73	#HALFWIDTH KATAKANA LETTER U
+0xB4	0xFF74	#HALFWIDTH KATAKANA LETTER E
+0xB5	0xFF75	#HALFWIDTH KATAKANA LETTER O
+0xB6	0xFF76	#HALFWIDTH KATAKANA LETTER KA
+0xB7	0xFF77	#HALFWIDTH KATAKANA LETTER KI
+0xB8	0xFF78	#HALFWIDTH KATAKANA LETTER KU
+0xB9	0xFF79	#HALFWIDTH KATAKANA LETTER KE
+0xBA	0xFF7A	#HALFWIDTH KATAKANA LETTER KO
+0xBB	0xFF7B	#HALFWIDTH KATAKANA LETTER SA
+0xBC	0xFF7C	#HALFWIDTH KATAKANA LETTER SI
+0xBD	0xFF7D	#HALFWIDTH KATAKANA LETTER SU
+0xBE	0xFF7E	#HALFWIDTH KATAKANA LETTER SE
+0xBF	0xFF7F	#HALFWIDTH KATAKANA LETTER SO
+0xC0	0xFF80	#HALFWIDTH KATAKANA LETTER TA
+0xC1	0xFF81	#HALFWIDTH KATAKANA LETTER TI
+0xC2	0xFF82	#HALFWIDTH KATAKANA LETTER TU
+0xC3	0xFF83	#HALFWIDTH KATAKANA LETTER TE
+0xC4	0xFF84	#HALFWIDTH KATAKANA LETTER TO
+0xC5	0xFF85	#HALFWIDTH KATAKANA LETTER NA
+0xC6	0xFF86	#HALFWIDTH KATAKANA LETTER NI
+0xC7	0xFF87	#HALFWIDTH KATAKANA LETTER NU
+0xC8	0xFF88	#HALFWIDTH KATAKANA LETTER NE
+0xC9	0xFF89	#HALFWIDTH KATAKANA LETTER NO
+0xCA	0xFF8A	#HALFWIDTH KATAKANA LETTER HA
+0xCB	0xFF8B	#HALFWIDTH KATAKANA LETTER HI
+0xCC	0xFF8C	#HALFWIDTH KATAKANA LETTER HU
+0xCD	0xFF8D	#HALFWIDTH KATAKANA LETTER HE
+0xCE	0xFF8E	#HALFWIDTH KATAKANA LETTER HO
+0xCF	0xFF8F	#HALFWIDTH KATAKANA LETTER MA
+0xD0	0xFF90	#HALFWIDTH KATAKANA LETTER MI
+0xD1	0xFF91	#HALFWIDTH KATAKANA LETTER MU
+0xD2	0xFF92	#HALFWIDTH KATAKANA LETTER ME
+0xD3	0xFF93	#HALFWIDTH KATAKANA LETTER MO
+0xD4	0xFF94	#HALFWIDTH KATAKANA LETTER YA
+0xD5	0xFF95	#HALFWIDTH KATAKANA LETTER YU
+0xD6	0xFF96	#HALFWIDTH KATAKANA LETTER YO
+0xD7	0xFF97	#HALFWIDTH KATAKANA LETTER RA
+0xD8	0xFF98	#HALFWIDTH KATAKANA LETTER RI
+0xD9	0xFF99	#HALFWIDTH KATAKANA LETTER RU
+0xDA	0xFF9A	#HALFWIDTH KATAKANA LETTER RE
+0xDB	0xFF9B	#HALFWIDTH KATAKANA LETTER RO
+0xDC	0xFF9C	#HALFWIDTH KATAKANA LETTER WA
+0xDD	0xFF9D	#HALFWIDTH KATAKANA LETTER N
+0xDE	0xFF9E	#HALFWIDTH KATAKANA VOICED SOUND MARK
+0xDF	0xFF9F	#HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+0xE0	      	#DBCS LEAD BYTE
+0xE1	      	#DBCS LEAD BYTE
+0xE2	      	#DBCS LEAD BYTE
+0xE3	      	#DBCS LEAD BYTE
+0xE4	      	#DBCS LEAD BYTE
+0xE5	      	#DBCS LEAD BYTE
+0xE6	      	#DBCS LEAD BYTE
+0xE7	      	#DBCS LEAD BYTE
+0xE8	      	#DBCS LEAD BYTE
+0xE9	      	#DBCS LEAD BYTE
+0xEA	      	#DBCS LEAD BYTE
+0xEB	      	#DBCS LEAD BYTE
+0xEC	      	#DBCS LEAD BYTE
+0xED	      	#DBCS LEAD BYTE
+0xEE	      	#DBCS LEAD BYTE
+0xEF	      	#DBCS LEAD BYTE
+0xF0	      	#DBCS LEAD BYTE
+0xF1	      	#DBCS LEAD BYTE
+0xF2	      	#DBCS LEAD BYTE
+0xF3	      	#DBCS LEAD BYTE
+0xF4	      	#DBCS LEAD BYTE
+0xF5	      	#DBCS LEAD BYTE
+0xF6	      	#DBCS LEAD BYTE
+0xF7	      	#DBCS LEAD BYTE
+0xF8	      	#DBCS LEAD BYTE
+0xF9	      	#DBCS LEAD BYTE
+0xFA	      	#DBCS LEAD BYTE
+0xFB	      	#DBCS LEAD BYTE
+0xFC	      	#DBCS LEAD BYTE
+0xFD	      	#UNDEFINED
+0xFE	      	#UNDEFINED
+0xFF	      	#UNDEFINED
+0x8140	0x3000	#IDEOGRAPHIC SPACE
+0x8141	0x3001	#IDEOGRAPHIC COMMA
+0x8142	0x3002	#IDEOGRAPHIC FULL STOP
+0x8143	0xFF0C	#FULLWIDTH COMMA
+0x8144	0xFF0E	#FULLWIDTH FULL STOP
+0x8145	0x30FB	#KATAKANA MIDDLE DOT
+0x8146	0xFF1A	#FULLWIDTH COLON
+0x8147	0xFF1B	#FULLWIDTH SEMICOLON
+0x8148	0xFF1F	#FULLWIDTH QUESTION MARK
+0x8149	0xFF01	#FULLWIDTH EXCLAMATION MARK
+0x814A	0x309B	#KATAKANA-HIRAGANA VOICED SOUND MARK
+0x814B	0x309C	#KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+0x814C	0x00B4	#ACUTE ACCENT
+0x814D	0xFF40	#FULLWIDTH GRAVE ACCENT
+0x814E	0x00A8	#DIAERESIS
+0x814F	0xFF3E	#FULLWIDTH CIRCUMFLEX ACCENT
+0x8150	0xFFE3	#FULLWIDTH MACRON
+0x8151	0xFF3F	#FULLWIDTH LOW LINE
+0x8152	0x30FD	#KATAKANA ITERATION MARK
+0x8153	0x30FE	#KATAKANA VOICED ITERATION MARK
+0x8154	0x309D	#HIRAGANA ITERATION MARK
+0x8155	0x309E	#HIRAGANA VOICED ITERATION MARK
+0x8156	0x3003	#DITTO MARK
+0x8157	0x4EDD	#CJK UNIFIED IDEOGRAPH
+0x8158	0x3005	#IDEOGRAPHIC ITERATION MARK
+0x8159	0x3006	#IDEOGRAPHIC CLOSING MARK
+0x815A	0x3007	#IDEOGRAPHIC NUMBER ZERO
+0x815B	0x30FC	#KATAKANA-HIRAGANA PROLONGED SOUND MARK
+0x815C	0x2015	#HORIZONTAL BAR
+0x815D	0x2010	#HYPHEN
+0x815E	0xFF0F	#FULLWIDTH SOLIDUS
+0x815F	0xFF3C	#FULLWIDTH REVERSE SOLIDUS
+0x8160	0xFF5E	#FULLWIDTH TILDE
+0x8161	0x2225	#PARALLEL TO
+0x8162	0xFF5C	#FULLWIDTH VERTICAL LINE
+0x8163	0x2026	#HORIZONTAL ELLIPSIS
+0x8164	0x2025	#TWO DOT LEADER
+0x8165	0x2018	#LEFT SINGLE QUOTATION MARK
+0x8166	0x2019	#RIGHT SINGLE QUOTATION MARK
+0x8167	0x201C	#LEFT DOUBLE QUOTATION MARK
+0x8168	0x201D	#RIGHT DOUBLE QUOTATION MARK
+0x8169	0xFF08	#FULLWIDTH LEFT PARENTHESIS
+0x816A	0xFF09	#FULLWIDTH RIGHT PARENTHESIS
+0x816B	0x3014	#LEFT TORTOISE SHELL BRACKET
+0x816C	0x3015	#RIGHT TORTOISE SHELL BRACKET
+0x816D	0xFF3B	#FULLWIDTH LEFT SQUARE BRACKET
+0x816E	0xFF3D	#FULLWIDTH RIGHT SQUARE BRACKET
+0x816F	0xFF5B	#FULLWIDTH LEFT CURLY BRACKET
+0x8170	0xFF5D	#FULLWIDTH RIGHT CURLY BRACKET
+0x8171	0x3008	#LEFT ANGLE BRACKET
+0x8172	0x3009	#RIGHT ANGLE BRACKET
+0x8173	0x300A	#LEFT DOUBLE ANGLE BRACKET
+0x8174	0x300B	#RIGHT DOUBLE ANGLE BRACKET
+0x8175	0x300C	#LEFT CORNER BRACKET
+0x8176	0x300D	#RIGHT CORNER BRACKET
+0x8177	0x300E	#LEFT WHITE CORNER BRACKET
+0x8178	0x300F	#RIGHT WHITE CORNER BRACKET
+0x8179	0x3010	#LEFT BLACK LENTICULAR BRACKET
+0x817A	0x3011	#RIGHT BLACK LENTICULAR BRACKET
+0x817B	0xFF0B	#FULLWIDTH PLUS SIGN
+0x817C	0xFF0D	#FULLWIDTH HYPHEN-MINUS
+0x817D	0x00B1	#PLUS-MINUS SIGN
+0x817E	0x00D7	#MULTIPLICATION SIGN
+0x8180	0x00F7	#DIVISION SIGN
+0x8181	0xFF1D	#FULLWIDTH EQUALS SIGN
+0x8182	0x2260	#NOT EQUAL TO
+0x8183	0xFF1C	#FULLWIDTH LESS-THAN SIGN
+0x8184	0xFF1E	#FULLWIDTH GREATER-THAN SIGN
+0x8185	0x2266	#LESS-THAN OVER EQUAL TO
+0x8186	0x2267	#GREATER-THAN OVER EQUAL TO
+0x8187	0x221E	#INFINITY
+0x8188	0x2234	#THEREFORE
+0x8189	0x2642	#MALE SIGN
+0x818A	0x2640	#FEMALE SIGN
+0x818B	0x00B0	#DEGREE SIGN
+0x818C	0x2032	#PRIME
+0x818D	0x2033	#DOUBLE PRIME
+0x818E	0x2103	#DEGREE CELSIUS
+0x818F	0xFFE5	#FULLWIDTH YEN SIGN
+0x8190	0xFF04	#FULLWIDTH DOLLAR SIGN
+0x8191	0xFFE0	#FULLWIDTH CENT SIGN
+0x8192	0xFFE1	#FULLWIDTH POUND SIGN
+0x8193	0xFF05	#FULLWIDTH PERCENT SIGN
+0x8194	0xFF03	#FULLWIDTH NUMBER SIGN
+0x8195	0xFF06	#FULLWIDTH AMPERSAND
+0x8196	0xFF0A	#FULLWIDTH ASTERISK
+0x8197	0xFF20	#FULLWIDTH COMMERCIAL AT
+0x8198	0x00A7	#SECTION SIGN
+0x8199	0x2606	#WHITE STAR
+0x819A	0x2605	#BLACK STAR
+0x819B	0x25CB	#WHITE CIRCLE
+0x819C	0x25CF	#BLACK CIRCLE
+0x819D	0x25CE	#BULLSEYE
+0x819E	0x25C7	#WHITE DIAMOND
+0x819F	0x25C6	#BLACK DIAMOND
+0x81A0	0x25A1	#WHITE SQUARE
+0x81A1	0x25A0	#BLACK SQUARE
+0x81A2	0x25B3	#WHITE UP-POINTING TRIANGLE
+0x81A3	0x25B2	#BLACK UP-POINTING TRIANGLE
+0x81A4	0x25BD	#WHITE DOWN-POINTING TRIANGLE
+0x81A5	0x25BC	#BLACK DOWN-POINTING TRIANGLE
+0x81A6	0x203B	#REFERENCE MARK
+0x81A7	0x3012	#POSTAL MARK
+0x81A8	0x2192	#RIGHTWARDS ARROW
+0x81A9	0x2190	#LEFTWARDS ARROW
+0x81AA	0x2191	#UPWARDS ARROW
+0x81AB	0x2193	#DOWNWARDS ARROW
+0x81AC	0x3013	#GETA MARK
+0x81B8	0x2208	#ELEMENT OF
+0x81B9	0x220B	#CONTAINS AS MEMBER
+0x81BA	0x2286	#SUBSET OF OR EQUAL TO
+0x81BB	0x2287	#SUPERSET OF OR EQUAL TO
+0x81BC	0x2282	#SUBSET OF
+0x81BD	0x2283	#SUPERSET OF
+0x81BE	0x222A	#UNION
+0x81BF	0x2229	#INTERSECTION
+0x81C8	0x2227	#LOGICAL AND
+0x81C9	0x2228	#LOGICAL OR
+0x81CA	0xFFE2	#FULLWIDTH NOT SIGN
+0x81CB	0x21D2	#RIGHTWARDS DOUBLE ARROW
+0x81CC	0x21D4	#LEFT RIGHT DOUBLE ARROW
+0x81CD	0x2200	#FOR ALL
+0x81CE	0x2203	#THERE EXISTS
+0x81DA	0x2220	#ANGLE
+0x81DB	0x22A5	#UP TACK
+0x81DC	0x2312	#ARC
+0x81DD	0x2202	#PARTIAL DIFFERENTIAL
+0x81DE	0x2207	#NABLA
+0x81DF	0x2261	#IDENTICAL TO
+0x81E0	0x2252	#APPROXIMATELY EQUAL TO OR THE IMAGE OF
+0x81E1	0x226A	#MUCH LESS-THAN
+0x81E2	0x226B	#MUCH GREATER-THAN
+0x81E3	0x221A	#SQUARE ROOT
+0x81E4	0x223D	#REVERSED TILDE
+0x81E5	0x221D	#PROPORTIONAL TO
+0x81E6	0x2235	#BECAUSE
+0x81E7	0x222B	#INTEGRAL
+0x81E8	0x222C	#DOUBLE INTEGRAL
+0x81F0	0x212B	#ANGSTROM SIGN
+0x81F1	0x2030	#PER MILLE SIGN
+0x81F2	0x266F	#MUSIC SHARP SIGN
+0x81F3	0x266D	#MUSIC FLAT SIGN
+0x81F4	0x266A	#EIGHTH NOTE
+0x81F5	0x2020	#DAGGER
+0x81F6	0x2021	#DOUBLE DAGGER
+0x81F7	0x00B6	#PILCROW SIGN
+0x81FC	0x25EF	#LARGE CIRCLE
+0x824F	0xFF10	#FULLWIDTH DIGIT ZERO
+0x8250	0xFF11	#FULLWIDTH DIGIT ONE
+0x8251	0xFF12	#FULLWIDTH DIGIT TWO
+0x8252	0xFF13	#FULLWIDTH DIGIT THREE
+0x8253	0xFF14	#FULLWIDTH DIGIT FOUR
+0x8254	0xFF15	#FULLWIDTH DIGIT FIVE
+0x8255	0xFF16	#FULLWIDTH DIGIT SIX
+0x8256	0xFF17	#FULLWIDTH DIGIT SEVEN
+0x8257	0xFF18	#FULLWIDTH DIGIT EIGHT
+0x8258	0xFF19	#FULLWIDTH DIGIT NINE
+0x8260	0xFF21	#FULLWIDTH LATIN CAPITAL LETTER A
+0x8261	0xFF22	#FULLWIDTH LATIN CAPITAL LETTER B
+0x8262	0xFF23	#FULLWIDTH LATIN CAPITAL LETTER C
+0x8263	0xFF24	#FULLWIDTH LATIN CAPITAL LETTER D
+0x8264	0xFF25	#FULLWIDTH LATIN CAPITAL LETTER E
+0x8265	0xFF26	#FULLWIDTH LATIN CAPITAL LETTER F
+0x8266	0xFF27	#FULLWIDTH LATIN CAPITAL LETTER G
+0x8267	0xFF28	#FULLWIDTH LATIN CAPITAL LETTER H
+0x8268	0xFF29	#FULLWIDTH LATIN CAPITAL LETTER I
+0x8269	0xFF2A	#FULLWIDTH LATIN CAPITAL LETTER J
+0x826A	0xFF2B	#FULLWIDTH LATIN CAPITAL LETTER K
+0x826B	0xFF2C	#FULLWIDTH LATIN CAPITAL LETTER L
+0x826C	0xFF2D	#FULLWIDTH LATIN CAPITAL LETTER M
+0x826D	0xFF2E	#FULLWIDTH LATIN CAPITAL LETTER N
+0x826E	0xFF2F	#FULLWIDTH LATIN CAPITAL LETTER O
+0x826F	0xFF30	#FULLWIDTH LATIN CAPITAL LETTER P
+0x8270	0xFF31	#FULLWIDTH LATIN CAPITAL LETTER Q
+0x8271	0xFF32	#FULLWIDTH LATIN CAPITAL LETTER R
+0x8272	0xFF33	#FULLWIDTH LATIN CAPITAL LETTER S
+0x8273	0xFF34	#FULLWIDTH LATIN CAPITAL LETTER T
+0x8274	0xFF35	#FULLWIDTH LATIN CAPITAL LETTER U
+0x8275	0xFF36	#FULLWIDTH LATIN CAPITAL LETTER V
+0x8276	0xFF37	#FULLWIDTH LATIN CAPITAL LETTER W
+0x8277	0xFF38	#FULLWIDTH LATIN CAPITAL LETTER X
+0x8278	0xFF39	#FULLWIDTH LATIN CAPITAL LETTER Y
+0x8279	0xFF3A	#FULLWIDTH LATIN CAPITAL LETTER Z
+0x8281	0xFF41	#FULLWIDTH LATIN SMALL LETTER A
+0x8282	0xFF42	#FULLWIDTH LATIN SMALL LETTER B
+0x8283	0xFF43	#FULLWIDTH LATIN SMALL LETTER C
+0x8284	0xFF44	#FULLWIDTH LATIN SMALL LETTER D
+0x8285	0xFF45	#FULLWIDTH LATIN SMALL LETTER E
+0x8286	0xFF46	#FULLWIDTH LATIN SMALL LETTER F
+0x8287	0xFF47	#FULLWIDTH LATIN SMALL LETTER G
+0x8288	0xFF48	#FULLWIDTH LATIN SMALL LETTER H
+0x8289	0xFF49	#FULLWIDTH LATIN SMALL LETTER I
+0x828A	0xFF4A	#FULLWIDTH LATIN SMALL LETTER J
+0x828B	0xFF4B	#FULLWIDTH LATIN SMALL LETTER K
+0x828C	0xFF4C	#FULLWIDTH LATIN SMALL LETTER L
+0x828D	0xFF4D	#FULLWIDTH LATIN SMALL LETTER M
+0x828E	0xFF4E	#FULLWIDTH LATIN SMALL LETTER N
+0x828F	0xFF4F	#FULLWIDTH LATIN SMALL LETTER O
+0x8290	0xFF50	#FULLWIDTH LATIN SMALL LETTER P
+0x8291	0xFF51	#FULLWIDTH LATIN SMALL LETTER Q
+0x8292	0xFF52	#FULLWIDTH LATIN SMALL LETTER R
+0x8293	0xFF53	#FULLWIDTH LATIN SMALL LETTER S
+0x8294	0xFF54	#FULLWIDTH LATIN SMALL LETTER T
+0x8295	0xFF55	#FULLWIDTH LATIN SMALL LETTER U
+0x8296	0xFF56	#FULLWIDTH LATIN SMALL LETTER V
+0x8297	0xFF57	#FULLWIDTH LATIN SMALL LETTER W
+0x8298	0xFF58	#FULLWIDTH LATIN SMALL LETTER X
+0x8299	0xFF59	#FULLWIDTH LATIN SMALL LETTER Y
+0x829A	0xFF5A	#FULLWIDTH LATIN SMALL LETTER Z
+0x829F	0x3041	#HIRAGANA LETTER SMALL A
+0x82A0	0x3042	#HIRAGANA LETTER A
+0x82A1	0x3043	#HIRAGANA LETTER SMALL I
+0x82A2	0x3044	#HIRAGANA LETTER I
+0x82A3	0x3045	#HIRAGANA LETTER SMALL U
+0x82A4	0x3046	#HIRAGANA LETTER U
+0x82A5	0x3047	#HIRAGANA LETTER SMALL E
+0x82A6	0x3048	#HIRAGANA LETTER E
+0x82A7	0x3049	#HIRAGANA LETTER SMALL O
+0x82A8	0x304A	#HIRAGANA LETTER O
+0x82A9	0x304B	#HIRAGANA LETTER KA
+0x82AA	0x304C	#HIRAGANA LETTER GA
+0x82AB	0x304D	#HIRAGANA LETTER KI
+0x82AC	0x304E	#HIRAGANA LETTER GI
+0x82AD	0x304F	#HIRAGANA LETTER KU
+0x82AE	0x3050	#HIRAGANA LETTER GU
+0x82AF	0x3051	#HIRAGANA LETTER KE
+0x82B0	0x3052	#HIRAGANA LETTER GE
+0x82B1	0x3053	#HIRAGANA LETTER KO
+0x82B2	0x3054	#HIRAGANA LETTER GO
+0x82B3	0x3055	#HIRAGANA LETTER SA
+0x82B4	0x3056	#HIRAGANA LETTER ZA
+0x82B5	0x3057	#HIRAGANA LETTER SI
+0x82B6	0x3058	#HIRAGANA LETTER ZI
+0x82B7	0x3059	#HIRAGANA LETTER SU
+0x82B8	0x305A	#HIRAGANA LETTER ZU
+0x82B9	0x305B	#HIRAGANA LETTER SE
+0x82BA	0x305C	#HIRAGANA LETTER ZE
+0x82BB	0x305D	#HIRAGANA LETTER SO
+0x82BC	0x305E	#HIRAGANA LETTER ZO
+0x82BD	0x305F	#HIRAGANA LETTER TA
+0x82BE	0x3060	#HIRAGANA LETTER DA
+0x82BF	0x3061	#HIRAGANA LETTER TI
+0x82C0	0x3062	#HIRAGANA LETTER DI
+0x82C1	0x3063	#HIRAGANA LETTER SMALL TU
+0x82C2	0x3064	#HIRAGANA LETTER TU
+0x82C3	0x3065	#HIRAGANA LETTER DU
+0x82C4	0x3066	#HIRAGANA LETTER TE
+0x82C5	0x3067	#HIRAGANA LETTER DE
+0x82C6	0x3068	#HIRAGANA LETTER TO
+0x82C7	0x3069	#HIRAGANA LETTER DO
+0x82C8	0x306A	#HIRAGANA LETTER NA
+0x82C9	0x306B	#HIRAGANA LETTER NI
+0x82CA	0x306C	#HIRAGANA LETTER NU
+0x82CB	0x306D	#HIRAGANA LETTER NE
+0x82CC	0x306E	#HIRAGANA LETTER NO
+0x82CD	0x306F	#HIRAGANA LETTER HA
+0x82CE	0x3070	#HIRAGANA LETTER BA
+0x82CF	0x3071	#HIRAGANA LETTER PA
+0x82D0	0x3072	#HIRAGANA LETTER HI
+0x82D1	0x3073	#HIRAGANA LETTER BI
+0x82D2	0x3074	#HIRAGANA LETTER PI
+0x82D3	0x3075	#HIRAGANA LETTER HU
+0x82D4	0x3076	#HIRAGANA LETTER BU
+0x82D5	0x3077	#HIRAGANA LETTER PU
+0x82D6	0x3078	#HIRAGANA LETTER HE
+0x82D7	0x3079	#HIRAGANA LETTER BE
+0x82D8	0x307A	#HIRAGANA LETTER PE
+0x82D9	0x307B	#HIRAGANA LETTER HO
+0x82DA	0x307C	#HIRAGANA LETTER BO
+0x82DB	0x307D	#HIRAGANA LETTER PO
+0x82DC	0x307E	#HIRAGANA LETTER MA
+0x82DD	0x307F	#HIRAGANA LETTER MI
+0x82DE	0x3080	#HIRAGANA LETTER MU
+0x82DF	0x3081	#HIRAGANA LETTER ME
+0x82E0	0x3082	#HIRAGANA LETTER MO
+0x82E1	0x3083	#HIRAGANA LETTER SMALL YA
+0x82E2	0x3084	#HIRAGANA LETTER YA
+0x82E3	0x3085	#HIRAGANA LETTER SMALL YU
+0x82E4	0x3086	#HIRAGANA LETTER YU
+0x82E5	0x3087	#HIRAGANA LETTER SMALL YO
+0x82E6	0x3088	#HIRAGANA LETTER YO
+0x82E7	0x3089	#HIRAGANA LETTER RA
+0x82E8	0x308A	#HIRAGANA LETTER RI
+0x82E9	0x308B	#HIRAGANA LETTER RU
+0x82EA	0x308C	#HIRAGANA LETTER RE
+0x82EB	0x308D	#HIRAGANA LETTER RO
+0x82EC	0x308E	#HIRAGANA LETTER SMALL WA
+0x82ED	0x308F	#HIRAGANA LETTER WA
+0x82EE	0x3090	#HIRAGANA LETTER WI
+0x82EF	0x3091	#HIRAGANA LETTER WE
+0x82F0	0x3092	#HIRAGANA LETTER WO
+0x82F1	0x3093	#HIRAGANA LETTER N
+0x8340	0x30A1	#KATAKANA LETTER SMALL A
+0x8341	0x30A2	#KATAKANA LETTER A
+0x8342	0x30A3	#KATAKANA LETTER SMALL I
+0x8343	0x30A4	#KATAKANA LETTER I
+0x8344	0x30A5	#KATAKANA LETTER SMALL U
+0x8345	0x30A6	#KATAKANA LETTER U
+0x8346	0x30A7	#KATAKANA LETTER SMALL E
+0x8347	0x30A8	#KATAKANA LETTER E
+0x8348	0x30A9	#KATAKANA LETTER SMALL O
+0x8349	0x30AA	#KATAKANA LETTER O
+0x834A	0x30AB	#KATAKANA LETTER KA
+0x834B	0x30AC	#KATAKANA LETTER GA
+0x834C	0x30AD	#KATAKANA LETTER KI
+0x834D	0x30AE	#KATAKANA LETTER GI
+0x834E	0x30AF	#KATAKANA LETTER KU
+0x834F	0x30B0	#KATAKANA LETTER GU
+0x8350	0x30B1	#KATAKANA LETTER KE
+0x8351	0x30B2	#KATAKANA LETTER GE
+0x8352	0x30B3	#KATAKANA LETTER KO
+0x8353	0x30B4	#KATAKANA LETTER GO
+0x8354	0x30B5	#KATAKANA LETTER SA
+0x8355	0x30B6	#KATAKANA LETTER ZA
+0x8356	0x30B7	#KATAKANA LETTER SI
+0x8357	0x30B8	#KATAKANA LETTER ZI
+0x8358	0x30B9	#KATAKANA LETTER SU
+0x8359	0x30BA	#KATAKANA LETTER ZU
+0x835A	0x30BB	#KATAKANA LETTER SE
+0x835B	0x30BC	#KATAKANA LETTER ZE
+0x835C	0x30BD	#KATAKANA LETTER SO
+0x835D	0x30BE	#KATAKANA LETTER ZO
+0x835E	0x30BF	#KATAKANA LETTER TA
+0x835F	0x30C0	#KATAKANA LETTER DA
+0x8360	0x30C1	#KATAKANA LETTER TI
+0x8361	0x30C2	#KATAKANA LETTER DI
+0x8362	0x30C3	#KATAKANA LETTER SMALL TU
+0x8363	0x30C4	#KATAKANA LETTER TU
+0x8364	0x30C5	#KATAKANA LETTER DU
+0x8365	0x30C6	#KATAKANA LETTER TE
+0x8366	0x30C7	#KATAKANA LETTER DE
+0x8367	0x30C8	#KATAKANA LETTER TO
+0x8368	0x30C9	#KATAKANA LETTER DO
+0x8369	0x30CA	#KATAKANA LETTER NA
+0x836A	0x30CB	#KATAKANA LETTER NI
+0x836B	0x30CC	#KATAKANA LETTER NU
+0x836C	0x30CD	#KATAKANA LETTER NE
+0x836D	0x30CE	#KATAKANA LETTER NO
+0x836E	0x30CF	#KATAKANA LETTER HA
+0x836F	0x30D0	#KATAKANA LETTER BA
+0x8370	0x30D1	#KATAKANA LETTER PA
+0x8371	0x30D2	#KATAKANA LETTER HI
+0x8372	0x30D3	#KATAKANA LETTER BI
+0x8373	0x30D4	#KATAKANA LETTER PI
+0x8374	0x30D5	#KATAKANA LETTER HU
+0x8375	0x30D6	#KATAKANA LETTER BU
+0x8376	0x30D7	#KATAKANA LETTER PU
+0x8377	0x30D8	#KATAKANA LETTER HE
+0x8378	0x30D9	#KATAKANA LETTER BE
+0x8379	0x30DA	#KATAKANA LETTER PE
+0x837A	0x30DB	#KATAKANA LETTER HO
+0x837B	0x30DC	#KATAKANA LETTER BO
+0x837C	0x30DD	#KATAKANA LETTER PO
+0x837D	0x30DE	#KATAKANA LETTER MA
+0x837E	0x30DF	#KATAKANA LETTER MI
+0x8380	0x30E0	#KATAKANA LETTER MU
+0x8381	0x30E1	#KATAKANA LETTER ME
+0x8382	0x30E2	#KATAKANA LETTER MO
+0x8383	0x30E3	#KATAKANA LETTER SMALL YA
+0x8384	0x30E4	#KATAKANA LETTER YA
+0x8385	0x30E5	#KATAKANA LETTER SMALL YU
+0x8386	0x30E6	#KATAKANA LETTER YU
+0x8387	0x30E7	#KATAKANA LETTER SMALL YO
+0x8388	0x30E8	#KATAKANA LETTER YO
+0x8389	0x30E9	#KATAKANA LETTER RA
+0x838A	0x30EA	#KATAKANA LETTER RI
+0x838B	0x30EB	#KATAKANA LETTER RU
+0x838C	0x30EC	#KATAKANA LETTER RE
+0x838D	0x30ED	#KATAKANA LETTER RO
+0x838E	0x30EE	#KATAKANA LETTER SMALL WA
+0x838F	0x30EF	#KATAKANA LETTER WA
+0x8390	0x30F0	#KATAKANA LETTER WI
+0x8391	0x30F1	#KATAKANA LETTER WE
+0x8392	0x30F2	#KATAKANA LETTER WO
+0x8393	0x30F3	#KATAKANA LETTER N
+0x8394	0x30F4	#KATAKANA LETTER VU
+0x8395	0x30F5	#KATAKANA LETTER SMALL KA
+0x8396	0x30F6	#KATAKANA LETTER SMALL KE
+0x839F	0x0391	#GREEK CAPITAL LETTER ALPHA
+0x83A0	0x0392	#GREEK CAPITAL LETTER BETA
+0x83A1	0x0393	#GREEK CAPITAL LETTER GAMMA
+0x83A2	0x0394	#GREEK CAPITAL LETTER DELTA
+0x83A3	0x0395	#GREEK CAPITAL LETTER EPSILON
+0x83A4	0x0396	#GREEK CAPITAL LETTER ZETA
+0x83A5	0x0397	#GREEK CAPITAL LETTER ETA
+0x83A6	0x0398	#GREEK CAPITAL LETTER THETA
+0x83A7	0x0399	#GREEK CAPITAL LETTER IOTA
+0x83A8	0x039A	#GREEK CAPITAL LETTER KAPPA
+0x83A9	0x039B	#GREEK CAPITAL LETTER LAMDA
+0x83AA	0x039C	#GREEK CAPITAL LETTER MU
+0x83AB	0x039D	#GREEK CAPITAL LETTER NU
+0x83AC	0x039E	#GREEK CAPITAL LETTER XI
+0x83AD	0x039F	#GREEK CAPITAL LETTER OMICRON
+0x83AE	0x03A0	#GREEK CAPITAL LETTER PI
+0x83AF	0x03A1	#GREEK CAPITAL LETTER RHO
+0x83B0	0x03A3	#GREEK CAPITAL LETTER SIGMA
+0x83B1	0x03A4	#GREEK CAPITAL LETTER TAU
+0x83B2	0x03A5	#GREEK CAPITAL LETTER UPSILON
+0x83B3	0x03A6	#GREEK CAPITAL LETTER PHI
+0x83B4	0x03A7	#GREEK CAPITAL LETTER CHI
+0x83B5	0x03A8	#GREEK CAPITAL LETTER PSI
+0x83B6	0x03A9	#GREEK CAPITAL LETTER OMEGA
+0x83BF	0x03B1	#GREEK SMALL LETTER ALPHA
+0x83C0	0x03B2	#GREEK SMALL LETTER BETA
+0x83C1	0x03B3	#GREEK SMALL LETTER GAMMA
+0x83C2	0x03B4	#GREEK SMALL LETTER DELTA
+0x83C3	0x03B5	#GREEK SMALL LETTER EPSILON
+0x83C4	0x03B6	#GREEK SMALL LETTER ZETA
+0x83C5	0x03B7	#GREEK SMALL LETTER ETA
+0x83C6	0x03B8	#GREEK SMALL LETTER THETA
+0x83C7	0x03B9	#GREEK SMALL LETTER IOTA
+0x83C8	0x03BA	#GREEK SMALL LETTER KAPPA
+0x83C9	0x03BB	#GREEK SMALL LETTER LAMDA
+0x83CA	0x03BC	#GREEK SMALL LETTER MU
+0x83CB	0x03BD	#GREEK SMALL LETTER NU
+0x83CC	0x03BE	#GREEK SMALL LETTER XI
+0x83CD	0x03BF	#GREEK SMALL LETTER OMICRON
+0x83CE	0x03C0	#GREEK SMALL LETTER PI
+0x83CF	0x03C1	#GREEK SMALL LETTER RHO
+0x83D0	0x03C3	#GREEK SMALL LETTER SIGMA
+0x83D1	0x03C4	#GREEK SMALL LETTER TAU
+0x83D2	0x03C5	#GREEK SMALL LETTER UPSILON
+0x83D3	0x03C6	#GREEK SMALL LETTER PHI
+0x83D4	0x03C7	#GREEK SMALL LETTER CHI
+0x83D5	0x03C8	#GREEK SMALL LETTER PSI
+0x83D6	0x03C9	#GREEK SMALL LETTER OMEGA
+0x8440	0x0410	#CYRILLIC CAPITAL LETTER A
+0x8441	0x0411	#CYRILLIC CAPITAL LETTER BE
+0x8442	0x0412	#CYRILLIC CAPITAL LETTER VE
+0x8443	0x0413	#CYRILLIC CAPITAL LETTER GHE
+0x8444	0x0414	#CYRILLIC CAPITAL LETTER DE
+0x8445	0x0415	#CYRILLIC CAPITAL LETTER IE
+0x8446	0x0401	#CYRILLIC CAPITAL LETTER IO
+0x8447	0x0416	#CYRILLIC CAPITAL LETTER ZHE
+0x8448	0x0417	#CYRILLIC CAPITAL LETTER ZE
+0x8449	0x0418	#CYRILLIC CAPITAL LETTER I
+0x844A	0x0419	#CYRILLIC CAPITAL LETTER SHORT I
+0x844B	0x041A	#CYRILLIC CAPITAL LETTER KA
+0x844C	0x041B	#CYRILLIC CAPITAL LETTER EL
+0x844D	0x041C	#CYRILLIC CAPITAL LETTER EM
+0x844E	0x041D	#CYRILLIC CAPITAL LETTER EN
+0x844F	0x041E	#CYRILLIC CAPITAL LETTER O
+0x8450	0x041F	#CYRILLIC CAPITAL LETTER PE
+0x8451	0x0420	#CYRILLIC CAPITAL LETTER ER
+0x8452	0x0421	#CYRILLIC CAPITAL LETTER ES
+0x8453	0x0422	#CYRILLIC CAPITAL LETTER TE
+0x8454	0x0423	#CYRILLIC CAPITAL LETTER U
+0x8455	0x0424	#CYRILLIC CAPITAL LETTER EF
+0x8456	0x0425	#CYRILLIC CAPITAL LETTER HA
+0x8457	0x0426	#CYRILLIC CAPITAL LETTER TSE
+0x8458	0x0427	#CYRILLIC CAPITAL LETTER CHE
+0x8459	0x0428	#CYRILLIC CAPITAL LETTER SHA
+0x845A	0x0429	#CYRILLIC CAPITAL LETTER SHCHA
+0x845B	0x042A	#CYRILLIC CAPITAL LETTER HARD SIGN
+0x845C	0x042B	#CYRILLIC CAPITAL LETTER YERU
+0x845D	0x042C	#CYRILLIC CAPITAL LETTER SOFT SIGN
+0x845E	0x042D	#CYRILLIC CAPITAL LETTER E
+0x845F	0x042E	#CYRILLIC CAPITAL LETTER YU
+0x8460	0x042F	#CYRILLIC CAPITAL LETTER YA
+0x8470	0x0430	#CYRILLIC SMALL LETTER A
+0x8471	0x0431	#CYRILLIC SMALL LETTER BE
+0x8472	0x0432	#CYRILLIC SMALL LETTER VE
+0x8473	0x0433	#CYRILLIC SMALL LETTER GHE
+0x8474	0x0434	#CYRILLIC SMALL LETTER DE
+0x8475	0x0435	#CYRILLIC SMALL LETTER IE
+0x8476	0x0451	#CYRILLIC SMALL LETTER IO
+0x8477	0x0436	#CYRILLIC SMALL LETTER ZHE
+0x8478	0x0437	#CYRILLIC SMALL LETTER ZE
+0x8479	0x0438	#CYRILLIC SMALL LETTER I
+0x847A	0x0439	#CYRILLIC SMALL LETTER SHORT I
+0x847B	0x043A	#CYRILLIC SMALL LETTER KA
+0x847C	0x043B	#CYRILLIC SMALL LETTER EL
+0x847D	0x043C	#CYRILLIC SMALL LETTER EM
+0x847E	0x043D	#CYRILLIC SMALL LETTER EN
+0x8480	0x043E	#CYRILLIC SMALL LETTER O
+0x8481	0x043F	#CYRILLIC SMALL LETTER PE
+0x8482	0x0440	#CYRILLIC SMALL LETTER ER
+0x8483	0x0441	#CYRILLIC SMALL LETTER ES
+0x8484	0x0442	#CYRILLIC SMALL LETTER TE
+0x8485	0x0443	#CYRILLIC SMALL LETTER U
+0x8486	0x0444	#CYRILLIC SMALL LETTER EF
+0x8487	0x0445	#CYRILLIC SMALL LETTER HA
+0x8488	0x0446	#CYRILLIC SMALL LETTER TSE
+0x8489	0x0447	#CYRILLIC SMALL LETTER CHE
+0x848A	0x0448	#CYRILLIC SMALL LETTER SHA
+0x848B	0x0449	#CYRILLIC SMALL LETTER SHCHA
+0x848C	0x044A	#CYRILLIC SMALL LETTER HARD SIGN
+0x848D	0x044B	#CYRILLIC SMALL LETTER YERU
+0x848E	0x044C	#CYRILLIC SMALL LETTER SOFT SIGN
+0x848F	0x044D	#CYRILLIC SMALL LETTER E
+0x8490	0x044E	#CYRILLIC SMALL LETTER YU
+0x8491	0x044F	#CYRILLIC SMALL LETTER YA
+0x849F	0x2500	#BOX DRAWINGS LIGHT HORIZONTAL
+0x84A0	0x2502	#BOX DRAWINGS LIGHT VERTICAL
+0x84A1	0x250C	#BOX DRAWINGS LIGHT DOWN AND RIGHT
+0x84A2	0x2510	#BOX DRAWINGS LIGHT DOWN AND LEFT
+0x84A3	0x2518	#BOX DRAWINGS LIGHT UP AND LEFT
+0x84A4	0x2514	#BOX DRAWINGS LIGHT UP AND RIGHT
+0x84A5	0x251C	#BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0x84A6	0x252C	#BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0x84A7	0x2524	#BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0x84A8	0x2534	#BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0x84A9	0x253C	#BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0x84AA	0x2501	#BOX DRAWINGS HEAVY HORIZONTAL
+0x84AB	0x2503	#BOX DRAWINGS HEAVY VERTICAL
+0x84AC	0x250F	#BOX DRAWINGS HEAVY DOWN AND RIGHT
+0x84AD	0x2513	#BOX DRAWINGS HEAVY DOWN AND LEFT
+0x84AE	0x251B	#BOX DRAWINGS HEAVY UP AND LEFT
+0x84AF	0x2517	#BOX DRAWINGS HEAVY UP AND RIGHT
+0x84B0	0x2523	#BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+0x84B1	0x2533	#BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+0x84B2	0x252B	#BOX DRAWINGS HEAVY VERTICAL AND LEFT
+0x84B3	0x253B	#BOX DRAWINGS HEAVY UP AND HORIZONTAL
+0x84B4	0x254B	#BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+0x84B5	0x2520	#BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+0x84B6	0x252F	#BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+0x84B7	0x2528	#BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+0x84B8	0x2537	#BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+0x84B9	0x253F	#BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+0x84BA	0x251D	#BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+0x84BB	0x2530	#BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+0x84BC	0x2525	#BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+0x84BD	0x2538	#BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+0x84BE	0x2542	#BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+0x8740	0x2460	#CIRCLED DIGIT ONE
+0x8741	0x2461	#CIRCLED DIGIT TWO
+0x8742	0x2462	#CIRCLED DIGIT THREE
+0x8743	0x2463	#CIRCLED DIGIT FOUR
+0x8744	0x2464	#CIRCLED DIGIT FIVE
+0x8745	0x2465	#CIRCLED DIGIT SIX
+0x8746	0x2466	#CIRCLED DIGIT SEVEN
+0x8747	0x2467	#CIRCLED DIGIT EIGHT
+0x8748	0x2468	#CIRCLED DIGIT NINE
+0x8749	0x2469	#CIRCLED NUMBER TEN
+0x874A	0x246A	#CIRCLED NUMBER ELEVEN
+0x874B	0x246B	#CIRCLED NUMBER TWELVE
+0x874C	0x246C	#CIRCLED NUMBER THIRTEEN
+0x874D	0x246D	#CIRCLED NUMBER FOURTEEN
+0x874E	0x246E	#CIRCLED NUMBER FIFTEEN
+0x874F	0x246F	#CIRCLED NUMBER SIXTEEN
+0x8750	0x2470	#CIRCLED NUMBER SEVENTEEN
+0x8751	0x2471	#CIRCLED NUMBER EIGHTEEN
+0x8752	0x2472	#CIRCLED NUMBER NINETEEN
+0x8753	0x2473	#CIRCLED NUMBER TWENTY
+0x8754	0x2160	#ROMAN NUMERAL ONE
+0x8755	0x2161	#ROMAN NUMERAL TWO
+0x8756	0x2162	#ROMAN NUMERAL THREE
+0x8757	0x2163	#ROMAN NUMERAL FOUR
+0x8758	0x2164	#ROMAN NUMERAL FIVE
+0x8759	0x2165	#ROMAN NUMERAL SIX
+0x875A	0x2166	#ROMAN NUMERAL SEVEN
+0x875B	0x2167	#ROMAN NUMERAL EIGHT
+0x875C	0x2168	#ROMAN NUMERAL NINE
+0x875D	0x2169	#ROMAN NUMERAL TEN
+0x875F	0x3349	#SQUARE MIRI
+0x8760	0x3314	#SQUARE KIRO
+0x8761	0x3322	#SQUARE SENTI
+0x8762	0x334D	#SQUARE MEETORU
+0x8763	0x3318	#SQUARE GURAMU
+0x8764	0x3327	#SQUARE TON
+0x8765	0x3303	#SQUARE AARU
+0x8766	0x3336	#SQUARE HEKUTAARU
+0x8767	0x3351	#SQUARE RITTORU
+0x8768	0x3357	#SQUARE WATTO
+0x8769	0x330D	#SQUARE KARORII
+0x876A	0x3326	#SQUARE DORU
+0x876B	0x3323	#SQUARE SENTO
+0x876C	0x332B	#SQUARE PAASENTO
+0x876D	0x334A	#SQUARE MIRIBAARU
+0x876E	0x333B	#SQUARE PEEZI
+0x876F	0x339C	#SQUARE MM
+0x8770	0x339D	#SQUARE CM
+0x8771	0x339E	#SQUARE KM
+0x8772	0x338E	#SQUARE MG
+0x8773	0x338F	#SQUARE KG
+0x8774	0x33C4	#SQUARE CC
+0x8775	0x33A1	#SQUARE M SQUARED
+0x877E	0x337B	#SQUARE ERA NAME HEISEI
+0x8780	0x301D	#REVERSED DOUBLE PRIME QUOTATION MARK
+0x8781	0x301F	#LOW DOUBLE PRIME QUOTATION MARK
+0x8782	0x2116	#NUMERO SIGN
+0x8783	0x33CD	#SQUARE KK
+0x8784	0x2121	#TELEPHONE SIGN
+0x8785	0x32A4	#CIRCLED IDEOGRAPH HIGH
+0x8786	0x32A5	#CIRCLED IDEOGRAPH CENTRE
+0x8787	0x32A6	#CIRCLED IDEOGRAPH LOW
+0x8788	0x32A7	#CIRCLED IDEOGRAPH LEFT
+0x8789	0x32A8	#CIRCLED IDEOGRAPH RIGHT
+0x878A	0x3231	#PARENTHESIZED IDEOGRAPH STOCK
+0x878B	0x3232	#PARENTHESIZED IDEOGRAPH HAVE
+0x878C	0x3239	#PARENTHESIZED IDEOGRAPH REPRESENT
+0x878D	0x337E	#SQUARE ERA NAME MEIZI
+0x878E	0x337D	#SQUARE ERA NAME TAISYOU
+0x878F	0x337C	#SQUARE ERA NAME SYOUWA
+0x8790	0x2252	#APPROXIMATELY EQUAL TO OR THE IMAGE OF
+0x8791	0x2261	#IDENTICAL TO
+0x8792	0x222B	#INTEGRAL
+0x8793	0x222E	#CONTOUR INTEGRAL
+0x8794	0x2211	#N-ARY SUMMATION
+0x8795	0x221A	#SQUARE ROOT
+0x8796	0x22A5	#UP TACK
+0x8797	0x2220	#ANGLE
+0x8798	0x221F	#RIGHT ANGLE
+0x8799	0x22BF	#RIGHT TRIANGLE
+0x879A	0x2235	#BECAUSE
+0x879B	0x2229	#INTERSECTION
+0x879C	0x222A	#UNION
+0x889F	0x4E9C	#CJK UNIFIED IDEOGRAPH
+0x88A0	0x5516	#CJK UNIFIED IDEOGRAPH
+0x88A1	0x5A03	#CJK UNIFIED IDEOGRAPH
+0x88A2	0x963F	#CJK UNIFIED IDEOGRAPH
+0x88A3	0x54C0	#CJK UNIFIED IDEOGRAPH
+0x88A4	0x611B	#CJK UNIFIED IDEOGRAPH
+0x88A5	0x6328	#CJK UNIFIED IDEOGRAPH
+0x88A6	0x59F6	#CJK UNIFIED IDEOGRAPH
+0x88A7	0x9022	#CJK UNIFIED IDEOGRAPH
+0x88A8	0x8475	#CJK UNIFIED IDEOGRAPH
+0x88A9	0x831C	#CJK UNIFIED IDEOGRAPH
+0x88AA	0x7A50	#CJK UNIFIED IDEOGRAPH
+0x88AB	0x60AA	#CJK UNIFIED IDEOGRAPH
+0x88AC	0x63E1	#CJK UNIFIED IDEOGRAPH
+0x88AD	0x6E25	#CJK UNIFIED IDEOGRAPH
+0x88AE	0x65ED	#CJK UNIFIED IDEOGRAPH
+0x88AF	0x8466	#CJK UNIFIED IDEOGRAPH
+0x88B0	0x82A6	#CJK UNIFIED IDEOGRAPH
+0x88B1	0x9BF5	#CJK UNIFIED IDEOGRAPH
+0x88B2	0x6893	#CJK UNIFIED IDEOGRAPH
+0x88B3	0x5727	#CJK UNIFIED IDEOGRAPH
+0x88B4	0x65A1	#CJK UNIFIED IDEOGRAPH
+0x88B5	0x6271	#CJK UNIFIED IDEOGRAPH
+0x88B6	0x5B9B	#CJK UNIFIED IDEOGRAPH
+0x88B7	0x59D0	#CJK UNIFIED IDEOGRAPH
+0x88B8	0x867B	#CJK UNIFIED IDEOGRAPH
+0x88B9	0x98F4	#CJK UNIFIED IDEOGRAPH
+0x88BA	0x7D62	#CJK UNIFIED IDEOGRAPH
+0x88BB	0x7DBE	#CJK UNIFIED IDEOGRAPH
+0x88BC	0x9B8E	#CJK UNIFIED IDEOGRAPH
+0x88BD	0x6216	#CJK UNIFIED IDEOGRAPH
+0x88BE	0x7C9F	#CJK UNIFIED IDEOGRAPH
+0x88BF	0x88B7	#CJK UNIFIED IDEOGRAPH
+0x88C0	0x5B89	#CJK UNIFIED IDEOGRAPH
+0x88C1	0x5EB5	#CJK UNIFIED IDEOGRAPH
+0x88C2	0x6309	#CJK UNIFIED IDEOGRAPH
+0x88C3	0x6697	#CJK UNIFIED IDEOGRAPH
+0x88C4	0x6848	#CJK UNIFIED IDEOGRAPH
+0x88C5	0x95C7	#CJK UNIFIED IDEOGRAPH
+0x88C6	0x978D	#CJK UNIFIED IDEOGRAPH
+0x88C7	0x674F	#CJK UNIFIED IDEOGRAPH
+0x88C8	0x4EE5	#CJK UNIFIED IDEOGRAPH
+0x88C9	0x4F0A	#CJK UNIFIED IDEOGRAPH
+0x88CA	0x4F4D	#CJK UNIFIED IDEOGRAPH
+0x88CB	0x4F9D	#CJK UNIFIED IDEOGRAPH
+0x88CC	0x5049	#CJK UNIFIED IDEOGRAPH
+0x88CD	0x56F2	#CJK UNIFIED IDEOGRAPH
+0x88CE	0x5937	#CJK UNIFIED IDEOGRAPH
+0x88CF	0x59D4	#CJK UNIFIED IDEOGRAPH
+0x88D0	0x5A01	#CJK UNIFIED IDEOGRAPH
+0x88D1	0x5C09	#CJK UNIFIED IDEOGRAPH
+0x88D2	0x60DF	#CJK UNIFIED IDEOGRAPH
+0x88D3	0x610F	#CJK UNIFIED IDEOGRAPH
+0x88D4	0x6170	#CJK UNIFIED IDEOGRAPH
+0x88D5	0x6613	#CJK UNIFIED IDEOGRAPH
+0x88D6	0x6905	#CJK UNIFIED IDEOGRAPH
+0x88D7	0x70BA	#CJK UNIFIED IDEOGRAPH
+0x88D8	0x754F	#CJK UNIFIED IDEOGRAPH
+0x88D9	0x7570	#CJK UNIFIED IDEOGRAPH
+0x88DA	0x79FB	#CJK UNIFIED IDEOGRAPH
+0x88DB	0x7DAD	#CJK UNIFIED IDEOGRAPH
+0x88DC	0x7DEF	#CJK UNIFIED IDEOGRAPH
+0x88DD	0x80C3	#CJK UNIFIED IDEOGRAPH
+0x88DE	0x840E	#CJK UNIFIED IDEOGRAPH
+0x88DF	0x8863	#CJK UNIFIED IDEOGRAPH
+0x88E0	0x8B02	#CJK UNIFIED IDEOGRAPH
+0x88E1	0x9055	#CJK UNIFIED IDEOGRAPH
+0x88E2	0x907A	#CJK UNIFIED IDEOGRAPH
+0x88E3	0x533B	#CJK UNIFIED IDEOGRAPH
+0x88E4	0x4E95	#CJK UNIFIED IDEOGRAPH
+0x88E5	0x4EA5	#CJK UNIFIED IDEOGRAPH
+0x88E6	0x57DF	#CJK UNIFIED IDEOGRAPH
+0x88E7	0x80B2	#CJK UNIFIED IDEOGRAPH
+0x88E8	0x90C1	#CJK UNIFIED IDEOGRAPH
+0x88E9	0x78EF	#CJK UNIFIED IDEOGRAPH
+0x88EA	0x4E00	#CJK UNIFIED IDEOGRAPH
+0x88EB	0x58F1	#CJK UNIFIED IDEOGRAPH
+0x88EC	0x6EA2	#CJK UNIFIED IDEOGRAPH
+0x88ED	0x9038	#CJK UNIFIED IDEOGRAPH
+0x88EE	0x7A32	#CJK UNIFIED IDEOGRAPH
+0x88EF	0x8328	#CJK UNIFIED IDEOGRAPH
+0x88F0	0x828B	#CJK UNIFIED IDEOGRAPH
+0x88F1	0x9C2F	#CJK UNIFIED IDEOGRAPH
+0x88F2	0x5141	#CJK UNIFIED IDEOGRAPH
+0x88F3	0x5370	#CJK UNIFIED IDEOGRAPH
+0x88F4	0x54BD	#CJK UNIFIED IDEOGRAPH
+0x88F5	0x54E1	#CJK UNIFIED IDEOGRAPH
+0x88F6	0x56E0	#CJK UNIFIED IDEOGRAPH
+0x88F7	0x59FB	#CJK UNIFIED IDEOGRAPH
+0x88F8	0x5F15	#CJK UNIFIED IDEOGRAPH
+0x88F9	0x98F2	#CJK UNIFIED IDEOGRAPH
+0x88FA	0x6DEB	#CJK UNIFIED IDEOGRAPH
+0x88FB	0x80E4	#CJK UNIFIED IDEOGRAPH
+0x88FC	0x852D	#CJK UNIFIED IDEOGRAPH
+0x8940	0x9662	#CJK UNIFIED IDEOGRAPH
+0x8941	0x9670	#CJK UNIFIED IDEOGRAPH
+0x8942	0x96A0	#CJK UNIFIED IDEOGRAPH
+0x8943	0x97FB	#CJK UNIFIED IDEOGRAPH
+0x8944	0x540B	#CJK UNIFIED IDEOGRAPH
+0x8945	0x53F3	#CJK UNIFIED IDEOGRAPH
+0x8946	0x5B87	#CJK UNIFIED IDEOGRAPH
+0x8947	0x70CF	#CJK UNIFIED IDEOGRAPH
+0x8948	0x7FBD	#CJK UNIFIED IDEOGRAPH
+0x8949	0x8FC2	#CJK UNIFIED IDEOGRAPH
+0x894A	0x96E8	#CJK UNIFIED IDEOGRAPH
+0x894B	0x536F	#CJK UNIFIED IDEOGRAPH
+0x894C	0x9D5C	#CJK UNIFIED IDEOGRAPH
+0x894D	0x7ABA	#CJK UNIFIED IDEOGRAPH
+0x894E	0x4E11	#CJK UNIFIED IDEOGRAPH
+0x894F	0x7893	#CJK UNIFIED IDEOGRAPH
+0x8950	0x81FC	#CJK UNIFIED IDEOGRAPH
+0x8951	0x6E26	#CJK UNIFIED IDEOGRAPH
+0x8952	0x5618	#CJK UNIFIED IDEOGRAPH
+0x8953	0x5504	#CJK UNIFIED IDEOGRAPH
+0x8954	0x6B1D	#CJK UNIFIED IDEOGRAPH
+0x8955	0x851A	#CJK UNIFIED IDEOGRAPH
+0x8956	0x9C3B	#CJK UNIFIED IDEOGRAPH
+0x8957	0x59E5	#CJK UNIFIED IDEOGRAPH
+0x8958	0x53A9	#CJK UNIFIED IDEOGRAPH
+0x8959	0x6D66	#CJK UNIFIED IDEOGRAPH
+0x895A	0x74DC	#CJK UNIFIED IDEOGRAPH
+0x895B	0x958F	#CJK UNIFIED IDEOGRAPH
+0x895C	0x5642	#CJK UNIFIED IDEOGRAPH
+0x895D	0x4E91	#CJK UNIFIED IDEOGRAPH
+0x895E	0x904B	#CJK UNIFIED IDEOGRAPH
+0x895F	0x96F2	#CJK UNIFIED IDEOGRAPH
+0x8960	0x834F	#CJK UNIFIED IDEOGRAPH
+0x8961	0x990C	#CJK UNIFIED IDEOGRAPH
+0x8962	0x53E1	#CJK UNIFIED IDEOGRAPH
+0x8963	0x55B6	#CJK UNIFIED IDEOGRAPH
+0x8964	0x5B30	#CJK UNIFIED IDEOGRAPH
+0x8965	0x5F71	#CJK UNIFIED IDEOGRAPH
+0x8966	0x6620	#CJK UNIFIED IDEOGRAPH
+0x8967	0x66F3	#CJK UNIFIED IDEOGRAPH
+0x8968	0x6804	#CJK UNIFIED IDEOGRAPH
+0x8969	0x6C38	#CJK UNIFIED IDEOGRAPH
+0x896A	0x6CF3	#CJK UNIFIED IDEOGRAPH
+0x896B	0x6D29	#CJK UNIFIED IDEOGRAPH
+0x896C	0x745B	#CJK UNIFIED IDEOGRAPH
+0x896D	0x76C8	#CJK UNIFIED IDEOGRAPH
+0x896E	0x7A4E	#CJK UNIFIED IDEOGRAPH
+0x896F	0x9834	#CJK UNIFIED IDEOGRAPH
+0x8970	0x82F1	#CJK UNIFIED IDEOGRAPH
+0x8971	0x885B	#CJK UNIFIED IDEOGRAPH
+0x8972	0x8A60	#CJK UNIFIED IDEOGRAPH
+0x8973	0x92ED	#CJK UNIFIED IDEOGRAPH
+0x8974	0x6DB2	#CJK UNIFIED IDEOGRAPH
+0x8975	0x75AB	#CJK UNIFIED IDEOGRAPH
+0x8976	0x76CA	#CJK UNIFIED IDEOGRAPH
+0x8977	0x99C5	#CJK UNIFIED IDEOGRAPH
+0x8978	0x60A6	#CJK UNIFIED IDEOGRAPH
+0x8979	0x8B01	#CJK UNIFIED IDEOGRAPH
+0x897A	0x8D8A	#CJK UNIFIED IDEOGRAPH
+0x897B	0x95B2	#CJK UNIFIED IDEOGRAPH
+0x897C	0x698E	#CJK UNIFIED IDEOGRAPH
+0x897D	0x53AD	#CJK UNIFIED IDEOGRAPH
+0x897E	0x5186	#CJK UNIFIED IDEOGRAPH
+0x8980	0x5712	#CJK UNIFIED IDEOGRAPH
+0x8981	0x5830	#CJK UNIFIED IDEOGRAPH
+0x8982	0x5944	#CJK UNIFIED IDEOGRAPH
+0x8983	0x5BB4	#CJK UNIFIED IDEOGRAPH
+0x8984	0x5EF6	#CJK UNIFIED IDEOGRAPH
+0x8985	0x6028	#CJK UNIFIED IDEOGRAPH
+0x8986	0x63A9	#CJK UNIFIED IDEOGRAPH
+0x8987	0x63F4	#CJK UNIFIED IDEOGRAPH
+0x8988	0x6CBF	#CJK UNIFIED IDEOGRAPH
+0x8989	0x6F14	#CJK UNIFIED IDEOGRAPH
+0x898A	0x708E	#CJK UNIFIED IDEOGRAPH
+0x898B	0x7114	#CJK UNIFIED IDEOGRAPH
+0x898C	0x7159	#CJK UNIFIED IDEOGRAPH
+0x898D	0x71D5	#CJK UNIFIED IDEOGRAPH
+0x898E	0x733F	#CJK UNIFIED IDEOGRAPH
+0x898F	0x7E01	#CJK UNIFIED IDEOGRAPH
+0x8990	0x8276	#CJK UNIFIED IDEOGRAPH
+0x8991	0x82D1	#CJK UNIFIED IDEOGRAPH
+0x8992	0x8597	#CJK UNIFIED IDEOGRAPH
+0x8993	0x9060	#CJK UNIFIED IDEOGRAPH
+0x8994	0x925B	#CJK UNIFIED IDEOGRAPH
+0x8995	0x9D1B	#CJK UNIFIED IDEOGRAPH
+0x8996	0x5869	#CJK UNIFIED IDEOGRAPH
+0x8997	0x65BC	#CJK UNIFIED IDEOGRAPH
+0x8998	0x6C5A	#CJK UNIFIED IDEOGRAPH
+0x8999	0x7525	#CJK UNIFIED IDEOGRAPH
+0x899A	0x51F9	#CJK UNIFIED IDEOGRAPH
+0x899B	0x592E	#CJK UNIFIED IDEOGRAPH
+0x899C	0x5965	#CJK UNIFIED IDEOGRAPH
+0x899D	0x5F80	#CJK UNIFIED IDEOGRAPH
+0x899E	0x5FDC	#CJK UNIFIED IDEOGRAPH
+0x899F	0x62BC	#CJK UNIFIED IDEOGRAPH
+0x89A0	0x65FA	#CJK UNIFIED IDEOGRAPH
+0x89A1	0x6A2A	#CJK UNIFIED IDEOGRAPH
+0x89A2	0x6B27	#CJK UNIFIED IDEOGRAPH
+0x89A3	0x6BB4	#CJK UNIFIED IDEOGRAPH
+0x89A4	0x738B	#CJK UNIFIED IDEOGRAPH
+0x89A5	0x7FC1	#CJK UNIFIED IDEOGRAPH
+0x89A6	0x8956	#CJK UNIFIED IDEOGRAPH
+0x89A7	0x9D2C	#CJK UNIFIED IDEOGRAPH
+0x89A8	0x9D0E	#CJK UNIFIED IDEOGRAPH
+0x89A9	0x9EC4	#CJK UNIFIED IDEOGRAPH
+0x89AA	0x5CA1	#CJK UNIFIED IDEOGRAPH
+0x89AB	0x6C96	#CJK UNIFIED IDEOGRAPH
+0x89AC	0x837B	#CJK UNIFIED IDEOGRAPH
+0x89AD	0x5104	#CJK UNIFIED IDEOGRAPH
+0x89AE	0x5C4B	#CJK UNIFIED IDEOGRAPH
+0x89AF	0x61B6	#CJK UNIFIED IDEOGRAPH
+0x89B0	0x81C6	#CJK UNIFIED IDEOGRAPH
+0x89B1	0x6876	#CJK UNIFIED IDEOGRAPH
+0x89B2	0x7261	#CJK UNIFIED IDEOGRAPH
+0x89B3	0x4E59	#CJK UNIFIED IDEOGRAPH
+0x89B4	0x4FFA	#CJK UNIFIED IDEOGRAPH
+0x89B5	0x5378	#CJK UNIFIED IDEOGRAPH
+0x89B6	0x6069	#CJK UNIFIED IDEOGRAPH
+0x89B7	0x6E29	#CJK UNIFIED IDEOGRAPH
+0x89B8	0x7A4F	#CJK UNIFIED IDEOGRAPH
+0x89B9	0x97F3	#CJK UNIFIED IDEOGRAPH
+0x89BA	0x4E0B	#CJK UNIFIED IDEOGRAPH
+0x89BB	0x5316	#CJK UNIFIED IDEOGRAPH
+0x89BC	0x4EEE	#CJK UNIFIED IDEOGRAPH
+0x89BD	0x4F55	#CJK UNIFIED IDEOGRAPH
+0x89BE	0x4F3D	#CJK UNIFIED IDEOGRAPH
+0x89BF	0x4FA1	#CJK UNIFIED IDEOGRAPH
+0x89C0	0x4F73	#CJK UNIFIED IDEOGRAPH
+0x89C1	0x52A0	#CJK UNIFIED IDEOGRAPH
+0x89C2	0x53EF	#CJK UNIFIED IDEOGRAPH
+0x89C3	0x5609	#CJK UNIFIED IDEOGRAPH
+0x89C4	0x590F	#CJK UNIFIED IDEOGRAPH
+0x89C5	0x5AC1	#CJK UNIFIED IDEOGRAPH
+0x89C6	0x5BB6	#CJK UNIFIED IDEOGRAPH
+0x89C7	0x5BE1	#CJK UNIFIED IDEOGRAPH
+0x89C8	0x79D1	#CJK UNIFIED IDEOGRAPH
+0x89C9	0x6687	#CJK UNIFIED IDEOGRAPH
+0x89CA	0x679C	#CJK UNIFIED IDEOGRAPH
+0x89CB	0x67B6	#CJK UNIFIED IDEOGRAPH
+0x89CC	0x6B4C	#CJK UNIFIED IDEOGRAPH
+0x89CD	0x6CB3	#CJK UNIFIED IDEOGRAPH
+0x89CE	0x706B	#CJK UNIFIED IDEOGRAPH
+0x89CF	0x73C2	#CJK UNIFIED IDEOGRAPH
+0x89D0	0x798D	#CJK UNIFIED IDEOGRAPH
+0x89D1	0x79BE	#CJK UNIFIED IDEOGRAPH
+0x89D2	0x7A3C	#CJK UNIFIED IDEOGRAPH
+0x89D3	0x7B87	#CJK UNIFIED IDEOGRAPH
+0x89D4	0x82B1	#CJK UNIFIED IDEOGRAPH
+0x89D5	0x82DB	#CJK UNIFIED IDEOGRAPH
+0x89D6	0x8304	#CJK UNIFIED IDEOGRAPH
+0x89D7	0x8377	#CJK UNIFIED IDEOGRAPH
+0x89D8	0x83EF	#CJK UNIFIED IDEOGRAPH
+0x89D9	0x83D3	#CJK UNIFIED IDEOGRAPH
+0x89DA	0x8766	#CJK UNIFIED IDEOGRAPH
+0x89DB	0x8AB2	#CJK UNIFIED IDEOGRAPH
+0x89DC	0x5629	#CJK UNIFIED IDEOGRAPH
+0x89DD	0x8CA8	#CJK UNIFIED IDEOGRAPH
+0x89DE	0x8FE6	#CJK UNIFIED IDEOGRAPH
+0x89DF	0x904E	#CJK UNIFIED IDEOGRAPH
+0x89E0	0x971E	#CJK UNIFIED IDEOGRAPH
+0x89E1	0x868A	#CJK UNIFIED IDEOGRAPH
+0x89E2	0x4FC4	#CJK UNIFIED IDEOGRAPH
+0x89E3	0x5CE8	#CJK UNIFIED IDEOGRAPH
+0x89E4	0x6211	#CJK UNIFIED IDEOGRAPH
+0x89E5	0x7259	#CJK UNIFIED IDEOGRAPH
+0x89E6	0x753B	#CJK UNIFIED IDEOGRAPH
+0x89E7	0x81E5	#CJK UNIFIED IDEOGRAPH
+0x89E8	0x82BD	#CJK UNIFIED IDEOGRAPH
+0x89E9	0x86FE	#CJK UNIFIED IDEOGRAPH
+0x89EA	0x8CC0	#CJK UNIFIED IDEOGRAPH
+0x89EB	0x96C5	#CJK UNIFIED IDEOGRAPH
+0x89EC	0x9913	#CJK UNIFIED IDEOGRAPH
+0x89ED	0x99D5	#CJK UNIFIED IDEOGRAPH
+0x89EE	0x4ECB	#CJK UNIFIED IDEOGRAPH
+0x89EF	0x4F1A	#CJK UNIFIED IDEOGRAPH
+0x89F0	0x89E3	#CJK UNIFIED IDEOGRAPH
+0x89F1	0x56DE	#CJK UNIFIED IDEOGRAPH
+0x89F2	0x584A	#CJK UNIFIED IDEOGRAPH
+0x89F3	0x58CA	#CJK UNIFIED IDEOGRAPH
+0x89F4	0x5EFB	#CJK UNIFIED IDEOGRAPH
+0x89F5	0x5FEB	#CJK UNIFIED IDEOGRAPH
+0x89F6	0x602A	#CJK UNIFIED IDEOGRAPH
+0x89F7	0x6094	#CJK UNIFIED IDEOGRAPH
+0x89F8	0x6062	#CJK UNIFIED IDEOGRAPH
+0x89F9	0x61D0	#CJK UNIFIED IDEOGRAPH
+0x89FA	0x6212	#CJK UNIFIED IDEOGRAPH
+0x89FB	0x62D0	#CJK UNIFIED IDEOGRAPH
+0x89FC	0x6539	#CJK UNIFIED IDEOGRAPH
+0x8A40	0x9B41	#CJK UNIFIED IDEOGRAPH
+0x8A41	0x6666	#CJK UNIFIED IDEOGRAPH
+0x8A42	0x68B0	#CJK UNIFIED IDEOGRAPH
+0x8A43	0x6D77	#CJK UNIFIED IDEOGRAPH
+0x8A44	0x7070	#CJK UNIFIED IDEOGRAPH
+0x8A45	0x754C	#CJK UNIFIED IDEOGRAPH
+0x8A46	0x7686	#CJK UNIFIED IDEOGRAPH
+0x8A47	0x7D75	#CJK UNIFIED IDEOGRAPH
+0x8A48	0x82A5	#CJK UNIFIED IDEOGRAPH
+0x8A49	0x87F9	#CJK UNIFIED IDEOGRAPH
+0x8A4A	0x958B	#CJK UNIFIED IDEOGRAPH
+0x8A4B	0x968E	#CJK UNIFIED IDEOGRAPH
+0x8A4C	0x8C9D	#CJK UNIFIED IDEOGRAPH
+0x8A4D	0x51F1	#CJK UNIFIED IDEOGRAPH
+0x8A4E	0x52BE	#CJK UNIFIED IDEOGRAPH
+0x8A4F	0x5916	#CJK UNIFIED IDEOGRAPH
+0x8A50	0x54B3	#CJK UNIFIED IDEOGRAPH
+0x8A51	0x5BB3	#CJK UNIFIED IDEOGRAPH
+0x8A52	0x5D16	#CJK UNIFIED IDEOGRAPH
+0x8A53	0x6168	#CJK UNIFIED IDEOGRAPH
+0x8A54	0x6982	#CJK UNIFIED IDEOGRAPH
+0x8A55	0x6DAF	#CJK UNIFIED IDEOGRAPH
+0x8A56	0x788D	#CJK UNIFIED IDEOGRAPH
+0x8A57	0x84CB	#CJK UNIFIED IDEOGRAPH
+0x8A58	0x8857	#CJK UNIFIED IDEOGRAPH
+0x8A59	0x8A72	#CJK UNIFIED IDEOGRAPH
+0x8A5A	0x93A7	#CJK UNIFIED IDEOGRAPH
+0x8A5B	0x9AB8	#CJK UNIFIED IDEOGRAPH
+0x8A5C	0x6D6C	#CJK UNIFIED IDEOGRAPH
+0x8A5D	0x99A8	#CJK UNIFIED IDEOGRAPH
+0x8A5E	0x86D9	#CJK UNIFIED IDEOGRAPH
+0x8A5F	0x57A3	#CJK UNIFIED IDEOGRAPH
+0x8A60	0x67FF	#CJK UNIFIED IDEOGRAPH
+0x8A61	0x86CE	#CJK UNIFIED IDEOGRAPH
+0x8A62	0x920E	#CJK UNIFIED IDEOGRAPH
+0x8A63	0x5283	#CJK UNIFIED IDEOGRAPH
+0x8A64	0x5687	#CJK UNIFIED IDEOGRAPH
+0x8A65	0x5404	#CJK UNIFIED IDEOGRAPH
+0x8A66	0x5ED3	#CJK UNIFIED IDEOGRAPH
+0x8A67	0x62E1	#CJK UNIFIED IDEOGRAPH
+0x8A68	0x64B9	#CJK UNIFIED IDEOGRAPH
+0x8A69	0x683C	#CJK UNIFIED IDEOGRAPH
+0x8A6A	0x6838	#CJK UNIFIED IDEOGRAPH
+0x8A6B	0x6BBB	#CJK UNIFIED IDEOGRAPH
+0x8A6C	0x7372	#CJK UNIFIED IDEOGRAPH
+0x8A6D	0x78BA	#CJK UNIFIED IDEOGRAPH
+0x8A6E	0x7A6B	#CJK UNIFIED IDEOGRAPH
+0x8A6F	0x899A	#CJK UNIFIED IDEOGRAPH
+0x8A70	0x89D2	#CJK UNIFIED IDEOGRAPH
+0x8A71	0x8D6B	#CJK UNIFIED IDEOGRAPH
+0x8A72	0x8F03	#CJK UNIFIED IDEOGRAPH
+0x8A73	0x90ED	#CJK UNIFIED IDEOGRAPH
+0x8A74	0x95A3	#CJK UNIFIED IDEOGRAPH
+0x8A75	0x9694	#CJK UNIFIED IDEOGRAPH
+0x8A76	0x9769	#CJK UNIFIED IDEOGRAPH
+0x8A77	0x5B66	#CJK UNIFIED IDEOGRAPH
+0x8A78	0x5CB3	#CJK UNIFIED IDEOGRAPH
+0x8A79	0x697D	#CJK UNIFIED IDEOGRAPH
+0x8A7A	0x984D	#CJK UNIFIED IDEOGRAPH
+0x8A7B	0x984E	#CJK UNIFIED IDEOGRAPH
+0x8A7C	0x639B	#CJK UNIFIED IDEOGRAPH
+0x8A7D	0x7B20	#CJK UNIFIED IDEOGRAPH
+0x8A7E	0x6A2B	#CJK UNIFIED IDEOGRAPH
+0x8A80	0x6A7F	#CJK UNIFIED IDEOGRAPH
+0x8A81	0x68B6	#CJK UNIFIED IDEOGRAPH
+0x8A82	0x9C0D	#CJK UNIFIED IDEOGRAPH
+0x8A83	0x6F5F	#CJK UNIFIED IDEOGRAPH
+0x8A84	0x5272	#CJK UNIFIED IDEOGRAPH
+0x8A85	0x559D	#CJK UNIFIED IDEOGRAPH
+0x8A86	0x6070	#CJK UNIFIED IDEOGRAPH
+0x8A87	0x62EC	#CJK UNIFIED IDEOGRAPH
+0x8A88	0x6D3B	#CJK UNIFIED IDEOGRAPH
+0x8A89	0x6E07	#CJK UNIFIED IDEOGRAPH
+0x8A8A	0x6ED1	#CJK UNIFIED IDEOGRAPH
+0x8A8B	0x845B	#CJK UNIFIED IDEOGRAPH
+0x8A8C	0x8910	#CJK UNIFIED IDEOGRAPH
+0x8A8D	0x8F44	#CJK UNIFIED IDEOGRAPH
+0x8A8E	0x4E14	#CJK UNIFIED IDEOGRAPH
+0x8A8F	0x9C39	#CJK UNIFIED IDEOGRAPH
+0x8A90	0x53F6	#CJK UNIFIED IDEOGRAPH
+0x8A91	0x691B	#CJK UNIFIED IDEOGRAPH
+0x8A92	0x6A3A	#CJK UNIFIED IDEOGRAPH
+0x8A93	0x9784	#CJK UNIFIED IDEOGRAPH
+0x8A94	0x682A	#CJK UNIFIED IDEOGRAPH
+0x8A95	0x515C	#CJK UNIFIED IDEOGRAPH
+0x8A96	0x7AC3	#CJK UNIFIED IDEOGRAPH
+0x8A97	0x84B2	#CJK UNIFIED IDEOGRAPH
+0x8A98	0x91DC	#CJK UNIFIED IDEOGRAPH
+0x8A99	0x938C	#CJK UNIFIED IDEOGRAPH
+0x8A9A	0x565B	#CJK UNIFIED IDEOGRAPH
+0x8A9B	0x9D28	#CJK UNIFIED IDEOGRAPH
+0x8A9C	0x6822	#CJK UNIFIED IDEOGRAPH
+0x8A9D	0x8305	#CJK UNIFIED IDEOGRAPH
+0x8A9E	0x8431	#CJK UNIFIED IDEOGRAPH
+0x8A9F	0x7CA5	#CJK UNIFIED IDEOGRAPH
+0x8AA0	0x5208	#CJK UNIFIED IDEOGRAPH
+0x8AA1	0x82C5	#CJK UNIFIED IDEOGRAPH
+0x8AA2	0x74E6	#CJK UNIFIED IDEOGRAPH
+0x8AA3	0x4E7E	#CJK UNIFIED IDEOGRAPH
+0x8AA4	0x4F83	#CJK UNIFIED IDEOGRAPH
+0x8AA5	0x51A0	#CJK UNIFIED IDEOGRAPH
+0x8AA6	0x5BD2	#CJK UNIFIED IDEOGRAPH
+0x8AA7	0x520A	#CJK UNIFIED IDEOGRAPH
+0x8AA8	0x52D8	#CJK UNIFIED IDEOGRAPH
+0x8AA9	0x52E7	#CJK UNIFIED IDEOGRAPH
+0x8AAA	0x5DFB	#CJK UNIFIED IDEOGRAPH
+0x8AAB	0x559A	#CJK UNIFIED IDEOGRAPH
+0x8AAC	0x582A	#CJK UNIFIED IDEOGRAPH
+0x8AAD	0x59E6	#CJK UNIFIED IDEOGRAPH
+0x8AAE	0x5B8C	#CJK UNIFIED IDEOGRAPH
+0x8AAF	0x5B98	#CJK UNIFIED IDEOGRAPH
+0x8AB0	0x5BDB	#CJK UNIFIED IDEOGRAPH
+0x8AB1	0x5E72	#CJK UNIFIED IDEOGRAPH
+0x8AB2	0x5E79	#CJK UNIFIED IDEOGRAPH
+0x8AB3	0x60A3	#CJK UNIFIED IDEOGRAPH
+0x8AB4	0x611F	#CJK UNIFIED IDEOGRAPH
+0x8AB5	0x6163	#CJK UNIFIED IDEOGRAPH
+0x8AB6	0x61BE	#CJK UNIFIED IDEOGRAPH
+0x8AB7	0x63DB	#CJK UNIFIED IDEOGRAPH
+0x8AB8	0x6562	#CJK UNIFIED IDEOGRAPH
+0x8AB9	0x67D1	#CJK UNIFIED IDEOGRAPH
+0x8ABA	0x6853	#CJK UNIFIED IDEOGRAPH
+0x8ABB	0x68FA	#CJK UNIFIED IDEOGRAPH
+0x8ABC	0x6B3E	#CJK UNIFIED IDEOGRAPH
+0x8ABD	0x6B53	#CJK UNIFIED IDEOGRAPH
+0x8ABE	0x6C57	#CJK UNIFIED IDEOGRAPH
+0x8ABF	0x6F22	#CJK UNIFIED IDEOGRAPH
+0x8AC0	0x6F97	#CJK UNIFIED IDEOGRAPH
+0x8AC1	0x6F45	#CJK UNIFIED IDEOGRAPH
+0x8AC2	0x74B0	#CJK UNIFIED IDEOGRAPH
+0x8AC3	0x7518	#CJK UNIFIED IDEOGRAPH
+0x8AC4	0x76E3	#CJK UNIFIED IDEOGRAPH
+0x8AC5	0x770B	#CJK UNIFIED IDEOGRAPH
+0x8AC6	0x7AFF	#CJK UNIFIED IDEOGRAPH
+0x8AC7	0x7BA1	#CJK UNIFIED IDEOGRAPH
+0x8AC8	0x7C21	#CJK UNIFIED IDEOGRAPH
+0x8AC9	0x7DE9	#CJK UNIFIED IDEOGRAPH
+0x8ACA	0x7F36	#CJK UNIFIED IDEOGRAPH
+0x8ACB	0x7FF0	#CJK UNIFIED IDEOGRAPH
+0x8ACC	0x809D	#CJK UNIFIED IDEOGRAPH
+0x8ACD	0x8266	#CJK UNIFIED IDEOGRAPH
+0x8ACE	0x839E	#CJK UNIFIED IDEOGRAPH
+0x8ACF	0x89B3	#CJK UNIFIED IDEOGRAPH
+0x8AD0	0x8ACC	#CJK UNIFIED IDEOGRAPH
+0x8AD1	0x8CAB	#CJK UNIFIED IDEOGRAPH
+0x8AD2	0x9084	#CJK UNIFIED IDEOGRAPH
+0x8AD3	0x9451	#CJK UNIFIED IDEOGRAPH
+0x8AD4	0x9593	#CJK UNIFIED IDEOGRAPH
+0x8AD5	0x9591	#CJK UNIFIED IDEOGRAPH
+0x8AD6	0x95A2	#CJK UNIFIED IDEOGRAPH
+0x8AD7	0x9665	#CJK UNIFIED IDEOGRAPH
+0x8AD8	0x97D3	#CJK UNIFIED IDEOGRAPH
+0x8AD9	0x9928	#CJK UNIFIED IDEOGRAPH
+0x8ADA	0x8218	#CJK UNIFIED IDEOGRAPH
+0x8ADB	0x4E38	#CJK UNIFIED IDEOGRAPH
+0x8ADC	0x542B	#CJK UNIFIED IDEOGRAPH
+0x8ADD	0x5CB8	#CJK UNIFIED IDEOGRAPH
+0x8ADE	0x5DCC	#CJK UNIFIED IDEOGRAPH
+0x8ADF	0x73A9	#CJK UNIFIED IDEOGRAPH
+0x8AE0	0x764C	#CJK UNIFIED IDEOGRAPH
+0x8AE1	0x773C	#CJK UNIFIED IDEOGRAPH
+0x8AE2	0x5CA9	#CJK UNIFIED IDEOGRAPH
+0x8AE3	0x7FEB	#CJK UNIFIED IDEOGRAPH
+0x8AE4	0x8D0B	#CJK UNIFIED IDEOGRAPH
+0x8AE5	0x96C1	#CJK UNIFIED IDEOGRAPH
+0x8AE6	0x9811	#CJK UNIFIED IDEOGRAPH
+0x8AE7	0x9854	#CJK UNIFIED IDEOGRAPH
+0x8AE8	0x9858	#CJK UNIFIED IDEOGRAPH
+0x8AE9	0x4F01	#CJK UNIFIED IDEOGRAPH
+0x8AEA	0x4F0E	#CJK UNIFIED IDEOGRAPH
+0x8AEB	0x5371	#CJK UNIFIED IDEOGRAPH
+0x8AEC	0x559C	#CJK UNIFIED IDEOGRAPH
+0x8AED	0x5668	#CJK UNIFIED IDEOGRAPH
+0x8AEE	0x57FA	#CJK UNIFIED IDEOGRAPH
+0x8AEF	0x5947	#CJK UNIFIED IDEOGRAPH
+0x8AF0	0x5B09	#CJK UNIFIED IDEOGRAPH
+0x8AF1	0x5BC4	#CJK UNIFIED IDEOGRAPH
+0x8AF2	0x5C90	#CJK UNIFIED IDEOGRAPH
+0x8AF3	0x5E0C	#CJK UNIFIED IDEOGRAPH
+0x8AF4	0x5E7E	#CJK UNIFIED IDEOGRAPH
+0x8AF5	0x5FCC	#CJK UNIFIED IDEOGRAPH
+0x8AF6	0x63EE	#CJK UNIFIED IDEOGRAPH
+0x8AF7	0x673A	#CJK UNIFIED IDEOGRAPH
+0x8AF8	0x65D7	#CJK UNIFIED IDEOGRAPH
+0x8AF9	0x65E2	#CJK UNIFIED IDEOGRAPH
+0x8AFA	0x671F	#CJK UNIFIED IDEOGRAPH
+0x8AFB	0x68CB	#CJK UNIFIED IDEOGRAPH
+0x8AFC	0x68C4	#CJK UNIFIED IDEOGRAPH
+0x8B40	0x6A5F	#CJK UNIFIED IDEOGRAPH
+0x8B41	0x5E30	#CJK UNIFIED IDEOGRAPH
+0x8B42	0x6BC5	#CJK UNIFIED IDEOGRAPH
+0x8B43	0x6C17	#CJK UNIFIED IDEOGRAPH
+0x8B44	0x6C7D	#CJK UNIFIED IDEOGRAPH
+0x8B45	0x757F	#CJK UNIFIED IDEOGRAPH
+0x8B46	0x7948	#CJK UNIFIED IDEOGRAPH
+0x8B47	0x5B63	#CJK UNIFIED IDEOGRAPH
+0x8B48	0x7A00	#CJK UNIFIED IDEOGRAPH
+0x8B49	0x7D00	#CJK UNIFIED IDEOGRAPH
+0x8B4A	0x5FBD	#CJK UNIFIED IDEOGRAPH
+0x8B4B	0x898F	#CJK UNIFIED IDEOGRAPH
+0x8B4C	0x8A18	#CJK UNIFIED IDEOGRAPH
+0x8B4D	0x8CB4	#CJK UNIFIED IDEOGRAPH
+0x8B4E	0x8D77	#CJK UNIFIED IDEOGRAPH
+0x8B4F	0x8ECC	#CJK UNIFIED IDEOGRAPH
+0x8B50	0x8F1D	#CJK UNIFIED IDEOGRAPH
+0x8B51	0x98E2	#CJK UNIFIED IDEOGRAPH
+0x8B52	0x9A0E	#CJK UNIFIED IDEOGRAPH
+0x8B53	0x9B3C	#CJK UNIFIED IDEOGRAPH
+0x8B54	0x4E80	#CJK UNIFIED IDEOGRAPH
+0x8B55	0x507D	#CJK UNIFIED IDEOGRAPH
+0x8B56	0x5100	#CJK UNIFIED IDEOGRAPH
+0x8B57	0x5993	#CJK UNIFIED IDEOGRAPH
+0x8B58	0x5B9C	#CJK UNIFIED IDEOGRAPH
+0x8B59	0x622F	#CJK UNIFIED IDEOGRAPH
+0x8B5A	0x6280	#CJK UNIFIED IDEOGRAPH
+0x8B5B	0x64EC	#CJK UNIFIED IDEOGRAPH
+0x8B5C	0x6B3A	#CJK UNIFIED IDEOGRAPH
+0x8B5D	0x72A0	#CJK UNIFIED IDEOGRAPH
+0x8B5E	0x7591	#CJK UNIFIED IDEOGRAPH
+0x8B5F	0x7947	#CJK UNIFIED IDEOGRAPH
+0x8B60	0x7FA9	#CJK UNIFIED IDEOGRAPH
+0x8B61	0x87FB	#CJK UNIFIED IDEOGRAPH
+0x8B62	0x8ABC	#CJK UNIFIED IDEOGRAPH
+0x8B63	0x8B70	#CJK UNIFIED IDEOGRAPH
+0x8B64	0x63AC	#CJK UNIFIED IDEOGRAPH
+0x8B65	0x83CA	#CJK UNIFIED IDEOGRAPH
+0x8B66	0x97A0	#CJK UNIFIED IDEOGRAPH
+0x8B67	0x5409	#CJK UNIFIED IDEOGRAPH
+0x8B68	0x5403	#CJK UNIFIED IDEOGRAPH
+0x8B69	0x55AB	#CJK UNIFIED IDEOGRAPH
+0x8B6A	0x6854	#CJK UNIFIED IDEOGRAPH
+0x8B6B	0x6A58	#CJK UNIFIED IDEOGRAPH
+0x8B6C	0x8A70	#CJK UNIFIED IDEOGRAPH
+0x8B6D	0x7827	#CJK UNIFIED IDEOGRAPH
+0x8B6E	0x6775	#CJK UNIFIED IDEOGRAPH
+0x8B6F	0x9ECD	#CJK UNIFIED IDEOGRAPH
+0x8B70	0x5374	#CJK UNIFIED IDEOGRAPH
+0x8B71	0x5BA2	#CJK UNIFIED IDEOGRAPH
+0x8B72	0x811A	#CJK UNIFIED IDEOGRAPH
+0x8B73	0x8650	#CJK UNIFIED IDEOGRAPH
+0x8B74	0x9006	#CJK UNIFIED IDEOGRAPH
+0x8B75	0x4E18	#CJK UNIFIED IDEOGRAPH
+0x8B76	0x4E45	#CJK UNIFIED IDEOGRAPH
+0x8B77	0x4EC7	#CJK UNIFIED IDEOGRAPH
+0x8B78	0x4F11	#CJK UNIFIED IDEOGRAPH
+0x8B79	0x53CA	#CJK UNIFIED IDEOGRAPH
+0x8B7A	0x5438	#CJK UNIFIED IDEOGRAPH
+0x8B7B	0x5BAE	#CJK UNIFIED IDEOGRAPH
+0x8B7C	0x5F13	#CJK UNIFIED IDEOGRAPH
+0x8B7D	0x6025	#CJK UNIFIED IDEOGRAPH
+0x8B7E	0x6551	#CJK UNIFIED IDEOGRAPH
+0x8B80	0x673D	#CJK UNIFIED IDEOGRAPH
+0x8B81	0x6C42	#CJK UNIFIED IDEOGRAPH
+0x8B82	0x6C72	#CJK UNIFIED IDEOGRAPH
+0x8B83	0x6CE3	#CJK UNIFIED IDEOGRAPH
+0x8B84	0x7078	#CJK UNIFIED IDEOGRAPH
+0x8B85	0x7403	#CJK UNIFIED IDEOGRAPH
+0x8B86	0x7A76	#CJK UNIFIED IDEOGRAPH
+0x8B87	0x7AAE	#CJK UNIFIED IDEOGRAPH
+0x8B88	0x7B08	#CJK UNIFIED IDEOGRAPH
+0x8B89	0x7D1A	#CJK UNIFIED IDEOGRAPH
+0x8B8A	0x7CFE	#CJK UNIFIED IDEOGRAPH
+0x8B8B	0x7D66	#CJK UNIFIED IDEOGRAPH
+0x8B8C	0x65E7	#CJK UNIFIED IDEOGRAPH
+0x8B8D	0x725B	#CJK UNIFIED IDEOGRAPH
+0x8B8E	0x53BB	#CJK UNIFIED IDEOGRAPH
+0x8B8F	0x5C45	#CJK UNIFIED IDEOGRAPH
+0x8B90	0x5DE8	#CJK UNIFIED IDEOGRAPH
+0x8B91	0x62D2	#CJK UNIFIED IDEOGRAPH
+0x8B92	0x62E0	#CJK UNIFIED IDEOGRAPH
+0x8B93	0x6319	#CJK UNIFIED IDEOGRAPH
+0x8B94	0x6E20	#CJK UNIFIED IDEOGRAPH
+0x8B95	0x865A	#CJK UNIFIED IDEOGRAPH
+0x8B96	0x8A31	#CJK UNIFIED IDEOGRAPH
+0x8B97	0x8DDD	#CJK UNIFIED IDEOGRAPH
+0x8B98	0x92F8	#CJK UNIFIED IDEOGRAPH
+0x8B99	0x6F01	#CJK UNIFIED IDEOGRAPH
+0x8B9A	0x79A6	#CJK UNIFIED IDEOGRAPH
+0x8B9B	0x9B5A	#CJK UNIFIED IDEOGRAPH
+0x8B9C	0x4EA8	#CJK UNIFIED IDEOGRAPH
+0x8B9D	0x4EAB	#CJK UNIFIED IDEOGRAPH
+0x8B9E	0x4EAC	#CJK UNIFIED IDEOGRAPH
+0x8B9F	0x4F9B	#CJK UNIFIED IDEOGRAPH
+0x8BA0	0x4FA0	#CJK UNIFIED IDEOGRAPH
+0x8BA1	0x50D1	#CJK UNIFIED IDEOGRAPH
+0x8BA2	0x5147	#CJK UNIFIED IDEOGRAPH
+0x8BA3	0x7AF6	#CJK UNIFIED IDEOGRAPH
+0x8BA4	0x5171	#CJK UNIFIED IDEOGRAPH
+0x8BA5	0x51F6	#CJK UNIFIED IDEOGRAPH
+0x8BA6	0x5354	#CJK UNIFIED IDEOGRAPH
+0x8BA7	0x5321	#CJK UNIFIED IDEOGRAPH
+0x8BA8	0x537F	#CJK UNIFIED IDEOGRAPH
+0x8BA9	0x53EB	#CJK UNIFIED IDEOGRAPH
+0x8BAA	0x55AC	#CJK UNIFIED IDEOGRAPH
+0x8BAB	0x5883	#CJK UNIFIED IDEOGRAPH
+0x8BAC	0x5CE1	#CJK UNIFIED IDEOGRAPH
+0x8BAD	0x5F37	#CJK UNIFIED IDEOGRAPH
+0x8BAE	0x5F4A	#CJK UNIFIED IDEOGRAPH
+0x8BAF	0x602F	#CJK UNIFIED IDEOGRAPH
+0x8BB0	0x6050	#CJK UNIFIED IDEOGRAPH
+0x8BB1	0x606D	#CJK UNIFIED IDEOGRAPH
+0x8BB2	0x631F	#CJK UNIFIED IDEOGRAPH
+0x8BB3	0x6559	#CJK UNIFIED IDEOGRAPH
+0x8BB4	0x6A4B	#CJK UNIFIED IDEOGRAPH
+0x8BB5	0x6CC1	#CJK UNIFIED IDEOGRAPH
+0x8BB6	0x72C2	#CJK UNIFIED IDEOGRAPH
+0x8BB7	0x72ED	#CJK UNIFIED IDEOGRAPH
+0x8BB8	0x77EF	#CJK UNIFIED IDEOGRAPH
+0x8BB9	0x80F8	#CJK UNIFIED IDEOGRAPH
+0x8BBA	0x8105	#CJK UNIFIED IDEOGRAPH
+0x8BBB	0x8208	#CJK UNIFIED IDEOGRAPH
+0x8BBC	0x854E	#CJK UNIFIED IDEOGRAPH
+0x8BBD	0x90F7	#CJK UNIFIED IDEOGRAPH
+0x8BBE	0x93E1	#CJK UNIFIED IDEOGRAPH
+0x8BBF	0x97FF	#CJK UNIFIED IDEOGRAPH
+0x8BC0	0x9957	#CJK UNIFIED IDEOGRAPH
+0x8BC1	0x9A5A	#CJK UNIFIED IDEOGRAPH
+0x8BC2	0x4EF0	#CJK UNIFIED IDEOGRAPH
+0x8BC3	0x51DD	#CJK UNIFIED IDEOGRAPH
+0x8BC4	0x5C2D	#CJK UNIFIED IDEOGRAPH
+0x8BC5	0x6681	#CJK UNIFIED IDEOGRAPH
+0x8BC6	0x696D	#CJK UNIFIED IDEOGRAPH
+0x8BC7	0x5C40	#CJK UNIFIED IDEOGRAPH
+0x8BC8	0x66F2	#CJK UNIFIED IDEOGRAPH
+0x8BC9	0x6975	#CJK UNIFIED IDEOGRAPH
+0x8BCA	0x7389	#CJK UNIFIED IDEOGRAPH
+0x8BCB	0x6850	#CJK UNIFIED IDEOGRAPH
+0x8BCC	0x7C81	#CJK UNIFIED IDEOGRAPH
+0x8BCD	0x50C5	#CJK UNIFIED IDEOGRAPH
+0x8BCE	0x52E4	#CJK UNIFIED IDEOGRAPH
+0x8BCF	0x5747	#CJK UNIFIED IDEOGRAPH
+0x8BD0	0x5DFE	#CJK UNIFIED IDEOGRAPH
+0x8BD1	0x9326	#CJK UNIFIED IDEOGRAPH
+0x8BD2	0x65A4	#CJK UNIFIED IDEOGRAPH
+0x8BD3	0x6B23	#CJK UNIFIED IDEOGRAPH
+0x8BD4	0x6B3D	#CJK UNIFIED IDEOGRAPH
+0x8BD5	0x7434	#CJK UNIFIED IDEOGRAPH
+0x8BD6	0x7981	#CJK UNIFIED IDEOGRAPH
+0x8BD7	0x79BD	#CJK UNIFIED IDEOGRAPH
+0x8BD8	0x7B4B	#CJK UNIFIED IDEOGRAPH
+0x8BD9	0x7DCA	#CJK UNIFIED IDEOGRAPH
+0x8BDA	0x82B9	#CJK UNIFIED IDEOGRAPH
+0x8BDB	0x83CC	#CJK UNIFIED IDEOGRAPH
+0x8BDC	0x887F	#CJK UNIFIED IDEOGRAPH
+0x8BDD	0x895F	#CJK UNIFIED IDEOGRAPH
+0x8BDE	0x8B39	#CJK UNIFIED IDEOGRAPH
+0x8BDF	0x8FD1	#CJK UNIFIED IDEOGRAPH
+0x8BE0	0x91D1	#CJK UNIFIED IDEOGRAPH
+0x8BE1	0x541F	#CJK UNIFIED IDEOGRAPH
+0x8BE2	0x9280	#CJK UNIFIED IDEOGRAPH
+0x8BE3	0x4E5D	#CJK UNIFIED IDEOGRAPH
+0x8BE4	0x5036	#CJK UNIFIED IDEOGRAPH
+0x8BE5	0x53E5	#CJK UNIFIED IDEOGRAPH
+0x8BE6	0x533A	#CJK UNIFIED IDEOGRAPH
+0x8BE7	0x72D7	#CJK UNIFIED IDEOGRAPH
+0x8BE8	0x7396	#CJK UNIFIED IDEOGRAPH
+0x8BE9	0x77E9	#CJK UNIFIED IDEOGRAPH
+0x8BEA	0x82E6	#CJK UNIFIED IDEOGRAPH
+0x8BEB	0x8EAF	#CJK UNIFIED IDEOGRAPH
+0x8BEC	0x99C6	#CJK UNIFIED IDEOGRAPH
+0x8BED	0x99C8	#CJK UNIFIED IDEOGRAPH
+0x8BEE	0x99D2	#CJK UNIFIED IDEOGRAPH
+0x8BEF	0x5177	#CJK UNIFIED IDEOGRAPH
+0x8BF0	0x611A	#CJK UNIFIED IDEOGRAPH
+0x8BF1	0x865E	#CJK UNIFIED IDEOGRAPH
+0x8BF2	0x55B0	#CJK UNIFIED IDEOGRAPH
+0x8BF3	0x7A7A	#CJK UNIFIED IDEOGRAPH
+0x8BF4	0x5076	#CJK UNIFIED IDEOGRAPH
+0x8BF5	0x5BD3	#CJK UNIFIED IDEOGRAPH
+0x8BF6	0x9047	#CJK UNIFIED IDEOGRAPH
+0x8BF7	0x9685	#CJK UNIFIED IDEOGRAPH
+0x8BF8	0x4E32	#CJK UNIFIED IDEOGRAPH
+0x8BF9	0x6ADB	#CJK UNIFIED IDEOGRAPH
+0x8BFA	0x91E7	#CJK UNIFIED IDEOGRAPH
+0x8BFB	0x5C51	#CJK UNIFIED IDEOGRAPH
+0x8BFC	0x5C48	#CJK UNIFIED IDEOGRAPH
+0x8C40	0x6398	#CJK UNIFIED IDEOGRAPH
+0x8C41	0x7A9F	#CJK UNIFIED IDEOGRAPH
+0x8C42	0x6C93	#CJK UNIFIED IDEOGRAPH
+0x8C43	0x9774	#CJK UNIFIED IDEOGRAPH
+0x8C44	0x8F61	#CJK UNIFIED IDEOGRAPH
+0x8C45	0x7AAA	#CJK UNIFIED IDEOGRAPH
+0x8C46	0x718A	#CJK UNIFIED IDEOGRAPH
+0x8C47	0x9688	#CJK UNIFIED IDEOGRAPH
+0x8C48	0x7C82	#CJK UNIFIED IDEOGRAPH
+0x8C49	0x6817	#CJK UNIFIED IDEOGRAPH
+0x8C4A	0x7E70	#CJK UNIFIED IDEOGRAPH
+0x8C4B	0x6851	#CJK UNIFIED IDEOGRAPH
+0x8C4C	0x936C	#CJK UNIFIED IDEOGRAPH
+0x8C4D	0x52F2	#CJK UNIFIED IDEOGRAPH
+0x8C4E	0x541B	#CJK UNIFIED IDEOGRAPH
+0x8C4F	0x85AB	#CJK UNIFIED IDEOGRAPH
+0x8C50	0x8A13	#CJK UNIFIED IDEOGRAPH
+0x8C51	0x7FA4	#CJK UNIFIED IDEOGRAPH
+0x8C52	0x8ECD	#CJK UNIFIED IDEOGRAPH
+0x8C53	0x90E1	#CJK UNIFIED IDEOGRAPH
+0x8C54	0x5366	#CJK UNIFIED IDEOGRAPH
+0x8C55	0x8888	#CJK UNIFIED IDEOGRAPH
+0x8C56	0x7941	#CJK UNIFIED IDEOGRAPH
+0x8C57	0x4FC2	#CJK UNIFIED IDEOGRAPH
+0x8C58	0x50BE	#CJK UNIFIED IDEOGRAPH
+0x8C59	0x5211	#CJK UNIFIED IDEOGRAPH
+0x8C5A	0x5144	#CJK UNIFIED IDEOGRAPH
+0x8C5B	0x5553	#CJK UNIFIED IDEOGRAPH
+0x8C5C	0x572D	#CJK UNIFIED IDEOGRAPH
+0x8C5D	0x73EA	#CJK UNIFIED IDEOGRAPH
+0x8C5E	0x578B	#CJK UNIFIED IDEOGRAPH
+0x8C5F	0x5951	#CJK UNIFIED IDEOGRAPH
+0x8C60	0x5F62	#CJK UNIFIED IDEOGRAPH
+0x8C61	0x5F84	#CJK UNIFIED IDEOGRAPH
+0x8C62	0x6075	#CJK UNIFIED IDEOGRAPH
+0x8C63	0x6176	#CJK UNIFIED IDEOGRAPH
+0x8C64	0x6167	#CJK UNIFIED IDEOGRAPH
+0x8C65	0x61A9	#CJK UNIFIED IDEOGRAPH
+0x8C66	0x63B2	#CJK UNIFIED IDEOGRAPH
+0x8C67	0x643A	#CJK UNIFIED IDEOGRAPH
+0x8C68	0x656C	#CJK UNIFIED IDEOGRAPH
+0x8C69	0x666F	#CJK UNIFIED IDEOGRAPH
+0x8C6A	0x6842	#CJK UNIFIED IDEOGRAPH
+0x8C6B	0x6E13	#CJK UNIFIED IDEOGRAPH
+0x8C6C	0x7566	#CJK UNIFIED IDEOGRAPH
+0x8C6D	0x7A3D	#CJK UNIFIED IDEOGRAPH
+0x8C6E	0x7CFB	#CJK UNIFIED IDEOGRAPH
+0x8C6F	0x7D4C	#CJK UNIFIED IDEOGRAPH
+0x8C70	0x7D99	#CJK UNIFIED IDEOGRAPH
+0x8C71	0x7E4B	#CJK UNIFIED IDEOGRAPH
+0x8C72	0x7F6B	#CJK UNIFIED IDEOGRAPH
+0x8C73	0x830E	#CJK UNIFIED IDEOGRAPH
+0x8C74	0x834A	#CJK UNIFIED IDEOGRAPH
+0x8C75	0x86CD	#CJK UNIFIED IDEOGRAPH
+0x8C76	0x8A08	#CJK UNIFIED IDEOGRAPH
+0x8C77	0x8A63	#CJK UNIFIED IDEOGRAPH
+0x8C78	0x8B66	#CJK UNIFIED IDEOGRAPH
+0x8C79	0x8EFD	#CJK UNIFIED IDEOGRAPH
+0x8C7A	0x981A	#CJK UNIFIED IDEOGRAPH
+0x8C7B	0x9D8F	#CJK UNIFIED IDEOGRAPH
+0x8C7C	0x82B8	#CJK UNIFIED IDEOGRAPH
+0x8C7D	0x8FCE	#CJK UNIFIED IDEOGRAPH
+0x8C7E	0x9BE8	#CJK UNIFIED IDEOGRAPH
+0x8C80	0x5287	#CJK UNIFIED IDEOGRAPH
+0x8C81	0x621F	#CJK UNIFIED IDEOGRAPH
+0x8C82	0x6483	#CJK UNIFIED IDEOGRAPH
+0x8C83	0x6FC0	#CJK UNIFIED IDEOGRAPH
+0x8C84	0x9699	#CJK UNIFIED IDEOGRAPH
+0x8C85	0x6841	#CJK UNIFIED IDEOGRAPH
+0x8C86	0x5091	#CJK UNIFIED IDEOGRAPH
+0x8C87	0x6B20	#CJK UNIFIED IDEOGRAPH
+0x8C88	0x6C7A	#CJK UNIFIED IDEOGRAPH
+0x8C89	0x6F54	#CJK UNIFIED IDEOGRAPH
+0x8C8A	0x7A74	#CJK UNIFIED IDEOGRAPH
+0x8C8B	0x7D50	#CJK UNIFIED IDEOGRAPH
+0x8C8C	0x8840	#CJK UNIFIED IDEOGRAPH
+0x8C8D	0x8A23	#CJK UNIFIED IDEOGRAPH
+0x8C8E	0x6708	#CJK UNIFIED IDEOGRAPH
+0x8C8F	0x4EF6	#CJK UNIFIED IDEOGRAPH
+0x8C90	0x5039	#CJK UNIFIED IDEOGRAPH
+0x8C91	0x5026	#CJK UNIFIED IDEOGRAPH
+0x8C92	0x5065	#CJK UNIFIED IDEOGRAPH
+0x8C93	0x517C	#CJK UNIFIED IDEOGRAPH
+0x8C94	0x5238	#CJK UNIFIED IDEOGRAPH
+0x8C95	0x5263	#CJK UNIFIED IDEOGRAPH
+0x8C96	0x55A7	#CJK UNIFIED IDEOGRAPH
+0x8C97	0x570F	#CJK UNIFIED IDEOGRAPH
+0x8C98	0x5805	#CJK UNIFIED IDEOGRAPH
+0x8C99	0x5ACC	#CJK UNIFIED IDEOGRAPH
+0x8C9A	0x5EFA	#CJK UNIFIED IDEOGRAPH
+0x8C9B	0x61B2	#CJK UNIFIED IDEOGRAPH
+0x8C9C	0x61F8	#CJK UNIFIED IDEOGRAPH
+0x8C9D	0x62F3	#CJK UNIFIED IDEOGRAPH
+0x8C9E	0x6372	#CJK UNIFIED IDEOGRAPH
+0x8C9F	0x691C	#CJK UNIFIED IDEOGRAPH
+0x8CA0	0x6A29	#CJK UNIFIED IDEOGRAPH
+0x8CA1	0x727D	#CJK UNIFIED IDEOGRAPH
+0x8CA2	0x72AC	#CJK UNIFIED IDEOGRAPH
+0x8CA3	0x732E	#CJK UNIFIED IDEOGRAPH
+0x8CA4	0x7814	#CJK UNIFIED IDEOGRAPH
+0x8CA5	0x786F	#CJK UNIFIED IDEOGRAPH
+0x8CA6	0x7D79	#CJK UNIFIED IDEOGRAPH
+0x8CA7	0x770C	#CJK UNIFIED IDEOGRAPH
+0x8CA8	0x80A9	#CJK UNIFIED IDEOGRAPH
+0x8CA9	0x898B	#CJK UNIFIED IDEOGRAPH
+0x8CAA	0x8B19	#CJK UNIFIED IDEOGRAPH
+0x8CAB	0x8CE2	#CJK UNIFIED IDEOGRAPH
+0x8CAC	0x8ED2	#CJK UNIFIED IDEOGRAPH
+0x8CAD	0x9063	#CJK UNIFIED IDEOGRAPH
+0x8CAE	0x9375	#CJK UNIFIED IDEOGRAPH
+0x8CAF	0x967A	#CJK UNIFIED IDEOGRAPH
+0x8CB0	0x9855	#CJK UNIFIED IDEOGRAPH
+0x8CB1	0x9A13	#CJK UNIFIED IDEOGRAPH
+0x8CB2	0x9E78	#CJK UNIFIED IDEOGRAPH
+0x8CB3	0x5143	#CJK UNIFIED IDEOGRAPH
+0x8CB4	0x539F	#CJK UNIFIED IDEOGRAPH
+0x8CB5	0x53B3	#CJK UNIFIED IDEOGRAPH
+0x8CB6	0x5E7B	#CJK UNIFIED IDEOGRAPH
+0x8CB7	0x5F26	#CJK UNIFIED IDEOGRAPH
+0x8CB8	0x6E1B	#CJK UNIFIED IDEOGRAPH
+0x8CB9	0x6E90	#CJK UNIFIED IDEOGRAPH
+0x8CBA	0x7384	#CJK UNIFIED IDEOGRAPH
+0x8CBB	0x73FE	#CJK UNIFIED IDEOGRAPH
+0x8CBC	0x7D43	#CJK UNIFIED IDEOGRAPH
+0x8CBD	0x8237	#CJK UNIFIED IDEOGRAPH
+0x8CBE	0x8A00	#CJK UNIFIED IDEOGRAPH
+0x8CBF	0x8AFA	#CJK UNIFIED IDEOGRAPH
+0x8CC0	0x9650	#CJK UNIFIED IDEOGRAPH
+0x8CC1	0x4E4E	#CJK UNIFIED IDEOGRAPH
+0x8CC2	0x500B	#CJK UNIFIED IDEOGRAPH
+0x8CC3	0x53E4	#CJK UNIFIED IDEOGRAPH
+0x8CC4	0x547C	#CJK UNIFIED IDEOGRAPH
+0x8CC5	0x56FA	#CJK UNIFIED IDEOGRAPH
+0x8CC6	0x59D1	#CJK UNIFIED IDEOGRAPH
+0x8CC7	0x5B64	#CJK UNIFIED IDEOGRAPH
+0x8CC8	0x5DF1	#CJK UNIFIED IDEOGRAPH
+0x8CC9	0x5EAB	#CJK UNIFIED IDEOGRAPH
+0x8CCA	0x5F27	#CJK UNIFIED IDEOGRAPH
+0x8CCB	0x6238	#CJK UNIFIED IDEOGRAPH
+0x8CCC	0x6545	#CJK UNIFIED IDEOGRAPH
+0x8CCD	0x67AF	#CJK UNIFIED IDEOGRAPH
+0x8CCE	0x6E56	#CJK UNIFIED IDEOGRAPH
+0x8CCF	0x72D0	#CJK UNIFIED IDEOGRAPH
+0x8CD0	0x7CCA	#CJK UNIFIED IDEOGRAPH
+0x8CD1	0x88B4	#CJK UNIFIED IDEOGRAPH
+0x8CD2	0x80A1	#CJK UNIFIED IDEOGRAPH
+0x8CD3	0x80E1	#CJK UNIFIED IDEOGRAPH
+0x8CD4	0x83F0	#CJK UNIFIED IDEOGRAPH
+0x8CD5	0x864E	#CJK UNIFIED IDEOGRAPH
+0x8CD6	0x8A87	#CJK UNIFIED IDEOGRAPH
+0x8CD7	0x8DE8	#CJK UNIFIED IDEOGRAPH
+0x8CD8	0x9237	#CJK UNIFIED IDEOGRAPH
+0x8CD9	0x96C7	#CJK UNIFIED IDEOGRAPH
+0x8CDA	0x9867	#CJK UNIFIED IDEOGRAPH
+0x8CDB	0x9F13	#CJK UNIFIED IDEOGRAPH
+0x8CDC	0x4E94	#CJK UNIFIED IDEOGRAPH
+0x8CDD	0x4E92	#CJK UNIFIED IDEOGRAPH
+0x8CDE	0x4F0D	#CJK UNIFIED IDEOGRAPH
+0x8CDF	0x5348	#CJK UNIFIED IDEOGRAPH
+0x8CE0	0x5449	#CJK UNIFIED IDEOGRAPH
+0x8CE1	0x543E	#CJK UNIFIED IDEOGRAPH
+0x8CE2	0x5A2F	#CJK UNIFIED IDEOGRAPH
+0x8CE3	0x5F8C	#CJK UNIFIED IDEOGRAPH
+0x8CE4	0x5FA1	#CJK UNIFIED IDEOGRAPH
+0x8CE5	0x609F	#CJK UNIFIED IDEOGRAPH
+0x8CE6	0x68A7	#CJK UNIFIED IDEOGRAPH
+0x8CE7	0x6A8E	#CJK UNIFIED IDEOGRAPH
+0x8CE8	0x745A	#CJK UNIFIED IDEOGRAPH
+0x8CE9	0x7881	#CJK UNIFIED IDEOGRAPH
+0x8CEA	0x8A9E	#CJK UNIFIED IDEOGRAPH
+0x8CEB	0x8AA4	#CJK UNIFIED IDEOGRAPH
+0x8CEC	0x8B77	#CJK UNIFIED IDEOGRAPH
+0x8CED	0x9190	#CJK UNIFIED IDEOGRAPH
+0x8CEE	0x4E5E	#CJK UNIFIED IDEOGRAPH
+0x8CEF	0x9BC9	#CJK UNIFIED IDEOGRAPH
+0x8CF0	0x4EA4	#CJK UNIFIED IDEOGRAPH
+0x8CF1	0x4F7C	#CJK UNIFIED IDEOGRAPH
+0x8CF2	0x4FAF	#CJK UNIFIED IDEOGRAPH
+0x8CF3	0x5019	#CJK UNIFIED IDEOGRAPH
+0x8CF4	0x5016	#CJK UNIFIED IDEOGRAPH
+0x8CF5	0x5149	#CJK UNIFIED IDEOGRAPH
+0x8CF6	0x516C	#CJK UNIFIED IDEOGRAPH
+0x8CF7	0x529F	#CJK UNIFIED IDEOGRAPH
+0x8CF8	0x52B9	#CJK UNIFIED IDEOGRAPH
+0x8CF9	0x52FE	#CJK UNIFIED IDEOGRAPH
+0x8CFA	0x539A	#CJK UNIFIED IDEOGRAPH
+0x8CFB	0x53E3	#CJK UNIFIED IDEOGRAPH
+0x8CFC	0x5411	#CJK UNIFIED IDEOGRAPH
+0x8D40	0x540E	#CJK UNIFIED IDEOGRAPH
+0x8D41	0x5589	#CJK UNIFIED IDEOGRAPH
+0x8D42	0x5751	#CJK UNIFIED IDEOGRAPH
+0x8D43	0x57A2	#CJK UNIFIED IDEOGRAPH
+0x8D44	0x597D	#CJK UNIFIED IDEOGRAPH
+0x8D45	0x5B54	#CJK UNIFIED IDEOGRAPH
+0x8D46	0x5B5D	#CJK UNIFIED IDEOGRAPH
+0x8D47	0x5B8F	#CJK UNIFIED IDEOGRAPH
+0x8D48	0x5DE5	#CJK UNIFIED IDEOGRAPH
+0x8D49	0x5DE7	#CJK UNIFIED IDEOGRAPH
+0x8D4A	0x5DF7	#CJK UNIFIED IDEOGRAPH
+0x8D4B	0x5E78	#CJK UNIFIED IDEOGRAPH
+0x8D4C	0x5E83	#CJK UNIFIED IDEOGRAPH
+0x8D4D	0x5E9A	#CJK UNIFIED IDEOGRAPH
+0x8D4E	0x5EB7	#CJK UNIFIED IDEOGRAPH
+0x8D4F	0x5F18	#CJK UNIFIED IDEOGRAPH
+0x8D50	0x6052	#CJK UNIFIED IDEOGRAPH
+0x8D51	0x614C	#CJK UNIFIED IDEOGRAPH
+0x8D52	0x6297	#CJK UNIFIED IDEOGRAPH
+0x8D53	0x62D8	#CJK UNIFIED IDEOGRAPH
+0x8D54	0x63A7	#CJK UNIFIED IDEOGRAPH
+0x8D55	0x653B	#CJK UNIFIED IDEOGRAPH
+0x8D56	0x6602	#CJK UNIFIED IDEOGRAPH
+0x8D57	0x6643	#CJK UNIFIED IDEOGRAPH
+0x8D58	0x66F4	#CJK UNIFIED IDEOGRAPH
+0x8D59	0x676D	#CJK UNIFIED IDEOGRAPH
+0x8D5A	0x6821	#CJK UNIFIED IDEOGRAPH
+0x8D5B	0x6897	#CJK UNIFIED IDEOGRAPH
+0x8D5C	0x69CB	#CJK UNIFIED IDEOGRAPH
+0x8D5D	0x6C5F	#CJK UNIFIED IDEOGRAPH
+0x8D5E	0x6D2A	#CJK UNIFIED IDEOGRAPH
+0x8D5F	0x6D69	#CJK UNIFIED IDEOGRAPH
+0x8D60	0x6E2F	#CJK UNIFIED IDEOGRAPH
+0x8D61	0x6E9D	#CJK UNIFIED IDEOGRAPH
+0x8D62	0x7532	#CJK UNIFIED IDEOGRAPH
+0x8D63	0x7687	#CJK UNIFIED IDEOGRAPH
+0x8D64	0x786C	#CJK UNIFIED IDEOGRAPH
+0x8D65	0x7A3F	#CJK UNIFIED IDEOGRAPH
+0x8D66	0x7CE0	#CJK UNIFIED IDEOGRAPH
+0x8D67	0x7D05	#CJK UNIFIED IDEOGRAPH
+0x8D68	0x7D18	#CJK UNIFIED IDEOGRAPH
+0x8D69	0x7D5E	#CJK UNIFIED IDEOGRAPH
+0x8D6A	0x7DB1	#CJK UNIFIED IDEOGRAPH
+0x8D6B	0x8015	#CJK UNIFIED IDEOGRAPH
+0x8D6C	0x8003	#CJK UNIFIED IDEOGRAPH
+0x8D6D	0x80AF	#CJK UNIFIED IDEOGRAPH
+0x8D6E	0x80B1	#CJK UNIFIED IDEOGRAPH
+0x8D6F	0x8154	#CJK UNIFIED IDEOGRAPH
+0x8D70	0x818F	#CJK UNIFIED IDEOGRAPH
+0x8D71	0x822A	#CJK UNIFIED IDEOGRAPH
+0x8D72	0x8352	#CJK UNIFIED IDEOGRAPH
+0x8D73	0x884C	#CJK UNIFIED IDEOGRAPH
+0x8D74	0x8861	#CJK UNIFIED IDEOGRAPH
+0x8D75	0x8B1B	#CJK UNIFIED IDEOGRAPH
+0x8D76	0x8CA2	#CJK UNIFIED IDEOGRAPH
+0x8D77	0x8CFC	#CJK UNIFIED IDEOGRAPH
+0x8D78	0x90CA	#CJK UNIFIED IDEOGRAPH
+0x8D79	0x9175	#CJK UNIFIED IDEOGRAPH
+0x8D7A	0x9271	#CJK UNIFIED IDEOGRAPH
+0x8D7B	0x783F	#CJK UNIFIED IDEOGRAPH
+0x8D7C	0x92FC	#CJK UNIFIED IDEOGRAPH
+0x8D7D	0x95A4	#CJK UNIFIED IDEOGRAPH
+0x8D7E	0x964D	#CJK UNIFIED IDEOGRAPH
+0x8D80	0x9805	#CJK UNIFIED IDEOGRAPH
+0x8D81	0x9999	#CJK UNIFIED IDEOGRAPH
+0x8D82	0x9AD8	#CJK UNIFIED IDEOGRAPH
+0x8D83	0x9D3B	#CJK UNIFIED IDEOGRAPH
+0x8D84	0x525B	#CJK UNIFIED IDEOGRAPH
+0x8D85	0x52AB	#CJK UNIFIED IDEOGRAPH
+0x8D86	0x53F7	#CJK UNIFIED IDEOGRAPH
+0x8D87	0x5408	#CJK UNIFIED IDEOGRAPH
+0x8D88	0x58D5	#CJK UNIFIED IDEOGRAPH
+0x8D89	0x62F7	#CJK UNIFIED IDEOGRAPH
+0x8D8A	0x6FE0	#CJK UNIFIED IDEOGRAPH
+0x8D8B	0x8C6A	#CJK UNIFIED IDEOGRAPH
+0x8D8C	0x8F5F	#CJK UNIFIED IDEOGRAPH
+0x8D8D	0x9EB9	#CJK UNIFIED IDEOGRAPH
+0x8D8E	0x514B	#CJK UNIFIED IDEOGRAPH
+0x8D8F	0x523B	#CJK UNIFIED IDEOGRAPH
+0x8D90	0x544A	#CJK UNIFIED IDEOGRAPH
+0x8D91	0x56FD	#CJK UNIFIED IDEOGRAPH
+0x8D92	0x7A40	#CJK UNIFIED IDEOGRAPH
+0x8D93	0x9177	#CJK UNIFIED IDEOGRAPH
+0x8D94	0x9D60	#CJK UNIFIED IDEOGRAPH
+0x8D95	0x9ED2	#CJK UNIFIED IDEOGRAPH
+0x8D96	0x7344	#CJK UNIFIED IDEOGRAPH
+0x8D97	0x6F09	#CJK UNIFIED IDEOGRAPH
+0x8D98	0x8170	#CJK UNIFIED IDEOGRAPH
+0x8D99	0x7511	#CJK UNIFIED IDEOGRAPH
+0x8D9A	0x5FFD	#CJK UNIFIED IDEOGRAPH
+0x8D9B	0x60DA	#CJK UNIFIED IDEOGRAPH
+0x8D9C	0x9AA8	#CJK UNIFIED IDEOGRAPH
+0x8D9D	0x72DB	#CJK UNIFIED IDEOGRAPH
+0x8D9E	0x8FBC	#CJK UNIFIED IDEOGRAPH
+0x8D9F	0x6B64	#CJK UNIFIED IDEOGRAPH
+0x8DA0	0x9803	#CJK UNIFIED IDEOGRAPH
+0x8DA1	0x4ECA	#CJK UNIFIED IDEOGRAPH
+0x8DA2	0x56F0	#CJK UNIFIED IDEOGRAPH
+0x8DA3	0x5764	#CJK UNIFIED IDEOGRAPH
+0x8DA4	0x58BE	#CJK UNIFIED IDEOGRAPH
+0x8DA5	0x5A5A	#CJK UNIFIED IDEOGRAPH
+0x8DA6	0x6068	#CJK UNIFIED IDEOGRAPH
+0x8DA7	0x61C7	#CJK UNIFIED IDEOGRAPH
+0x8DA8	0x660F	#CJK UNIFIED IDEOGRAPH
+0x8DA9	0x6606	#CJK UNIFIED IDEOGRAPH
+0x8DAA	0x6839	#CJK UNIFIED IDEOGRAPH
+0x8DAB	0x68B1	#CJK UNIFIED IDEOGRAPH
+0x8DAC	0x6DF7	#CJK UNIFIED IDEOGRAPH
+0x8DAD	0x75D5	#CJK UNIFIED IDEOGRAPH
+0x8DAE	0x7D3A	#CJK UNIFIED IDEOGRAPH
+0x8DAF	0x826E	#CJK UNIFIED IDEOGRAPH
+0x8DB0	0x9B42	#CJK UNIFIED IDEOGRAPH
+0x8DB1	0x4E9B	#CJK UNIFIED IDEOGRAPH
+0x8DB2	0x4F50	#CJK UNIFIED IDEOGRAPH
+0x8DB3	0x53C9	#CJK UNIFIED IDEOGRAPH
+0x8DB4	0x5506	#CJK UNIFIED IDEOGRAPH
+0x8DB5	0x5D6F	#CJK UNIFIED IDEOGRAPH
+0x8DB6	0x5DE6	#CJK UNIFIED IDEOGRAPH
+0x8DB7	0x5DEE	#CJK UNIFIED IDEOGRAPH
+0x8DB8	0x67FB	#CJK UNIFIED IDEOGRAPH
+0x8DB9	0x6C99	#CJK UNIFIED IDEOGRAPH
+0x8DBA	0x7473	#CJK UNIFIED IDEOGRAPH
+0x8DBB	0x7802	#CJK UNIFIED IDEOGRAPH
+0x8DBC	0x8A50	#CJK UNIFIED IDEOGRAPH
+0x8DBD	0x9396	#CJK UNIFIED IDEOGRAPH
+0x8DBE	0x88DF	#CJK UNIFIED IDEOGRAPH
+0x8DBF	0x5750	#CJK UNIFIED IDEOGRAPH
+0x8DC0	0x5EA7	#CJK UNIFIED IDEOGRAPH
+0x8DC1	0x632B	#CJK UNIFIED IDEOGRAPH
+0x8DC2	0x50B5	#CJK UNIFIED IDEOGRAPH
+0x8DC3	0x50AC	#CJK UNIFIED IDEOGRAPH
+0x8DC4	0x518D	#CJK UNIFIED IDEOGRAPH
+0x8DC5	0x6700	#CJK UNIFIED IDEOGRAPH
+0x8DC6	0x54C9	#CJK UNIFIED IDEOGRAPH
+0x8DC7	0x585E	#CJK UNIFIED IDEOGRAPH
+0x8DC8	0x59BB	#CJK UNIFIED IDEOGRAPH
+0x8DC9	0x5BB0	#CJK UNIFIED IDEOGRAPH
+0x8DCA	0x5F69	#CJK UNIFIED IDEOGRAPH
+0x8DCB	0x624D	#CJK UNIFIED IDEOGRAPH
+0x8DCC	0x63A1	#CJK UNIFIED IDEOGRAPH
+0x8DCD	0x683D	#CJK UNIFIED IDEOGRAPH
+0x8DCE	0x6B73	#CJK UNIFIED IDEOGRAPH
+0x8DCF	0x6E08	#CJK UNIFIED IDEOGRAPH
+0x8DD0	0x707D	#CJK UNIFIED IDEOGRAPH
+0x8DD1	0x91C7	#CJK UNIFIED IDEOGRAPH
+0x8DD2	0x7280	#CJK UNIFIED IDEOGRAPH
+0x8DD3	0x7815	#CJK UNIFIED IDEOGRAPH
+0x8DD4	0x7826	#CJK UNIFIED IDEOGRAPH
+0x8DD5	0x796D	#CJK UNIFIED IDEOGRAPH
+0x8DD6	0x658E	#CJK UNIFIED IDEOGRAPH
+0x8DD7	0x7D30	#CJK UNIFIED IDEOGRAPH
+0x8DD8	0x83DC	#CJK UNIFIED IDEOGRAPH
+0x8DD9	0x88C1	#CJK UNIFIED IDEOGRAPH
+0x8DDA	0x8F09	#CJK UNIFIED IDEOGRAPH
+0x8DDB	0x969B	#CJK UNIFIED IDEOGRAPH
+0x8DDC	0x5264	#CJK UNIFIED IDEOGRAPH
+0x8DDD	0x5728	#CJK UNIFIED IDEOGRAPH
+0x8DDE	0x6750	#CJK UNIFIED IDEOGRAPH
+0x8DDF	0x7F6A	#CJK UNIFIED IDEOGRAPH
+0x8DE0	0x8CA1	#CJK UNIFIED IDEOGRAPH
+0x8DE1	0x51B4	#CJK UNIFIED IDEOGRAPH
+0x8DE2	0x5742	#CJK UNIFIED IDEOGRAPH
+0x8DE3	0x962A	#CJK UNIFIED IDEOGRAPH
+0x8DE4	0x583A	#CJK UNIFIED IDEOGRAPH
+0x8DE5	0x698A	#CJK UNIFIED IDEOGRAPH
+0x8DE6	0x80B4	#CJK UNIFIED IDEOGRAPH
+0x8DE7	0x54B2	#CJK UNIFIED IDEOGRAPH
+0x8DE8	0x5D0E	#CJK UNIFIED IDEOGRAPH
+0x8DE9	0x57FC	#CJK UNIFIED IDEOGRAPH
+0x8DEA	0x7895	#CJK UNIFIED IDEOGRAPH
+0x8DEB	0x9DFA	#CJK UNIFIED IDEOGRAPH
+0x8DEC	0x4F5C	#CJK UNIFIED IDEOGRAPH
+0x8DED	0x524A	#CJK UNIFIED IDEOGRAPH
+0x8DEE	0x548B	#CJK UNIFIED IDEOGRAPH
+0x8DEF	0x643E	#CJK UNIFIED IDEOGRAPH
+0x8DF0	0x6628	#CJK UNIFIED IDEOGRAPH
+0x8DF1	0x6714	#CJK UNIFIED IDEOGRAPH
+0x8DF2	0x67F5	#CJK UNIFIED IDEOGRAPH
+0x8DF3	0x7A84	#CJK UNIFIED IDEOGRAPH
+0x8DF4	0x7B56	#CJK UNIFIED IDEOGRAPH
+0x8DF5	0x7D22	#CJK UNIFIED IDEOGRAPH
+0x8DF6	0x932F	#CJK UNIFIED IDEOGRAPH
+0x8DF7	0x685C	#CJK UNIFIED IDEOGRAPH
+0x8DF8	0x9BAD	#CJK UNIFIED IDEOGRAPH
+0x8DF9	0x7B39	#CJK UNIFIED IDEOGRAPH
+0x8DFA	0x5319	#CJK UNIFIED IDEOGRAPH
+0x8DFB	0x518A	#CJK UNIFIED IDEOGRAPH
+0x8DFC	0x5237	#CJK UNIFIED IDEOGRAPH
+0x8E40	0x5BDF	#CJK UNIFIED IDEOGRAPH
+0x8E41	0x62F6	#CJK UNIFIED IDEOGRAPH
+0x8E42	0x64AE	#CJK UNIFIED IDEOGRAPH
+0x8E43	0x64E6	#CJK UNIFIED IDEOGRAPH
+0x8E44	0x672D	#CJK UNIFIED IDEOGRAPH
+0x8E45	0x6BBA	#CJK UNIFIED IDEOGRAPH
+0x8E46	0x85A9	#CJK UNIFIED IDEOGRAPH
+0x8E47	0x96D1	#CJK UNIFIED IDEOGRAPH
+0x8E48	0x7690	#CJK UNIFIED IDEOGRAPH
+0x8E49	0x9BD6	#CJK UNIFIED IDEOGRAPH
+0x8E4A	0x634C	#CJK UNIFIED IDEOGRAPH
+0x8E4B	0x9306	#CJK UNIFIED IDEOGRAPH
+0x8E4C	0x9BAB	#CJK UNIFIED IDEOGRAPH
+0x8E4D	0x76BF	#CJK UNIFIED IDEOGRAPH
+0x8E4E	0x6652	#CJK UNIFIED IDEOGRAPH
+0x8E4F	0x4E09	#CJK UNIFIED IDEOGRAPH
+0x8E50	0x5098	#CJK UNIFIED IDEOGRAPH
+0x8E51	0x53C2	#CJK UNIFIED IDEOGRAPH
+0x8E52	0x5C71	#CJK UNIFIED IDEOGRAPH
+0x8E53	0x60E8	#CJK UNIFIED IDEOGRAPH
+0x8E54	0x6492	#CJK UNIFIED IDEOGRAPH
+0x8E55	0x6563	#CJK UNIFIED IDEOGRAPH
+0x8E56	0x685F	#CJK UNIFIED IDEOGRAPH
+0x8E57	0x71E6	#CJK UNIFIED IDEOGRAPH
+0x8E58	0x73CA	#CJK UNIFIED IDEOGRAPH
+0x8E59	0x7523	#CJK UNIFIED IDEOGRAPH
+0x8E5A	0x7B97	#CJK UNIFIED IDEOGRAPH
+0x8E5B	0x7E82	#CJK UNIFIED IDEOGRAPH
+0x8E5C	0x8695	#CJK UNIFIED IDEOGRAPH
+0x8E5D	0x8B83	#CJK UNIFIED IDEOGRAPH
+0x8E5E	0x8CDB	#CJK UNIFIED IDEOGRAPH
+0x8E5F	0x9178	#CJK UNIFIED IDEOGRAPH
+0x8E60	0x9910	#CJK UNIFIED IDEOGRAPH
+0x8E61	0x65AC	#CJK UNIFIED IDEOGRAPH
+0x8E62	0x66AB	#CJK UNIFIED IDEOGRAPH
+0x8E63	0x6B8B	#CJK UNIFIED IDEOGRAPH
+0x8E64	0x4ED5	#CJK UNIFIED IDEOGRAPH
+0x8E65	0x4ED4	#CJK UNIFIED IDEOGRAPH
+0x8E66	0x4F3A	#CJK UNIFIED IDEOGRAPH
+0x8E67	0x4F7F	#CJK UNIFIED IDEOGRAPH
+0x8E68	0x523A	#CJK UNIFIED IDEOGRAPH
+0x8E69	0x53F8	#CJK UNIFIED IDEOGRAPH
+0x8E6A	0x53F2	#CJK UNIFIED IDEOGRAPH
+0x8E6B	0x55E3	#CJK UNIFIED IDEOGRAPH
+0x8E6C	0x56DB	#CJK UNIFIED IDEOGRAPH
+0x8E6D	0x58EB	#CJK UNIFIED IDEOGRAPH
+0x8E6E	0x59CB	#CJK UNIFIED IDEOGRAPH
+0x8E6F	0x59C9	#CJK UNIFIED IDEOGRAPH
+0x8E70	0x59FF	#CJK UNIFIED IDEOGRAPH
+0x8E71	0x5B50	#CJK UNIFIED IDEOGRAPH
+0x8E72	0x5C4D	#CJK UNIFIED IDEOGRAPH
+0x8E73	0x5E02	#CJK UNIFIED IDEOGRAPH
+0x8E74	0x5E2B	#CJK UNIFIED IDEOGRAPH
+0x8E75	0x5FD7	#CJK UNIFIED IDEOGRAPH
+0x8E76	0x601D	#CJK UNIFIED IDEOGRAPH
+0x8E77	0x6307	#CJK UNIFIED IDEOGRAPH
+0x8E78	0x652F	#CJK UNIFIED IDEOGRAPH
+0x8E79	0x5B5C	#CJK UNIFIED IDEOGRAPH
+0x8E7A	0x65AF	#CJK UNIFIED IDEOGRAPH
+0x8E7B	0x65BD	#CJK UNIFIED IDEOGRAPH
+0x8E7C	0x65E8	#CJK UNIFIED IDEOGRAPH
+0x8E7D	0x679D	#CJK UNIFIED IDEOGRAPH
+0x8E7E	0x6B62	#CJK UNIFIED IDEOGRAPH
+0x8E80	0x6B7B	#CJK UNIFIED IDEOGRAPH
+0x8E81	0x6C0F	#CJK UNIFIED IDEOGRAPH
+0x8E82	0x7345	#CJK UNIFIED IDEOGRAPH
+0x8E83	0x7949	#CJK UNIFIED IDEOGRAPH
+0x8E84	0x79C1	#CJK UNIFIED IDEOGRAPH
+0x8E85	0x7CF8	#CJK UNIFIED IDEOGRAPH
+0x8E86	0x7D19	#CJK UNIFIED IDEOGRAPH
+0x8E87	0x7D2B	#CJK UNIFIED IDEOGRAPH
+0x8E88	0x80A2	#CJK UNIFIED IDEOGRAPH
+0x8E89	0x8102	#CJK UNIFIED IDEOGRAPH
+0x8E8A	0x81F3	#CJK UNIFIED IDEOGRAPH
+0x8E8B	0x8996	#CJK UNIFIED IDEOGRAPH
+0x8E8C	0x8A5E	#CJK UNIFIED IDEOGRAPH
+0x8E8D	0x8A69	#CJK UNIFIED IDEOGRAPH
+0x8E8E	0x8A66	#CJK UNIFIED IDEOGRAPH
+0x8E8F	0x8A8C	#CJK UNIFIED IDEOGRAPH
+0x8E90	0x8AEE	#CJK UNIFIED IDEOGRAPH
+0x8E91	0x8CC7	#CJK UNIFIED IDEOGRAPH
+0x8E92	0x8CDC	#CJK UNIFIED IDEOGRAPH
+0x8E93	0x96CC	#CJK UNIFIED IDEOGRAPH
+0x8E94	0x98FC	#CJK UNIFIED IDEOGRAPH
+0x8E95	0x6B6F	#CJK UNIFIED IDEOGRAPH
+0x8E96	0x4E8B	#CJK UNIFIED IDEOGRAPH
+0x8E97	0x4F3C	#CJK UNIFIED IDEOGRAPH
+0x8E98	0x4F8D	#CJK UNIFIED IDEOGRAPH
+0x8E99	0x5150	#CJK UNIFIED IDEOGRAPH
+0x8E9A	0x5B57	#CJK UNIFIED IDEOGRAPH
+0x8E9B	0x5BFA	#CJK UNIFIED IDEOGRAPH
+0x8E9C	0x6148	#CJK UNIFIED IDEOGRAPH
+0x8E9D	0x6301	#CJK UNIFIED IDEOGRAPH
+0x8E9E	0x6642	#CJK UNIFIED IDEOGRAPH
+0x8E9F	0x6B21	#CJK UNIFIED IDEOGRAPH
+0x8EA0	0x6ECB	#CJK UNIFIED IDEOGRAPH
+0x8EA1	0x6CBB	#CJK UNIFIED IDEOGRAPH
+0x8EA2	0x723E	#CJK UNIFIED IDEOGRAPH
+0x8EA3	0x74BD	#CJK UNIFIED IDEOGRAPH
+0x8EA4	0x75D4	#CJK UNIFIED IDEOGRAPH
+0x8EA5	0x78C1	#CJK UNIFIED IDEOGRAPH
+0x8EA6	0x793A	#CJK UNIFIED IDEOGRAPH
+0x8EA7	0x800C	#CJK UNIFIED IDEOGRAPH
+0x8EA8	0x8033	#CJK UNIFIED IDEOGRAPH
+0x8EA9	0x81EA	#CJK UNIFIED IDEOGRAPH
+0x8EAA	0x8494	#CJK UNIFIED IDEOGRAPH
+0x8EAB	0x8F9E	#CJK UNIFIED IDEOGRAPH
+0x8EAC	0x6C50	#CJK UNIFIED IDEOGRAPH
+0x8EAD	0x9E7F	#CJK UNIFIED IDEOGRAPH
+0x8EAE	0x5F0F	#CJK UNIFIED IDEOGRAPH
+0x8EAF	0x8B58	#CJK UNIFIED IDEOGRAPH
+0x8EB0	0x9D2B	#CJK UNIFIED IDEOGRAPH
+0x8EB1	0x7AFA	#CJK UNIFIED IDEOGRAPH
+0x8EB2	0x8EF8	#CJK UNIFIED IDEOGRAPH
+0x8EB3	0x5B8D	#CJK UNIFIED IDEOGRAPH
+0x8EB4	0x96EB	#CJK UNIFIED IDEOGRAPH
+0x8EB5	0x4E03	#CJK UNIFIED IDEOGRAPH
+0x8EB6	0x53F1	#CJK UNIFIED IDEOGRAPH
+0x8EB7	0x57F7	#CJK UNIFIED IDEOGRAPH
+0x8EB8	0x5931	#CJK UNIFIED IDEOGRAPH
+0x8EB9	0x5AC9	#CJK UNIFIED IDEOGRAPH
+0x8EBA	0x5BA4	#CJK UNIFIED IDEOGRAPH
+0x8EBB	0x6089	#CJK UNIFIED IDEOGRAPH
+0x8EBC	0x6E7F	#CJK UNIFIED IDEOGRAPH
+0x8EBD	0x6F06	#CJK UNIFIED IDEOGRAPH
+0x8EBE	0x75BE	#CJK UNIFIED IDEOGRAPH
+0x8EBF	0x8CEA	#CJK UNIFIED IDEOGRAPH
+0x8EC0	0x5B9F	#CJK UNIFIED IDEOGRAPH
+0x8EC1	0x8500	#CJK UNIFIED IDEOGRAPH
+0x8EC2	0x7BE0	#CJK UNIFIED IDEOGRAPH
+0x8EC3	0x5072	#CJK UNIFIED IDEOGRAPH
+0x8EC4	0x67F4	#CJK UNIFIED IDEOGRAPH
+0x8EC5	0x829D	#CJK UNIFIED IDEOGRAPH
+0x8EC6	0x5C61	#CJK UNIFIED IDEOGRAPH
+0x8EC7	0x854A	#CJK UNIFIED IDEOGRAPH
+0x8EC8	0x7E1E	#CJK UNIFIED IDEOGRAPH
+0x8EC9	0x820E	#CJK UNIFIED IDEOGRAPH
+0x8ECA	0x5199	#CJK UNIFIED IDEOGRAPH
+0x8ECB	0x5C04	#CJK UNIFIED IDEOGRAPH
+0x8ECC	0x6368	#CJK UNIFIED IDEOGRAPH
+0x8ECD	0x8D66	#CJK UNIFIED IDEOGRAPH
+0x8ECE	0x659C	#CJK UNIFIED IDEOGRAPH
+0x8ECF	0x716E	#CJK UNIFIED IDEOGRAPH
+0x8ED0	0x793E	#CJK UNIFIED IDEOGRAPH
+0x8ED1	0x7D17	#CJK UNIFIED IDEOGRAPH
+0x8ED2	0x8005	#CJK UNIFIED IDEOGRAPH
+0x8ED3	0x8B1D	#CJK UNIFIED IDEOGRAPH
+0x8ED4	0x8ECA	#CJK UNIFIED IDEOGRAPH
+0x8ED5	0x906E	#CJK UNIFIED IDEOGRAPH
+0x8ED6	0x86C7	#CJK UNIFIED IDEOGRAPH
+0x8ED7	0x90AA	#CJK UNIFIED IDEOGRAPH
+0x8ED8	0x501F	#CJK UNIFIED IDEOGRAPH
+0x8ED9	0x52FA	#CJK UNIFIED IDEOGRAPH
+0x8EDA	0x5C3A	#CJK UNIFIED IDEOGRAPH
+0x8EDB	0x6753	#CJK UNIFIED IDEOGRAPH
+0x8EDC	0x707C	#CJK UNIFIED IDEOGRAPH
+0x8EDD	0x7235	#CJK UNIFIED IDEOGRAPH
+0x8EDE	0x914C	#CJK UNIFIED IDEOGRAPH
+0x8EDF	0x91C8	#CJK UNIFIED IDEOGRAPH
+0x8EE0	0x932B	#CJK UNIFIED IDEOGRAPH
+0x8EE1	0x82E5	#CJK UNIFIED IDEOGRAPH
+0x8EE2	0x5BC2	#CJK UNIFIED IDEOGRAPH
+0x8EE3	0x5F31	#CJK UNIFIED IDEOGRAPH
+0x8EE4	0x60F9	#CJK UNIFIED IDEOGRAPH
+0x8EE5	0x4E3B	#CJK UNIFIED IDEOGRAPH
+0x8EE6	0x53D6	#CJK UNIFIED IDEOGRAPH
+0x8EE7	0x5B88	#CJK UNIFIED IDEOGRAPH
+0x8EE8	0x624B	#CJK UNIFIED IDEOGRAPH
+0x8EE9	0x6731	#CJK UNIFIED IDEOGRAPH
+0x8EEA	0x6B8A	#CJK UNIFIED IDEOGRAPH
+0x8EEB	0x72E9	#CJK UNIFIED IDEOGRAPH
+0x8EEC	0x73E0	#CJK UNIFIED IDEOGRAPH
+0x8EED	0x7A2E	#CJK UNIFIED IDEOGRAPH
+0x8EEE	0x816B	#CJK UNIFIED IDEOGRAPH
+0x8EEF	0x8DA3	#CJK UNIFIED IDEOGRAPH
+0x8EF0	0x9152	#CJK UNIFIED IDEOGRAPH
+0x8EF1	0x9996	#CJK UNIFIED IDEOGRAPH
+0x8EF2	0x5112	#CJK UNIFIED IDEOGRAPH
+0x8EF3	0x53D7	#CJK UNIFIED IDEOGRAPH
+0x8EF4	0x546A	#CJK UNIFIED IDEOGRAPH
+0x8EF5	0x5BFF	#CJK UNIFIED IDEOGRAPH
+0x8EF6	0x6388	#CJK UNIFIED IDEOGRAPH
+0x8EF7	0x6A39	#CJK UNIFIED IDEOGRAPH
+0x8EF8	0x7DAC	#CJK UNIFIED IDEOGRAPH
+0x8EF9	0x9700	#CJK UNIFIED IDEOGRAPH
+0x8EFA	0x56DA	#CJK UNIFIED IDEOGRAPH
+0x8EFB	0x53CE	#CJK UNIFIED IDEOGRAPH
+0x8EFC	0x5468	#CJK UNIFIED IDEOGRAPH
+0x8F40	0x5B97	#CJK UNIFIED IDEOGRAPH
+0x8F41	0x5C31	#CJK UNIFIED IDEOGRAPH
+0x8F42	0x5DDE	#CJK UNIFIED IDEOGRAPH
+0x8F43	0x4FEE	#CJK UNIFIED IDEOGRAPH
+0x8F44	0x6101	#CJK UNIFIED IDEOGRAPH
+0x8F45	0x62FE	#CJK UNIFIED IDEOGRAPH
+0x8F46	0x6D32	#CJK UNIFIED IDEOGRAPH
+0x8F47	0x79C0	#CJK UNIFIED IDEOGRAPH
+0x8F48	0x79CB	#CJK UNIFIED IDEOGRAPH
+0x8F49	0x7D42	#CJK UNIFIED IDEOGRAPH
+0x8F4A	0x7E4D	#CJK UNIFIED IDEOGRAPH
+0x8F4B	0x7FD2	#CJK UNIFIED IDEOGRAPH
+0x8F4C	0x81ED	#CJK UNIFIED IDEOGRAPH
+0x8F4D	0x821F	#CJK UNIFIED IDEOGRAPH
+0x8F4E	0x8490	#CJK UNIFIED IDEOGRAPH
+0x8F4F	0x8846	#CJK UNIFIED IDEOGRAPH
+0x8F50	0x8972	#CJK UNIFIED IDEOGRAPH
+0x8F51	0x8B90	#CJK UNIFIED IDEOGRAPH
+0x8F52	0x8E74	#CJK UNIFIED IDEOGRAPH
+0x8F53	0x8F2F	#CJK UNIFIED IDEOGRAPH
+0x8F54	0x9031	#CJK UNIFIED IDEOGRAPH
+0x8F55	0x914B	#CJK UNIFIED IDEOGRAPH
+0x8F56	0x916C	#CJK UNIFIED IDEOGRAPH
+0x8F57	0x96C6	#CJK UNIFIED IDEOGRAPH
+0x8F58	0x919C	#CJK UNIFIED IDEOGRAPH
+0x8F59	0x4EC0	#CJK UNIFIED IDEOGRAPH
+0x8F5A	0x4F4F	#CJK UNIFIED IDEOGRAPH
+0x8F5B	0x5145	#CJK UNIFIED IDEOGRAPH
+0x8F5C	0x5341	#CJK UNIFIED IDEOGRAPH
+0x8F5D	0x5F93	#CJK UNIFIED IDEOGRAPH
+0x8F5E	0x620E	#CJK UNIFIED IDEOGRAPH
+0x8F5F	0x67D4	#CJK UNIFIED IDEOGRAPH
+0x8F60	0x6C41	#CJK UNIFIED IDEOGRAPH
+0x8F61	0x6E0B	#CJK UNIFIED IDEOGRAPH
+0x8F62	0x7363	#CJK UNIFIED IDEOGRAPH
+0x8F63	0x7E26	#CJK UNIFIED IDEOGRAPH
+0x8F64	0x91CD	#CJK UNIFIED IDEOGRAPH
+0x8F65	0x9283	#CJK UNIFIED IDEOGRAPH
+0x8F66	0x53D4	#CJK UNIFIED IDEOGRAPH
+0x8F67	0x5919	#CJK UNIFIED IDEOGRAPH
+0x8F68	0x5BBF	#CJK UNIFIED IDEOGRAPH
+0x8F69	0x6DD1	#CJK UNIFIED IDEOGRAPH
+0x8F6A	0x795D	#CJK UNIFIED IDEOGRAPH
+0x8F6B	0x7E2E	#CJK UNIFIED IDEOGRAPH
+0x8F6C	0x7C9B	#CJK UNIFIED IDEOGRAPH
+0x8F6D	0x587E	#CJK UNIFIED IDEOGRAPH
+0x8F6E	0x719F	#CJK UNIFIED IDEOGRAPH
+0x8F6F	0x51FA	#CJK UNIFIED IDEOGRAPH
+0x8F70	0x8853	#CJK UNIFIED IDEOGRAPH
+0x8F71	0x8FF0	#CJK UNIFIED IDEOGRAPH
+0x8F72	0x4FCA	#CJK UNIFIED IDEOGRAPH
+0x8F73	0x5CFB	#CJK UNIFIED IDEOGRAPH
+0x8F74	0x6625	#CJK UNIFIED IDEOGRAPH
+0x8F75	0x77AC	#CJK UNIFIED IDEOGRAPH
+0x8F76	0x7AE3	#CJK UNIFIED IDEOGRAPH
+0x8F77	0x821C	#CJK UNIFIED IDEOGRAPH
+0x8F78	0x99FF	#CJK UNIFIED IDEOGRAPH
+0x8F79	0x51C6	#CJK UNIFIED IDEOGRAPH
+0x8F7A	0x5FAA	#CJK UNIFIED IDEOGRAPH
+0x8F7B	0x65EC	#CJK UNIFIED IDEOGRAPH
+0x8F7C	0x696F	#CJK UNIFIED IDEOGRAPH
+0x8F7D	0x6B89	#CJK UNIFIED IDEOGRAPH
+0x8F7E	0x6DF3	#CJK UNIFIED IDEOGRAPH
+0x8F80	0x6E96	#CJK UNIFIED IDEOGRAPH
+0x8F81	0x6F64	#CJK UNIFIED IDEOGRAPH
+0x8F82	0x76FE	#CJK UNIFIED IDEOGRAPH
+0x8F83	0x7D14	#CJK UNIFIED IDEOGRAPH
+0x8F84	0x5DE1	#CJK UNIFIED IDEOGRAPH
+0x8F85	0x9075	#CJK UNIFIED IDEOGRAPH
+0x8F86	0x9187	#CJK UNIFIED IDEOGRAPH
+0x8F87	0x9806	#CJK UNIFIED IDEOGRAPH
+0x8F88	0x51E6	#CJK UNIFIED IDEOGRAPH
+0x8F89	0x521D	#CJK UNIFIED IDEOGRAPH
+0x8F8A	0x6240	#CJK UNIFIED IDEOGRAPH
+0x8F8B	0x6691	#CJK UNIFIED IDEOGRAPH
+0x8F8C	0x66D9	#CJK UNIFIED IDEOGRAPH
+0x8F8D	0x6E1A	#CJK UNIFIED IDEOGRAPH
+0x8F8E	0x5EB6	#CJK UNIFIED IDEOGRAPH
+0x8F8F	0x7DD2	#CJK UNIFIED IDEOGRAPH
+0x8F90	0x7F72	#CJK UNIFIED IDEOGRAPH
+0x8F91	0x66F8	#CJK UNIFIED IDEOGRAPH
+0x8F92	0x85AF	#CJK UNIFIED IDEOGRAPH
+0x8F93	0x85F7	#CJK UNIFIED IDEOGRAPH
+0x8F94	0x8AF8	#CJK UNIFIED IDEOGRAPH
+0x8F95	0x52A9	#CJK UNIFIED IDEOGRAPH
+0x8F96	0x53D9	#CJK UNIFIED IDEOGRAPH
+0x8F97	0x5973	#CJK UNIFIED IDEOGRAPH
+0x8F98	0x5E8F	#CJK UNIFIED IDEOGRAPH
+0x8F99	0x5F90	#CJK UNIFIED IDEOGRAPH
+0x8F9A	0x6055	#CJK UNIFIED IDEOGRAPH
+0x8F9B	0x92E4	#CJK UNIFIED IDEOGRAPH
+0x8F9C	0x9664	#CJK UNIFIED IDEOGRAPH
+0x8F9D	0x50B7	#CJK UNIFIED IDEOGRAPH
+0x8F9E	0x511F	#CJK UNIFIED IDEOGRAPH
+0x8F9F	0x52DD	#CJK UNIFIED IDEOGRAPH
+0x8FA0	0x5320	#CJK UNIFIED IDEOGRAPH
+0x8FA1	0x5347	#CJK UNIFIED IDEOGRAPH
+0x8FA2	0x53EC	#CJK UNIFIED IDEOGRAPH
+0x8FA3	0x54E8	#CJK UNIFIED IDEOGRAPH
+0x8FA4	0x5546	#CJK UNIFIED IDEOGRAPH
+0x8FA5	0x5531	#CJK UNIFIED IDEOGRAPH
+0x8FA6	0x5617	#CJK UNIFIED IDEOGRAPH
+0x8FA7	0x5968	#CJK UNIFIED IDEOGRAPH
+0x8FA8	0x59BE	#CJK UNIFIED IDEOGRAPH
+0x8FA9	0x5A3C	#CJK UNIFIED IDEOGRAPH
+0x8FAA	0x5BB5	#CJK UNIFIED IDEOGRAPH
+0x8FAB	0x5C06	#CJK UNIFIED IDEOGRAPH
+0x8FAC	0x5C0F	#CJK UNIFIED IDEOGRAPH
+0x8FAD	0x5C11	#CJK UNIFIED IDEOGRAPH
+0x8FAE	0x5C1A	#CJK UNIFIED IDEOGRAPH
+0x8FAF	0x5E84	#CJK UNIFIED IDEOGRAPH
+0x8FB0	0x5E8A	#CJK UNIFIED IDEOGRAPH
+0x8FB1	0x5EE0	#CJK UNIFIED IDEOGRAPH
+0x8FB2	0x5F70	#CJK UNIFIED IDEOGRAPH
+0x8FB3	0x627F	#CJK UNIFIED IDEOGRAPH
+0x8FB4	0x6284	#CJK UNIFIED IDEOGRAPH
+0x8FB5	0x62DB	#CJK UNIFIED IDEOGRAPH
+0x8FB6	0x638C	#CJK UNIFIED IDEOGRAPH
+0x8FB7	0x6377	#CJK UNIFIED IDEOGRAPH
+0x8FB8	0x6607	#CJK UNIFIED IDEOGRAPH
+0x8FB9	0x660C	#CJK UNIFIED IDEOGRAPH
+0x8FBA	0x662D	#CJK UNIFIED IDEOGRAPH
+0x8FBB	0x6676	#CJK UNIFIED IDEOGRAPH
+0x8FBC	0x677E	#CJK UNIFIED IDEOGRAPH
+0x8FBD	0x68A2	#CJK UNIFIED IDEOGRAPH
+0x8FBE	0x6A1F	#CJK UNIFIED IDEOGRAPH
+0x8FBF	0x6A35	#CJK UNIFIED IDEOGRAPH
+0x8FC0	0x6CBC	#CJK UNIFIED IDEOGRAPH
+0x8FC1	0x6D88	#CJK UNIFIED IDEOGRAPH
+0x8FC2	0x6E09	#CJK UNIFIED IDEOGRAPH
+0x8FC3	0x6E58	#CJK UNIFIED IDEOGRAPH
+0x8FC4	0x713C	#CJK UNIFIED IDEOGRAPH
+0x8FC5	0x7126	#CJK UNIFIED IDEOGRAPH
+0x8FC6	0x7167	#CJK UNIFIED IDEOGRAPH
+0x8FC7	0x75C7	#CJK UNIFIED IDEOGRAPH
+0x8FC8	0x7701	#CJK UNIFIED IDEOGRAPH
+0x8FC9	0x785D	#CJK UNIFIED IDEOGRAPH
+0x8FCA	0x7901	#CJK UNIFIED IDEOGRAPH
+0x8FCB	0x7965	#CJK UNIFIED IDEOGRAPH
+0x8FCC	0x79F0	#CJK UNIFIED IDEOGRAPH
+0x8FCD	0x7AE0	#CJK UNIFIED IDEOGRAPH
+0x8FCE	0x7B11	#CJK UNIFIED IDEOGRAPH
+0x8FCF	0x7CA7	#CJK UNIFIED IDEOGRAPH
+0x8FD0	0x7D39	#CJK UNIFIED IDEOGRAPH
+0x8FD1	0x8096	#CJK UNIFIED IDEOGRAPH
+0x8FD2	0x83D6	#CJK UNIFIED IDEOGRAPH
+0x8FD3	0x848B	#CJK UNIFIED IDEOGRAPH
+0x8FD4	0x8549	#CJK UNIFIED IDEOGRAPH
+0x8FD5	0x885D	#CJK UNIFIED IDEOGRAPH
+0x8FD6	0x88F3	#CJK UNIFIED IDEOGRAPH
+0x8FD7	0x8A1F	#CJK UNIFIED IDEOGRAPH
+0x8FD8	0x8A3C	#CJK UNIFIED IDEOGRAPH
+0x8FD9	0x8A54	#CJK UNIFIED IDEOGRAPH
+0x8FDA	0x8A73	#CJK UNIFIED IDEOGRAPH
+0x8FDB	0x8C61	#CJK UNIFIED IDEOGRAPH
+0x8FDC	0x8CDE	#CJK UNIFIED IDEOGRAPH
+0x8FDD	0x91A4	#CJK UNIFIED IDEOGRAPH
+0x8FDE	0x9266	#CJK UNIFIED IDEOGRAPH
+0x8FDF	0x937E	#CJK UNIFIED IDEOGRAPH
+0x8FE0	0x9418	#CJK UNIFIED IDEOGRAPH
+0x8FE1	0x969C	#CJK UNIFIED IDEOGRAPH
+0x8FE2	0x9798	#CJK UNIFIED IDEOGRAPH
+0x8FE3	0x4E0A	#CJK UNIFIED IDEOGRAPH
+0x8FE4	0x4E08	#CJK UNIFIED IDEOGRAPH
+0x8FE5	0x4E1E	#CJK UNIFIED IDEOGRAPH
+0x8FE6	0x4E57	#CJK UNIFIED IDEOGRAPH
+0x8FE7	0x5197	#CJK UNIFIED IDEOGRAPH
+0x8FE8	0x5270	#CJK UNIFIED IDEOGRAPH
+0x8FE9	0x57CE	#CJK UNIFIED IDEOGRAPH
+0x8FEA	0x5834	#CJK UNIFIED IDEOGRAPH
+0x8FEB	0x58CC	#CJK UNIFIED IDEOGRAPH
+0x8FEC	0x5B22	#CJK UNIFIED IDEOGRAPH
+0x8FED	0x5E38	#CJK UNIFIED IDEOGRAPH
+0x8FEE	0x60C5	#CJK UNIFIED IDEOGRAPH
+0x8FEF	0x64FE	#CJK UNIFIED IDEOGRAPH
+0x8FF0	0x6761	#CJK UNIFIED IDEOGRAPH
+0x8FF1	0x6756	#CJK UNIFIED IDEOGRAPH
+0x8FF2	0x6D44	#CJK UNIFIED IDEOGRAPH
+0x8FF3	0x72B6	#CJK UNIFIED IDEOGRAPH
+0x8FF4	0x7573	#CJK UNIFIED IDEOGRAPH
+0x8FF5	0x7A63	#CJK UNIFIED IDEOGRAPH
+0x8FF6	0x84B8	#CJK UNIFIED IDEOGRAPH
+0x8FF7	0x8B72	#CJK UNIFIED IDEOGRAPH
+0x8FF8	0x91B8	#CJK UNIFIED IDEOGRAPH
+0x8FF9	0x9320	#CJK UNIFIED IDEOGRAPH
+0x8FFA	0x5631	#CJK UNIFIED IDEOGRAPH
+0x8FFB	0x57F4	#CJK UNIFIED IDEOGRAPH
+0x8FFC	0x98FE	#CJK UNIFIED IDEOGRAPH
+0x9040	0x62ED	#CJK UNIFIED IDEOGRAPH
+0x9041	0x690D	#CJK UNIFIED IDEOGRAPH
+0x9042	0x6B96	#CJK UNIFIED IDEOGRAPH
+0x9043	0x71ED	#CJK UNIFIED IDEOGRAPH
+0x9044	0x7E54	#CJK UNIFIED IDEOGRAPH
+0x9045	0x8077	#CJK UNIFIED IDEOGRAPH
+0x9046	0x8272	#CJK UNIFIED IDEOGRAPH
+0x9047	0x89E6	#CJK UNIFIED IDEOGRAPH
+0x9048	0x98DF	#CJK UNIFIED IDEOGRAPH
+0x9049	0x8755	#CJK UNIFIED IDEOGRAPH
+0x904A	0x8FB1	#CJK UNIFIED IDEOGRAPH
+0x904B	0x5C3B	#CJK UNIFIED IDEOGRAPH
+0x904C	0x4F38	#CJK UNIFIED IDEOGRAPH
+0x904D	0x4FE1	#CJK UNIFIED IDEOGRAPH
+0x904E	0x4FB5	#CJK UNIFIED IDEOGRAPH
+0x904F	0x5507	#CJK UNIFIED IDEOGRAPH
+0x9050	0x5A20	#CJK UNIFIED IDEOGRAPH
+0x9051	0x5BDD	#CJK UNIFIED IDEOGRAPH
+0x9052	0x5BE9	#CJK UNIFIED IDEOGRAPH
+0x9053	0x5FC3	#CJK UNIFIED IDEOGRAPH
+0x9054	0x614E	#CJK UNIFIED IDEOGRAPH
+0x9055	0x632F	#CJK UNIFIED IDEOGRAPH
+0x9056	0x65B0	#CJK UNIFIED IDEOGRAPH
+0x9057	0x664B	#CJK UNIFIED IDEOGRAPH
+0x9058	0x68EE	#CJK UNIFIED IDEOGRAPH
+0x9059	0x699B	#CJK UNIFIED IDEOGRAPH
+0x905A	0x6D78	#CJK UNIFIED IDEOGRAPH
+0x905B	0x6DF1	#CJK UNIFIED IDEOGRAPH
+0x905C	0x7533	#CJK UNIFIED IDEOGRAPH
+0x905D	0x75B9	#CJK UNIFIED IDEOGRAPH
+0x905E	0x771F	#CJK UNIFIED IDEOGRAPH
+0x905F	0x795E	#CJK UNIFIED IDEOGRAPH
+0x9060	0x79E6	#CJK UNIFIED IDEOGRAPH
+0x9061	0x7D33	#CJK UNIFIED IDEOGRAPH
+0x9062	0x81E3	#CJK UNIFIED IDEOGRAPH
+0x9063	0x82AF	#CJK UNIFIED IDEOGRAPH
+0x9064	0x85AA	#CJK UNIFIED IDEOGRAPH
+0x9065	0x89AA	#CJK UNIFIED IDEOGRAPH
+0x9066	0x8A3A	#CJK UNIFIED IDEOGRAPH
+0x9067	0x8EAB	#CJK UNIFIED IDEOGRAPH
+0x9068	0x8F9B	#CJK UNIFIED IDEOGRAPH
+0x9069	0x9032	#CJK UNIFIED IDEOGRAPH
+0x906A	0x91DD	#CJK UNIFIED IDEOGRAPH
+0x906B	0x9707	#CJK UNIFIED IDEOGRAPH
+0x906C	0x4EBA	#CJK UNIFIED IDEOGRAPH
+0x906D	0x4EC1	#CJK UNIFIED IDEOGRAPH
+0x906E	0x5203	#CJK UNIFIED IDEOGRAPH
+0x906F	0x5875	#CJK UNIFIED IDEOGRAPH
+0x9070	0x58EC	#CJK UNIFIED IDEOGRAPH
+0x9071	0x5C0B	#CJK UNIFIED IDEOGRAPH
+0x9072	0x751A	#CJK UNIFIED IDEOGRAPH
+0x9073	0x5C3D	#CJK UNIFIED IDEOGRAPH
+0x9074	0x814E	#CJK UNIFIED IDEOGRAPH
+0x9075	0x8A0A	#CJK UNIFIED IDEOGRAPH
+0x9076	0x8FC5	#CJK UNIFIED IDEOGRAPH
+0x9077	0x9663	#CJK UNIFIED IDEOGRAPH
+0x9078	0x976D	#CJK UNIFIED IDEOGRAPH
+0x9079	0x7B25	#CJK UNIFIED IDEOGRAPH
+0x907A	0x8ACF	#CJK UNIFIED IDEOGRAPH
+0x907B	0x9808	#CJK UNIFIED IDEOGRAPH
+0x907C	0x9162	#CJK UNIFIED IDEOGRAPH
+0x907D	0x56F3	#CJK UNIFIED IDEOGRAPH
+0x907E	0x53A8	#CJK UNIFIED IDEOGRAPH
+0x9080	0x9017	#CJK UNIFIED IDEOGRAPH
+0x9081	0x5439	#CJK UNIFIED IDEOGRAPH
+0x9082	0x5782	#CJK UNIFIED IDEOGRAPH
+0x9083	0x5E25	#CJK UNIFIED IDEOGRAPH
+0x9084	0x63A8	#CJK UNIFIED IDEOGRAPH
+0x9085	0x6C34	#CJK UNIFIED IDEOGRAPH
+0x9086	0x708A	#CJK UNIFIED IDEOGRAPH
+0x9087	0x7761	#CJK UNIFIED IDEOGRAPH
+0x9088	0x7C8B	#CJK UNIFIED IDEOGRAPH
+0x9089	0x7FE0	#CJK UNIFIED IDEOGRAPH
+0x908A	0x8870	#CJK UNIFIED IDEOGRAPH
+0x908B	0x9042	#CJK UNIFIED IDEOGRAPH
+0x908C	0x9154	#CJK UNIFIED IDEOGRAPH
+0x908D	0x9310	#CJK UNIFIED IDEOGRAPH
+0x908E	0x9318	#CJK UNIFIED IDEOGRAPH
+0x908F	0x968F	#CJK UNIFIED IDEOGRAPH
+0x9090	0x745E	#CJK UNIFIED IDEOGRAPH
+0x9091	0x9AC4	#CJK UNIFIED IDEOGRAPH
+0x9092	0x5D07	#CJK UNIFIED IDEOGRAPH
+0x9093	0x5D69	#CJK UNIFIED IDEOGRAPH
+0x9094	0x6570	#CJK UNIFIED IDEOGRAPH
+0x9095	0x67A2	#CJK UNIFIED IDEOGRAPH
+0x9096	0x8DA8	#CJK UNIFIED IDEOGRAPH
+0x9097	0x96DB	#CJK UNIFIED IDEOGRAPH
+0x9098	0x636E	#CJK UNIFIED IDEOGRAPH
+0x9099	0x6749	#CJK UNIFIED IDEOGRAPH
+0x909A	0x6919	#CJK UNIFIED IDEOGRAPH
+0x909B	0x83C5	#CJK UNIFIED IDEOGRAPH
+0x909C	0x9817	#CJK UNIFIED IDEOGRAPH
+0x909D	0x96C0	#CJK UNIFIED IDEOGRAPH
+0x909E	0x88FE	#CJK UNIFIED IDEOGRAPH
+0x909F	0x6F84	#CJK UNIFIED IDEOGRAPH
+0x90A0	0x647A	#CJK UNIFIED IDEOGRAPH
+0x90A1	0x5BF8	#CJK UNIFIED IDEOGRAPH
+0x90A2	0x4E16	#CJK UNIFIED IDEOGRAPH
+0x90A3	0x702C	#CJK UNIFIED IDEOGRAPH
+0x90A4	0x755D	#CJK UNIFIED IDEOGRAPH
+0x90A5	0x662F	#CJK UNIFIED IDEOGRAPH
+0x90A6	0x51C4	#CJK UNIFIED IDEOGRAPH
+0x90A7	0x5236	#CJK UNIFIED IDEOGRAPH
+0x90A8	0x52E2	#CJK UNIFIED IDEOGRAPH
+0x90A9	0x59D3	#CJK UNIFIED IDEOGRAPH
+0x90AA	0x5F81	#CJK UNIFIED IDEOGRAPH
+0x90AB	0x6027	#CJK UNIFIED IDEOGRAPH
+0x90AC	0x6210	#CJK UNIFIED IDEOGRAPH
+0x90AD	0x653F	#CJK UNIFIED IDEOGRAPH
+0x90AE	0x6574	#CJK UNIFIED IDEOGRAPH
+0x90AF	0x661F	#CJK UNIFIED IDEOGRAPH
+0x90B0	0x6674	#CJK UNIFIED IDEOGRAPH
+0x90B1	0x68F2	#CJK UNIFIED IDEOGRAPH
+0x90B2	0x6816	#CJK UNIFIED IDEOGRAPH
+0x90B3	0x6B63	#CJK UNIFIED IDEOGRAPH
+0x90B4	0x6E05	#CJK UNIFIED IDEOGRAPH
+0x90B5	0x7272	#CJK UNIFIED IDEOGRAPH
+0x90B6	0x751F	#CJK UNIFIED IDEOGRAPH
+0x90B7	0x76DB	#CJK UNIFIED IDEOGRAPH
+0x90B8	0x7CBE	#CJK UNIFIED IDEOGRAPH
+0x90B9	0x8056	#CJK UNIFIED IDEOGRAPH
+0x90BA	0x58F0	#CJK UNIFIED IDEOGRAPH
+0x90BB	0x88FD	#CJK UNIFIED IDEOGRAPH
+0x90BC	0x897F	#CJK UNIFIED IDEOGRAPH
+0x90BD	0x8AA0	#CJK UNIFIED IDEOGRAPH
+0x90BE	0x8A93	#CJK UNIFIED IDEOGRAPH
+0x90BF	0x8ACB	#CJK UNIFIED IDEOGRAPH
+0x90C0	0x901D	#CJK UNIFIED IDEOGRAPH
+0x90C1	0x9192	#CJK UNIFIED IDEOGRAPH
+0x90C2	0x9752	#CJK UNIFIED IDEOGRAPH
+0x90C3	0x9759	#CJK UNIFIED IDEOGRAPH
+0x90C4	0x6589	#CJK UNIFIED IDEOGRAPH
+0x90C5	0x7A0E	#CJK UNIFIED IDEOGRAPH
+0x90C6	0x8106	#CJK UNIFIED IDEOGRAPH
+0x90C7	0x96BB	#CJK UNIFIED IDEOGRAPH
+0x90C8	0x5E2D	#CJK UNIFIED IDEOGRAPH
+0x90C9	0x60DC	#CJK UNIFIED IDEOGRAPH
+0x90CA	0x621A	#CJK UNIFIED IDEOGRAPH
+0x90CB	0x65A5	#CJK UNIFIED IDEOGRAPH
+0x90CC	0x6614	#CJK UNIFIED IDEOGRAPH
+0x90CD	0x6790	#CJK UNIFIED IDEOGRAPH
+0x90CE	0x77F3	#CJK UNIFIED IDEOGRAPH
+0x90CF	0x7A4D	#CJK UNIFIED IDEOGRAPH
+0x90D0	0x7C4D	#CJK UNIFIED IDEOGRAPH
+0x90D1	0x7E3E	#CJK UNIFIED IDEOGRAPH
+0x90D2	0x810A	#CJK UNIFIED IDEOGRAPH
+0x90D3	0x8CAC	#CJK UNIFIED IDEOGRAPH
+0x90D4	0x8D64	#CJK UNIFIED IDEOGRAPH
+0x90D5	0x8DE1	#CJK UNIFIED IDEOGRAPH
+0x90D6	0x8E5F	#CJK UNIFIED IDEOGRAPH
+0x90D7	0x78A9	#CJK UNIFIED IDEOGRAPH
+0x90D8	0x5207	#CJK UNIFIED IDEOGRAPH
+0x90D9	0x62D9	#CJK UNIFIED IDEOGRAPH
+0x90DA	0x63A5	#CJK UNIFIED IDEOGRAPH
+0x90DB	0x6442	#CJK UNIFIED IDEOGRAPH
+0x90DC	0x6298	#CJK UNIFIED IDEOGRAPH
+0x90DD	0x8A2D	#CJK UNIFIED IDEOGRAPH
+0x90DE	0x7A83	#CJK UNIFIED IDEOGRAPH
+0x90DF	0x7BC0	#CJK UNIFIED IDEOGRAPH
+0x90E0	0x8AAC	#CJK UNIFIED IDEOGRAPH
+0x90E1	0x96EA	#CJK UNIFIED IDEOGRAPH
+0x90E2	0x7D76	#CJK UNIFIED IDEOGRAPH
+0x90E3	0x820C	#CJK UNIFIED IDEOGRAPH
+0x90E4	0x8749	#CJK UNIFIED IDEOGRAPH
+0x90E5	0x4ED9	#CJK UNIFIED IDEOGRAPH
+0x90E6	0x5148	#CJK UNIFIED IDEOGRAPH
+0x90E7	0x5343	#CJK UNIFIED IDEOGRAPH
+0x90E8	0x5360	#CJK UNIFIED IDEOGRAPH
+0x90E9	0x5BA3	#CJK UNIFIED IDEOGRAPH
+0x90EA	0x5C02	#CJK UNIFIED IDEOGRAPH
+0x90EB	0x5C16	#CJK UNIFIED IDEOGRAPH
+0x90EC	0x5DDD	#CJK UNIFIED IDEOGRAPH
+0x90ED	0x6226	#CJK UNIFIED IDEOGRAPH
+0x90EE	0x6247	#CJK UNIFIED IDEOGRAPH
+0x90EF	0x64B0	#CJK UNIFIED IDEOGRAPH
+0x90F0	0x6813	#CJK UNIFIED IDEOGRAPH
+0x90F1	0x6834	#CJK UNIFIED IDEOGRAPH
+0x90F2	0x6CC9	#CJK UNIFIED IDEOGRAPH
+0x90F3	0x6D45	#CJK UNIFIED IDEOGRAPH
+0x90F4	0x6D17	#CJK UNIFIED IDEOGRAPH
+0x90F5	0x67D3	#CJK UNIFIED IDEOGRAPH
+0x90F6	0x6F5C	#CJK UNIFIED IDEOGRAPH
+0x90F7	0x714E	#CJK UNIFIED IDEOGRAPH
+0x90F8	0x717D	#CJK UNIFIED IDEOGRAPH
+0x90F9	0x65CB	#CJK UNIFIED IDEOGRAPH
+0x90FA	0x7A7F	#CJK UNIFIED IDEOGRAPH
+0x90FB	0x7BAD	#CJK UNIFIED IDEOGRAPH
+0x90FC	0x7DDA	#CJK UNIFIED IDEOGRAPH
+0x9140	0x7E4A	#CJK UNIFIED IDEOGRAPH
+0x9141	0x7FA8	#CJK UNIFIED IDEOGRAPH
+0x9142	0x817A	#CJK UNIFIED IDEOGRAPH
+0x9143	0x821B	#CJK UNIFIED IDEOGRAPH
+0x9144	0x8239	#CJK UNIFIED IDEOGRAPH
+0x9145	0x85A6	#CJK UNIFIED IDEOGRAPH
+0x9146	0x8A6E	#CJK UNIFIED IDEOGRAPH
+0x9147	0x8CCE	#CJK UNIFIED IDEOGRAPH
+0x9148	0x8DF5	#CJK UNIFIED IDEOGRAPH
+0x9149	0x9078	#CJK UNIFIED IDEOGRAPH
+0x914A	0x9077	#CJK UNIFIED IDEOGRAPH
+0x914B	0x92AD	#CJK UNIFIED IDEOGRAPH
+0x914C	0x9291	#CJK UNIFIED IDEOGRAPH
+0x914D	0x9583	#CJK UNIFIED IDEOGRAPH
+0x914E	0x9BAE	#CJK UNIFIED IDEOGRAPH
+0x914F	0x524D	#CJK UNIFIED IDEOGRAPH
+0x9150	0x5584	#CJK UNIFIED IDEOGRAPH
+0x9151	0x6F38	#CJK UNIFIED IDEOGRAPH
+0x9152	0x7136	#CJK UNIFIED IDEOGRAPH
+0x9153	0x5168	#CJK UNIFIED IDEOGRAPH
+0x9154	0x7985	#CJK UNIFIED IDEOGRAPH
+0x9155	0x7E55	#CJK UNIFIED IDEOGRAPH
+0x9156	0x81B3	#CJK UNIFIED IDEOGRAPH
+0x9157	0x7CCE	#CJK UNIFIED IDEOGRAPH
+0x9158	0x564C	#CJK UNIFIED IDEOGRAPH
+0x9159	0x5851	#CJK UNIFIED IDEOGRAPH
+0x915A	0x5CA8	#CJK UNIFIED IDEOGRAPH
+0x915B	0x63AA	#CJK UNIFIED IDEOGRAPH
+0x915C	0x66FE	#CJK UNIFIED IDEOGRAPH
+0x915D	0x66FD	#CJK UNIFIED IDEOGRAPH
+0x915E	0x695A	#CJK UNIFIED IDEOGRAPH
+0x915F	0x72D9	#CJK UNIFIED IDEOGRAPH
+0x9160	0x758F	#CJK UNIFIED IDEOGRAPH
+0x9161	0x758E	#CJK UNIFIED IDEOGRAPH
+0x9162	0x790E	#CJK UNIFIED IDEOGRAPH
+0x9163	0x7956	#CJK UNIFIED IDEOGRAPH
+0x9164	0x79DF	#CJK UNIFIED IDEOGRAPH
+0x9165	0x7C97	#CJK UNIFIED IDEOGRAPH
+0x9166	0x7D20	#CJK UNIFIED IDEOGRAPH
+0x9167	0x7D44	#CJK UNIFIED IDEOGRAPH
+0x9168	0x8607	#CJK UNIFIED IDEOGRAPH
+0x9169	0x8A34	#CJK UNIFIED IDEOGRAPH
+0x916A	0x963B	#CJK UNIFIED IDEOGRAPH
+0x916B	0x9061	#CJK UNIFIED IDEOGRAPH
+0x916C	0x9F20	#CJK UNIFIED IDEOGRAPH
+0x916D	0x50E7	#CJK UNIFIED IDEOGRAPH
+0x916E	0x5275	#CJK UNIFIED IDEOGRAPH
+0x916F	0x53CC	#CJK UNIFIED IDEOGRAPH
+0x9170	0x53E2	#CJK UNIFIED IDEOGRAPH
+0x9171	0x5009	#CJK UNIFIED IDEOGRAPH
+0x9172	0x55AA	#CJK UNIFIED IDEOGRAPH
+0x9173	0x58EE	#CJK UNIFIED IDEOGRAPH
+0x9174	0x594F	#CJK UNIFIED IDEOGRAPH
+0x9175	0x723D	#CJK UNIFIED IDEOGRAPH
+0x9176	0x5B8B	#CJK UNIFIED IDEOGRAPH
+0x9177	0x5C64	#CJK UNIFIED IDEOGRAPH
+0x9178	0x531D	#CJK UNIFIED IDEOGRAPH
+0x9179	0x60E3	#CJK UNIFIED IDEOGRAPH
+0x917A	0x60F3	#CJK UNIFIED IDEOGRAPH
+0x917B	0x635C	#CJK UNIFIED IDEOGRAPH
+0x917C	0x6383	#CJK UNIFIED IDEOGRAPH
+0x917D	0x633F	#CJK UNIFIED IDEOGRAPH
+0x917E	0x63BB	#CJK UNIFIED IDEOGRAPH
+0x9180	0x64CD	#CJK UNIFIED IDEOGRAPH
+0x9181	0x65E9	#CJK UNIFIED IDEOGRAPH
+0x9182	0x66F9	#CJK UNIFIED IDEOGRAPH
+0x9183	0x5DE3	#CJK UNIFIED IDEOGRAPH
+0x9184	0x69CD	#CJK UNIFIED IDEOGRAPH
+0x9185	0x69FD	#CJK UNIFIED IDEOGRAPH
+0x9186	0x6F15	#CJK UNIFIED IDEOGRAPH
+0x9187	0x71E5	#CJK UNIFIED IDEOGRAPH
+0x9188	0x4E89	#CJK UNIFIED IDEOGRAPH
+0x9189	0x75E9	#CJK UNIFIED IDEOGRAPH
+0x918A	0x76F8	#CJK UNIFIED IDEOGRAPH
+0x918B	0x7A93	#CJK UNIFIED IDEOGRAPH
+0x918C	0x7CDF	#CJK UNIFIED IDEOGRAPH
+0x918D	0x7DCF	#CJK UNIFIED IDEOGRAPH
+0x918E	0x7D9C	#CJK UNIFIED IDEOGRAPH
+0x918F	0x8061	#CJK UNIFIED IDEOGRAPH
+0x9190	0x8349	#CJK UNIFIED IDEOGRAPH
+0x9191	0x8358	#CJK UNIFIED IDEOGRAPH
+0x9192	0x846C	#CJK UNIFIED IDEOGRAPH
+0x9193	0x84BC	#CJK UNIFIED IDEOGRAPH
+0x9194	0x85FB	#CJK UNIFIED IDEOGRAPH
+0x9195	0x88C5	#CJK UNIFIED IDEOGRAPH
+0x9196	0x8D70	#CJK UNIFIED IDEOGRAPH
+0x9197	0x9001	#CJK UNIFIED IDEOGRAPH
+0x9198	0x906D	#CJK UNIFIED IDEOGRAPH
+0x9199	0x9397	#CJK UNIFIED IDEOGRAPH
+0x919A	0x971C	#CJK UNIFIED IDEOGRAPH
+0x919B	0x9A12	#CJK UNIFIED IDEOGRAPH
+0x919C	0x50CF	#CJK UNIFIED IDEOGRAPH
+0x919D	0x5897	#CJK UNIFIED IDEOGRAPH
+0x919E	0x618E	#CJK UNIFIED IDEOGRAPH
+0x919F	0x81D3	#CJK UNIFIED IDEOGRAPH
+0x91A0	0x8535	#CJK UNIFIED IDEOGRAPH
+0x91A1	0x8D08	#CJK UNIFIED IDEOGRAPH
+0x91A2	0x9020	#CJK UNIFIED IDEOGRAPH
+0x91A3	0x4FC3	#CJK UNIFIED IDEOGRAPH
+0x91A4	0x5074	#CJK UNIFIED IDEOGRAPH
+0x91A5	0x5247	#CJK UNIFIED IDEOGRAPH
+0x91A6	0x5373	#CJK UNIFIED IDEOGRAPH
+0x91A7	0x606F	#CJK UNIFIED IDEOGRAPH
+0x91A8	0x6349	#CJK UNIFIED IDEOGRAPH
+0x91A9	0x675F	#CJK UNIFIED IDEOGRAPH
+0x91AA	0x6E2C	#CJK UNIFIED IDEOGRAPH
+0x91AB	0x8DB3	#CJK UNIFIED IDEOGRAPH
+0x91AC	0x901F	#CJK UNIFIED IDEOGRAPH
+0x91AD	0x4FD7	#CJK UNIFIED IDEOGRAPH
+0x91AE	0x5C5E	#CJK UNIFIED IDEOGRAPH
+0x91AF	0x8CCA	#CJK UNIFIED IDEOGRAPH
+0x91B0	0x65CF	#CJK UNIFIED IDEOGRAPH
+0x91B1	0x7D9A	#CJK UNIFIED IDEOGRAPH
+0x91B2	0x5352	#CJK UNIFIED IDEOGRAPH
+0x91B3	0x8896	#CJK UNIFIED IDEOGRAPH
+0x91B4	0x5176	#CJK UNIFIED IDEOGRAPH
+0x91B5	0x63C3	#CJK UNIFIED IDEOGRAPH
+0x91B6	0x5B58	#CJK UNIFIED IDEOGRAPH
+0x91B7	0x5B6B	#CJK UNIFIED IDEOGRAPH
+0x91B8	0x5C0A	#CJK UNIFIED IDEOGRAPH
+0x91B9	0x640D	#CJK UNIFIED IDEOGRAPH
+0x91BA	0x6751	#CJK UNIFIED IDEOGRAPH
+0x91BB	0x905C	#CJK UNIFIED IDEOGRAPH
+0x91BC	0x4ED6	#CJK UNIFIED IDEOGRAPH
+0x91BD	0x591A	#CJK UNIFIED IDEOGRAPH
+0x91BE	0x592A	#CJK UNIFIED IDEOGRAPH
+0x91BF	0x6C70	#CJK UNIFIED IDEOGRAPH
+0x91C0	0x8A51	#CJK UNIFIED IDEOGRAPH
+0x91C1	0x553E	#CJK UNIFIED IDEOGRAPH
+0x91C2	0x5815	#CJK UNIFIED IDEOGRAPH
+0x91C3	0x59A5	#CJK UNIFIED IDEOGRAPH
+0x91C4	0x60F0	#CJK UNIFIED IDEOGRAPH
+0x91C5	0x6253	#CJK UNIFIED IDEOGRAPH
+0x91C6	0x67C1	#CJK UNIFIED IDEOGRAPH
+0x91C7	0x8235	#CJK UNIFIED IDEOGRAPH
+0x91C8	0x6955	#CJK UNIFIED IDEOGRAPH
+0x91C9	0x9640	#CJK UNIFIED IDEOGRAPH
+0x91CA	0x99C4	#CJK UNIFIED IDEOGRAPH
+0x91CB	0x9A28	#CJK UNIFIED IDEOGRAPH
+0x91CC	0x4F53	#CJK UNIFIED IDEOGRAPH
+0x91CD	0x5806	#CJK UNIFIED IDEOGRAPH
+0x91CE	0x5BFE	#CJK UNIFIED IDEOGRAPH
+0x91CF	0x8010	#CJK UNIFIED IDEOGRAPH
+0x91D0	0x5CB1	#CJK UNIFIED IDEOGRAPH
+0x91D1	0x5E2F	#CJK UNIFIED IDEOGRAPH
+0x91D2	0x5F85	#CJK UNIFIED IDEOGRAPH
+0x91D3	0x6020	#CJK UNIFIED IDEOGRAPH
+0x91D4	0x614B	#CJK UNIFIED IDEOGRAPH
+0x91D5	0x6234	#CJK UNIFIED IDEOGRAPH
+0x91D6	0x66FF	#CJK UNIFIED IDEOGRAPH
+0x91D7	0x6CF0	#CJK UNIFIED IDEOGRAPH
+0x91D8	0x6EDE	#CJK UNIFIED IDEOGRAPH
+0x91D9	0x80CE	#CJK UNIFIED IDEOGRAPH
+0x91DA	0x817F	#CJK UNIFIED IDEOGRAPH
+0x91DB	0x82D4	#CJK UNIFIED IDEOGRAPH
+0x91DC	0x888B	#CJK UNIFIED IDEOGRAPH
+0x91DD	0x8CB8	#CJK UNIFIED IDEOGRAPH
+0x91DE	0x9000	#CJK UNIFIED IDEOGRAPH
+0x91DF	0x902E	#CJK UNIFIED IDEOGRAPH
+0x91E0	0x968A	#CJK UNIFIED IDEOGRAPH
+0x91E1	0x9EDB	#CJK UNIFIED IDEOGRAPH
+0x91E2	0x9BDB	#CJK UNIFIED IDEOGRAPH
+0x91E3	0x4EE3	#CJK UNIFIED IDEOGRAPH
+0x91E4	0x53F0	#CJK UNIFIED IDEOGRAPH
+0x91E5	0x5927	#CJK UNIFIED IDEOGRAPH
+0x91E6	0x7B2C	#CJK UNIFIED IDEOGRAPH
+0x91E7	0x918D	#CJK UNIFIED IDEOGRAPH
+0x91E8	0x984C	#CJK UNIFIED IDEOGRAPH
+0x91E9	0x9DF9	#CJK UNIFIED IDEOGRAPH
+0x91EA	0x6EDD	#CJK UNIFIED IDEOGRAPH
+0x91EB	0x7027	#CJK UNIFIED IDEOGRAPH
+0x91EC	0x5353	#CJK UNIFIED IDEOGRAPH
+0x91ED	0x5544	#CJK UNIFIED IDEOGRAPH
+0x91EE	0x5B85	#CJK UNIFIED IDEOGRAPH
+0x91EF	0x6258	#CJK UNIFIED IDEOGRAPH
+0x91F0	0x629E	#CJK UNIFIED IDEOGRAPH
+0x91F1	0x62D3	#CJK UNIFIED IDEOGRAPH
+0x91F2	0x6CA2	#CJK UNIFIED IDEOGRAPH
+0x91F3	0x6FEF	#CJK UNIFIED IDEOGRAPH
+0x91F4	0x7422	#CJK UNIFIED IDEOGRAPH
+0x91F5	0x8A17	#CJK UNIFIED IDEOGRAPH
+0x91F6	0x9438	#CJK UNIFIED IDEOGRAPH
+0x91F7	0x6FC1	#CJK UNIFIED IDEOGRAPH
+0x91F8	0x8AFE	#CJK UNIFIED IDEOGRAPH
+0x91F9	0x8338	#CJK UNIFIED IDEOGRAPH
+0x91FA	0x51E7	#CJK UNIFIED IDEOGRAPH
+0x91FB	0x86F8	#CJK UNIFIED IDEOGRAPH
+0x91FC	0x53EA	#CJK UNIFIED IDEOGRAPH
+0x9240	0x53E9	#CJK UNIFIED IDEOGRAPH
+0x9241	0x4F46	#CJK UNIFIED IDEOGRAPH
+0x9242	0x9054	#CJK UNIFIED IDEOGRAPH
+0x9243	0x8FB0	#CJK UNIFIED IDEOGRAPH
+0x9244	0x596A	#CJK UNIFIED IDEOGRAPH
+0x9245	0x8131	#CJK UNIFIED IDEOGRAPH
+0x9246	0x5DFD	#CJK UNIFIED IDEOGRAPH
+0x9247	0x7AEA	#CJK UNIFIED IDEOGRAPH
+0x9248	0x8FBF	#CJK UNIFIED IDEOGRAPH
+0x9249	0x68DA	#CJK UNIFIED IDEOGRAPH
+0x924A	0x8C37	#CJK UNIFIED IDEOGRAPH
+0x924B	0x72F8	#CJK UNIFIED IDEOGRAPH
+0x924C	0x9C48	#CJK UNIFIED IDEOGRAPH
+0x924D	0x6A3D	#CJK UNIFIED IDEOGRAPH
+0x924E	0x8AB0	#CJK UNIFIED IDEOGRAPH
+0x924F	0x4E39	#CJK UNIFIED IDEOGRAPH
+0x9250	0x5358	#CJK UNIFIED IDEOGRAPH
+0x9251	0x5606	#CJK UNIFIED IDEOGRAPH
+0x9252	0x5766	#CJK UNIFIED IDEOGRAPH
+0x9253	0x62C5	#CJK UNIFIED IDEOGRAPH
+0x9254	0x63A2	#CJK UNIFIED IDEOGRAPH
+0x9255	0x65E6	#CJK UNIFIED IDEOGRAPH
+0x9256	0x6B4E	#CJK UNIFIED IDEOGRAPH
+0x9257	0x6DE1	#CJK UNIFIED IDEOGRAPH
+0x9258	0x6E5B	#CJK UNIFIED IDEOGRAPH
+0x9259	0x70AD	#CJK UNIFIED IDEOGRAPH
+0x925A	0x77ED	#CJK UNIFIED IDEOGRAPH
+0x925B	0x7AEF	#CJK UNIFIED IDEOGRAPH
+0x925C	0x7BAA	#CJK UNIFIED IDEOGRAPH
+0x925D	0x7DBB	#CJK UNIFIED IDEOGRAPH
+0x925E	0x803D	#CJK UNIFIED IDEOGRAPH
+0x925F	0x80C6	#CJK UNIFIED IDEOGRAPH
+0x9260	0x86CB	#CJK UNIFIED IDEOGRAPH
+0x9261	0x8A95	#CJK UNIFIED IDEOGRAPH
+0x9262	0x935B	#CJK UNIFIED IDEOGRAPH
+0x9263	0x56E3	#CJK UNIFIED IDEOGRAPH
+0x9264	0x58C7	#CJK UNIFIED IDEOGRAPH
+0x9265	0x5F3E	#CJK UNIFIED IDEOGRAPH
+0x9266	0x65AD	#CJK UNIFIED IDEOGRAPH
+0x9267	0x6696	#CJK UNIFIED IDEOGRAPH
+0x9268	0x6A80	#CJK UNIFIED IDEOGRAPH
+0x9269	0x6BB5	#CJK UNIFIED IDEOGRAPH
+0x926A	0x7537	#CJK UNIFIED IDEOGRAPH
+0x926B	0x8AC7	#CJK UNIFIED IDEOGRAPH
+0x926C	0x5024	#CJK UNIFIED IDEOGRAPH
+0x926D	0x77E5	#CJK UNIFIED IDEOGRAPH
+0x926E	0x5730	#CJK UNIFIED IDEOGRAPH
+0x926F	0x5F1B	#CJK UNIFIED IDEOGRAPH
+0x9270	0x6065	#CJK UNIFIED IDEOGRAPH
+0x9271	0x667A	#CJK UNIFIED IDEOGRAPH
+0x9272	0x6C60	#CJK UNIFIED IDEOGRAPH
+0x9273	0x75F4	#CJK UNIFIED IDEOGRAPH
+0x9274	0x7A1A	#CJK UNIFIED IDEOGRAPH
+0x9275	0x7F6E	#CJK UNIFIED IDEOGRAPH
+0x9276	0x81F4	#CJK UNIFIED IDEOGRAPH
+0x9277	0x8718	#CJK UNIFIED IDEOGRAPH
+0x9278	0x9045	#CJK UNIFIED IDEOGRAPH
+0x9279	0x99B3	#CJK UNIFIED IDEOGRAPH
+0x927A	0x7BC9	#CJK UNIFIED IDEOGRAPH
+0x927B	0x755C	#CJK UNIFIED IDEOGRAPH
+0x927C	0x7AF9	#CJK UNIFIED IDEOGRAPH
+0x927D	0x7B51	#CJK UNIFIED IDEOGRAPH
+0x927E	0x84C4	#CJK UNIFIED IDEOGRAPH
+0x9280	0x9010	#CJK UNIFIED IDEOGRAPH
+0x9281	0x79E9	#CJK UNIFIED IDEOGRAPH
+0x9282	0x7A92	#CJK UNIFIED IDEOGRAPH
+0x9283	0x8336	#CJK UNIFIED IDEOGRAPH
+0x9284	0x5AE1	#CJK UNIFIED IDEOGRAPH
+0x9285	0x7740	#CJK UNIFIED IDEOGRAPH
+0x9286	0x4E2D	#CJK UNIFIED IDEOGRAPH
+0x9287	0x4EF2	#CJK UNIFIED IDEOGRAPH
+0x9288	0x5B99	#CJK UNIFIED IDEOGRAPH
+0x9289	0x5FE0	#CJK UNIFIED IDEOGRAPH
+0x928A	0x62BD	#CJK UNIFIED IDEOGRAPH
+0x928B	0x663C	#CJK UNIFIED IDEOGRAPH
+0x928C	0x67F1	#CJK UNIFIED IDEOGRAPH
+0x928D	0x6CE8	#CJK UNIFIED IDEOGRAPH
+0x928E	0x866B	#CJK UNIFIED IDEOGRAPH
+0x928F	0x8877	#CJK UNIFIED IDEOGRAPH
+0x9290	0x8A3B	#CJK UNIFIED IDEOGRAPH
+0x9291	0x914E	#CJK UNIFIED IDEOGRAPH
+0x9292	0x92F3	#CJK UNIFIED IDEOGRAPH
+0x9293	0x99D0	#CJK UNIFIED IDEOGRAPH
+0x9294	0x6A17	#CJK UNIFIED IDEOGRAPH
+0x9295	0x7026	#CJK UNIFIED IDEOGRAPH
+0x9296	0x732A	#CJK UNIFIED IDEOGRAPH
+0x9297	0x82E7	#CJK UNIFIED IDEOGRAPH
+0x9298	0x8457	#CJK UNIFIED IDEOGRAPH
+0x9299	0x8CAF	#CJK UNIFIED IDEOGRAPH
+0x929A	0x4E01	#CJK UNIFIED IDEOGRAPH
+0x929B	0x5146	#CJK UNIFIED IDEOGRAPH
+0x929C	0x51CB	#CJK UNIFIED IDEOGRAPH
+0x929D	0x558B	#CJK UNIFIED IDEOGRAPH
+0x929E	0x5BF5	#CJK UNIFIED IDEOGRAPH
+0x929F	0x5E16	#CJK UNIFIED IDEOGRAPH
+0x92A0	0x5E33	#CJK UNIFIED IDEOGRAPH
+0x92A1	0x5E81	#CJK UNIFIED IDEOGRAPH
+0x92A2	0x5F14	#CJK UNIFIED IDEOGRAPH
+0x92A3	0x5F35	#CJK UNIFIED IDEOGRAPH
+0x92A4	0x5F6B	#CJK UNIFIED IDEOGRAPH
+0x92A5	0x5FB4	#CJK UNIFIED IDEOGRAPH
+0x92A6	0x61F2	#CJK UNIFIED IDEOGRAPH
+0x92A7	0x6311	#CJK UNIFIED IDEOGRAPH
+0x92A8	0x66A2	#CJK UNIFIED IDEOGRAPH
+0x92A9	0x671D	#CJK UNIFIED IDEOGRAPH
+0x92AA	0x6F6E	#CJK UNIFIED IDEOGRAPH
+0x92AB	0x7252	#CJK UNIFIED IDEOGRAPH
+0x92AC	0x753A	#CJK UNIFIED IDEOGRAPH
+0x92AD	0x773A	#CJK UNIFIED IDEOGRAPH
+0x92AE	0x8074	#CJK UNIFIED IDEOGRAPH
+0x92AF	0x8139	#CJK UNIFIED IDEOGRAPH
+0x92B0	0x8178	#CJK UNIFIED IDEOGRAPH
+0x92B1	0x8776	#CJK UNIFIED IDEOGRAPH
+0x92B2	0x8ABF	#CJK UNIFIED IDEOGRAPH
+0x92B3	0x8ADC	#CJK UNIFIED IDEOGRAPH
+0x92B4	0x8D85	#CJK UNIFIED IDEOGRAPH
+0x92B5	0x8DF3	#CJK UNIFIED IDEOGRAPH
+0x92B6	0x929A	#CJK UNIFIED IDEOGRAPH
+0x92B7	0x9577	#CJK UNIFIED IDEOGRAPH
+0x92B8	0x9802	#CJK UNIFIED IDEOGRAPH
+0x92B9	0x9CE5	#CJK UNIFIED IDEOGRAPH
+0x92BA	0x52C5	#CJK UNIFIED IDEOGRAPH
+0x92BB	0x6357	#CJK UNIFIED IDEOGRAPH
+0x92BC	0x76F4	#CJK UNIFIED IDEOGRAPH
+0x92BD	0x6715	#CJK UNIFIED IDEOGRAPH
+0x92BE	0x6C88	#CJK UNIFIED IDEOGRAPH
+0x92BF	0x73CD	#CJK UNIFIED IDEOGRAPH
+0x92C0	0x8CC3	#CJK UNIFIED IDEOGRAPH
+0x92C1	0x93AE	#CJK UNIFIED IDEOGRAPH
+0x92C2	0x9673	#CJK UNIFIED IDEOGRAPH
+0x92C3	0x6D25	#CJK UNIFIED IDEOGRAPH
+0x92C4	0x589C	#CJK UNIFIED IDEOGRAPH
+0x92C5	0x690E	#CJK UNIFIED IDEOGRAPH
+0x92C6	0x69CC	#CJK UNIFIED IDEOGRAPH
+0x92C7	0x8FFD	#CJK UNIFIED IDEOGRAPH
+0x92C8	0x939A	#CJK UNIFIED IDEOGRAPH
+0x92C9	0x75DB	#CJK UNIFIED IDEOGRAPH
+0x92CA	0x901A	#CJK UNIFIED IDEOGRAPH
+0x92CB	0x585A	#CJK UNIFIED IDEOGRAPH
+0x92CC	0x6802	#CJK UNIFIED IDEOGRAPH
+0x92CD	0x63B4	#CJK UNIFIED IDEOGRAPH
+0x92CE	0x69FB	#CJK UNIFIED IDEOGRAPH
+0x92CF	0x4F43	#CJK UNIFIED IDEOGRAPH
+0x92D0	0x6F2C	#CJK UNIFIED IDEOGRAPH
+0x92D1	0x67D8	#CJK UNIFIED IDEOGRAPH
+0x92D2	0x8FBB	#CJK UNIFIED IDEOGRAPH
+0x92D3	0x8526	#CJK UNIFIED IDEOGRAPH
+0x92D4	0x7DB4	#CJK UNIFIED IDEOGRAPH
+0x92D5	0x9354	#CJK UNIFIED IDEOGRAPH
+0x92D6	0x693F	#CJK UNIFIED IDEOGRAPH
+0x92D7	0x6F70	#CJK UNIFIED IDEOGRAPH
+0x92D8	0x576A	#CJK UNIFIED IDEOGRAPH
+0x92D9	0x58F7	#CJK UNIFIED IDEOGRAPH
+0x92DA	0x5B2C	#CJK UNIFIED IDEOGRAPH
+0x92DB	0x7D2C	#CJK UNIFIED IDEOGRAPH
+0x92DC	0x722A	#CJK UNIFIED IDEOGRAPH
+0x92DD	0x540A	#CJK UNIFIED IDEOGRAPH
+0x92DE	0x91E3	#CJK UNIFIED IDEOGRAPH
+0x92DF	0x9DB4	#CJK UNIFIED IDEOGRAPH
+0x92E0	0x4EAD	#CJK UNIFIED IDEOGRAPH
+0x92E1	0x4F4E	#CJK UNIFIED IDEOGRAPH
+0x92E2	0x505C	#CJK UNIFIED IDEOGRAPH
+0x92E3	0x5075	#CJK UNIFIED IDEOGRAPH
+0x92E4	0x5243	#CJK UNIFIED IDEOGRAPH
+0x92E5	0x8C9E	#CJK UNIFIED IDEOGRAPH
+0x92E6	0x5448	#CJK UNIFIED IDEOGRAPH
+0x92E7	0x5824	#CJK UNIFIED IDEOGRAPH
+0x92E8	0x5B9A	#CJK UNIFIED IDEOGRAPH
+0x92E9	0x5E1D	#CJK UNIFIED IDEOGRAPH
+0x92EA	0x5E95	#CJK UNIFIED IDEOGRAPH
+0x92EB	0x5EAD	#CJK UNIFIED IDEOGRAPH
+0x92EC	0x5EF7	#CJK UNIFIED IDEOGRAPH
+0x92ED	0x5F1F	#CJK UNIFIED IDEOGRAPH
+0x92EE	0x608C	#CJK UNIFIED IDEOGRAPH
+0x92EF	0x62B5	#CJK UNIFIED IDEOGRAPH
+0x92F0	0x633A	#CJK UNIFIED IDEOGRAPH
+0x92F1	0x63D0	#CJK UNIFIED IDEOGRAPH
+0x92F2	0x68AF	#CJK UNIFIED IDEOGRAPH
+0x92F3	0x6C40	#CJK UNIFIED IDEOGRAPH
+0x92F4	0x7887	#CJK UNIFIED IDEOGRAPH
+0x92F5	0x798E	#CJK UNIFIED IDEOGRAPH
+0x92F6	0x7A0B	#CJK UNIFIED IDEOGRAPH
+0x92F7	0x7DE0	#CJK UNIFIED IDEOGRAPH
+0x92F8	0x8247	#CJK UNIFIED IDEOGRAPH
+0x92F9	0x8A02	#CJK UNIFIED IDEOGRAPH
+0x92FA	0x8AE6	#CJK UNIFIED IDEOGRAPH
+0x92FB	0x8E44	#CJK UNIFIED IDEOGRAPH
+0x92FC	0x9013	#CJK UNIFIED IDEOGRAPH
+0x9340	0x90B8	#CJK UNIFIED IDEOGRAPH
+0x9341	0x912D	#CJK UNIFIED IDEOGRAPH
+0x9342	0x91D8	#CJK UNIFIED IDEOGRAPH
+0x9343	0x9F0E	#CJK UNIFIED IDEOGRAPH
+0x9344	0x6CE5	#CJK UNIFIED IDEOGRAPH
+0x9345	0x6458	#CJK UNIFIED IDEOGRAPH
+0x9346	0x64E2	#CJK UNIFIED IDEOGRAPH
+0x9347	0x6575	#CJK UNIFIED IDEOGRAPH
+0x9348	0x6EF4	#CJK UNIFIED IDEOGRAPH
+0x9349	0x7684	#CJK UNIFIED IDEOGRAPH
+0x934A	0x7B1B	#CJK UNIFIED IDEOGRAPH
+0x934B	0x9069	#CJK UNIFIED IDEOGRAPH
+0x934C	0x93D1	#CJK UNIFIED IDEOGRAPH
+0x934D	0x6EBA	#CJK UNIFIED IDEOGRAPH
+0x934E	0x54F2	#CJK UNIFIED IDEOGRAPH
+0x934F	0x5FB9	#CJK UNIFIED IDEOGRAPH
+0x9350	0x64A4	#CJK UNIFIED IDEOGRAPH
+0x9351	0x8F4D	#CJK UNIFIED IDEOGRAPH
+0x9352	0x8FED	#CJK UNIFIED IDEOGRAPH
+0x9353	0x9244	#CJK UNIFIED IDEOGRAPH
+0x9354	0x5178	#CJK UNIFIED IDEOGRAPH
+0x9355	0x586B	#CJK UNIFIED IDEOGRAPH
+0x9356	0x5929	#CJK UNIFIED IDEOGRAPH
+0x9357	0x5C55	#CJK UNIFIED IDEOGRAPH
+0x9358	0x5E97	#CJK UNIFIED IDEOGRAPH
+0x9359	0x6DFB	#CJK UNIFIED IDEOGRAPH
+0x935A	0x7E8F	#CJK UNIFIED IDEOGRAPH
+0x935B	0x751C	#CJK UNIFIED IDEOGRAPH
+0x935C	0x8CBC	#CJK UNIFIED IDEOGRAPH
+0x935D	0x8EE2	#CJK UNIFIED IDEOGRAPH
+0x935E	0x985B	#CJK UNIFIED IDEOGRAPH
+0x935F	0x70B9	#CJK UNIFIED IDEOGRAPH
+0x9360	0x4F1D	#CJK UNIFIED IDEOGRAPH
+0x9361	0x6BBF	#CJK UNIFIED IDEOGRAPH
+0x9362	0x6FB1	#CJK UNIFIED IDEOGRAPH
+0x9363	0x7530	#CJK UNIFIED IDEOGRAPH
+0x9364	0x96FB	#CJK UNIFIED IDEOGRAPH
+0x9365	0x514E	#CJK UNIFIED IDEOGRAPH
+0x9366	0x5410	#CJK UNIFIED IDEOGRAPH
+0x9367	0x5835	#CJK UNIFIED IDEOGRAPH
+0x9368	0x5857	#CJK UNIFIED IDEOGRAPH
+0x9369	0x59AC	#CJK UNIFIED IDEOGRAPH
+0x936A	0x5C60	#CJK UNIFIED IDEOGRAPH
+0x936B	0x5F92	#CJK UNIFIED IDEOGRAPH
+0x936C	0x6597	#CJK UNIFIED IDEOGRAPH
+0x936D	0x675C	#CJK UNIFIED IDEOGRAPH
+0x936E	0x6E21	#CJK UNIFIED IDEOGRAPH
+0x936F	0x767B	#CJK UNIFIED IDEOGRAPH
+0x9370	0x83DF	#CJK UNIFIED IDEOGRAPH
+0x9371	0x8CED	#CJK UNIFIED IDEOGRAPH
+0x9372	0x9014	#CJK UNIFIED IDEOGRAPH
+0x9373	0x90FD	#CJK UNIFIED IDEOGRAPH
+0x9374	0x934D	#CJK UNIFIED IDEOGRAPH
+0x9375	0x7825	#CJK UNIFIED IDEOGRAPH
+0x9376	0x783A	#CJK UNIFIED IDEOGRAPH
+0x9377	0x52AA	#CJK UNIFIED IDEOGRAPH
+0x9378	0x5EA6	#CJK UNIFIED IDEOGRAPH
+0x9379	0x571F	#CJK UNIFIED IDEOGRAPH
+0x937A	0x5974	#CJK UNIFIED IDEOGRAPH
+0x937B	0x6012	#CJK UNIFIED IDEOGRAPH
+0x937C	0x5012	#CJK UNIFIED IDEOGRAPH
+0x937D	0x515A	#CJK UNIFIED IDEOGRAPH
+0x937E	0x51AC	#CJK UNIFIED IDEOGRAPH
+0x9380	0x51CD	#CJK UNIFIED IDEOGRAPH
+0x9381	0x5200	#CJK UNIFIED IDEOGRAPH
+0x9382	0x5510	#CJK UNIFIED IDEOGRAPH
+0x9383	0x5854	#CJK UNIFIED IDEOGRAPH
+0x9384	0x5858	#CJK UNIFIED IDEOGRAPH
+0x9385	0x5957	#CJK UNIFIED IDEOGRAPH
+0x9386	0x5B95	#CJK UNIFIED IDEOGRAPH
+0x9387	0x5CF6	#CJK UNIFIED IDEOGRAPH
+0x9388	0x5D8B	#CJK UNIFIED IDEOGRAPH
+0x9389	0x60BC	#CJK UNIFIED IDEOGRAPH
+0x938A	0x6295	#CJK UNIFIED IDEOGRAPH
+0x938B	0x642D	#CJK UNIFIED IDEOGRAPH
+0x938C	0x6771	#CJK UNIFIED IDEOGRAPH
+0x938D	0x6843	#CJK UNIFIED IDEOGRAPH
+0x938E	0x68BC	#CJK UNIFIED IDEOGRAPH
+0x938F	0x68DF	#CJK UNIFIED IDEOGRAPH
+0x9390	0x76D7	#CJK UNIFIED IDEOGRAPH
+0x9391	0x6DD8	#CJK UNIFIED IDEOGRAPH
+0x9392	0x6E6F	#CJK UNIFIED IDEOGRAPH
+0x9393	0x6D9B	#CJK UNIFIED IDEOGRAPH
+0x9394	0x706F	#CJK UNIFIED IDEOGRAPH
+0x9395	0x71C8	#CJK UNIFIED IDEOGRAPH
+0x9396	0x5F53	#CJK UNIFIED IDEOGRAPH
+0x9397	0x75D8	#CJK UNIFIED IDEOGRAPH
+0x9398	0x7977	#CJK UNIFIED IDEOGRAPH
+0x9399	0x7B49	#CJK UNIFIED IDEOGRAPH
+0x939A	0x7B54	#CJK UNIFIED IDEOGRAPH
+0x939B	0x7B52	#CJK UNIFIED IDEOGRAPH
+0x939C	0x7CD6	#CJK UNIFIED IDEOGRAPH
+0x939D	0x7D71	#CJK UNIFIED IDEOGRAPH
+0x939E	0x5230	#CJK UNIFIED IDEOGRAPH
+0x939F	0x8463	#CJK UNIFIED IDEOGRAPH
+0x93A0	0x8569	#CJK UNIFIED IDEOGRAPH
+0x93A1	0x85E4	#CJK UNIFIED IDEOGRAPH
+0x93A2	0x8A0E	#CJK UNIFIED IDEOGRAPH
+0x93A3	0x8B04	#CJK UNIFIED IDEOGRAPH
+0x93A4	0x8C46	#CJK UNIFIED IDEOGRAPH
+0x93A5	0x8E0F	#CJK UNIFIED IDEOGRAPH
+0x93A6	0x9003	#CJK UNIFIED IDEOGRAPH
+0x93A7	0x900F	#CJK UNIFIED IDEOGRAPH
+0x93A8	0x9419	#CJK UNIFIED IDEOGRAPH
+0x93A9	0x9676	#CJK UNIFIED IDEOGRAPH
+0x93AA	0x982D	#CJK UNIFIED IDEOGRAPH
+0x93AB	0x9A30	#CJK UNIFIED IDEOGRAPH
+0x93AC	0x95D8	#CJK UNIFIED IDEOGRAPH
+0x93AD	0x50CD	#CJK UNIFIED IDEOGRAPH
+0x93AE	0x52D5	#CJK UNIFIED IDEOGRAPH
+0x93AF	0x540C	#CJK UNIFIED IDEOGRAPH
+0x93B0	0x5802	#CJK UNIFIED IDEOGRAPH
+0x93B1	0x5C0E	#CJK UNIFIED IDEOGRAPH
+0x93B2	0x61A7	#CJK UNIFIED IDEOGRAPH
+0x93B3	0x649E	#CJK UNIFIED IDEOGRAPH
+0x93B4	0x6D1E	#CJK UNIFIED IDEOGRAPH
+0x93B5	0x77B3	#CJK UNIFIED IDEOGRAPH
+0x93B6	0x7AE5	#CJK UNIFIED IDEOGRAPH
+0x93B7	0x80F4	#CJK UNIFIED IDEOGRAPH
+0x93B8	0x8404	#CJK UNIFIED IDEOGRAPH
+0x93B9	0x9053	#CJK UNIFIED IDEOGRAPH
+0x93BA	0x9285	#CJK UNIFIED IDEOGRAPH
+0x93BB	0x5CE0	#CJK UNIFIED IDEOGRAPH
+0x93BC	0x9D07	#CJK UNIFIED IDEOGRAPH
+0x93BD	0x533F	#CJK UNIFIED IDEOGRAPH
+0x93BE	0x5F97	#CJK UNIFIED IDEOGRAPH
+0x93BF	0x5FB3	#CJK UNIFIED IDEOGRAPH
+0x93C0	0x6D9C	#CJK UNIFIED IDEOGRAPH
+0x93C1	0x7279	#CJK UNIFIED IDEOGRAPH
+0x93C2	0x7763	#CJK UNIFIED IDEOGRAPH
+0x93C3	0x79BF	#CJK UNIFIED IDEOGRAPH
+0x93C4	0x7BE4	#CJK UNIFIED IDEOGRAPH
+0x93C5	0x6BD2	#CJK UNIFIED IDEOGRAPH
+0x93C6	0x72EC	#CJK UNIFIED IDEOGRAPH
+0x93C7	0x8AAD	#CJK UNIFIED IDEOGRAPH
+0x93C8	0x6803	#CJK UNIFIED IDEOGRAPH
+0x93C9	0x6A61	#CJK UNIFIED IDEOGRAPH
+0x93CA	0x51F8	#CJK UNIFIED IDEOGRAPH
+0x93CB	0x7A81	#CJK UNIFIED IDEOGRAPH
+0x93CC	0x6934	#CJK UNIFIED IDEOGRAPH
+0x93CD	0x5C4A	#CJK UNIFIED IDEOGRAPH
+0x93CE	0x9CF6	#CJK UNIFIED IDEOGRAPH
+0x93CF	0x82EB	#CJK UNIFIED IDEOGRAPH
+0x93D0	0x5BC5	#CJK UNIFIED IDEOGRAPH
+0x93D1	0x9149	#CJK UNIFIED IDEOGRAPH
+0x93D2	0x701E	#CJK UNIFIED IDEOGRAPH
+0x93D3	0x5678	#CJK UNIFIED IDEOGRAPH
+0x93D4	0x5C6F	#CJK UNIFIED IDEOGRAPH
+0x93D5	0x60C7	#CJK UNIFIED IDEOGRAPH
+0x93D6	0x6566	#CJK UNIFIED IDEOGRAPH
+0x93D7	0x6C8C	#CJK UNIFIED IDEOGRAPH
+0x93D8	0x8C5A	#CJK UNIFIED IDEOGRAPH
+0x93D9	0x9041	#CJK UNIFIED IDEOGRAPH
+0x93DA	0x9813	#CJK UNIFIED IDEOGRAPH
+0x93DB	0x5451	#CJK UNIFIED IDEOGRAPH
+0x93DC	0x66C7	#CJK UNIFIED IDEOGRAPH
+0x93DD	0x920D	#CJK UNIFIED IDEOGRAPH
+0x93DE	0x5948	#CJK UNIFIED IDEOGRAPH
+0x93DF	0x90A3	#CJK UNIFIED IDEOGRAPH
+0x93E0	0x5185	#CJK UNIFIED IDEOGRAPH
+0x93E1	0x4E4D	#CJK UNIFIED IDEOGRAPH
+0x93E2	0x51EA	#CJK UNIFIED IDEOGRAPH
+0x93E3	0x8599	#CJK UNIFIED IDEOGRAPH
+0x93E4	0x8B0E	#CJK UNIFIED IDEOGRAPH
+0x93E5	0x7058	#CJK UNIFIED IDEOGRAPH
+0x93E6	0x637A	#CJK UNIFIED IDEOGRAPH
+0x93E7	0x934B	#CJK UNIFIED IDEOGRAPH
+0x93E8	0x6962	#CJK UNIFIED IDEOGRAPH
+0x93E9	0x99B4	#CJK UNIFIED IDEOGRAPH
+0x93EA	0x7E04	#CJK UNIFIED IDEOGRAPH
+0x93EB	0x7577	#CJK UNIFIED IDEOGRAPH
+0x93EC	0x5357	#CJK UNIFIED IDEOGRAPH
+0x93ED	0x6960	#CJK UNIFIED IDEOGRAPH
+0x93EE	0x8EDF	#CJK UNIFIED IDEOGRAPH
+0x93EF	0x96E3	#CJK UNIFIED IDEOGRAPH
+0x93F0	0x6C5D	#CJK UNIFIED IDEOGRAPH
+0x93F1	0x4E8C	#CJK UNIFIED IDEOGRAPH
+0x93F2	0x5C3C	#CJK UNIFIED IDEOGRAPH
+0x93F3	0x5F10	#CJK UNIFIED IDEOGRAPH
+0x93F4	0x8FE9	#CJK UNIFIED IDEOGRAPH
+0x93F5	0x5302	#CJK UNIFIED IDEOGRAPH
+0x93F6	0x8CD1	#CJK UNIFIED IDEOGRAPH
+0x93F7	0x8089	#CJK UNIFIED IDEOGRAPH
+0x93F8	0x8679	#CJK UNIFIED IDEOGRAPH
+0x93F9	0x5EFF	#CJK UNIFIED IDEOGRAPH
+0x93FA	0x65E5	#CJK UNIFIED IDEOGRAPH
+0x93FB	0x4E73	#CJK UNIFIED IDEOGRAPH
+0x93FC	0x5165	#CJK UNIFIED IDEOGRAPH
+0x9440	0x5982	#CJK UNIFIED IDEOGRAPH
+0x9441	0x5C3F	#CJK UNIFIED IDEOGRAPH
+0x9442	0x97EE	#CJK UNIFIED IDEOGRAPH
+0x9443	0x4EFB	#CJK UNIFIED IDEOGRAPH
+0x9444	0x598A	#CJK UNIFIED IDEOGRAPH
+0x9445	0x5FCD	#CJK UNIFIED IDEOGRAPH
+0x9446	0x8A8D	#CJK UNIFIED IDEOGRAPH
+0x9447	0x6FE1	#CJK UNIFIED IDEOGRAPH
+0x9448	0x79B0	#CJK UNIFIED IDEOGRAPH
+0x9449	0x7962	#CJK UNIFIED IDEOGRAPH
+0x944A	0x5BE7	#CJK UNIFIED IDEOGRAPH
+0x944B	0x8471	#CJK UNIFIED IDEOGRAPH
+0x944C	0x732B	#CJK UNIFIED IDEOGRAPH
+0x944D	0x71B1	#CJK UNIFIED IDEOGRAPH
+0x944E	0x5E74	#CJK UNIFIED IDEOGRAPH
+0x944F	0x5FF5	#CJK UNIFIED IDEOGRAPH
+0x9450	0x637B	#CJK UNIFIED IDEOGRAPH
+0x9451	0x649A	#CJK UNIFIED IDEOGRAPH
+0x9452	0x71C3	#CJK UNIFIED IDEOGRAPH
+0x9453	0x7C98	#CJK UNIFIED IDEOGRAPH
+0x9454	0x4E43	#CJK UNIFIED IDEOGRAPH
+0x9455	0x5EFC	#CJK UNIFIED IDEOGRAPH
+0x9456	0x4E4B	#CJK UNIFIED IDEOGRAPH
+0x9457	0x57DC	#CJK UNIFIED IDEOGRAPH
+0x9458	0x56A2	#CJK UNIFIED IDEOGRAPH
+0x9459	0x60A9	#CJK UNIFIED IDEOGRAPH
+0x945A	0x6FC3	#CJK UNIFIED IDEOGRAPH
+0x945B	0x7D0D	#CJK UNIFIED IDEOGRAPH
+0x945C	0x80FD	#CJK UNIFIED IDEOGRAPH
+0x945D	0x8133	#CJK UNIFIED IDEOGRAPH
+0x945E	0x81BF	#CJK UNIFIED IDEOGRAPH
+0x945F	0x8FB2	#CJK UNIFIED IDEOGRAPH
+0x9460	0x8997	#CJK UNIFIED IDEOGRAPH
+0x9461	0x86A4	#CJK UNIFIED IDEOGRAPH
+0x9462	0x5DF4	#CJK UNIFIED IDEOGRAPH
+0x9463	0x628A	#CJK UNIFIED IDEOGRAPH
+0x9464	0x64AD	#CJK UNIFIED IDEOGRAPH
+0x9465	0x8987	#CJK UNIFIED IDEOGRAPH
+0x9466	0x6777	#CJK UNIFIED IDEOGRAPH
+0x9467	0x6CE2	#CJK UNIFIED IDEOGRAPH
+0x9468	0x6D3E	#CJK UNIFIED IDEOGRAPH
+0x9469	0x7436	#CJK UNIFIED IDEOGRAPH
+0x946A	0x7834	#CJK UNIFIED IDEOGRAPH
+0x946B	0x5A46	#CJK UNIFIED IDEOGRAPH
+0x946C	0x7F75	#CJK UNIFIED IDEOGRAPH
+0x946D	0x82AD	#CJK UNIFIED IDEOGRAPH
+0x946E	0x99AC	#CJK UNIFIED IDEOGRAPH
+0x946F	0x4FF3	#CJK UNIFIED IDEOGRAPH
+0x9470	0x5EC3	#CJK UNIFIED IDEOGRAPH
+0x9471	0x62DD	#CJK UNIFIED IDEOGRAPH
+0x9472	0x6392	#CJK UNIFIED IDEOGRAPH
+0x9473	0x6557	#CJK UNIFIED IDEOGRAPH
+0x9474	0x676F	#CJK UNIFIED IDEOGRAPH
+0x9475	0x76C3	#CJK UNIFIED IDEOGRAPH
+0x9476	0x724C	#CJK UNIFIED IDEOGRAPH
+0x9477	0x80CC	#CJK UNIFIED IDEOGRAPH
+0x9478	0x80BA	#CJK UNIFIED IDEOGRAPH
+0x9479	0x8F29	#CJK UNIFIED IDEOGRAPH
+0x947A	0x914D	#CJK UNIFIED IDEOGRAPH
+0x947B	0x500D	#CJK UNIFIED IDEOGRAPH
+0x947C	0x57F9	#CJK UNIFIED IDEOGRAPH
+0x947D	0x5A92	#CJK UNIFIED IDEOGRAPH
+0x947E	0x6885	#CJK UNIFIED IDEOGRAPH
+0x9480	0x6973	#CJK UNIFIED IDEOGRAPH
+0x9481	0x7164	#CJK UNIFIED IDEOGRAPH
+0x9482	0x72FD	#CJK UNIFIED IDEOGRAPH
+0x9483	0x8CB7	#CJK UNIFIED IDEOGRAPH
+0x9484	0x58F2	#CJK UNIFIED IDEOGRAPH
+0x9485	0x8CE0	#CJK UNIFIED IDEOGRAPH
+0x9486	0x966A	#CJK UNIFIED IDEOGRAPH
+0x9487	0x9019	#CJK UNIFIED IDEOGRAPH
+0x9488	0x877F	#CJK UNIFIED IDEOGRAPH
+0x9489	0x79E4	#CJK UNIFIED IDEOGRAPH
+0x948A	0x77E7	#CJK UNIFIED IDEOGRAPH
+0x948B	0x8429	#CJK UNIFIED IDEOGRAPH
+0x948C	0x4F2F	#CJK UNIFIED IDEOGRAPH
+0x948D	0x5265	#CJK UNIFIED IDEOGRAPH
+0x948E	0x535A	#CJK UNIFIED IDEOGRAPH
+0x948F	0x62CD	#CJK UNIFIED IDEOGRAPH
+0x9490	0x67CF	#CJK UNIFIED IDEOGRAPH
+0x9491	0x6CCA	#CJK UNIFIED IDEOGRAPH
+0x9492	0x767D	#CJK UNIFIED IDEOGRAPH
+0x9493	0x7B94	#CJK UNIFIED IDEOGRAPH
+0x9494	0x7C95	#CJK UNIFIED IDEOGRAPH
+0x9495	0x8236	#CJK UNIFIED IDEOGRAPH
+0x9496	0x8584	#CJK UNIFIED IDEOGRAPH
+0x9497	0x8FEB	#CJK UNIFIED IDEOGRAPH
+0x9498	0x66DD	#CJK UNIFIED IDEOGRAPH
+0x9499	0x6F20	#CJK UNIFIED IDEOGRAPH
+0x949A	0x7206	#CJK UNIFIED IDEOGRAPH
+0x949B	0x7E1B	#CJK UNIFIED IDEOGRAPH
+0x949C	0x83AB	#CJK UNIFIED IDEOGRAPH
+0x949D	0x99C1	#CJK UNIFIED IDEOGRAPH
+0x949E	0x9EA6	#CJK UNIFIED IDEOGRAPH
+0x949F	0x51FD	#CJK UNIFIED IDEOGRAPH
+0x94A0	0x7BB1	#CJK UNIFIED IDEOGRAPH
+0x94A1	0x7872	#CJK UNIFIED IDEOGRAPH
+0x94A2	0x7BB8	#CJK UNIFIED IDEOGRAPH
+0x94A3	0x8087	#CJK UNIFIED IDEOGRAPH
+0x94A4	0x7B48	#CJK UNIFIED IDEOGRAPH
+0x94A5	0x6AE8	#CJK UNIFIED IDEOGRAPH
+0x94A6	0x5E61	#CJK UNIFIED IDEOGRAPH
+0x94A7	0x808C	#CJK UNIFIED IDEOGRAPH
+0x94A8	0x7551	#CJK UNIFIED IDEOGRAPH
+0x94A9	0x7560	#CJK UNIFIED IDEOGRAPH
+0x94AA	0x516B	#CJK UNIFIED IDEOGRAPH
+0x94AB	0x9262	#CJK UNIFIED IDEOGRAPH
+0x94AC	0x6E8C	#CJK UNIFIED IDEOGRAPH
+0x94AD	0x767A	#CJK UNIFIED IDEOGRAPH
+0x94AE	0x9197	#CJK UNIFIED IDEOGRAPH
+0x94AF	0x9AEA	#CJK UNIFIED IDEOGRAPH
+0x94B0	0x4F10	#CJK UNIFIED IDEOGRAPH
+0x94B1	0x7F70	#CJK UNIFIED IDEOGRAPH
+0x94B2	0x629C	#CJK UNIFIED IDEOGRAPH
+0x94B3	0x7B4F	#CJK UNIFIED IDEOGRAPH
+0x94B4	0x95A5	#CJK UNIFIED IDEOGRAPH
+0x94B5	0x9CE9	#CJK UNIFIED IDEOGRAPH
+0x94B6	0x567A	#CJK UNIFIED IDEOGRAPH
+0x94B7	0x5859	#CJK UNIFIED IDEOGRAPH
+0x94B8	0x86E4	#CJK UNIFIED IDEOGRAPH
+0x94B9	0x96BC	#CJK UNIFIED IDEOGRAPH
+0x94BA	0x4F34	#CJK UNIFIED IDEOGRAPH
+0x94BB	0x5224	#CJK UNIFIED IDEOGRAPH
+0x94BC	0x534A	#CJK UNIFIED IDEOGRAPH
+0x94BD	0x53CD	#CJK UNIFIED IDEOGRAPH
+0x94BE	0x53DB	#CJK UNIFIED IDEOGRAPH
+0x94BF	0x5E06	#CJK UNIFIED IDEOGRAPH
+0x94C0	0x642C	#CJK UNIFIED IDEOGRAPH
+0x94C1	0x6591	#CJK UNIFIED IDEOGRAPH
+0x94C2	0x677F	#CJK UNIFIED IDEOGRAPH
+0x94C3	0x6C3E	#CJK UNIFIED IDEOGRAPH
+0x94C4	0x6C4E	#CJK UNIFIED IDEOGRAPH
+0x94C5	0x7248	#CJK UNIFIED IDEOGRAPH
+0x94C6	0x72AF	#CJK UNIFIED IDEOGRAPH
+0x94C7	0x73ED	#CJK UNIFIED IDEOGRAPH
+0x94C8	0x7554	#CJK UNIFIED IDEOGRAPH
+0x94C9	0x7E41	#CJK UNIFIED IDEOGRAPH
+0x94CA	0x822C	#CJK UNIFIED IDEOGRAPH
+0x94CB	0x85E9	#CJK UNIFIED IDEOGRAPH
+0x94CC	0x8CA9	#CJK UNIFIED IDEOGRAPH
+0x94CD	0x7BC4	#CJK UNIFIED IDEOGRAPH
+0x94CE	0x91C6	#CJK UNIFIED IDEOGRAPH
+0x94CF	0x7169	#CJK UNIFIED IDEOGRAPH
+0x94D0	0x9812	#CJK UNIFIED IDEOGRAPH
+0x94D1	0x98EF	#CJK UNIFIED IDEOGRAPH
+0x94D2	0x633D	#CJK UNIFIED IDEOGRAPH
+0x94D3	0x6669	#CJK UNIFIED IDEOGRAPH
+0x94D4	0x756A	#CJK UNIFIED IDEOGRAPH
+0x94D5	0x76E4	#CJK UNIFIED IDEOGRAPH
+0x94D6	0x78D0	#CJK UNIFIED IDEOGRAPH
+0x94D7	0x8543	#CJK UNIFIED IDEOGRAPH
+0x94D8	0x86EE	#CJK UNIFIED IDEOGRAPH
+0x94D9	0x532A	#CJK UNIFIED IDEOGRAPH
+0x94DA	0x5351	#CJK UNIFIED IDEOGRAPH
+0x94DB	0x5426	#CJK UNIFIED IDEOGRAPH
+0x94DC	0x5983	#CJK UNIFIED IDEOGRAPH
+0x94DD	0x5E87	#CJK UNIFIED IDEOGRAPH
+0x94DE	0x5F7C	#CJK UNIFIED IDEOGRAPH
+0x94DF	0x60B2	#CJK UNIFIED IDEOGRAPH
+0x94E0	0x6249	#CJK UNIFIED IDEOGRAPH
+0x94E1	0x6279	#CJK UNIFIED IDEOGRAPH
+0x94E2	0x62AB	#CJK UNIFIED IDEOGRAPH
+0x94E3	0x6590	#CJK UNIFIED IDEOGRAPH
+0x94E4	0x6BD4	#CJK UNIFIED IDEOGRAPH
+0x94E5	0x6CCC	#CJK UNIFIED IDEOGRAPH
+0x94E6	0x75B2	#CJK UNIFIED IDEOGRAPH
+0x94E7	0x76AE	#CJK UNIFIED IDEOGRAPH
+0x94E8	0x7891	#CJK UNIFIED IDEOGRAPH
+0x94E9	0x79D8	#CJK UNIFIED IDEOGRAPH
+0x94EA	0x7DCB	#CJK UNIFIED IDEOGRAPH
+0x94EB	0x7F77	#CJK UNIFIED IDEOGRAPH
+0x94EC	0x80A5	#CJK UNIFIED IDEOGRAPH
+0x94ED	0x88AB	#CJK UNIFIED IDEOGRAPH
+0x94EE	0x8AB9	#CJK UNIFIED IDEOGRAPH
+0x94EF	0x8CBB	#CJK UNIFIED IDEOGRAPH
+0x94F0	0x907F	#CJK UNIFIED IDEOGRAPH
+0x94F1	0x975E	#CJK UNIFIED IDEOGRAPH
+0x94F2	0x98DB	#CJK UNIFIED IDEOGRAPH
+0x94F3	0x6A0B	#CJK UNIFIED IDEOGRAPH
+0x94F4	0x7C38	#CJK UNIFIED IDEOGRAPH
+0x94F5	0x5099	#CJK UNIFIED IDEOGRAPH
+0x94F6	0x5C3E	#CJK UNIFIED IDEOGRAPH
+0x94F7	0x5FAE	#CJK UNIFIED IDEOGRAPH
+0x94F8	0x6787	#CJK UNIFIED IDEOGRAPH
+0x94F9	0x6BD8	#CJK UNIFIED IDEOGRAPH
+0x94FA	0x7435	#CJK UNIFIED IDEOGRAPH
+0x94FB	0x7709	#CJK UNIFIED IDEOGRAPH
+0x94FC	0x7F8E	#CJK UNIFIED IDEOGRAPH
+0x9540	0x9F3B	#CJK UNIFIED IDEOGRAPH
+0x9541	0x67CA	#CJK UNIFIED IDEOGRAPH
+0x9542	0x7A17	#CJK UNIFIED IDEOGRAPH
+0x9543	0x5339	#CJK UNIFIED IDEOGRAPH
+0x9544	0x758B	#CJK UNIFIED IDEOGRAPH
+0x9545	0x9AED	#CJK UNIFIED IDEOGRAPH
+0x9546	0x5F66	#CJK UNIFIED IDEOGRAPH
+0x9547	0x819D	#CJK UNIFIED IDEOGRAPH
+0x9548	0x83F1	#CJK UNIFIED IDEOGRAPH
+0x9549	0x8098	#CJK UNIFIED IDEOGRAPH
+0x954A	0x5F3C	#CJK UNIFIED IDEOGRAPH
+0x954B	0x5FC5	#CJK UNIFIED IDEOGRAPH
+0x954C	0x7562	#CJK UNIFIED IDEOGRAPH
+0x954D	0x7B46	#CJK UNIFIED IDEOGRAPH
+0x954E	0x903C	#CJK UNIFIED IDEOGRAPH
+0x954F	0x6867	#CJK UNIFIED IDEOGRAPH
+0x9550	0x59EB	#CJK UNIFIED IDEOGRAPH
+0x9551	0x5A9B	#CJK UNIFIED IDEOGRAPH
+0x9552	0x7D10	#CJK UNIFIED IDEOGRAPH
+0x9553	0x767E	#CJK UNIFIED IDEOGRAPH
+0x9554	0x8B2C	#CJK UNIFIED IDEOGRAPH
+0x9555	0x4FF5	#CJK UNIFIED IDEOGRAPH
+0x9556	0x5F6A	#CJK UNIFIED IDEOGRAPH
+0x9557	0x6A19	#CJK UNIFIED IDEOGRAPH
+0x9558	0x6C37	#CJK UNIFIED IDEOGRAPH
+0x9559	0x6F02	#CJK UNIFIED IDEOGRAPH
+0x955A	0x74E2	#CJK UNIFIED IDEOGRAPH
+0x955B	0x7968	#CJK UNIFIED IDEOGRAPH
+0x955C	0x8868	#CJK UNIFIED IDEOGRAPH
+0x955D	0x8A55	#CJK UNIFIED IDEOGRAPH
+0x955E	0x8C79	#CJK UNIFIED IDEOGRAPH
+0x955F	0x5EDF	#CJK UNIFIED IDEOGRAPH
+0x9560	0x63CF	#CJK UNIFIED IDEOGRAPH
+0x9561	0x75C5	#CJK UNIFIED IDEOGRAPH
+0x9562	0x79D2	#CJK UNIFIED IDEOGRAPH
+0x9563	0x82D7	#CJK UNIFIED IDEOGRAPH
+0x9564	0x9328	#CJK UNIFIED IDEOGRAPH
+0x9565	0x92F2	#CJK UNIFIED IDEOGRAPH
+0x9566	0x849C	#CJK UNIFIED IDEOGRAPH
+0x9567	0x86ED	#CJK UNIFIED IDEOGRAPH
+0x9568	0x9C2D	#CJK UNIFIED IDEOGRAPH
+0x9569	0x54C1	#CJK UNIFIED IDEOGRAPH
+0x956A	0x5F6C	#CJK UNIFIED IDEOGRAPH
+0x956B	0x658C	#CJK UNIFIED IDEOGRAPH
+0x956C	0x6D5C	#CJK UNIFIED IDEOGRAPH
+0x956D	0x7015	#CJK UNIFIED IDEOGRAPH
+0x956E	0x8CA7	#CJK UNIFIED IDEOGRAPH
+0x956F	0x8CD3	#CJK UNIFIED IDEOGRAPH
+0x9570	0x983B	#CJK UNIFIED IDEOGRAPH
+0x9571	0x654F	#CJK UNIFIED IDEOGRAPH
+0x9572	0x74F6	#CJK UNIFIED IDEOGRAPH
+0x9573	0x4E0D	#CJK UNIFIED IDEOGRAPH
+0x9574	0x4ED8	#CJK UNIFIED IDEOGRAPH
+0x9575	0x57E0	#CJK UNIFIED IDEOGRAPH
+0x9576	0x592B	#CJK UNIFIED IDEOGRAPH
+0x9577	0x5A66	#CJK UNIFIED IDEOGRAPH
+0x9578	0x5BCC	#CJK UNIFIED IDEOGRAPH
+0x9579	0x51A8	#CJK UNIFIED IDEOGRAPH
+0x957A	0x5E03	#CJK UNIFIED IDEOGRAPH
+0x957B	0x5E9C	#CJK UNIFIED IDEOGRAPH
+0x957C	0x6016	#CJK UNIFIED IDEOGRAPH
+0x957D	0x6276	#CJK UNIFIED IDEOGRAPH
+0x957E	0x6577	#CJK UNIFIED IDEOGRAPH
+0x9580	0x65A7	#CJK UNIFIED IDEOGRAPH
+0x9581	0x666E	#CJK UNIFIED IDEOGRAPH
+0x9582	0x6D6E	#CJK UNIFIED IDEOGRAPH
+0x9583	0x7236	#CJK UNIFIED IDEOGRAPH
+0x9584	0x7B26	#CJK UNIFIED IDEOGRAPH
+0x9585	0x8150	#CJK UNIFIED IDEOGRAPH
+0x9586	0x819A	#CJK UNIFIED IDEOGRAPH
+0x9587	0x8299	#CJK UNIFIED IDEOGRAPH
+0x9588	0x8B5C	#CJK UNIFIED IDEOGRAPH
+0x9589	0x8CA0	#CJK UNIFIED IDEOGRAPH
+0x958A	0x8CE6	#CJK UNIFIED IDEOGRAPH
+0x958B	0x8D74	#CJK UNIFIED IDEOGRAPH
+0x958C	0x961C	#CJK UNIFIED IDEOGRAPH
+0x958D	0x9644	#CJK UNIFIED IDEOGRAPH
+0x958E	0x4FAE	#CJK UNIFIED IDEOGRAPH
+0x958F	0x64AB	#CJK UNIFIED IDEOGRAPH
+0x9590	0x6B66	#CJK UNIFIED IDEOGRAPH
+0x9591	0x821E	#CJK UNIFIED IDEOGRAPH
+0x9592	0x8461	#CJK UNIFIED IDEOGRAPH
+0x9593	0x856A	#CJK UNIFIED IDEOGRAPH
+0x9594	0x90E8	#CJK UNIFIED IDEOGRAPH
+0x9595	0x5C01	#CJK UNIFIED IDEOGRAPH
+0x9596	0x6953	#CJK UNIFIED IDEOGRAPH
+0x9597	0x98A8	#CJK UNIFIED IDEOGRAPH
+0x9598	0x847A	#CJK UNIFIED IDEOGRAPH
+0x9599	0x8557	#CJK UNIFIED IDEOGRAPH
+0x959A	0x4F0F	#CJK UNIFIED IDEOGRAPH
+0x959B	0x526F	#CJK UNIFIED IDEOGRAPH
+0x959C	0x5FA9	#CJK UNIFIED IDEOGRAPH
+0x959D	0x5E45	#CJK UNIFIED IDEOGRAPH
+0x959E	0x670D	#CJK UNIFIED IDEOGRAPH
+0x959F	0x798F	#CJK UNIFIED IDEOGRAPH
+0x95A0	0x8179	#CJK UNIFIED IDEOGRAPH
+0x95A1	0x8907	#CJK UNIFIED IDEOGRAPH
+0x95A2	0x8986	#CJK UNIFIED IDEOGRAPH
+0x95A3	0x6DF5	#CJK UNIFIED IDEOGRAPH
+0x95A4	0x5F17	#CJK UNIFIED IDEOGRAPH
+0x95A5	0x6255	#CJK UNIFIED IDEOGRAPH
+0x95A6	0x6CB8	#CJK UNIFIED IDEOGRAPH
+0x95A7	0x4ECF	#CJK UNIFIED IDEOGRAPH
+0x95A8	0x7269	#CJK UNIFIED IDEOGRAPH
+0x95A9	0x9B92	#CJK UNIFIED IDEOGRAPH
+0x95AA	0x5206	#CJK UNIFIED IDEOGRAPH
+0x95AB	0x543B	#CJK UNIFIED IDEOGRAPH
+0x95AC	0x5674	#CJK UNIFIED IDEOGRAPH
+0x95AD	0x58B3	#CJK UNIFIED IDEOGRAPH
+0x95AE	0x61A4	#CJK UNIFIED IDEOGRAPH
+0x95AF	0x626E	#CJK UNIFIED IDEOGRAPH
+0x95B0	0x711A	#CJK UNIFIED IDEOGRAPH
+0x95B1	0x596E	#CJK UNIFIED IDEOGRAPH
+0x95B2	0x7C89	#CJK UNIFIED IDEOGRAPH
+0x95B3	0x7CDE	#CJK UNIFIED IDEOGRAPH
+0x95B4	0x7D1B	#CJK UNIFIED IDEOGRAPH
+0x95B5	0x96F0	#CJK UNIFIED IDEOGRAPH
+0x95B6	0x6587	#CJK UNIFIED IDEOGRAPH
+0x95B7	0x805E	#CJK UNIFIED IDEOGRAPH
+0x95B8	0x4E19	#CJK UNIFIED IDEOGRAPH
+0x95B9	0x4F75	#CJK UNIFIED IDEOGRAPH
+0x95BA	0x5175	#CJK UNIFIED IDEOGRAPH
+0x95BB	0x5840	#CJK UNIFIED IDEOGRAPH
+0x95BC	0x5E63	#CJK UNIFIED IDEOGRAPH
+0x95BD	0x5E73	#CJK UNIFIED IDEOGRAPH
+0x95BE	0x5F0A	#CJK UNIFIED IDEOGRAPH
+0x95BF	0x67C4	#CJK UNIFIED IDEOGRAPH
+0x95C0	0x4E26	#CJK UNIFIED IDEOGRAPH
+0x95C1	0x853D	#CJK UNIFIED IDEOGRAPH
+0x95C2	0x9589	#CJK UNIFIED IDEOGRAPH
+0x95C3	0x965B	#CJK UNIFIED IDEOGRAPH
+0x95C4	0x7C73	#CJK UNIFIED IDEOGRAPH
+0x95C5	0x9801	#CJK UNIFIED IDEOGRAPH
+0x95C6	0x50FB	#CJK UNIFIED IDEOGRAPH
+0x95C7	0x58C1	#CJK UNIFIED IDEOGRAPH
+0x95C8	0x7656	#CJK UNIFIED IDEOGRAPH
+0x95C9	0x78A7	#CJK UNIFIED IDEOGRAPH
+0x95CA	0x5225	#CJK UNIFIED IDEOGRAPH
+0x95CB	0x77A5	#CJK UNIFIED IDEOGRAPH
+0x95CC	0x8511	#CJK UNIFIED IDEOGRAPH
+0x95CD	0x7B86	#CJK UNIFIED IDEOGRAPH
+0x95CE	0x504F	#CJK UNIFIED IDEOGRAPH
+0x95CF	0x5909	#CJK UNIFIED IDEOGRAPH
+0x95D0	0x7247	#CJK UNIFIED IDEOGRAPH
+0x95D1	0x7BC7	#CJK UNIFIED IDEOGRAPH
+0x95D2	0x7DE8	#CJK UNIFIED IDEOGRAPH
+0x95D3	0x8FBA	#CJK UNIFIED IDEOGRAPH
+0x95D4	0x8FD4	#CJK UNIFIED IDEOGRAPH
+0x95D5	0x904D	#CJK UNIFIED IDEOGRAPH
+0x95D6	0x4FBF	#CJK UNIFIED IDEOGRAPH
+0x95D7	0x52C9	#CJK UNIFIED IDEOGRAPH
+0x95D8	0x5A29	#CJK UNIFIED IDEOGRAPH
+0x95D9	0x5F01	#CJK UNIFIED IDEOGRAPH
+0x95DA	0x97AD	#CJK UNIFIED IDEOGRAPH
+0x95DB	0x4FDD	#CJK UNIFIED IDEOGRAPH
+0x95DC	0x8217	#CJK UNIFIED IDEOGRAPH
+0x95DD	0x92EA	#CJK UNIFIED IDEOGRAPH
+0x95DE	0x5703	#CJK UNIFIED IDEOGRAPH
+0x95DF	0x6355	#CJK UNIFIED IDEOGRAPH
+0x95E0	0x6B69	#CJK UNIFIED IDEOGRAPH
+0x95E1	0x752B	#CJK UNIFIED IDEOGRAPH
+0x95E2	0x88DC	#CJK UNIFIED IDEOGRAPH
+0x95E3	0x8F14	#CJK UNIFIED IDEOGRAPH
+0x95E4	0x7A42	#CJK UNIFIED IDEOGRAPH
+0x95E5	0x52DF	#CJK UNIFIED IDEOGRAPH
+0x95E6	0x5893	#CJK UNIFIED IDEOGRAPH
+0x95E7	0x6155	#CJK UNIFIED IDEOGRAPH
+0x95E8	0x620A	#CJK UNIFIED IDEOGRAPH
+0x95E9	0x66AE	#CJK UNIFIED IDEOGRAPH
+0x95EA	0x6BCD	#CJK UNIFIED IDEOGRAPH
+0x95EB	0x7C3F	#CJK UNIFIED IDEOGRAPH
+0x95EC	0x83E9	#CJK UNIFIED IDEOGRAPH
+0x95ED	0x5023	#CJK UNIFIED IDEOGRAPH
+0x95EE	0x4FF8	#CJK UNIFIED IDEOGRAPH
+0x95EF	0x5305	#CJK UNIFIED IDEOGRAPH
+0x95F0	0x5446	#CJK UNIFIED IDEOGRAPH
+0x95F1	0x5831	#CJK UNIFIED IDEOGRAPH
+0x95F2	0x5949	#CJK UNIFIED IDEOGRAPH
+0x95F3	0x5B9D	#CJK UNIFIED IDEOGRAPH
+0x95F4	0x5CF0	#CJK UNIFIED IDEOGRAPH
+0x95F5	0x5CEF	#CJK UNIFIED IDEOGRAPH
+0x95F6	0x5D29	#CJK UNIFIED IDEOGRAPH
+0x95F7	0x5E96	#CJK UNIFIED IDEOGRAPH
+0x95F8	0x62B1	#CJK UNIFIED IDEOGRAPH
+0x95F9	0x6367	#CJK UNIFIED IDEOGRAPH
+0x95FA	0x653E	#CJK UNIFIED IDEOGRAPH
+0x95FB	0x65B9	#CJK UNIFIED IDEOGRAPH
+0x95FC	0x670B	#CJK UNIFIED IDEOGRAPH
+0x9640	0x6CD5	#CJK UNIFIED IDEOGRAPH
+0x9641	0x6CE1	#CJK UNIFIED IDEOGRAPH
+0x9642	0x70F9	#CJK UNIFIED IDEOGRAPH
+0x9643	0x7832	#CJK UNIFIED IDEOGRAPH
+0x9644	0x7E2B	#CJK UNIFIED IDEOGRAPH
+0x9645	0x80DE	#CJK UNIFIED IDEOGRAPH
+0x9646	0x82B3	#CJK UNIFIED IDEOGRAPH
+0x9647	0x840C	#CJK UNIFIED IDEOGRAPH
+0x9648	0x84EC	#CJK UNIFIED IDEOGRAPH
+0x9649	0x8702	#CJK UNIFIED IDEOGRAPH
+0x964A	0x8912	#CJK UNIFIED IDEOGRAPH
+0x964B	0x8A2A	#CJK UNIFIED IDEOGRAPH
+0x964C	0x8C4A	#CJK UNIFIED IDEOGRAPH
+0x964D	0x90A6	#CJK UNIFIED IDEOGRAPH
+0x964E	0x92D2	#CJK UNIFIED IDEOGRAPH
+0x964F	0x98FD	#CJK UNIFIED IDEOGRAPH
+0x9650	0x9CF3	#CJK UNIFIED IDEOGRAPH
+0x9651	0x9D6C	#CJK UNIFIED IDEOGRAPH
+0x9652	0x4E4F	#CJK UNIFIED IDEOGRAPH
+0x9653	0x4EA1	#CJK UNIFIED IDEOGRAPH
+0x9654	0x508D	#CJK UNIFIED IDEOGRAPH
+0x9655	0x5256	#CJK UNIFIED IDEOGRAPH
+0x9656	0x574A	#CJK UNIFIED IDEOGRAPH
+0x9657	0x59A8	#CJK UNIFIED IDEOGRAPH
+0x9658	0x5E3D	#CJK UNIFIED IDEOGRAPH
+0x9659	0x5FD8	#CJK UNIFIED IDEOGRAPH
+0x965A	0x5FD9	#CJK UNIFIED IDEOGRAPH
+0x965B	0x623F	#CJK UNIFIED IDEOGRAPH
+0x965C	0x66B4	#CJK UNIFIED IDEOGRAPH
+0x965D	0x671B	#CJK UNIFIED IDEOGRAPH
+0x965E	0x67D0	#CJK UNIFIED IDEOGRAPH
+0x965F	0x68D2	#CJK UNIFIED IDEOGRAPH
+0x9660	0x5192	#CJK UNIFIED IDEOGRAPH
+0x9661	0x7D21	#CJK UNIFIED IDEOGRAPH
+0x9662	0x80AA	#CJK UNIFIED IDEOGRAPH
+0x9663	0x81A8	#CJK UNIFIED IDEOGRAPH
+0x9664	0x8B00	#CJK UNIFIED IDEOGRAPH
+0x9665	0x8C8C	#CJK UNIFIED IDEOGRAPH
+0x9666	0x8CBF	#CJK UNIFIED IDEOGRAPH
+0x9667	0x927E	#CJK UNIFIED IDEOGRAPH
+0x9668	0x9632	#CJK UNIFIED IDEOGRAPH
+0x9669	0x5420	#CJK UNIFIED IDEOGRAPH
+0x966A	0x982C	#CJK UNIFIED IDEOGRAPH
+0x966B	0x5317	#CJK UNIFIED IDEOGRAPH
+0x966C	0x50D5	#CJK UNIFIED IDEOGRAPH
+0x966D	0x535C	#CJK UNIFIED IDEOGRAPH
+0x966E	0x58A8	#CJK UNIFIED IDEOGRAPH
+0x966F	0x64B2	#CJK UNIFIED IDEOGRAPH
+0x9670	0x6734	#CJK UNIFIED IDEOGRAPH
+0x9671	0x7267	#CJK UNIFIED IDEOGRAPH
+0x9672	0x7766	#CJK UNIFIED IDEOGRAPH
+0x9673	0x7A46	#CJK UNIFIED IDEOGRAPH
+0x9674	0x91E6	#CJK UNIFIED IDEOGRAPH
+0x9675	0x52C3	#CJK UNIFIED IDEOGRAPH
+0x9676	0x6CA1	#CJK UNIFIED IDEOGRAPH
+0x9677	0x6B86	#CJK UNIFIED IDEOGRAPH
+0x9678	0x5800	#CJK UNIFIED IDEOGRAPH
+0x9679	0x5E4C	#CJK UNIFIED IDEOGRAPH
+0x967A	0x5954	#CJK UNIFIED IDEOGRAPH
+0x967B	0x672C	#CJK UNIFIED IDEOGRAPH
+0x967C	0x7FFB	#CJK UNIFIED IDEOGRAPH
+0x967D	0x51E1	#CJK UNIFIED IDEOGRAPH
+0x967E	0x76C6	#CJK UNIFIED IDEOGRAPH
+0x9680	0x6469	#CJK UNIFIED IDEOGRAPH
+0x9681	0x78E8	#CJK UNIFIED IDEOGRAPH
+0x9682	0x9B54	#CJK UNIFIED IDEOGRAPH
+0x9683	0x9EBB	#CJK UNIFIED IDEOGRAPH
+0x9684	0x57CB	#CJK UNIFIED IDEOGRAPH
+0x9685	0x59B9	#CJK UNIFIED IDEOGRAPH
+0x9686	0x6627	#CJK UNIFIED IDEOGRAPH
+0x9687	0x679A	#CJK UNIFIED IDEOGRAPH
+0x9688	0x6BCE	#CJK UNIFIED IDEOGRAPH
+0x9689	0x54E9	#CJK UNIFIED IDEOGRAPH
+0x968A	0x69D9	#CJK UNIFIED IDEOGRAPH
+0x968B	0x5E55	#CJK UNIFIED IDEOGRAPH
+0x968C	0x819C	#CJK UNIFIED IDEOGRAPH
+0x968D	0x6795	#CJK UNIFIED IDEOGRAPH
+0x968E	0x9BAA	#CJK UNIFIED IDEOGRAPH
+0x968F	0x67FE	#CJK UNIFIED IDEOGRAPH
+0x9690	0x9C52	#CJK UNIFIED IDEOGRAPH
+0x9691	0x685D	#CJK UNIFIED IDEOGRAPH
+0x9692	0x4EA6	#CJK UNIFIED IDEOGRAPH
+0x9693	0x4FE3	#CJK UNIFIED IDEOGRAPH
+0x9694	0x53C8	#CJK UNIFIED IDEOGRAPH
+0x9695	0x62B9	#CJK UNIFIED IDEOGRAPH
+0x9696	0x672B	#CJK UNIFIED IDEOGRAPH
+0x9697	0x6CAB	#CJK UNIFIED IDEOGRAPH
+0x9698	0x8FC4	#CJK UNIFIED IDEOGRAPH
+0x9699	0x4FAD	#CJK UNIFIED IDEOGRAPH
+0x969A	0x7E6D	#CJK UNIFIED IDEOGRAPH
+0x969B	0x9EBF	#CJK UNIFIED IDEOGRAPH
+0x969C	0x4E07	#CJK UNIFIED IDEOGRAPH
+0x969D	0x6162	#CJK UNIFIED IDEOGRAPH
+0x969E	0x6E80	#CJK UNIFIED IDEOGRAPH
+0x969F	0x6F2B	#CJK UNIFIED IDEOGRAPH
+0x96A0	0x8513	#CJK UNIFIED IDEOGRAPH
+0x96A1	0x5473	#CJK UNIFIED IDEOGRAPH
+0x96A2	0x672A	#CJK UNIFIED IDEOGRAPH
+0x96A3	0x9B45	#CJK UNIFIED IDEOGRAPH
+0x96A4	0x5DF3	#CJK UNIFIED IDEOGRAPH
+0x96A5	0x7B95	#CJK UNIFIED IDEOGRAPH
+0x96A6	0x5CAC	#CJK UNIFIED IDEOGRAPH
+0x96A7	0x5BC6	#CJK UNIFIED IDEOGRAPH
+0x96A8	0x871C	#CJK UNIFIED IDEOGRAPH
+0x96A9	0x6E4A	#CJK UNIFIED IDEOGRAPH
+0x96AA	0x84D1	#CJK UNIFIED IDEOGRAPH
+0x96AB	0x7A14	#CJK UNIFIED IDEOGRAPH
+0x96AC	0x8108	#CJK UNIFIED IDEOGRAPH
+0x96AD	0x5999	#CJK UNIFIED IDEOGRAPH
+0x96AE	0x7C8D	#CJK UNIFIED IDEOGRAPH
+0x96AF	0x6C11	#CJK UNIFIED IDEOGRAPH
+0x96B0	0x7720	#CJK UNIFIED IDEOGRAPH
+0x96B1	0x52D9	#CJK UNIFIED IDEOGRAPH
+0x96B2	0x5922	#CJK UNIFIED IDEOGRAPH
+0x96B3	0x7121	#CJK UNIFIED IDEOGRAPH
+0x96B4	0x725F	#CJK UNIFIED IDEOGRAPH
+0x96B5	0x77DB	#CJK UNIFIED IDEOGRAPH
+0x96B6	0x9727	#CJK UNIFIED IDEOGRAPH
+0x96B7	0x9D61	#CJK UNIFIED IDEOGRAPH
+0x96B8	0x690B	#CJK UNIFIED IDEOGRAPH
+0x96B9	0x5A7F	#CJK UNIFIED IDEOGRAPH
+0x96BA	0x5A18	#CJK UNIFIED IDEOGRAPH
+0x96BB	0x51A5	#CJK UNIFIED IDEOGRAPH
+0x96BC	0x540D	#CJK UNIFIED IDEOGRAPH
+0x96BD	0x547D	#CJK UNIFIED IDEOGRAPH
+0x96BE	0x660E	#CJK UNIFIED IDEOGRAPH
+0x96BF	0x76DF	#CJK UNIFIED IDEOGRAPH
+0x96C0	0x8FF7	#CJK UNIFIED IDEOGRAPH
+0x96C1	0x9298	#CJK UNIFIED IDEOGRAPH
+0x96C2	0x9CF4	#CJK UNIFIED IDEOGRAPH
+0x96C3	0x59EA	#CJK UNIFIED IDEOGRAPH
+0x96C4	0x725D	#CJK UNIFIED IDEOGRAPH
+0x96C5	0x6EC5	#CJK UNIFIED IDEOGRAPH
+0x96C6	0x514D	#CJK UNIFIED IDEOGRAPH
+0x96C7	0x68C9	#CJK UNIFIED IDEOGRAPH
+0x96C8	0x7DBF	#CJK UNIFIED IDEOGRAPH
+0x96C9	0x7DEC	#CJK UNIFIED IDEOGRAPH
+0x96CA	0x9762	#CJK UNIFIED IDEOGRAPH
+0x96CB	0x9EBA	#CJK UNIFIED IDEOGRAPH
+0x96CC	0x6478	#CJK UNIFIED IDEOGRAPH
+0x96CD	0x6A21	#CJK UNIFIED IDEOGRAPH
+0x96CE	0x8302	#CJK UNIFIED IDEOGRAPH
+0x96CF	0x5984	#CJK UNIFIED IDEOGRAPH
+0x96D0	0x5B5F	#CJK UNIFIED IDEOGRAPH
+0x96D1	0x6BDB	#CJK UNIFIED IDEOGRAPH
+0x96D2	0x731B	#CJK UNIFIED IDEOGRAPH
+0x96D3	0x76F2	#CJK UNIFIED IDEOGRAPH
+0x96D4	0x7DB2	#CJK UNIFIED IDEOGRAPH
+0x96D5	0x8017	#CJK UNIFIED IDEOGRAPH
+0x96D6	0x8499	#CJK UNIFIED IDEOGRAPH
+0x96D7	0x5132	#CJK UNIFIED IDEOGRAPH
+0x96D8	0x6728	#CJK UNIFIED IDEOGRAPH
+0x96D9	0x9ED9	#CJK UNIFIED IDEOGRAPH
+0x96DA	0x76EE	#CJK UNIFIED IDEOGRAPH
+0x96DB	0x6762	#CJK UNIFIED IDEOGRAPH
+0x96DC	0x52FF	#CJK UNIFIED IDEOGRAPH
+0x96DD	0x9905	#CJK UNIFIED IDEOGRAPH
+0x96DE	0x5C24	#CJK UNIFIED IDEOGRAPH
+0x96DF	0x623B	#CJK UNIFIED IDEOGRAPH
+0x96E0	0x7C7E	#CJK UNIFIED IDEOGRAPH
+0x96E1	0x8CB0	#CJK UNIFIED IDEOGRAPH
+0x96E2	0x554F	#CJK UNIFIED IDEOGRAPH
+0x96E3	0x60B6	#CJK UNIFIED IDEOGRAPH
+0x96E4	0x7D0B	#CJK UNIFIED IDEOGRAPH
+0x96E5	0x9580	#CJK UNIFIED IDEOGRAPH
+0x96E6	0x5301	#CJK UNIFIED IDEOGRAPH
+0x96E7	0x4E5F	#CJK UNIFIED IDEOGRAPH
+0x96E8	0x51B6	#CJK UNIFIED IDEOGRAPH
+0x96E9	0x591C	#CJK UNIFIED IDEOGRAPH
+0x96EA	0x723A	#CJK UNIFIED IDEOGRAPH
+0x96EB	0x8036	#CJK UNIFIED IDEOGRAPH
+0x96EC	0x91CE	#CJK UNIFIED IDEOGRAPH
+0x96ED	0x5F25	#CJK UNIFIED IDEOGRAPH
+0x96EE	0x77E2	#CJK UNIFIED IDEOGRAPH
+0x96EF	0x5384	#CJK UNIFIED IDEOGRAPH
+0x96F0	0x5F79	#CJK UNIFIED IDEOGRAPH
+0x96F1	0x7D04	#CJK UNIFIED IDEOGRAPH
+0x96F2	0x85AC	#CJK UNIFIED IDEOGRAPH
+0x96F3	0x8A33	#CJK UNIFIED IDEOGRAPH
+0x96F4	0x8E8D	#CJK UNIFIED IDEOGRAPH
+0x96F5	0x9756	#CJK UNIFIED IDEOGRAPH
+0x96F6	0x67F3	#CJK UNIFIED IDEOGRAPH
+0x96F7	0x85AE	#CJK UNIFIED IDEOGRAPH
+0x96F8	0x9453	#CJK UNIFIED IDEOGRAPH
+0x96F9	0x6109	#CJK UNIFIED IDEOGRAPH
+0x96FA	0x6108	#CJK UNIFIED IDEOGRAPH
+0x96FB	0x6CB9	#CJK UNIFIED IDEOGRAPH
+0x96FC	0x7652	#CJK UNIFIED IDEOGRAPH
+0x9740	0x8AED	#CJK UNIFIED IDEOGRAPH
+0x9741	0x8F38	#CJK UNIFIED IDEOGRAPH
+0x9742	0x552F	#CJK UNIFIED IDEOGRAPH
+0x9743	0x4F51	#CJK UNIFIED IDEOGRAPH
+0x9744	0x512A	#CJK UNIFIED IDEOGRAPH
+0x9745	0x52C7	#CJK UNIFIED IDEOGRAPH
+0x9746	0x53CB	#CJK UNIFIED IDEOGRAPH
+0x9747	0x5BA5	#CJK UNIFIED IDEOGRAPH
+0x9748	0x5E7D	#CJK UNIFIED IDEOGRAPH
+0x9749	0x60A0	#CJK UNIFIED IDEOGRAPH
+0x974A	0x6182	#CJK UNIFIED IDEOGRAPH
+0x974B	0x63D6	#CJK UNIFIED IDEOGRAPH
+0x974C	0x6709	#CJK UNIFIED IDEOGRAPH
+0x974D	0x67DA	#CJK UNIFIED IDEOGRAPH
+0x974E	0x6E67	#CJK UNIFIED IDEOGRAPH
+0x974F	0x6D8C	#CJK UNIFIED IDEOGRAPH
+0x9750	0x7336	#CJK UNIFIED IDEOGRAPH
+0x9751	0x7337	#CJK UNIFIED IDEOGRAPH
+0x9752	0x7531	#CJK UNIFIED IDEOGRAPH
+0x9753	0x7950	#CJK UNIFIED IDEOGRAPH
+0x9754	0x88D5	#CJK UNIFIED IDEOGRAPH
+0x9755	0x8A98	#CJK UNIFIED IDEOGRAPH
+0x9756	0x904A	#CJK UNIFIED IDEOGRAPH
+0x9757	0x9091	#CJK UNIFIED IDEOGRAPH
+0x9758	0x90F5	#CJK UNIFIED IDEOGRAPH
+0x9759	0x96C4	#CJK UNIFIED IDEOGRAPH
+0x975A	0x878D	#CJK UNIFIED IDEOGRAPH
+0x975B	0x5915	#CJK UNIFIED IDEOGRAPH
+0x975C	0x4E88	#CJK UNIFIED IDEOGRAPH
+0x975D	0x4F59	#CJK UNIFIED IDEOGRAPH
+0x975E	0x4E0E	#CJK UNIFIED IDEOGRAPH
+0x975F	0x8A89	#CJK UNIFIED IDEOGRAPH
+0x9760	0x8F3F	#CJK UNIFIED IDEOGRAPH
+0x9761	0x9810	#CJK UNIFIED IDEOGRAPH
+0x9762	0x50AD	#CJK UNIFIED IDEOGRAPH
+0x9763	0x5E7C	#CJK UNIFIED IDEOGRAPH
+0x9764	0x5996	#CJK UNIFIED IDEOGRAPH
+0x9765	0x5BB9	#CJK UNIFIED IDEOGRAPH
+0x9766	0x5EB8	#CJK UNIFIED IDEOGRAPH
+0x9767	0x63DA	#CJK UNIFIED IDEOGRAPH
+0x9768	0x63FA	#CJK UNIFIED IDEOGRAPH
+0x9769	0x64C1	#CJK UNIFIED IDEOGRAPH
+0x976A	0x66DC	#CJK UNIFIED IDEOGRAPH
+0x976B	0x694A	#CJK UNIFIED IDEOGRAPH
+0x976C	0x69D8	#CJK UNIFIED IDEOGRAPH
+0x976D	0x6D0B	#CJK UNIFIED IDEOGRAPH
+0x976E	0x6EB6	#CJK UNIFIED IDEOGRAPH
+0x976F	0x7194	#CJK UNIFIED IDEOGRAPH
+0x9770	0x7528	#CJK UNIFIED IDEOGRAPH
+0x9771	0x7AAF	#CJK UNIFIED IDEOGRAPH
+0x9772	0x7F8A	#CJK UNIFIED IDEOGRAPH
+0x9773	0x8000	#CJK UNIFIED IDEOGRAPH
+0x9774	0x8449	#CJK UNIFIED IDEOGRAPH
+0x9775	0x84C9	#CJK UNIFIED IDEOGRAPH
+0x9776	0x8981	#CJK UNIFIED IDEOGRAPH
+0x9777	0x8B21	#CJK UNIFIED IDEOGRAPH
+0x9778	0x8E0A	#CJK UNIFIED IDEOGRAPH
+0x9779	0x9065	#CJK UNIFIED IDEOGRAPH
+0x977A	0x967D	#CJK UNIFIED IDEOGRAPH
+0x977B	0x990A	#CJK UNIFIED IDEOGRAPH
+0x977C	0x617E	#CJK UNIFIED IDEOGRAPH
+0x977D	0x6291	#CJK UNIFIED IDEOGRAPH
+0x977E	0x6B32	#CJK UNIFIED IDEOGRAPH
+0x9780	0x6C83	#CJK UNIFIED IDEOGRAPH
+0x9781	0x6D74	#CJK UNIFIED IDEOGRAPH
+0x9782	0x7FCC	#CJK UNIFIED IDEOGRAPH
+0x9783	0x7FFC	#CJK UNIFIED IDEOGRAPH
+0x9784	0x6DC0	#CJK UNIFIED IDEOGRAPH
+0x9785	0x7F85	#CJK UNIFIED IDEOGRAPH
+0x9786	0x87BA	#CJK UNIFIED IDEOGRAPH
+0x9787	0x88F8	#CJK UNIFIED IDEOGRAPH
+0x9788	0x6765	#CJK UNIFIED IDEOGRAPH
+0x9789	0x83B1	#CJK UNIFIED IDEOGRAPH
+0x978A	0x983C	#CJK UNIFIED IDEOGRAPH
+0x978B	0x96F7	#CJK UNIFIED IDEOGRAPH
+0x978C	0x6D1B	#CJK UNIFIED IDEOGRAPH
+0x978D	0x7D61	#CJK UNIFIED IDEOGRAPH
+0x978E	0x843D	#CJK UNIFIED IDEOGRAPH
+0x978F	0x916A	#CJK UNIFIED IDEOGRAPH
+0x9790	0x4E71	#CJK UNIFIED IDEOGRAPH
+0x9791	0x5375	#CJK UNIFIED IDEOGRAPH
+0x9792	0x5D50	#CJK UNIFIED IDEOGRAPH
+0x9793	0x6B04	#CJK UNIFIED IDEOGRAPH
+0x9794	0x6FEB	#CJK UNIFIED IDEOGRAPH
+0x9795	0x85CD	#CJK UNIFIED IDEOGRAPH
+0x9796	0x862D	#CJK UNIFIED IDEOGRAPH
+0x9797	0x89A7	#CJK UNIFIED IDEOGRAPH
+0x9798	0x5229	#CJK UNIFIED IDEOGRAPH
+0x9799	0x540F	#CJK UNIFIED IDEOGRAPH
+0x979A	0x5C65	#CJK UNIFIED IDEOGRAPH
+0x979B	0x674E	#CJK UNIFIED IDEOGRAPH
+0x979C	0x68A8	#CJK UNIFIED IDEOGRAPH
+0x979D	0x7406	#CJK UNIFIED IDEOGRAPH
+0x979E	0x7483	#CJK UNIFIED IDEOGRAPH
+0x979F	0x75E2	#CJK UNIFIED IDEOGRAPH
+0x97A0	0x88CF	#CJK UNIFIED IDEOGRAPH
+0x97A1	0x88E1	#CJK UNIFIED IDEOGRAPH
+0x97A2	0x91CC	#CJK UNIFIED IDEOGRAPH
+0x97A3	0x96E2	#CJK UNIFIED IDEOGRAPH
+0x97A4	0x9678	#CJK UNIFIED IDEOGRAPH
+0x97A5	0x5F8B	#CJK UNIFIED IDEOGRAPH
+0x97A6	0x7387	#CJK UNIFIED IDEOGRAPH
+0x97A7	0x7ACB	#CJK UNIFIED IDEOGRAPH
+0x97A8	0x844E	#CJK UNIFIED IDEOGRAPH
+0x97A9	0x63A0	#CJK UNIFIED IDEOGRAPH
+0x97AA	0x7565	#CJK UNIFIED IDEOGRAPH
+0x97AB	0x5289	#CJK UNIFIED IDEOGRAPH
+0x97AC	0x6D41	#CJK UNIFIED IDEOGRAPH
+0x97AD	0x6E9C	#CJK UNIFIED IDEOGRAPH
+0x97AE	0x7409	#CJK UNIFIED IDEOGRAPH
+0x97AF	0x7559	#CJK UNIFIED IDEOGRAPH
+0x97B0	0x786B	#CJK UNIFIED IDEOGRAPH
+0x97B1	0x7C92	#CJK UNIFIED IDEOGRAPH
+0x97B2	0x9686	#CJK UNIFIED IDEOGRAPH
+0x97B3	0x7ADC	#CJK UNIFIED IDEOGRAPH
+0x97B4	0x9F8D	#CJK UNIFIED IDEOGRAPH
+0x97B5	0x4FB6	#CJK UNIFIED IDEOGRAPH
+0x97B6	0x616E	#CJK UNIFIED IDEOGRAPH
+0x97B7	0x65C5	#CJK UNIFIED IDEOGRAPH
+0x97B8	0x865C	#CJK UNIFIED IDEOGRAPH
+0x97B9	0x4E86	#CJK UNIFIED IDEOGRAPH
+0x97BA	0x4EAE	#CJK UNIFIED IDEOGRAPH
+0x97BB	0x50DA	#CJK UNIFIED IDEOGRAPH
+0x97BC	0x4E21	#CJK UNIFIED IDEOGRAPH
+0x97BD	0x51CC	#CJK UNIFIED IDEOGRAPH
+0x97BE	0x5BEE	#CJK UNIFIED IDEOGRAPH
+0x97BF	0x6599	#CJK UNIFIED IDEOGRAPH
+0x97C0	0x6881	#CJK UNIFIED IDEOGRAPH
+0x97C1	0x6DBC	#CJK UNIFIED IDEOGRAPH
+0x97C2	0x731F	#CJK UNIFIED IDEOGRAPH
+0x97C3	0x7642	#CJK UNIFIED IDEOGRAPH
+0x97C4	0x77AD	#CJK UNIFIED IDEOGRAPH
+0x97C5	0x7A1C	#CJK UNIFIED IDEOGRAPH
+0x97C6	0x7CE7	#CJK UNIFIED IDEOGRAPH
+0x97C7	0x826F	#CJK UNIFIED IDEOGRAPH
+0x97C8	0x8AD2	#CJK UNIFIED IDEOGRAPH
+0x97C9	0x907C	#CJK UNIFIED IDEOGRAPH
+0x97CA	0x91CF	#CJK UNIFIED IDEOGRAPH
+0x97CB	0x9675	#CJK UNIFIED IDEOGRAPH
+0x97CC	0x9818	#CJK UNIFIED IDEOGRAPH
+0x97CD	0x529B	#CJK UNIFIED IDEOGRAPH
+0x97CE	0x7DD1	#CJK UNIFIED IDEOGRAPH
+0x97CF	0x502B	#CJK UNIFIED IDEOGRAPH
+0x97D0	0x5398	#CJK UNIFIED IDEOGRAPH
+0x97D1	0x6797	#CJK UNIFIED IDEOGRAPH
+0x97D2	0x6DCB	#CJK UNIFIED IDEOGRAPH
+0x97D3	0x71D0	#CJK UNIFIED IDEOGRAPH
+0x97D4	0x7433	#CJK UNIFIED IDEOGRAPH
+0x97D5	0x81E8	#CJK UNIFIED IDEOGRAPH
+0x97D6	0x8F2A	#CJK UNIFIED IDEOGRAPH
+0x97D7	0x96A3	#CJK UNIFIED IDEOGRAPH
+0x97D8	0x9C57	#CJK UNIFIED IDEOGRAPH
+0x97D9	0x9E9F	#CJK UNIFIED IDEOGRAPH
+0x97DA	0x7460	#CJK UNIFIED IDEOGRAPH
+0x97DB	0x5841	#CJK UNIFIED IDEOGRAPH
+0x97DC	0x6D99	#CJK UNIFIED IDEOGRAPH
+0x97DD	0x7D2F	#CJK UNIFIED IDEOGRAPH
+0x97DE	0x985E	#CJK UNIFIED IDEOGRAPH
+0x97DF	0x4EE4	#CJK UNIFIED IDEOGRAPH
+0x97E0	0x4F36	#CJK UNIFIED IDEOGRAPH
+0x97E1	0x4F8B	#CJK UNIFIED IDEOGRAPH
+0x97E2	0x51B7	#CJK UNIFIED IDEOGRAPH
+0x97E3	0x52B1	#CJK UNIFIED IDEOGRAPH
+0x97E4	0x5DBA	#CJK UNIFIED IDEOGRAPH
+0x97E5	0x601C	#CJK UNIFIED IDEOGRAPH
+0x97E6	0x73B2	#CJK UNIFIED IDEOGRAPH
+0x97E7	0x793C	#CJK UNIFIED IDEOGRAPH
+0x97E8	0x82D3	#CJK UNIFIED IDEOGRAPH
+0x97E9	0x9234	#CJK UNIFIED IDEOGRAPH
+0x97EA	0x96B7	#CJK UNIFIED IDEOGRAPH
+0x97EB	0x96F6	#CJK UNIFIED IDEOGRAPH
+0x97EC	0x970A	#CJK UNIFIED IDEOGRAPH
+0x97ED	0x9E97	#CJK UNIFIED IDEOGRAPH
+0x97EE	0x9F62	#CJK UNIFIED IDEOGRAPH
+0x97EF	0x66A6	#CJK UNIFIED IDEOGRAPH
+0x97F0	0x6B74	#CJK UNIFIED IDEOGRAPH
+0x97F1	0x5217	#CJK UNIFIED IDEOGRAPH
+0x97F2	0x52A3	#CJK UNIFIED IDEOGRAPH
+0x97F3	0x70C8	#CJK UNIFIED IDEOGRAPH
+0x97F4	0x88C2	#CJK UNIFIED IDEOGRAPH
+0x97F5	0x5EC9	#CJK UNIFIED IDEOGRAPH
+0x97F6	0x604B	#CJK UNIFIED IDEOGRAPH
+0x97F7	0x6190	#CJK UNIFIED IDEOGRAPH
+0x97F8	0x6F23	#CJK UNIFIED IDEOGRAPH
+0x97F9	0x7149	#CJK UNIFIED IDEOGRAPH
+0x97FA	0x7C3E	#CJK UNIFIED IDEOGRAPH
+0x97FB	0x7DF4	#CJK UNIFIED IDEOGRAPH
+0x97FC	0x806F	#CJK UNIFIED IDEOGRAPH
+0x9840	0x84EE	#CJK UNIFIED IDEOGRAPH
+0x9841	0x9023	#CJK UNIFIED IDEOGRAPH
+0x9842	0x932C	#CJK UNIFIED IDEOGRAPH
+0x9843	0x5442	#CJK UNIFIED IDEOGRAPH
+0x9844	0x9B6F	#CJK UNIFIED IDEOGRAPH
+0x9845	0x6AD3	#CJK UNIFIED IDEOGRAPH
+0x9846	0x7089	#CJK UNIFIED IDEOGRAPH
+0x9847	0x8CC2	#CJK UNIFIED IDEOGRAPH
+0x9848	0x8DEF	#CJK UNIFIED IDEOGRAPH
+0x9849	0x9732	#CJK UNIFIED IDEOGRAPH
+0x984A	0x52B4	#CJK UNIFIED IDEOGRAPH
+0x984B	0x5A41	#CJK UNIFIED IDEOGRAPH
+0x984C	0x5ECA	#CJK UNIFIED IDEOGRAPH
+0x984D	0x5F04	#CJK UNIFIED IDEOGRAPH
+0x984E	0x6717	#CJK UNIFIED IDEOGRAPH
+0x984F	0x697C	#CJK UNIFIED IDEOGRAPH
+0x9850	0x6994	#CJK UNIFIED IDEOGRAPH
+0x9851	0x6D6A	#CJK UNIFIED IDEOGRAPH
+0x9852	0x6F0F	#CJK UNIFIED IDEOGRAPH
+0x9853	0x7262	#CJK UNIFIED IDEOGRAPH
+0x9854	0x72FC	#CJK UNIFIED IDEOGRAPH
+0x9855	0x7BED	#CJK UNIFIED IDEOGRAPH
+0x9856	0x8001	#CJK UNIFIED IDEOGRAPH
+0x9857	0x807E	#CJK UNIFIED IDEOGRAPH
+0x9858	0x874B	#CJK UNIFIED IDEOGRAPH
+0x9859	0x90CE	#CJK UNIFIED IDEOGRAPH
+0x985A	0x516D	#CJK UNIFIED IDEOGRAPH
+0x985B	0x9E93	#CJK UNIFIED IDEOGRAPH
+0x985C	0x7984	#CJK UNIFIED IDEOGRAPH
+0x985D	0x808B	#CJK UNIFIED IDEOGRAPH
+0x985E	0x9332	#CJK UNIFIED IDEOGRAPH
+0x985F	0x8AD6	#CJK UNIFIED IDEOGRAPH
+0x9860	0x502D	#CJK UNIFIED IDEOGRAPH
+0x9861	0x548C	#CJK UNIFIED IDEOGRAPH
+0x9862	0x8A71	#CJK UNIFIED IDEOGRAPH
+0x9863	0x6B6A	#CJK UNIFIED IDEOGRAPH
+0x9864	0x8CC4	#CJK UNIFIED IDEOGRAPH
+0x9865	0x8107	#CJK UNIFIED IDEOGRAPH
+0x9866	0x60D1	#CJK UNIFIED IDEOGRAPH
+0x9867	0x67A0	#CJK UNIFIED IDEOGRAPH
+0x9868	0x9DF2	#CJK UNIFIED IDEOGRAPH
+0x9869	0x4E99	#CJK UNIFIED IDEOGRAPH
+0x986A	0x4E98	#CJK UNIFIED IDEOGRAPH
+0x986B	0x9C10	#CJK UNIFIED IDEOGRAPH
+0x986C	0x8A6B	#CJK UNIFIED IDEOGRAPH
+0x986D	0x85C1	#CJK UNIFIED IDEOGRAPH
+0x986E	0x8568	#CJK UNIFIED IDEOGRAPH
+0x986F	0x6900	#CJK UNIFIED IDEOGRAPH
+0x9870	0x6E7E	#CJK UNIFIED IDEOGRAPH
+0x9871	0x7897	#CJK UNIFIED IDEOGRAPH
+0x9872	0x8155	#CJK UNIFIED IDEOGRAPH
+0x989F	0x5F0C	#CJK UNIFIED IDEOGRAPH
+0x98A0	0x4E10	#CJK UNIFIED IDEOGRAPH
+0x98A1	0x4E15	#CJK UNIFIED IDEOGRAPH
+0x98A2	0x4E2A	#CJK UNIFIED IDEOGRAPH
+0x98A3	0x4E31	#CJK UNIFIED IDEOGRAPH
+0x98A4	0x4E36	#CJK UNIFIED IDEOGRAPH
+0x98A5	0x4E3C	#CJK UNIFIED IDEOGRAPH
+0x98A6	0x4E3F	#CJK UNIFIED IDEOGRAPH
+0x98A7	0x4E42	#CJK UNIFIED IDEOGRAPH
+0x98A8	0x4E56	#CJK UNIFIED IDEOGRAPH
+0x98A9	0x4E58	#CJK UNIFIED IDEOGRAPH
+0x98AA	0x4E82	#CJK UNIFIED IDEOGRAPH
+0x98AB	0x4E85	#CJK UNIFIED IDEOGRAPH
+0x98AC	0x8C6B	#CJK UNIFIED IDEOGRAPH
+0x98AD	0x4E8A	#CJK UNIFIED IDEOGRAPH
+0x98AE	0x8212	#CJK UNIFIED IDEOGRAPH
+0x98AF	0x5F0D	#CJK UNIFIED IDEOGRAPH
+0x98B0	0x4E8E	#CJK UNIFIED IDEOGRAPH
+0x98B1	0x4E9E	#CJK UNIFIED IDEOGRAPH
+0x98B2	0x4E9F	#CJK UNIFIED IDEOGRAPH
+0x98B3	0x4EA0	#CJK UNIFIED IDEOGRAPH
+0x98B4	0x4EA2	#CJK UNIFIED IDEOGRAPH
+0x98B5	0x4EB0	#CJK UNIFIED IDEOGRAPH
+0x98B6	0x4EB3	#CJK UNIFIED IDEOGRAPH
+0x98B7	0x4EB6	#CJK UNIFIED IDEOGRAPH
+0x98B8	0x4ECE	#CJK UNIFIED IDEOGRAPH
+0x98B9	0x4ECD	#CJK UNIFIED IDEOGRAPH
+0x98BA	0x4EC4	#CJK UNIFIED IDEOGRAPH
+0x98BB	0x4EC6	#CJK UNIFIED IDEOGRAPH
+0x98BC	0x4EC2	#CJK UNIFIED IDEOGRAPH
+0x98BD	0x4ED7	#CJK UNIFIED IDEOGRAPH
+0x98BE	0x4EDE	#CJK UNIFIED IDEOGRAPH
+0x98BF	0x4EED	#CJK UNIFIED IDEOGRAPH
+0x98C0	0x4EDF	#CJK UNIFIED IDEOGRAPH
+0x98C1	0x4EF7	#CJK UNIFIED IDEOGRAPH
+0x98C2	0x4F09	#CJK UNIFIED IDEOGRAPH
+0x98C3	0x4F5A	#CJK UNIFIED IDEOGRAPH
+0x98C4	0x4F30	#CJK UNIFIED IDEOGRAPH
+0x98C5	0x4F5B	#CJK UNIFIED IDEOGRAPH
+0x98C6	0x4F5D	#CJK UNIFIED IDEOGRAPH
+0x98C7	0x4F57	#CJK UNIFIED IDEOGRAPH
+0x98C8	0x4F47	#CJK UNIFIED IDEOGRAPH
+0x98C9	0x4F76	#CJK UNIFIED IDEOGRAPH
+0x98CA	0x4F88	#CJK UNIFIED IDEOGRAPH
+0x98CB	0x4F8F	#CJK UNIFIED IDEOGRAPH
+0x98CC	0x4F98	#CJK UNIFIED IDEOGRAPH
+0x98CD	0x4F7B	#CJK UNIFIED IDEOGRAPH
+0x98CE	0x4F69	#CJK UNIFIED IDEOGRAPH
+0x98CF	0x4F70	#CJK UNIFIED IDEOGRAPH
+0x98D0	0x4F91	#CJK UNIFIED IDEOGRAPH
+0x98D1	0x4F6F	#CJK UNIFIED IDEOGRAPH
+0x98D2	0x4F86	#CJK UNIFIED IDEOGRAPH
+0x98D3	0x4F96	#CJK UNIFIED IDEOGRAPH
+0x98D4	0x5118	#CJK UNIFIED IDEOGRAPH
+0x98D5	0x4FD4	#CJK UNIFIED IDEOGRAPH
+0x98D6	0x4FDF	#CJK UNIFIED IDEOGRAPH
+0x98D7	0x4FCE	#CJK UNIFIED IDEOGRAPH
+0x98D8	0x4FD8	#CJK UNIFIED IDEOGRAPH
+0x98D9	0x4FDB	#CJK UNIFIED IDEOGRAPH
+0x98DA	0x4FD1	#CJK UNIFIED IDEOGRAPH
+0x98DB	0x4FDA	#CJK UNIFIED IDEOGRAPH
+0x98DC	0x4FD0	#CJK UNIFIED IDEOGRAPH
+0x98DD	0x4FE4	#CJK UNIFIED IDEOGRAPH
+0x98DE	0x4FE5	#CJK UNIFIED IDEOGRAPH
+0x98DF	0x501A	#CJK UNIFIED IDEOGRAPH
+0x98E0	0x5028	#CJK UNIFIED IDEOGRAPH
+0x98E1	0x5014	#CJK UNIFIED IDEOGRAPH
+0x98E2	0x502A	#CJK UNIFIED IDEOGRAPH
+0x98E3	0x5025	#CJK UNIFIED IDEOGRAPH
+0x98E4	0x5005	#CJK UNIFIED IDEOGRAPH
+0x98E5	0x4F1C	#CJK UNIFIED IDEOGRAPH
+0x98E6	0x4FF6	#CJK UNIFIED IDEOGRAPH
+0x98E7	0x5021	#CJK UNIFIED IDEOGRAPH
+0x98E8	0x5029	#CJK UNIFIED IDEOGRAPH
+0x98E9	0x502C	#CJK UNIFIED IDEOGRAPH
+0x98EA	0x4FFE	#CJK UNIFIED IDEOGRAPH
+0x98EB	0x4FEF	#CJK UNIFIED IDEOGRAPH
+0x98EC	0x5011	#CJK UNIFIED IDEOGRAPH
+0x98ED	0x5006	#CJK UNIFIED IDEOGRAPH
+0x98EE	0x5043	#CJK UNIFIED IDEOGRAPH
+0x98EF	0x5047	#CJK UNIFIED IDEOGRAPH
+0x98F0	0x6703	#CJK UNIFIED IDEOGRAPH
+0x98F1	0x5055	#CJK UNIFIED IDEOGRAPH
+0x98F2	0x5050	#CJK UNIFIED IDEOGRAPH
+0x98F3	0x5048	#CJK UNIFIED IDEOGRAPH
+0x98F4	0x505A	#CJK UNIFIED IDEOGRAPH
+0x98F5	0x5056	#CJK UNIFIED IDEOGRAPH
+0x98F6	0x506C	#CJK UNIFIED IDEOGRAPH
+0x98F7	0x5078	#CJK UNIFIED IDEOGRAPH
+0x98F8	0x5080	#CJK UNIFIED IDEOGRAPH
+0x98F9	0x509A	#CJK UNIFIED IDEOGRAPH
+0x98FA	0x5085	#CJK UNIFIED IDEOGRAPH
+0x98FB	0x50B4	#CJK UNIFIED IDEOGRAPH
+0x98FC	0x50B2	#CJK UNIFIED IDEOGRAPH
+0x9940	0x50C9	#CJK UNIFIED IDEOGRAPH
+0x9941	0x50CA	#CJK UNIFIED IDEOGRAPH
+0x9942	0x50B3	#CJK UNIFIED IDEOGRAPH
+0x9943	0x50C2	#CJK UNIFIED IDEOGRAPH
+0x9944	0x50D6	#CJK UNIFIED IDEOGRAPH
+0x9945	0x50DE	#CJK UNIFIED IDEOGRAPH
+0x9946	0x50E5	#CJK UNIFIED IDEOGRAPH
+0x9947	0x50ED	#CJK UNIFIED IDEOGRAPH
+0x9948	0x50E3	#CJK UNIFIED IDEOGRAPH
+0x9949	0x50EE	#CJK UNIFIED IDEOGRAPH
+0x994A	0x50F9	#CJK UNIFIED IDEOGRAPH
+0x994B	0x50F5	#CJK UNIFIED IDEOGRAPH
+0x994C	0x5109	#CJK UNIFIED IDEOGRAPH
+0x994D	0x5101	#CJK UNIFIED IDEOGRAPH
+0x994E	0x5102	#CJK UNIFIED IDEOGRAPH
+0x994F	0x5116	#CJK UNIFIED IDEOGRAPH
+0x9950	0x5115	#CJK UNIFIED IDEOGRAPH
+0x9951	0x5114	#CJK UNIFIED IDEOGRAPH
+0x9952	0x511A	#CJK UNIFIED IDEOGRAPH
+0x9953	0x5121	#CJK UNIFIED IDEOGRAPH
+0x9954	0x513A	#CJK UNIFIED IDEOGRAPH
+0x9955	0x5137	#CJK UNIFIED IDEOGRAPH
+0x9956	0x513C	#CJK UNIFIED IDEOGRAPH
+0x9957	0x513B	#CJK UNIFIED IDEOGRAPH
+0x9958	0x513F	#CJK UNIFIED IDEOGRAPH
+0x9959	0x5140	#CJK UNIFIED IDEOGRAPH
+0x995A	0x5152	#CJK UNIFIED IDEOGRAPH
+0x995B	0x514C	#CJK UNIFIED IDEOGRAPH
+0x995C	0x5154	#CJK UNIFIED IDEOGRAPH
+0x995D	0x5162	#CJK UNIFIED IDEOGRAPH
+0x995E	0x7AF8	#CJK UNIFIED IDEOGRAPH
+0x995F	0x5169	#CJK UNIFIED IDEOGRAPH
+0x9960	0x516A	#CJK UNIFIED IDEOGRAPH
+0x9961	0x516E	#CJK UNIFIED IDEOGRAPH
+0x9962	0x5180	#CJK UNIFIED IDEOGRAPH
+0x9963	0x5182	#CJK UNIFIED IDEOGRAPH
+0x9964	0x56D8	#CJK UNIFIED IDEOGRAPH
+0x9965	0x518C	#CJK UNIFIED IDEOGRAPH
+0x9966	0x5189	#CJK UNIFIED IDEOGRAPH
+0x9967	0x518F	#CJK UNIFIED IDEOGRAPH
+0x9968	0x5191	#CJK UNIFIED IDEOGRAPH
+0x9969	0x5193	#CJK UNIFIED IDEOGRAPH
+0x996A	0x5195	#CJK UNIFIED IDEOGRAPH
+0x996B	0x5196	#CJK UNIFIED IDEOGRAPH
+0x996C	0x51A4	#CJK UNIFIED IDEOGRAPH
+0x996D	0x51A6	#CJK UNIFIED IDEOGRAPH
+0x996E	0x51A2	#CJK UNIFIED IDEOGRAPH
+0x996F	0x51A9	#CJK UNIFIED IDEOGRAPH
+0x9970	0x51AA	#CJK UNIFIED IDEOGRAPH
+0x9971	0x51AB	#CJK UNIFIED IDEOGRAPH
+0x9972	0x51B3	#CJK UNIFIED IDEOGRAPH
+0x9973	0x51B1	#CJK UNIFIED IDEOGRAPH
+0x9974	0x51B2	#CJK UNIFIED IDEOGRAPH
+0x9975	0x51B0	#CJK UNIFIED IDEOGRAPH
+0x9976	0x51B5	#CJK UNIFIED IDEOGRAPH
+0x9977	0x51BD	#CJK UNIFIED IDEOGRAPH
+0x9978	0x51C5	#CJK UNIFIED IDEOGRAPH
+0x9979	0x51C9	#CJK UNIFIED IDEOGRAPH
+0x997A	0x51DB	#CJK UNIFIED IDEOGRAPH
+0x997B	0x51E0	#CJK UNIFIED IDEOGRAPH
+0x997C	0x8655	#CJK UNIFIED IDEOGRAPH
+0x997D	0x51E9	#CJK UNIFIED IDEOGRAPH
+0x997E	0x51ED	#CJK UNIFIED IDEOGRAPH
+0x9980	0x51F0	#CJK UNIFIED IDEOGRAPH
+0x9981	0x51F5	#CJK UNIFIED IDEOGRAPH
+0x9982	0x51FE	#CJK UNIFIED IDEOGRAPH
+0x9983	0x5204	#CJK UNIFIED IDEOGRAPH
+0x9984	0x520B	#CJK UNIFIED IDEOGRAPH
+0x9985	0x5214	#CJK UNIFIED IDEOGRAPH
+0x9986	0x520E	#CJK UNIFIED IDEOGRAPH
+0x9987	0x5227	#CJK UNIFIED IDEOGRAPH
+0x9988	0x522A	#CJK UNIFIED IDEOGRAPH
+0x9989	0x522E	#CJK UNIFIED IDEOGRAPH
+0x998A	0x5233	#CJK UNIFIED IDEOGRAPH
+0x998B	0x5239	#CJK UNIFIED IDEOGRAPH
+0x998C	0x524F	#CJK UNIFIED IDEOGRAPH
+0x998D	0x5244	#CJK UNIFIED IDEOGRAPH
+0x998E	0x524B	#CJK UNIFIED IDEOGRAPH
+0x998F	0x524C	#CJK UNIFIED IDEOGRAPH
+0x9990	0x525E	#CJK UNIFIED IDEOGRAPH
+0x9991	0x5254	#CJK UNIFIED IDEOGRAPH
+0x9992	0x526A	#CJK UNIFIED IDEOGRAPH
+0x9993	0x5274	#CJK UNIFIED IDEOGRAPH
+0x9994	0x5269	#CJK UNIFIED IDEOGRAPH
+0x9995	0x5273	#CJK UNIFIED IDEOGRAPH
+0x9996	0x527F	#CJK UNIFIED IDEOGRAPH
+0x9997	0x527D	#CJK UNIFIED IDEOGRAPH
+0x9998	0x528D	#CJK UNIFIED IDEOGRAPH
+0x9999	0x5294	#CJK UNIFIED IDEOGRAPH
+0x999A	0x5292	#CJK UNIFIED IDEOGRAPH
+0x999B	0x5271	#CJK UNIFIED IDEOGRAPH
+0x999C	0x5288	#CJK UNIFIED IDEOGRAPH
+0x999D	0x5291	#CJK UNIFIED IDEOGRAPH
+0x999E	0x8FA8	#CJK UNIFIED IDEOGRAPH
+0x999F	0x8FA7	#CJK UNIFIED IDEOGRAPH
+0x99A0	0x52AC	#CJK UNIFIED IDEOGRAPH
+0x99A1	0x52AD	#CJK UNIFIED IDEOGRAPH
+0x99A2	0x52BC	#CJK UNIFIED IDEOGRAPH
+0x99A3	0x52B5	#CJK UNIFIED IDEOGRAPH
+0x99A4	0x52C1	#CJK UNIFIED IDEOGRAPH
+0x99A5	0x52CD	#CJK UNIFIED IDEOGRAPH
+0x99A6	0x52D7	#CJK UNIFIED IDEOGRAPH
+0x99A7	0x52DE	#CJK UNIFIED IDEOGRAPH
+0x99A8	0x52E3	#CJK UNIFIED IDEOGRAPH
+0x99A9	0x52E6	#CJK UNIFIED IDEOGRAPH
+0x99AA	0x98ED	#CJK UNIFIED IDEOGRAPH
+0x99AB	0x52E0	#CJK UNIFIED IDEOGRAPH
+0x99AC	0x52F3	#CJK UNIFIED IDEOGRAPH
+0x99AD	0x52F5	#CJK UNIFIED IDEOGRAPH
+0x99AE	0x52F8	#CJK UNIFIED IDEOGRAPH
+0x99AF	0x52F9	#CJK UNIFIED IDEOGRAPH
+0x99B0	0x5306	#CJK UNIFIED IDEOGRAPH
+0x99B1	0x5308	#CJK UNIFIED IDEOGRAPH
+0x99B2	0x7538	#CJK UNIFIED IDEOGRAPH
+0x99B3	0x530D	#CJK UNIFIED IDEOGRAPH
+0x99B4	0x5310	#CJK UNIFIED IDEOGRAPH
+0x99B5	0x530F	#CJK UNIFIED IDEOGRAPH
+0x99B6	0x5315	#CJK UNIFIED IDEOGRAPH
+0x99B7	0x531A	#CJK UNIFIED IDEOGRAPH
+0x99B8	0x5323	#CJK UNIFIED IDEOGRAPH
+0x99B9	0x532F	#CJK UNIFIED IDEOGRAPH
+0x99BA	0x5331	#CJK UNIFIED IDEOGRAPH
+0x99BB	0x5333	#CJK UNIFIED IDEOGRAPH
+0x99BC	0x5338	#CJK UNIFIED IDEOGRAPH
+0x99BD	0x5340	#CJK UNIFIED IDEOGRAPH
+0x99BE	0x5346	#CJK UNIFIED IDEOGRAPH
+0x99BF	0x5345	#CJK UNIFIED IDEOGRAPH
+0x99C0	0x4E17	#CJK UNIFIED IDEOGRAPH
+0x99C1	0x5349	#CJK UNIFIED IDEOGRAPH
+0x99C2	0x534D	#CJK UNIFIED IDEOGRAPH
+0x99C3	0x51D6	#CJK UNIFIED IDEOGRAPH
+0x99C4	0x535E	#CJK UNIFIED IDEOGRAPH
+0x99C5	0x5369	#CJK UNIFIED IDEOGRAPH
+0x99C6	0x536E	#CJK UNIFIED IDEOGRAPH
+0x99C7	0x5918	#CJK UNIFIED IDEOGRAPH
+0x99C8	0x537B	#CJK UNIFIED IDEOGRAPH
+0x99C9	0x5377	#CJK UNIFIED IDEOGRAPH
+0x99CA	0x5382	#CJK UNIFIED IDEOGRAPH
+0x99CB	0x5396	#CJK UNIFIED IDEOGRAPH
+0x99CC	0x53A0	#CJK UNIFIED IDEOGRAPH
+0x99CD	0x53A6	#CJK UNIFIED IDEOGRAPH
+0x99CE	0x53A5	#CJK UNIFIED IDEOGRAPH
+0x99CF	0x53AE	#CJK UNIFIED IDEOGRAPH
+0x99D0	0x53B0	#CJK UNIFIED IDEOGRAPH
+0x99D1	0x53B6	#CJK UNIFIED IDEOGRAPH
+0x99D2	0x53C3	#CJK UNIFIED IDEOGRAPH
+0x99D3	0x7C12	#CJK UNIFIED IDEOGRAPH
+0x99D4	0x96D9	#CJK UNIFIED IDEOGRAPH
+0x99D5	0x53DF	#CJK UNIFIED IDEOGRAPH
+0x99D6	0x66FC	#CJK UNIFIED IDEOGRAPH
+0x99D7	0x71EE	#CJK UNIFIED IDEOGRAPH
+0x99D8	0x53EE	#CJK UNIFIED IDEOGRAPH
+0x99D9	0x53E8	#CJK UNIFIED IDEOGRAPH
+0x99DA	0x53ED	#CJK UNIFIED IDEOGRAPH
+0x99DB	0x53FA	#CJK UNIFIED IDEOGRAPH
+0x99DC	0x5401	#CJK UNIFIED IDEOGRAPH
+0x99DD	0x543D	#CJK UNIFIED IDEOGRAPH
+0x99DE	0x5440	#CJK UNIFIED IDEOGRAPH
+0x99DF	0x542C	#CJK UNIFIED IDEOGRAPH
+0x99E0	0x542D	#CJK UNIFIED IDEOGRAPH
+0x99E1	0x543C	#CJK UNIFIED IDEOGRAPH
+0x99E2	0x542E	#CJK UNIFIED IDEOGRAPH
+0x99E3	0x5436	#CJK UNIFIED IDEOGRAPH
+0x99E4	0x5429	#CJK UNIFIED IDEOGRAPH
+0x99E5	0x541D	#CJK UNIFIED IDEOGRAPH
+0x99E6	0x544E	#CJK UNIFIED IDEOGRAPH
+0x99E7	0x548F	#CJK UNIFIED IDEOGRAPH
+0x99E8	0x5475	#CJK UNIFIED IDEOGRAPH
+0x99E9	0x548E	#CJK UNIFIED IDEOGRAPH
+0x99EA	0x545F	#CJK UNIFIED IDEOGRAPH
+0x99EB	0x5471	#CJK UNIFIED IDEOGRAPH
+0x99EC	0x5477	#CJK UNIFIED IDEOGRAPH
+0x99ED	0x5470	#CJK UNIFIED IDEOGRAPH
+0x99EE	0x5492	#CJK UNIFIED IDEOGRAPH
+0x99EF	0x547B	#CJK UNIFIED IDEOGRAPH
+0x99F0	0x5480	#CJK UNIFIED IDEOGRAPH
+0x99F1	0x5476	#CJK UNIFIED IDEOGRAPH
+0x99F2	0x5484	#CJK UNIFIED IDEOGRAPH
+0x99F3	0x5490	#CJK UNIFIED IDEOGRAPH
+0x99F4	0x5486	#CJK UNIFIED IDEOGRAPH
+0x99F5	0x54C7	#CJK UNIFIED IDEOGRAPH
+0x99F6	0x54A2	#CJK UNIFIED IDEOGRAPH
+0x99F7	0x54B8	#CJK UNIFIED IDEOGRAPH
+0x99F8	0x54A5	#CJK UNIFIED IDEOGRAPH
+0x99F9	0x54AC	#CJK UNIFIED IDEOGRAPH
+0x99FA	0x54C4	#CJK UNIFIED IDEOGRAPH
+0x99FB	0x54C8	#CJK UNIFIED IDEOGRAPH
+0x99FC	0x54A8	#CJK UNIFIED IDEOGRAPH
+0x9A40	0x54AB	#CJK UNIFIED IDEOGRAPH
+0x9A41	0x54C2	#CJK UNIFIED IDEOGRAPH
+0x9A42	0x54A4	#CJK UNIFIED IDEOGRAPH
+0x9A43	0x54BE	#CJK UNIFIED IDEOGRAPH
+0x9A44	0x54BC	#CJK UNIFIED IDEOGRAPH
+0x9A45	0x54D8	#CJK UNIFIED IDEOGRAPH
+0x9A46	0x54E5	#CJK UNIFIED IDEOGRAPH
+0x9A47	0x54E6	#CJK UNIFIED IDEOGRAPH
+0x9A48	0x550F	#CJK UNIFIED IDEOGRAPH
+0x9A49	0x5514	#CJK UNIFIED IDEOGRAPH
+0x9A4A	0x54FD	#CJK UNIFIED IDEOGRAPH
+0x9A4B	0x54EE	#CJK UNIFIED IDEOGRAPH
+0x9A4C	0x54ED	#CJK UNIFIED IDEOGRAPH
+0x9A4D	0x54FA	#CJK UNIFIED IDEOGRAPH
+0x9A4E	0x54E2	#CJK UNIFIED IDEOGRAPH
+0x9A4F	0x5539	#CJK UNIFIED IDEOGRAPH
+0x9A50	0x5540	#CJK UNIFIED IDEOGRAPH
+0x9A51	0x5563	#CJK UNIFIED IDEOGRAPH
+0x9A52	0x554C	#CJK UNIFIED IDEOGRAPH
+0x9A53	0x552E	#CJK UNIFIED IDEOGRAPH
+0x9A54	0x555C	#CJK UNIFIED IDEOGRAPH
+0x9A55	0x5545	#CJK UNIFIED IDEOGRAPH
+0x9A56	0x5556	#CJK UNIFIED IDEOGRAPH
+0x9A57	0x5557	#CJK UNIFIED IDEOGRAPH
+0x9A58	0x5538	#CJK UNIFIED IDEOGRAPH
+0x9A59	0x5533	#CJK UNIFIED IDEOGRAPH
+0x9A5A	0x555D	#CJK UNIFIED IDEOGRAPH
+0x9A5B	0x5599	#CJK UNIFIED IDEOGRAPH
+0x9A5C	0x5580	#CJK UNIFIED IDEOGRAPH
+0x9A5D	0x54AF	#CJK UNIFIED IDEOGRAPH
+0x9A5E	0x558A	#CJK UNIFIED IDEOGRAPH
+0x9A5F	0x559F	#CJK UNIFIED IDEOGRAPH
+0x9A60	0x557B	#CJK UNIFIED IDEOGRAPH
+0x9A61	0x557E	#CJK UNIFIED IDEOGRAPH
+0x9A62	0x5598	#CJK UNIFIED IDEOGRAPH
+0x9A63	0x559E	#CJK UNIFIED IDEOGRAPH
+0x9A64	0x55AE	#CJK UNIFIED IDEOGRAPH
+0x9A65	0x557C	#CJK UNIFIED IDEOGRAPH
+0x9A66	0x5583	#CJK UNIFIED IDEOGRAPH
+0x9A67	0x55A9	#CJK UNIFIED IDEOGRAPH
+0x9A68	0x5587	#CJK UNIFIED IDEOGRAPH
+0x9A69	0x55A8	#CJK UNIFIED IDEOGRAPH
+0x9A6A	0x55DA	#CJK UNIFIED IDEOGRAPH
+0x9A6B	0x55C5	#CJK UNIFIED IDEOGRAPH
+0x9A6C	0x55DF	#CJK UNIFIED IDEOGRAPH
+0x9A6D	0x55C4	#CJK UNIFIED IDEOGRAPH
+0x9A6E	0x55DC	#CJK UNIFIED IDEOGRAPH
+0x9A6F	0x55E4	#CJK UNIFIED IDEOGRAPH
+0x9A70	0x55D4	#CJK UNIFIED IDEOGRAPH
+0x9A71	0x5614	#CJK UNIFIED IDEOGRAPH
+0x9A72	0x55F7	#CJK UNIFIED IDEOGRAPH
+0x9A73	0x5616	#CJK UNIFIED IDEOGRAPH
+0x9A74	0x55FE	#CJK UNIFIED IDEOGRAPH
+0x9A75	0x55FD	#CJK UNIFIED IDEOGRAPH
+0x9A76	0x561B	#CJK UNIFIED IDEOGRAPH
+0x9A77	0x55F9	#CJK UNIFIED IDEOGRAPH
+0x9A78	0x564E	#CJK UNIFIED IDEOGRAPH
+0x9A79	0x5650	#CJK UNIFIED IDEOGRAPH
+0x9A7A	0x71DF	#CJK UNIFIED IDEOGRAPH
+0x9A7B	0x5634	#CJK UNIFIED IDEOGRAPH
+0x9A7C	0x5636	#CJK UNIFIED IDEOGRAPH
+0x9A7D	0x5632	#CJK UNIFIED IDEOGRAPH
+0x9A7E	0x5638	#CJK UNIFIED IDEOGRAPH
+0x9A80	0x566B	#CJK UNIFIED IDEOGRAPH
+0x9A81	0x5664	#CJK UNIFIED IDEOGRAPH
+0x9A82	0x562F	#CJK UNIFIED IDEOGRAPH
+0x9A83	0x566C	#CJK UNIFIED IDEOGRAPH
+0x9A84	0x566A	#CJK UNIFIED IDEOGRAPH
+0x9A85	0x5686	#CJK UNIFIED IDEOGRAPH
+0x9A86	0x5680	#CJK UNIFIED IDEOGRAPH
+0x9A87	0x568A	#CJK UNIFIED IDEOGRAPH
+0x9A88	0x56A0	#CJK UNIFIED IDEOGRAPH
+0x9A89	0x5694	#CJK UNIFIED IDEOGRAPH
+0x9A8A	0x568F	#CJK UNIFIED IDEOGRAPH
+0x9A8B	0x56A5	#CJK UNIFIED IDEOGRAPH
+0x9A8C	0x56AE	#CJK UNIFIED IDEOGRAPH
+0x9A8D	0x56B6	#CJK UNIFIED IDEOGRAPH
+0x9A8E	0x56B4	#CJK UNIFIED IDEOGRAPH
+0x9A8F	0x56C2	#CJK UNIFIED IDEOGRAPH
+0x9A90	0x56BC	#CJK UNIFIED IDEOGRAPH
+0x9A91	0x56C1	#CJK UNIFIED IDEOGRAPH
+0x9A92	0x56C3	#CJK UNIFIED IDEOGRAPH
+0x9A93	0x56C0	#CJK UNIFIED IDEOGRAPH
+0x9A94	0x56C8	#CJK UNIFIED IDEOGRAPH
+0x9A95	0x56CE	#CJK UNIFIED IDEOGRAPH
+0x9A96	0x56D1	#CJK UNIFIED IDEOGRAPH
+0x9A97	0x56D3	#CJK UNIFIED IDEOGRAPH
+0x9A98	0x56D7	#CJK UNIFIED IDEOGRAPH
+0x9A99	0x56EE	#CJK UNIFIED IDEOGRAPH
+0x9A9A	0x56F9	#CJK UNIFIED IDEOGRAPH
+0x9A9B	0x5700	#CJK UNIFIED IDEOGRAPH
+0x9A9C	0x56FF	#CJK UNIFIED IDEOGRAPH
+0x9A9D	0x5704	#CJK UNIFIED IDEOGRAPH
+0x9A9E	0x5709	#CJK UNIFIED IDEOGRAPH
+0x9A9F	0x5708	#CJK UNIFIED IDEOGRAPH
+0x9AA0	0x570B	#CJK UNIFIED IDEOGRAPH
+0x9AA1	0x570D	#CJK UNIFIED IDEOGRAPH
+0x9AA2	0x5713	#CJK UNIFIED IDEOGRAPH
+0x9AA3	0x5718	#CJK UNIFIED IDEOGRAPH
+0x9AA4	0x5716	#CJK UNIFIED IDEOGRAPH
+0x9AA5	0x55C7	#CJK UNIFIED IDEOGRAPH
+0x9AA6	0x571C	#CJK UNIFIED IDEOGRAPH
+0x9AA7	0x5726	#CJK UNIFIED IDEOGRAPH
+0x9AA8	0x5737	#CJK UNIFIED IDEOGRAPH
+0x9AA9	0x5738	#CJK UNIFIED IDEOGRAPH
+0x9AAA	0x574E	#CJK UNIFIED IDEOGRAPH
+0x9AAB	0x573B	#CJK UNIFIED IDEOGRAPH
+0x9AAC	0x5740	#CJK UNIFIED IDEOGRAPH
+0x9AAD	0x574F	#CJK UNIFIED IDEOGRAPH
+0x9AAE	0x5769	#CJK UNIFIED IDEOGRAPH
+0x9AAF	0x57C0	#CJK UNIFIED IDEOGRAPH
+0x9AB0	0x5788	#CJK UNIFIED IDEOGRAPH
+0x9AB1	0x5761	#CJK UNIFIED IDEOGRAPH
+0x9AB2	0x577F	#CJK UNIFIED IDEOGRAPH
+0x9AB3	0x5789	#CJK UNIFIED IDEOGRAPH
+0x9AB4	0x5793	#CJK UNIFIED IDEOGRAPH
+0x9AB5	0x57A0	#CJK UNIFIED IDEOGRAPH
+0x9AB6	0x57B3	#CJK UNIFIED IDEOGRAPH
+0x9AB7	0x57A4	#CJK UNIFIED IDEOGRAPH
+0x9AB8	0x57AA	#CJK UNIFIED IDEOGRAPH
+0x9AB9	0x57B0	#CJK UNIFIED IDEOGRAPH
+0x9ABA	0x57C3	#CJK UNIFIED IDEOGRAPH
+0x9ABB	0x57C6	#CJK UNIFIED IDEOGRAPH
+0x9ABC	0x57D4	#CJK UNIFIED IDEOGRAPH
+0x9ABD	0x57D2	#CJK UNIFIED IDEOGRAPH
+0x9ABE	0x57D3	#CJK UNIFIED IDEOGRAPH
+0x9ABF	0x580A	#CJK UNIFIED IDEOGRAPH
+0x9AC0	0x57D6	#CJK UNIFIED IDEOGRAPH
+0x9AC1	0x57E3	#CJK UNIFIED IDEOGRAPH
+0x9AC2	0x580B	#CJK UNIFIED IDEOGRAPH
+0x9AC3	0x5819	#CJK UNIFIED IDEOGRAPH
+0x9AC4	0x581D	#CJK UNIFIED IDEOGRAPH
+0x9AC5	0x5872	#CJK UNIFIED IDEOGRAPH
+0x9AC6	0x5821	#CJK UNIFIED IDEOGRAPH
+0x9AC7	0x5862	#CJK UNIFIED IDEOGRAPH
+0x9AC8	0x584B	#CJK UNIFIED IDEOGRAPH
+0x9AC9	0x5870	#CJK UNIFIED IDEOGRAPH
+0x9ACA	0x6BC0	#CJK UNIFIED IDEOGRAPH
+0x9ACB	0x5852	#CJK UNIFIED IDEOGRAPH
+0x9ACC	0x583D	#CJK UNIFIED IDEOGRAPH
+0x9ACD	0x5879	#CJK UNIFIED IDEOGRAPH
+0x9ACE	0x5885	#CJK UNIFIED IDEOGRAPH
+0x9ACF	0x58B9	#CJK UNIFIED IDEOGRAPH
+0x9AD0	0x589F	#CJK UNIFIED IDEOGRAPH
+0x9AD1	0x58AB	#CJK UNIFIED IDEOGRAPH
+0x9AD2	0x58BA	#CJK UNIFIED IDEOGRAPH
+0x9AD3	0x58DE	#CJK UNIFIED IDEOGRAPH
+0x9AD4	0x58BB	#CJK UNIFIED IDEOGRAPH
+0x9AD5	0x58B8	#CJK UNIFIED IDEOGRAPH
+0x9AD6	0x58AE	#CJK UNIFIED IDEOGRAPH
+0x9AD7	0x58C5	#CJK UNIFIED IDEOGRAPH
+0x9AD8	0x58D3	#CJK UNIFIED IDEOGRAPH
+0x9AD9	0x58D1	#CJK UNIFIED IDEOGRAPH
+0x9ADA	0x58D7	#CJK UNIFIED IDEOGRAPH
+0x9ADB	0x58D9	#CJK UNIFIED IDEOGRAPH
+0x9ADC	0x58D8	#CJK UNIFIED IDEOGRAPH
+0x9ADD	0x58E5	#CJK UNIFIED IDEOGRAPH
+0x9ADE	0x58DC	#CJK UNIFIED IDEOGRAPH
+0x9ADF	0x58E4	#CJK UNIFIED IDEOGRAPH
+0x9AE0	0x58DF	#CJK UNIFIED IDEOGRAPH
+0x9AE1	0x58EF	#CJK UNIFIED IDEOGRAPH
+0x9AE2	0x58FA	#CJK UNIFIED IDEOGRAPH
+0x9AE3	0x58F9	#CJK UNIFIED IDEOGRAPH
+0x9AE4	0x58FB	#CJK UNIFIED IDEOGRAPH
+0x9AE5	0x58FC	#CJK UNIFIED IDEOGRAPH
+0x9AE6	0x58FD	#CJK UNIFIED IDEOGRAPH
+0x9AE7	0x5902	#CJK UNIFIED IDEOGRAPH
+0x9AE8	0x590A	#CJK UNIFIED IDEOGRAPH
+0x9AE9	0x5910	#CJK UNIFIED IDEOGRAPH
+0x9AEA	0x591B	#CJK UNIFIED IDEOGRAPH
+0x9AEB	0x68A6	#CJK UNIFIED IDEOGRAPH
+0x9AEC	0x5925	#CJK UNIFIED IDEOGRAPH
+0x9AED	0x592C	#CJK UNIFIED IDEOGRAPH
+0x9AEE	0x592D	#CJK UNIFIED IDEOGRAPH
+0x9AEF	0x5932	#CJK UNIFIED IDEOGRAPH
+0x9AF0	0x5938	#CJK UNIFIED IDEOGRAPH
+0x9AF1	0x593E	#CJK UNIFIED IDEOGRAPH
+0x9AF2	0x7AD2	#CJK UNIFIED IDEOGRAPH
+0x9AF3	0x5955	#CJK UNIFIED IDEOGRAPH
+0x9AF4	0x5950	#CJK UNIFIED IDEOGRAPH
+0x9AF5	0x594E	#CJK UNIFIED IDEOGRAPH
+0x9AF6	0x595A	#CJK UNIFIED IDEOGRAPH
+0x9AF7	0x5958	#CJK UNIFIED IDEOGRAPH
+0x9AF8	0x5962	#CJK UNIFIED IDEOGRAPH
+0x9AF9	0x5960	#CJK UNIFIED IDEOGRAPH
+0x9AFA	0x5967	#CJK UNIFIED IDEOGRAPH
+0x9AFB	0x596C	#CJK UNIFIED IDEOGRAPH
+0x9AFC	0x5969	#CJK UNIFIED IDEOGRAPH
+0x9B40	0x5978	#CJK UNIFIED IDEOGRAPH
+0x9B41	0x5981	#CJK UNIFIED IDEOGRAPH
+0x9B42	0x599D	#CJK UNIFIED IDEOGRAPH
+0x9B43	0x4F5E	#CJK UNIFIED IDEOGRAPH
+0x9B44	0x4FAB	#CJK UNIFIED IDEOGRAPH
+0x9B45	0x59A3	#CJK UNIFIED IDEOGRAPH
+0x9B46	0x59B2	#CJK UNIFIED IDEOGRAPH
+0x9B47	0x59C6	#CJK UNIFIED IDEOGRAPH
+0x9B48	0x59E8	#CJK UNIFIED IDEOGRAPH
+0x9B49	0x59DC	#CJK UNIFIED IDEOGRAPH
+0x9B4A	0x598D	#CJK UNIFIED IDEOGRAPH
+0x9B4B	0x59D9	#CJK UNIFIED IDEOGRAPH
+0x9B4C	0x59DA	#CJK UNIFIED IDEOGRAPH
+0x9B4D	0x5A25	#CJK UNIFIED IDEOGRAPH
+0x9B4E	0x5A1F	#CJK UNIFIED IDEOGRAPH
+0x9B4F	0x5A11	#CJK UNIFIED IDEOGRAPH
+0x9B50	0x5A1C	#CJK UNIFIED IDEOGRAPH
+0x9B51	0x5A09	#CJK UNIFIED IDEOGRAPH
+0x9B52	0x5A1A	#CJK UNIFIED IDEOGRAPH
+0x9B53	0x5A40	#CJK UNIFIED IDEOGRAPH
+0x9B54	0x5A6C	#CJK UNIFIED IDEOGRAPH
+0x9B55	0x5A49	#CJK UNIFIED IDEOGRAPH
+0x9B56	0x5A35	#CJK UNIFIED IDEOGRAPH
+0x9B57	0x5A36	#CJK UNIFIED IDEOGRAPH
+0x9B58	0x5A62	#CJK UNIFIED IDEOGRAPH
+0x9B59	0x5A6A	#CJK UNIFIED IDEOGRAPH
+0x9B5A	0x5A9A	#CJK UNIFIED IDEOGRAPH
+0x9B5B	0x5ABC	#CJK UNIFIED IDEOGRAPH
+0x9B5C	0x5ABE	#CJK UNIFIED IDEOGRAPH
+0x9B5D	0x5ACB	#CJK UNIFIED IDEOGRAPH
+0x9B5E	0x5AC2	#CJK UNIFIED IDEOGRAPH
+0x9B5F	0x5ABD	#CJK UNIFIED IDEOGRAPH
+0x9B60	0x5AE3	#CJK UNIFIED IDEOGRAPH
+0x9B61	0x5AD7	#CJK UNIFIED IDEOGRAPH
+0x9B62	0x5AE6	#CJK UNIFIED IDEOGRAPH
+0x9B63	0x5AE9	#CJK UNIFIED IDEOGRAPH
+0x9B64	0x5AD6	#CJK UNIFIED IDEOGRAPH
+0x9B65	0x5AFA	#CJK UNIFIED IDEOGRAPH
+0x9B66	0x5AFB	#CJK UNIFIED IDEOGRAPH
+0x9B67	0x5B0C	#CJK UNIFIED IDEOGRAPH
+0x9B68	0x5B0B	#CJK UNIFIED IDEOGRAPH
+0x9B69	0x5B16	#CJK UNIFIED IDEOGRAPH
+0x9B6A	0x5B32	#CJK UNIFIED IDEOGRAPH
+0x9B6B	0x5AD0	#CJK UNIFIED IDEOGRAPH
+0x9B6C	0x5B2A	#CJK UNIFIED IDEOGRAPH
+0x9B6D	0x5B36	#CJK UNIFIED IDEOGRAPH
+0x9B6E	0x5B3E	#CJK UNIFIED IDEOGRAPH
+0x9B6F	0x5B43	#CJK UNIFIED IDEOGRAPH
+0x9B70	0x5B45	#CJK UNIFIED IDEOGRAPH
+0x9B71	0x5B40	#CJK UNIFIED IDEOGRAPH
+0x9B72	0x5B51	#CJK UNIFIED IDEOGRAPH
+0x9B73	0x5B55	#CJK UNIFIED IDEOGRAPH
+0x9B74	0x5B5A	#CJK UNIFIED IDEOGRAPH
+0x9B75	0x5B5B	#CJK UNIFIED IDEOGRAPH
+0x9B76	0x5B65	#CJK UNIFIED IDEOGRAPH
+0x9B77	0x5B69	#CJK UNIFIED IDEOGRAPH
+0x9B78	0x5B70	#CJK UNIFIED IDEOGRAPH
+0x9B79	0x5B73	#CJK UNIFIED IDEOGRAPH
+0x9B7A	0x5B75	#CJK UNIFIED IDEOGRAPH
+0x9B7B	0x5B78	#CJK UNIFIED IDEOGRAPH
+0x9B7C	0x6588	#CJK UNIFIED IDEOGRAPH
+0x9B7D	0x5B7A	#CJK UNIFIED IDEOGRAPH
+0x9B7E	0x5B80	#CJK UNIFIED IDEOGRAPH
+0x9B80	0x5B83	#CJK UNIFIED IDEOGRAPH
+0x9B81	0x5BA6	#CJK UNIFIED IDEOGRAPH
+0x9B82	0x5BB8	#CJK UNIFIED IDEOGRAPH
+0x9B83	0x5BC3	#CJK UNIFIED IDEOGRAPH
+0x9B84	0x5BC7	#CJK UNIFIED IDEOGRAPH
+0x9B85	0x5BC9	#CJK UNIFIED IDEOGRAPH
+0x9B86	0x5BD4	#CJK UNIFIED IDEOGRAPH
+0x9B87	0x5BD0	#CJK UNIFIED IDEOGRAPH
+0x9B88	0x5BE4	#CJK UNIFIED IDEOGRAPH
+0x9B89	0x5BE6	#CJK UNIFIED IDEOGRAPH
+0x9B8A	0x5BE2	#CJK UNIFIED IDEOGRAPH
+0x9B8B	0x5BDE	#CJK UNIFIED IDEOGRAPH
+0x9B8C	0x5BE5	#CJK UNIFIED IDEOGRAPH
+0x9B8D	0x5BEB	#CJK UNIFIED IDEOGRAPH
+0x9B8E	0x5BF0	#CJK UNIFIED IDEOGRAPH
+0x9B8F	0x5BF6	#CJK UNIFIED IDEOGRAPH
+0x9B90	0x5BF3	#CJK UNIFIED IDEOGRAPH
+0x9B91	0x5C05	#CJK UNIFIED IDEOGRAPH
+0x9B92	0x5C07	#CJK UNIFIED IDEOGRAPH
+0x9B93	0x5C08	#CJK UNIFIED IDEOGRAPH
+0x9B94	0x5C0D	#CJK UNIFIED IDEOGRAPH
+0x9B95	0x5C13	#CJK UNIFIED IDEOGRAPH
+0x9B96	0x5C20	#CJK UNIFIED IDEOGRAPH
+0x9B97	0x5C22	#CJK UNIFIED IDEOGRAPH
+0x9B98	0x5C28	#CJK UNIFIED IDEOGRAPH
+0x9B99	0x5C38	#CJK UNIFIED IDEOGRAPH
+0x9B9A	0x5C39	#CJK UNIFIED IDEOGRAPH
+0x9B9B	0x5C41	#CJK UNIFIED IDEOGRAPH
+0x9B9C	0x5C46	#CJK UNIFIED IDEOGRAPH
+0x9B9D	0x5C4E	#CJK UNIFIED IDEOGRAPH
+0x9B9E	0x5C53	#CJK UNIFIED IDEOGRAPH
+0x9B9F	0x5C50	#CJK UNIFIED IDEOGRAPH
+0x9BA0	0x5C4F	#CJK UNIFIED IDEOGRAPH
+0x9BA1	0x5B71	#CJK UNIFIED IDEOGRAPH
+0x9BA2	0x5C6C	#CJK UNIFIED IDEOGRAPH
+0x9BA3	0x5C6E	#CJK UNIFIED IDEOGRAPH
+0x9BA4	0x4E62	#CJK UNIFIED IDEOGRAPH
+0x9BA5	0x5C76	#CJK UNIFIED IDEOGRAPH
+0x9BA6	0x5C79	#CJK UNIFIED IDEOGRAPH
+0x9BA7	0x5C8C	#CJK UNIFIED IDEOGRAPH
+0x9BA8	0x5C91	#CJK UNIFIED IDEOGRAPH
+0x9BA9	0x5C94	#CJK UNIFIED IDEOGRAPH
+0x9BAA	0x599B	#CJK UNIFIED IDEOGRAPH
+0x9BAB	0x5CAB	#CJK UNIFIED IDEOGRAPH
+0x9BAC	0x5CBB	#CJK UNIFIED IDEOGRAPH
+0x9BAD	0x5CB6	#CJK UNIFIED IDEOGRAPH
+0x9BAE	0x5CBC	#CJK UNIFIED IDEOGRAPH
+0x9BAF	0x5CB7	#CJK UNIFIED IDEOGRAPH
+0x9BB0	0x5CC5	#CJK UNIFIED IDEOGRAPH
+0x9BB1	0x5CBE	#CJK UNIFIED IDEOGRAPH
+0x9BB2	0x5CC7	#CJK UNIFIED IDEOGRAPH
+0x9BB3	0x5CD9	#CJK UNIFIED IDEOGRAPH
+0x9BB4	0x5CE9	#CJK UNIFIED IDEOGRAPH
+0x9BB5	0x5CFD	#CJK UNIFIED IDEOGRAPH
+0x9BB6	0x5CFA	#CJK UNIFIED IDEOGRAPH
+0x9BB7	0x5CED	#CJK UNIFIED IDEOGRAPH
+0x9BB8	0x5D8C	#CJK UNIFIED IDEOGRAPH
+0x9BB9	0x5CEA	#CJK UNIFIED IDEOGRAPH
+0x9BBA	0x5D0B	#CJK UNIFIED IDEOGRAPH
+0x9BBB	0x5D15	#CJK UNIFIED IDEOGRAPH
+0x9BBC	0x5D17	#CJK UNIFIED IDEOGRAPH
+0x9BBD	0x5D5C	#CJK UNIFIED IDEOGRAPH
+0x9BBE	0x5D1F	#CJK UNIFIED IDEOGRAPH
+0x9BBF	0x5D1B	#CJK UNIFIED IDEOGRAPH
+0x9BC0	0x5D11	#CJK UNIFIED IDEOGRAPH
+0x9BC1	0x5D14	#CJK UNIFIED IDEOGRAPH
+0x9BC2	0x5D22	#CJK UNIFIED IDEOGRAPH
+0x9BC3	0x5D1A	#CJK UNIFIED IDEOGRAPH
+0x9BC4	0x5D19	#CJK UNIFIED IDEOGRAPH
+0x9BC5	0x5D18	#CJK UNIFIED IDEOGRAPH
+0x9BC6	0x5D4C	#CJK UNIFIED IDEOGRAPH
+0x9BC7	0x5D52	#CJK UNIFIED IDEOGRAPH
+0x9BC8	0x5D4E	#CJK UNIFIED IDEOGRAPH
+0x9BC9	0x5D4B	#CJK UNIFIED IDEOGRAPH
+0x9BCA	0x5D6C	#CJK UNIFIED IDEOGRAPH
+0x9BCB	0x5D73	#CJK UNIFIED IDEOGRAPH
+0x9BCC	0x5D76	#CJK UNIFIED IDEOGRAPH
+0x9BCD	0x5D87	#CJK UNIFIED IDEOGRAPH
+0x9BCE	0x5D84	#CJK UNIFIED IDEOGRAPH
+0x9BCF	0x5D82	#CJK UNIFIED IDEOGRAPH
+0x9BD0	0x5DA2	#CJK UNIFIED IDEOGRAPH
+0x9BD1	0x5D9D	#CJK UNIFIED IDEOGRAPH
+0x9BD2	0x5DAC	#CJK UNIFIED IDEOGRAPH
+0x9BD3	0x5DAE	#CJK UNIFIED IDEOGRAPH
+0x9BD4	0x5DBD	#CJK UNIFIED IDEOGRAPH
+0x9BD5	0x5D90	#CJK UNIFIED IDEOGRAPH
+0x9BD6	0x5DB7	#CJK UNIFIED IDEOGRAPH
+0x9BD7	0x5DBC	#CJK UNIFIED IDEOGRAPH
+0x9BD8	0x5DC9	#CJK UNIFIED IDEOGRAPH
+0x9BD9	0x5DCD	#CJK UNIFIED IDEOGRAPH
+0x9BDA	0x5DD3	#CJK UNIFIED IDEOGRAPH
+0x9BDB	0x5DD2	#CJK UNIFIED IDEOGRAPH
+0x9BDC	0x5DD6	#CJK UNIFIED IDEOGRAPH
+0x9BDD	0x5DDB	#CJK UNIFIED IDEOGRAPH
+0x9BDE	0x5DEB	#CJK UNIFIED IDEOGRAPH
+0x9BDF	0x5DF2	#CJK UNIFIED IDEOGRAPH
+0x9BE0	0x5DF5	#CJK UNIFIED IDEOGRAPH
+0x9BE1	0x5E0B	#CJK UNIFIED IDEOGRAPH
+0x9BE2	0x5E1A	#CJK UNIFIED IDEOGRAPH
+0x9BE3	0x5E19	#CJK UNIFIED IDEOGRAPH
+0x9BE4	0x5E11	#CJK UNIFIED IDEOGRAPH
+0x9BE5	0x5E1B	#CJK UNIFIED IDEOGRAPH
+0x9BE6	0x5E36	#CJK UNIFIED IDEOGRAPH
+0x9BE7	0x5E37	#CJK UNIFIED IDEOGRAPH
+0x9BE8	0x5E44	#CJK UNIFIED IDEOGRAPH
+0x9BE9	0x5E43	#CJK UNIFIED IDEOGRAPH
+0x9BEA	0x5E40	#CJK UNIFIED IDEOGRAPH
+0x9BEB	0x5E4E	#CJK UNIFIED IDEOGRAPH
+0x9BEC	0x5E57	#CJK UNIFIED IDEOGRAPH
+0x9BED	0x5E54	#CJK UNIFIED IDEOGRAPH
+0x9BEE	0x5E5F	#CJK UNIFIED IDEOGRAPH
+0x9BEF	0x5E62	#CJK UNIFIED IDEOGRAPH
+0x9BF0	0x5E64	#CJK UNIFIED IDEOGRAPH
+0x9BF1	0x5E47	#CJK UNIFIED IDEOGRAPH
+0x9BF2	0x5E75	#CJK UNIFIED IDEOGRAPH
+0x9BF3	0x5E76	#CJK UNIFIED IDEOGRAPH
+0x9BF4	0x5E7A	#CJK UNIFIED IDEOGRAPH
+0x9BF5	0x9EBC	#CJK UNIFIED IDEOGRAPH
+0x9BF6	0x5E7F	#CJK UNIFIED IDEOGRAPH
+0x9BF7	0x5EA0	#CJK UNIFIED IDEOGRAPH
+0x9BF8	0x5EC1	#CJK UNIFIED IDEOGRAPH
+0x9BF9	0x5EC2	#CJK UNIFIED IDEOGRAPH
+0x9BFA	0x5EC8	#CJK UNIFIED IDEOGRAPH
+0x9BFB	0x5ED0	#CJK UNIFIED IDEOGRAPH
+0x9BFC	0x5ECF	#CJK UNIFIED IDEOGRAPH
+0x9C40	0x5ED6	#CJK UNIFIED IDEOGRAPH
+0x9C41	0x5EE3	#CJK UNIFIED IDEOGRAPH
+0x9C42	0x5EDD	#CJK UNIFIED IDEOGRAPH
+0x9C43	0x5EDA	#CJK UNIFIED IDEOGRAPH
+0x9C44	0x5EDB	#CJK UNIFIED IDEOGRAPH
+0x9C45	0x5EE2	#CJK UNIFIED IDEOGRAPH
+0x9C46	0x5EE1	#CJK UNIFIED IDEOGRAPH
+0x9C47	0x5EE8	#CJK UNIFIED IDEOGRAPH
+0x9C48	0x5EE9	#CJK UNIFIED IDEOGRAPH
+0x9C49	0x5EEC	#CJK UNIFIED IDEOGRAPH
+0x9C4A	0x5EF1	#CJK UNIFIED IDEOGRAPH
+0x9C4B	0x5EF3	#CJK UNIFIED IDEOGRAPH
+0x9C4C	0x5EF0	#CJK UNIFIED IDEOGRAPH
+0x9C4D	0x5EF4	#CJK UNIFIED IDEOGRAPH
+0x9C4E	0x5EF8	#CJK UNIFIED IDEOGRAPH
+0x9C4F	0x5EFE	#CJK UNIFIED IDEOGRAPH
+0x9C50	0x5F03	#CJK UNIFIED IDEOGRAPH
+0x9C51	0x5F09	#CJK UNIFIED IDEOGRAPH
+0x9C52	0x5F5D	#CJK UNIFIED IDEOGRAPH
+0x9C53	0x5F5C	#CJK UNIFIED IDEOGRAPH
+0x9C54	0x5F0B	#CJK UNIFIED IDEOGRAPH
+0x9C55	0x5F11	#CJK UNIFIED IDEOGRAPH
+0x9C56	0x5F16	#CJK UNIFIED IDEOGRAPH
+0x9C57	0x5F29	#CJK UNIFIED IDEOGRAPH
+0x9C58	0x5F2D	#CJK UNIFIED IDEOGRAPH
+0x9C59	0x5F38	#CJK UNIFIED IDEOGRAPH
+0x9C5A	0x5F41	#CJK UNIFIED IDEOGRAPH
+0x9C5B	0x5F48	#CJK UNIFIED IDEOGRAPH
+0x9C5C	0x5F4C	#CJK UNIFIED IDEOGRAPH
+0x9C5D	0x5F4E	#CJK UNIFIED IDEOGRAPH
+0x9C5E	0x5F2F	#CJK UNIFIED IDEOGRAPH
+0x9C5F	0x5F51	#CJK UNIFIED IDEOGRAPH
+0x9C60	0x5F56	#CJK UNIFIED IDEOGRAPH
+0x9C61	0x5F57	#CJK UNIFIED IDEOGRAPH
+0x9C62	0x5F59	#CJK UNIFIED IDEOGRAPH
+0x9C63	0x5F61	#CJK UNIFIED IDEOGRAPH
+0x9C64	0x5F6D	#CJK UNIFIED IDEOGRAPH
+0x9C65	0x5F73	#CJK UNIFIED IDEOGRAPH
+0x9C66	0x5F77	#CJK UNIFIED IDEOGRAPH
+0x9C67	0x5F83	#CJK UNIFIED IDEOGRAPH
+0x9C68	0x5F82	#CJK UNIFIED IDEOGRAPH
+0x9C69	0x5F7F	#CJK UNIFIED IDEOGRAPH
+0x9C6A	0x5F8A	#CJK UNIFIED IDEOGRAPH
+0x9C6B	0x5F88	#CJK UNIFIED IDEOGRAPH
+0x9C6C	0x5F91	#CJK UNIFIED IDEOGRAPH
+0x9C6D	0x5F87	#CJK UNIFIED IDEOGRAPH
+0x9C6E	0x5F9E	#CJK UNIFIED IDEOGRAPH
+0x9C6F	0x5F99	#CJK UNIFIED IDEOGRAPH
+0x9C70	0x5F98	#CJK UNIFIED IDEOGRAPH
+0x9C71	0x5FA0	#CJK UNIFIED IDEOGRAPH
+0x9C72	0x5FA8	#CJK UNIFIED IDEOGRAPH
+0x9C73	0x5FAD	#CJK UNIFIED IDEOGRAPH
+0x9C74	0x5FBC	#CJK UNIFIED IDEOGRAPH
+0x9C75	0x5FD6	#CJK UNIFIED IDEOGRAPH
+0x9C76	0x5FFB	#CJK UNIFIED IDEOGRAPH
+0x9C77	0x5FE4	#CJK UNIFIED IDEOGRAPH
+0x9C78	0x5FF8	#CJK UNIFIED IDEOGRAPH
+0x9C79	0x5FF1	#CJK UNIFIED IDEOGRAPH
+0x9C7A	0x5FDD	#CJK UNIFIED IDEOGRAPH
+0x9C7B	0x60B3	#CJK UNIFIED IDEOGRAPH
+0x9C7C	0x5FFF	#CJK UNIFIED IDEOGRAPH
+0x9C7D	0x6021	#CJK UNIFIED IDEOGRAPH
+0x9C7E	0x6060	#CJK UNIFIED IDEOGRAPH
+0x9C80	0x6019	#CJK UNIFIED IDEOGRAPH
+0x9C81	0x6010	#CJK UNIFIED IDEOGRAPH
+0x9C82	0x6029	#CJK UNIFIED IDEOGRAPH
+0x9C83	0x600E	#CJK UNIFIED IDEOGRAPH
+0x9C84	0x6031	#CJK UNIFIED IDEOGRAPH
+0x9C85	0x601B	#CJK UNIFIED IDEOGRAPH
+0x9C86	0x6015	#CJK UNIFIED IDEOGRAPH
+0x9C87	0x602B	#CJK UNIFIED IDEOGRAPH
+0x9C88	0x6026	#CJK UNIFIED IDEOGRAPH
+0x9C89	0x600F	#CJK UNIFIED IDEOGRAPH
+0x9C8A	0x603A	#CJK UNIFIED IDEOGRAPH
+0x9C8B	0x605A	#CJK UNIFIED IDEOGRAPH
+0x9C8C	0x6041	#CJK UNIFIED IDEOGRAPH
+0x9C8D	0x606A	#CJK UNIFIED IDEOGRAPH
+0x9C8E	0x6077	#CJK UNIFIED IDEOGRAPH
+0x9C8F	0x605F	#CJK UNIFIED IDEOGRAPH
+0x9C90	0x604A	#CJK UNIFIED IDEOGRAPH
+0x9C91	0x6046	#CJK UNIFIED IDEOGRAPH
+0x9C92	0x604D	#CJK UNIFIED IDEOGRAPH
+0x9C93	0x6063	#CJK UNIFIED IDEOGRAPH
+0x9C94	0x6043	#CJK UNIFIED IDEOGRAPH
+0x9C95	0x6064	#CJK UNIFIED IDEOGRAPH
+0x9C96	0x6042	#CJK UNIFIED IDEOGRAPH
+0x9C97	0x606C	#CJK UNIFIED IDEOGRAPH
+0x9C98	0x606B	#CJK UNIFIED IDEOGRAPH
+0x9C99	0x6059	#CJK UNIFIED IDEOGRAPH
+0x9C9A	0x6081	#CJK UNIFIED IDEOGRAPH
+0x9C9B	0x608D	#CJK UNIFIED IDEOGRAPH
+0x9C9C	0x60E7	#CJK UNIFIED IDEOGRAPH
+0x9C9D	0x6083	#CJK UNIFIED IDEOGRAPH
+0x9C9E	0x609A	#CJK UNIFIED IDEOGRAPH
+0x9C9F	0x6084	#CJK UNIFIED IDEOGRAPH
+0x9CA0	0x609B	#CJK UNIFIED IDEOGRAPH
+0x9CA1	0x6096	#CJK UNIFIED IDEOGRAPH
+0x9CA2	0x6097	#CJK UNIFIED IDEOGRAPH
+0x9CA3	0x6092	#CJK UNIFIED IDEOGRAPH
+0x9CA4	0x60A7	#CJK UNIFIED IDEOGRAPH
+0x9CA5	0x608B	#CJK UNIFIED IDEOGRAPH
+0x9CA6	0x60E1	#CJK UNIFIED IDEOGRAPH
+0x9CA7	0x60B8	#CJK UNIFIED IDEOGRAPH
+0x9CA8	0x60E0	#CJK UNIFIED IDEOGRAPH
+0x9CA9	0x60D3	#CJK UNIFIED IDEOGRAPH
+0x9CAA	0x60B4	#CJK UNIFIED IDEOGRAPH
+0x9CAB	0x5FF0	#CJK UNIFIED IDEOGRAPH
+0x9CAC	0x60BD	#CJK UNIFIED IDEOGRAPH
+0x9CAD	0x60C6	#CJK UNIFIED IDEOGRAPH
+0x9CAE	0x60B5	#CJK UNIFIED IDEOGRAPH
+0x9CAF	0x60D8	#CJK UNIFIED IDEOGRAPH
+0x9CB0	0x614D	#CJK UNIFIED IDEOGRAPH
+0x9CB1	0x6115	#CJK UNIFIED IDEOGRAPH
+0x9CB2	0x6106	#CJK UNIFIED IDEOGRAPH
+0x9CB3	0x60F6	#CJK UNIFIED IDEOGRAPH
+0x9CB4	0x60F7	#CJK UNIFIED IDEOGRAPH
+0x9CB5	0x6100	#CJK UNIFIED IDEOGRAPH
+0x9CB6	0x60F4	#CJK UNIFIED IDEOGRAPH
+0x9CB7	0x60FA	#CJK UNIFIED IDEOGRAPH
+0x9CB8	0x6103	#CJK UNIFIED IDEOGRAPH
+0x9CB9	0x6121	#CJK UNIFIED IDEOGRAPH
+0x9CBA	0x60FB	#CJK UNIFIED IDEOGRAPH
+0x9CBB	0x60F1	#CJK UNIFIED IDEOGRAPH
+0x9CBC	0x610D	#CJK UNIFIED IDEOGRAPH
+0x9CBD	0x610E	#CJK UNIFIED IDEOGRAPH
+0x9CBE	0x6147	#CJK UNIFIED IDEOGRAPH
+0x9CBF	0x613E	#CJK UNIFIED IDEOGRAPH
+0x9CC0	0x6128	#CJK UNIFIED IDEOGRAPH
+0x9CC1	0x6127	#CJK UNIFIED IDEOGRAPH
+0x9CC2	0x614A	#CJK UNIFIED IDEOGRAPH
+0x9CC3	0x613F	#CJK UNIFIED IDEOGRAPH
+0x9CC4	0x613C	#CJK UNIFIED IDEOGRAPH
+0x9CC5	0x612C	#CJK UNIFIED IDEOGRAPH
+0x9CC6	0x6134	#CJK UNIFIED IDEOGRAPH
+0x9CC7	0x613D	#CJK UNIFIED IDEOGRAPH
+0x9CC8	0x6142	#CJK UNIFIED IDEOGRAPH
+0x9CC9	0x6144	#CJK UNIFIED IDEOGRAPH
+0x9CCA	0x6173	#CJK UNIFIED IDEOGRAPH
+0x9CCB	0x6177	#CJK UNIFIED IDEOGRAPH
+0x9CCC	0x6158	#CJK UNIFIED IDEOGRAPH
+0x9CCD	0x6159	#CJK UNIFIED IDEOGRAPH
+0x9CCE	0x615A	#CJK UNIFIED IDEOGRAPH
+0x9CCF	0x616B	#CJK UNIFIED IDEOGRAPH
+0x9CD0	0x6174	#CJK UNIFIED IDEOGRAPH
+0x9CD1	0x616F	#CJK UNIFIED IDEOGRAPH
+0x9CD2	0x6165	#CJK UNIFIED IDEOGRAPH
+0x9CD3	0x6171	#CJK UNIFIED IDEOGRAPH
+0x9CD4	0x615F	#CJK UNIFIED IDEOGRAPH
+0x9CD5	0x615D	#CJK UNIFIED IDEOGRAPH
+0x9CD6	0x6153	#CJK UNIFIED IDEOGRAPH
+0x9CD7	0x6175	#CJK UNIFIED IDEOGRAPH
+0x9CD8	0x6199	#CJK UNIFIED IDEOGRAPH
+0x9CD9	0x6196	#CJK UNIFIED IDEOGRAPH
+0x9CDA	0x6187	#CJK UNIFIED IDEOGRAPH
+0x9CDB	0x61AC	#CJK UNIFIED IDEOGRAPH
+0x9CDC	0x6194	#CJK UNIFIED IDEOGRAPH
+0x9CDD	0x619A	#CJK UNIFIED IDEOGRAPH
+0x9CDE	0x618A	#CJK UNIFIED IDEOGRAPH
+0x9CDF	0x6191	#CJK UNIFIED IDEOGRAPH
+0x9CE0	0x61AB	#CJK UNIFIED IDEOGRAPH
+0x9CE1	0x61AE	#CJK UNIFIED IDEOGRAPH
+0x9CE2	0x61CC	#CJK UNIFIED IDEOGRAPH
+0x9CE3	0x61CA	#CJK UNIFIED IDEOGRAPH
+0x9CE4	0x61C9	#CJK UNIFIED IDEOGRAPH
+0x9CE5	0x61F7	#CJK UNIFIED IDEOGRAPH
+0x9CE6	0x61C8	#CJK UNIFIED IDEOGRAPH
+0x9CE7	0x61C3	#CJK UNIFIED IDEOGRAPH
+0x9CE8	0x61C6	#CJK UNIFIED IDEOGRAPH
+0x9CE9	0x61BA	#CJK UNIFIED IDEOGRAPH
+0x9CEA	0x61CB	#CJK UNIFIED IDEOGRAPH
+0x9CEB	0x7F79	#CJK UNIFIED IDEOGRAPH
+0x9CEC	0x61CD	#CJK UNIFIED IDEOGRAPH
+0x9CED	0x61E6	#CJK UNIFIED IDEOGRAPH
+0x9CEE	0x61E3	#CJK UNIFIED IDEOGRAPH
+0x9CEF	0x61F6	#CJK UNIFIED IDEOGRAPH
+0x9CF0	0x61FA	#CJK UNIFIED IDEOGRAPH
+0x9CF1	0x61F4	#CJK UNIFIED IDEOGRAPH
+0x9CF2	0x61FF	#CJK UNIFIED IDEOGRAPH
+0x9CF3	0x61FD	#CJK UNIFIED IDEOGRAPH
+0x9CF4	0x61FC	#CJK UNIFIED IDEOGRAPH
+0x9CF5	0x61FE	#CJK UNIFIED IDEOGRAPH
+0x9CF6	0x6200	#CJK UNIFIED IDEOGRAPH
+0x9CF7	0x6208	#CJK UNIFIED IDEOGRAPH
+0x9CF8	0x6209	#CJK UNIFIED IDEOGRAPH
+0x9CF9	0x620D	#CJK UNIFIED IDEOGRAPH
+0x9CFA	0x620C	#CJK UNIFIED IDEOGRAPH
+0x9CFB	0x6214	#CJK UNIFIED IDEOGRAPH
+0x9CFC	0x621B	#CJK UNIFIED IDEOGRAPH
+0x9D40	0x621E	#CJK UNIFIED IDEOGRAPH
+0x9D41	0x6221	#CJK UNIFIED IDEOGRAPH
+0x9D42	0x622A	#CJK UNIFIED IDEOGRAPH
+0x9D43	0x622E	#CJK UNIFIED IDEOGRAPH
+0x9D44	0x6230	#CJK UNIFIED IDEOGRAPH
+0x9D45	0x6232	#CJK UNIFIED IDEOGRAPH
+0x9D46	0x6233	#CJK UNIFIED IDEOGRAPH
+0x9D47	0x6241	#CJK UNIFIED IDEOGRAPH
+0x9D48	0x624E	#CJK UNIFIED IDEOGRAPH
+0x9D49	0x625E	#CJK UNIFIED IDEOGRAPH
+0x9D4A	0x6263	#CJK UNIFIED IDEOGRAPH
+0x9D4B	0x625B	#CJK UNIFIED IDEOGRAPH
+0x9D4C	0x6260	#CJK UNIFIED IDEOGRAPH
+0x9D4D	0x6268	#CJK UNIFIED IDEOGRAPH
+0x9D4E	0x627C	#CJK UNIFIED IDEOGRAPH
+0x9D4F	0x6282	#CJK UNIFIED IDEOGRAPH
+0x9D50	0x6289	#CJK UNIFIED IDEOGRAPH
+0x9D51	0x627E	#CJK UNIFIED IDEOGRAPH
+0x9D52	0x6292	#CJK UNIFIED IDEOGRAPH
+0x9D53	0x6293	#CJK UNIFIED IDEOGRAPH
+0x9D54	0x6296	#CJK UNIFIED IDEOGRAPH
+0x9D55	0x62D4	#CJK UNIFIED IDEOGRAPH
+0x9D56	0x6283	#CJK UNIFIED IDEOGRAPH
+0x9D57	0x6294	#CJK UNIFIED IDEOGRAPH
+0x9D58	0x62D7	#CJK UNIFIED IDEOGRAPH
+0x9D59	0x62D1	#CJK UNIFIED IDEOGRAPH
+0x9D5A	0x62BB	#CJK UNIFIED IDEOGRAPH
+0x9D5B	0x62CF	#CJK UNIFIED IDEOGRAPH
+0x9D5C	0x62FF	#CJK UNIFIED IDEOGRAPH
+0x9D5D	0x62C6	#CJK UNIFIED IDEOGRAPH
+0x9D5E	0x64D4	#CJK UNIFIED IDEOGRAPH
+0x9D5F	0x62C8	#CJK UNIFIED IDEOGRAPH
+0x9D60	0x62DC	#CJK UNIFIED IDEOGRAPH
+0x9D61	0x62CC	#CJK UNIFIED IDEOGRAPH
+0x9D62	0x62CA	#CJK UNIFIED IDEOGRAPH
+0x9D63	0x62C2	#CJK UNIFIED IDEOGRAPH
+0x9D64	0x62C7	#CJK UNIFIED IDEOGRAPH
+0x9D65	0x629B	#CJK UNIFIED IDEOGRAPH
+0x9D66	0x62C9	#CJK UNIFIED IDEOGRAPH
+0x9D67	0x630C	#CJK UNIFIED IDEOGRAPH
+0x9D68	0x62EE	#CJK UNIFIED IDEOGRAPH
+0x9D69	0x62F1	#CJK UNIFIED IDEOGRAPH
+0x9D6A	0x6327	#CJK UNIFIED IDEOGRAPH
+0x9D6B	0x6302	#CJK UNIFIED IDEOGRAPH
+0x9D6C	0x6308	#CJK UNIFIED IDEOGRAPH
+0x9D6D	0x62EF	#CJK UNIFIED IDEOGRAPH
+0x9D6E	0x62F5	#CJK UNIFIED IDEOGRAPH
+0x9D6F	0x6350	#CJK UNIFIED IDEOGRAPH
+0x9D70	0x633E	#CJK UNIFIED IDEOGRAPH
+0x9D71	0x634D	#CJK UNIFIED IDEOGRAPH
+0x9D72	0x641C	#CJK UNIFIED IDEOGRAPH
+0x9D73	0x634F	#CJK UNIFIED IDEOGRAPH
+0x9D74	0x6396	#CJK UNIFIED IDEOGRAPH
+0x9D75	0x638E	#CJK UNIFIED IDEOGRAPH
+0x9D76	0x6380	#CJK UNIFIED IDEOGRAPH
+0x9D77	0x63AB	#CJK UNIFIED IDEOGRAPH
+0x9D78	0x6376	#CJK UNIFIED IDEOGRAPH
+0x9D79	0x63A3	#CJK UNIFIED IDEOGRAPH
+0x9D7A	0x638F	#CJK UNIFIED IDEOGRAPH
+0x9D7B	0x6389	#CJK UNIFIED IDEOGRAPH
+0x9D7C	0x639F	#CJK UNIFIED IDEOGRAPH
+0x9D7D	0x63B5	#CJK UNIFIED IDEOGRAPH
+0x9D7E	0x636B	#CJK UNIFIED IDEOGRAPH
+0x9D80	0x6369	#CJK UNIFIED IDEOGRAPH
+0x9D81	0x63BE	#CJK UNIFIED IDEOGRAPH
+0x9D82	0x63E9	#CJK UNIFIED IDEOGRAPH
+0x9D83	0x63C0	#CJK UNIFIED IDEOGRAPH
+0x9D84	0x63C6	#CJK UNIFIED IDEOGRAPH
+0x9D85	0x63E3	#CJK UNIFIED IDEOGRAPH
+0x9D86	0x63C9	#CJK UNIFIED IDEOGRAPH
+0x9D87	0x63D2	#CJK UNIFIED IDEOGRAPH
+0x9D88	0x63F6	#CJK UNIFIED IDEOGRAPH
+0x9D89	0x63C4	#CJK UNIFIED IDEOGRAPH
+0x9D8A	0x6416	#CJK UNIFIED IDEOGRAPH
+0x9D8B	0x6434	#CJK UNIFIED IDEOGRAPH
+0x9D8C	0x6406	#CJK UNIFIED IDEOGRAPH
+0x9D8D	0x6413	#CJK UNIFIED IDEOGRAPH
+0x9D8E	0x6426	#CJK UNIFIED IDEOGRAPH
+0x9D8F	0x6436	#CJK UNIFIED IDEOGRAPH
+0x9D90	0x651D	#CJK UNIFIED IDEOGRAPH
+0x9D91	0x6417	#CJK UNIFIED IDEOGRAPH
+0x9D92	0x6428	#CJK UNIFIED IDEOGRAPH
+0x9D93	0x640F	#CJK UNIFIED IDEOGRAPH
+0x9D94	0x6467	#CJK UNIFIED IDEOGRAPH
+0x9D95	0x646F	#CJK UNIFIED IDEOGRAPH
+0x9D96	0x6476	#CJK UNIFIED IDEOGRAPH
+0x9D97	0x644E	#CJK UNIFIED IDEOGRAPH
+0x9D98	0x652A	#CJK UNIFIED IDEOGRAPH
+0x9D99	0x6495	#CJK UNIFIED IDEOGRAPH
+0x9D9A	0x6493	#CJK UNIFIED IDEOGRAPH
+0x9D9B	0x64A5	#CJK UNIFIED IDEOGRAPH
+0x9D9C	0x64A9	#CJK UNIFIED IDEOGRAPH
+0x9D9D	0x6488	#CJK UNIFIED IDEOGRAPH
+0x9D9E	0x64BC	#CJK UNIFIED IDEOGRAPH
+0x9D9F	0x64DA	#CJK UNIFIED IDEOGRAPH
+0x9DA0	0x64D2	#CJK UNIFIED IDEOGRAPH
+0x9DA1	0x64C5	#CJK UNIFIED IDEOGRAPH
+0x9DA2	0x64C7	#CJK UNIFIED IDEOGRAPH
+0x9DA3	0x64BB	#CJK UNIFIED IDEOGRAPH
+0x9DA4	0x64D8	#CJK UNIFIED IDEOGRAPH
+0x9DA5	0x64C2	#CJK UNIFIED IDEOGRAPH
+0x9DA6	0x64F1	#CJK UNIFIED IDEOGRAPH
+0x9DA7	0x64E7	#CJK UNIFIED IDEOGRAPH
+0x9DA8	0x8209	#CJK UNIFIED IDEOGRAPH
+0x9DA9	0x64E0	#CJK UNIFIED IDEOGRAPH
+0x9DAA	0x64E1	#CJK UNIFIED IDEOGRAPH
+0x9DAB	0x62AC	#CJK UNIFIED IDEOGRAPH
+0x9DAC	0x64E3	#CJK UNIFIED IDEOGRAPH
+0x9DAD	0x64EF	#CJK UNIFIED IDEOGRAPH
+0x9DAE	0x652C	#CJK UNIFIED IDEOGRAPH
+0x9DAF	0x64F6	#CJK UNIFIED IDEOGRAPH
+0x9DB0	0x64F4	#CJK UNIFIED IDEOGRAPH
+0x9DB1	0x64F2	#CJK UNIFIED IDEOGRAPH
+0x9DB2	0x64FA	#CJK UNIFIED IDEOGRAPH
+0x9DB3	0x6500	#CJK UNIFIED IDEOGRAPH
+0x9DB4	0x64FD	#CJK UNIFIED IDEOGRAPH
+0x9DB5	0x6518	#CJK UNIFIED IDEOGRAPH
+0x9DB6	0x651C	#CJK UNIFIED IDEOGRAPH
+0x9DB7	0x6505	#CJK UNIFIED IDEOGRAPH
+0x9DB8	0x6524	#CJK UNIFIED IDEOGRAPH
+0x9DB9	0x6523	#CJK UNIFIED IDEOGRAPH
+0x9DBA	0x652B	#CJK UNIFIED IDEOGRAPH
+0x9DBB	0x6534	#CJK UNIFIED IDEOGRAPH
+0x9DBC	0x6535	#CJK UNIFIED IDEOGRAPH
+0x9DBD	0x6537	#CJK UNIFIED IDEOGRAPH
+0x9DBE	0x6536	#CJK UNIFIED IDEOGRAPH
+0x9DBF	0x6538	#CJK UNIFIED IDEOGRAPH
+0x9DC0	0x754B	#CJK UNIFIED IDEOGRAPH
+0x9DC1	0x6548	#CJK UNIFIED IDEOGRAPH
+0x9DC2	0x6556	#CJK UNIFIED IDEOGRAPH
+0x9DC3	0x6555	#CJK UNIFIED IDEOGRAPH
+0x9DC4	0x654D	#CJK UNIFIED IDEOGRAPH
+0x9DC5	0x6558	#CJK UNIFIED IDEOGRAPH
+0x9DC6	0x655E	#CJK UNIFIED IDEOGRAPH
+0x9DC7	0x655D	#CJK UNIFIED IDEOGRAPH
+0x9DC8	0x6572	#CJK UNIFIED IDEOGRAPH
+0x9DC9	0x6578	#CJK UNIFIED IDEOGRAPH
+0x9DCA	0x6582	#CJK UNIFIED IDEOGRAPH
+0x9DCB	0x6583	#CJK UNIFIED IDEOGRAPH
+0x9DCC	0x8B8A	#CJK UNIFIED IDEOGRAPH
+0x9DCD	0x659B	#CJK UNIFIED IDEOGRAPH
+0x9DCE	0x659F	#CJK UNIFIED IDEOGRAPH
+0x9DCF	0x65AB	#CJK UNIFIED IDEOGRAPH
+0x9DD0	0x65B7	#CJK UNIFIED IDEOGRAPH
+0x9DD1	0x65C3	#CJK UNIFIED IDEOGRAPH
+0x9DD2	0x65C6	#CJK UNIFIED IDEOGRAPH
+0x9DD3	0x65C1	#CJK UNIFIED IDEOGRAPH
+0x9DD4	0x65C4	#CJK UNIFIED IDEOGRAPH
+0x9DD5	0x65CC	#CJK UNIFIED IDEOGRAPH
+0x9DD6	0x65D2	#CJK UNIFIED IDEOGRAPH
+0x9DD7	0x65DB	#CJK UNIFIED IDEOGRAPH
+0x9DD8	0x65D9	#CJK UNIFIED IDEOGRAPH
+0x9DD9	0x65E0	#CJK UNIFIED IDEOGRAPH
+0x9DDA	0x65E1	#CJK UNIFIED IDEOGRAPH
+0x9DDB	0x65F1	#CJK UNIFIED IDEOGRAPH
+0x9DDC	0x6772	#CJK UNIFIED IDEOGRAPH
+0x9DDD	0x660A	#CJK UNIFIED IDEOGRAPH
+0x9DDE	0x6603	#CJK UNIFIED IDEOGRAPH
+0x9DDF	0x65FB	#CJK UNIFIED IDEOGRAPH
+0x9DE0	0x6773	#CJK UNIFIED IDEOGRAPH
+0x9DE1	0x6635	#CJK UNIFIED IDEOGRAPH
+0x9DE2	0x6636	#CJK UNIFIED IDEOGRAPH
+0x9DE3	0x6634	#CJK UNIFIED IDEOGRAPH
+0x9DE4	0x661C	#CJK UNIFIED IDEOGRAPH
+0x9DE5	0x664F	#CJK UNIFIED IDEOGRAPH
+0x9DE6	0x6644	#CJK UNIFIED IDEOGRAPH
+0x9DE7	0x6649	#CJK UNIFIED IDEOGRAPH
+0x9DE8	0x6641	#CJK UNIFIED IDEOGRAPH
+0x9DE9	0x665E	#CJK UNIFIED IDEOGRAPH
+0x9DEA	0x665D	#CJK UNIFIED IDEOGRAPH
+0x9DEB	0x6664	#CJK UNIFIED IDEOGRAPH
+0x9DEC	0x6667	#CJK UNIFIED IDEOGRAPH
+0x9DED	0x6668	#CJK UNIFIED IDEOGRAPH
+0x9DEE	0x665F	#CJK UNIFIED IDEOGRAPH
+0x9DEF	0x6662	#CJK UNIFIED IDEOGRAPH
+0x9DF0	0x6670	#CJK UNIFIED IDEOGRAPH
+0x9DF1	0x6683	#CJK UNIFIED IDEOGRAPH
+0x9DF2	0x6688	#CJK UNIFIED IDEOGRAPH
+0x9DF3	0x668E	#CJK UNIFIED IDEOGRAPH
+0x9DF4	0x6689	#CJK UNIFIED IDEOGRAPH
+0x9DF5	0x6684	#CJK UNIFIED IDEOGRAPH
+0x9DF6	0x6698	#CJK UNIFIED IDEOGRAPH
+0x9DF7	0x669D	#CJK UNIFIED IDEOGRAPH
+0x9DF8	0x66C1	#CJK UNIFIED IDEOGRAPH
+0x9DF9	0x66B9	#CJK UNIFIED IDEOGRAPH
+0x9DFA	0x66C9	#CJK UNIFIED IDEOGRAPH
+0x9DFB	0x66BE	#CJK UNIFIED IDEOGRAPH
+0x9DFC	0x66BC	#CJK UNIFIED IDEOGRAPH
+0x9E40	0x66C4	#CJK UNIFIED IDEOGRAPH
+0x9E41	0x66B8	#CJK UNIFIED IDEOGRAPH
+0x9E42	0x66D6	#CJK UNIFIED IDEOGRAPH
+0x9E43	0x66DA	#CJK UNIFIED IDEOGRAPH
+0x9E44	0x66E0	#CJK UNIFIED IDEOGRAPH
+0x9E45	0x663F	#CJK UNIFIED IDEOGRAPH
+0x9E46	0x66E6	#CJK UNIFIED IDEOGRAPH
+0x9E47	0x66E9	#CJK UNIFIED IDEOGRAPH
+0x9E48	0x66F0	#CJK UNIFIED IDEOGRAPH
+0x9E49	0x66F5	#CJK UNIFIED IDEOGRAPH
+0x9E4A	0x66F7	#CJK UNIFIED IDEOGRAPH
+0x9E4B	0x670F	#CJK UNIFIED IDEOGRAPH
+0x9E4C	0x6716	#CJK UNIFIED IDEOGRAPH
+0x9E4D	0x671E	#CJK UNIFIED IDEOGRAPH
+0x9E4E	0x6726	#CJK UNIFIED IDEOGRAPH
+0x9E4F	0x6727	#CJK UNIFIED IDEOGRAPH
+0x9E50	0x9738	#CJK UNIFIED IDEOGRAPH
+0x9E51	0x672E	#CJK UNIFIED IDEOGRAPH
+0x9E52	0x673F	#CJK UNIFIED IDEOGRAPH
+0x9E53	0x6736	#CJK UNIFIED IDEOGRAPH
+0x9E54	0x6741	#CJK UNIFIED IDEOGRAPH
+0x9E55	0x6738	#CJK UNIFIED IDEOGRAPH
+0x9E56	0x6737	#CJK UNIFIED IDEOGRAPH
+0x9E57	0x6746	#CJK UNIFIED IDEOGRAPH
+0x9E58	0x675E	#CJK UNIFIED IDEOGRAPH
+0x9E59	0x6760	#CJK UNIFIED IDEOGRAPH
+0x9E5A	0x6759	#CJK UNIFIED IDEOGRAPH
+0x9E5B	0x6763	#CJK UNIFIED IDEOGRAPH
+0x9E5C	0x6764	#CJK UNIFIED IDEOGRAPH
+0x9E5D	0x6789	#CJK UNIFIED IDEOGRAPH
+0x9E5E	0x6770	#CJK UNIFIED IDEOGRAPH
+0x9E5F	0x67A9	#CJK UNIFIED IDEOGRAPH
+0x9E60	0x677C	#CJK UNIFIED IDEOGRAPH
+0x9E61	0x676A	#CJK UNIFIED IDEOGRAPH
+0x9E62	0x678C	#CJK UNIFIED IDEOGRAPH
+0x9E63	0x678B	#CJK UNIFIED IDEOGRAPH
+0x9E64	0x67A6	#CJK UNIFIED IDEOGRAPH
+0x9E65	0x67A1	#CJK UNIFIED IDEOGRAPH
+0x9E66	0x6785	#CJK UNIFIED IDEOGRAPH
+0x9E67	0x67B7	#CJK UNIFIED IDEOGRAPH
+0x9E68	0x67EF	#CJK UNIFIED IDEOGRAPH
+0x9E69	0x67B4	#CJK UNIFIED IDEOGRAPH
+0x9E6A	0x67EC	#CJK UNIFIED IDEOGRAPH
+0x9E6B	0x67B3	#CJK UNIFIED IDEOGRAPH
+0x9E6C	0x67E9	#CJK UNIFIED IDEOGRAPH
+0x9E6D	0x67B8	#CJK UNIFIED IDEOGRAPH
+0x9E6E	0x67E4	#CJK UNIFIED IDEOGRAPH
+0x9E6F	0x67DE	#CJK UNIFIED IDEOGRAPH
+0x9E70	0x67DD	#CJK UNIFIED IDEOGRAPH
+0x9E71	0x67E2	#CJK UNIFIED IDEOGRAPH
+0x9E72	0x67EE	#CJK UNIFIED IDEOGRAPH
+0x9E73	0x67B9	#CJK UNIFIED IDEOGRAPH
+0x9E74	0x67CE	#CJK UNIFIED IDEOGRAPH
+0x9E75	0x67C6	#CJK UNIFIED IDEOGRAPH
+0x9E76	0x67E7	#CJK UNIFIED IDEOGRAPH
+0x9E77	0x6A9C	#CJK UNIFIED IDEOGRAPH
+0x9E78	0x681E	#CJK UNIFIED IDEOGRAPH
+0x9E79	0x6846	#CJK UNIFIED IDEOGRAPH
+0x9E7A	0x6829	#CJK UNIFIED IDEOGRAPH
+0x9E7B	0x6840	#CJK UNIFIED IDEOGRAPH
+0x9E7C	0x684D	#CJK UNIFIED IDEOGRAPH
+0x9E7D	0x6832	#CJK UNIFIED IDEOGRAPH
+0x9E7E	0x684E	#CJK UNIFIED IDEOGRAPH
+0x9E80	0x68B3	#CJK UNIFIED IDEOGRAPH
+0x9E81	0x682B	#CJK UNIFIED IDEOGRAPH
+0x9E82	0x6859	#CJK UNIFIED IDEOGRAPH
+0x9E83	0x6863	#CJK UNIFIED IDEOGRAPH
+0x9E84	0x6877	#CJK UNIFIED IDEOGRAPH
+0x9E85	0x687F	#CJK UNIFIED IDEOGRAPH
+0x9E86	0x689F	#CJK UNIFIED IDEOGRAPH
+0x9E87	0x688F	#CJK UNIFIED IDEOGRAPH
+0x9E88	0x68AD	#CJK UNIFIED IDEOGRAPH
+0x9E89	0x6894	#CJK UNIFIED IDEOGRAPH
+0x9E8A	0x689D	#CJK UNIFIED IDEOGRAPH
+0x9E8B	0x689B	#CJK UNIFIED IDEOGRAPH
+0x9E8C	0x6883	#CJK UNIFIED IDEOGRAPH
+0x9E8D	0x6AAE	#CJK UNIFIED IDEOGRAPH
+0x9E8E	0x68B9	#CJK UNIFIED IDEOGRAPH
+0x9E8F	0x6874	#CJK UNIFIED IDEOGRAPH
+0x9E90	0x68B5	#CJK UNIFIED IDEOGRAPH
+0x9E91	0x68A0	#CJK UNIFIED IDEOGRAPH
+0x9E92	0x68BA	#CJK UNIFIED IDEOGRAPH
+0x9E93	0x690F	#CJK UNIFIED IDEOGRAPH
+0x9E94	0x688D	#CJK UNIFIED IDEOGRAPH
+0x9E95	0x687E	#CJK UNIFIED IDEOGRAPH
+0x9E96	0x6901	#CJK UNIFIED IDEOGRAPH
+0x9E97	0x68CA	#CJK UNIFIED IDEOGRAPH
+0x9E98	0x6908	#CJK UNIFIED IDEOGRAPH
+0x9E99	0x68D8	#CJK UNIFIED IDEOGRAPH
+0x9E9A	0x6922	#CJK UNIFIED IDEOGRAPH
+0x9E9B	0x6926	#CJK UNIFIED IDEOGRAPH
+0x9E9C	0x68E1	#CJK UNIFIED IDEOGRAPH
+0x9E9D	0x690C	#CJK UNIFIED IDEOGRAPH
+0x9E9E	0x68CD	#CJK UNIFIED IDEOGRAPH
+0x9E9F	0x68D4	#CJK UNIFIED IDEOGRAPH
+0x9EA0	0x68E7	#CJK UNIFIED IDEOGRAPH
+0x9EA1	0x68D5	#CJK UNIFIED IDEOGRAPH
+0x9EA2	0x6936	#CJK UNIFIED IDEOGRAPH
+0x9EA3	0x6912	#CJK UNIFIED IDEOGRAPH
+0x9EA4	0x6904	#CJK UNIFIED IDEOGRAPH
+0x9EA5	0x68D7	#CJK UNIFIED IDEOGRAPH
+0x9EA6	0x68E3	#CJK UNIFIED IDEOGRAPH
+0x9EA7	0x6925	#CJK UNIFIED IDEOGRAPH
+0x9EA8	0x68F9	#CJK UNIFIED IDEOGRAPH
+0x9EA9	0x68E0	#CJK UNIFIED IDEOGRAPH
+0x9EAA	0x68EF	#CJK UNIFIED IDEOGRAPH
+0x9EAB	0x6928	#CJK UNIFIED IDEOGRAPH
+0x9EAC	0x692A	#CJK UNIFIED IDEOGRAPH
+0x9EAD	0x691A	#CJK UNIFIED IDEOGRAPH
+0x9EAE	0x6923	#CJK UNIFIED IDEOGRAPH
+0x9EAF	0x6921	#CJK UNIFIED IDEOGRAPH
+0x9EB0	0x68C6	#CJK UNIFIED IDEOGRAPH
+0x9EB1	0x6979	#CJK UNIFIED IDEOGRAPH
+0x9EB2	0x6977	#CJK UNIFIED IDEOGRAPH
+0x9EB3	0x695C	#CJK UNIFIED IDEOGRAPH
+0x9EB4	0x6978	#CJK UNIFIED IDEOGRAPH
+0x9EB5	0x696B	#CJK UNIFIED IDEOGRAPH
+0x9EB6	0x6954	#CJK UNIFIED IDEOGRAPH
+0x9EB7	0x697E	#CJK UNIFIED IDEOGRAPH
+0x9EB8	0x696E	#CJK UNIFIED IDEOGRAPH
+0x9EB9	0x6939	#CJK UNIFIED IDEOGRAPH
+0x9EBA	0x6974	#CJK UNIFIED IDEOGRAPH
+0x9EBB	0x693D	#CJK UNIFIED IDEOGRAPH
+0x9EBC	0x6959	#CJK UNIFIED IDEOGRAPH
+0x9EBD	0x6930	#CJK UNIFIED IDEOGRAPH
+0x9EBE	0x6961	#CJK UNIFIED IDEOGRAPH
+0x9EBF	0x695E	#CJK UNIFIED IDEOGRAPH
+0x9EC0	0x695D	#CJK UNIFIED IDEOGRAPH
+0x9EC1	0x6981	#CJK UNIFIED IDEOGRAPH
+0x9EC2	0x696A	#CJK UNIFIED IDEOGRAPH
+0x9EC3	0x69B2	#CJK UNIFIED IDEOGRAPH
+0x9EC4	0x69AE	#CJK UNIFIED IDEOGRAPH
+0x9EC5	0x69D0	#CJK UNIFIED IDEOGRAPH
+0x9EC6	0x69BF	#CJK UNIFIED IDEOGRAPH
+0x9EC7	0x69C1	#CJK UNIFIED IDEOGRAPH
+0x9EC8	0x69D3	#CJK UNIFIED IDEOGRAPH
+0x9EC9	0x69BE	#CJK UNIFIED IDEOGRAPH
+0x9ECA	0x69CE	#CJK UNIFIED IDEOGRAPH
+0x9ECB	0x5BE8	#CJK UNIFIED IDEOGRAPH
+0x9ECC	0x69CA	#CJK UNIFIED IDEOGRAPH
+0x9ECD	0x69DD	#CJK UNIFIED IDEOGRAPH
+0x9ECE	0x69BB	#CJK UNIFIED IDEOGRAPH
+0x9ECF	0x69C3	#CJK UNIFIED IDEOGRAPH
+0x9ED0	0x69A7	#CJK UNIFIED IDEOGRAPH
+0x9ED1	0x6A2E	#CJK UNIFIED IDEOGRAPH
+0x9ED2	0x6991	#CJK UNIFIED IDEOGRAPH
+0x9ED3	0x69A0	#CJK UNIFIED IDEOGRAPH
+0x9ED4	0x699C	#CJK UNIFIED IDEOGRAPH
+0x9ED5	0x6995	#CJK UNIFIED IDEOGRAPH
+0x9ED6	0x69B4	#CJK UNIFIED IDEOGRAPH
+0x9ED7	0x69DE	#CJK UNIFIED IDEOGRAPH
+0x9ED8	0x69E8	#CJK UNIFIED IDEOGRAPH
+0x9ED9	0x6A02	#CJK UNIFIED IDEOGRAPH
+0x9EDA	0x6A1B	#CJK UNIFIED IDEOGRAPH
+0x9EDB	0x69FF	#CJK UNIFIED IDEOGRAPH
+0x9EDC	0x6B0A	#CJK UNIFIED IDEOGRAPH
+0x9EDD	0x69F9	#CJK UNIFIED IDEOGRAPH
+0x9EDE	0x69F2	#CJK UNIFIED IDEOGRAPH
+0x9EDF	0x69E7	#CJK UNIFIED IDEOGRAPH
+0x9EE0	0x6A05	#CJK UNIFIED IDEOGRAPH
+0x9EE1	0x69B1	#CJK UNIFIED IDEOGRAPH
+0x9EE2	0x6A1E	#CJK UNIFIED IDEOGRAPH
+0x9EE3	0x69ED	#CJK UNIFIED IDEOGRAPH
+0x9EE4	0x6A14	#CJK UNIFIED IDEOGRAPH
+0x9EE5	0x69EB	#CJK UNIFIED IDEOGRAPH
+0x9EE6	0x6A0A	#CJK UNIFIED IDEOGRAPH
+0x9EE7	0x6A12	#CJK UNIFIED IDEOGRAPH
+0x9EE8	0x6AC1	#CJK UNIFIED IDEOGRAPH
+0x9EE9	0x6A23	#CJK UNIFIED IDEOGRAPH
+0x9EEA	0x6A13	#CJK UNIFIED IDEOGRAPH
+0x9EEB	0x6A44	#CJK UNIFIED IDEOGRAPH
+0x9EEC	0x6A0C	#CJK UNIFIED IDEOGRAPH
+0x9EED	0x6A72	#CJK UNIFIED IDEOGRAPH
+0x9EEE	0x6A36	#CJK UNIFIED IDEOGRAPH
+0x9EEF	0x6A78	#CJK UNIFIED IDEOGRAPH
+0x9EF0	0x6A47	#CJK UNIFIED IDEOGRAPH
+0x9EF1	0x6A62	#CJK UNIFIED IDEOGRAPH
+0x9EF2	0x6A59	#CJK UNIFIED IDEOGRAPH
+0x9EF3	0x6A66	#CJK UNIFIED IDEOGRAPH
+0x9EF4	0x6A48	#CJK UNIFIED IDEOGRAPH
+0x9EF5	0x6A38	#CJK UNIFIED IDEOGRAPH
+0x9EF6	0x6A22	#CJK UNIFIED IDEOGRAPH
+0x9EF7	0x6A90	#CJK UNIFIED IDEOGRAPH
+0x9EF8	0x6A8D	#CJK UNIFIED IDEOGRAPH
+0x9EF9	0x6AA0	#CJK UNIFIED IDEOGRAPH
+0x9EFA	0x6A84	#CJK UNIFIED IDEOGRAPH
+0x9EFB	0x6AA2	#CJK UNIFIED IDEOGRAPH
+0x9EFC	0x6AA3	#CJK UNIFIED IDEOGRAPH
+0x9F40	0x6A97	#CJK UNIFIED IDEOGRAPH
+0x9F41	0x8617	#CJK UNIFIED IDEOGRAPH
+0x9F42	0x6ABB	#CJK UNIFIED IDEOGRAPH
+0x9F43	0x6AC3	#CJK UNIFIED IDEOGRAPH
+0x9F44	0x6AC2	#CJK UNIFIED IDEOGRAPH
+0x9F45	0x6AB8	#CJK UNIFIED IDEOGRAPH
+0x9F46	0x6AB3	#CJK UNIFIED IDEOGRAPH
+0x9F47	0x6AAC	#CJK UNIFIED IDEOGRAPH
+0x9F48	0x6ADE	#CJK UNIFIED IDEOGRAPH
+0x9F49	0x6AD1	#CJK UNIFIED IDEOGRAPH
+0x9F4A	0x6ADF	#CJK UNIFIED IDEOGRAPH
+0x9F4B	0x6AAA	#CJK UNIFIED IDEOGRAPH
+0x9F4C	0x6ADA	#CJK UNIFIED IDEOGRAPH
+0x9F4D	0x6AEA	#CJK UNIFIED IDEOGRAPH
+0x9F4E	0x6AFB	#CJK UNIFIED IDEOGRAPH
+0x9F4F	0x6B05	#CJK UNIFIED IDEOGRAPH
+0x9F50	0x8616	#CJK UNIFIED IDEOGRAPH
+0x9F51	0x6AFA	#CJK UNIFIED IDEOGRAPH
+0x9F52	0x6B12	#CJK UNIFIED IDEOGRAPH
+0x9F53	0x6B16	#CJK UNIFIED IDEOGRAPH
+0x9F54	0x9B31	#CJK UNIFIED IDEOGRAPH
+0x9F55	0x6B1F	#CJK UNIFIED IDEOGRAPH
+0x9F56	0x6B38	#CJK UNIFIED IDEOGRAPH
+0x9F57	0x6B37	#CJK UNIFIED IDEOGRAPH
+0x9F58	0x76DC	#CJK UNIFIED IDEOGRAPH
+0x9F59	0x6B39	#CJK UNIFIED IDEOGRAPH
+0x9F5A	0x98EE	#CJK UNIFIED IDEOGRAPH
+0x9F5B	0x6B47	#CJK UNIFIED IDEOGRAPH
+0x9F5C	0x6B43	#CJK UNIFIED IDEOGRAPH
+0x9F5D	0x6B49	#CJK UNIFIED IDEOGRAPH
+0x9F5E	0x6B50	#CJK UNIFIED IDEOGRAPH
+0x9F5F	0x6B59	#CJK UNIFIED IDEOGRAPH
+0x9F60	0x6B54	#CJK UNIFIED IDEOGRAPH
+0x9F61	0x6B5B	#CJK UNIFIED IDEOGRAPH
+0x9F62	0x6B5F	#CJK UNIFIED IDEOGRAPH
+0x9F63	0x6B61	#CJK UNIFIED IDEOGRAPH
+0x9F64	0x6B78	#CJK UNIFIED IDEOGRAPH
+0x9F65	0x6B79	#CJK UNIFIED IDEOGRAPH
+0x9F66	0x6B7F	#CJK UNIFIED IDEOGRAPH
+0x9F67	0x6B80	#CJK UNIFIED IDEOGRAPH
+0x9F68	0x6B84	#CJK UNIFIED IDEOGRAPH
+0x9F69	0x6B83	#CJK UNIFIED IDEOGRAPH
+0x9F6A	0x6B8D	#CJK UNIFIED IDEOGRAPH
+0x9F6B	0x6B98	#CJK UNIFIED IDEOGRAPH
+0x9F6C	0x6B95	#CJK UNIFIED IDEOGRAPH
+0x9F6D	0x6B9E	#CJK UNIFIED IDEOGRAPH
+0x9F6E	0x6BA4	#CJK UNIFIED IDEOGRAPH
+0x9F6F	0x6BAA	#CJK UNIFIED IDEOGRAPH
+0x9F70	0x6BAB	#CJK UNIFIED IDEOGRAPH
+0x9F71	0x6BAF	#CJK UNIFIED IDEOGRAPH
+0x9F72	0x6BB2	#CJK UNIFIED IDEOGRAPH
+0x9F73	0x6BB1	#CJK UNIFIED IDEOGRAPH
+0x9F74	0x6BB3	#CJK UNIFIED IDEOGRAPH
+0x9F75	0x6BB7	#CJK UNIFIED IDEOGRAPH
+0x9F76	0x6BBC	#CJK UNIFIED IDEOGRAPH
+0x9F77	0x6BC6	#CJK UNIFIED IDEOGRAPH
+0x9F78	0x6BCB	#CJK UNIFIED IDEOGRAPH
+0x9F79	0x6BD3	#CJK UNIFIED IDEOGRAPH
+0x9F7A	0x6BDF	#CJK UNIFIED IDEOGRAPH
+0x9F7B	0x6BEC	#CJK UNIFIED IDEOGRAPH
+0x9F7C	0x6BEB	#CJK UNIFIED IDEOGRAPH
+0x9F7D	0x6BF3	#CJK UNIFIED IDEOGRAPH
+0x9F7E	0x6BEF	#CJK UNIFIED IDEOGRAPH
+0x9F80	0x9EBE	#CJK UNIFIED IDEOGRAPH
+0x9F81	0x6C08	#CJK UNIFIED IDEOGRAPH
+0x9F82	0x6C13	#CJK UNIFIED IDEOGRAPH
+0x9F83	0x6C14	#CJK UNIFIED IDEOGRAPH
+0x9F84	0x6C1B	#CJK UNIFIED IDEOGRAPH
+0x9F85	0x6C24	#CJK UNIFIED IDEOGRAPH
+0x9F86	0x6C23	#CJK UNIFIED IDEOGRAPH
+0x9F87	0x6C5E	#CJK UNIFIED IDEOGRAPH
+0x9F88	0x6C55	#CJK UNIFIED IDEOGRAPH
+0x9F89	0x6C62	#CJK UNIFIED IDEOGRAPH
+0x9F8A	0x6C6A	#CJK UNIFIED IDEOGRAPH
+0x9F8B	0x6C82	#CJK UNIFIED IDEOGRAPH
+0x9F8C	0x6C8D	#CJK UNIFIED IDEOGRAPH
+0x9F8D	0x6C9A	#CJK UNIFIED IDEOGRAPH
+0x9F8E	0x6C81	#CJK UNIFIED IDEOGRAPH
+0x9F8F	0x6C9B	#CJK UNIFIED IDEOGRAPH
+0x9F90	0x6C7E	#CJK UNIFIED IDEOGRAPH
+0x9F91	0x6C68	#CJK UNIFIED IDEOGRAPH
+0x9F92	0x6C73	#CJK UNIFIED IDEOGRAPH
+0x9F93	0x6C92	#CJK UNIFIED IDEOGRAPH
+0x9F94	0x6C90	#CJK UNIFIED IDEOGRAPH
+0x9F95	0x6CC4	#CJK UNIFIED IDEOGRAPH
+0x9F96	0x6CF1	#CJK UNIFIED IDEOGRAPH
+0x9F97	0x6CD3	#CJK UNIFIED IDEOGRAPH
+0x9F98	0x6CBD	#CJK UNIFIED IDEOGRAPH
+0x9F99	0x6CD7	#CJK UNIFIED IDEOGRAPH
+0x9F9A	0x6CC5	#CJK UNIFIED IDEOGRAPH
+0x9F9B	0x6CDD	#CJK UNIFIED IDEOGRAPH
+0x9F9C	0x6CAE	#CJK UNIFIED IDEOGRAPH
+0x9F9D	0x6CB1	#CJK UNIFIED IDEOGRAPH
+0x9F9E	0x6CBE	#CJK UNIFIED IDEOGRAPH
+0x9F9F	0x6CBA	#CJK UNIFIED IDEOGRAPH
+0x9FA0	0x6CDB	#CJK UNIFIED IDEOGRAPH
+0x9FA1	0x6CEF	#CJK UNIFIED IDEOGRAPH
+0x9FA2	0x6CD9	#CJK UNIFIED IDEOGRAPH
+0x9FA3	0x6CEA	#CJK UNIFIED IDEOGRAPH
+0x9FA4	0x6D1F	#CJK UNIFIED IDEOGRAPH
+0x9FA5	0x884D	#CJK UNIFIED IDEOGRAPH
+0x9FA6	0x6D36	#CJK UNIFIED IDEOGRAPH
+0x9FA7	0x6D2B	#CJK UNIFIED IDEOGRAPH
+0x9FA8	0x6D3D	#CJK UNIFIED IDEOGRAPH
+0x9FA9	0x6D38	#CJK UNIFIED IDEOGRAPH
+0x9FAA	0x6D19	#CJK UNIFIED IDEOGRAPH
+0x9FAB	0x6D35	#CJK UNIFIED IDEOGRAPH
+0x9FAC	0x6D33	#CJK UNIFIED IDEOGRAPH
+0x9FAD	0x6D12	#CJK UNIFIED IDEOGRAPH
+0x9FAE	0x6D0C	#CJK UNIFIED IDEOGRAPH
+0x9FAF	0x6D63	#CJK UNIFIED IDEOGRAPH
+0x9FB0	0x6D93	#CJK UNIFIED IDEOGRAPH
+0x9FB1	0x6D64	#CJK UNIFIED IDEOGRAPH
+0x9FB2	0x6D5A	#CJK UNIFIED IDEOGRAPH
+0x9FB3	0x6D79	#CJK UNIFIED IDEOGRAPH
+0x9FB4	0x6D59	#CJK UNIFIED IDEOGRAPH
+0x9FB5	0x6D8E	#CJK UNIFIED IDEOGRAPH
+0x9FB6	0x6D95	#CJK UNIFIED IDEOGRAPH
+0x9FB7	0x6FE4	#CJK UNIFIED IDEOGRAPH
+0x9FB8	0x6D85	#CJK UNIFIED IDEOGRAPH
+0x9FB9	0x6DF9	#CJK UNIFIED IDEOGRAPH
+0x9FBA	0x6E15	#CJK UNIFIED IDEOGRAPH
+0x9FBB	0x6E0A	#CJK UNIFIED IDEOGRAPH
+0x9FBC	0x6DB5	#CJK UNIFIED IDEOGRAPH
+0x9FBD	0x6DC7	#CJK UNIFIED IDEOGRAPH
+0x9FBE	0x6DE6	#CJK UNIFIED IDEOGRAPH
+0x9FBF	0x6DB8	#CJK UNIFIED IDEOGRAPH
+0x9FC0	0x6DC6	#CJK UNIFIED IDEOGRAPH
+0x9FC1	0x6DEC	#CJK UNIFIED IDEOGRAPH
+0x9FC2	0x6DDE	#CJK UNIFIED IDEOGRAPH
+0x9FC3	0x6DCC	#CJK UNIFIED IDEOGRAPH
+0x9FC4	0x6DE8	#CJK UNIFIED IDEOGRAPH
+0x9FC5	0x6DD2	#CJK UNIFIED IDEOGRAPH
+0x9FC6	0x6DC5	#CJK UNIFIED IDEOGRAPH
+0x9FC7	0x6DFA	#CJK UNIFIED IDEOGRAPH
+0x9FC8	0x6DD9	#CJK UNIFIED IDEOGRAPH
+0x9FC9	0x6DE4	#CJK UNIFIED IDEOGRAPH
+0x9FCA	0x6DD5	#CJK UNIFIED IDEOGRAPH
+0x9FCB	0x6DEA	#CJK UNIFIED IDEOGRAPH
+0x9FCC	0x6DEE	#CJK UNIFIED IDEOGRAPH
+0x9FCD	0x6E2D	#CJK UNIFIED IDEOGRAPH
+0x9FCE	0x6E6E	#CJK UNIFIED IDEOGRAPH
+0x9FCF	0x6E2E	#CJK UNIFIED IDEOGRAPH
+0x9FD0	0x6E19	#CJK UNIFIED IDEOGRAPH
+0x9FD1	0x6E72	#CJK UNIFIED IDEOGRAPH
+0x9FD2	0x6E5F	#CJK UNIFIED IDEOGRAPH
+0x9FD3	0x6E3E	#CJK UNIFIED IDEOGRAPH
+0x9FD4	0x6E23	#CJK UNIFIED IDEOGRAPH
+0x9FD5	0x6E6B	#CJK UNIFIED IDEOGRAPH
+0x9FD6	0x6E2B	#CJK UNIFIED IDEOGRAPH
+0x9FD7	0x6E76	#CJK UNIFIED IDEOGRAPH
+0x9FD8	0x6E4D	#CJK UNIFIED IDEOGRAPH
+0x9FD9	0x6E1F	#CJK UNIFIED IDEOGRAPH
+0x9FDA	0x6E43	#CJK UNIFIED IDEOGRAPH
+0x9FDB	0x6E3A	#CJK UNIFIED IDEOGRAPH
+0x9FDC	0x6E4E	#CJK UNIFIED IDEOGRAPH
+0x9FDD	0x6E24	#CJK UNIFIED IDEOGRAPH
+0x9FDE	0x6EFF	#CJK UNIFIED IDEOGRAPH
+0x9FDF	0x6E1D	#CJK UNIFIED IDEOGRAPH
+0x9FE0	0x6E38	#CJK UNIFIED IDEOGRAPH
+0x9FE1	0x6E82	#CJK UNIFIED IDEOGRAPH
+0x9FE2	0x6EAA	#CJK UNIFIED IDEOGRAPH
+0x9FE3	0x6E98	#CJK UNIFIED IDEOGRAPH
+0x9FE4	0x6EC9	#CJK UNIFIED IDEOGRAPH
+0x9FE5	0x6EB7	#CJK UNIFIED IDEOGRAPH
+0x9FE6	0x6ED3	#CJK UNIFIED IDEOGRAPH
+0x9FE7	0x6EBD	#CJK UNIFIED IDEOGRAPH
+0x9FE8	0x6EAF	#CJK UNIFIED IDEOGRAPH
+0x9FE9	0x6EC4	#CJK UNIFIED IDEOGRAPH
+0x9FEA	0x6EB2	#CJK UNIFIED IDEOGRAPH
+0x9FEB	0x6ED4	#CJK UNIFIED IDEOGRAPH
+0x9FEC	0x6ED5	#CJK UNIFIED IDEOGRAPH
+0x9FED	0x6E8F	#CJK UNIFIED IDEOGRAPH
+0x9FEE	0x6EA5	#CJK UNIFIED IDEOGRAPH
+0x9FEF	0x6EC2	#CJK UNIFIED IDEOGRAPH
+0x9FF0	0x6E9F	#CJK UNIFIED IDEOGRAPH
+0x9FF1	0x6F41	#CJK UNIFIED IDEOGRAPH
+0x9FF2	0x6F11	#CJK UNIFIED IDEOGRAPH
+0x9FF3	0x704C	#CJK UNIFIED IDEOGRAPH
+0x9FF4	0x6EEC	#CJK UNIFIED IDEOGRAPH
+0x9FF5	0x6EF8	#CJK UNIFIED IDEOGRAPH
+0x9FF6	0x6EFE	#CJK UNIFIED IDEOGRAPH
+0x9FF7	0x6F3F	#CJK UNIFIED IDEOGRAPH
+0x9FF8	0x6EF2	#CJK UNIFIED IDEOGRAPH
+0x9FF9	0x6F31	#CJK UNIFIED IDEOGRAPH
+0x9FFA	0x6EEF	#CJK UNIFIED IDEOGRAPH
+0x9FFB	0x6F32	#CJK UNIFIED IDEOGRAPH
+0x9FFC	0x6ECC	#CJK UNIFIED IDEOGRAPH
+0xE040	0x6F3E	#CJK UNIFIED IDEOGRAPH
+0xE041	0x6F13	#CJK UNIFIED IDEOGRAPH
+0xE042	0x6EF7	#CJK UNIFIED IDEOGRAPH
+0xE043	0x6F86	#CJK UNIFIED IDEOGRAPH
+0xE044	0x6F7A	#CJK UNIFIED IDEOGRAPH
+0xE045	0x6F78	#CJK UNIFIED IDEOGRAPH
+0xE046	0x6F81	#CJK UNIFIED IDEOGRAPH
+0xE047	0x6F80	#CJK UNIFIED IDEOGRAPH
+0xE048	0x6F6F	#CJK UNIFIED IDEOGRAPH
+0xE049	0x6F5B	#CJK UNIFIED IDEOGRAPH
+0xE04A	0x6FF3	#CJK UNIFIED IDEOGRAPH
+0xE04B	0x6F6D	#CJK UNIFIED IDEOGRAPH
+0xE04C	0x6F82	#CJK UNIFIED IDEOGRAPH
+0xE04D	0x6F7C	#CJK UNIFIED IDEOGRAPH
+0xE04E	0x6F58	#CJK UNIFIED IDEOGRAPH
+0xE04F	0x6F8E	#CJK UNIFIED IDEOGRAPH
+0xE050	0x6F91	#CJK UNIFIED IDEOGRAPH
+0xE051	0x6FC2	#CJK UNIFIED IDEOGRAPH
+0xE052	0x6F66	#CJK UNIFIED IDEOGRAPH
+0xE053	0x6FB3	#CJK UNIFIED IDEOGRAPH
+0xE054	0x6FA3	#CJK UNIFIED IDEOGRAPH
+0xE055	0x6FA1	#CJK UNIFIED IDEOGRAPH
+0xE056	0x6FA4	#CJK UNIFIED IDEOGRAPH
+0xE057	0x6FB9	#CJK UNIFIED IDEOGRAPH
+0xE058	0x6FC6	#CJK UNIFIED IDEOGRAPH
+0xE059	0x6FAA	#CJK UNIFIED IDEOGRAPH
+0xE05A	0x6FDF	#CJK UNIFIED IDEOGRAPH
+0xE05B	0x6FD5	#CJK UNIFIED IDEOGRAPH
+0xE05C	0x6FEC	#CJK UNIFIED IDEOGRAPH
+0xE05D	0x6FD4	#CJK UNIFIED IDEOGRAPH
+0xE05E	0x6FD8	#CJK UNIFIED IDEOGRAPH
+0xE05F	0x6FF1	#CJK UNIFIED IDEOGRAPH
+0xE060	0x6FEE	#CJK UNIFIED IDEOGRAPH
+0xE061	0x6FDB	#CJK UNIFIED IDEOGRAPH
+0xE062	0x7009	#CJK UNIFIED IDEOGRAPH
+0xE063	0x700B	#CJK UNIFIED IDEOGRAPH
+0xE064	0x6FFA	#CJK UNIFIED IDEOGRAPH
+0xE065	0x7011	#CJK UNIFIED IDEOGRAPH
+0xE066	0x7001	#CJK UNIFIED IDEOGRAPH
+0xE067	0x700F	#CJK UNIFIED IDEOGRAPH
+0xE068	0x6FFE	#CJK UNIFIED IDEOGRAPH
+0xE069	0x701B	#CJK UNIFIED IDEOGRAPH
+0xE06A	0x701A	#CJK UNIFIED IDEOGRAPH
+0xE06B	0x6F74	#CJK UNIFIED IDEOGRAPH
+0xE06C	0x701D	#CJK UNIFIED IDEOGRAPH
+0xE06D	0x7018	#CJK UNIFIED IDEOGRAPH
+0xE06E	0x701F	#CJK UNIFIED IDEOGRAPH
+0xE06F	0x7030	#CJK UNIFIED IDEOGRAPH
+0xE070	0x703E	#CJK UNIFIED IDEOGRAPH
+0xE071	0x7032	#CJK UNIFIED IDEOGRAPH
+0xE072	0x7051	#CJK UNIFIED IDEOGRAPH
+0xE073	0x7063	#CJK UNIFIED IDEOGRAPH
+0xE074	0x7099	#CJK UNIFIED IDEOGRAPH
+0xE075	0x7092	#CJK UNIFIED IDEOGRAPH
+0xE076	0x70AF	#CJK UNIFIED IDEOGRAPH
+0xE077	0x70F1	#CJK UNIFIED IDEOGRAPH
+0xE078	0x70AC	#CJK UNIFIED IDEOGRAPH
+0xE079	0x70B8	#CJK UNIFIED IDEOGRAPH
+0xE07A	0x70B3	#CJK UNIFIED IDEOGRAPH
+0xE07B	0x70AE	#CJK UNIFIED IDEOGRAPH
+0xE07C	0x70DF	#CJK UNIFIED IDEOGRAPH
+0xE07D	0x70CB	#CJK UNIFIED IDEOGRAPH
+0xE07E	0x70DD	#CJK UNIFIED IDEOGRAPH
+0xE080	0x70D9	#CJK UNIFIED IDEOGRAPH
+0xE081	0x7109	#CJK UNIFIED IDEOGRAPH
+0xE082	0x70FD	#CJK UNIFIED IDEOGRAPH
+0xE083	0x711C	#CJK UNIFIED IDEOGRAPH
+0xE084	0x7119	#CJK UNIFIED IDEOGRAPH
+0xE085	0x7165	#CJK UNIFIED IDEOGRAPH
+0xE086	0x7155	#CJK UNIFIED IDEOGRAPH
+0xE087	0x7188	#CJK UNIFIED IDEOGRAPH
+0xE088	0x7166	#CJK UNIFIED IDEOGRAPH
+0xE089	0x7162	#CJK UNIFIED IDEOGRAPH
+0xE08A	0x714C	#CJK UNIFIED IDEOGRAPH
+0xE08B	0x7156	#CJK UNIFIED IDEOGRAPH
+0xE08C	0x716C	#CJK UNIFIED IDEOGRAPH
+0xE08D	0x718F	#CJK UNIFIED IDEOGRAPH
+0xE08E	0x71FB	#CJK UNIFIED IDEOGRAPH
+0xE08F	0x7184	#CJK UNIFIED IDEOGRAPH
+0xE090	0x7195	#CJK UNIFIED IDEOGRAPH
+0xE091	0x71A8	#CJK UNIFIED IDEOGRAPH
+0xE092	0x71AC	#CJK UNIFIED IDEOGRAPH
+0xE093	0x71D7	#CJK UNIFIED IDEOGRAPH
+0xE094	0x71B9	#CJK UNIFIED IDEOGRAPH
+0xE095	0x71BE	#CJK UNIFIED IDEOGRAPH
+0xE096	0x71D2	#CJK UNIFIED IDEOGRAPH
+0xE097	0x71C9	#CJK UNIFIED IDEOGRAPH
+0xE098	0x71D4	#CJK UNIFIED IDEOGRAPH
+0xE099	0x71CE	#CJK UNIFIED IDEOGRAPH
+0xE09A	0x71E0	#CJK UNIFIED IDEOGRAPH
+0xE09B	0x71EC	#CJK UNIFIED IDEOGRAPH
+0xE09C	0x71E7	#CJK UNIFIED IDEOGRAPH
+0xE09D	0x71F5	#CJK UNIFIED IDEOGRAPH
+0xE09E	0x71FC	#CJK UNIFIED IDEOGRAPH
+0xE09F	0x71F9	#CJK UNIFIED IDEOGRAPH
+0xE0A0	0x71FF	#CJK UNIFIED IDEOGRAPH
+0xE0A1	0x720D	#CJK UNIFIED IDEOGRAPH
+0xE0A2	0x7210	#CJK UNIFIED IDEOGRAPH
+0xE0A3	0x721B	#CJK UNIFIED IDEOGRAPH
+0xE0A4	0x7228	#CJK UNIFIED IDEOGRAPH
+0xE0A5	0x722D	#CJK UNIFIED IDEOGRAPH
+0xE0A6	0x722C	#CJK UNIFIED IDEOGRAPH
+0xE0A7	0x7230	#CJK UNIFIED IDEOGRAPH
+0xE0A8	0x7232	#CJK UNIFIED IDEOGRAPH
+0xE0A9	0x723B	#CJK UNIFIED IDEOGRAPH
+0xE0AA	0x723C	#CJK UNIFIED IDEOGRAPH
+0xE0AB	0x723F	#CJK UNIFIED IDEOGRAPH
+0xE0AC	0x7240	#CJK UNIFIED IDEOGRAPH
+0xE0AD	0x7246	#CJK UNIFIED IDEOGRAPH
+0xE0AE	0x724B	#CJK UNIFIED IDEOGRAPH
+0xE0AF	0x7258	#CJK UNIFIED IDEOGRAPH
+0xE0B0	0x7274	#CJK UNIFIED IDEOGRAPH
+0xE0B1	0x727E	#CJK UNIFIED IDEOGRAPH
+0xE0B2	0x7282	#CJK UNIFIED IDEOGRAPH
+0xE0B3	0x7281	#CJK UNIFIED IDEOGRAPH
+0xE0B4	0x7287	#CJK UNIFIED IDEOGRAPH
+0xE0B5	0x7292	#CJK UNIFIED IDEOGRAPH
+0xE0B6	0x7296	#CJK UNIFIED IDEOGRAPH
+0xE0B7	0x72A2	#CJK UNIFIED IDEOGRAPH
+0xE0B8	0x72A7	#CJK UNIFIED IDEOGRAPH
+0xE0B9	0x72B9	#CJK UNIFIED IDEOGRAPH
+0xE0BA	0x72B2	#CJK UNIFIED IDEOGRAPH
+0xE0BB	0x72C3	#CJK UNIFIED IDEOGRAPH
+0xE0BC	0x72C6	#CJK UNIFIED IDEOGRAPH
+0xE0BD	0x72C4	#CJK UNIFIED IDEOGRAPH
+0xE0BE	0x72CE	#CJK UNIFIED IDEOGRAPH
+0xE0BF	0x72D2	#CJK UNIFIED IDEOGRAPH
+0xE0C0	0x72E2	#CJK UNIFIED IDEOGRAPH
+0xE0C1	0x72E0	#CJK UNIFIED IDEOGRAPH
+0xE0C2	0x72E1	#CJK UNIFIED IDEOGRAPH
+0xE0C3	0x72F9	#CJK UNIFIED IDEOGRAPH
+0xE0C4	0x72F7	#CJK UNIFIED IDEOGRAPH
+0xE0C5	0x500F	#CJK UNIFIED IDEOGRAPH
+0xE0C6	0x7317	#CJK UNIFIED IDEOGRAPH
+0xE0C7	0x730A	#CJK UNIFIED IDEOGRAPH
+0xE0C8	0x731C	#CJK UNIFIED IDEOGRAPH
+0xE0C9	0x7316	#CJK UNIFIED IDEOGRAPH
+0xE0CA	0x731D	#CJK UNIFIED IDEOGRAPH
+0xE0CB	0x7334	#CJK UNIFIED IDEOGRAPH
+0xE0CC	0x732F	#CJK UNIFIED IDEOGRAPH
+0xE0CD	0x7329	#CJK UNIFIED IDEOGRAPH
+0xE0CE	0x7325	#CJK UNIFIED IDEOGRAPH
+0xE0CF	0x733E	#CJK UNIFIED IDEOGRAPH
+0xE0D0	0x734E	#CJK UNIFIED IDEOGRAPH
+0xE0D1	0x734F	#CJK UNIFIED IDEOGRAPH
+0xE0D2	0x9ED8	#CJK UNIFIED IDEOGRAPH
+0xE0D3	0x7357	#CJK UNIFIED IDEOGRAPH
+0xE0D4	0x736A	#CJK UNIFIED IDEOGRAPH
+0xE0D5	0x7368	#CJK UNIFIED IDEOGRAPH
+0xE0D6	0x7370	#CJK UNIFIED IDEOGRAPH
+0xE0D7	0x7378	#CJK UNIFIED IDEOGRAPH
+0xE0D8	0x7375	#CJK UNIFIED IDEOGRAPH
+0xE0D9	0x737B	#CJK UNIFIED IDEOGRAPH
+0xE0DA	0x737A	#CJK UNIFIED IDEOGRAPH
+0xE0DB	0x73C8	#CJK UNIFIED IDEOGRAPH
+0xE0DC	0x73B3	#CJK UNIFIED IDEOGRAPH
+0xE0DD	0x73CE	#CJK UNIFIED IDEOGRAPH
+0xE0DE	0x73BB	#CJK UNIFIED IDEOGRAPH
+0xE0DF	0x73C0	#CJK UNIFIED IDEOGRAPH
+0xE0E0	0x73E5	#CJK UNIFIED IDEOGRAPH
+0xE0E1	0x73EE	#CJK UNIFIED IDEOGRAPH
+0xE0E2	0x73DE	#CJK UNIFIED IDEOGRAPH
+0xE0E3	0x74A2	#CJK UNIFIED IDEOGRAPH
+0xE0E4	0x7405	#CJK UNIFIED IDEOGRAPH
+0xE0E5	0x746F	#CJK UNIFIED IDEOGRAPH
+0xE0E6	0x7425	#CJK UNIFIED IDEOGRAPH
+0xE0E7	0x73F8	#CJK UNIFIED IDEOGRAPH
+0xE0E8	0x7432	#CJK UNIFIED IDEOGRAPH
+0xE0E9	0x743A	#CJK UNIFIED IDEOGRAPH
+0xE0EA	0x7455	#CJK UNIFIED IDEOGRAPH
+0xE0EB	0x743F	#CJK UNIFIED IDEOGRAPH
+0xE0EC	0x745F	#CJK UNIFIED IDEOGRAPH
+0xE0ED	0x7459	#CJK UNIFIED IDEOGRAPH
+0xE0EE	0x7441	#CJK UNIFIED IDEOGRAPH
+0xE0EF	0x745C	#CJK UNIFIED IDEOGRAPH
+0xE0F0	0x7469	#CJK UNIFIED IDEOGRAPH
+0xE0F1	0x7470	#CJK UNIFIED IDEOGRAPH
+0xE0F2	0x7463	#CJK UNIFIED IDEOGRAPH
+0xE0F3	0x746A	#CJK UNIFIED IDEOGRAPH
+0xE0F4	0x7476	#CJK UNIFIED IDEOGRAPH
+0xE0F5	0x747E	#CJK UNIFIED IDEOGRAPH
+0xE0F6	0x748B	#CJK UNIFIED IDEOGRAPH
+0xE0F7	0x749E	#CJK UNIFIED IDEOGRAPH
+0xE0F8	0x74A7	#CJK UNIFIED IDEOGRAPH
+0xE0F9	0x74CA	#CJK UNIFIED IDEOGRAPH
+0xE0FA	0x74CF	#CJK UNIFIED IDEOGRAPH
+0xE0FB	0x74D4	#CJK UNIFIED IDEOGRAPH
+0xE0FC	0x73F1	#CJK UNIFIED IDEOGRAPH
+0xE140	0x74E0	#CJK UNIFIED IDEOGRAPH
+0xE141	0x74E3	#CJK UNIFIED IDEOGRAPH
+0xE142	0x74E7	#CJK UNIFIED IDEOGRAPH
+0xE143	0x74E9	#CJK UNIFIED IDEOGRAPH
+0xE144	0x74EE	#CJK UNIFIED IDEOGRAPH
+0xE145	0x74F2	#CJK UNIFIED IDEOGRAPH
+0xE146	0x74F0	#CJK UNIFIED IDEOGRAPH
+0xE147	0x74F1	#CJK UNIFIED IDEOGRAPH
+0xE148	0x74F8	#CJK UNIFIED IDEOGRAPH
+0xE149	0x74F7	#CJK UNIFIED IDEOGRAPH
+0xE14A	0x7504	#CJK UNIFIED IDEOGRAPH
+0xE14B	0x7503	#CJK UNIFIED IDEOGRAPH
+0xE14C	0x7505	#CJK UNIFIED IDEOGRAPH
+0xE14D	0x750C	#CJK UNIFIED IDEOGRAPH
+0xE14E	0x750E	#CJK UNIFIED IDEOGRAPH
+0xE14F	0x750D	#CJK UNIFIED IDEOGRAPH
+0xE150	0x7515	#CJK UNIFIED IDEOGRAPH
+0xE151	0x7513	#CJK UNIFIED IDEOGRAPH
+0xE152	0x751E	#CJK UNIFIED IDEOGRAPH
+0xE153	0x7526	#CJK UNIFIED IDEOGRAPH
+0xE154	0x752C	#CJK UNIFIED IDEOGRAPH
+0xE155	0x753C	#CJK UNIFIED IDEOGRAPH
+0xE156	0x7544	#CJK UNIFIED IDEOGRAPH
+0xE157	0x754D	#CJK UNIFIED IDEOGRAPH
+0xE158	0x754A	#CJK UNIFIED IDEOGRAPH
+0xE159	0x7549	#CJK UNIFIED IDEOGRAPH
+0xE15A	0x755B	#CJK UNIFIED IDEOGRAPH
+0xE15B	0x7546	#CJK UNIFIED IDEOGRAPH
+0xE15C	0x755A	#CJK UNIFIED IDEOGRAPH
+0xE15D	0x7569	#CJK UNIFIED IDEOGRAPH
+0xE15E	0x7564	#CJK UNIFIED IDEOGRAPH
+0xE15F	0x7567	#CJK UNIFIED IDEOGRAPH
+0xE160	0x756B	#CJK UNIFIED IDEOGRAPH
+0xE161	0x756D	#CJK UNIFIED IDEOGRAPH
+0xE162	0x7578	#CJK UNIFIED IDEOGRAPH
+0xE163	0x7576	#CJK UNIFIED IDEOGRAPH
+0xE164	0x7586	#CJK UNIFIED IDEOGRAPH
+0xE165	0x7587	#CJK UNIFIED IDEOGRAPH
+0xE166	0x7574	#CJK UNIFIED IDEOGRAPH
+0xE167	0x758A	#CJK UNIFIED IDEOGRAPH
+0xE168	0x7589	#CJK UNIFIED IDEOGRAPH
+0xE169	0x7582	#CJK UNIFIED IDEOGRAPH
+0xE16A	0x7594	#CJK UNIFIED IDEOGRAPH
+0xE16B	0x759A	#CJK UNIFIED IDEOGRAPH
+0xE16C	0x759D	#CJK UNIFIED IDEOGRAPH
+0xE16D	0x75A5	#CJK UNIFIED IDEOGRAPH
+0xE16E	0x75A3	#CJK UNIFIED IDEOGRAPH
+0xE16F	0x75C2	#CJK UNIFIED IDEOGRAPH
+0xE170	0x75B3	#CJK UNIFIED IDEOGRAPH
+0xE171	0x75C3	#CJK UNIFIED IDEOGRAPH
+0xE172	0x75B5	#CJK UNIFIED IDEOGRAPH
+0xE173	0x75BD	#CJK UNIFIED IDEOGRAPH
+0xE174	0x75B8	#CJK UNIFIED IDEOGRAPH
+0xE175	0x75BC	#CJK UNIFIED IDEOGRAPH
+0xE176	0x75B1	#CJK UNIFIED IDEOGRAPH
+0xE177	0x75CD	#CJK UNIFIED IDEOGRAPH
+0xE178	0x75CA	#CJK UNIFIED IDEOGRAPH
+0xE179	0x75D2	#CJK UNIFIED IDEOGRAPH
+0xE17A	0x75D9	#CJK UNIFIED IDEOGRAPH
+0xE17B	0x75E3	#CJK UNIFIED IDEOGRAPH
+0xE17C	0x75DE	#CJK UNIFIED IDEOGRAPH
+0xE17D	0x75FE	#CJK UNIFIED IDEOGRAPH
+0xE17E	0x75FF	#CJK UNIFIED IDEOGRAPH
+0xE180	0x75FC	#CJK UNIFIED IDEOGRAPH
+0xE181	0x7601	#CJK UNIFIED IDEOGRAPH
+0xE182	0x75F0	#CJK UNIFIED IDEOGRAPH
+0xE183	0x75FA	#CJK UNIFIED IDEOGRAPH
+0xE184	0x75F2	#CJK UNIFIED IDEOGRAPH
+0xE185	0x75F3	#CJK UNIFIED IDEOGRAPH
+0xE186	0x760B	#CJK UNIFIED IDEOGRAPH
+0xE187	0x760D	#CJK UNIFIED IDEOGRAPH
+0xE188	0x7609	#CJK UNIFIED IDEOGRAPH
+0xE189	0x761F	#CJK UNIFIED IDEOGRAPH
+0xE18A	0x7627	#CJK UNIFIED IDEOGRAPH
+0xE18B	0x7620	#CJK UNIFIED IDEOGRAPH
+0xE18C	0x7621	#CJK UNIFIED IDEOGRAPH
+0xE18D	0x7622	#CJK UNIFIED IDEOGRAPH
+0xE18E	0x7624	#CJK UNIFIED IDEOGRAPH
+0xE18F	0x7634	#CJK UNIFIED IDEOGRAPH
+0xE190	0x7630	#CJK UNIFIED IDEOGRAPH
+0xE191	0x763B	#CJK UNIFIED IDEOGRAPH
+0xE192	0x7647	#CJK UNIFIED IDEOGRAPH
+0xE193	0x7648	#CJK UNIFIED IDEOGRAPH
+0xE194	0x7646	#CJK UNIFIED IDEOGRAPH
+0xE195	0x765C	#CJK UNIFIED IDEOGRAPH
+0xE196	0x7658	#CJK UNIFIED IDEOGRAPH
+0xE197	0x7661	#CJK UNIFIED IDEOGRAPH
+0xE198	0x7662	#CJK UNIFIED IDEOGRAPH
+0xE199	0x7668	#CJK UNIFIED IDEOGRAPH
+0xE19A	0x7669	#CJK UNIFIED IDEOGRAPH
+0xE19B	0x766A	#CJK UNIFIED IDEOGRAPH
+0xE19C	0x7667	#CJK UNIFIED IDEOGRAPH
+0xE19D	0x766C	#CJK UNIFIED IDEOGRAPH
+0xE19E	0x7670	#CJK UNIFIED IDEOGRAPH
+0xE19F	0x7672	#CJK UNIFIED IDEOGRAPH
+0xE1A0	0x7676	#CJK UNIFIED IDEOGRAPH
+0xE1A1	0x7678	#CJK UNIFIED IDEOGRAPH
+0xE1A2	0x767C	#CJK UNIFIED IDEOGRAPH
+0xE1A3	0x7680	#CJK UNIFIED IDEOGRAPH
+0xE1A4	0x7683	#CJK UNIFIED IDEOGRAPH
+0xE1A5	0x7688	#CJK UNIFIED IDEOGRAPH
+0xE1A6	0x768B	#CJK UNIFIED IDEOGRAPH
+0xE1A7	0x768E	#CJK UNIFIED IDEOGRAPH
+0xE1A8	0x7696	#CJK UNIFIED IDEOGRAPH
+0xE1A9	0x7693	#CJK UNIFIED IDEOGRAPH
+0xE1AA	0x7699	#CJK UNIFIED IDEOGRAPH
+0xE1AB	0x769A	#CJK UNIFIED IDEOGRAPH
+0xE1AC	0x76B0	#CJK UNIFIED IDEOGRAPH
+0xE1AD	0x76B4	#CJK UNIFIED IDEOGRAPH
+0xE1AE	0x76B8	#CJK UNIFIED IDEOGRAPH
+0xE1AF	0x76B9	#CJK UNIFIED IDEOGRAPH
+0xE1B0	0x76BA	#CJK UNIFIED IDEOGRAPH
+0xE1B1	0x76C2	#CJK UNIFIED IDEOGRAPH
+0xE1B2	0x76CD	#CJK UNIFIED IDEOGRAPH
+0xE1B3	0x76D6	#CJK UNIFIED IDEOGRAPH
+0xE1B4	0x76D2	#CJK UNIFIED IDEOGRAPH
+0xE1B5	0x76DE	#CJK UNIFIED IDEOGRAPH
+0xE1B6	0x76E1	#CJK UNIFIED IDEOGRAPH
+0xE1B7	0x76E5	#CJK UNIFIED IDEOGRAPH
+0xE1B8	0x76E7	#CJK UNIFIED IDEOGRAPH
+0xE1B9	0x76EA	#CJK UNIFIED IDEOGRAPH
+0xE1BA	0x862F	#CJK UNIFIED IDEOGRAPH
+0xE1BB	0x76FB	#CJK UNIFIED IDEOGRAPH
+0xE1BC	0x7708	#CJK UNIFIED IDEOGRAPH
+0xE1BD	0x7707	#CJK UNIFIED IDEOGRAPH
+0xE1BE	0x7704	#CJK UNIFIED IDEOGRAPH
+0xE1BF	0x7729	#CJK UNIFIED IDEOGRAPH
+0xE1C0	0x7724	#CJK UNIFIED IDEOGRAPH
+0xE1C1	0x771E	#CJK UNIFIED IDEOGRAPH
+0xE1C2	0x7725	#CJK UNIFIED IDEOGRAPH
+0xE1C3	0x7726	#CJK UNIFIED IDEOGRAPH
+0xE1C4	0x771B	#CJK UNIFIED IDEOGRAPH
+0xE1C5	0x7737	#CJK UNIFIED IDEOGRAPH
+0xE1C6	0x7738	#CJK UNIFIED IDEOGRAPH
+0xE1C7	0x7747	#CJK UNIFIED IDEOGRAPH
+0xE1C8	0x775A	#CJK UNIFIED IDEOGRAPH
+0xE1C9	0x7768	#CJK UNIFIED IDEOGRAPH
+0xE1CA	0x776B	#CJK UNIFIED IDEOGRAPH
+0xE1CB	0x775B	#CJK UNIFIED IDEOGRAPH
+0xE1CC	0x7765	#CJK UNIFIED IDEOGRAPH
+0xE1CD	0x777F	#CJK UNIFIED IDEOGRAPH
+0xE1CE	0x777E	#CJK UNIFIED IDEOGRAPH
+0xE1CF	0x7779	#CJK UNIFIED IDEOGRAPH
+0xE1D0	0x778E	#CJK UNIFIED IDEOGRAPH
+0xE1D1	0x778B	#CJK UNIFIED IDEOGRAPH
+0xE1D2	0x7791	#CJK UNIFIED IDEOGRAPH
+0xE1D3	0x77A0	#CJK UNIFIED IDEOGRAPH
+0xE1D4	0x779E	#CJK UNIFIED IDEOGRAPH
+0xE1D5	0x77B0	#CJK UNIFIED IDEOGRAPH
+0xE1D6	0x77B6	#CJK UNIFIED IDEOGRAPH
+0xE1D7	0x77B9	#CJK UNIFIED IDEOGRAPH
+0xE1D8	0x77BF	#CJK UNIFIED IDEOGRAPH
+0xE1D9	0x77BC	#CJK UNIFIED IDEOGRAPH
+0xE1DA	0x77BD	#CJK UNIFIED IDEOGRAPH
+0xE1DB	0x77BB	#CJK UNIFIED IDEOGRAPH
+0xE1DC	0x77C7	#CJK UNIFIED IDEOGRAPH
+0xE1DD	0x77CD	#CJK UNIFIED IDEOGRAPH
+0xE1DE	0x77D7	#CJK UNIFIED IDEOGRAPH
+0xE1DF	0x77DA	#CJK UNIFIED IDEOGRAPH
+0xE1E0	0x77DC	#CJK UNIFIED IDEOGRAPH
+0xE1E1	0x77E3	#CJK UNIFIED IDEOGRAPH
+0xE1E2	0x77EE	#CJK UNIFIED IDEOGRAPH
+0xE1E3	0x77FC	#CJK UNIFIED IDEOGRAPH
+0xE1E4	0x780C	#CJK UNIFIED IDEOGRAPH
+0xE1E5	0x7812	#CJK UNIFIED IDEOGRAPH
+0xE1E6	0x7926	#CJK UNIFIED IDEOGRAPH
+0xE1E7	0x7820	#CJK UNIFIED IDEOGRAPH
+0xE1E8	0x792A	#CJK UNIFIED IDEOGRAPH
+0xE1E9	0x7845	#CJK UNIFIED IDEOGRAPH
+0xE1EA	0x788E	#CJK UNIFIED IDEOGRAPH
+0xE1EB	0x7874	#CJK UNIFIED IDEOGRAPH
+0xE1EC	0x7886	#CJK UNIFIED IDEOGRAPH
+0xE1ED	0x787C	#CJK UNIFIED IDEOGRAPH
+0xE1EE	0x789A	#CJK UNIFIED IDEOGRAPH
+0xE1EF	0x788C	#CJK UNIFIED IDEOGRAPH
+0xE1F0	0x78A3	#CJK UNIFIED IDEOGRAPH
+0xE1F1	0x78B5	#CJK UNIFIED IDEOGRAPH
+0xE1F2	0x78AA	#CJK UNIFIED IDEOGRAPH
+0xE1F3	0x78AF	#CJK UNIFIED IDEOGRAPH
+0xE1F4	0x78D1	#CJK UNIFIED IDEOGRAPH
+0xE1F5	0x78C6	#CJK UNIFIED IDEOGRAPH
+0xE1F6	0x78CB	#CJK UNIFIED IDEOGRAPH
+0xE1F7	0x78D4	#CJK UNIFIED IDEOGRAPH
+0xE1F8	0x78BE	#CJK UNIFIED IDEOGRAPH
+0xE1F9	0x78BC	#CJK UNIFIED IDEOGRAPH
+0xE1FA	0x78C5	#CJK UNIFIED IDEOGRAPH
+0xE1FB	0x78CA	#CJK UNIFIED IDEOGRAPH
+0xE1FC	0x78EC	#CJK UNIFIED IDEOGRAPH
+0xE240	0x78E7	#CJK UNIFIED IDEOGRAPH
+0xE241	0x78DA	#CJK UNIFIED IDEOGRAPH
+0xE242	0x78FD	#CJK UNIFIED IDEOGRAPH
+0xE243	0x78F4	#CJK UNIFIED IDEOGRAPH
+0xE244	0x7907	#CJK UNIFIED IDEOGRAPH
+0xE245	0x7912	#CJK UNIFIED IDEOGRAPH
+0xE246	0x7911	#CJK UNIFIED IDEOGRAPH
+0xE247	0x7919	#CJK UNIFIED IDEOGRAPH
+0xE248	0x792C	#CJK UNIFIED IDEOGRAPH
+0xE249	0x792B	#CJK UNIFIED IDEOGRAPH
+0xE24A	0x7940	#CJK UNIFIED IDEOGRAPH
+0xE24B	0x7960	#CJK UNIFIED IDEOGRAPH
+0xE24C	0x7957	#CJK UNIFIED IDEOGRAPH
+0xE24D	0x795F	#CJK UNIFIED IDEOGRAPH
+0xE24E	0x795A	#CJK UNIFIED IDEOGRAPH
+0xE24F	0x7955	#CJK UNIFIED IDEOGRAPH
+0xE250	0x7953	#CJK UNIFIED IDEOGRAPH
+0xE251	0x797A	#CJK UNIFIED IDEOGRAPH
+0xE252	0x797F	#CJK UNIFIED IDEOGRAPH
+0xE253	0x798A	#CJK UNIFIED IDEOGRAPH
+0xE254	0x799D	#CJK UNIFIED IDEOGRAPH
+0xE255	0x79A7	#CJK UNIFIED IDEOGRAPH
+0xE256	0x9F4B	#CJK UNIFIED IDEOGRAPH
+0xE257	0x79AA	#CJK UNIFIED IDEOGRAPH
+0xE258	0x79AE	#CJK UNIFIED IDEOGRAPH
+0xE259	0x79B3	#CJK UNIFIED IDEOGRAPH
+0xE25A	0x79B9	#CJK UNIFIED IDEOGRAPH
+0xE25B	0x79BA	#CJK UNIFIED IDEOGRAPH
+0xE25C	0x79C9	#CJK UNIFIED IDEOGRAPH
+0xE25D	0x79D5	#CJK UNIFIED IDEOGRAPH
+0xE25E	0x79E7	#CJK UNIFIED IDEOGRAPH
+0xE25F	0x79EC	#CJK UNIFIED IDEOGRAPH
+0xE260	0x79E1	#CJK UNIFIED IDEOGRAPH
+0xE261	0x79E3	#CJK UNIFIED IDEOGRAPH
+0xE262	0x7A08	#CJK UNIFIED IDEOGRAPH
+0xE263	0x7A0D	#CJK UNIFIED IDEOGRAPH
+0xE264	0x7A18	#CJK UNIFIED IDEOGRAPH
+0xE265	0x7A19	#CJK UNIFIED IDEOGRAPH
+0xE266	0x7A20	#CJK UNIFIED IDEOGRAPH
+0xE267	0x7A1F	#CJK UNIFIED IDEOGRAPH
+0xE268	0x7980	#CJK UNIFIED IDEOGRAPH
+0xE269	0x7A31	#CJK UNIFIED IDEOGRAPH
+0xE26A	0x7A3B	#CJK UNIFIED IDEOGRAPH
+0xE26B	0x7A3E	#CJK UNIFIED IDEOGRAPH
+0xE26C	0x7A37	#CJK UNIFIED IDEOGRAPH
+0xE26D	0x7A43	#CJK UNIFIED IDEOGRAPH
+0xE26E	0x7A57	#CJK UNIFIED IDEOGRAPH
+0xE26F	0x7A49	#CJK UNIFIED IDEOGRAPH
+0xE270	0x7A61	#CJK UNIFIED IDEOGRAPH
+0xE271	0x7A62	#CJK UNIFIED IDEOGRAPH
+0xE272	0x7A69	#CJK UNIFIED IDEOGRAPH
+0xE273	0x9F9D	#CJK UNIFIED IDEOGRAPH
+0xE274	0x7A70	#CJK UNIFIED IDEOGRAPH
+0xE275	0x7A79	#CJK UNIFIED IDEOGRAPH
+0xE276	0x7A7D	#CJK UNIFIED IDEOGRAPH
+0xE277	0x7A88	#CJK UNIFIED IDEOGRAPH
+0xE278	0x7A97	#CJK UNIFIED IDEOGRAPH
+0xE279	0x7A95	#CJK UNIFIED IDEOGRAPH
+0xE27A	0x7A98	#CJK UNIFIED IDEOGRAPH
+0xE27B	0x7A96	#CJK UNIFIED IDEOGRAPH
+0xE27C	0x7AA9	#CJK UNIFIED IDEOGRAPH
+0xE27D	0x7AC8	#CJK UNIFIED IDEOGRAPH
+0xE27E	0x7AB0	#CJK UNIFIED IDEOGRAPH
+0xE280	0x7AB6	#CJK UNIFIED IDEOGRAPH
+0xE281	0x7AC5	#CJK UNIFIED IDEOGRAPH
+0xE282	0x7AC4	#CJK UNIFIED IDEOGRAPH
+0xE283	0x7ABF	#CJK UNIFIED IDEOGRAPH
+0xE284	0x9083	#CJK UNIFIED IDEOGRAPH
+0xE285	0x7AC7	#CJK UNIFIED IDEOGRAPH
+0xE286	0x7ACA	#CJK UNIFIED IDEOGRAPH
+0xE287	0x7ACD	#CJK UNIFIED IDEOGRAPH
+0xE288	0x7ACF	#CJK UNIFIED IDEOGRAPH
+0xE289	0x7AD5	#CJK UNIFIED IDEOGRAPH
+0xE28A	0x7AD3	#CJK UNIFIED IDEOGRAPH
+0xE28B	0x7AD9	#CJK UNIFIED IDEOGRAPH
+0xE28C	0x7ADA	#CJK UNIFIED IDEOGRAPH
+0xE28D	0x7ADD	#CJK UNIFIED IDEOGRAPH
+0xE28E	0x7AE1	#CJK UNIFIED IDEOGRAPH
+0xE28F	0x7AE2	#CJK UNIFIED IDEOGRAPH
+0xE290	0x7AE6	#CJK UNIFIED IDEOGRAPH
+0xE291	0x7AED	#CJK UNIFIED IDEOGRAPH
+0xE292	0x7AF0	#CJK UNIFIED IDEOGRAPH
+0xE293	0x7B02	#CJK UNIFIED IDEOGRAPH
+0xE294	0x7B0F	#CJK UNIFIED IDEOGRAPH
+0xE295	0x7B0A	#CJK UNIFIED IDEOGRAPH
+0xE296	0x7B06	#CJK UNIFIED IDEOGRAPH
+0xE297	0x7B33	#CJK UNIFIED IDEOGRAPH
+0xE298	0x7B18	#CJK UNIFIED IDEOGRAPH
+0xE299	0x7B19	#CJK UNIFIED IDEOGRAPH
+0xE29A	0x7B1E	#CJK UNIFIED IDEOGRAPH
+0xE29B	0x7B35	#CJK UNIFIED IDEOGRAPH
+0xE29C	0x7B28	#CJK UNIFIED IDEOGRAPH
+0xE29D	0x7B36	#CJK UNIFIED IDEOGRAPH
+0xE29E	0x7B50	#CJK UNIFIED IDEOGRAPH
+0xE29F	0x7B7A	#CJK UNIFIED IDEOGRAPH
+0xE2A0	0x7B04	#CJK UNIFIED IDEOGRAPH
+0xE2A1	0x7B4D	#CJK UNIFIED IDEOGRAPH
+0xE2A2	0x7B0B	#CJK UNIFIED IDEOGRAPH
+0xE2A3	0x7B4C	#CJK UNIFIED IDEOGRAPH
+0xE2A4	0x7B45	#CJK UNIFIED IDEOGRAPH
+0xE2A5	0x7B75	#CJK UNIFIED IDEOGRAPH
+0xE2A6	0x7B65	#CJK UNIFIED IDEOGRAPH
+0xE2A7	0x7B74	#CJK UNIFIED IDEOGRAPH
+0xE2A8	0x7B67	#CJK UNIFIED IDEOGRAPH
+0xE2A9	0x7B70	#CJK UNIFIED IDEOGRAPH
+0xE2AA	0x7B71	#CJK UNIFIED IDEOGRAPH
+0xE2AB	0x7B6C	#CJK UNIFIED IDEOGRAPH
+0xE2AC	0x7B6E	#CJK UNIFIED IDEOGRAPH
+0xE2AD	0x7B9D	#CJK UNIFIED IDEOGRAPH
+0xE2AE	0x7B98	#CJK UNIFIED IDEOGRAPH
+0xE2AF	0x7B9F	#CJK UNIFIED IDEOGRAPH
+0xE2B0	0x7B8D	#CJK UNIFIED IDEOGRAPH
+0xE2B1	0x7B9C	#CJK UNIFIED IDEOGRAPH
+0xE2B2	0x7B9A	#CJK UNIFIED IDEOGRAPH
+0xE2B3	0x7B8B	#CJK UNIFIED IDEOGRAPH
+0xE2B4	0x7B92	#CJK UNIFIED IDEOGRAPH
+0xE2B5	0x7B8F	#CJK UNIFIED IDEOGRAPH
+0xE2B6	0x7B5D	#CJK UNIFIED IDEOGRAPH
+0xE2B7	0x7B99	#CJK UNIFIED IDEOGRAPH
+0xE2B8	0x7BCB	#CJK UNIFIED IDEOGRAPH
+0xE2B9	0x7BC1	#CJK UNIFIED IDEOGRAPH
+0xE2BA	0x7BCC	#CJK UNIFIED IDEOGRAPH
+0xE2BB	0x7BCF	#CJK UNIFIED IDEOGRAPH
+0xE2BC	0x7BB4	#CJK UNIFIED IDEOGRAPH
+0xE2BD	0x7BC6	#CJK UNIFIED IDEOGRAPH
+0xE2BE	0x7BDD	#CJK UNIFIED IDEOGRAPH
+0xE2BF	0x7BE9	#CJK UNIFIED IDEOGRAPH
+0xE2C0	0x7C11	#CJK UNIFIED IDEOGRAPH
+0xE2C1	0x7C14	#CJK UNIFIED IDEOGRAPH
+0xE2C2	0x7BE6	#CJK UNIFIED IDEOGRAPH
+0xE2C3	0x7BE5	#CJK UNIFIED IDEOGRAPH
+0xE2C4	0x7C60	#CJK UNIFIED IDEOGRAPH
+0xE2C5	0x7C00	#CJK UNIFIED IDEOGRAPH
+0xE2C6	0x7C07	#CJK UNIFIED IDEOGRAPH
+0xE2C7	0x7C13	#CJK UNIFIED IDEOGRAPH
+0xE2C8	0x7BF3	#CJK UNIFIED IDEOGRAPH
+0xE2C9	0x7BF7	#CJK UNIFIED IDEOGRAPH
+0xE2CA	0x7C17	#CJK UNIFIED IDEOGRAPH
+0xE2CB	0x7C0D	#CJK UNIFIED IDEOGRAPH
+0xE2CC	0x7BF6	#CJK UNIFIED IDEOGRAPH
+0xE2CD	0x7C23	#CJK UNIFIED IDEOGRAPH
+0xE2CE	0x7C27	#CJK UNIFIED IDEOGRAPH
+0xE2CF	0x7C2A	#CJK UNIFIED IDEOGRAPH
+0xE2D0	0x7C1F	#CJK UNIFIED IDEOGRAPH
+0xE2D1	0x7C37	#CJK UNIFIED IDEOGRAPH
+0xE2D2	0x7C2B	#CJK UNIFIED IDEOGRAPH
+0xE2D3	0x7C3D	#CJK UNIFIED IDEOGRAPH
+0xE2D4	0x7C4C	#CJK UNIFIED IDEOGRAPH
+0xE2D5	0x7C43	#CJK UNIFIED IDEOGRAPH
+0xE2D6	0x7C54	#CJK UNIFIED IDEOGRAPH
+0xE2D7	0x7C4F	#CJK UNIFIED IDEOGRAPH
+0xE2D8	0x7C40	#CJK UNIFIED IDEOGRAPH
+0xE2D9	0x7C50	#CJK UNIFIED IDEOGRAPH
+0xE2DA	0x7C58	#CJK UNIFIED IDEOGRAPH
+0xE2DB	0x7C5F	#CJK UNIFIED IDEOGRAPH
+0xE2DC	0x7C64	#CJK UNIFIED IDEOGRAPH
+0xE2DD	0x7C56	#CJK UNIFIED IDEOGRAPH
+0xE2DE	0x7C65	#CJK UNIFIED IDEOGRAPH
+0xE2DF	0x7C6C	#CJK UNIFIED IDEOGRAPH
+0xE2E0	0x7C75	#CJK UNIFIED IDEOGRAPH
+0xE2E1	0x7C83	#CJK UNIFIED IDEOGRAPH
+0xE2E2	0x7C90	#CJK UNIFIED IDEOGRAPH
+0xE2E3	0x7CA4	#CJK UNIFIED IDEOGRAPH
+0xE2E4	0x7CAD	#CJK UNIFIED IDEOGRAPH
+0xE2E5	0x7CA2	#CJK UNIFIED IDEOGRAPH
+0xE2E6	0x7CAB	#CJK UNIFIED IDEOGRAPH
+0xE2E7	0x7CA1	#CJK UNIFIED IDEOGRAPH
+0xE2E8	0x7CA8	#CJK UNIFIED IDEOGRAPH
+0xE2E9	0x7CB3	#CJK UNIFIED IDEOGRAPH
+0xE2EA	0x7CB2	#CJK UNIFIED IDEOGRAPH
+0xE2EB	0x7CB1	#CJK UNIFIED IDEOGRAPH
+0xE2EC	0x7CAE	#CJK UNIFIED IDEOGRAPH
+0xE2ED	0x7CB9	#CJK UNIFIED IDEOGRAPH
+0xE2EE	0x7CBD	#CJK UNIFIED IDEOGRAPH
+0xE2EF	0x7CC0	#CJK UNIFIED IDEOGRAPH
+0xE2F0	0x7CC5	#CJK UNIFIED IDEOGRAPH
+0xE2F1	0x7CC2	#CJK UNIFIED IDEOGRAPH
+0xE2F2	0x7CD8	#CJK UNIFIED IDEOGRAPH
+0xE2F3	0x7CD2	#CJK UNIFIED IDEOGRAPH
+0xE2F4	0x7CDC	#CJK UNIFIED IDEOGRAPH
+0xE2F5	0x7CE2	#CJK UNIFIED IDEOGRAPH
+0xE2F6	0x9B3B	#CJK UNIFIED IDEOGRAPH
+0xE2F7	0x7CEF	#CJK UNIFIED IDEOGRAPH
+0xE2F8	0x7CF2	#CJK UNIFIED IDEOGRAPH
+0xE2F9	0x7CF4	#CJK UNIFIED IDEOGRAPH
+0xE2FA	0x7CF6	#CJK UNIFIED IDEOGRAPH
+0xE2FB	0x7CFA	#CJK UNIFIED IDEOGRAPH
+0xE2FC	0x7D06	#CJK UNIFIED IDEOGRAPH
+0xE340	0x7D02	#CJK UNIFIED IDEOGRAPH
+0xE341	0x7D1C	#CJK UNIFIED IDEOGRAPH
+0xE342	0x7D15	#CJK UNIFIED IDEOGRAPH
+0xE343	0x7D0A	#CJK UNIFIED IDEOGRAPH
+0xE344	0x7D45	#CJK UNIFIED IDEOGRAPH
+0xE345	0x7D4B	#CJK UNIFIED IDEOGRAPH
+0xE346	0x7D2E	#CJK UNIFIED IDEOGRAPH
+0xE347	0x7D32	#CJK UNIFIED IDEOGRAPH
+0xE348	0x7D3F	#CJK UNIFIED IDEOGRAPH
+0xE349	0x7D35	#CJK UNIFIED IDEOGRAPH
+0xE34A	0x7D46	#CJK UNIFIED IDEOGRAPH
+0xE34B	0x7D73	#CJK UNIFIED IDEOGRAPH
+0xE34C	0x7D56	#CJK UNIFIED IDEOGRAPH
+0xE34D	0x7D4E	#CJK UNIFIED IDEOGRAPH
+0xE34E	0x7D72	#CJK UNIFIED IDEOGRAPH
+0xE34F	0x7D68	#CJK UNIFIED IDEOGRAPH
+0xE350	0x7D6E	#CJK UNIFIED IDEOGRAPH
+0xE351	0x7D4F	#CJK UNIFIED IDEOGRAPH
+0xE352	0x7D63	#CJK UNIFIED IDEOGRAPH
+0xE353	0x7D93	#CJK UNIFIED IDEOGRAPH
+0xE354	0x7D89	#CJK UNIFIED IDEOGRAPH
+0xE355	0x7D5B	#CJK UNIFIED IDEOGRAPH
+0xE356	0x7D8F	#CJK UNIFIED IDEOGRAPH
+0xE357	0x7D7D	#CJK UNIFIED IDEOGRAPH
+0xE358	0x7D9B	#CJK UNIFIED IDEOGRAPH
+0xE359	0x7DBA	#CJK UNIFIED IDEOGRAPH
+0xE35A	0x7DAE	#CJK UNIFIED IDEOGRAPH
+0xE35B	0x7DA3	#CJK UNIFIED IDEOGRAPH
+0xE35C	0x7DB5	#CJK UNIFIED IDEOGRAPH
+0xE35D	0x7DC7	#CJK UNIFIED IDEOGRAPH
+0xE35E	0x7DBD	#CJK UNIFIED IDEOGRAPH
+0xE35F	0x7DAB	#CJK UNIFIED IDEOGRAPH
+0xE360	0x7E3D	#CJK UNIFIED IDEOGRAPH
+0xE361	0x7DA2	#CJK UNIFIED IDEOGRAPH
+0xE362	0x7DAF	#CJK UNIFIED IDEOGRAPH
+0xE363	0x7DDC	#CJK UNIFIED IDEOGRAPH
+0xE364	0x7DB8	#CJK UNIFIED IDEOGRAPH
+0xE365	0x7D9F	#CJK UNIFIED IDEOGRAPH
+0xE366	0x7DB0	#CJK UNIFIED IDEOGRAPH
+0xE367	0x7DD8	#CJK UNIFIED IDEOGRAPH
+0xE368	0x7DDD	#CJK UNIFIED IDEOGRAPH
+0xE369	0x7DE4	#CJK UNIFIED IDEOGRAPH
+0xE36A	0x7DDE	#CJK UNIFIED IDEOGRAPH
+0xE36B	0x7DFB	#CJK UNIFIED IDEOGRAPH
+0xE36C	0x7DF2	#CJK UNIFIED IDEOGRAPH
+0xE36D	0x7DE1	#CJK UNIFIED IDEOGRAPH
+0xE36E	0x7E05	#CJK UNIFIED IDEOGRAPH
+0xE36F	0x7E0A	#CJK UNIFIED IDEOGRAPH
+0xE370	0x7E23	#CJK UNIFIED IDEOGRAPH
+0xE371	0x7E21	#CJK UNIFIED IDEOGRAPH
+0xE372	0x7E12	#CJK UNIFIED IDEOGRAPH
+0xE373	0x7E31	#CJK UNIFIED IDEOGRAPH
+0xE374	0x7E1F	#CJK UNIFIED IDEOGRAPH
+0xE375	0x7E09	#CJK UNIFIED IDEOGRAPH
+0xE376	0x7E0B	#CJK UNIFIED IDEOGRAPH
+0xE377	0x7E22	#CJK UNIFIED IDEOGRAPH
+0xE378	0x7E46	#CJK UNIFIED IDEOGRAPH
+0xE379	0x7E66	#CJK UNIFIED IDEOGRAPH
+0xE37A	0x7E3B	#CJK UNIFIED IDEOGRAPH
+0xE37B	0x7E35	#CJK UNIFIED IDEOGRAPH
+0xE37C	0x7E39	#CJK UNIFIED IDEOGRAPH
+0xE37D	0x7E43	#CJK UNIFIED IDEOGRAPH
+0xE37E	0x7E37	#CJK UNIFIED IDEOGRAPH
+0xE380	0x7E32	#CJK UNIFIED IDEOGRAPH
+0xE381	0x7E3A	#CJK UNIFIED IDEOGRAPH
+0xE382	0x7E67	#CJK UNIFIED IDEOGRAPH
+0xE383	0x7E5D	#CJK UNIFIED IDEOGRAPH
+0xE384	0x7E56	#CJK UNIFIED IDEOGRAPH
+0xE385	0x7E5E	#CJK UNIFIED IDEOGRAPH
+0xE386	0x7E59	#CJK UNIFIED IDEOGRAPH
+0xE387	0x7E5A	#CJK UNIFIED IDEOGRAPH
+0xE388	0x7E79	#CJK UNIFIED IDEOGRAPH
+0xE389	0x7E6A	#CJK UNIFIED IDEOGRAPH
+0xE38A	0x7E69	#CJK UNIFIED IDEOGRAPH
+0xE38B	0x7E7C	#CJK UNIFIED IDEOGRAPH
+0xE38C	0x7E7B	#CJK UNIFIED IDEOGRAPH
+0xE38D	0x7E83	#CJK UNIFIED IDEOGRAPH
+0xE38E	0x7DD5	#CJK UNIFIED IDEOGRAPH
+0xE38F	0x7E7D	#CJK UNIFIED IDEOGRAPH
+0xE390	0x8FAE	#CJK UNIFIED IDEOGRAPH
+0xE391	0x7E7F	#CJK UNIFIED IDEOGRAPH
+0xE392	0x7E88	#CJK UNIFIED IDEOGRAPH
+0xE393	0x7E89	#CJK UNIFIED IDEOGRAPH
+0xE394	0x7E8C	#CJK UNIFIED IDEOGRAPH
+0xE395	0x7E92	#CJK UNIFIED IDEOGRAPH
+0xE396	0x7E90	#CJK UNIFIED IDEOGRAPH
+0xE397	0x7E93	#CJK UNIFIED IDEOGRAPH
+0xE398	0x7E94	#CJK UNIFIED IDEOGRAPH
+0xE399	0x7E96	#CJK UNIFIED IDEOGRAPH
+0xE39A	0x7E8E	#CJK UNIFIED IDEOGRAPH
+0xE39B	0x7E9B	#CJK UNIFIED IDEOGRAPH
+0xE39C	0x7E9C	#CJK UNIFIED IDEOGRAPH
+0xE39D	0x7F38	#CJK UNIFIED IDEOGRAPH
+0xE39E	0x7F3A	#CJK UNIFIED IDEOGRAPH
+0xE39F	0x7F45	#CJK UNIFIED IDEOGRAPH
+0xE3A0	0x7F4C	#CJK UNIFIED IDEOGRAPH
+0xE3A1	0x7F4D	#CJK UNIFIED IDEOGRAPH
+0xE3A2	0x7F4E	#CJK UNIFIED IDEOGRAPH
+0xE3A3	0x7F50	#CJK UNIFIED IDEOGRAPH
+0xE3A4	0x7F51	#CJK UNIFIED IDEOGRAPH
+0xE3A5	0x7F55	#CJK UNIFIED IDEOGRAPH
+0xE3A6	0x7F54	#CJK UNIFIED IDEOGRAPH
+0xE3A7	0x7F58	#CJK UNIFIED IDEOGRAPH
+0xE3A8	0x7F5F	#CJK UNIFIED IDEOGRAPH
+0xE3A9	0x7F60	#CJK UNIFIED IDEOGRAPH
+0xE3AA	0x7F68	#CJK UNIFIED IDEOGRAPH
+0xE3AB	0x7F69	#CJK UNIFIED IDEOGRAPH
+0xE3AC	0x7F67	#CJK UNIFIED IDEOGRAPH
+0xE3AD	0x7F78	#CJK UNIFIED IDEOGRAPH
+0xE3AE	0x7F82	#CJK UNIFIED IDEOGRAPH
+0xE3AF	0x7F86	#CJK UNIFIED IDEOGRAPH
+0xE3B0	0x7F83	#CJK UNIFIED IDEOGRAPH
+0xE3B1	0x7F88	#CJK UNIFIED IDEOGRAPH
+0xE3B2	0x7F87	#CJK UNIFIED IDEOGRAPH
+0xE3B3	0x7F8C	#CJK UNIFIED IDEOGRAPH
+0xE3B4	0x7F94	#CJK UNIFIED IDEOGRAPH
+0xE3B5	0x7F9E	#CJK UNIFIED IDEOGRAPH
+0xE3B6	0x7F9D	#CJK UNIFIED IDEOGRAPH
+0xE3B7	0x7F9A	#CJK UNIFIED IDEOGRAPH
+0xE3B8	0x7FA3	#CJK UNIFIED IDEOGRAPH
+0xE3B9	0x7FAF	#CJK UNIFIED IDEOGRAPH
+0xE3BA	0x7FB2	#CJK UNIFIED IDEOGRAPH
+0xE3BB	0x7FB9	#CJK UNIFIED IDEOGRAPH
+0xE3BC	0x7FAE	#CJK UNIFIED IDEOGRAPH
+0xE3BD	0x7FB6	#CJK UNIFIED IDEOGRAPH
+0xE3BE	0x7FB8	#CJK UNIFIED IDEOGRAPH
+0xE3BF	0x8B71	#CJK UNIFIED IDEOGRAPH
+0xE3C0	0x7FC5	#CJK UNIFIED IDEOGRAPH
+0xE3C1	0x7FC6	#CJK UNIFIED IDEOGRAPH
+0xE3C2	0x7FCA	#CJK UNIFIED IDEOGRAPH
+0xE3C3	0x7FD5	#CJK UNIFIED IDEOGRAPH
+0xE3C4	0x7FD4	#CJK UNIFIED IDEOGRAPH
+0xE3C5	0x7FE1	#CJK UNIFIED IDEOGRAPH
+0xE3C6	0x7FE6	#CJK UNIFIED IDEOGRAPH
+0xE3C7	0x7FE9	#CJK UNIFIED IDEOGRAPH
+0xE3C8	0x7FF3	#CJK UNIFIED IDEOGRAPH
+0xE3C9	0x7FF9	#CJK UNIFIED IDEOGRAPH
+0xE3CA	0x98DC	#CJK UNIFIED IDEOGRAPH
+0xE3CB	0x8006	#CJK UNIFIED IDEOGRAPH
+0xE3CC	0x8004	#CJK UNIFIED IDEOGRAPH
+0xE3CD	0x800B	#CJK UNIFIED IDEOGRAPH
+0xE3CE	0x8012	#CJK UNIFIED IDEOGRAPH
+0xE3CF	0x8018	#CJK UNIFIED IDEOGRAPH
+0xE3D0	0x8019	#CJK UNIFIED IDEOGRAPH
+0xE3D1	0x801C	#CJK UNIFIED IDEOGRAPH
+0xE3D2	0x8021	#CJK UNIFIED IDEOGRAPH
+0xE3D3	0x8028	#CJK UNIFIED IDEOGRAPH
+0xE3D4	0x803F	#CJK UNIFIED IDEOGRAPH
+0xE3D5	0x803B	#CJK UNIFIED IDEOGRAPH
+0xE3D6	0x804A	#CJK UNIFIED IDEOGRAPH
+0xE3D7	0x8046	#CJK UNIFIED IDEOGRAPH
+0xE3D8	0x8052	#CJK UNIFIED IDEOGRAPH
+0xE3D9	0x8058	#CJK UNIFIED IDEOGRAPH
+0xE3DA	0x805A	#CJK UNIFIED IDEOGRAPH
+0xE3DB	0x805F	#CJK UNIFIED IDEOGRAPH
+0xE3DC	0x8062	#CJK UNIFIED IDEOGRAPH
+0xE3DD	0x8068	#CJK UNIFIED IDEOGRAPH
+0xE3DE	0x8073	#CJK UNIFIED IDEOGRAPH
+0xE3DF	0x8072	#CJK UNIFIED IDEOGRAPH
+0xE3E0	0x8070	#CJK UNIFIED IDEOGRAPH
+0xE3E1	0x8076	#CJK UNIFIED IDEOGRAPH
+0xE3E2	0x8079	#CJK UNIFIED IDEOGRAPH
+0xE3E3	0x807D	#CJK UNIFIED IDEOGRAPH
+0xE3E4	0x807F	#CJK UNIFIED IDEOGRAPH
+0xE3E5	0x8084	#CJK UNIFIED IDEOGRAPH
+0xE3E6	0x8086	#CJK UNIFIED IDEOGRAPH
+0xE3E7	0x8085	#CJK UNIFIED IDEOGRAPH
+0xE3E8	0x809B	#CJK UNIFIED IDEOGRAPH
+0xE3E9	0x8093	#CJK UNIFIED IDEOGRAPH
+0xE3EA	0x809A	#CJK UNIFIED IDEOGRAPH
+0xE3EB	0x80AD	#CJK UNIFIED IDEOGRAPH
+0xE3EC	0x5190	#CJK UNIFIED IDEOGRAPH
+0xE3ED	0x80AC	#CJK UNIFIED IDEOGRAPH
+0xE3EE	0x80DB	#CJK UNIFIED IDEOGRAPH
+0xE3EF	0x80E5	#CJK UNIFIED IDEOGRAPH
+0xE3F0	0x80D9	#CJK UNIFIED IDEOGRAPH
+0xE3F1	0x80DD	#CJK UNIFIED IDEOGRAPH
+0xE3F2	0x80C4	#CJK UNIFIED IDEOGRAPH
+0xE3F3	0x80DA	#CJK UNIFIED IDEOGRAPH
+0xE3F4	0x80D6	#CJK UNIFIED IDEOGRAPH
+0xE3F5	0x8109	#CJK UNIFIED IDEOGRAPH
+0xE3F6	0x80EF	#CJK UNIFIED IDEOGRAPH
+0xE3F7	0x80F1	#CJK UNIFIED IDEOGRAPH
+0xE3F8	0x811B	#CJK UNIFIED IDEOGRAPH
+0xE3F9	0x8129	#CJK UNIFIED IDEOGRAPH
+0xE3FA	0x8123	#CJK UNIFIED IDEOGRAPH
+0xE3FB	0x812F	#CJK UNIFIED IDEOGRAPH
+0xE3FC	0x814B	#CJK UNIFIED IDEOGRAPH
+0xE440	0x968B	#CJK UNIFIED IDEOGRAPH
+0xE441	0x8146	#CJK UNIFIED IDEOGRAPH
+0xE442	0x813E	#CJK UNIFIED IDEOGRAPH
+0xE443	0x8153	#CJK UNIFIED IDEOGRAPH
+0xE444	0x8151	#CJK UNIFIED IDEOGRAPH
+0xE445	0x80FC	#CJK UNIFIED IDEOGRAPH
+0xE446	0x8171	#CJK UNIFIED IDEOGRAPH
+0xE447	0x816E	#CJK UNIFIED IDEOGRAPH
+0xE448	0x8165	#CJK UNIFIED IDEOGRAPH
+0xE449	0x8166	#CJK UNIFIED IDEOGRAPH
+0xE44A	0x8174	#CJK UNIFIED IDEOGRAPH
+0xE44B	0x8183	#CJK UNIFIED IDEOGRAPH
+0xE44C	0x8188	#CJK UNIFIED IDEOGRAPH
+0xE44D	0x818A	#CJK UNIFIED IDEOGRAPH
+0xE44E	0x8180	#CJK UNIFIED IDEOGRAPH
+0xE44F	0x8182	#CJK UNIFIED IDEOGRAPH
+0xE450	0x81A0	#CJK UNIFIED IDEOGRAPH
+0xE451	0x8195	#CJK UNIFIED IDEOGRAPH
+0xE452	0x81A4	#CJK UNIFIED IDEOGRAPH
+0xE453	0x81A3	#CJK UNIFIED IDEOGRAPH
+0xE454	0x815F	#CJK UNIFIED IDEOGRAPH
+0xE455	0x8193	#CJK UNIFIED IDEOGRAPH
+0xE456	0x81A9	#CJK UNIFIED IDEOGRAPH
+0xE457	0x81B0	#CJK UNIFIED IDEOGRAPH
+0xE458	0x81B5	#CJK UNIFIED IDEOGRAPH
+0xE459	0x81BE	#CJK UNIFIED IDEOGRAPH
+0xE45A	0x81B8	#CJK UNIFIED IDEOGRAPH
+0xE45B	0x81BD	#CJK UNIFIED IDEOGRAPH
+0xE45C	0x81C0	#CJK UNIFIED IDEOGRAPH
+0xE45D	0x81C2	#CJK UNIFIED IDEOGRAPH
+0xE45E	0x81BA	#CJK UNIFIED IDEOGRAPH
+0xE45F	0x81C9	#CJK UNIFIED IDEOGRAPH
+0xE460	0x81CD	#CJK UNIFIED IDEOGRAPH
+0xE461	0x81D1	#CJK UNIFIED IDEOGRAPH
+0xE462	0x81D9	#CJK UNIFIED IDEOGRAPH
+0xE463	0x81D8	#CJK UNIFIED IDEOGRAPH
+0xE464	0x81C8	#CJK UNIFIED IDEOGRAPH
+0xE465	0x81DA	#CJK UNIFIED IDEOGRAPH
+0xE466	0x81DF	#CJK UNIFIED IDEOGRAPH
+0xE467	0x81E0	#CJK UNIFIED IDEOGRAPH
+0xE468	0x81E7	#CJK UNIFIED IDEOGRAPH
+0xE469	0x81FA	#CJK UNIFIED IDEOGRAPH
+0xE46A	0x81FB	#CJK UNIFIED IDEOGRAPH
+0xE46B	0x81FE	#CJK UNIFIED IDEOGRAPH
+0xE46C	0x8201	#CJK UNIFIED IDEOGRAPH
+0xE46D	0x8202	#CJK UNIFIED IDEOGRAPH
+0xE46E	0x8205	#CJK UNIFIED IDEOGRAPH
+0xE46F	0x8207	#CJK UNIFIED IDEOGRAPH
+0xE470	0x820A	#CJK UNIFIED IDEOGRAPH
+0xE471	0x820D	#CJK UNIFIED IDEOGRAPH
+0xE472	0x8210	#CJK UNIFIED IDEOGRAPH
+0xE473	0x8216	#CJK UNIFIED IDEOGRAPH
+0xE474	0x8229	#CJK UNIFIED IDEOGRAPH
+0xE475	0x822B	#CJK UNIFIED IDEOGRAPH
+0xE476	0x8238	#CJK UNIFIED IDEOGRAPH
+0xE477	0x8233	#CJK UNIFIED IDEOGRAPH
+0xE478	0x8240	#CJK UNIFIED IDEOGRAPH
+0xE479	0x8259	#CJK UNIFIED IDEOGRAPH
+0xE47A	0x8258	#CJK UNIFIED IDEOGRAPH
+0xE47B	0x825D	#CJK UNIFIED IDEOGRAPH
+0xE47C	0x825A	#CJK UNIFIED IDEOGRAPH
+0xE47D	0x825F	#CJK UNIFIED IDEOGRAPH
+0xE47E	0x8264	#CJK UNIFIED IDEOGRAPH
+0xE480	0x8262	#CJK UNIFIED IDEOGRAPH
+0xE481	0x8268	#CJK UNIFIED IDEOGRAPH
+0xE482	0x826A	#CJK UNIFIED IDEOGRAPH
+0xE483	0x826B	#CJK UNIFIED IDEOGRAPH
+0xE484	0x822E	#CJK UNIFIED IDEOGRAPH
+0xE485	0x8271	#CJK UNIFIED IDEOGRAPH
+0xE486	0x8277	#CJK UNIFIED IDEOGRAPH
+0xE487	0x8278	#CJK UNIFIED IDEOGRAPH
+0xE488	0x827E	#CJK UNIFIED IDEOGRAPH
+0xE489	0x828D	#CJK UNIFIED IDEOGRAPH
+0xE48A	0x8292	#CJK UNIFIED IDEOGRAPH
+0xE48B	0x82AB	#CJK UNIFIED IDEOGRAPH
+0xE48C	0x829F	#CJK UNIFIED IDEOGRAPH
+0xE48D	0x82BB	#CJK UNIFIED IDEOGRAPH
+0xE48E	0x82AC	#CJK UNIFIED IDEOGRAPH
+0xE48F	0x82E1	#CJK UNIFIED IDEOGRAPH
+0xE490	0x82E3	#CJK UNIFIED IDEOGRAPH
+0xE491	0x82DF	#CJK UNIFIED IDEOGRAPH
+0xE492	0x82D2	#CJK UNIFIED IDEOGRAPH
+0xE493	0x82F4	#CJK UNIFIED IDEOGRAPH
+0xE494	0x82F3	#CJK UNIFIED IDEOGRAPH
+0xE495	0x82FA	#CJK UNIFIED IDEOGRAPH
+0xE496	0x8393	#CJK UNIFIED IDEOGRAPH
+0xE497	0x8303	#CJK UNIFIED IDEOGRAPH
+0xE498	0x82FB	#CJK UNIFIED IDEOGRAPH
+0xE499	0x82F9	#CJK UNIFIED IDEOGRAPH
+0xE49A	0x82DE	#CJK UNIFIED IDEOGRAPH
+0xE49B	0x8306	#CJK UNIFIED IDEOGRAPH
+0xE49C	0x82DC	#CJK UNIFIED IDEOGRAPH
+0xE49D	0x8309	#CJK UNIFIED IDEOGRAPH
+0xE49E	0x82D9	#CJK UNIFIED IDEOGRAPH
+0xE49F	0x8335	#CJK UNIFIED IDEOGRAPH
+0xE4A0	0x8334	#CJK UNIFIED IDEOGRAPH
+0xE4A1	0x8316	#CJK UNIFIED IDEOGRAPH
+0xE4A2	0x8332	#CJK UNIFIED IDEOGRAPH
+0xE4A3	0x8331	#CJK UNIFIED IDEOGRAPH
+0xE4A4	0x8340	#CJK UNIFIED IDEOGRAPH
+0xE4A5	0x8339	#CJK UNIFIED IDEOGRAPH
+0xE4A6	0x8350	#CJK UNIFIED IDEOGRAPH
+0xE4A7	0x8345	#CJK UNIFIED IDEOGRAPH
+0xE4A8	0x832F	#CJK UNIFIED IDEOGRAPH
+0xE4A9	0x832B	#CJK UNIFIED IDEOGRAPH
+0xE4AA	0x8317	#CJK UNIFIED IDEOGRAPH
+0xE4AB	0x8318	#CJK UNIFIED IDEOGRAPH
+0xE4AC	0x8385	#CJK UNIFIED IDEOGRAPH
+0xE4AD	0x839A	#CJK UNIFIED IDEOGRAPH
+0xE4AE	0x83AA	#CJK UNIFIED IDEOGRAPH
+0xE4AF	0x839F	#CJK UNIFIED IDEOGRAPH
+0xE4B0	0x83A2	#CJK UNIFIED IDEOGRAPH
+0xE4B1	0x8396	#CJK UNIFIED IDEOGRAPH
+0xE4B2	0x8323	#CJK UNIFIED IDEOGRAPH
+0xE4B3	0x838E	#CJK UNIFIED IDEOGRAPH
+0xE4B4	0x8387	#CJK UNIFIED IDEOGRAPH
+0xE4B5	0x838A	#CJK UNIFIED IDEOGRAPH
+0xE4B6	0x837C	#CJK UNIFIED IDEOGRAPH
+0xE4B7	0x83B5	#CJK UNIFIED IDEOGRAPH
+0xE4B8	0x8373	#CJK UNIFIED IDEOGRAPH
+0xE4B9	0x8375	#CJK UNIFIED IDEOGRAPH
+0xE4BA	0x83A0	#CJK UNIFIED IDEOGRAPH
+0xE4BB	0x8389	#CJK UNIFIED IDEOGRAPH
+0xE4BC	0x83A8	#CJK UNIFIED IDEOGRAPH
+0xE4BD	0x83F4	#CJK UNIFIED IDEOGRAPH
+0xE4BE	0x8413	#CJK UNIFIED IDEOGRAPH
+0xE4BF	0x83EB	#CJK UNIFIED IDEOGRAPH
+0xE4C0	0x83CE	#CJK UNIFIED IDEOGRAPH
+0xE4C1	0x83FD	#CJK UNIFIED IDEOGRAPH
+0xE4C2	0x8403	#CJK UNIFIED IDEOGRAPH
+0xE4C3	0x83D8	#CJK UNIFIED IDEOGRAPH
+0xE4C4	0x840B	#CJK UNIFIED IDEOGRAPH
+0xE4C5	0x83C1	#CJK UNIFIED IDEOGRAPH
+0xE4C6	0x83F7	#CJK UNIFIED IDEOGRAPH
+0xE4C7	0x8407	#CJK UNIFIED IDEOGRAPH
+0xE4C8	0x83E0	#CJK UNIFIED IDEOGRAPH
+0xE4C9	0x83F2	#CJK UNIFIED IDEOGRAPH
+0xE4CA	0x840D	#CJK UNIFIED IDEOGRAPH
+0xE4CB	0x8422	#CJK UNIFIED IDEOGRAPH
+0xE4CC	0x8420	#CJK UNIFIED IDEOGRAPH
+0xE4CD	0x83BD	#CJK UNIFIED IDEOGRAPH
+0xE4CE	0x8438	#CJK UNIFIED IDEOGRAPH
+0xE4CF	0x8506	#CJK UNIFIED IDEOGRAPH
+0xE4D0	0x83FB	#CJK UNIFIED IDEOGRAPH
+0xE4D1	0x846D	#CJK UNIFIED IDEOGRAPH
+0xE4D2	0x842A	#CJK UNIFIED IDEOGRAPH
+0xE4D3	0x843C	#CJK UNIFIED IDEOGRAPH
+0xE4D4	0x855A	#CJK UNIFIED IDEOGRAPH
+0xE4D5	0x8484	#CJK UNIFIED IDEOGRAPH
+0xE4D6	0x8477	#CJK UNIFIED IDEOGRAPH
+0xE4D7	0x846B	#CJK UNIFIED IDEOGRAPH
+0xE4D8	0x84AD	#CJK UNIFIED IDEOGRAPH
+0xE4D9	0x846E	#CJK UNIFIED IDEOGRAPH
+0xE4DA	0x8482	#CJK UNIFIED IDEOGRAPH
+0xE4DB	0x8469	#CJK UNIFIED IDEOGRAPH
+0xE4DC	0x8446	#CJK UNIFIED IDEOGRAPH
+0xE4DD	0x842C	#CJK UNIFIED IDEOGRAPH
+0xE4DE	0x846F	#CJK UNIFIED IDEOGRAPH
+0xE4DF	0x8479	#CJK UNIFIED IDEOGRAPH
+0xE4E0	0x8435	#CJK UNIFIED IDEOGRAPH
+0xE4E1	0x84CA	#CJK UNIFIED IDEOGRAPH
+0xE4E2	0x8462	#CJK UNIFIED IDEOGRAPH
+0xE4E3	0x84B9	#CJK UNIFIED IDEOGRAPH
+0xE4E4	0x84BF	#CJK UNIFIED IDEOGRAPH
+0xE4E5	0x849F	#CJK UNIFIED IDEOGRAPH
+0xE4E6	0x84D9	#CJK UNIFIED IDEOGRAPH
+0xE4E7	0x84CD	#CJK UNIFIED IDEOGRAPH
+0xE4E8	0x84BB	#CJK UNIFIED IDEOGRAPH
+0xE4E9	0x84DA	#CJK UNIFIED IDEOGRAPH
+0xE4EA	0x84D0	#CJK UNIFIED IDEOGRAPH
+0xE4EB	0x84C1	#CJK UNIFIED IDEOGRAPH
+0xE4EC	0x84C6	#CJK UNIFIED IDEOGRAPH
+0xE4ED	0x84D6	#CJK UNIFIED IDEOGRAPH
+0xE4EE	0x84A1	#CJK UNIFIED IDEOGRAPH
+0xE4EF	0x8521	#CJK UNIFIED IDEOGRAPH
+0xE4F0	0x84FF	#CJK UNIFIED IDEOGRAPH
+0xE4F1	0x84F4	#CJK UNIFIED IDEOGRAPH
+0xE4F2	0x8517	#CJK UNIFIED IDEOGRAPH
+0xE4F3	0x8518	#CJK UNIFIED IDEOGRAPH
+0xE4F4	0x852C	#CJK UNIFIED IDEOGRAPH
+0xE4F5	0x851F	#CJK UNIFIED IDEOGRAPH
+0xE4F6	0x8515	#CJK UNIFIED IDEOGRAPH
+0xE4F7	0x8514	#CJK UNIFIED IDEOGRAPH
+0xE4F8	0x84FC	#CJK UNIFIED IDEOGRAPH
+0xE4F9	0x8540	#CJK UNIFIED IDEOGRAPH
+0xE4FA	0x8563	#CJK UNIFIED IDEOGRAPH
+0xE4FB	0x8558	#CJK UNIFIED IDEOGRAPH
+0xE4FC	0x8548	#CJK UNIFIED IDEOGRAPH
+0xE540	0x8541	#CJK UNIFIED IDEOGRAPH
+0xE541	0x8602	#CJK UNIFIED IDEOGRAPH
+0xE542	0x854B	#CJK UNIFIED IDEOGRAPH
+0xE543	0x8555	#CJK UNIFIED IDEOGRAPH
+0xE544	0x8580	#CJK UNIFIED IDEOGRAPH
+0xE545	0x85A4	#CJK UNIFIED IDEOGRAPH
+0xE546	0x8588	#CJK UNIFIED IDEOGRAPH
+0xE547	0x8591	#CJK UNIFIED IDEOGRAPH
+0xE548	0x858A	#CJK UNIFIED IDEOGRAPH
+0xE549	0x85A8	#CJK UNIFIED IDEOGRAPH
+0xE54A	0x856D	#CJK UNIFIED IDEOGRAPH
+0xE54B	0x8594	#CJK UNIFIED IDEOGRAPH
+0xE54C	0x859B	#CJK UNIFIED IDEOGRAPH
+0xE54D	0x85EA	#CJK UNIFIED IDEOGRAPH
+0xE54E	0x8587	#CJK UNIFIED IDEOGRAPH
+0xE54F	0x859C	#CJK UNIFIED IDEOGRAPH
+0xE550	0x8577	#CJK UNIFIED IDEOGRAPH
+0xE551	0x857E	#CJK UNIFIED IDEOGRAPH
+0xE552	0x8590	#CJK UNIFIED IDEOGRAPH
+0xE553	0x85C9	#CJK UNIFIED IDEOGRAPH
+0xE554	0x85BA	#CJK UNIFIED IDEOGRAPH
+0xE555	0x85CF	#CJK UNIFIED IDEOGRAPH
+0xE556	0x85B9	#CJK UNIFIED IDEOGRAPH
+0xE557	0x85D0	#CJK UNIFIED IDEOGRAPH
+0xE558	0x85D5	#CJK UNIFIED IDEOGRAPH
+0xE559	0x85DD	#CJK UNIFIED IDEOGRAPH
+0xE55A	0x85E5	#CJK UNIFIED IDEOGRAPH
+0xE55B	0x85DC	#CJK UNIFIED IDEOGRAPH
+0xE55C	0x85F9	#CJK UNIFIED IDEOGRAPH
+0xE55D	0x860A	#CJK UNIFIED IDEOGRAPH
+0xE55E	0x8613	#CJK UNIFIED IDEOGRAPH
+0xE55F	0x860B	#CJK UNIFIED IDEOGRAPH
+0xE560	0x85FE	#CJK UNIFIED IDEOGRAPH
+0xE561	0x85FA	#CJK UNIFIED IDEOGRAPH
+0xE562	0x8606	#CJK UNIFIED IDEOGRAPH
+0xE563	0x8622	#CJK UNIFIED IDEOGRAPH
+0xE564	0x861A	#CJK UNIFIED IDEOGRAPH
+0xE565	0x8630	#CJK UNIFIED IDEOGRAPH
+0xE566	0x863F	#CJK UNIFIED IDEOGRAPH
+0xE567	0x864D	#CJK UNIFIED IDEOGRAPH
+0xE568	0x4E55	#CJK UNIFIED IDEOGRAPH
+0xE569	0x8654	#CJK UNIFIED IDEOGRAPH
+0xE56A	0x865F	#CJK UNIFIED IDEOGRAPH
+0xE56B	0x8667	#CJK UNIFIED IDEOGRAPH
+0xE56C	0x8671	#CJK UNIFIED IDEOGRAPH
+0xE56D	0x8693	#CJK UNIFIED IDEOGRAPH
+0xE56E	0x86A3	#CJK UNIFIED IDEOGRAPH
+0xE56F	0x86A9	#CJK UNIFIED IDEOGRAPH
+0xE570	0x86AA	#CJK UNIFIED IDEOGRAPH
+0xE571	0x868B	#CJK UNIFIED IDEOGRAPH
+0xE572	0x868C	#CJK UNIFIED IDEOGRAPH
+0xE573	0x86B6	#CJK UNIFIED IDEOGRAPH
+0xE574	0x86AF	#CJK UNIFIED IDEOGRAPH
+0xE575	0x86C4	#CJK UNIFIED IDEOGRAPH
+0xE576	0x86C6	#CJK UNIFIED IDEOGRAPH
+0xE577	0x86B0	#CJK UNIFIED IDEOGRAPH
+0xE578	0x86C9	#CJK UNIFIED IDEOGRAPH
+0xE579	0x8823	#CJK UNIFIED IDEOGRAPH
+0xE57A	0x86AB	#CJK UNIFIED IDEOGRAPH
+0xE57B	0x86D4	#CJK UNIFIED IDEOGRAPH
+0xE57C	0x86DE	#CJK UNIFIED IDEOGRAPH
+0xE57D	0x86E9	#CJK UNIFIED IDEOGRAPH
+0xE57E	0x86EC	#CJK UNIFIED IDEOGRAPH
+0xE580	0x86DF	#CJK UNIFIED IDEOGRAPH
+0xE581	0x86DB	#CJK UNIFIED IDEOGRAPH
+0xE582	0x86EF	#CJK UNIFIED IDEOGRAPH
+0xE583	0x8712	#CJK UNIFIED IDEOGRAPH
+0xE584	0x8706	#CJK UNIFIED IDEOGRAPH
+0xE585	0x8708	#CJK UNIFIED IDEOGRAPH
+0xE586	0x8700	#CJK UNIFIED IDEOGRAPH
+0xE587	0x8703	#CJK UNIFIED IDEOGRAPH
+0xE588	0x86FB	#CJK UNIFIED IDEOGRAPH
+0xE589	0x8711	#CJK UNIFIED IDEOGRAPH
+0xE58A	0x8709	#CJK UNIFIED IDEOGRAPH
+0xE58B	0x870D	#CJK UNIFIED IDEOGRAPH
+0xE58C	0x86F9	#CJK UNIFIED IDEOGRAPH
+0xE58D	0x870A	#CJK UNIFIED IDEOGRAPH
+0xE58E	0x8734	#CJK UNIFIED IDEOGRAPH
+0xE58F	0x873F	#CJK UNIFIED IDEOGRAPH
+0xE590	0x8737	#CJK UNIFIED IDEOGRAPH
+0xE591	0x873B	#CJK UNIFIED IDEOGRAPH
+0xE592	0x8725	#CJK UNIFIED IDEOGRAPH
+0xE593	0x8729	#CJK UNIFIED IDEOGRAPH
+0xE594	0x871A	#CJK UNIFIED IDEOGRAPH
+0xE595	0x8760	#CJK UNIFIED IDEOGRAPH
+0xE596	0x875F	#CJK UNIFIED IDEOGRAPH
+0xE597	0x8778	#CJK UNIFIED IDEOGRAPH
+0xE598	0x874C	#CJK UNIFIED IDEOGRAPH
+0xE599	0x874E	#CJK UNIFIED IDEOGRAPH
+0xE59A	0x8774	#CJK UNIFIED IDEOGRAPH
+0xE59B	0x8757	#CJK UNIFIED IDEOGRAPH
+0xE59C	0x8768	#CJK UNIFIED IDEOGRAPH
+0xE59D	0x876E	#CJK UNIFIED IDEOGRAPH
+0xE59E	0x8759	#CJK UNIFIED IDEOGRAPH
+0xE59F	0x8753	#CJK UNIFIED IDEOGRAPH
+0xE5A0	0x8763	#CJK UNIFIED IDEOGRAPH
+0xE5A1	0x876A	#CJK UNIFIED IDEOGRAPH
+0xE5A2	0x8805	#CJK UNIFIED IDEOGRAPH
+0xE5A3	0x87A2	#CJK UNIFIED IDEOGRAPH
+0xE5A4	0x879F	#CJK UNIFIED IDEOGRAPH
+0xE5A5	0x8782	#CJK UNIFIED IDEOGRAPH
+0xE5A6	0x87AF	#CJK UNIFIED IDEOGRAPH
+0xE5A7	0x87CB	#CJK UNIFIED IDEOGRAPH
+0xE5A8	0x87BD	#CJK UNIFIED IDEOGRAPH
+0xE5A9	0x87C0	#CJK UNIFIED IDEOGRAPH
+0xE5AA	0x87D0	#CJK UNIFIED IDEOGRAPH
+0xE5AB	0x96D6	#CJK UNIFIED IDEOGRAPH
+0xE5AC	0x87AB	#CJK UNIFIED IDEOGRAPH
+0xE5AD	0x87C4	#CJK UNIFIED IDEOGRAPH
+0xE5AE	0x87B3	#CJK UNIFIED IDEOGRAPH
+0xE5AF	0x87C7	#CJK UNIFIED IDEOGRAPH
+0xE5B0	0x87C6	#CJK UNIFIED IDEOGRAPH
+0xE5B1	0x87BB	#CJK UNIFIED IDEOGRAPH
+0xE5B2	0x87EF	#CJK UNIFIED IDEOGRAPH
+0xE5B3	0x87F2	#CJK UNIFIED IDEOGRAPH
+0xE5B4	0x87E0	#CJK UNIFIED IDEOGRAPH
+0xE5B5	0x880F	#CJK UNIFIED IDEOGRAPH
+0xE5B6	0x880D	#CJK UNIFIED IDEOGRAPH
+0xE5B7	0x87FE	#CJK UNIFIED IDEOGRAPH
+0xE5B8	0x87F6	#CJK UNIFIED IDEOGRAPH
+0xE5B9	0x87F7	#CJK UNIFIED IDEOGRAPH
+0xE5BA	0x880E	#CJK UNIFIED IDEOGRAPH
+0xE5BB	0x87D2	#CJK UNIFIED IDEOGRAPH
+0xE5BC	0x8811	#CJK UNIFIED IDEOGRAPH
+0xE5BD	0x8816	#CJK UNIFIED IDEOGRAPH
+0xE5BE	0x8815	#CJK UNIFIED IDEOGRAPH
+0xE5BF	0x8822	#CJK UNIFIED IDEOGRAPH
+0xE5C0	0x8821	#CJK UNIFIED IDEOGRAPH
+0xE5C1	0x8831	#CJK UNIFIED IDEOGRAPH
+0xE5C2	0x8836	#CJK UNIFIED IDEOGRAPH
+0xE5C3	0x8839	#CJK UNIFIED IDEOGRAPH
+0xE5C4	0x8827	#CJK UNIFIED IDEOGRAPH
+0xE5C5	0x883B	#CJK UNIFIED IDEOGRAPH
+0xE5C6	0x8844	#CJK UNIFIED IDEOGRAPH
+0xE5C7	0x8842	#CJK UNIFIED IDEOGRAPH
+0xE5C8	0x8852	#CJK UNIFIED IDEOGRAPH
+0xE5C9	0x8859	#CJK UNIFIED IDEOGRAPH
+0xE5CA	0x885E	#CJK UNIFIED IDEOGRAPH
+0xE5CB	0x8862	#CJK UNIFIED IDEOGRAPH
+0xE5CC	0x886B	#CJK UNIFIED IDEOGRAPH
+0xE5CD	0x8881	#CJK UNIFIED IDEOGRAPH
+0xE5CE	0x887E	#CJK UNIFIED IDEOGRAPH
+0xE5CF	0x889E	#CJK UNIFIED IDEOGRAPH
+0xE5D0	0x8875	#CJK UNIFIED IDEOGRAPH
+0xE5D1	0x887D	#CJK UNIFIED IDEOGRAPH
+0xE5D2	0x88B5	#CJK UNIFIED IDEOGRAPH
+0xE5D3	0x8872	#CJK UNIFIED IDEOGRAPH
+0xE5D4	0x8882	#CJK UNIFIED IDEOGRAPH
+0xE5D5	0x8897	#CJK UNIFIED IDEOGRAPH
+0xE5D6	0x8892	#CJK UNIFIED IDEOGRAPH
+0xE5D7	0x88AE	#CJK UNIFIED IDEOGRAPH
+0xE5D8	0x8899	#CJK UNIFIED IDEOGRAPH
+0xE5D9	0x88A2	#CJK UNIFIED IDEOGRAPH
+0xE5DA	0x888D	#CJK UNIFIED IDEOGRAPH
+0xE5DB	0x88A4	#CJK UNIFIED IDEOGRAPH
+0xE5DC	0x88B0	#CJK UNIFIED IDEOGRAPH
+0xE5DD	0x88BF	#CJK UNIFIED IDEOGRAPH
+0xE5DE	0x88B1	#CJK UNIFIED IDEOGRAPH
+0xE5DF	0x88C3	#CJK UNIFIED IDEOGRAPH
+0xE5E0	0x88C4	#CJK UNIFIED IDEOGRAPH
+0xE5E1	0x88D4	#CJK UNIFIED IDEOGRAPH
+0xE5E2	0x88D8	#CJK UNIFIED IDEOGRAPH
+0xE5E3	0x88D9	#CJK UNIFIED IDEOGRAPH
+0xE5E4	0x88DD	#CJK UNIFIED IDEOGRAPH
+0xE5E5	0x88F9	#CJK UNIFIED IDEOGRAPH
+0xE5E6	0x8902	#CJK UNIFIED IDEOGRAPH
+0xE5E7	0x88FC	#CJK UNIFIED IDEOGRAPH
+0xE5E8	0x88F4	#CJK UNIFIED IDEOGRAPH
+0xE5E9	0x88E8	#CJK UNIFIED IDEOGRAPH
+0xE5EA	0x88F2	#CJK UNIFIED IDEOGRAPH
+0xE5EB	0x8904	#CJK UNIFIED IDEOGRAPH
+0xE5EC	0x890C	#CJK UNIFIED IDEOGRAPH
+0xE5ED	0x890A	#CJK UNIFIED IDEOGRAPH
+0xE5EE	0x8913	#CJK UNIFIED IDEOGRAPH
+0xE5EF	0x8943	#CJK UNIFIED IDEOGRAPH
+0xE5F0	0x891E	#CJK UNIFIED IDEOGRAPH
+0xE5F1	0x8925	#CJK UNIFIED IDEOGRAPH
+0xE5F2	0x892A	#CJK UNIFIED IDEOGRAPH
+0xE5F3	0x892B	#CJK UNIFIED IDEOGRAPH
+0xE5F4	0x8941	#CJK UNIFIED IDEOGRAPH
+0xE5F5	0x8944	#CJK UNIFIED IDEOGRAPH
+0xE5F6	0x893B	#CJK UNIFIED IDEOGRAPH
+0xE5F7	0x8936	#CJK UNIFIED IDEOGRAPH
+0xE5F8	0x8938	#CJK UNIFIED IDEOGRAPH
+0xE5F9	0x894C	#CJK UNIFIED IDEOGRAPH
+0xE5FA	0x891D	#CJK UNIFIED IDEOGRAPH
+0xE5FB	0x8960	#CJK UNIFIED IDEOGRAPH
+0xE5FC	0x895E	#CJK UNIFIED IDEOGRAPH
+0xE640	0x8966	#CJK UNIFIED IDEOGRAPH
+0xE641	0x8964	#CJK UNIFIED IDEOGRAPH
+0xE642	0x896D	#CJK UNIFIED IDEOGRAPH
+0xE643	0x896A	#CJK UNIFIED IDEOGRAPH
+0xE644	0x896F	#CJK UNIFIED IDEOGRAPH
+0xE645	0x8974	#CJK UNIFIED IDEOGRAPH
+0xE646	0x8977	#CJK UNIFIED IDEOGRAPH
+0xE647	0x897E	#CJK UNIFIED IDEOGRAPH
+0xE648	0x8983	#CJK UNIFIED IDEOGRAPH
+0xE649	0x8988	#CJK UNIFIED IDEOGRAPH
+0xE64A	0x898A	#CJK UNIFIED IDEOGRAPH
+0xE64B	0x8993	#CJK UNIFIED IDEOGRAPH
+0xE64C	0x8998	#CJK UNIFIED IDEOGRAPH
+0xE64D	0x89A1	#CJK UNIFIED IDEOGRAPH
+0xE64E	0x89A9	#CJK UNIFIED IDEOGRAPH
+0xE64F	0x89A6	#CJK UNIFIED IDEOGRAPH
+0xE650	0x89AC	#CJK UNIFIED IDEOGRAPH
+0xE651	0x89AF	#CJK UNIFIED IDEOGRAPH
+0xE652	0x89B2	#CJK UNIFIED IDEOGRAPH
+0xE653	0x89BA	#CJK UNIFIED IDEOGRAPH
+0xE654	0x89BD	#CJK UNIFIED IDEOGRAPH
+0xE655	0x89BF	#CJK UNIFIED IDEOGRAPH
+0xE656	0x89C0	#CJK UNIFIED IDEOGRAPH
+0xE657	0x89DA	#CJK UNIFIED IDEOGRAPH
+0xE658	0x89DC	#CJK UNIFIED IDEOGRAPH
+0xE659	0x89DD	#CJK UNIFIED IDEOGRAPH
+0xE65A	0x89E7	#CJK UNIFIED IDEOGRAPH
+0xE65B	0x89F4	#CJK UNIFIED IDEOGRAPH
+0xE65C	0x89F8	#CJK UNIFIED IDEOGRAPH
+0xE65D	0x8A03	#CJK UNIFIED IDEOGRAPH
+0xE65E	0x8A16	#CJK UNIFIED IDEOGRAPH
+0xE65F	0x8A10	#CJK UNIFIED IDEOGRAPH
+0xE660	0x8A0C	#CJK UNIFIED IDEOGRAPH
+0xE661	0x8A1B	#CJK UNIFIED IDEOGRAPH
+0xE662	0x8A1D	#CJK UNIFIED IDEOGRAPH
+0xE663	0x8A25	#CJK UNIFIED IDEOGRAPH
+0xE664	0x8A36	#CJK UNIFIED IDEOGRAPH
+0xE665	0x8A41	#CJK UNIFIED IDEOGRAPH
+0xE666	0x8A5B	#CJK UNIFIED IDEOGRAPH
+0xE667	0x8A52	#CJK UNIFIED IDEOGRAPH
+0xE668	0x8A46	#CJK UNIFIED IDEOGRAPH
+0xE669	0x8A48	#CJK UNIFIED IDEOGRAPH
+0xE66A	0x8A7C	#CJK UNIFIED IDEOGRAPH
+0xE66B	0x8A6D	#CJK UNIFIED IDEOGRAPH
+0xE66C	0x8A6C	#CJK UNIFIED IDEOGRAPH
+0xE66D	0x8A62	#CJK UNIFIED IDEOGRAPH
+0xE66E	0x8A85	#CJK UNIFIED IDEOGRAPH
+0xE66F	0x8A82	#CJK UNIFIED IDEOGRAPH
+0xE670	0x8A84	#CJK UNIFIED IDEOGRAPH
+0xE671	0x8AA8	#CJK UNIFIED IDEOGRAPH
+0xE672	0x8AA1	#CJK UNIFIED IDEOGRAPH
+0xE673	0x8A91	#CJK UNIFIED IDEOGRAPH
+0xE674	0x8AA5	#CJK UNIFIED IDEOGRAPH
+0xE675	0x8AA6	#CJK UNIFIED IDEOGRAPH
+0xE676	0x8A9A	#CJK UNIFIED IDEOGRAPH
+0xE677	0x8AA3	#CJK UNIFIED IDEOGRAPH
+0xE678	0x8AC4	#CJK UNIFIED IDEOGRAPH
+0xE679	0x8ACD	#CJK UNIFIED IDEOGRAPH
+0xE67A	0x8AC2	#CJK UNIFIED IDEOGRAPH
+0xE67B	0x8ADA	#CJK UNIFIED IDEOGRAPH
+0xE67C	0x8AEB	#CJK UNIFIED IDEOGRAPH
+0xE67D	0x8AF3	#CJK UNIFIED IDEOGRAPH
+0xE67E	0x8AE7	#CJK UNIFIED IDEOGRAPH
+0xE680	0x8AE4	#CJK UNIFIED IDEOGRAPH
+0xE681	0x8AF1	#CJK UNIFIED IDEOGRAPH
+0xE682	0x8B14	#CJK UNIFIED IDEOGRAPH
+0xE683	0x8AE0	#CJK UNIFIED IDEOGRAPH
+0xE684	0x8AE2	#CJK UNIFIED IDEOGRAPH
+0xE685	0x8AF7	#CJK UNIFIED IDEOGRAPH
+0xE686	0x8ADE	#CJK UNIFIED IDEOGRAPH
+0xE687	0x8ADB	#CJK UNIFIED IDEOGRAPH
+0xE688	0x8B0C	#CJK UNIFIED IDEOGRAPH
+0xE689	0x8B07	#CJK UNIFIED IDEOGRAPH
+0xE68A	0x8B1A	#CJK UNIFIED IDEOGRAPH
+0xE68B	0x8AE1	#CJK UNIFIED IDEOGRAPH
+0xE68C	0x8B16	#CJK UNIFIED IDEOGRAPH
+0xE68D	0x8B10	#CJK UNIFIED IDEOGRAPH
+0xE68E	0x8B17	#CJK UNIFIED IDEOGRAPH
+0xE68F	0x8B20	#CJK UNIFIED IDEOGRAPH
+0xE690	0x8B33	#CJK UNIFIED IDEOGRAPH
+0xE691	0x97AB	#CJK UNIFIED IDEOGRAPH
+0xE692	0x8B26	#CJK UNIFIED IDEOGRAPH
+0xE693	0x8B2B	#CJK UNIFIED IDEOGRAPH
+0xE694	0x8B3E	#CJK UNIFIED IDEOGRAPH
+0xE695	0x8B28	#CJK UNIFIED IDEOGRAPH
+0xE696	0x8B41	#CJK UNIFIED IDEOGRAPH
+0xE697	0x8B4C	#CJK UNIFIED IDEOGRAPH
+0xE698	0x8B4F	#CJK UNIFIED IDEOGRAPH
+0xE699	0x8B4E	#CJK UNIFIED IDEOGRAPH
+0xE69A	0x8B49	#CJK UNIFIED IDEOGRAPH
+0xE69B	0x8B56	#CJK UNIFIED IDEOGRAPH
+0xE69C	0x8B5B	#CJK UNIFIED IDEOGRAPH
+0xE69D	0x8B5A	#CJK UNIFIED IDEOGRAPH
+0xE69E	0x8B6B	#CJK UNIFIED IDEOGRAPH
+0xE69F	0x8B5F	#CJK UNIFIED IDEOGRAPH
+0xE6A0	0x8B6C	#CJK UNIFIED IDEOGRAPH
+0xE6A1	0x8B6F	#CJK UNIFIED IDEOGRAPH
+0xE6A2	0x8B74	#CJK UNIFIED IDEOGRAPH
+0xE6A3	0x8B7D	#CJK UNIFIED IDEOGRAPH
+0xE6A4	0x8B80	#CJK UNIFIED IDEOGRAPH
+0xE6A5	0x8B8C	#CJK UNIFIED IDEOGRAPH
+0xE6A6	0x8B8E	#CJK UNIFIED IDEOGRAPH
+0xE6A7	0x8B92	#CJK UNIFIED IDEOGRAPH
+0xE6A8	0x8B93	#CJK UNIFIED IDEOGRAPH
+0xE6A9	0x8B96	#CJK UNIFIED IDEOGRAPH
+0xE6AA	0x8B99	#CJK UNIFIED IDEOGRAPH
+0xE6AB	0x8B9A	#CJK UNIFIED IDEOGRAPH
+0xE6AC	0x8C3A	#CJK UNIFIED IDEOGRAPH
+0xE6AD	0x8C41	#CJK UNIFIED IDEOGRAPH
+0xE6AE	0x8C3F	#CJK UNIFIED IDEOGRAPH
+0xE6AF	0x8C48	#CJK UNIFIED IDEOGRAPH
+0xE6B0	0x8C4C	#CJK UNIFIED IDEOGRAPH
+0xE6B1	0x8C4E	#CJK UNIFIED IDEOGRAPH
+0xE6B2	0x8C50	#CJK UNIFIED IDEOGRAPH
+0xE6B3	0x8C55	#CJK UNIFIED IDEOGRAPH
+0xE6B4	0x8C62	#CJK UNIFIED IDEOGRAPH
+0xE6B5	0x8C6C	#CJK UNIFIED IDEOGRAPH
+0xE6B6	0x8C78	#CJK UNIFIED IDEOGRAPH
+0xE6B7	0x8C7A	#CJK UNIFIED IDEOGRAPH
+0xE6B8	0x8C82	#CJK UNIFIED IDEOGRAPH
+0xE6B9	0x8C89	#CJK UNIFIED IDEOGRAPH
+0xE6BA	0x8C85	#CJK UNIFIED IDEOGRAPH
+0xE6BB	0x8C8A	#CJK UNIFIED IDEOGRAPH
+0xE6BC	0x8C8D	#CJK UNIFIED IDEOGRAPH
+0xE6BD	0x8C8E	#CJK UNIFIED IDEOGRAPH
+0xE6BE	0x8C94	#CJK UNIFIED IDEOGRAPH
+0xE6BF	0x8C7C	#CJK UNIFIED IDEOGRAPH
+0xE6C0	0x8C98	#CJK UNIFIED IDEOGRAPH
+0xE6C1	0x621D	#CJK UNIFIED IDEOGRAPH
+0xE6C2	0x8CAD	#CJK UNIFIED IDEOGRAPH
+0xE6C3	0x8CAA	#CJK UNIFIED IDEOGRAPH
+0xE6C4	0x8CBD	#CJK UNIFIED IDEOGRAPH
+0xE6C5	0x8CB2	#CJK UNIFIED IDEOGRAPH
+0xE6C6	0x8CB3	#CJK UNIFIED IDEOGRAPH
+0xE6C7	0x8CAE	#CJK UNIFIED IDEOGRAPH
+0xE6C8	0x8CB6	#CJK UNIFIED IDEOGRAPH
+0xE6C9	0x8CC8	#CJK UNIFIED IDEOGRAPH
+0xE6CA	0x8CC1	#CJK UNIFIED IDEOGRAPH
+0xE6CB	0x8CE4	#CJK UNIFIED IDEOGRAPH
+0xE6CC	0x8CE3	#CJK UNIFIED IDEOGRAPH
+0xE6CD	0x8CDA	#CJK UNIFIED IDEOGRAPH
+0xE6CE	0x8CFD	#CJK UNIFIED IDEOGRAPH
+0xE6CF	0x8CFA	#CJK UNIFIED IDEOGRAPH
+0xE6D0	0x8CFB	#CJK UNIFIED IDEOGRAPH
+0xE6D1	0x8D04	#CJK UNIFIED IDEOGRAPH
+0xE6D2	0x8D05	#CJK UNIFIED IDEOGRAPH
+0xE6D3	0x8D0A	#CJK UNIFIED IDEOGRAPH
+0xE6D4	0x8D07	#CJK UNIFIED IDEOGRAPH
+0xE6D5	0x8D0F	#CJK UNIFIED IDEOGRAPH
+0xE6D6	0x8D0D	#CJK UNIFIED IDEOGRAPH
+0xE6D7	0x8D10	#CJK UNIFIED IDEOGRAPH
+0xE6D8	0x9F4E	#CJK UNIFIED IDEOGRAPH
+0xE6D9	0x8D13	#CJK UNIFIED IDEOGRAPH
+0xE6DA	0x8CCD	#CJK UNIFIED IDEOGRAPH
+0xE6DB	0x8D14	#CJK UNIFIED IDEOGRAPH
+0xE6DC	0x8D16	#CJK UNIFIED IDEOGRAPH
+0xE6DD	0x8D67	#CJK UNIFIED IDEOGRAPH
+0xE6DE	0x8D6D	#CJK UNIFIED IDEOGRAPH
+0xE6DF	0x8D71	#CJK UNIFIED IDEOGRAPH
+0xE6E0	0x8D73	#CJK UNIFIED IDEOGRAPH
+0xE6E1	0x8D81	#CJK UNIFIED IDEOGRAPH
+0xE6E2	0x8D99	#CJK UNIFIED IDEOGRAPH
+0xE6E3	0x8DC2	#CJK UNIFIED IDEOGRAPH
+0xE6E4	0x8DBE	#CJK UNIFIED IDEOGRAPH
+0xE6E5	0x8DBA	#CJK UNIFIED IDEOGRAPH
+0xE6E6	0x8DCF	#CJK UNIFIED IDEOGRAPH
+0xE6E7	0x8DDA	#CJK UNIFIED IDEOGRAPH
+0xE6E8	0x8DD6	#CJK UNIFIED IDEOGRAPH
+0xE6E9	0x8DCC	#CJK UNIFIED IDEOGRAPH
+0xE6EA	0x8DDB	#CJK UNIFIED IDEOGRAPH
+0xE6EB	0x8DCB	#CJK UNIFIED IDEOGRAPH
+0xE6EC	0x8DEA	#CJK UNIFIED IDEOGRAPH
+0xE6ED	0x8DEB	#CJK UNIFIED IDEOGRAPH
+0xE6EE	0x8DDF	#CJK UNIFIED IDEOGRAPH
+0xE6EF	0x8DE3	#CJK UNIFIED IDEOGRAPH
+0xE6F0	0x8DFC	#CJK UNIFIED IDEOGRAPH
+0xE6F1	0x8E08	#CJK UNIFIED IDEOGRAPH
+0xE6F2	0x8E09	#CJK UNIFIED IDEOGRAPH
+0xE6F3	0x8DFF	#CJK UNIFIED IDEOGRAPH
+0xE6F4	0x8E1D	#CJK UNIFIED IDEOGRAPH
+0xE6F5	0x8E1E	#CJK UNIFIED IDEOGRAPH
+0xE6F6	0x8E10	#CJK UNIFIED IDEOGRAPH
+0xE6F7	0x8E1F	#CJK UNIFIED IDEOGRAPH
+0xE6F8	0x8E42	#CJK UNIFIED IDEOGRAPH
+0xE6F9	0x8E35	#CJK UNIFIED IDEOGRAPH
+0xE6FA	0x8E30	#CJK UNIFIED IDEOGRAPH
+0xE6FB	0x8E34	#CJK UNIFIED IDEOGRAPH
+0xE6FC	0x8E4A	#CJK UNIFIED IDEOGRAPH
+0xE740	0x8E47	#CJK UNIFIED IDEOGRAPH
+0xE741	0x8E49	#CJK UNIFIED IDEOGRAPH
+0xE742	0x8E4C	#CJK UNIFIED IDEOGRAPH
+0xE743	0x8E50	#CJK UNIFIED IDEOGRAPH
+0xE744	0x8E48	#CJK UNIFIED IDEOGRAPH
+0xE745	0x8E59	#CJK UNIFIED IDEOGRAPH
+0xE746	0x8E64	#CJK UNIFIED IDEOGRAPH
+0xE747	0x8E60	#CJK UNIFIED IDEOGRAPH
+0xE748	0x8E2A	#CJK UNIFIED IDEOGRAPH
+0xE749	0x8E63	#CJK UNIFIED IDEOGRAPH
+0xE74A	0x8E55	#CJK UNIFIED IDEOGRAPH
+0xE74B	0x8E76	#CJK UNIFIED IDEOGRAPH
+0xE74C	0x8E72	#CJK UNIFIED IDEOGRAPH
+0xE74D	0x8E7C	#CJK UNIFIED IDEOGRAPH
+0xE74E	0x8E81	#CJK UNIFIED IDEOGRAPH
+0xE74F	0x8E87	#CJK UNIFIED IDEOGRAPH
+0xE750	0x8E85	#CJK UNIFIED IDEOGRAPH
+0xE751	0x8E84	#CJK UNIFIED IDEOGRAPH
+0xE752	0x8E8B	#CJK UNIFIED IDEOGRAPH
+0xE753	0x8E8A	#CJK UNIFIED IDEOGRAPH
+0xE754	0x8E93	#CJK UNIFIED IDEOGRAPH
+0xE755	0x8E91	#CJK UNIFIED IDEOGRAPH
+0xE756	0x8E94	#CJK UNIFIED IDEOGRAPH
+0xE757	0x8E99	#CJK UNIFIED IDEOGRAPH
+0xE758	0x8EAA	#CJK UNIFIED IDEOGRAPH
+0xE759	0x8EA1	#CJK UNIFIED IDEOGRAPH
+0xE75A	0x8EAC	#CJK UNIFIED IDEOGRAPH
+0xE75B	0x8EB0	#CJK UNIFIED IDEOGRAPH
+0xE75C	0x8EC6	#CJK UNIFIED IDEOGRAPH
+0xE75D	0x8EB1	#CJK UNIFIED IDEOGRAPH
+0xE75E	0x8EBE	#CJK UNIFIED IDEOGRAPH
+0xE75F	0x8EC5	#CJK UNIFIED IDEOGRAPH
+0xE760	0x8EC8	#CJK UNIFIED IDEOGRAPH
+0xE761	0x8ECB	#CJK UNIFIED IDEOGRAPH
+0xE762	0x8EDB	#CJK UNIFIED IDEOGRAPH
+0xE763	0x8EE3	#CJK UNIFIED IDEOGRAPH
+0xE764	0x8EFC	#CJK UNIFIED IDEOGRAPH
+0xE765	0x8EFB	#CJK UNIFIED IDEOGRAPH
+0xE766	0x8EEB	#CJK UNIFIED IDEOGRAPH
+0xE767	0x8EFE	#CJK UNIFIED IDEOGRAPH
+0xE768	0x8F0A	#CJK UNIFIED IDEOGRAPH
+0xE769	0x8F05	#CJK UNIFIED IDEOGRAPH
+0xE76A	0x8F15	#CJK UNIFIED IDEOGRAPH
+0xE76B	0x8F12	#CJK UNIFIED IDEOGRAPH
+0xE76C	0x8F19	#CJK UNIFIED IDEOGRAPH
+0xE76D	0x8F13	#CJK UNIFIED IDEOGRAPH
+0xE76E	0x8F1C	#CJK UNIFIED IDEOGRAPH
+0xE76F	0x8F1F	#CJK UNIFIED IDEOGRAPH
+0xE770	0x8F1B	#CJK UNIFIED IDEOGRAPH
+0xE771	0x8F0C	#CJK UNIFIED IDEOGRAPH
+0xE772	0x8F26	#CJK UNIFIED IDEOGRAPH
+0xE773	0x8F33	#CJK UNIFIED IDEOGRAPH
+0xE774	0x8F3B	#CJK UNIFIED IDEOGRAPH
+0xE775	0x8F39	#CJK UNIFIED IDEOGRAPH
+0xE776	0x8F45	#CJK UNIFIED IDEOGRAPH
+0xE777	0x8F42	#CJK UNIFIED IDEOGRAPH
+0xE778	0x8F3E	#CJK UNIFIED IDEOGRAPH
+0xE779	0x8F4C	#CJK UNIFIED IDEOGRAPH
+0xE77A	0x8F49	#CJK UNIFIED IDEOGRAPH
+0xE77B	0x8F46	#CJK UNIFIED IDEOGRAPH
+0xE77C	0x8F4E	#CJK UNIFIED IDEOGRAPH
+0xE77D	0x8F57	#CJK UNIFIED IDEOGRAPH
+0xE77E	0x8F5C	#CJK UNIFIED IDEOGRAPH
+0xE780	0x8F62	#CJK UNIFIED IDEOGRAPH
+0xE781	0x8F63	#CJK UNIFIED IDEOGRAPH
+0xE782	0x8F64	#CJK UNIFIED IDEOGRAPH
+0xE783	0x8F9C	#CJK UNIFIED IDEOGRAPH
+0xE784	0x8F9F	#CJK UNIFIED IDEOGRAPH
+0xE785	0x8FA3	#CJK UNIFIED IDEOGRAPH
+0xE786	0x8FAD	#CJK UNIFIED IDEOGRAPH
+0xE787	0x8FAF	#CJK UNIFIED IDEOGRAPH
+0xE788	0x8FB7	#CJK UNIFIED IDEOGRAPH
+0xE789	0x8FDA	#CJK UNIFIED IDEOGRAPH
+0xE78A	0x8FE5	#CJK UNIFIED IDEOGRAPH
+0xE78B	0x8FE2	#CJK UNIFIED IDEOGRAPH
+0xE78C	0x8FEA	#CJK UNIFIED IDEOGRAPH
+0xE78D	0x8FEF	#CJK UNIFIED IDEOGRAPH
+0xE78E	0x9087	#CJK UNIFIED IDEOGRAPH
+0xE78F	0x8FF4	#CJK UNIFIED IDEOGRAPH
+0xE790	0x9005	#CJK UNIFIED IDEOGRAPH
+0xE791	0x8FF9	#CJK UNIFIED IDEOGRAPH
+0xE792	0x8FFA	#CJK UNIFIED IDEOGRAPH
+0xE793	0x9011	#CJK UNIFIED IDEOGRAPH
+0xE794	0x9015	#CJK UNIFIED IDEOGRAPH
+0xE795	0x9021	#CJK UNIFIED IDEOGRAPH
+0xE796	0x900D	#CJK UNIFIED IDEOGRAPH
+0xE797	0x901E	#CJK UNIFIED IDEOGRAPH
+0xE798	0x9016	#CJK UNIFIED IDEOGRAPH
+0xE799	0x900B	#CJK UNIFIED IDEOGRAPH
+0xE79A	0x9027	#CJK UNIFIED IDEOGRAPH
+0xE79B	0x9036	#CJK UNIFIED IDEOGRAPH
+0xE79C	0x9035	#CJK UNIFIED IDEOGRAPH
+0xE79D	0x9039	#CJK UNIFIED IDEOGRAPH
+0xE79E	0x8FF8	#CJK UNIFIED IDEOGRAPH
+0xE79F	0x904F	#CJK UNIFIED IDEOGRAPH
+0xE7A0	0x9050	#CJK UNIFIED IDEOGRAPH
+0xE7A1	0x9051	#CJK UNIFIED IDEOGRAPH
+0xE7A2	0x9052	#CJK UNIFIED IDEOGRAPH
+0xE7A3	0x900E	#CJK UNIFIED IDEOGRAPH
+0xE7A4	0x9049	#CJK UNIFIED IDEOGRAPH
+0xE7A5	0x903E	#CJK UNIFIED IDEOGRAPH
+0xE7A6	0x9056	#CJK UNIFIED IDEOGRAPH
+0xE7A7	0x9058	#CJK UNIFIED IDEOGRAPH
+0xE7A8	0x905E	#CJK UNIFIED IDEOGRAPH
+0xE7A9	0x9068	#CJK UNIFIED IDEOGRAPH
+0xE7AA	0x906F	#CJK UNIFIED IDEOGRAPH
+0xE7AB	0x9076	#CJK UNIFIED IDEOGRAPH
+0xE7AC	0x96A8	#CJK UNIFIED IDEOGRAPH
+0xE7AD	0x9072	#CJK UNIFIED IDEOGRAPH
+0xE7AE	0x9082	#CJK UNIFIED IDEOGRAPH
+0xE7AF	0x907D	#CJK UNIFIED IDEOGRAPH
+0xE7B0	0x9081	#CJK UNIFIED IDEOGRAPH
+0xE7B1	0x9080	#CJK UNIFIED IDEOGRAPH
+0xE7B2	0x908A	#CJK UNIFIED IDEOGRAPH
+0xE7B3	0x9089	#CJK UNIFIED IDEOGRAPH
+0xE7B4	0x908F	#CJK UNIFIED IDEOGRAPH
+0xE7B5	0x90A8	#CJK UNIFIED IDEOGRAPH
+0xE7B6	0x90AF	#CJK UNIFIED IDEOGRAPH
+0xE7B7	0x90B1	#CJK UNIFIED IDEOGRAPH
+0xE7B8	0x90B5	#CJK UNIFIED IDEOGRAPH
+0xE7B9	0x90E2	#CJK UNIFIED IDEOGRAPH
+0xE7BA	0x90E4	#CJK UNIFIED IDEOGRAPH
+0xE7BB	0x6248	#CJK UNIFIED IDEOGRAPH
+0xE7BC	0x90DB	#CJK UNIFIED IDEOGRAPH
+0xE7BD	0x9102	#CJK UNIFIED IDEOGRAPH
+0xE7BE	0x9112	#CJK UNIFIED IDEOGRAPH
+0xE7BF	0x9119	#CJK UNIFIED IDEOGRAPH
+0xE7C0	0x9132	#CJK UNIFIED IDEOGRAPH
+0xE7C1	0x9130	#CJK UNIFIED IDEOGRAPH
+0xE7C2	0x914A	#CJK UNIFIED IDEOGRAPH
+0xE7C3	0x9156	#CJK UNIFIED IDEOGRAPH
+0xE7C4	0x9158	#CJK UNIFIED IDEOGRAPH
+0xE7C5	0x9163	#CJK UNIFIED IDEOGRAPH
+0xE7C6	0x9165	#CJK UNIFIED IDEOGRAPH
+0xE7C7	0x9169	#CJK UNIFIED IDEOGRAPH
+0xE7C8	0x9173	#CJK UNIFIED IDEOGRAPH
+0xE7C9	0x9172	#CJK UNIFIED IDEOGRAPH
+0xE7CA	0x918B	#CJK UNIFIED IDEOGRAPH
+0xE7CB	0x9189	#CJK UNIFIED IDEOGRAPH
+0xE7CC	0x9182	#CJK UNIFIED IDEOGRAPH
+0xE7CD	0x91A2	#CJK UNIFIED IDEOGRAPH
+0xE7CE	0x91AB	#CJK UNIFIED IDEOGRAPH
+0xE7CF	0x91AF	#CJK UNIFIED IDEOGRAPH
+0xE7D0	0x91AA	#CJK UNIFIED IDEOGRAPH
+0xE7D1	0x91B5	#CJK UNIFIED IDEOGRAPH
+0xE7D2	0x91B4	#CJK UNIFIED IDEOGRAPH
+0xE7D3	0x91BA	#CJK UNIFIED IDEOGRAPH
+0xE7D4	0x91C0	#CJK UNIFIED IDEOGRAPH
+0xE7D5	0x91C1	#CJK UNIFIED IDEOGRAPH
+0xE7D6	0x91C9	#CJK UNIFIED IDEOGRAPH
+0xE7D7	0x91CB	#CJK UNIFIED IDEOGRAPH
+0xE7D8	0x91D0	#CJK UNIFIED IDEOGRAPH
+0xE7D9	0x91D6	#CJK UNIFIED IDEOGRAPH
+0xE7DA	0x91DF	#CJK UNIFIED IDEOGRAPH
+0xE7DB	0x91E1	#CJK UNIFIED IDEOGRAPH
+0xE7DC	0x91DB	#CJK UNIFIED IDEOGRAPH
+0xE7DD	0x91FC	#CJK UNIFIED IDEOGRAPH
+0xE7DE	0x91F5	#CJK UNIFIED IDEOGRAPH
+0xE7DF	0x91F6	#CJK UNIFIED IDEOGRAPH
+0xE7E0	0x921E	#CJK UNIFIED IDEOGRAPH
+0xE7E1	0x91FF	#CJK UNIFIED IDEOGRAPH
+0xE7E2	0x9214	#CJK UNIFIED IDEOGRAPH
+0xE7E3	0x922C	#CJK UNIFIED IDEOGRAPH
+0xE7E4	0x9215	#CJK UNIFIED IDEOGRAPH
+0xE7E5	0x9211	#CJK UNIFIED IDEOGRAPH
+0xE7E6	0x925E	#CJK UNIFIED IDEOGRAPH
+0xE7E7	0x9257	#CJK UNIFIED IDEOGRAPH
+0xE7E8	0x9245	#CJK UNIFIED IDEOGRAPH
+0xE7E9	0x9249	#CJK UNIFIED IDEOGRAPH
+0xE7EA	0x9264	#CJK UNIFIED IDEOGRAPH
+0xE7EB	0x9248	#CJK UNIFIED IDEOGRAPH
+0xE7EC	0x9295	#CJK UNIFIED IDEOGRAPH
+0xE7ED	0x923F	#CJK UNIFIED IDEOGRAPH
+0xE7EE	0x924B	#CJK UNIFIED IDEOGRAPH
+0xE7EF	0x9250	#CJK UNIFIED IDEOGRAPH
+0xE7F0	0x929C	#CJK UNIFIED IDEOGRAPH
+0xE7F1	0x9296	#CJK UNIFIED IDEOGRAPH
+0xE7F2	0x9293	#CJK UNIFIED IDEOGRAPH
+0xE7F3	0x929B	#CJK UNIFIED IDEOGRAPH
+0xE7F4	0x925A	#CJK UNIFIED IDEOGRAPH
+0xE7F5	0x92CF	#CJK UNIFIED IDEOGRAPH
+0xE7F6	0x92B9	#CJK UNIFIED IDEOGRAPH
+0xE7F7	0x92B7	#CJK UNIFIED IDEOGRAPH
+0xE7F8	0x92E9	#CJK UNIFIED IDEOGRAPH
+0xE7F9	0x930F	#CJK UNIFIED IDEOGRAPH
+0xE7FA	0x92FA	#CJK UNIFIED IDEOGRAPH
+0xE7FB	0x9344	#CJK UNIFIED IDEOGRAPH
+0xE7FC	0x932E	#CJK UNIFIED IDEOGRAPH
+0xE840	0x9319	#CJK UNIFIED IDEOGRAPH
+0xE841	0x9322	#CJK UNIFIED IDEOGRAPH
+0xE842	0x931A	#CJK UNIFIED IDEOGRAPH
+0xE843	0x9323	#CJK UNIFIED IDEOGRAPH
+0xE844	0x933A	#CJK UNIFIED IDEOGRAPH
+0xE845	0x9335	#CJK UNIFIED IDEOGRAPH
+0xE846	0x933B	#CJK UNIFIED IDEOGRAPH
+0xE847	0x935C	#CJK UNIFIED IDEOGRAPH
+0xE848	0x9360	#CJK UNIFIED IDEOGRAPH
+0xE849	0x937C	#CJK UNIFIED IDEOGRAPH
+0xE84A	0x936E	#CJK UNIFIED IDEOGRAPH
+0xE84B	0x9356	#CJK UNIFIED IDEOGRAPH
+0xE84C	0x93B0	#CJK UNIFIED IDEOGRAPH
+0xE84D	0x93AC	#CJK UNIFIED IDEOGRAPH
+0xE84E	0x93AD	#CJK UNIFIED IDEOGRAPH
+0xE84F	0x9394	#CJK UNIFIED IDEOGRAPH
+0xE850	0x93B9	#CJK UNIFIED IDEOGRAPH
+0xE851	0x93D6	#CJK UNIFIED IDEOGRAPH
+0xE852	0x93D7	#CJK UNIFIED IDEOGRAPH
+0xE853	0x93E8	#CJK UNIFIED IDEOGRAPH
+0xE854	0x93E5	#CJK UNIFIED IDEOGRAPH
+0xE855	0x93D8	#CJK UNIFIED IDEOGRAPH
+0xE856	0x93C3	#CJK UNIFIED IDEOGRAPH
+0xE857	0x93DD	#CJK UNIFIED IDEOGRAPH
+0xE858	0x93D0	#CJK UNIFIED IDEOGRAPH
+0xE859	0x93C8	#CJK UNIFIED IDEOGRAPH
+0xE85A	0x93E4	#CJK UNIFIED IDEOGRAPH
+0xE85B	0x941A	#CJK UNIFIED IDEOGRAPH
+0xE85C	0x9414	#CJK UNIFIED IDEOGRAPH
+0xE85D	0x9413	#CJK UNIFIED IDEOGRAPH
+0xE85E	0x9403	#CJK UNIFIED IDEOGRAPH
+0xE85F	0x9407	#CJK UNIFIED IDEOGRAPH
+0xE860	0x9410	#CJK UNIFIED IDEOGRAPH
+0xE861	0x9436	#CJK UNIFIED IDEOGRAPH
+0xE862	0x942B	#CJK UNIFIED IDEOGRAPH
+0xE863	0x9435	#CJK UNIFIED IDEOGRAPH
+0xE864	0x9421	#CJK UNIFIED IDEOGRAPH
+0xE865	0x943A	#CJK UNIFIED IDEOGRAPH
+0xE866	0x9441	#CJK UNIFIED IDEOGRAPH
+0xE867	0x9452	#CJK UNIFIED IDEOGRAPH
+0xE868	0x9444	#CJK UNIFIED IDEOGRAPH
+0xE869	0x945B	#CJK UNIFIED IDEOGRAPH
+0xE86A	0x9460	#CJK UNIFIED IDEOGRAPH
+0xE86B	0x9462	#CJK UNIFIED IDEOGRAPH
+0xE86C	0x945E	#CJK UNIFIED IDEOGRAPH
+0xE86D	0x946A	#CJK UNIFIED IDEOGRAPH
+0xE86E	0x9229	#CJK UNIFIED IDEOGRAPH
+0xE86F	0x9470	#CJK UNIFIED IDEOGRAPH
+0xE870	0x9475	#CJK UNIFIED IDEOGRAPH
+0xE871	0x9477	#CJK UNIFIED IDEOGRAPH
+0xE872	0x947D	#CJK UNIFIED IDEOGRAPH
+0xE873	0x945A	#CJK UNIFIED IDEOGRAPH
+0xE874	0x947C	#CJK UNIFIED IDEOGRAPH
+0xE875	0x947E	#CJK UNIFIED IDEOGRAPH
+0xE876	0x9481	#CJK UNIFIED IDEOGRAPH
+0xE877	0x947F	#CJK UNIFIED IDEOGRAPH
+0xE878	0x9582	#CJK UNIFIED IDEOGRAPH
+0xE879	0x9587	#CJK UNIFIED IDEOGRAPH
+0xE87A	0x958A	#CJK UNIFIED IDEOGRAPH
+0xE87B	0x9594	#CJK UNIFIED IDEOGRAPH
+0xE87C	0x9596	#CJK UNIFIED IDEOGRAPH
+0xE87D	0x9598	#CJK UNIFIED IDEOGRAPH
+0xE87E	0x9599	#CJK UNIFIED IDEOGRAPH
+0xE880	0x95A0	#CJK UNIFIED IDEOGRAPH
+0xE881	0x95A8	#CJK UNIFIED IDEOGRAPH
+0xE882	0x95A7	#CJK UNIFIED IDEOGRAPH
+0xE883	0x95AD	#CJK UNIFIED IDEOGRAPH
+0xE884	0x95BC	#CJK UNIFIED IDEOGRAPH
+0xE885	0x95BB	#CJK UNIFIED IDEOGRAPH
+0xE886	0x95B9	#CJK UNIFIED IDEOGRAPH
+0xE887	0x95BE	#CJK UNIFIED IDEOGRAPH
+0xE888	0x95CA	#CJK UNIFIED IDEOGRAPH
+0xE889	0x6FF6	#CJK UNIFIED IDEOGRAPH
+0xE88A	0x95C3	#CJK UNIFIED IDEOGRAPH
+0xE88B	0x95CD	#CJK UNIFIED IDEOGRAPH
+0xE88C	0x95CC	#CJK UNIFIED IDEOGRAPH
+0xE88D	0x95D5	#CJK UNIFIED IDEOGRAPH
+0xE88E	0x95D4	#CJK UNIFIED IDEOGRAPH
+0xE88F	0x95D6	#CJK UNIFIED IDEOGRAPH
+0xE890	0x95DC	#CJK UNIFIED IDEOGRAPH
+0xE891	0x95E1	#CJK UNIFIED IDEOGRAPH
+0xE892	0x95E5	#CJK UNIFIED IDEOGRAPH
+0xE893	0x95E2	#CJK UNIFIED IDEOGRAPH
+0xE894	0x9621	#CJK UNIFIED IDEOGRAPH
+0xE895	0x9628	#CJK UNIFIED IDEOGRAPH
+0xE896	0x962E	#CJK UNIFIED IDEOGRAPH
+0xE897	0x962F	#CJK UNIFIED IDEOGRAPH
+0xE898	0x9642	#CJK UNIFIED IDEOGRAPH
+0xE899	0x964C	#CJK UNIFIED IDEOGRAPH
+0xE89A	0x964F	#CJK UNIFIED IDEOGRAPH
+0xE89B	0x964B	#CJK UNIFIED IDEOGRAPH
+0xE89C	0x9677	#CJK UNIFIED IDEOGRAPH
+0xE89D	0x965C	#CJK UNIFIED IDEOGRAPH
+0xE89E	0x965E	#CJK UNIFIED IDEOGRAPH
+0xE89F	0x965D	#CJK UNIFIED IDEOGRAPH
+0xE8A0	0x965F	#CJK UNIFIED IDEOGRAPH
+0xE8A1	0x9666	#CJK UNIFIED IDEOGRAPH
+0xE8A2	0x9672	#CJK UNIFIED IDEOGRAPH
+0xE8A3	0x966C	#CJK UNIFIED IDEOGRAPH
+0xE8A4	0x968D	#CJK UNIFIED IDEOGRAPH
+0xE8A5	0x9698	#CJK UNIFIED IDEOGRAPH
+0xE8A6	0x9695	#CJK UNIFIED IDEOGRAPH
+0xE8A7	0x9697	#CJK UNIFIED IDEOGRAPH
+0xE8A8	0x96AA	#CJK UNIFIED IDEOGRAPH
+0xE8A9	0x96A7	#CJK UNIFIED IDEOGRAPH
+0xE8AA	0x96B1	#CJK UNIFIED IDEOGRAPH
+0xE8AB	0x96B2	#CJK UNIFIED IDEOGRAPH
+0xE8AC	0x96B0	#CJK UNIFIED IDEOGRAPH
+0xE8AD	0x96B4	#CJK UNIFIED IDEOGRAPH
+0xE8AE	0x96B6	#CJK UNIFIED IDEOGRAPH
+0xE8AF	0x96B8	#CJK UNIFIED IDEOGRAPH
+0xE8B0	0x96B9	#CJK UNIFIED IDEOGRAPH
+0xE8B1	0x96CE	#CJK UNIFIED IDEOGRAPH
+0xE8B2	0x96CB	#CJK UNIFIED IDEOGRAPH
+0xE8B3	0x96C9	#CJK UNIFIED IDEOGRAPH
+0xE8B4	0x96CD	#CJK UNIFIED IDEOGRAPH
+0xE8B5	0x894D	#CJK UNIFIED IDEOGRAPH
+0xE8B6	0x96DC	#CJK UNIFIED IDEOGRAPH
+0xE8B7	0x970D	#CJK UNIFIED IDEOGRAPH
+0xE8B8	0x96D5	#CJK UNIFIED IDEOGRAPH
+0xE8B9	0x96F9	#CJK UNIFIED IDEOGRAPH
+0xE8BA	0x9704	#CJK UNIFIED IDEOGRAPH
+0xE8BB	0x9706	#CJK UNIFIED IDEOGRAPH
+0xE8BC	0x9708	#CJK UNIFIED IDEOGRAPH
+0xE8BD	0x9713	#CJK UNIFIED IDEOGRAPH
+0xE8BE	0x970E	#CJK UNIFIED IDEOGRAPH
+0xE8BF	0x9711	#CJK UNIFIED IDEOGRAPH
+0xE8C0	0x970F	#CJK UNIFIED IDEOGRAPH
+0xE8C1	0x9716	#CJK UNIFIED IDEOGRAPH
+0xE8C2	0x9719	#CJK UNIFIED IDEOGRAPH
+0xE8C3	0x9724	#CJK UNIFIED IDEOGRAPH
+0xE8C4	0x972A	#CJK UNIFIED IDEOGRAPH
+0xE8C5	0x9730	#CJK UNIFIED IDEOGRAPH
+0xE8C6	0x9739	#CJK UNIFIED IDEOGRAPH
+0xE8C7	0x973D	#CJK UNIFIED IDEOGRAPH
+0xE8C8	0x973E	#CJK UNIFIED IDEOGRAPH
+0xE8C9	0x9744	#CJK UNIFIED IDEOGRAPH
+0xE8CA	0x9746	#CJK UNIFIED IDEOGRAPH
+0xE8CB	0x9748	#CJK UNIFIED IDEOGRAPH
+0xE8CC	0x9742	#CJK UNIFIED IDEOGRAPH
+0xE8CD	0x9749	#CJK UNIFIED IDEOGRAPH
+0xE8CE	0x975C	#CJK UNIFIED IDEOGRAPH
+0xE8CF	0x9760	#CJK UNIFIED IDEOGRAPH
+0xE8D0	0x9764	#CJK UNIFIED IDEOGRAPH
+0xE8D1	0x9766	#CJK UNIFIED IDEOGRAPH
+0xE8D2	0x9768	#CJK UNIFIED IDEOGRAPH
+0xE8D3	0x52D2	#CJK UNIFIED IDEOGRAPH
+0xE8D4	0x976B	#CJK UNIFIED IDEOGRAPH
+0xE8D5	0x9771	#CJK UNIFIED IDEOGRAPH
+0xE8D6	0x9779	#CJK UNIFIED IDEOGRAPH
+0xE8D7	0x9785	#CJK UNIFIED IDEOGRAPH
+0xE8D8	0x977C	#CJK UNIFIED IDEOGRAPH
+0xE8D9	0x9781	#CJK UNIFIED IDEOGRAPH
+0xE8DA	0x977A	#CJK UNIFIED IDEOGRAPH
+0xE8DB	0x9786	#CJK UNIFIED IDEOGRAPH
+0xE8DC	0x978B	#CJK UNIFIED IDEOGRAPH
+0xE8DD	0x978F	#CJK UNIFIED IDEOGRAPH
+0xE8DE	0x9790	#CJK UNIFIED IDEOGRAPH
+0xE8DF	0x979C	#CJK UNIFIED IDEOGRAPH
+0xE8E0	0x97A8	#CJK UNIFIED IDEOGRAPH
+0xE8E1	0x97A6	#CJK UNIFIED IDEOGRAPH
+0xE8E2	0x97A3	#CJK UNIFIED IDEOGRAPH
+0xE8E3	0x97B3	#CJK UNIFIED IDEOGRAPH
+0xE8E4	0x97B4	#CJK UNIFIED IDEOGRAPH
+0xE8E5	0x97C3	#CJK UNIFIED IDEOGRAPH
+0xE8E6	0x97C6	#CJK UNIFIED IDEOGRAPH
+0xE8E7	0x97C8	#CJK UNIFIED IDEOGRAPH
+0xE8E8	0x97CB	#CJK UNIFIED IDEOGRAPH
+0xE8E9	0x97DC	#CJK UNIFIED IDEOGRAPH
+0xE8EA	0x97ED	#CJK UNIFIED IDEOGRAPH
+0xE8EB	0x9F4F	#CJK UNIFIED IDEOGRAPH
+0xE8EC	0x97F2	#CJK UNIFIED IDEOGRAPH
+0xE8ED	0x7ADF	#CJK UNIFIED IDEOGRAPH
+0xE8EE	0x97F6	#CJK UNIFIED IDEOGRAPH
+0xE8EF	0x97F5	#CJK UNIFIED IDEOGRAPH
+0xE8F0	0x980F	#CJK UNIFIED IDEOGRAPH
+0xE8F1	0x980C	#CJK UNIFIED IDEOGRAPH
+0xE8F2	0x9838	#CJK UNIFIED IDEOGRAPH
+0xE8F3	0x9824	#CJK UNIFIED IDEOGRAPH
+0xE8F4	0x9821	#CJK UNIFIED IDEOGRAPH
+0xE8F5	0x9837	#CJK UNIFIED IDEOGRAPH
+0xE8F6	0x983D	#CJK UNIFIED IDEOGRAPH
+0xE8F7	0x9846	#CJK UNIFIED IDEOGRAPH
+0xE8F8	0x984F	#CJK UNIFIED IDEOGRAPH
+0xE8F9	0x984B	#CJK UNIFIED IDEOGRAPH
+0xE8FA	0x986B	#CJK UNIFIED IDEOGRAPH
+0xE8FB	0x986F	#CJK UNIFIED IDEOGRAPH
+0xE8FC	0x9870	#CJK UNIFIED IDEOGRAPH
+0xE940	0x9871	#CJK UNIFIED IDEOGRAPH
+0xE941	0x9874	#CJK UNIFIED IDEOGRAPH
+0xE942	0x9873	#CJK UNIFIED IDEOGRAPH
+0xE943	0x98AA	#CJK UNIFIED IDEOGRAPH
+0xE944	0x98AF	#CJK UNIFIED IDEOGRAPH
+0xE945	0x98B1	#CJK UNIFIED IDEOGRAPH
+0xE946	0x98B6	#CJK UNIFIED IDEOGRAPH
+0xE947	0x98C4	#CJK UNIFIED IDEOGRAPH
+0xE948	0x98C3	#CJK UNIFIED IDEOGRAPH
+0xE949	0x98C6	#CJK UNIFIED IDEOGRAPH
+0xE94A	0x98E9	#CJK UNIFIED IDEOGRAPH
+0xE94B	0x98EB	#CJK UNIFIED IDEOGRAPH
+0xE94C	0x9903	#CJK UNIFIED IDEOGRAPH
+0xE94D	0x9909	#CJK UNIFIED IDEOGRAPH
+0xE94E	0x9912	#CJK UNIFIED IDEOGRAPH
+0xE94F	0x9914	#CJK UNIFIED IDEOGRAPH
+0xE950	0x9918	#CJK UNIFIED IDEOGRAPH
+0xE951	0x9921	#CJK UNIFIED IDEOGRAPH
+0xE952	0x991D	#CJK UNIFIED IDEOGRAPH
+0xE953	0x991E	#CJK UNIFIED IDEOGRAPH
+0xE954	0x9924	#CJK UNIFIED IDEOGRAPH
+0xE955	0x9920	#CJK UNIFIED IDEOGRAPH
+0xE956	0x992C	#CJK UNIFIED IDEOGRAPH
+0xE957	0x992E	#CJK UNIFIED IDEOGRAPH
+0xE958	0x993D	#CJK UNIFIED IDEOGRAPH
+0xE959	0x993E	#CJK UNIFIED IDEOGRAPH
+0xE95A	0x9942	#CJK UNIFIED IDEOGRAPH
+0xE95B	0x9949	#CJK UNIFIED IDEOGRAPH
+0xE95C	0x9945	#CJK UNIFIED IDEOGRAPH
+0xE95D	0x9950	#CJK UNIFIED IDEOGRAPH
+0xE95E	0x994B	#CJK UNIFIED IDEOGRAPH
+0xE95F	0x9951	#CJK UNIFIED IDEOGRAPH
+0xE960	0x9952	#CJK UNIFIED IDEOGRAPH
+0xE961	0x994C	#CJK UNIFIED IDEOGRAPH
+0xE962	0x9955	#CJK UNIFIED IDEOGRAPH
+0xE963	0x9997	#CJK UNIFIED IDEOGRAPH
+0xE964	0x9998	#CJK UNIFIED IDEOGRAPH
+0xE965	0x99A5	#CJK UNIFIED IDEOGRAPH
+0xE966	0x99AD	#CJK UNIFIED IDEOGRAPH
+0xE967	0x99AE	#CJK UNIFIED IDEOGRAPH
+0xE968	0x99BC	#CJK UNIFIED IDEOGRAPH
+0xE969	0x99DF	#CJK UNIFIED IDEOGRAPH
+0xE96A	0x99DB	#CJK UNIFIED IDEOGRAPH
+0xE96B	0x99DD	#CJK UNIFIED IDEOGRAPH
+0xE96C	0x99D8	#CJK UNIFIED IDEOGRAPH
+0xE96D	0x99D1	#CJK UNIFIED IDEOGRAPH
+0xE96E	0x99ED	#CJK UNIFIED IDEOGRAPH
+0xE96F	0x99EE	#CJK UNIFIED IDEOGRAPH
+0xE970	0x99F1	#CJK UNIFIED IDEOGRAPH
+0xE971	0x99F2	#CJK UNIFIED IDEOGRAPH
+0xE972	0x99FB	#CJK UNIFIED IDEOGRAPH
+0xE973	0x99F8	#CJK UNIFIED IDEOGRAPH
+0xE974	0x9A01	#CJK UNIFIED IDEOGRAPH
+0xE975	0x9A0F	#CJK UNIFIED IDEOGRAPH
+0xE976	0x9A05	#CJK UNIFIED IDEOGRAPH
+0xE977	0x99E2	#CJK UNIFIED IDEOGRAPH
+0xE978	0x9A19	#CJK UNIFIED IDEOGRAPH
+0xE979	0x9A2B	#CJK UNIFIED IDEOGRAPH
+0xE97A	0x9A37	#CJK UNIFIED IDEOGRAPH
+0xE97B	0x9A45	#CJK UNIFIED IDEOGRAPH
+0xE97C	0x9A42	#CJK UNIFIED IDEOGRAPH
+0xE97D	0x9A40	#CJK UNIFIED IDEOGRAPH
+0xE97E	0x9A43	#CJK UNIFIED IDEOGRAPH
+0xE980	0x9A3E	#CJK UNIFIED IDEOGRAPH
+0xE981	0x9A55	#CJK UNIFIED IDEOGRAPH
+0xE982	0x9A4D	#CJK UNIFIED IDEOGRAPH
+0xE983	0x9A5B	#CJK UNIFIED IDEOGRAPH
+0xE984	0x9A57	#CJK UNIFIED IDEOGRAPH
+0xE985	0x9A5F	#CJK UNIFIED IDEOGRAPH
+0xE986	0x9A62	#CJK UNIFIED IDEOGRAPH
+0xE987	0x9A65	#CJK UNIFIED IDEOGRAPH
+0xE988	0x9A64	#CJK UNIFIED IDEOGRAPH
+0xE989	0x9A69	#CJK UNIFIED IDEOGRAPH
+0xE98A	0x9A6B	#CJK UNIFIED IDEOGRAPH
+0xE98B	0x9A6A	#CJK UNIFIED IDEOGRAPH
+0xE98C	0x9AAD	#CJK UNIFIED IDEOGRAPH
+0xE98D	0x9AB0	#CJK UNIFIED IDEOGRAPH
+0xE98E	0x9ABC	#CJK UNIFIED IDEOGRAPH
+0xE98F	0x9AC0	#CJK UNIFIED IDEOGRAPH
+0xE990	0x9ACF	#CJK UNIFIED IDEOGRAPH
+0xE991	0x9AD1	#CJK UNIFIED IDEOGRAPH
+0xE992	0x9AD3	#CJK UNIFIED IDEOGRAPH
+0xE993	0x9AD4	#CJK UNIFIED IDEOGRAPH
+0xE994	0x9ADE	#CJK UNIFIED IDEOGRAPH
+0xE995	0x9ADF	#CJK UNIFIED IDEOGRAPH
+0xE996	0x9AE2	#CJK UNIFIED IDEOGRAPH
+0xE997	0x9AE3	#CJK UNIFIED IDEOGRAPH
+0xE998	0x9AE6	#CJK UNIFIED IDEOGRAPH
+0xE999	0x9AEF	#CJK UNIFIED IDEOGRAPH
+0xE99A	0x9AEB	#CJK UNIFIED IDEOGRAPH
+0xE99B	0x9AEE	#CJK UNIFIED IDEOGRAPH
+0xE99C	0x9AF4	#CJK UNIFIED IDEOGRAPH
+0xE99D	0x9AF1	#CJK UNIFIED IDEOGRAPH
+0xE99E	0x9AF7	#CJK UNIFIED IDEOGRAPH
+0xE99F	0x9AFB	#CJK UNIFIED IDEOGRAPH
+0xE9A0	0x9B06	#CJK UNIFIED IDEOGRAPH
+0xE9A1	0x9B18	#CJK UNIFIED IDEOGRAPH
+0xE9A2	0x9B1A	#CJK UNIFIED IDEOGRAPH
+0xE9A3	0x9B1F	#CJK UNIFIED IDEOGRAPH
+0xE9A4	0x9B22	#CJK UNIFIED IDEOGRAPH
+0xE9A5	0x9B23	#CJK UNIFIED IDEOGRAPH
+0xE9A6	0x9B25	#CJK UNIFIED IDEOGRAPH
+0xE9A7	0x9B27	#CJK UNIFIED IDEOGRAPH
+0xE9A8	0x9B28	#CJK UNIFIED IDEOGRAPH
+0xE9A9	0x9B29	#CJK UNIFIED IDEOGRAPH
+0xE9AA	0x9B2A	#CJK UNIFIED IDEOGRAPH
+0xE9AB	0x9B2E	#CJK UNIFIED IDEOGRAPH
+0xE9AC	0x9B2F	#CJK UNIFIED IDEOGRAPH
+0xE9AD	0x9B32	#CJK UNIFIED IDEOGRAPH
+0xE9AE	0x9B44	#CJK UNIFIED IDEOGRAPH
+0xE9AF	0x9B43	#CJK UNIFIED IDEOGRAPH
+0xE9B0	0x9B4F	#CJK UNIFIED IDEOGRAPH
+0xE9B1	0x9B4D	#CJK UNIFIED IDEOGRAPH
+0xE9B2	0x9B4E	#CJK UNIFIED IDEOGRAPH
+0xE9B3	0x9B51	#CJK UNIFIED IDEOGRAPH
+0xE9B4	0x9B58	#CJK UNIFIED IDEOGRAPH
+0xE9B5	0x9B74	#CJK UNIFIED IDEOGRAPH
+0xE9B6	0x9B93	#CJK UNIFIED IDEOGRAPH
+0xE9B7	0x9B83	#CJK UNIFIED IDEOGRAPH
+0xE9B8	0x9B91	#CJK UNIFIED IDEOGRAPH
+0xE9B9	0x9B96	#CJK UNIFIED IDEOGRAPH
+0xE9BA	0x9B97	#CJK UNIFIED IDEOGRAPH
+0xE9BB	0x9B9F	#CJK UNIFIED IDEOGRAPH
+0xE9BC	0x9BA0	#CJK UNIFIED IDEOGRAPH
+0xE9BD	0x9BA8	#CJK UNIFIED IDEOGRAPH
+0xE9BE	0x9BB4	#CJK UNIFIED IDEOGRAPH
+0xE9BF	0x9BC0	#CJK UNIFIED IDEOGRAPH
+0xE9C0	0x9BCA	#CJK UNIFIED IDEOGRAPH
+0xE9C1	0x9BB9	#CJK UNIFIED IDEOGRAPH
+0xE9C2	0x9BC6	#CJK UNIFIED IDEOGRAPH
+0xE9C3	0x9BCF	#CJK UNIFIED IDEOGRAPH
+0xE9C4	0x9BD1	#CJK UNIFIED IDEOGRAPH
+0xE9C5	0x9BD2	#CJK UNIFIED IDEOGRAPH
+0xE9C6	0x9BE3	#CJK UNIFIED IDEOGRAPH
+0xE9C7	0x9BE2	#CJK UNIFIED IDEOGRAPH
+0xE9C8	0x9BE4	#CJK UNIFIED IDEOGRAPH
+0xE9C9	0x9BD4	#CJK UNIFIED IDEOGRAPH
+0xE9CA	0x9BE1	#CJK UNIFIED IDEOGRAPH
+0xE9CB	0x9C3A	#CJK UNIFIED IDEOGRAPH
+0xE9CC	0x9BF2	#CJK UNIFIED IDEOGRAPH
+0xE9CD	0x9BF1	#CJK UNIFIED IDEOGRAPH
+0xE9CE	0x9BF0	#CJK UNIFIED IDEOGRAPH
+0xE9CF	0x9C15	#CJK UNIFIED IDEOGRAPH
+0xE9D0	0x9C14	#CJK UNIFIED IDEOGRAPH
+0xE9D1	0x9C09	#CJK UNIFIED IDEOGRAPH
+0xE9D2	0x9C13	#CJK UNIFIED IDEOGRAPH
+0xE9D3	0x9C0C	#CJK UNIFIED IDEOGRAPH
+0xE9D4	0x9C06	#CJK UNIFIED IDEOGRAPH
+0xE9D5	0x9C08	#CJK UNIFIED IDEOGRAPH
+0xE9D6	0x9C12	#CJK UNIFIED IDEOGRAPH
+0xE9D7	0x9C0A	#CJK UNIFIED IDEOGRAPH
+0xE9D8	0x9C04	#CJK UNIFIED IDEOGRAPH
+0xE9D9	0x9C2E	#CJK UNIFIED IDEOGRAPH
+0xE9DA	0x9C1B	#CJK UNIFIED IDEOGRAPH
+0xE9DB	0x9C25	#CJK UNIFIED IDEOGRAPH
+0xE9DC	0x9C24	#CJK UNIFIED IDEOGRAPH
+0xE9DD	0x9C21	#CJK UNIFIED IDEOGRAPH
+0xE9DE	0x9C30	#CJK UNIFIED IDEOGRAPH
+0xE9DF	0x9C47	#CJK UNIFIED IDEOGRAPH
+0xE9E0	0x9C32	#CJK UNIFIED IDEOGRAPH
+0xE9E1	0x9C46	#CJK UNIFIED IDEOGRAPH
+0xE9E2	0x9C3E	#CJK UNIFIED IDEOGRAPH
+0xE9E3	0x9C5A	#CJK UNIFIED IDEOGRAPH
+0xE9E4	0x9C60	#CJK UNIFIED IDEOGRAPH
+0xE9E5	0x9C67	#CJK UNIFIED IDEOGRAPH
+0xE9E6	0x9C76	#CJK UNIFIED IDEOGRAPH
+0xE9E7	0x9C78	#CJK UNIFIED IDEOGRAPH
+0xE9E8	0x9CE7	#CJK UNIFIED IDEOGRAPH
+0xE9E9	0x9CEC	#CJK UNIFIED IDEOGRAPH
+0xE9EA	0x9CF0	#CJK UNIFIED IDEOGRAPH
+0xE9EB	0x9D09	#CJK UNIFIED IDEOGRAPH
+0xE9EC	0x9D08	#CJK UNIFIED IDEOGRAPH
+0xE9ED	0x9CEB	#CJK UNIFIED IDEOGRAPH
+0xE9EE	0x9D03	#CJK UNIFIED IDEOGRAPH
+0xE9EF	0x9D06	#CJK UNIFIED IDEOGRAPH
+0xE9F0	0x9D2A	#CJK UNIFIED IDEOGRAPH
+0xE9F1	0x9D26	#CJK UNIFIED IDEOGRAPH
+0xE9F2	0x9DAF	#CJK UNIFIED IDEOGRAPH
+0xE9F3	0x9D23	#CJK UNIFIED IDEOGRAPH
+0xE9F4	0x9D1F	#CJK UNIFIED IDEOGRAPH
+0xE9F5	0x9D44	#CJK UNIFIED IDEOGRAPH
+0xE9F6	0x9D15	#CJK UNIFIED IDEOGRAPH
+0xE9F7	0x9D12	#CJK UNIFIED IDEOGRAPH
+0xE9F8	0x9D41	#CJK UNIFIED IDEOGRAPH
+0xE9F9	0x9D3F	#CJK UNIFIED IDEOGRAPH
+0xE9FA	0x9D3E	#CJK UNIFIED IDEOGRAPH
+0xE9FB	0x9D46	#CJK UNIFIED IDEOGRAPH
+0xE9FC	0x9D48	#CJK UNIFIED IDEOGRAPH
+0xEA40	0x9D5D	#CJK UNIFIED IDEOGRAPH
+0xEA41	0x9D5E	#CJK UNIFIED IDEOGRAPH
+0xEA42	0x9D64	#CJK UNIFIED IDEOGRAPH
+0xEA43	0x9D51	#CJK UNIFIED IDEOGRAPH
+0xEA44	0x9D50	#CJK UNIFIED IDEOGRAPH
+0xEA45	0x9D59	#CJK UNIFIED IDEOGRAPH
+0xEA46	0x9D72	#CJK UNIFIED IDEOGRAPH
+0xEA47	0x9D89	#CJK UNIFIED IDEOGRAPH
+0xEA48	0x9D87	#CJK UNIFIED IDEOGRAPH
+0xEA49	0x9DAB	#CJK UNIFIED IDEOGRAPH
+0xEA4A	0x9D6F	#CJK UNIFIED IDEOGRAPH
+0xEA4B	0x9D7A	#CJK UNIFIED IDEOGRAPH
+0xEA4C	0x9D9A	#CJK UNIFIED IDEOGRAPH
+0xEA4D	0x9DA4	#CJK UNIFIED IDEOGRAPH
+0xEA4E	0x9DA9	#CJK UNIFIED IDEOGRAPH
+0xEA4F	0x9DB2	#CJK UNIFIED IDEOGRAPH
+0xEA50	0x9DC4	#CJK UNIFIED IDEOGRAPH
+0xEA51	0x9DC1	#CJK UNIFIED IDEOGRAPH
+0xEA52	0x9DBB	#CJK UNIFIED IDEOGRAPH
+0xEA53	0x9DB8	#CJK UNIFIED IDEOGRAPH
+0xEA54	0x9DBA	#CJK UNIFIED IDEOGRAPH
+0xEA55	0x9DC6	#CJK UNIFIED IDEOGRAPH
+0xEA56	0x9DCF	#CJK UNIFIED IDEOGRAPH
+0xEA57	0x9DC2	#CJK UNIFIED IDEOGRAPH
+0xEA58	0x9DD9	#CJK UNIFIED IDEOGRAPH
+0xEA59	0x9DD3	#CJK UNIFIED IDEOGRAPH
+0xEA5A	0x9DF8	#CJK UNIFIED IDEOGRAPH
+0xEA5B	0x9DE6	#CJK UNIFIED IDEOGRAPH
+0xEA5C	0x9DED	#CJK UNIFIED IDEOGRAPH
+0xEA5D	0x9DEF	#CJK UNIFIED IDEOGRAPH
+0xEA5E	0x9DFD	#CJK UNIFIED IDEOGRAPH
+0xEA5F	0x9E1A	#CJK UNIFIED IDEOGRAPH
+0xEA60	0x9E1B	#CJK UNIFIED IDEOGRAPH
+0xEA61	0x9E1E	#CJK UNIFIED IDEOGRAPH
+0xEA62	0x9E75	#CJK UNIFIED IDEOGRAPH
+0xEA63	0x9E79	#CJK UNIFIED IDEOGRAPH
+0xEA64	0x9E7D	#CJK UNIFIED IDEOGRAPH
+0xEA65	0x9E81	#CJK UNIFIED IDEOGRAPH
+0xEA66	0x9E88	#CJK UNIFIED IDEOGRAPH
+0xEA67	0x9E8B	#CJK UNIFIED IDEOGRAPH
+0xEA68	0x9E8C	#CJK UNIFIED IDEOGRAPH
+0xEA69	0x9E92	#CJK UNIFIED IDEOGRAPH
+0xEA6A	0x9E95	#CJK UNIFIED IDEOGRAPH
+0xEA6B	0x9E91	#CJK UNIFIED IDEOGRAPH
+0xEA6C	0x9E9D	#CJK UNIFIED IDEOGRAPH
+0xEA6D	0x9EA5	#CJK UNIFIED IDEOGRAPH
+0xEA6E	0x9EA9	#CJK UNIFIED IDEOGRAPH
+0xEA6F	0x9EB8	#CJK UNIFIED IDEOGRAPH
+0xEA70	0x9EAA	#CJK UNIFIED IDEOGRAPH
+0xEA71	0x9EAD	#CJK UNIFIED IDEOGRAPH
+0xEA72	0x9761	#CJK UNIFIED IDEOGRAPH
+0xEA73	0x9ECC	#CJK UNIFIED IDEOGRAPH
+0xEA74	0x9ECE	#CJK UNIFIED IDEOGRAPH
+0xEA75	0x9ECF	#CJK UNIFIED IDEOGRAPH
+0xEA76	0x9ED0	#CJK UNIFIED IDEOGRAPH
+0xEA77	0x9ED4	#CJK UNIFIED IDEOGRAPH
+0xEA78	0x9EDC	#CJK UNIFIED IDEOGRAPH
+0xEA79	0x9EDE	#CJK UNIFIED IDEOGRAPH
+0xEA7A	0x9EDD	#CJK UNIFIED IDEOGRAPH
+0xEA7B	0x9EE0	#CJK UNIFIED IDEOGRAPH
+0xEA7C	0x9EE5	#CJK UNIFIED IDEOGRAPH
+0xEA7D	0x9EE8	#CJK UNIFIED IDEOGRAPH
+0xEA7E	0x9EEF	#CJK UNIFIED IDEOGRAPH
+0xEA80	0x9EF4	#CJK UNIFIED IDEOGRAPH
+0xEA81	0x9EF6	#CJK UNIFIED IDEOGRAPH
+0xEA82	0x9EF7	#CJK UNIFIED IDEOGRAPH
+0xEA83	0x9EF9	#CJK UNIFIED IDEOGRAPH
+0xEA84	0x9EFB	#CJK UNIFIED IDEOGRAPH
+0xEA85	0x9EFC	#CJK UNIFIED IDEOGRAPH
+0xEA86	0x9EFD	#CJK UNIFIED IDEOGRAPH
+0xEA87	0x9F07	#CJK UNIFIED IDEOGRAPH
+0xEA88	0x9F08	#CJK UNIFIED IDEOGRAPH
+0xEA89	0x76B7	#CJK UNIFIED IDEOGRAPH
+0xEA8A	0x9F15	#CJK UNIFIED IDEOGRAPH
+0xEA8B	0x9F21	#CJK UNIFIED IDEOGRAPH
+0xEA8C	0x9F2C	#CJK UNIFIED IDEOGRAPH
+0xEA8D	0x9F3E	#CJK UNIFIED IDEOGRAPH
+0xEA8E	0x9F4A	#CJK UNIFIED IDEOGRAPH
+0xEA8F	0x9F52	#CJK UNIFIED IDEOGRAPH
+0xEA90	0x9F54	#CJK UNIFIED IDEOGRAPH
+0xEA91	0x9F63	#CJK UNIFIED IDEOGRAPH
+0xEA92	0x9F5F	#CJK UNIFIED IDEOGRAPH
+0xEA93	0x9F60	#CJK UNIFIED IDEOGRAPH
+0xEA94	0x9F61	#CJK UNIFIED IDEOGRAPH
+0xEA95	0x9F66	#CJK UNIFIED IDEOGRAPH
+0xEA96	0x9F67	#CJK UNIFIED IDEOGRAPH
+0xEA97	0x9F6C	#CJK UNIFIED IDEOGRAPH
+0xEA98	0x9F6A	#CJK UNIFIED IDEOGRAPH
+0xEA99	0x9F77	#CJK UNIFIED IDEOGRAPH
+0xEA9A	0x9F72	#CJK UNIFIED IDEOGRAPH
+0xEA9B	0x9F76	#CJK UNIFIED IDEOGRAPH
+0xEA9C	0x9F95	#CJK UNIFIED IDEOGRAPH
+0xEA9D	0x9F9C	#CJK UNIFIED IDEOGRAPH
+0xEA9E	0x9FA0	#CJK UNIFIED IDEOGRAPH
+0xEA9F	0x582F	#CJK UNIFIED IDEOGRAPH
+0xEAA0	0x69C7	#CJK UNIFIED IDEOGRAPH
+0xEAA1	0x9059	#CJK UNIFIED IDEOGRAPH
+0xEAA2	0x7464	#CJK UNIFIED IDEOGRAPH
+0xEAA3	0x51DC	#CJK UNIFIED IDEOGRAPH
+0xEAA4	0x7199	#CJK UNIFIED IDEOGRAPH
+0xED40	0x7E8A	#CJK UNIFIED IDEOGRAPH
+0xED41	0x891C	#CJK UNIFIED IDEOGRAPH
+0xED42	0x9348	#CJK UNIFIED IDEOGRAPH
+0xED43	0x9288	#CJK UNIFIED IDEOGRAPH
+0xED44	0x84DC	#CJK UNIFIED IDEOGRAPH
+0xED45	0x4FC9	#CJK UNIFIED IDEOGRAPH
+0xED46	0x70BB	#CJK UNIFIED IDEOGRAPH
+0xED47	0x6631	#CJK UNIFIED IDEOGRAPH
+0xED48	0x68C8	#CJK UNIFIED IDEOGRAPH
+0xED49	0x92F9	#CJK UNIFIED IDEOGRAPH
+0xED4A	0x66FB	#CJK UNIFIED IDEOGRAPH
+0xED4B	0x5F45	#CJK UNIFIED IDEOGRAPH
+0xED4C	0x4E28	#CJK UNIFIED IDEOGRAPH
+0xED4D	0x4EE1	#CJK UNIFIED IDEOGRAPH
+0xED4E	0x4EFC	#CJK UNIFIED IDEOGRAPH
+0xED4F	0x4F00	#CJK UNIFIED IDEOGRAPH
+0xED50	0x4F03	#CJK UNIFIED IDEOGRAPH
+0xED51	0x4F39	#CJK UNIFIED IDEOGRAPH
+0xED52	0x4F56	#CJK UNIFIED IDEOGRAPH
+0xED53	0x4F92	#CJK UNIFIED IDEOGRAPH
+0xED54	0x4F8A	#CJK UNIFIED IDEOGRAPH
+0xED55	0x4F9A	#CJK UNIFIED IDEOGRAPH
+0xED56	0x4F94	#CJK UNIFIED IDEOGRAPH
+0xED57	0x4FCD	#CJK UNIFIED IDEOGRAPH
+0xED58	0x5040	#CJK UNIFIED IDEOGRAPH
+0xED59	0x5022	#CJK UNIFIED IDEOGRAPH
+0xED5A	0x4FFF	#CJK UNIFIED IDEOGRAPH
+0xED5B	0x501E	#CJK UNIFIED IDEOGRAPH
+0xED5C	0x5046	#CJK UNIFIED IDEOGRAPH
+0xED5D	0x5070	#CJK UNIFIED IDEOGRAPH
+0xED5E	0x5042	#CJK UNIFIED IDEOGRAPH
+0xED5F	0x5094	#CJK UNIFIED IDEOGRAPH
+0xED60	0x50F4	#CJK UNIFIED IDEOGRAPH
+0xED61	0x50D8	#CJK UNIFIED IDEOGRAPH
+0xED62	0x514A	#CJK UNIFIED IDEOGRAPH
+0xED63	0x5164	#CJK UNIFIED IDEOGRAPH
+0xED64	0x519D	#CJK UNIFIED IDEOGRAPH
+0xED65	0x51BE	#CJK UNIFIED IDEOGRAPH
+0xED66	0x51EC	#CJK UNIFIED IDEOGRAPH
+0xED67	0x5215	#CJK UNIFIED IDEOGRAPH
+0xED68	0x529C	#CJK UNIFIED IDEOGRAPH
+0xED69	0x52A6	#CJK UNIFIED IDEOGRAPH
+0xED6A	0x52C0	#CJK UNIFIED IDEOGRAPH
+0xED6B	0x52DB	#CJK UNIFIED IDEOGRAPH
+0xED6C	0x5300	#CJK UNIFIED IDEOGRAPH
+0xED6D	0x5307	#CJK UNIFIED IDEOGRAPH
+0xED6E	0x5324	#CJK UNIFIED IDEOGRAPH
+0xED6F	0x5372	#CJK UNIFIED IDEOGRAPH
+0xED70	0x5393	#CJK UNIFIED IDEOGRAPH
+0xED71	0x53B2	#CJK UNIFIED IDEOGRAPH
+0xED72	0x53DD	#CJK UNIFIED IDEOGRAPH
+0xED73	0xFA0E	#CJK COMPATIBILITY IDEOGRAPH
+0xED74	0x549C	#CJK UNIFIED IDEOGRAPH
+0xED75	0x548A	#CJK UNIFIED IDEOGRAPH
+0xED76	0x54A9	#CJK UNIFIED IDEOGRAPH
+0xED77	0x54FF	#CJK UNIFIED IDEOGRAPH
+0xED78	0x5586	#CJK UNIFIED IDEOGRAPH
+0xED79	0x5759	#CJK UNIFIED IDEOGRAPH
+0xED7A	0x5765	#CJK UNIFIED IDEOGRAPH
+0xED7B	0x57AC	#CJK UNIFIED IDEOGRAPH
+0xED7C	0x57C8	#CJK UNIFIED IDEOGRAPH
+0xED7D	0x57C7	#CJK UNIFIED IDEOGRAPH
+0xED7E	0xFA0F	#CJK COMPATIBILITY IDEOGRAPH
+0xED80	0xFA10	#CJK COMPATIBILITY IDEOGRAPH
+0xED81	0x589E	#CJK UNIFIED IDEOGRAPH
+0xED82	0x58B2	#CJK UNIFIED IDEOGRAPH
+0xED83	0x590B	#CJK UNIFIED IDEOGRAPH
+0xED84	0x5953	#CJK UNIFIED IDEOGRAPH
+0xED85	0x595B	#CJK UNIFIED IDEOGRAPH
+0xED86	0x595D	#CJK UNIFIED IDEOGRAPH
+0xED87	0x5963	#CJK UNIFIED IDEOGRAPH
+0xED88	0x59A4	#CJK UNIFIED IDEOGRAPH
+0xED89	0x59BA	#CJK UNIFIED IDEOGRAPH
+0xED8A	0x5B56	#CJK UNIFIED IDEOGRAPH
+0xED8B	0x5BC0	#CJK UNIFIED IDEOGRAPH
+0xED8C	0x752F	#CJK UNIFIED IDEOGRAPH
+0xED8D	0x5BD8	#CJK UNIFIED IDEOGRAPH
+0xED8E	0x5BEC	#CJK UNIFIED IDEOGRAPH
+0xED8F	0x5C1E	#CJK UNIFIED IDEOGRAPH
+0xED90	0x5CA6	#CJK UNIFIED IDEOGRAPH
+0xED91	0x5CBA	#CJK UNIFIED IDEOGRAPH
+0xED92	0x5CF5	#CJK UNIFIED IDEOGRAPH
+0xED93	0x5D27	#CJK UNIFIED IDEOGRAPH
+0xED94	0x5D53	#CJK UNIFIED IDEOGRAPH
+0xED95	0xFA11	#CJK COMPATIBILITY IDEOGRAPH
+0xED96	0x5D42	#CJK UNIFIED IDEOGRAPH
+0xED97	0x5D6D	#CJK UNIFIED IDEOGRAPH
+0xED98	0x5DB8	#CJK UNIFIED IDEOGRAPH
+0xED99	0x5DB9	#CJK UNIFIED IDEOGRAPH
+0xED9A	0x5DD0	#CJK UNIFIED IDEOGRAPH
+0xED9B	0x5F21	#CJK UNIFIED IDEOGRAPH
+0xED9C	0x5F34	#CJK UNIFIED IDEOGRAPH
+0xED9D	0x5F67	#CJK UNIFIED IDEOGRAPH
+0xED9E	0x5FB7	#CJK UNIFIED IDEOGRAPH
+0xED9F	0x5FDE	#CJK UNIFIED IDEOGRAPH
+0xEDA0	0x605D	#CJK UNIFIED IDEOGRAPH
+0xEDA1	0x6085	#CJK UNIFIED IDEOGRAPH
+0xEDA2	0x608A	#CJK UNIFIED IDEOGRAPH
+0xEDA3	0x60DE	#CJK UNIFIED IDEOGRAPH
+0xEDA4	0x60D5	#CJK UNIFIED IDEOGRAPH
+0xEDA5	0x6120	#CJK UNIFIED IDEOGRAPH
+0xEDA6	0x60F2	#CJK UNIFIED IDEOGRAPH
+0xEDA7	0x6111	#CJK UNIFIED IDEOGRAPH
+0xEDA8	0x6137	#CJK UNIFIED IDEOGRAPH
+0xEDA9	0x6130	#CJK UNIFIED IDEOGRAPH
+0xEDAA	0x6198	#CJK UNIFIED IDEOGRAPH
+0xEDAB	0x6213	#CJK UNIFIED IDEOGRAPH
+0xEDAC	0x62A6	#CJK UNIFIED IDEOGRAPH
+0xEDAD	0x63F5	#CJK UNIFIED IDEOGRAPH
+0xEDAE	0x6460	#CJK UNIFIED IDEOGRAPH
+0xEDAF	0x649D	#CJK UNIFIED IDEOGRAPH
+0xEDB0	0x64CE	#CJK UNIFIED IDEOGRAPH
+0xEDB1	0x654E	#CJK UNIFIED IDEOGRAPH
+0xEDB2	0x6600	#CJK UNIFIED IDEOGRAPH
+0xEDB3	0x6615	#CJK UNIFIED IDEOGRAPH
+0xEDB4	0x663B	#CJK UNIFIED IDEOGRAPH
+0xEDB5	0x6609	#CJK UNIFIED IDEOGRAPH
+0xEDB6	0x662E	#CJK UNIFIED IDEOGRAPH
+0xEDB7	0x661E	#CJK UNIFIED IDEOGRAPH
+0xEDB8	0x6624	#CJK UNIFIED IDEOGRAPH
+0xEDB9	0x6665	#CJK UNIFIED IDEOGRAPH
+0xEDBA	0x6657	#CJK UNIFIED IDEOGRAPH
+0xEDBB	0x6659	#CJK UNIFIED IDEOGRAPH
+0xEDBC	0xFA12	#CJK COMPATIBILITY IDEOGRAPH
+0xEDBD	0x6673	#CJK UNIFIED IDEOGRAPH
+0xEDBE	0x6699	#CJK UNIFIED IDEOGRAPH
+0xEDBF	0x66A0	#CJK UNIFIED IDEOGRAPH
+0xEDC0	0x66B2	#CJK UNIFIED IDEOGRAPH
+0xEDC1	0x66BF	#CJK UNIFIED IDEOGRAPH
+0xEDC2	0x66FA	#CJK UNIFIED IDEOGRAPH
+0xEDC3	0x670E	#CJK UNIFIED IDEOGRAPH
+0xEDC4	0xF929	#CJK COMPATIBILITY IDEOGRAPH
+0xEDC5	0x6766	#CJK UNIFIED IDEOGRAPH
+0xEDC6	0x67BB	#CJK UNIFIED IDEOGRAPH
+0xEDC7	0x6852	#CJK UNIFIED IDEOGRAPH
+0xEDC8	0x67C0	#CJK UNIFIED IDEOGRAPH
+0xEDC9	0x6801	#CJK UNIFIED IDEOGRAPH
+0xEDCA	0x6844	#CJK UNIFIED IDEOGRAPH
+0xEDCB	0x68CF	#CJK UNIFIED IDEOGRAPH
+0xEDCC	0xFA13	#CJK COMPATIBILITY IDEOGRAPH
+0xEDCD	0x6968	#CJK UNIFIED IDEOGRAPH
+0xEDCE	0xFA14	#CJK COMPATIBILITY IDEOGRAPH
+0xEDCF	0x6998	#CJK UNIFIED IDEOGRAPH
+0xEDD0	0x69E2	#CJK UNIFIED IDEOGRAPH
+0xEDD1	0x6A30	#CJK UNIFIED IDEOGRAPH
+0xEDD2	0x6A6B	#CJK UNIFIED IDEOGRAPH
+0xEDD3	0x6A46	#CJK UNIFIED IDEOGRAPH
+0xEDD4	0x6A73	#CJK UNIFIED IDEOGRAPH
+0xEDD5	0x6A7E	#CJK UNIFIED IDEOGRAPH
+0xEDD6	0x6AE2	#CJK UNIFIED IDEOGRAPH
+0xEDD7	0x6AE4	#CJK UNIFIED IDEOGRAPH
+0xEDD8	0x6BD6	#CJK UNIFIED IDEOGRAPH
+0xEDD9	0x6C3F	#CJK UNIFIED IDEOGRAPH
+0xEDDA	0x6C5C	#CJK UNIFIED IDEOGRAPH
+0xEDDB	0x6C86	#CJK UNIFIED IDEOGRAPH
+0xEDDC	0x6C6F	#CJK UNIFIED IDEOGRAPH
+0xEDDD	0x6CDA	#CJK UNIFIED IDEOGRAPH
+0xEDDE	0x6D04	#CJK UNIFIED IDEOGRAPH
+0xEDDF	0x6D87	#CJK UNIFIED IDEOGRAPH
+0xEDE0	0x6D6F	#CJK UNIFIED IDEOGRAPH
+0xEDE1	0x6D96	#CJK UNIFIED IDEOGRAPH
+0xEDE2	0x6DAC	#CJK UNIFIED IDEOGRAPH
+0xEDE3	0x6DCF	#CJK UNIFIED IDEOGRAPH
+0xEDE4	0x6DF8	#CJK UNIFIED IDEOGRAPH
+0xEDE5	0x6DF2	#CJK UNIFIED IDEOGRAPH
+0xEDE6	0x6DFC	#CJK UNIFIED IDEOGRAPH
+0xEDE7	0x6E39	#CJK UNIFIED IDEOGRAPH
+0xEDE8	0x6E5C	#CJK UNIFIED IDEOGRAPH
+0xEDE9	0x6E27	#CJK UNIFIED IDEOGRAPH
+0xEDEA	0x6E3C	#CJK UNIFIED IDEOGRAPH
+0xEDEB	0x6EBF	#CJK UNIFIED IDEOGRAPH
+0xEDEC	0x6F88	#CJK UNIFIED IDEOGRAPH
+0xEDED	0x6FB5	#CJK UNIFIED IDEOGRAPH
+0xEDEE	0x6FF5	#CJK UNIFIED IDEOGRAPH
+0xEDEF	0x7005	#CJK UNIFIED IDEOGRAPH
+0xEDF0	0x7007	#CJK UNIFIED IDEOGRAPH
+0xEDF1	0x7028	#CJK UNIFIED IDEOGRAPH
+0xEDF2	0x7085	#CJK UNIFIED IDEOGRAPH
+0xEDF3	0x70AB	#CJK UNIFIED IDEOGRAPH
+0xEDF4	0x710F	#CJK UNIFIED IDEOGRAPH
+0xEDF5	0x7104	#CJK UNIFIED IDEOGRAPH
+0xEDF6	0x715C	#CJK UNIFIED IDEOGRAPH
+0xEDF7	0x7146	#CJK UNIFIED IDEOGRAPH
+0xEDF8	0x7147	#CJK UNIFIED IDEOGRAPH
+0xEDF9	0xFA15	#CJK COMPATIBILITY IDEOGRAPH
+0xEDFA	0x71C1	#CJK UNIFIED IDEOGRAPH
+0xEDFB	0x71FE	#CJK UNIFIED IDEOGRAPH
+0xEDFC	0x72B1	#CJK UNIFIED IDEOGRAPH
+0xEE40	0x72BE	#CJK UNIFIED IDEOGRAPH
+0xEE41	0x7324	#CJK UNIFIED IDEOGRAPH
+0xEE42	0xFA16	#CJK COMPATIBILITY IDEOGRAPH
+0xEE43	0x7377	#CJK UNIFIED IDEOGRAPH
+0xEE44	0x73BD	#CJK UNIFIED IDEOGRAPH
+0xEE45	0x73C9	#CJK UNIFIED IDEOGRAPH
+0xEE46	0x73D6	#CJK UNIFIED IDEOGRAPH
+0xEE47	0x73E3	#CJK UNIFIED IDEOGRAPH
+0xEE48	0x73D2	#CJK UNIFIED IDEOGRAPH
+0xEE49	0x7407	#CJK UNIFIED IDEOGRAPH
+0xEE4A	0x73F5	#CJK UNIFIED IDEOGRAPH
+0xEE4B	0x7426	#CJK UNIFIED IDEOGRAPH
+0xEE4C	0x742A	#CJK UNIFIED IDEOGRAPH
+0xEE4D	0x7429	#CJK UNIFIED IDEOGRAPH
+0xEE4E	0x742E	#CJK UNIFIED IDEOGRAPH
+0xEE4F	0x7462	#CJK UNIFIED IDEOGRAPH
+0xEE50	0x7489	#CJK UNIFIED IDEOGRAPH
+0xEE51	0x749F	#CJK UNIFIED IDEOGRAPH
+0xEE52	0x7501	#CJK UNIFIED IDEOGRAPH
+0xEE53	0x756F	#CJK UNIFIED IDEOGRAPH
+0xEE54	0x7682	#CJK UNIFIED IDEOGRAPH
+0xEE55	0x769C	#CJK UNIFIED IDEOGRAPH
+0xEE56	0x769E	#CJK UNIFIED IDEOGRAPH
+0xEE57	0x769B	#CJK UNIFIED IDEOGRAPH
+0xEE58	0x76A6	#CJK UNIFIED IDEOGRAPH
+0xEE59	0xFA17	#CJK COMPATIBILITY IDEOGRAPH
+0xEE5A	0x7746	#CJK UNIFIED IDEOGRAPH
+0xEE5B	0x52AF	#CJK UNIFIED IDEOGRAPH
+0xEE5C	0x7821	#CJK UNIFIED IDEOGRAPH
+0xEE5D	0x784E	#CJK UNIFIED IDEOGRAPH
+0xEE5E	0x7864	#CJK UNIFIED IDEOGRAPH
+0xEE5F	0x787A	#CJK UNIFIED IDEOGRAPH
+0xEE60	0x7930	#CJK UNIFIED IDEOGRAPH
+0xEE61	0xFA18	#CJK COMPATIBILITY IDEOGRAPH
+0xEE62	0xFA19	#CJK COMPATIBILITY IDEOGRAPH
+0xEE63	0xFA1A	#CJK COMPATIBILITY IDEOGRAPH
+0xEE64	0x7994	#CJK UNIFIED IDEOGRAPH
+0xEE65	0xFA1B	#CJK COMPATIBILITY IDEOGRAPH
+0xEE66	0x799B	#CJK UNIFIED IDEOGRAPH
+0xEE67	0x7AD1	#CJK UNIFIED IDEOGRAPH
+0xEE68	0x7AE7	#CJK UNIFIED IDEOGRAPH
+0xEE69	0xFA1C	#CJK COMPATIBILITY IDEOGRAPH
+0xEE6A	0x7AEB	#CJK UNIFIED IDEOGRAPH
+0xEE6B	0x7B9E	#CJK UNIFIED IDEOGRAPH
+0xEE6C	0xFA1D	#CJK COMPATIBILITY IDEOGRAPH
+0xEE6D	0x7D48	#CJK UNIFIED IDEOGRAPH
+0xEE6E	0x7D5C	#CJK UNIFIED IDEOGRAPH
+0xEE6F	0x7DB7	#CJK UNIFIED IDEOGRAPH
+0xEE70	0x7DA0	#CJK UNIFIED IDEOGRAPH
+0xEE71	0x7DD6	#CJK UNIFIED IDEOGRAPH
+0xEE72	0x7E52	#CJK UNIFIED IDEOGRAPH
+0xEE73	0x7F47	#CJK UNIFIED IDEOGRAPH
+0xEE74	0x7FA1	#CJK UNIFIED IDEOGRAPH
+0xEE75	0xFA1E	#CJK COMPATIBILITY IDEOGRAPH
+0xEE76	0x8301	#CJK UNIFIED IDEOGRAPH
+0xEE77	0x8362	#CJK UNIFIED IDEOGRAPH
+0xEE78	0x837F	#CJK UNIFIED IDEOGRAPH
+0xEE79	0x83C7	#CJK UNIFIED IDEOGRAPH
+0xEE7A	0x83F6	#CJK UNIFIED IDEOGRAPH
+0xEE7B	0x8448	#CJK UNIFIED IDEOGRAPH
+0xEE7C	0x84B4	#CJK UNIFIED IDEOGRAPH
+0xEE7D	0x8553	#CJK UNIFIED IDEOGRAPH
+0xEE7E	0x8559	#CJK UNIFIED IDEOGRAPH
+0xEE80	0x856B	#CJK UNIFIED IDEOGRAPH
+0xEE81	0xFA1F	#CJK COMPATIBILITY IDEOGRAPH
+0xEE82	0x85B0	#CJK UNIFIED IDEOGRAPH
+0xEE83	0xFA20	#CJK COMPATIBILITY IDEOGRAPH
+0xEE84	0xFA21	#CJK COMPATIBILITY IDEOGRAPH
+0xEE85	0x8807	#CJK UNIFIED IDEOGRAPH
+0xEE86	0x88F5	#CJK UNIFIED IDEOGRAPH
+0xEE87	0x8A12	#CJK UNIFIED IDEOGRAPH
+0xEE88	0x8A37	#CJK UNIFIED IDEOGRAPH
+0xEE89	0x8A79	#CJK UNIFIED IDEOGRAPH
+0xEE8A	0x8AA7	#CJK UNIFIED IDEOGRAPH
+0xEE8B	0x8ABE	#CJK UNIFIED IDEOGRAPH
+0xEE8C	0x8ADF	#CJK UNIFIED IDEOGRAPH
+0xEE8D	0xFA22	#CJK COMPATIBILITY IDEOGRAPH
+0xEE8E	0x8AF6	#CJK UNIFIED IDEOGRAPH
+0xEE8F	0x8B53	#CJK UNIFIED IDEOGRAPH
+0xEE90	0x8B7F	#CJK UNIFIED IDEOGRAPH
+0xEE91	0x8CF0	#CJK UNIFIED IDEOGRAPH
+0xEE92	0x8CF4	#CJK UNIFIED IDEOGRAPH
+0xEE93	0x8D12	#CJK UNIFIED IDEOGRAPH
+0xEE94	0x8D76	#CJK UNIFIED IDEOGRAPH
+0xEE95	0xFA23	#CJK COMPATIBILITY IDEOGRAPH
+0xEE96	0x8ECF	#CJK UNIFIED IDEOGRAPH
+0xEE97	0xFA24	#CJK COMPATIBILITY IDEOGRAPH
+0xEE98	0xFA25	#CJK COMPATIBILITY IDEOGRAPH
+0xEE99	0x9067	#CJK UNIFIED IDEOGRAPH
+0xEE9A	0x90DE	#CJK UNIFIED IDEOGRAPH
+0xEE9B	0xFA26	#CJK COMPATIBILITY IDEOGRAPH
+0xEE9C	0x9115	#CJK UNIFIED IDEOGRAPH
+0xEE9D	0x9127	#CJK UNIFIED IDEOGRAPH
+0xEE9E	0x91DA	#CJK UNIFIED IDEOGRAPH
+0xEE9F	0x91D7	#CJK UNIFIED IDEOGRAPH
+0xEEA0	0x91DE	#CJK UNIFIED IDEOGRAPH
+0xEEA1	0x91ED	#CJK UNIFIED IDEOGRAPH
+0xEEA2	0x91EE	#CJK UNIFIED IDEOGRAPH
+0xEEA3	0x91E4	#CJK UNIFIED IDEOGRAPH
+0xEEA4	0x91E5	#CJK UNIFIED IDEOGRAPH
+0xEEA5	0x9206	#CJK UNIFIED IDEOGRAPH
+0xEEA6	0x9210	#CJK UNIFIED IDEOGRAPH
+0xEEA7	0x920A	#CJK UNIFIED IDEOGRAPH
+0xEEA8	0x923A	#CJK UNIFIED IDEOGRAPH
+0xEEA9	0x9240	#CJK UNIFIED IDEOGRAPH
+0xEEAA	0x923C	#CJK UNIFIED IDEOGRAPH
+0xEEAB	0x924E	#CJK UNIFIED IDEOGRAPH
+0xEEAC	0x9259	#CJK UNIFIED IDEOGRAPH
+0xEEAD	0x9251	#CJK UNIFIED IDEOGRAPH
+0xEEAE	0x9239	#CJK UNIFIED IDEOGRAPH
+0xEEAF	0x9267	#CJK UNIFIED IDEOGRAPH
+0xEEB0	0x92A7	#CJK UNIFIED IDEOGRAPH
+0xEEB1	0x9277	#CJK UNIFIED IDEOGRAPH
+0xEEB2	0x9278	#CJK UNIFIED IDEOGRAPH
+0xEEB3	0x92E7	#CJK UNIFIED IDEOGRAPH
+0xEEB4	0x92D7	#CJK UNIFIED IDEOGRAPH
+0xEEB5	0x92D9	#CJK UNIFIED IDEOGRAPH
+0xEEB6	0x92D0	#CJK UNIFIED IDEOGRAPH
+0xEEB7	0xFA27	#CJK COMPATIBILITY IDEOGRAPH
+0xEEB8	0x92D5	#CJK UNIFIED IDEOGRAPH
+0xEEB9	0x92E0	#CJK UNIFIED IDEOGRAPH
+0xEEBA	0x92D3	#CJK UNIFIED IDEOGRAPH
+0xEEBB	0x9325	#CJK UNIFIED IDEOGRAPH
+0xEEBC	0x9321	#CJK UNIFIED IDEOGRAPH
+0xEEBD	0x92FB	#CJK UNIFIED IDEOGRAPH
+0xEEBE	0xFA28	#CJK COMPATIBILITY IDEOGRAPH
+0xEEBF	0x931E	#CJK UNIFIED IDEOGRAPH
+0xEEC0	0x92FF	#CJK UNIFIED IDEOGRAPH
+0xEEC1	0x931D	#CJK UNIFIED IDEOGRAPH
+0xEEC2	0x9302	#CJK UNIFIED IDEOGRAPH
+0xEEC3	0x9370	#CJK UNIFIED IDEOGRAPH
+0xEEC4	0x9357	#CJK UNIFIED IDEOGRAPH
+0xEEC5	0x93A4	#CJK UNIFIED IDEOGRAPH
+0xEEC6	0x93C6	#CJK UNIFIED IDEOGRAPH
+0xEEC7	0x93DE	#CJK UNIFIED IDEOGRAPH
+0xEEC8	0x93F8	#CJK UNIFIED IDEOGRAPH
+0xEEC9	0x9431	#CJK UNIFIED IDEOGRAPH
+0xEECA	0x9445	#CJK UNIFIED IDEOGRAPH
+0xEECB	0x9448	#CJK UNIFIED IDEOGRAPH
+0xEECC	0x9592	#CJK UNIFIED IDEOGRAPH
+0xEECD	0xF9DC	#CJK COMPATIBILITY IDEOGRAPH
+0xEECE	0xFA29	#CJK COMPATIBILITY IDEOGRAPH
+0xEECF	0x969D	#CJK UNIFIED IDEOGRAPH
+0xEED0	0x96AF	#CJK UNIFIED IDEOGRAPH
+0xEED1	0x9733	#CJK UNIFIED IDEOGRAPH
+0xEED2	0x973B	#CJK UNIFIED IDEOGRAPH
+0xEED3	0x9743	#CJK UNIFIED IDEOGRAPH
+0xEED4	0x974D	#CJK UNIFIED IDEOGRAPH
+0xEED5	0x974F	#CJK UNIFIED IDEOGRAPH
+0xEED6	0x9751	#CJK UNIFIED IDEOGRAPH
+0xEED7	0x9755	#CJK UNIFIED IDEOGRAPH
+0xEED8	0x9857	#CJK UNIFIED IDEOGRAPH
+0xEED9	0x9865	#CJK UNIFIED IDEOGRAPH
+0xEEDA	0xFA2A	#CJK COMPATIBILITY IDEOGRAPH
+0xEEDB	0xFA2B	#CJK COMPATIBILITY IDEOGRAPH
+0xEEDC	0x9927	#CJK UNIFIED IDEOGRAPH
+0xEEDD	0xFA2C	#CJK COMPATIBILITY IDEOGRAPH
+0xEEDE	0x999E	#CJK UNIFIED IDEOGRAPH
+0xEEDF	0x9A4E	#CJK UNIFIED IDEOGRAPH
+0xEEE0	0x9AD9	#CJK UNIFIED IDEOGRAPH
+0xEEE1	0x9ADC	#CJK UNIFIED IDEOGRAPH
+0xEEE2	0x9B75	#CJK UNIFIED IDEOGRAPH
+0xEEE3	0x9B72	#CJK UNIFIED IDEOGRAPH
+0xEEE4	0x9B8F	#CJK UNIFIED IDEOGRAPH
+0xEEE5	0x9BB1	#CJK UNIFIED IDEOGRAPH
+0xEEE6	0x9BBB	#CJK UNIFIED IDEOGRAPH
+0xEEE7	0x9C00	#CJK UNIFIED IDEOGRAPH
+0xEEE8	0x9D70	#CJK UNIFIED IDEOGRAPH
+0xEEE9	0x9D6B	#CJK UNIFIED IDEOGRAPH
+0xEEEA	0xFA2D	#CJK COMPATIBILITY IDEOGRAPH
+0xEEEB	0x9E19	#CJK UNIFIED IDEOGRAPH
+0xEEEC	0x9ED1	#CJK UNIFIED IDEOGRAPH
+0xEEEF	0x2170	#SMALL ROMAN NUMERAL ONE
+0xEEF0	0x2171	#SMALL ROMAN NUMERAL TWO
+0xEEF1	0x2172	#SMALL ROMAN NUMERAL THREE
+0xEEF2	0x2173	#SMALL ROMAN NUMERAL FOUR
+0xEEF3	0x2174	#SMALL ROMAN NUMERAL FIVE
+0xEEF4	0x2175	#SMALL ROMAN NUMERAL SIX
+0xEEF5	0x2176	#SMALL ROMAN NUMERAL SEVEN
+0xEEF6	0x2177	#SMALL ROMAN NUMERAL EIGHT
+0xEEF7	0x2178	#SMALL ROMAN NUMERAL NINE
+0xEEF8	0x2179	#SMALL ROMAN NUMERAL TEN
+0xEEF9	0xFFE2	#FULLWIDTH NOT SIGN
+0xEEFA	0xFFE4	#FULLWIDTH BROKEN BAR
+0xEEFB	0xFF07	#FULLWIDTH APOSTROPHE
+0xEEFC	0xFF02	#FULLWIDTH QUOTATION MARK
+0xFA40	0x2170	#SMALL ROMAN NUMERAL ONE
+0xFA41	0x2171	#SMALL ROMAN NUMERAL TWO
+0xFA42	0x2172	#SMALL ROMAN NUMERAL THREE
+0xFA43	0x2173	#SMALL ROMAN NUMERAL FOUR
+0xFA44	0x2174	#SMALL ROMAN NUMERAL FIVE
+0xFA45	0x2175	#SMALL ROMAN NUMERAL SIX
+0xFA46	0x2176	#SMALL ROMAN NUMERAL SEVEN
+0xFA47	0x2177	#SMALL ROMAN NUMERAL EIGHT
+0xFA48	0x2178	#SMALL ROMAN NUMERAL NINE
+0xFA49	0x2179	#SMALL ROMAN NUMERAL TEN
+0xFA4A	0x2160	#ROMAN NUMERAL ONE
+0xFA4B	0x2161	#ROMAN NUMERAL TWO
+0xFA4C	0x2162	#ROMAN NUMERAL THREE
+0xFA4D	0x2163	#ROMAN NUMERAL FOUR
+0xFA4E	0x2164	#ROMAN NUMERAL FIVE
+0xFA4F	0x2165	#ROMAN NUMERAL SIX
+0xFA50	0x2166	#ROMAN NUMERAL SEVEN
+0xFA51	0x2167	#ROMAN NUMERAL EIGHT
+0xFA52	0x2168	#ROMAN NUMERAL NINE
+0xFA53	0x2169	#ROMAN NUMERAL TEN
+0xFA54	0xFFE2	#FULLWIDTH NOT SIGN
+0xFA55	0xFFE4	#FULLWIDTH BROKEN BAR
+0xFA56	0xFF07	#FULLWIDTH APOSTROPHE
+0xFA57	0xFF02	#FULLWIDTH QUOTATION MARK
+0xFA58	0x3231	#PARENTHESIZED IDEOGRAPH STOCK
+0xFA59	0x2116	#NUMERO SIGN
+0xFA5A	0x2121	#TELEPHONE SIGN
+0xFA5B	0x2235	#BECAUSE
+0xFA5C	0x7E8A	#CJK UNIFIED IDEOGRAPH
+0xFA5D	0x891C	#CJK UNIFIED IDEOGRAPH
+0xFA5E	0x9348	#CJK UNIFIED IDEOGRAPH
+0xFA5F	0x9288	#CJK UNIFIED IDEOGRAPH
+0xFA60	0x84DC	#CJK UNIFIED IDEOGRAPH
+0xFA61	0x4FC9	#CJK UNIFIED IDEOGRAPH
+0xFA62	0x70BB	#CJK UNIFIED IDEOGRAPH
+0xFA63	0x6631	#CJK UNIFIED IDEOGRAPH
+0xFA64	0x68C8	#CJK UNIFIED IDEOGRAPH
+0xFA65	0x92F9	#CJK UNIFIED IDEOGRAPH
+0xFA66	0x66FB	#CJK UNIFIED IDEOGRAPH
+0xFA67	0x5F45	#CJK UNIFIED IDEOGRAPH
+0xFA68	0x4E28	#CJK UNIFIED IDEOGRAPH
+0xFA69	0x4EE1	#CJK UNIFIED IDEOGRAPH
+0xFA6A	0x4EFC	#CJK UNIFIED IDEOGRAPH
+0xFA6B	0x4F00	#CJK UNIFIED IDEOGRAPH
+0xFA6C	0x4F03	#CJK UNIFIED IDEOGRAPH
+0xFA6D	0x4F39	#CJK UNIFIED IDEOGRAPH
+0xFA6E	0x4F56	#CJK UNIFIED IDEOGRAPH
+0xFA6F	0x4F92	#CJK UNIFIED IDEOGRAPH
+0xFA70	0x4F8A	#CJK UNIFIED IDEOGRAPH
+0xFA71	0x4F9A	#CJK UNIFIED IDEOGRAPH
+0xFA72	0x4F94	#CJK UNIFIED IDEOGRAPH
+0xFA73	0x4FCD	#CJK UNIFIED IDEOGRAPH
+0xFA74	0x5040	#CJK UNIFIED IDEOGRAPH
+0xFA75	0x5022	#CJK UNIFIED IDEOGRAPH
+0xFA76	0x4FFF	#CJK UNIFIED IDEOGRAPH
+0xFA77	0x501E	#CJK UNIFIED IDEOGRAPH
+0xFA78	0x5046	#CJK UNIFIED IDEOGRAPH
+0xFA79	0x5070	#CJK UNIFIED IDEOGRAPH
+0xFA7A	0x5042	#CJK UNIFIED IDEOGRAPH
+0xFA7B	0x5094	#CJK UNIFIED IDEOGRAPH
+0xFA7C	0x50F4	#CJK UNIFIED IDEOGRAPH
+0xFA7D	0x50D8	#CJK UNIFIED IDEOGRAPH
+0xFA7E	0x514A	#CJK UNIFIED IDEOGRAPH
+0xFA80	0x5164	#CJK UNIFIED IDEOGRAPH
+0xFA81	0x519D	#CJK UNIFIED IDEOGRAPH
+0xFA82	0x51BE	#CJK UNIFIED IDEOGRAPH
+0xFA83	0x51EC	#CJK UNIFIED IDEOGRAPH
+0xFA84	0x5215	#CJK UNIFIED IDEOGRAPH
+0xFA85	0x529C	#CJK UNIFIED IDEOGRAPH
+0xFA86	0x52A6	#CJK UNIFIED IDEOGRAPH
+0xFA87	0x52C0	#CJK UNIFIED IDEOGRAPH
+0xFA88	0x52DB	#CJK UNIFIED IDEOGRAPH
+0xFA89	0x5300	#CJK UNIFIED IDEOGRAPH
+0xFA8A	0x5307	#CJK UNIFIED IDEOGRAPH
+0xFA8B	0x5324	#CJK UNIFIED IDEOGRAPH
+0xFA8C	0x5372	#CJK UNIFIED IDEOGRAPH
+0xFA8D	0x5393	#CJK UNIFIED IDEOGRAPH
+0xFA8E	0x53B2	#CJK UNIFIED IDEOGRAPH
+0xFA8F	0x53DD	#CJK UNIFIED IDEOGRAPH
+0xFA90	0xFA0E	#CJK COMPATIBILITY IDEOGRAPH
+0xFA91	0x549C	#CJK UNIFIED IDEOGRAPH
+0xFA92	0x548A	#CJK UNIFIED IDEOGRAPH
+0xFA93	0x54A9	#CJK UNIFIED IDEOGRAPH
+0xFA94	0x54FF	#CJK UNIFIED IDEOGRAPH
+0xFA95	0x5586	#CJK UNIFIED IDEOGRAPH
+0xFA96	0x5759	#CJK UNIFIED IDEOGRAPH
+0xFA97	0x5765	#CJK UNIFIED IDEOGRAPH
+0xFA98	0x57AC	#CJK UNIFIED IDEOGRAPH
+0xFA99	0x57C8	#CJK UNIFIED IDEOGRAPH
+0xFA9A	0x57C7	#CJK UNIFIED IDEOGRAPH
+0xFA9B	0xFA0F	#CJK COMPATIBILITY IDEOGRAPH
+0xFA9C	0xFA10	#CJK COMPATIBILITY IDEOGRAPH
+0xFA9D	0x589E	#CJK UNIFIED IDEOGRAPH
+0xFA9E	0x58B2	#CJK UNIFIED IDEOGRAPH
+0xFA9F	0x590B	#CJK UNIFIED IDEOGRAPH
+0xFAA0	0x5953	#CJK UNIFIED IDEOGRAPH
+0xFAA1	0x595B	#CJK UNIFIED IDEOGRAPH
+0xFAA2	0x595D	#CJK UNIFIED IDEOGRAPH
+0xFAA3	0x5963	#CJK UNIFIED IDEOGRAPH
+0xFAA4	0x59A4	#CJK UNIFIED IDEOGRAPH
+0xFAA5	0x59BA	#CJK UNIFIED IDEOGRAPH
+0xFAA6	0x5B56	#CJK UNIFIED IDEOGRAPH
+0xFAA7	0x5BC0	#CJK UNIFIED IDEOGRAPH
+0xFAA8	0x752F	#CJK UNIFIED IDEOGRAPH
+0xFAA9	0x5BD8	#CJK UNIFIED IDEOGRAPH
+0xFAAA	0x5BEC	#CJK UNIFIED IDEOGRAPH
+0xFAAB	0x5C1E	#CJK UNIFIED IDEOGRAPH
+0xFAAC	0x5CA6	#CJK UNIFIED IDEOGRAPH
+0xFAAD	0x5CBA	#CJK UNIFIED IDEOGRAPH
+0xFAAE	0x5CF5	#CJK UNIFIED IDEOGRAPH
+0xFAAF	0x5D27	#CJK UNIFIED IDEOGRAPH
+0xFAB0	0x5D53	#CJK UNIFIED IDEOGRAPH
+0xFAB1	0xFA11	#CJK COMPATIBILITY IDEOGRAPH
+0xFAB2	0x5D42	#CJK UNIFIED IDEOGRAPH
+0xFAB3	0x5D6D	#CJK UNIFIED IDEOGRAPH
+0xFAB4	0x5DB8	#CJK UNIFIED IDEOGRAPH
+0xFAB5	0x5DB9	#CJK UNIFIED IDEOGRAPH
+0xFAB6	0x5DD0	#CJK UNIFIED IDEOGRAPH
+0xFAB7	0x5F21	#CJK UNIFIED IDEOGRAPH
+0xFAB8	0x5F34	#CJK UNIFIED IDEOGRAPH
+0xFAB9	0x5F67	#CJK UNIFIED IDEOGRAPH
+0xFABA	0x5FB7	#CJK UNIFIED IDEOGRAPH
+0xFABB	0x5FDE	#CJK UNIFIED IDEOGRAPH
+0xFABC	0x605D	#CJK UNIFIED IDEOGRAPH
+0xFABD	0x6085	#CJK UNIFIED IDEOGRAPH
+0xFABE	0x608A	#CJK UNIFIED IDEOGRAPH
+0xFABF	0x60DE	#CJK UNIFIED IDEOGRAPH
+0xFAC0	0x60D5	#CJK UNIFIED IDEOGRAPH
+0xFAC1	0x6120	#CJK UNIFIED IDEOGRAPH
+0xFAC2	0x60F2	#CJK UNIFIED IDEOGRAPH
+0xFAC3	0x6111	#CJK UNIFIED IDEOGRAPH
+0xFAC4	0x6137	#CJK UNIFIED IDEOGRAPH
+0xFAC5	0x6130	#CJK UNIFIED IDEOGRAPH
+0xFAC6	0x6198	#CJK UNIFIED IDEOGRAPH
+0xFAC7	0x6213	#CJK UNIFIED IDEOGRAPH
+0xFAC8	0x62A6	#CJK UNIFIED IDEOGRAPH
+0xFAC9	0x63F5	#CJK UNIFIED IDEOGRAPH
+0xFACA	0x6460	#CJK UNIFIED IDEOGRAPH
+0xFACB	0x649D	#CJK UNIFIED IDEOGRAPH
+0xFACC	0x64CE	#CJK UNIFIED IDEOGRAPH
+0xFACD	0x654E	#CJK UNIFIED IDEOGRAPH
+0xFACE	0x6600	#CJK UNIFIED IDEOGRAPH
+0xFACF	0x6615	#CJK UNIFIED IDEOGRAPH
+0xFAD0	0x663B	#CJK UNIFIED IDEOGRAPH
+0xFAD1	0x6609	#CJK UNIFIED IDEOGRAPH
+0xFAD2	0x662E	#CJK UNIFIED IDEOGRAPH
+0xFAD3	0x661E	#CJK UNIFIED IDEOGRAPH
+0xFAD4	0x6624	#CJK UNIFIED IDEOGRAPH
+0xFAD5	0x6665	#CJK UNIFIED IDEOGRAPH
+0xFAD6	0x6657	#CJK UNIFIED IDEOGRAPH
+0xFAD7	0x6659	#CJK UNIFIED IDEOGRAPH
+0xFAD8	0xFA12	#CJK COMPATIBILITY IDEOGRAPH
+0xFAD9	0x6673	#CJK UNIFIED IDEOGRAPH
+0xFADA	0x6699	#CJK UNIFIED IDEOGRAPH
+0xFADB	0x66A0	#CJK UNIFIED IDEOGRAPH
+0xFADC	0x66B2	#CJK UNIFIED IDEOGRAPH
+0xFADD	0x66BF	#CJK UNIFIED IDEOGRAPH
+0xFADE	0x66FA	#CJK UNIFIED IDEOGRAPH
+0xFADF	0x670E	#CJK UNIFIED IDEOGRAPH
+0xFAE0	0xF929	#CJK COMPATIBILITY IDEOGRAPH
+0xFAE1	0x6766	#CJK UNIFIED IDEOGRAPH
+0xFAE2	0x67BB	#CJK UNIFIED IDEOGRAPH
+0xFAE3	0x6852	#CJK UNIFIED IDEOGRAPH
+0xFAE4	0x67C0	#CJK UNIFIED IDEOGRAPH
+0xFAE5	0x6801	#CJK UNIFIED IDEOGRAPH
+0xFAE6	0x6844	#CJK UNIFIED IDEOGRAPH
+0xFAE7	0x68CF	#CJK UNIFIED IDEOGRAPH
+0xFAE8	0xFA13	#CJK COMPATIBILITY IDEOGRAPH
+0xFAE9	0x6968	#CJK UNIFIED IDEOGRAPH
+0xFAEA	0xFA14	#CJK COMPATIBILITY IDEOGRAPH
+0xFAEB	0x6998	#CJK UNIFIED IDEOGRAPH
+0xFAEC	0x69E2	#CJK UNIFIED IDEOGRAPH
+0xFAED	0x6A30	#CJK UNIFIED IDEOGRAPH
+0xFAEE	0x6A6B	#CJK UNIFIED IDEOGRAPH
+0xFAEF	0x6A46	#CJK UNIFIED IDEOGRAPH
+0xFAF0	0x6A73	#CJK UNIFIED IDEOGRAPH
+0xFAF1	0x6A7E	#CJK UNIFIED IDEOGRAPH
+0xFAF2	0x6AE2	#CJK UNIFIED IDEOGRAPH
+0xFAF3	0x6AE4	#CJK UNIFIED IDEOGRAPH
+0xFAF4	0x6BD6	#CJK UNIFIED IDEOGRAPH
+0xFAF5	0x6C3F	#CJK UNIFIED IDEOGRAPH
+0xFAF6	0x6C5C	#CJK UNIFIED IDEOGRAPH
+0xFAF7	0x6C86	#CJK UNIFIED IDEOGRAPH
+0xFAF8	0x6C6F	#CJK UNIFIED IDEOGRAPH
+0xFAF9	0x6CDA	#CJK UNIFIED IDEOGRAPH
+0xFAFA	0x6D04	#CJK UNIFIED IDEOGRAPH
+0xFAFB	0x6D87	#CJK UNIFIED IDEOGRAPH
+0xFAFC	0x6D6F	#CJK UNIFIED IDEOGRAPH
+0xFB40	0x6D96	#CJK UNIFIED IDEOGRAPH
+0xFB41	0x6DAC	#CJK UNIFIED IDEOGRAPH
+0xFB42	0x6DCF	#CJK UNIFIED IDEOGRAPH
+0xFB43	0x6DF8	#CJK UNIFIED IDEOGRAPH
+0xFB44	0x6DF2	#CJK UNIFIED IDEOGRAPH
+0xFB45	0x6DFC	#CJK UNIFIED IDEOGRAPH
+0xFB46	0x6E39	#CJK UNIFIED IDEOGRAPH
+0xFB47	0x6E5C	#CJK UNIFIED IDEOGRAPH
+0xFB48	0x6E27	#CJK UNIFIED IDEOGRAPH
+0xFB49	0x6E3C	#CJK UNIFIED IDEOGRAPH
+0xFB4A	0x6EBF	#CJK UNIFIED IDEOGRAPH
+0xFB4B	0x6F88	#CJK UNIFIED IDEOGRAPH
+0xFB4C	0x6FB5	#CJK UNIFIED IDEOGRAPH
+0xFB4D	0x6FF5	#CJK UNIFIED IDEOGRAPH
+0xFB4E	0x7005	#CJK UNIFIED IDEOGRAPH
+0xFB4F	0x7007	#CJK UNIFIED IDEOGRAPH
+0xFB50	0x7028	#CJK UNIFIED IDEOGRAPH
+0xFB51	0x7085	#CJK UNIFIED IDEOGRAPH
+0xFB52	0x70AB	#CJK UNIFIED IDEOGRAPH
+0xFB53	0x710F	#CJK UNIFIED IDEOGRAPH
+0xFB54	0x7104	#CJK UNIFIED IDEOGRAPH
+0xFB55	0x715C	#CJK UNIFIED IDEOGRAPH
+0xFB56	0x7146	#CJK UNIFIED IDEOGRAPH
+0xFB57	0x7147	#CJK UNIFIED IDEOGRAPH
+0xFB58	0xFA15	#CJK COMPATIBILITY IDEOGRAPH
+0xFB59	0x71C1	#CJK UNIFIED IDEOGRAPH
+0xFB5A	0x71FE	#CJK UNIFIED IDEOGRAPH
+0xFB5B	0x72B1	#CJK UNIFIED IDEOGRAPH
+0xFB5C	0x72BE	#CJK UNIFIED IDEOGRAPH
+0xFB5D	0x7324	#CJK UNIFIED IDEOGRAPH
+0xFB5E	0xFA16	#CJK COMPATIBILITY IDEOGRAPH
+0xFB5F	0x7377	#CJK UNIFIED IDEOGRAPH
+0xFB60	0x73BD	#CJK UNIFIED IDEOGRAPH
+0xFB61	0x73C9	#CJK UNIFIED IDEOGRAPH
+0xFB62	0x73D6	#CJK UNIFIED IDEOGRAPH
+0xFB63	0x73E3	#CJK UNIFIED IDEOGRAPH
+0xFB64	0x73D2	#CJK UNIFIED IDEOGRAPH
+0xFB65	0x7407	#CJK UNIFIED IDEOGRAPH
+0xFB66	0x73F5	#CJK UNIFIED IDEOGRAPH
+0xFB67	0x7426	#CJK UNIFIED IDEOGRAPH
+0xFB68	0x742A	#CJK UNIFIED IDEOGRAPH
+0xFB69	0x7429	#CJK UNIFIED IDEOGRAPH
+0xFB6A	0x742E	#CJK UNIFIED IDEOGRAPH
+0xFB6B	0x7462	#CJK UNIFIED IDEOGRAPH
+0xFB6C	0x7489	#CJK UNIFIED IDEOGRAPH
+0xFB6D	0x749F	#CJK UNIFIED IDEOGRAPH
+0xFB6E	0x7501	#CJK UNIFIED IDEOGRAPH
+0xFB6F	0x756F	#CJK UNIFIED IDEOGRAPH
+0xFB70	0x7682	#CJK UNIFIED IDEOGRAPH
+0xFB71	0x769C	#CJK UNIFIED IDEOGRAPH
+0xFB72	0x769E	#CJK UNIFIED IDEOGRAPH
+0xFB73	0x769B	#CJK UNIFIED IDEOGRAPH
+0xFB74	0x76A6	#CJK UNIFIED IDEOGRAPH
+0xFB75	0xFA17	#CJK COMPATIBILITY IDEOGRAPH
+0xFB76	0x7746	#CJK UNIFIED IDEOGRAPH
+0xFB77	0x52AF	#CJK UNIFIED IDEOGRAPH
+0xFB78	0x7821	#CJK UNIFIED IDEOGRAPH
+0xFB79	0x784E	#CJK UNIFIED IDEOGRAPH
+0xFB7A	0x7864	#CJK UNIFIED IDEOGRAPH
+0xFB7B	0x787A	#CJK UNIFIED IDEOGRAPH
+0xFB7C	0x7930	#CJK UNIFIED IDEOGRAPH
+0xFB7D	0xFA18	#CJK COMPATIBILITY IDEOGRAPH
+0xFB7E	0xFA19	#CJK COMPATIBILITY IDEOGRAPH
+0xFB80	0xFA1A	#CJK COMPATIBILITY IDEOGRAPH
+0xFB81	0x7994	#CJK UNIFIED IDEOGRAPH
+0xFB82	0xFA1B	#CJK COMPATIBILITY IDEOGRAPH
+0xFB83	0x799B	#CJK UNIFIED IDEOGRAPH
+0xFB84	0x7AD1	#CJK UNIFIED IDEOGRAPH
+0xFB85	0x7AE7	#CJK UNIFIED IDEOGRAPH
+0xFB86	0xFA1C	#CJK COMPATIBILITY IDEOGRAPH
+0xFB87	0x7AEB	#CJK UNIFIED IDEOGRAPH
+0xFB88	0x7B9E	#CJK UNIFIED IDEOGRAPH
+0xFB89	0xFA1D	#CJK COMPATIBILITY IDEOGRAPH
+0xFB8A	0x7D48	#CJK UNIFIED IDEOGRAPH
+0xFB8B	0x7D5C	#CJK UNIFIED IDEOGRAPH
+0xFB8C	0x7DB7	#CJK UNIFIED IDEOGRAPH
+0xFB8D	0x7DA0	#CJK UNIFIED IDEOGRAPH
+0xFB8E	0x7DD6	#CJK UNIFIED IDEOGRAPH
+0xFB8F	0x7E52	#CJK UNIFIED IDEOGRAPH
+0xFB90	0x7F47	#CJK UNIFIED IDEOGRAPH
+0xFB91	0x7FA1	#CJK UNIFIED IDEOGRAPH
+0xFB92	0xFA1E	#CJK COMPATIBILITY IDEOGRAPH
+0xFB93	0x8301	#CJK UNIFIED IDEOGRAPH
+0xFB94	0x8362	#CJK UNIFIED IDEOGRAPH
+0xFB95	0x837F	#CJK UNIFIED IDEOGRAPH
+0xFB96	0x83C7	#CJK UNIFIED IDEOGRAPH
+0xFB97	0x83F6	#CJK UNIFIED IDEOGRAPH
+0xFB98	0x8448	#CJK UNIFIED IDEOGRAPH
+0xFB99	0x84B4	#CJK UNIFIED IDEOGRAPH
+0xFB9A	0x8553	#CJK UNIFIED IDEOGRAPH
+0xFB9B	0x8559	#CJK UNIFIED IDEOGRAPH
+0xFB9C	0x856B	#CJK UNIFIED IDEOGRAPH
+0xFB9D	0xFA1F	#CJK COMPATIBILITY IDEOGRAPH
+0xFB9E	0x85B0	#CJK UNIFIED IDEOGRAPH
+0xFB9F	0xFA20	#CJK COMPATIBILITY IDEOGRAPH
+0xFBA0	0xFA21	#CJK COMPATIBILITY IDEOGRAPH
+0xFBA1	0x8807	#CJK UNIFIED IDEOGRAPH
+0xFBA2	0x88F5	#CJK UNIFIED IDEOGRAPH
+0xFBA3	0x8A12	#CJK UNIFIED IDEOGRAPH
+0xFBA4	0x8A37	#CJK UNIFIED IDEOGRAPH
+0xFBA5	0x8A79	#CJK UNIFIED IDEOGRAPH
+0xFBA6	0x8AA7	#CJK UNIFIED IDEOGRAPH
+0xFBA7	0x8ABE	#CJK UNIFIED IDEOGRAPH
+0xFBA8	0x8ADF	#CJK UNIFIED IDEOGRAPH
+0xFBA9	0xFA22	#CJK COMPATIBILITY IDEOGRAPH
+0xFBAA	0x8AF6	#CJK UNIFIED IDEOGRAPH
+0xFBAB	0x8B53	#CJK UNIFIED IDEOGRAPH
+0xFBAC	0x8B7F	#CJK UNIFIED IDEOGRAPH
+0xFBAD	0x8CF0	#CJK UNIFIED IDEOGRAPH
+0xFBAE	0x8CF4	#CJK UNIFIED IDEOGRAPH
+0xFBAF	0x8D12	#CJK UNIFIED IDEOGRAPH
+0xFBB0	0x8D76	#CJK UNIFIED IDEOGRAPH
+0xFBB1	0xFA23	#CJK COMPATIBILITY IDEOGRAPH
+0xFBB2	0x8ECF	#CJK UNIFIED IDEOGRAPH
+0xFBB3	0xFA24	#CJK COMPATIBILITY IDEOGRAPH
+0xFBB4	0xFA25	#CJK COMPATIBILITY IDEOGRAPH
+0xFBB5	0x9067	#CJK UNIFIED IDEOGRAPH
+0xFBB6	0x90DE	#CJK UNIFIED IDEOGRAPH
+0xFBB7	0xFA26	#CJK COMPATIBILITY IDEOGRAPH
+0xFBB8	0x9115	#CJK UNIFIED IDEOGRAPH
+0xFBB9	0x9127	#CJK UNIFIED IDEOGRAPH
+0xFBBA	0x91DA	#CJK UNIFIED IDEOGRAPH
+0xFBBB	0x91D7	#CJK UNIFIED IDEOGRAPH
+0xFBBC	0x91DE	#CJK UNIFIED IDEOGRAPH
+0xFBBD	0x91ED	#CJK UNIFIED IDEOGRAPH
+0xFBBE	0x91EE	#CJK UNIFIED IDEOGRAPH
+0xFBBF	0x91E4	#CJK UNIFIED IDEOGRAPH
+0xFBC0	0x91E5	#CJK UNIFIED IDEOGRAPH
+0xFBC1	0x9206	#CJK UNIFIED IDEOGRAPH
+0xFBC2	0x9210	#CJK UNIFIED IDEOGRAPH
+0xFBC3	0x920A	#CJK UNIFIED IDEOGRAPH
+0xFBC4	0x923A	#CJK UNIFIED IDEOGRAPH
+0xFBC5	0x9240	#CJK UNIFIED IDEOGRAPH
+0xFBC6	0x923C	#CJK UNIFIED IDEOGRAPH
+0xFBC7	0x924E	#CJK UNIFIED IDEOGRAPH
+0xFBC8	0x9259	#CJK UNIFIED IDEOGRAPH
+0xFBC9	0x9251	#CJK UNIFIED IDEOGRAPH
+0xFBCA	0x9239	#CJK UNIFIED IDEOGRAPH
+0xFBCB	0x9267	#CJK UNIFIED IDEOGRAPH
+0xFBCC	0x92A7	#CJK UNIFIED IDEOGRAPH
+0xFBCD	0x9277	#CJK UNIFIED IDEOGRAPH
+0xFBCE	0x9278	#CJK UNIFIED IDEOGRAPH
+0xFBCF	0x92E7	#CJK UNIFIED IDEOGRAPH
+0xFBD0	0x92D7	#CJK UNIFIED IDEOGRAPH
+0xFBD1	0x92D9	#CJK UNIFIED IDEOGRAPH
+0xFBD2	0x92D0	#CJK UNIFIED IDEOGRAPH
+0xFBD3	0xFA27	#CJK COMPATIBILITY IDEOGRAPH
+0xFBD4	0x92D5	#CJK UNIFIED IDEOGRAPH
+0xFBD5	0x92E0	#CJK UNIFIED IDEOGRAPH
+0xFBD6	0x92D3	#CJK UNIFIED IDEOGRAPH
+0xFBD7	0x9325	#CJK UNIFIED IDEOGRAPH
+0xFBD8	0x9321	#CJK UNIFIED IDEOGRAPH
+0xFBD9	0x92FB	#CJK UNIFIED IDEOGRAPH
+0xFBDA	0xFA28	#CJK COMPATIBILITY IDEOGRAPH
+0xFBDB	0x931E	#CJK UNIFIED IDEOGRAPH
+0xFBDC	0x92FF	#CJK UNIFIED IDEOGRAPH
+0xFBDD	0x931D	#CJK UNIFIED IDEOGRAPH
+0xFBDE	0x9302	#CJK UNIFIED IDEOGRAPH
+0xFBDF	0x9370	#CJK UNIFIED IDEOGRAPH
+0xFBE0	0x9357	#CJK UNIFIED IDEOGRAPH
+0xFBE1	0x93A4	#CJK UNIFIED IDEOGRAPH
+0xFBE2	0x93C6	#CJK UNIFIED IDEOGRAPH
+0xFBE3	0x93DE	#CJK UNIFIED IDEOGRAPH
+0xFBE4	0x93F8	#CJK UNIFIED IDEOGRAPH
+0xFBE5	0x9431	#CJK UNIFIED IDEOGRAPH
+0xFBE6	0x9445	#CJK UNIFIED IDEOGRAPH
+0xFBE7	0x9448	#CJK UNIFIED IDEOGRAPH
+0xFBE8	0x9592	#CJK UNIFIED IDEOGRAPH
+0xFBE9	0xF9DC	#CJK COMPATIBILITY IDEOGRAPH
+0xFBEA	0xFA29	#CJK COMPATIBILITY IDEOGRAPH
+0xFBEB	0x969D	#CJK UNIFIED IDEOGRAPH
+0xFBEC	0x96AF	#CJK UNIFIED IDEOGRAPH
+0xFBED	0x9733	#CJK UNIFIED IDEOGRAPH
+0xFBEE	0x973B	#CJK UNIFIED IDEOGRAPH
+0xFBEF	0x9743	#CJK UNIFIED IDEOGRAPH
+0xFBF0	0x974D	#CJK UNIFIED IDEOGRAPH
+0xFBF1	0x974F	#CJK UNIFIED IDEOGRAPH
+0xFBF2	0x9751	#CJK UNIFIED IDEOGRAPH
+0xFBF3	0x9755	#CJK UNIFIED IDEOGRAPH
+0xFBF4	0x9857	#CJK UNIFIED IDEOGRAPH
+0xFBF5	0x9865	#CJK UNIFIED IDEOGRAPH
+0xFBF6	0xFA2A	#CJK COMPATIBILITY IDEOGRAPH
+0xFBF7	0xFA2B	#CJK COMPATIBILITY IDEOGRAPH
+0xFBF8	0x9927	#CJK UNIFIED IDEOGRAPH
+0xFBF9	0xFA2C	#CJK COMPATIBILITY IDEOGRAPH
+0xFBFA	0x999E	#CJK UNIFIED IDEOGRAPH
+0xFBFB	0x9A4E	#CJK UNIFIED IDEOGRAPH
+0xFBFC	0x9AD9	#CJK UNIFIED IDEOGRAPH
+0xFC40	0x9ADC	#CJK UNIFIED IDEOGRAPH
+0xFC41	0x9B75	#CJK UNIFIED IDEOGRAPH
+0xFC42	0x9B72	#CJK UNIFIED IDEOGRAPH
+0xFC43	0x9B8F	#CJK UNIFIED IDEOGRAPH
+0xFC44	0x9BB1	#CJK UNIFIED IDEOGRAPH
+0xFC45	0x9BBB	#CJK UNIFIED IDEOGRAPH
+0xFC46	0x9C00	#CJK UNIFIED IDEOGRAPH
+0xFC47	0x9D70	#CJK UNIFIED IDEOGRAPH
+0xFC48	0x9D6B	#CJK UNIFIED IDEOGRAPH
+0xFC49	0xFA2D	#CJK COMPATIBILITY IDEOGRAPH
+0xFC4A	0x9E19	#CJK UNIFIED IDEOGRAPH
+0xFC4B	0x9ED1	#CJK UNIFIED IDEOGRAPH
diff --git a/basis/io/encodings/japanese/authors.txt b/basis/io/encodings/japanese/authors.txt
new file mode 100644
index 0000000000..f990dd0ed2
--- /dev/null
+++ b/basis/io/encodings/japanese/authors.txt
@@ -0,0 +1 @@
+Daniel Ehrenberg
diff --git a/basis/io/encodings/japanese/japanese-docs.factor b/basis/io/encodings/japanese/japanese-docs.factor
new file mode 100644
index 0000000000..48f94af7b4
--- /dev/null
+++ b/basis/io/encodings/japanese/japanese-docs.factor
@@ -0,0 +1,19 @@
+! Copyright (C) 2009 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax ;
+IN: io.encodings.japanese
+
+ARTICLE: "io.encodings.japanese" "Japanese text encodings"
+"Several encodings are used for Japanese text besides the standard UTF encodings for Unicode strings. These are mostly based on the character set defined in the JIS X 208 standard. Current coverage of encodings is incomplete."
+{ $subsection shift-jis }
+{ $subsection windows-31j } ;
+
+ABOUT: "io.encodings.japanese"
+
+HELP: windows-31j
+{ $class-description "The encoding descriptor Windows-31J, which is sometimes informally called Shift JIS. This is based on Code Page 932." }
+{ $see-also "encodings-introduction" shift-jis } ;
+
+HELP: shift-jis
+{ $class-description "The encoding descriptor for Shift JIS, or JIS X 208:1997 Appendix 1. Microsoft extensions are not included." }
+{ $see-also "encodings-introduction" windows-31j } ;
diff --git a/basis/io/encodings/japanese/japanese-tests.factor b/basis/io/encodings/japanese/japanese-tests.factor
new file mode 100644
index 0000000000..4304c308cd
--- /dev/null
+++ b/basis/io/encodings/japanese/japanese-tests.factor
@@ -0,0 +1,17 @@
+! Copyright (C) 2009 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
+USING: io.encodings.japanese tools.test io.encodings.string arrays strings ;
+IN: io.encodings.japanese.tests
+
+[ { CHAR: replacement-character } ] [ { 141 } shift-jis decode >array ] unit-test
+[ "" ] [ "" shift-jis decode >string ] unit-test
+[ "" ] [ "" shift-jis encode >string ] unit-test
+[ { CHAR: replacement-character } shift-jis encode ] must-fail
+[ "ab¥ｨ" ] [ { CHAR: a CHAR: b HEX: 5C HEX: A8 } shift-jis decode ] unit-test
+[ { CHAR: a CHAR: b HEX: 5C HEX: A8 } ] [ "ab¥ｨ" shift-jis encode >array ] unit-test
+[ "ab\\ｨ" ] [ { CHAR: a CHAR: b HEX: 5C HEX: A8 } windows-31j decode ] unit-test
+[ { CHAR: a CHAR: b HEX: 5C HEX: A8 } ] [ "ab\\ｨ" windows-31j encode >array ] unit-test
+[ "\u000081\u0000c8" ] [ CHAR: logical-and 1string windows-31j encode >string ] unit-test
+[ "\u000081\u0000c8" ] [ CHAR: logical-and 1string shift-jis encode >string ] unit-test
+[ { CHAR: logical-and } ] [ "\u000081\u0000c8" windows-31j decode >array ] unit-test
+[ { CHAR: logical-and } ] [ "\u000081\u0000c8" shift-jis decode >array ] unit-test
diff --git a/basis/io/encodings/japanese/japanese.factor b/basis/io/encodings/japanese/japanese.factor
new file mode 100644
index 0000000000..23ff807245
--- /dev/null
+++ b/basis/io/encodings/japanese/japanese.factor
@@ -0,0 +1,65 @@
+! Copyright (C) 2009 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
+USING: sequences kernel io io.files combinators.short-circuit
+math.order values assocs io.encodings io.binary fry strings
+math io.encodings.utf8 arrays accessors splitting math.parser ;
+IN: io.encodings.japanese
+
+! The code page used is Microsoft Code Page 932, 
+! which is a set of extensions to JIS X 0208:1997
+
+VALUE: shift-jis
+
+VALUE: windows-31j
+
+<PRIVATE
+
+TUPLE: jis jis>ch ch>jis ;
+
+: <jis> ( assoc -- jis )
+    [ nip ] assoc-filter
+    [ H{ } assoc-like ]
+    [ [ swap ] H{ } assoc-map-as ] bi
+    jis boa ;
+
+: ch>jis ( ch tuple -- jis ) ch>jis>> at [ encode-error ] unless* ;
+: jis>ch ( jis tuple -- string ) jis>ch>> at replacement-char or ;
+
+: process-jis ( lines -- assoc )
+    [ "#" split1 drop ] map harvest [
+        "\t" split 2 head
+        [ 2 short tail hex> ] map
+    ] map ;
+
+: make-jis ( filename -- jis )
+    utf8 file-lines process-jis <jis> ;
+
+"resource:basis/io/encodings/japanese/CP932.txt"
+make-jis to: windows-31j
+
+"resource:basis/io/encodings/japanese/sjis-0208-1997-std.txt"
+make-jis to: shift-jis
+
+: small? ( char -- ? )
+    ! ASCII range or single-byte halfwidth katakana
+    { [ 0 HEX: 7F between? ] [ HEX: A1 HEX: DF between? ] } 1|| ;
+
+: write-halfword ( stream halfword -- )
+    h>b/b swap 2array >string swap stream-write ;
+
+M: jis encode-char
+    swapd ch>jis
+    dup small?
+    [ swap stream-write1 ]
+    [ write-halfword ] if ;
+
+M: jis decode-char
+    swap dup stream-read1 [
+        dup small? [ nip swap jis>ch ] [
+            swap stream-read1
+            [ 2array be> swap jis>ch ]
+            [ 2drop replacement-char ] if*
+        ] if
+    ] [ 2drop f ] if* ;
+
+PRIVATE>
diff --git a/basis/io/encodings/japanese/sjis-0208-1997-std.txt b/basis/io/encodings/japanese/sjis-0208-1997-std.txt
new file mode 100644
index 0000000000..023814b6b0
--- /dev/null
+++ b/basis/io/encodings/japanese/sjis-0208-1997-std.txt
@@ -0,0 +1,9066 @@
+## Shift_JIS (JIS X 0208:1997 Appendix 1) vs Unicode mapping table
+## 
+## Date: 06 Mar 2002 06:01:22 GMT
+## License:
+## 	Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
+## 	Copyright (C) 2001 I'O, All Rights Reserved.
+## 	You can use, modify, distribute this table freely.
+## Note:
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Private 	UCS private area mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+## JIS	Unicode	Name	Note
+0x00	U+0000	# <control>
+0x01	U+0001	# <control>
+0x02	U+0002	# <control>
+0x03	U+0003	# <control>
+0x04	U+0004	# <control>
+0x05	U+0005	# <control>
+0x06	U+0006	# <control>
+0x07	U+0007	# <control>
+0x08	U+0008	# <control>
+0x09	U+0009	# <control>
+0x0A	U+000A	# <control>
+0x0B	U+000B	# <control>
+0x0C	U+000C	# <control>
+0x0D	U+000D	# <control>
+0x0E	U+000E	# <control>
+0x0F	U+000F	# <control>
+0x10	U+0010	# <control>
+0x11	U+0011	# <control>
+0x12	U+0012	# <control>
+0x13	U+0013	# <control>
+0x14	U+0014	# <control>
+0x15	U+0015	# <control>
+0x16	U+0016	# <control>
+0x17	U+0017	# <control>
+0x18	U+0018	# <control>
+0x19	U+0019	# <control>
+0x1A	U+001A	# <control>
+0x1B	U+001B	# <control>
+0x1C	U+001C	# <control>
+0x1D	U+001D	# <control>
+0x1E	U+001E	# <control>
+0x1F	U+001F	# <control>
+0x20	U+0020	# SPACE
+0x21	U+0021	# EXCLAMATION MARK
+0x22	U+0022	# QUOTATION MARK
+0x23	U+0023	# NUMBER SIGN
+0x24	U+0024	# DOLLAR SIGN
+0x25	U+0025	# PERCENT SIGN
+0x26	U+0026	# AMPERSAND
+0x27	U+0027	# APOSTROPHE
+0x28	U+0028	# LEFT PARENTHESIS
+0x29	U+0029	# RIGHT PARENTHESIS
+0x2A	U+002A	# ASTERISK
+0x2B	U+002B	# PLUS SIGN
+0x2C	U+002C	# COMMA
+0x2D	U+002D	# HYPHEN-MINUS
+0x2E	U+002E	# FULL STOP
+0x2F	U+002F	# SOLIDUS
+0x30	U+0030	# DIGIT ZERO
+0x31	U+0031	# DIGIT ONE
+0x32	U+0032	# DIGIT TWO
+0x33	U+0033	# DIGIT THREE
+0x34	U+0034	# DIGIT FOUR
+0x35	U+0035	# DIGIT FIVE
+0x36	U+0036	# DIGIT SIX
+0x37	U+0037	# DIGIT SEVEN
+0x38	U+0038	# DIGIT EIGHT
+0x39	U+0039	# DIGIT NINE
+0x3A	U+003A	# COLON
+0x3B	U+003B	# SEMICOLON
+0x3C	U+003C	# LESS-THAN SIGN
+0x3D	U+003D	# EQUALS SIGN
+0x3E	U+003E	# GREATER-THAN SIGN
+0x3F	U+003F	# QUESTION MARK
+0x40	U+0040	# COMMERCIAL AT
+0x41	U+0041	# LATIN CAPITAL LETTER A
+0x42	U+0042	# LATIN CAPITAL LETTER B
+0x43	U+0043	# LATIN CAPITAL LETTER C
+0x44	U+0044	# LATIN CAPITAL LETTER D
+0x45	U+0045	# LATIN CAPITAL LETTER E
+0x46	U+0046	# LATIN CAPITAL LETTER F
+0x47	U+0047	# LATIN CAPITAL LETTER G
+0x48	U+0048	# LATIN CAPITAL LETTER H
+0x49	U+0049	# LATIN CAPITAL LETTER I
+0x4A	U+004A	# LATIN CAPITAL LETTER J
+0x4B	U+004B	# LATIN CAPITAL LETTER K
+0x4C	U+004C	# LATIN CAPITAL LETTER L
+0x4D	U+004D	# LATIN CAPITAL LETTER M
+0x4E	U+004E	# LATIN CAPITAL LETTER N
+0x4F	U+004F	# LATIN CAPITAL LETTER O
+0x50	U+0050	# LATIN CAPITAL LETTER P
+0x51	U+0051	# LATIN CAPITAL LETTER Q
+0x52	U+0052	# LATIN CAPITAL LETTER R
+0x53	U+0053	# LATIN CAPITAL LETTER S
+0x54	U+0054	# LATIN CAPITAL LETTER T
+0x55	U+0055	# LATIN CAPITAL LETTER U
+0x56	U+0056	# LATIN CAPITAL LETTER V
+0x57	U+0057	# LATIN CAPITAL LETTER W
+0x58	U+0058	# LATIN CAPITAL LETTER X
+0x59	U+0059	# LATIN CAPITAL LETTER Y
+0x5A	U+005A	# LATIN CAPITAL LETTER Z
+0x5B	U+005B	# LEFT SQUARE BRACKET
+0x5C	U+00A5	# YEN SIGN
+0x5D	U+005D	# RIGHT SQUARE BRACKET
+0x5E	U+005E	# CIRCUMFLEX ACCENT
+0x5F	U+005F	# LOW LINE
+0x60	U+0060	# GRAVE ACCENT
+0x61	U+0061	# LATIN SMALL LETTER A
+0x62	U+0062	# LATIN SMALL LETTER B
+0x63	U+0063	# LATIN SMALL LETTER C
+0x64	U+0064	# LATIN SMALL LETTER D
+0x65	U+0065	# LATIN SMALL LETTER E
+0x66	U+0066	# LATIN SMALL LETTER F
+0x67	U+0067	# LATIN SMALL LETTER G
+0x68	U+0068	# LATIN SMALL LETTER H
+0x69	U+0069	# LATIN SMALL LETTER I
+0x6A	U+006A	# LATIN SMALL LETTER J
+0x6B	U+006B	# LATIN SMALL LETTER K
+0x6C	U+006C	# LATIN SMALL LETTER L
+0x6D	U+006D	# LATIN SMALL LETTER M
+0x6E	U+006E	# LATIN SMALL LETTER N
+0x6F	U+006F	# LATIN SMALL LETTER O
+0x70	U+0070	# LATIN SMALL LETTER P
+0x71	U+0071	# LATIN SMALL LETTER Q
+0x72	U+0072	# LATIN SMALL LETTER R
+0x73	U+0073	# LATIN SMALL LETTER S
+0x74	U+0074	# LATIN SMALL LETTER T
+0x75	U+0075	# LATIN SMALL LETTER U
+0x76	U+0076	# LATIN SMALL LETTER V
+0x77	U+0077	# LATIN SMALL LETTER W
+0x78	U+0078	# LATIN SMALL LETTER X
+0x79	U+0079	# LATIN SMALL LETTER Y
+0x7A	U+007A	# LATIN SMALL LETTER Z
+0x7B	U+007B	# LEFT CURLY BRACKET
+0x7C	U+007C	# VERTICAL LINE
+0x7D	U+007D	# RIGHT CURLY BRACKET
+0x7E	U+203E	# OVERLINE
+0x7F	U+007F	# <control>
+0x80		# <reserved>
+0x81		# <doublebytes>
+0x82		# <doublebytes>
+0x83		# <doublebytes>
+0x84		# <doublebytes>
+0x85		# <doublebytes>
+0x86		# <doublebytes>
+0x87		# <doublebytes>
+0x88		# <doublebytes>
+0x89		# <doublebytes>
+0x8A		# <doublebytes>
+0x8B		# <doublebytes>
+0x8C		# <doublebytes>
+0x8D		# <doublebytes>
+0x8E		# <doublebytes>
+0x8F		# <doublebytes>
+0x90		# <doublebytes>
+0x91		# <doublebytes>
+0x92		# <doublebytes>
+0x93		# <doublebytes>
+0x94		# <doublebytes>
+0x95		# <doublebytes>
+0x96		# <doublebytes>
+0x97		# <doublebytes>
+0x98		# <doublebytes>
+0x99		# <doublebytes>
+0x9A		# <doublebytes>
+0x9B		# <doublebytes>
+0x9C		# <doublebytes>
+0x9D		# <doublebytes>
+0x9E		# <doublebytes>
+0x9F		# <doublebytes>
+0xA0		# <reserved>
+0xA1	U+FF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
+0xA2	U+FF62	# HALFWIDTH LEFT CORNER BRACKET
+0xA3	U+FF63	# HALFWIDTH RIGHT CORNER BRACKET
+0xA4	U+FF64	# HALFWIDTH IDEOGRAPHIC COMMA
+0xA5	U+FF65	# HALFWIDTH KATAKANA MIDDLE DOT
+0xA6	U+FF66	# HALFWIDTH KATAKANA LETTER WO
+0xA7	U+FF67	# HALFWIDTH KATAKANA LETTER SMALL A
+0xA8	U+FF68	# HALFWIDTH KATAKANA LETTER SMALL I
+0xA9	U+FF69	# HALFWIDTH KATAKANA LETTER SMALL U
+0xAA	U+FF6A	# HALFWIDTH KATAKANA LETTER SMALL E
+0xAB	U+FF6B	# HALFWIDTH KATAKANA LETTER SMALL O
+0xAC	U+FF6C	# HALFWIDTH KATAKANA LETTER SMALL YA
+0xAD	U+FF6D	# HALFWIDTH KATAKANA LETTER SMALL YU
+0xAE	U+FF6E	# HALFWIDTH KATAKANA LETTER SMALL YO
+0xAF	U+FF6F	# HALFWIDTH KATAKANA LETTER SMALL TU
+0xB0	U+FF70	# HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+0xB1	U+FF71	# HALFWIDTH KATAKANA LETTER A
+0xB2	U+FF72	# HALFWIDTH KATAKANA LETTER I
+0xB3	U+FF73	# HALFWIDTH KATAKANA LETTER U
+0xB4	U+FF74	# HALFWIDTH KATAKANA LETTER E
+0xB5	U+FF75	# HALFWIDTH KATAKANA LETTER O
+0xB6	U+FF76	# HALFWIDTH KATAKANA LETTER KA
+0xB7	U+FF77	# HALFWIDTH KATAKANA LETTER KI
+0xB8	U+FF78	# HALFWIDTH KATAKANA LETTER KU
+0xB9	U+FF79	# HALFWIDTH KATAKANA LETTER KE
+0xBA	U+FF7A	# HALFWIDTH KATAKANA LETTER KO
+0xBB	U+FF7B	# HALFWIDTH KATAKANA LETTER SA
+0xBC	U+FF7C	# HALFWIDTH KATAKANA LETTER SI
+0xBD	U+FF7D	# HALFWIDTH KATAKANA LETTER SU
+0xBE	U+FF7E	# HALFWIDTH KATAKANA LETTER SE
+0xBF	U+FF7F	# HALFWIDTH KATAKANA LETTER SO
+0xC0	U+FF80	# HALFWIDTH KATAKANA LETTER TA
+0xC1	U+FF81	# HALFWIDTH KATAKANA LETTER TI
+0xC2	U+FF82	# HALFWIDTH KATAKANA LETTER TU
+0xC3	U+FF83	# HALFWIDTH KATAKANA LETTER TE
+0xC4	U+FF84	# HALFWIDTH KATAKANA LETTER TO
+0xC5	U+FF85	# HALFWIDTH KATAKANA LETTER NA
+0xC6	U+FF86	# HALFWIDTH KATAKANA LETTER NI
+0xC7	U+FF87	# HALFWIDTH KATAKANA LETTER NU
+0xC8	U+FF88	# HALFWIDTH KATAKANA LETTER NE
+0xC9	U+FF89	# HALFWIDTH KATAKANA LETTER NO
+0xCA	U+FF8A	# HALFWIDTH KATAKANA LETTER HA
+0xCB	U+FF8B	# HALFWIDTH KATAKANA LETTER HI
+0xCC	U+FF8C	# HALFWIDTH KATAKANA LETTER HU
+0xCD	U+FF8D	# HALFWIDTH KATAKANA LETTER HE
+0xCE	U+FF8E	# HALFWIDTH KATAKANA LETTER HO
+0xCF	U+FF8F	# HALFWIDTH KATAKANA LETTER MA
+0xD0	U+FF90	# HALFWIDTH KATAKANA LETTER MI
+0xD1	U+FF91	# HALFWIDTH KATAKANA LETTER MU
+0xD2	U+FF92	# HALFWIDTH KATAKANA LETTER ME
+0xD3	U+FF93	# HALFWIDTH KATAKANA LETTER MO
+0xD4	U+FF94	# HALFWIDTH KATAKANA LETTER YA
+0xD5	U+FF95	# HALFWIDTH KATAKANA LETTER YU
+0xD6	U+FF96	# HALFWIDTH KATAKANA LETTER YO
+0xD7	U+FF97	# HALFWIDTH KATAKANA LETTER RA
+0xD8	U+FF98	# HALFWIDTH KATAKANA LETTER RI
+0xD9	U+FF99	# HALFWIDTH KATAKANA LETTER RU
+0xDA	U+FF9A	# HALFWIDTH KATAKANA LETTER RE
+0xDB	U+FF9B	# HALFWIDTH KATAKANA LETTER RO
+0xDC	U+FF9C	# HALFWIDTH KATAKANA LETTER WA
+0xDD	U+FF9D	# HALFWIDTH KATAKANA LETTER N
+0xDE	U+FF9E	# HALFWIDTH KATAKANA VOICED SOUND MARK 
+0xDF	U+FF9F	# HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK 
+0xE0		# <doublebytes>
+0xE1		# <doublebytes>
+0xE2		# <doublebytes>
+0xE3		# <doublebytes>
+0xE4		# <doublebytes>
+0xE5		# <doublebytes>
+0xE6		# <doublebytes>
+0xE7		# <doublebytes>
+0xE8		# <doublebytes>
+0xE9		# <doublebytes>
+0xEA		# <doublebytes>
+0xEB		# <doublebytes>
+0xEC		# <doublebytes>
+0xED		# <doublebytes>
+0xEE		# <doublebytes>
+0xEF		# <doublebytes>
+0xF0		# <reserved>
+0xF1		# <reserved>
+0xF2		# <reserved>
+0xF3		# <reserved>
+0xF4		# <reserved>
+0xF5		# <reserved>
+0xF6		# <reserved>
+0xF7		# <reserved>
+0xF8		# <reserved>
+0xF9		# <reserved>
+0xFA		# <reserved>
+0xFB		# <reserved>
+0xFC		# <reserved>
+0xFD		# <reserved>
+0xFE		# <reserved>
+0xFF		# <reserved>
+0x8140	U+3000	# IDEOGRAPHIC SPACE
+0x8141	U+3001	# IDEOGRAPHIC COMMA
+0x8142	U+3002	# IDEOGRAPHIC FULL STOP
+0x8143	U+FF0C	# FULLWIDTH COMMA
+0x8144	U+FF0E	# FULLWIDTH FULL STOP
+0x8145	U+30FB	# KATAKANA MIDDLE DOT
+0x8146	U+FF1A	# FULLWIDTH COLON
+0x8147	U+FF1B	# FULLWIDTH SEMICOLON
+0x8148	U+FF1F	# FULLWIDTH QUESTION MARK
+0x8149	U+FF01	# FULLWIDTH EXCLAMATION MARK
+0x814A	U+309B	# KATAKANA-HIRAGANA VOICED SOUND MARK
+0x814B	U+309C	# KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+0x814C	U+00B4	# ACUTE ACCENT
+0x814D	U+FF40	# FULLWIDTH GRAVE ACCENT
+0x814E	U+00A8	# DIAERESIS
+0x814F	U+FF3E	# FULLWIDTH CIRCUMFLEX ACCENT
+0x8150	U+FFE3	# FULLWIDTH MACRON 
+0x8151	U+FF3F	# FULLWIDTH LOW LINE
+0x8152	U+30FD	# KATAKANA ITERATION MARK
+0x8153	U+30FE	# KATAKANA VOICED ITERATION MARK
+0x8154	U+309D	# HIRAGANA ITERATION MARK
+0x8155	U+309E	# HIRAGANA VOICED ITERATION MARK
+0x8156	U+3003	# DITTO MARK
+0x8157	U+4EDD	# <cjk>
+0x8158	U+3005	# IDEOGRAPHIC ITERATION MARK
+0x8159	U+3006	# IDEOGRAPHIC CLOSING MARK
+0x815A	U+3007	# IDEOGRAPHIC NUMBER ZERO
+0x815C	U+2014	# EM DASH	Windows: U+2015
+0x815D	U+2010	# HYPHEN
+0x815E	U+FF0F	# FULLWIDTH SOLIDUS
+0x815F	U+005C	# REVERSE SOLIDUS	Fullwidth: U+FF3C
+0x8160	U+301C	# WAVE DASH	Windows: U+FF5E
+0x8161	U+2016	# DOUBLE VERTICAL LINE	Windows: U+2225
+0x8162	U+FF5C	# FULLWIDTH VERTICAL LINE
+0x8163	U+2026	# HORIZONTAL ELLIPSIS
+0x8164	U+2025	# TWO DOT LEADER
+0x8165	U+2018	# LEFT SINGLE QUOTATION MARK
+0x8166	U+2019	# RIGHT SINGLE QUOTATION MARK
+0x8167	U+201C	# LEFT DOUBLE QUOTATION MARK
+0x8168	U+201D	# RIGHT DOUBLE QUOTATION MARK
+0x8169	U+FF08	# FULLWIDTH LEFT PARENTHESIS
+0x816A	U+FF09	# FULLWIDTH RIGHT PARENTHESIS
+0x816B	U+3014	# LEFT TORTOISE SHELL BRACKET
+0x816C	U+3015	# RIGHT TORTOISE SHELL BRACKET
+0x816D	U+FF3B	# FULLWIDTH LEFT SQUARE BRACKET
+0x816E	U+FF3D	# FULLWIDTH RIGHT SQUARE BRACKET
+0x816F	U+FF5B	# FULLWIDTH LEFT CURLY BRACKET
+0x8170	U+FF5D	# FULLWIDTH RIGHT CURLY BRACKET
+0x8171	U+3008	# LEFT ANGLE BRACKET
+0x8172	U+3009	# RIGHT ANGLE BRACKET
+0x8173	U+300A	# LEFT DOUBLE ANGLE BRACKET
+0x8174	U+300B	# RIGHT DOUBLE ANGLE BRACKET
+0x8175	U+300C	# LEFT CORNER BRACKET
+0x8176	U+300D	# RIGHT CORNER BRACKET
+0x8177	U+300E	# LEFT WHITE CORNER BRACKET
+0x8178	U+300F	# RIGHT WHITE CORNER BRACKET
+0x8179	U+3010	# LEFT BLACK LENTICULAR BRACKET
+0x817A	U+3011	# RIGHT BLACK LENTICULAR BRACKET
+0x817B	U+FF0B	# FULLWIDTH PLUS SIGN
+0x817C	U+2212	# MINUS SIGN	Windows: U+FF0D
+0x817D	U+00B1	# PLUS-MINUS SIGN
+0x817E	U+00D7	# MULTIPLICATION SIGN
+0x8180	U+00F7	# DIVISION SIGN
+0x8181	U+FF1D	# FULLWIDTH EQUALS SIGN
+0x8182	U+2260	# NOT EQUAL TO
+0x8183	U+FF1C	# FULLWIDTH LESS-THAN SIGN
+0x8184	U+FF1E	# FULLWIDTH GREATER-THAN SIGN
+0x8185	U+2266	# LESS-THAN OVER EQUAL TO
+0x8186	U+2267	# GREATER-THAN OVER EQUAL TO
+0x8187	U+221E	# INFINITY
+0x8188	U+2234	# THEREFORE
+0x8189	U+2642	# MALE SIGN
+0x818A	U+2640	# FEMALE SIGN
+0x818B	U+00B0	# DEGREE SIGN
+0x818C	U+2032	# PRIME
+0x818D	U+2033	# DOUBLE PRIME
+0x818E	U+2103	# DEGREE CELSIUS
+0x818F	U+FFE5	# FULLWIDTH YEN SIGN
+0x8190	U+FF04	# FULLWIDTH DOLLAR SIGN
+0x8191	U+00A2	# CENT SIGN	Windows: U+FFE0
+0x8192	U+00A3	# POUND SIGN	Windows: U+FFE1
+0x8193	U+FF05	# FULLWIDTH PERCENT SIGN
+0x8194	U+FF03	# FULLWIDTH NUMBER SIGN
+0x8195	U+FF06	# FULLWIDTH AMPERSAND
+0x8196	U+FF0A	# FULLWIDTH ASTERISK
+0x8197	U+FF20	# FULLWIDTH COMMERCIAL AT
+0x8198	U+00A7	# SECTION SIGN
+0x8199	U+2606	# WHITE STAR
+0x819A	U+2605	# BLACK STAR
+0x819B	U+25CB	# WHITE CIRCLE
+0x819C	U+25CF	# BLACK CIRCLE
+0x819D	U+25CE	# BULLSEYE
+0x819E	U+25C7	# WHITE DIAMOND
+0x819F	U+25C6	# BLACK DIAMOND
+0x81A0	U+25A1	# WHITE SQUARE
+0x81A1	U+25A0	# BLACK SQUARE
+0x81A2	U+25B3	# WHITE UP-POINTING TRIANGLE
+0x81A3	U+25B2	# BLACK UP-POINTING TRIANGLE
+0x81A4	U+25BD	# WHITE DOWN-POINTING TRIANGLE
+0x81A5	U+25BC	# BLACK DOWN-POINTING TRIANGLE
+0x81A6	U+203B	# REFERENCE MARK
+0x81A7	U+3012	# POSTAL MARK
+0x81A8	U+2192	# RIGHTWARDS ARROW
+0x81A9	U+2190	# LEFTWARDS ARROW
+0x81AA	U+2191	# UPWARDS ARROW
+0x81AB	U+2193	# DOWNWARDS ARROW
+0x81AC	U+3013	# GETA MARK
+0x81AD	U+FF07	# FULLWIDTH APOSTROPHE
+0x81AE		# <reserved>
+0x81AF		# <reserved>
+0x81B0		# <reserved>
+0x81B1		# <reserved>
+0x81B2		# <reserved>
+0x81B3		# <reserved>
+0x81B4		# <reserved>
+0x81B5		# <reserved>
+0x81B6		# <reserved>
+0x81B7		# <reserved>
+0x81B8	U+2208	# ELEMENT OF	[1983]
+0x81B9	U+220B	# CONTAINS AS MEMBER	[1983]
+0x81BA	U+2286	# SUBSET OF OR EQUAL TO	[1983]
+0x81BB	U+2287	# SUPERSET OF OR EQUAL TO	[1983]
+0x81BC	U+2282	# SUBSET OF	[1983]
+0x81BD	U+2283	# SUPERSET OF	[1983]
+0x81BE	U+222A	# UNION	[1983]
+0x81BF	U+2229	# INTERSECTION	[1983]
+0x81C0		# <reserved>
+0x81C1		# <reserved>
+0x81C2		# <reserved>
+0x81C3		# <reserved>
+0x81C4		# <reserved>
+0x81C5		# <reserved>
+0x81C6		# <reserved>
+0x81C7		# <reserved>
+0x81C8	U+2227	# LOGICAL AND	[1983]
+0x81C9	U+2228	# LOGICAL OR	[1983]
+0x81CA	U+00AC	# NOT SIGN	[1983]	Windows: U+FFE2
+0x81CB	U+21D2	# RIGHTWARDS DOUBLE ARROW	[1983]
+0x81CC	U+21D4	# LEFT RIGHT DOUBLE ARROW	[1983]
+0x81CD	U+2200	# FOR ALL	[1983]
+0x81CE	U+2203	# THERE EXISTS	[1983]
+0x81CF		# <reserved>
+0x81D0		# <reserved>
+0x81D1		# <reserved>
+0x81D2		# <reserved>
+0x81D3		# <reserved>
+0x81D4		# <reserved>
+0x81D5		# <reserved>
+0x81D6		# <reserved>
+0x81D7		# <reserved>
+0x81D8		# <reserved>
+0x81D9		# <reserved>
+0x81DA	U+2220	# ANGLE	[1983]
+0x81DB	U+22A5	# UP TACK	[1983]
+0x81DC	U+2312	# ARC	[1983]
+0x81DD	U+2202	# PARTIAL DIFFERENTIAL	[1983]
+0x81DE	U+2207	# NABLA	[1983]
+0x81DF	U+2261	# IDENTICAL TO	[1983]
+0x81E0	U+2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF	[1983]
+0x81E1	U+226A	# MUCH LESS-THAN	[1983]
+0x81E2	U+226B	# MUCH GREATER-THAN	[1983]
+0x81E3	U+221A	# SQUARE ROOT	[1983]
+0x81E4	U+223D	# REVERSED TILDE 	[1983]
+0x81E5	U+221D	# PROPORTIONAL TO	[1983]
+0x81E6	U+2235	# BECAUSE	[1983]
+0x81E7	U+222B	# INTEGRAL	[1983]
+0x81E8	U+222C	# DOUBLE INTEGRAL	[1983]
+0x81E9		# <reserved>
+0x81EA		# <reserved>
+0x81EB		# <reserved>
+0x81EC		# <reserved>
+0x81ED		# <reserved>
+0x81EE		# <reserved>
+0x81EF		# <reserved>
+0x81F0	U+212B	# ANGSTROM SIGN	[1983]
+0x81F1	U+2030	# PER MILLE SIGN	[1983]
+0x81F2	U+266F	# MUSIC SHARP SIGN	[1983]
+0x81F3	U+266D	# MUSIC FLAT SIGN	[1983]
+0x81F4	U+266A	# EIGHTH NOTE	[1983]
+0x81F5	U+2020	# DAGGER	[1983]
+0x81F6	U+2021	# DOUBLE DAGGER	[1983]
+0x81F7	U+00B6	# PILCROW SIGN	[1983]
+0x81F8		# <reserved>
+0x81F9		# <reserved>
+0x81FA		# <reserved>
+0x81FB		# <reserved>
+0x81FC	U+25EF	# LARGE CIRCLE	[1983]
+0x8240		# <reserved>
+0x8241		# <reserved>
+0x8242		# <reserved>
+0x8243		# <reserved>
+0x8244		# <reserved>
+0x8245		# <reserved>
+0x8246		# <reserved>
+0x8247		# <reserved>
+0x8248		# <reserved>
+0x8249		# <reserved>
+0x824A		# <reserved>
+0x824B		# <reserved>
+0x824C		# <reserved>
+0x824D		# <reserved>
+0x824E		# <reserved>
+0x824F	U+FF10	# FULLWIDTH DIGIT ZERO
+0x8250	U+FF11	# FULLWIDTH DIGIT ONE
+0x8251	U+FF12	# FULLWIDTH DIGIT TWO
+0x8252	U+FF13	# FULLWIDTH DIGIT THREE
+0x8253	U+FF14	# FULLWIDTH DIGIT FOUR
+0x8254	U+FF15	# FULLWIDTH DIGIT FIVE
+0x8255	U+FF16	# FULLWIDTH DIGIT SIX
+0x8256	U+FF17	# FULLWIDTH DIGIT SEVEN
+0x8257	U+FF18	# FULLWIDTH DIGIT EIGHT
+0x8258	U+FF19	# FULLWIDTH DIGIT NINE
+0x8259		# <reserved>
+0x825A		# <reserved>
+0x825B		# <reserved>
+0x825C		# <reserved>
+0x825D		# <reserved>
+0x825E		# <reserved>
+0x825F		# <reserved>
+0x8260	U+FF21	# FULLWIDTH LATIN CAPITAL LETTER A
+0x8261	U+FF22	# FULLWIDTH LATIN CAPITAL LETTER B
+0x8262	U+FF23	# FULLWIDTH LATIN CAPITAL LETTER C
+0x8263	U+FF24	# FULLWIDTH LATIN CAPITAL LETTER D
+0x8264	U+FF25	# FULLWIDTH LATIN CAPITAL LETTER E
+0x8265	U+FF26	# FULLWIDTH LATIN CAPITAL LETTER F
+0x8266	U+FF27	# FULLWIDTH LATIN CAPITAL LETTER G
+0x8267	U+FF28	# FULLWIDTH LATIN CAPITAL LETTER H
+0x8268	U+FF29	# FULLWIDTH LATIN CAPITAL LETTER I
+0x8269	U+FF2A	# FULLWIDTH LATIN CAPITAL LETTER J
+0x826A	U+FF2B	# FULLWIDTH LATIN CAPITAL LETTER K
+0x826B	U+FF2C	# FULLWIDTH LATIN CAPITAL LETTER L
+0x826C	U+FF2D	# FULLWIDTH LATIN CAPITAL LETTER M
+0x826D	U+FF2E	# FULLWIDTH LATIN CAPITAL LETTER N
+0x826E	U+FF2F	# FULLWIDTH LATIN CAPITAL LETTER O
+0x826F	U+FF30	# FULLWIDTH LATIN CAPITAL LETTER P
+0x8270	U+FF31	# FULLWIDTH LATIN CAPITAL LETTER Q
+0x8271	U+FF32	# FULLWIDTH LATIN CAPITAL LETTER R
+0x8272	U+FF33	# FULLWIDTH LATIN CAPITAL LETTER S
+0x8273	U+FF34	# FULLWIDTH LATIN CAPITAL LETTER T
+0x8274	U+FF35	# FULLWIDTH LATIN CAPITAL LETTER U
+0x8275	U+FF36	# FULLWIDTH LATIN CAPITAL LETTER V
+0x8276	U+FF37	# FULLWIDTH LATIN CAPITAL LETTER W
+0x8277	U+FF38	# FULLWIDTH LATIN CAPITAL LETTER X
+0x8278	U+FF39	# FULLWIDTH LATIN CAPITAL LETTER Y
+0x8279	U+FF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
+0x827A		# <reserved>
+0x827B		# <reserved>
+0x827C		# <reserved>
+0x827D		# <reserved>
+0x827E		# <reserved>
+0x8280		# <reserved>
+0x8281	U+FF41	# FULLWIDTH LATIN SMALL LETTER A
+0x8282	U+FF42	# FULLWIDTH LATIN SMALL LETTER B
+0x8283	U+FF43	# FULLWIDTH LATIN SMALL LETTER C
+0x8284	U+FF44	# FULLWIDTH LATIN SMALL LETTER D
+0x8285	U+FF45	# FULLWIDTH LATIN SMALL LETTER E
+0x8286	U+FF46	# FULLWIDTH LATIN SMALL LETTER F
+0x8287	U+FF47	# FULLWIDTH LATIN SMALL LETTER G
+0x8288	U+FF48	# FULLWIDTH LATIN SMALL LETTER H
+0x8289	U+FF49	# FULLWIDTH LATIN SMALL LETTER I
+0x828A	U+FF4A	# FULLWIDTH LATIN SMALL LETTER J
+0x828B	U+FF4B	# FULLWIDTH LATIN SMALL LETTER K
+0x828C	U+FF4C	# FULLWIDTH LATIN SMALL LETTER L
+0x828D	U+FF4D	# FULLWIDTH LATIN SMALL LETTER M
+0x828E	U+FF4E	# FULLWIDTH LATIN SMALL LETTER N
+0x828F	U+FF4F	# FULLWIDTH LATIN SMALL LETTER O
+0x8290	U+FF50	# FULLWIDTH LATIN SMALL LETTER P
+0x8291	U+FF51	# FULLWIDTH LATIN SMALL LETTER Q
+0x8292	U+FF52	# FULLWIDTH LATIN SMALL LETTER R
+0x8293	U+FF53	# FULLWIDTH LATIN SMALL LETTER S
+0x8294	U+FF54	# FULLWIDTH LATIN SMALL LETTER T
+0x8295	U+FF55	# FULLWIDTH LATIN SMALL LETTER U
+0x8296	U+FF56	# FULLWIDTH LATIN SMALL LETTER V
+0x8297	U+FF57	# FULLWIDTH LATIN SMALL LETTER W
+0x8298	U+FF58	# FULLWIDTH LATIN SMALL LETTER X
+0x8299	U+FF59	# FULLWIDTH LATIN SMALL LETTER Y
+0x829A	U+FF5A	# FULLWIDTH LATIN SMALL LETTER Z
+0x829B		# <reserved>
+0x829C		# <reserved>
+0x829D		# <reserved>
+0x829E		# <reserved>
+0x829F	U+3041	# HIRAGANA LETTER SMALL A
+0x82A0	U+3042	# HIRAGANA LETTER A
+0x82A1	U+3043	# HIRAGANA LETTER SMALL I
+0x82A2	U+3044	# HIRAGANA LETTER I
+0x82A3	U+3045	# HIRAGANA LETTER SMALL U
+0x82A4	U+3046	# HIRAGANA LETTER U
+0x82A5	U+3047	# HIRAGANA LETTER SMALL E
+0x82A6	U+3048	# HIRAGANA LETTER E
+0x82A7	U+3049	# HIRAGANA LETTER SMALL O
+0x82A8	U+304A	# HIRAGANA LETTER O
+0x82A9	U+304B	# HIRAGANA LETTER KA
+0x82AA	U+304C	# HIRAGANA LETTER GA
+0x82AB	U+304D	# HIRAGANA LETTER KI
+0x82AC	U+304E	# HIRAGANA LETTER GI
+0x82AD	U+304F	# HIRAGANA LETTER KU
+0x82AE	U+3050	# HIRAGANA LETTER GU
+0x82AF	U+3051	# HIRAGANA LETTER KE
+0x82B0	U+3052	# HIRAGANA LETTER GE
+0x82B1	U+3053	# HIRAGANA LETTER KO
+0x82B2	U+3054	# HIRAGANA LETTER GO
+0x82B3	U+3055	# HIRAGANA LETTER SA
+0x82B4	U+3056	# HIRAGANA LETTER ZA
+0x82B5	U+3057	# HIRAGANA LETTER SI
+0x82B6	U+3058	# HIRAGANA LETTER ZI
+0x82B7	U+3059	# HIRAGANA LETTER SU
+0x82B8	U+305A	# HIRAGANA LETTER ZU
+0x82B9	U+305B	# HIRAGANA LETTER SE
+0x82BA	U+305C	# HIRAGANA LETTER ZE
+0x82BB	U+305D	# HIRAGANA LETTER SO
+0x82BC	U+305E	# HIRAGANA LETTER ZO
+0x82BD	U+305F	# HIRAGANA LETTER TA
+0x82BE	U+3060	# HIRAGANA LETTER DA
+0x82BF	U+3061	# HIRAGANA LETTER TI
+0x82C0	U+3062	# HIRAGANA LETTER DI
+0x82C1	U+3063	# HIRAGANA LETTER SMALL TU
+0x82C2	U+3064	# HIRAGANA LETTER TU
+0x82C3	U+3065	# HIRAGANA LETTER DU
+0x82C4	U+3066	# HIRAGANA LETTER TE
+0x82C5	U+3067	# HIRAGANA LETTER DE
+0x82C6	U+3068	# HIRAGANA LETTER TO
+0x82C7	U+3069	# HIRAGANA LETTER DO
+0x82C8	U+306A	# HIRAGANA LETTER NA
+0x82C9	U+306B	# HIRAGANA LETTER NI
+0x82CA	U+306C	# HIRAGANA LETTER NU
+0x82CB	U+306D	# HIRAGANA LETTER NE
+0x82CC	U+306E	# HIRAGANA LETTER NO
+0x82CD	U+306F	# HIRAGANA LETTER HA
+0x82CE	U+3070	# HIRAGANA LETTER BA
+0x82CF	U+3071	# HIRAGANA LETTER PA
+0x82D0	U+3072	# HIRAGANA LETTER HI
+0x82D1	U+3073	# HIRAGANA LETTER BI
+0x82D2	U+3074	# HIRAGANA LETTER PI
+0x82D3	U+3075	# HIRAGANA LETTER HU
+0x82D4	U+3076	# HIRAGANA LETTER BU
+0x82D5	U+3077	# HIRAGANA LETTER PU
+0x82D6	U+3078	# HIRAGANA LETTER HE
+0x82D7	U+3079	# HIRAGANA LETTER BE
+0x82D8	U+307A	# HIRAGANA LETTER PE
+0x82D9	U+307B	# HIRAGANA LETTER HO
+0x82DA	U+307C	# HIRAGANA LETTER BO
+0x82DB	U+307D	# HIRAGANA LETTER PO
+0x82DC	U+307E	# HIRAGANA LETTER MA
+0x82DD	U+307F	# HIRAGANA LETTER MI
+0x82DE	U+3080	# HIRAGANA LETTER MU
+0x82DF	U+3081	# HIRAGANA LETTER ME
+0x82E0	U+3082	# HIRAGANA LETTER MO
+0x82E1	U+3083	# HIRAGANA LETTER SMALL YA
+0x82E2	U+3084	# HIRAGANA LETTER YA
+0x82E3	U+3085	# HIRAGANA LETTER SMALL YU
+0x82E4	U+3086	# HIRAGANA LETTER YU
+0x82E5	U+3087	# HIRAGANA LETTER SMALL YO
+0x82E6	U+3088	# HIRAGANA LETTER YO
+0x82E7	U+3089	# HIRAGANA LETTER RA
+0x82E8	U+308A	# HIRAGANA LETTER RI
+0x82E9	U+308B	# HIRAGANA LETTER RU
+0x82EA	U+308C	# HIRAGANA LETTER RE
+0x82EB	U+308D	# HIRAGANA LETTER RO
+0x82EC	U+308E	# HIRAGANA LETTER SMALL WA
+0x82ED	U+308F	# HIRAGANA LETTER WA
+0x82EE	U+3090	# HIRAGANA LETTER WI
+0x82EF	U+3091	# HIRAGANA LETTER WE
+0x82F0	U+3092	# HIRAGANA LETTER WO
+0x82F1	U+3093	# HIRAGANA LETTER N
+0x82F2		# <reserved>
+0x82F3		# <reserved>
+0x82F4		# <reserved>
+0x82F5		# <reserved>
+0x82F6		# <reserved>
+0x82F7		# <reserved>
+0x82F8		# <reserved>
+0x82F9		# <reserved>
+0x82FA		# <reserved>
+0x82FB		# <reserved>
+0x82FC		# <reserved>
+0x8340	U+30A1	# KATAKANA LETTER SMALL A
+0x8341	U+30A2	# KATAKANA LETTER A
+0x8342	U+30A3	# KATAKANA LETTER SMALL I
+0x8343	U+30A4	# KATAKANA LETTER I
+0x8344	U+30A5	# KATAKANA LETTER SMALL U
+0x8345	U+30A6	# KATAKANA LETTER U
+0x8346	U+30A7	# KATAKANA LETTER SMALL E
+0x8347	U+30A8	# KATAKANA LETTER E
+0x8348	U+30A9	# KATAKANA LETTER SMALL O
+0x8349	U+30AA	# KATAKANA LETTER O
+0x834A	U+30AB	# KATAKANA LETTER KA
+0x834B	U+30AC	# KATAKANA LETTER GA
+0x834C	U+30AD	# KATAKANA LETTER KI
+0x834D	U+30AE	# KATAKANA LETTER GI
+0x834E	U+30AF	# KATAKANA LETTER KU
+0x834F	U+30B0	# KATAKANA LETTER GU
+0x8350	U+30B1	# KATAKANA LETTER KE
+0x8351	U+30B2	# KATAKANA LETTER GE
+0x8352	U+30B3	# KATAKANA LETTER KO
+0x8353	U+30B4	# KATAKANA LETTER GO
+0x8354	U+30B5	# KATAKANA LETTER SA
+0x8355	U+30B6	# KATAKANA LETTER ZA
+0x8356	U+30B7	# KATAKANA LETTER SI
+0x8357	U+30B8	# KATAKANA LETTER ZI
+0x8358	U+30B9	# KATAKANA LETTER SU
+0x8359	U+30BA	# KATAKANA LETTER ZU
+0x835A	U+30BB	# KATAKANA LETTER SE
+0x835C	U+30BD	# KATAKANA LETTER SO
+0x835D	U+30BE	# KATAKANA LETTER ZO
+0x835E	U+30BF	# KATAKANA LETTER TA
+0x835F	U+30C0	# KATAKANA LETTER DA
+0x8360	U+30C1	# KATAKANA LETTER TI
+0x8361	U+30C2	# KATAKANA LETTER DI
+0x8362	U+30C3	# KATAKANA LETTER SMALL TU
+0x8363	U+30C4	# KATAKANA LETTER TU
+0x8364	U+30C5	# KATAKANA LETTER DU
+0x8365	U+30C6	# KATAKANA LETTER TE
+0x8366	U+30C7	# KATAKANA LETTER DE
+0x8367	U+30C8	# KATAKANA LETTER TO
+0x8368	U+30C9	# KATAKANA LETTER DO
+0x8369	U+30CA	# KATAKANA LETTER NA
+0x836A	U+30CB	# KATAKANA LETTER NI
+0x836B	U+30CC	# KATAKANA LETTER NU
+0x836C	U+30CD	# KATAKANA LETTER NE
+0x836D	U+30CE	# KATAKANA LETTER NO
+0x836E	U+30CF	# KATAKANA LETTER HA
+0x836F	U+30D0	# KATAKANA LETTER BA
+0x8370	U+30D1	# KATAKANA LETTER PA
+0x8371	U+30D2	# KATAKANA LETTER HI
+0x8372	U+30D3	# KATAKANA LETTER BI
+0x8373	U+30D4	# KATAKANA LETTER PI
+0x8374	U+30D5	# KATAKANA LETTER HU
+0x8375	U+30D6	# KATAKANA LETTER BU
+0x8376	U+30D7	# KATAKANA LETTER PU
+0x8377	U+30D8	# KATAKANA LETTER HE
+0x8378	U+30D9	# KATAKANA LETTER BE
+0x8379	U+30DA	# KATAKANA LETTER PE
+0x837A	U+30DB	# KATAKANA LETTER HO
+0x837B	U+30DC	# KATAKANA LETTER BO
+0x837C	U+30DD	# KATAKANA LETTER PO
+0x837D	U+30DE	# KATAKANA LETTER MA
+0x837E	U+30DF	# KATAKANA LETTER MI
+0x8380	U+30E0	# KATAKANA LETTER MU
+0x8381	U+30E1	# KATAKANA LETTER ME
+0x8382	U+30E2	# KATAKANA LETTER MO
+0x8383	U+30E3	# KATAKANA LETTER SMALL YA
+0x8384	U+30E4	# KATAKANA LETTER YA
+0x8385	U+30E5	# KATAKANA LETTER SMALL YU
+0x8386	U+30E6	# KATAKANA LETTER YU
+0x8387	U+30E7	# KATAKANA LETTER SMALL YO
+0x8388	U+30E8	# KATAKANA LETTER YO
+0x8389	U+30E9	# KATAKANA LETTER RA
+0x838A	U+30EA	# KATAKANA LETTER RI
+0x838B	U+30EB	# KATAKANA LETTER RU
+0x838C	U+30EC	# KATAKANA LETTER RE
+0x838D	U+30ED	# KATAKANA LETTER RO
+0x838E	U+30EE	# KATAKANA LETTER SMALL WA
+0x838F	U+30EF	# KATAKANA LETTER WA
+0x8390	U+30F0	# KATAKANA LETTER WI
+0x8391	U+30F1	# KATAKANA LETTER WE
+0x8392	U+30F2	# KATAKANA LETTER WO
+0x8393	U+30F3	# KATAKANA LETTER N
+0x8394	U+30F4	# KATAKANA LETTER VU
+0x8395	U+30F5	# KATAKANA LETTER SMALL KA
+0x8396	U+30F6	# KATAKANA LETTER SMALL KE
+0x8397		# <reserved>
+0x8398		# <reserved>
+0x8399		# <reserved>
+0x839A		# <reserved>
+0x839B		# <reserved>
+0x839C		# <reserved>
+0x839D		# <reserved>
+0x839E		# <reserved>
+0x839F	U+0391	# GREEK CAPITAL LETTER ALPHA
+0x83A0	U+0392	# GREEK CAPITAL LETTER BETA
+0x83A1	U+0393	# GREEK CAPITAL LETTER GAMMA
+0x83A2	U+0394	# GREEK CAPITAL LETTER DELTA
+0x83A3	U+0395	# GREEK CAPITAL LETTER EPSILON
+0x83A4	U+0396	# GREEK CAPITAL LETTER ZETA
+0x83A5	U+0397	# GREEK CAPITAL LETTER ETA
+0x83A6	U+0398	# GREEK CAPITAL LETTER THETA
+0x83A7	U+0399	# GREEK CAPITAL LETTER IOTA
+0x83A8	U+039A	# GREEK CAPITAL LETTER KAPPA
+0x83A9	U+039B	# GREEK CAPITAL LETTER LAMDA
+0x83AA	U+039C	# GREEK CAPITAL LETTER MU
+0x83AB	U+039D	# GREEK CAPITAL LETTER NU
+0x83AC	U+039E	# GREEK CAPITAL LETTER XI
+0x83AD	U+039F	# GREEK CAPITAL LETTER OMICRON
+0x83AE	U+03A0	# GREEK CAPITAL LETTER PI
+0x83AF	U+03A1	# GREEK CAPITAL LETTER RHO
+0x83B0	U+03A3	# GREEK CAPITAL LETTER SIGMA
+0x83B1	U+03A4	# GREEK CAPITAL LETTER TAU
+0x83B2	U+03A5	# GREEK CAPITAL LETTER UPSILON
+0x83B3	U+03A6	# GREEK CAPITAL LETTER PHI
+0x83B4	U+03A7	# GREEK CAPITAL LETTER CHI
+0x83B5	U+03A8	# GREEK CAPITAL LETTER PSI
+0x83B6	U+03A9	# GREEK CAPITAL LETTER OMEGA
+0x83B7		# <reserved>
+0x83B8		# <reserved>
+0x83B9		# <reserved>
+0x83BA		# <reserved>
+0x83BB		# <reserved>
+0x83BC		# <reserved>
+0x83BD		# <reserved>
+0x83BE		# <reserved>
+0x83BF	U+03B1	# GREEK SMALL LETTER ALPHA
+0x83C0	U+03B2	# GREEK SMALL LETTER BETA
+0x83C1	U+03B3	# GREEK SMALL LETTER GAMMA
+0x83C2	U+03B4	# GREEK SMALL LETTER DELTA
+0x83C3	U+03B5	# GREEK SMALL LETTER EPSILON
+0x83C4	U+03B6	# GREEK SMALL LETTER ZETA
+0x83C5	U+03B7	# GREEK SMALL LETTER ETA
+0x83C6	U+03B8	# GREEK SMALL LETTER THETA
+0x83C7	U+03B9	# GREEK SMALL LETTER IOTA
+0x83C8	U+03BA	# GREEK SMALL LETTER KAPPA
+0x83C9	U+03BB	# GREEK SMALL LETTER LAMDA
+0x83CA	U+03BC	# GREEK SMALL LETTER MU
+0x83CB	U+03BD	# GREEK SMALL LETTER NU
+0x83CC	U+03BE	# GREEK SMALL LETTER XI
+0x83CD	U+03BF	# GREEK SMALL LETTER OMICRON
+0x83CE	U+03C0	# GREEK SMALL LETTER PI
+0x83CF	U+03C1	# GREEK SMALL LETTER RHO
+0x83D0	U+03C3	# GREEK SMALL LETTER SIGMA
+0x83D1	U+03C4	# GREEK SMALL LETTER TAU
+0x83D2	U+03C5	# GREEK SMALL LETTER UPSILON
+0x83D3	U+03C6	# GREEK SMALL LETTER PHI
+0x83D4	U+03C7	# GREEK SMALL LETTER CHI
+0x83D5	U+03C8	# GREEK SMALL LETTER PSI
+0x83D6	U+03C9	# GREEK SMALL LETTER OMEGA
+0x83D7		# <reserved>
+0x83D8		# <reserved>
+0x83D9		# <reserved>
+0x83DA		# <reserved>
+0x83DB		# <reserved>
+0x83DC		# <reserved>
+0x83DD		# <reserved>
+0x83DE		# <reserved>
+0x83DF		# <reserved>
+0x83E0		# <reserved>
+0x83E1		# <reserved>
+0x83E2		# <reserved>
+0x83E3		# <reserved>
+0x83E4		# <reserved>
+0x83E5		# <reserved>
+0x83E6		# <reserved>
+0x83E7		# <reserved>
+0x83E8		# <reserved>
+0x83E9		# <reserved>
+0x83EA		# <reserved>
+0x83EB		# <reserved>
+0x83EC		# <reserved>
+0x83ED		# <reserved>
+0x83EE		# <reserved>
+0x83EF		# <reserved>
+0x83F0		# <reserved>
+0x83F1		# <reserved>
+0x83F2		# <reserved>
+0x83F3		# <reserved>
+0x83F4		# <reserved>
+0x83F5		# <reserved>
+0x83F6		# <reserved>
+0x83F7		# <reserved>
+0x83F8		# <reserved>
+0x83F9		# <reserved>
+0x83FA		# <reserved>
+0x83FB		# <reserved>
+0x83FC		# <reserved>
+0x8440	U+0410	# CYRILLIC CAPITAL LETTER A
+0x8441	U+0411	# CYRILLIC CAPITAL LETTER BE
+0x8442	U+0412	# CYRILLIC CAPITAL LETTER VE
+0x8443	U+0413	# CYRILLIC CAPITAL LETTER GHE
+0x8444	U+0414	# CYRILLIC CAPITAL LETTER DE
+0x8445	U+0415	# CYRILLIC CAPITAL LETTER IE
+0x8446	U+0401	# CYRILLIC CAPITAL LETTER IO
+0x8447	U+0416	# CYRILLIC CAPITAL LETTER ZHE
+0x8448	U+0417	# CYRILLIC CAPITAL LETTER ZE
+0x8449	U+0418	# CYRILLIC CAPITAL LETTER I
+0x844A	U+0419	# CYRILLIC CAPITAL LETTER SHORT I
+0x844B	U+041A	# CYRILLIC CAPITAL LETTER KA
+0x844C	U+041B	# CYRILLIC CAPITAL LETTER EL
+0x844D	U+041C	# CYRILLIC CAPITAL LETTER EM
+0x844E	U+041D	# CYRILLIC CAPITAL LETTER EN
+0x844F	U+041E	# CYRILLIC CAPITAL LETTER O
+0x8450	U+041F	# CYRILLIC CAPITAL LETTER PE
+0x8451	U+0420	# CYRILLIC CAPITAL LETTER ER
+0x8452	U+0421	# CYRILLIC CAPITAL LETTER ES
+0x8453	U+0422	# CYRILLIC CAPITAL LETTER TE
+0x8454	U+0423	# CYRILLIC CAPITAL LETTER U
+0x8455	U+0424	# CYRILLIC CAPITAL LETTER EF
+0x8456	U+0425	# CYRILLIC CAPITAL LETTER HA
+0x8457	U+0426	# CYRILLIC CAPITAL LETTER TSE
+0x8458	U+0427	# CYRILLIC CAPITAL LETTER CHE
+0x8459	U+0428	# CYRILLIC CAPITAL LETTER SHA
+0x845A	U+0429	# CYRILLIC CAPITAL LETTER SHCHA
+0x845C	U+042B	# CYRILLIC CAPITAL LETTER YERU
+0x845D	U+042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
+0x845E	U+042D	# CYRILLIC CAPITAL LETTER E
+0x845F	U+042E	# CYRILLIC CAPITAL LETTER YU
+0x8460	U+042F	# CYRILLIC CAPITAL LETTER YA
+0x8461		# <reserved>
+0x8462		# <reserved>
+0x8463		# <reserved>
+0x8464		# <reserved>
+0x8465		# <reserved>
+0x8466		# <reserved>
+0x8467		# <reserved>
+0x8468		# <reserved>
+0x8469		# <reserved>
+0x846A		# <reserved>
+0x846B		# <reserved>
+0x846C		# <reserved>
+0x846D		# <reserved>
+0x846E		# <reserved>
+0x846F		# <reserved>
+0x8470	U+0430	# CYRILLIC SMALL LETTER A
+0x8471	U+0431	# CYRILLIC SMALL LETTER BE
+0x8472	U+0432	# CYRILLIC SMALL LETTER VE
+0x8473	U+0433	# CYRILLIC SMALL LETTER GHE
+0x8474	U+0434	# CYRILLIC SMALL LETTER DE
+0x8475	U+0435	# CYRILLIC SMALL LETTER IE
+0x8476	U+0451	# CYRILLIC SMALL LETTER IO
+0x8477	U+0436	# CYRILLIC SMALL LETTER ZHE
+0x8478	U+0437	# CYRILLIC SMALL LETTER ZE
+0x8479	U+0438	# CYRILLIC SMALL LETTER I
+0x847A	U+0439	# CYRILLIC SMALL LETTER SHORT I
+0x847B	U+043A	# CYRILLIC SMALL LETTER KA
+0x847C	U+043B	# CYRILLIC SMALL LETTER EL
+0x847D	U+043C	# CYRILLIC SMALL LETTER EM
+0x847E	U+043D	# CYRILLIC SMALL LETTER EN
+0x8480	U+043E	# CYRILLIC SMALL LETTER O
+0x8481	U+043F	# CYRILLIC SMALL LETTER PE
+0x8482	U+0440	# CYRILLIC SMALL LETTER ER
+0x8483	U+0441	# CYRILLIC SMALL LETTER ES
+0x8484	U+0442	# CYRILLIC SMALL LETTER TE
+0x8485	U+0443	# CYRILLIC SMALL LETTER U
+0x8486	U+0444	# CYRILLIC SMALL LETTER EF
+0x8487	U+0445	# CYRILLIC SMALL LETTER HA
+0x8488	U+0446	# CYRILLIC SMALL LETTER TSE
+0x8489	U+0447	# CYRILLIC SMALL LETTER CHE
+0x848A	U+0448	# CYRILLIC SMALL LETTER SHA
+0x848B	U+0449	# CYRILLIC SMALL LETTER SHCHA
+0x848C	U+044A	# CYRILLIC SMALL LETTER HARD SIGN
+0x848D	U+044B	# CYRILLIC SMALL LETTER YERU
+0x848E	U+044C	# CYRILLIC SMALL LETTER SOFT SIGN
+0x848F	U+044D	# CYRILLIC SMALL LETTER E
+0x8490	U+044E	# CYRILLIC SMALL LETTER YU
+0x8491	U+044F	# CYRILLIC SMALL LETTER YA
+0x8492		# <reserved>
+0x8493		# <reserved>
+0x8494		# <reserved>
+0x8495		# <reserved>
+0x8496		# <reserved>
+0x8497		# <reserved>
+0x8498		# <reserved>
+0x8499		# <reserved>
+0x849A		# <reserved>
+0x849B		# <reserved>
+0x849C		# <reserved>
+0x849D		# <reserved>
+0x849E		# <reserved>
+0x849F	U+2500	# BOX DRAWINGS LIGHT HORIZONTAL	[1983]
+0x84A0	U+2502	# BOX DRAWINGS LIGHT VERTICAL	[1983]
+0x84A1	U+250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT	[1983]
+0x84A2	U+2510	# BOX DRAWINGS LIGHT DOWN AND LEFT	[1983]
+0x84A3	U+2518	# BOX DRAWINGS LIGHT UP AND LEFT	[1983]
+0x84A4	U+2514	# BOX DRAWINGS LIGHT UP AND RIGHT	[1983]
+0x84A5	U+251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT	[1983]
+0x84A6	U+252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL	[1983]
+0x84A7	U+2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT	[1983]
+0x84A8	U+2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL	[1983]
+0x84A9	U+253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL	[1983]
+0x84AA	U+2501	# BOX DRAWINGS HEAVY HORIZONTAL	[1983]
+0x84AB	U+2503	# BOX DRAWINGS HEAVY VERTICAL	[1983]
+0x84AC	U+250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT	[1983]
+0x84AD	U+2513	# BOX DRAWINGS HEAVY DOWN AND LEFT	[1983]
+0x84AE	U+251B	# BOX DRAWINGS HEAVY UP AND LEFT	[1983]
+0x84AF	U+2517	# BOX DRAWINGS HEAVY UP AND RIGHT	[1983]
+0x84B0	U+2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT	[1983]
+0x84B1	U+2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL	[1983]
+0x84B2	U+252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT	[1983]
+0x84B3	U+253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL	[1983]
+0x84B4	U+254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL	[1983]
+0x84B5	U+2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT	[1983]
+0x84B6	U+252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY	[1983]
+0x84B7	U+2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT	[1983]
+0x84B8	U+2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY	[1983]
+0x84B9	U+253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY	[1983]
+0x84BA	U+251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY	[1983]
+0x84BB	U+2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT	[1983]
+0x84BC	U+2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY	[1983]
+0x84BD	U+2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT	[1983]
+0x84BE	U+2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT	[1983]
+0x84BF		# <reserved>
+0x84C0		# <reserved>
+0x84C1		# <reserved>
+0x84C2		# <reserved>
+0x84C3		# <reserved>
+0x84C4		# <reserved>
+0x84C5		# <reserved>
+0x84C6		# <reserved>
+0x84C7		# <reserved>
+0x84C8		# <reserved>
+0x84C9		# <reserved>
+0x84CA		# <reserved>
+0x84CB		# <reserved>
+0x84CC		# <reserved>
+0x84CD		# <reserved>
+0x84CE		# <reserved>
+0x84CF		# <reserved>
+0x84D0		# <reserved>
+0x84D1		# <reserved>
+0x84D2		# <reserved>
+0x84D3		# <reserved>
+0x84D4		# <reserved>
+0x84D5		# <reserved>
+0x84D6		# <reserved>
+0x84D7		# <reserved>
+0x84D8		# <reserved>
+0x84D9		# <reserved>
+0x84DA		# <reserved>
+0x84DB		# <reserved>
+0x84DC		# <reserved>
+0x84DD		# <reserved>
+0x84DE		# <reserved>
+0x84DF		# <reserved>
+0x84E0		# <reserved>
+0x84E1		# <reserved>
+0x84E2		# <reserved>
+0x84E3		# <reserved>
+0x84E4		# <reserved>
+0x84E5		# <reserved>
+0x84E6		# <reserved>
+0x84E7		# <reserved>
+0x84E8		# <reserved>
+0x84E9		# <reserved>
+0x84EA		# <reserved>
+0x84EB		# <reserved>
+0x84EC		# <reserved>
+0x84ED		# <reserved>
+0x84EE		# <reserved>
+0x84EF		# <reserved>
+0x84F0		# <reserved>
+0x84F1		# <reserved>
+0x84F2		# <reserved>
+0x84F3		# <reserved>
+0x84F4		# <reserved>
+0x84F5		# <reserved>
+0x84F6		# <reserved>
+0x84F7		# <reserved>
+0x84F8		# <reserved>
+0x84F9		# <reserved>
+0x84FA		# <reserved>
+0x84FB		# <reserved>
+0x84FC		# <reserved>
+0x8540		# <reserved>
+0x8541		# <reserved>
+0x8542		# <reserved>
+0x8543		# <reserved>
+0x8544		# <reserved>
+0x8545		# <reserved>
+0x8546		# <reserved>
+0x8547		# <reserved>
+0x8548		# <reserved>
+0x8549		# <reserved>
+0x854A		# <reserved>
+0x854B		# <reserved>
+0x854C		# <reserved>
+0x854D		# <reserved>
+0x854E		# <reserved>
+0x854F		# <reserved>
+0x8550		# <reserved>
+0x8551		# <reserved>
+0x8552		# <reserved>
+0x8553		# <reserved>
+0x8554		# <reserved>
+0x8555		# <reserved>
+0x8556		# <reserved>
+0x8557		# <reserved>
+0x8558		# <reserved>
+0x8559		# <reserved>
+0x855A		# <reserved>
+0x855C		# <reserved>
+0x855D		# <reserved>
+0x855E		# <reserved>
+0x855F		# <reserved>
+0x8560		# <reserved>
+0x8561		# <reserved>
+0x8562		# <reserved>
+0x8563		# <reserved>
+0x8564		# <reserved>
+0x8565		# <reserved>
+0x8566		# <reserved>
+0x8567		# <reserved>
+0x8568		# <reserved>
+0x8569		# <reserved>
+0x856A		# <reserved>
+0x856B		# <reserved>
+0x856C		# <reserved>
+0x856D		# <reserved>
+0x856E		# <reserved>
+0x856F		# <reserved>
+0x8570		# <reserved>
+0x8571		# <reserved>
+0x8572		# <reserved>
+0x8573		# <reserved>
+0x8574		# <reserved>
+0x8575		# <reserved>
+0x8576		# <reserved>
+0x8577		# <reserved>
+0x8578		# <reserved>
+0x8579		# <reserved>
+0x857A		# <reserved>
+0x857B		# <reserved>
+0x857C		# <reserved>
+0x857D		# <reserved>
+0x857E		# <reserved>
+0x8580		# <reserved>
+0x8581		# <reserved>
+0x8582		# <reserved>
+0x8583		# <reserved>
+0x8584		# <reserved>
+0x8585		# <reserved>
+0x8586		# <reserved>
+0x8587		# <reserved>
+0x8588		# <reserved>
+0x8589		# <reserved>
+0x858A		# <reserved>
+0x858B		# <reserved>
+0x858C		# <reserved>
+0x858D		# <reserved>
+0x858E		# <reserved>
+0x858F		# <reserved>
+0x8590		# <reserved>
+0x8591		# <reserved>
+0x8592		# <reserved>
+0x8593		# <reserved>
+0x8594		# <reserved>
+0x8595		# <reserved>
+0x8596		# <reserved>
+0x8597		# <reserved>
+0x8598		# <reserved>
+0x8599		# <reserved>
+0x859A		# <reserved>
+0x859B		# <reserved>
+0x859C		# <reserved>
+0x859D		# <reserved>
+0x859E		# <reserved>
+0x859F		# <reserved>
+0x85A0		# <reserved>
+0x85A1		# <reserved>
+0x85A2		# <reserved>
+0x85A3		# <reserved>
+0x85A4		# <reserved>
+0x85A5		# <reserved>
+0x85A6		# <reserved>
+0x85A7		# <reserved>
+0x85A8		# <reserved>
+0x85A9		# <reserved>
+0x85AA		# <reserved>
+0x85AB		# <reserved>
+0x85AC		# <reserved>
+0x85AD		# <reserved>
+0x85AE		# <reserved>
+0x85AF		# <reserved>
+0x85B0		# <reserved>
+0x85B1		# <reserved>
+0x85B2		# <reserved>
+0x85B3		# <reserved>
+0x85B4		# <reserved>
+0x85B5		# <reserved>
+0x85B6		# <reserved>
+0x85B7		# <reserved>
+0x85B8		# <reserved>
+0x85B9		# <reserved>
+0x85BA		# <reserved>
+0x85BB		# <reserved>
+0x85BC		# <reserved>
+0x85BD		# <reserved>
+0x85BE		# <reserved>
+0x85BF		# <reserved>
+0x85C0		# <reserved>
+0x85C1		# <reserved>
+0x85C2		# <reserved>
+0x85C3		# <reserved>
+0x85C4		# <reserved>
+0x85C5		# <reserved>
+0x85C6		# <reserved>
+0x85C7		# <reserved>
+0x85C8		# <reserved>
+0x85C9		# <reserved>
+0x85CA		# <reserved>
+0x85CB		# <reserved>
+0x85CC		# <reserved>
+0x85CD		# <reserved>
+0x85CE		# <reserved>
+0x85CF		# <reserved>
+0x85D0		# <reserved>
+0x85D1		# <reserved>
+0x85D2		# <reserved>
+0x85D3		# <reserved>
+0x85D4		# <reserved>
+0x85D5		# <reserved>
+0x85D6		# <reserved>
+0x85D7		# <reserved>
+0x85D8		# <reserved>
+0x85D9		# <reserved>
+0x85DA		# <reserved>
+0x85DB		# <reserved>
+0x85DC		# <reserved>
+0x85DD		# <reserved>
+0x85DE		# <reserved>
+0x85DF		# <reserved>
+0x85E0		# <reserved>
+0x85E1		# <reserved>
+0x85E2		# <reserved>
+0x85E3		# <reserved>
+0x85E4		# <reserved>
+0x85E5		# <reserved>
+0x85E6		# <reserved>
+0x85E7		# <reserved>
+0x85E8		# <reserved>
+0x85E9		# <reserved>
+0x85EA		# <reserved>
+0x85EB		# <reserved>
+0x85EC		# <reserved>
+0x85ED		# <reserved>
+0x85EE		# <reserved>
+0x85EF		# <reserved>
+0x85F0		# <reserved>
+0x85F1		# <reserved>
+0x85F2		# <reserved>
+0x85F3		# <reserved>
+0x85F4		# <reserved>
+0x85F5		# <reserved>
+0x85F6		# <reserved>
+0x85F7		# <reserved>
+0x85F8		# <reserved>
+0x85F9		# <reserved>
+0x85FA		# <reserved>
+0x85FB		# <reserved>
+0x85FC		# <reserved>
+0x8640		# <reserved>
+0x8641		# <reserved>
+0x8642		# <reserved>
+0x8643		# <reserved>
+0x8644		# <reserved>
+0x8645		# <reserved>
+0x8646		# <reserved>
+0x8647		# <reserved>
+0x8648		# <reserved>
+0x8649		# <reserved>
+0x864A		# <reserved>
+0x864B		# <reserved>
+0x864C		# <reserved>
+0x864D		# <reserved>
+0x864E		# <reserved>
+0x864F		# <reserved>
+0x8650		# <reserved>
+0x8651		# <reserved>
+0x8652		# <reserved>
+0x8653		# <reserved>
+0x8654		# <reserved>
+0x8655		# <reserved>
+0x8656		# <reserved>
+0x8657		# <reserved>
+0x8658		# <reserved>
+0x8659		# <reserved>
+0x865A		# <reserved>
+0x865C		# <reserved>
+0x865D		# <reserved>
+0x865E		# <reserved>
+0x865F		# <reserved>
+0x8660		# <reserved>
+0x8661		# <reserved>
+0x8662		# <reserved>
+0x8663		# <reserved>
+0x8664		# <reserved>
+0x8665		# <reserved>
+0x8666		# <reserved>
+0x8667		# <reserved>
+0x8668		# <reserved>
+0x8669		# <reserved>
+0x866A		# <reserved>
+0x866B		# <reserved>
+0x866C		# <reserved>
+0x866D		# <reserved>
+0x866E		# <reserved>
+0x866F		# <reserved>
+0x8670		# <reserved>
+0x8671		# <reserved>
+0x8672		# <reserved>
+0x8673		# <reserved>
+0x8674		# <reserved>
+0x8675		# <reserved>
+0x8676		# <reserved>
+0x8677		# <reserved>
+0x8678		# <reserved>
+0x8679		# <reserved>
+0x867A		# <reserved>
+0x867B		# <reserved>
+0x867C		# <reserved>
+0x867D		# <reserved>
+0x867E		# <reserved>
+0x8680		# <reserved>
+0x8681		# <reserved>
+0x8682		# <reserved>
+0x8683		# <reserved>
+0x8684		# <reserved>
+0x8685		# <reserved>
+0x8686		# <reserved>
+0x8687		# <reserved>
+0x8688		# <reserved>
+0x8689		# <reserved>
+0x868A		# <reserved>
+0x868B		# <reserved>
+0x868C		# <reserved>
+0x868D		# <reserved>
+0x868E		# <reserved>
+0x868F		# <reserved>
+0x8690		# <reserved>
+0x8691		# <reserved>
+0x8692		# <reserved>
+0x8693		# <reserved>
+0x8694		# <reserved>
+0x8695		# <reserved>
+0x8696		# <reserved>
+0x8697		# <reserved>
+0x8698		# <reserved>
+0x8699		# <reserved>
+0x869A		# <reserved>
+0x869B		# <reserved>
+0x869C		# <reserved>
+0x869D		# <reserved>
+0x869E		# <reserved>
+0x869F		# <reserved>
+0x86A0		# <reserved>
+0x86A1		# <reserved>
+0x86A2		# <reserved>
+0x86A3		# <reserved>
+0x86A4		# <reserved>
+0x86A5		# <reserved>
+0x86A6		# <reserved>
+0x86A7		# <reserved>
+0x86A8		# <reserved>
+0x86A9		# <reserved>
+0x86AA		# <reserved>
+0x86AB		# <reserved>
+0x86AC		# <reserved>
+0x86AD		# <reserved>
+0x86AE		# <reserved>
+0x86AF		# <reserved>
+0x86B0		# <reserved>
+0x86B1		# <reserved>
+0x86B2		# <reserved>
+0x86B3		# <reserved>
+0x86B4		# <reserved>
+0x86B5		# <reserved>
+0x86B6		# <reserved>
+0x86B7		# <reserved>
+0x86B8		# <reserved>
+0x86B9		# <reserved>
+0x86BA		# <reserved>
+0x86BB		# <reserved>
+0x86BC		# <reserved>
+0x86BD		# <reserved>
+0x86BE		# <reserved>
+0x86BF		# <reserved>
+0x86C0		# <reserved>
+0x86C1		# <reserved>
+0x86C2		# <reserved>
+0x86C3		# <reserved>
+0x86C4		# <reserved>
+0x86C5		# <reserved>
+0x86C6		# <reserved>
+0x86C7		# <reserved>
+0x86C8		# <reserved>
+0x86C9		# <reserved>
+0x86CA		# <reserved>
+0x86CB		# <reserved>
+0x86CC		# <reserved>
+0x86CD		# <reserved>
+0x86CE		# <reserved>
+0x86CF		# <reserved>
+0x86D0		# <reserved>
+0x86D1		# <reserved>
+0x86D2		# <reserved>
+0x86D3		# <reserved>
+0x86D4		# <reserved>
+0x86D5		# <reserved>
+0x86D6		# <reserved>
+0x86D7		# <reserved>
+0x86D8		# <reserved>
+0x86D9		# <reserved>
+0x86DA		# <reserved>
+0x86DB		# <reserved>
+0x86DC		# <reserved>
+0x86DD		# <reserved>
+0x86DE		# <reserved>
+0x86DF		# <reserved>
+0x86E0		# <reserved>
+0x86E1		# <reserved>
+0x86E2		# <reserved>
+0x86E3		# <reserved>
+0x86E4		# <reserved>
+0x86E5		# <reserved>
+0x86E6		# <reserved>
+0x86E7		# <reserved>
+0x86E8		# <reserved>
+0x86E9		# <reserved>
+0x86EA		# <reserved>
+0x86EB		# <reserved>
+0x86EC		# <reserved>
+0x86ED		# <reserved>
+0x86EE		# <reserved>
+0x86EF		# <reserved>
+0x86F0		# <reserved>
+0x86F1		# <reserved>
+0x86F2		# <reserved>
+0x86F3		# <reserved>
+0x86F4		# <reserved>
+0x86F5		# <reserved>
+0x86F6		# <reserved>
+0x86F7		# <reserved>
+0x86F8		# <reserved>
+0x86F9		# <reserved>
+0x86FA		# <reserved>
+0x86FB		# <reserved>
+0x86FC		# <reserved>
+0x8740		# <reserved>
+0x8741		# <reserved>
+0x8742		# <reserved>
+0x8743		# <reserved>
+0x8744		# <reserved>
+0x8745		# <reserved>
+0x8746		# <reserved>
+0x8747		# <reserved>
+0x8748		# <reserved>
+0x8749		# <reserved>
+0x874A		# <reserved>
+0x874B		# <reserved>
+0x874C		# <reserved>
+0x874D		# <reserved>
+0x874E		# <reserved>
+0x874F		# <reserved>
+0x8750		# <reserved>
+0x8751		# <reserved>
+0x8752		# <reserved>
+0x8753		# <reserved>
+0x8754		# <reserved>
+0x8755		# <reserved>
+0x8756		# <reserved>
+0x8757		# <reserved>
+0x8758		# <reserved>
+0x8759		# <reserved>
+0x875A		# <reserved>
+0x875C		# <reserved>
+0x875D		# <reserved>
+0x875E		# <reserved>
+0x875F		# <reserved>
+0x8760		# <reserved>
+0x8761		# <reserved>
+0x8762		# <reserved>
+0x8763		# <reserved>
+0x8764		# <reserved>
+0x8765		# <reserved>
+0x8766		# <reserved>
+0x8767		# <reserved>
+0x8768		# <reserved>
+0x8769		# <reserved>
+0x876A		# <reserved>
+0x876B		# <reserved>
+0x876C		# <reserved>
+0x876D		# <reserved>
+0x876E		# <reserved>
+0x876F		# <reserved>
+0x8770		# <reserved>
+0x8771		# <reserved>
+0x8772		# <reserved>
+0x8773		# <reserved>
+0x8774		# <reserved>
+0x8775		# <reserved>
+0x8776		# <reserved>
+0x8777		# <reserved>
+0x8778		# <reserved>
+0x8779		# <reserved>
+0x877A		# <reserved>
+0x877B		# <reserved>
+0x877C		# <reserved>
+0x877D		# <reserved>
+0x877E		# <reserved>
+0x8780		# <reserved>
+0x8781		# <reserved>
+0x8782		# <reserved>
+0x8783		# <reserved>
+0x8784		# <reserved>
+0x8785		# <reserved>
+0x8786		# <reserved>
+0x8787		# <reserved>
+0x8788		# <reserved>
+0x8789		# <reserved>
+0x878A		# <reserved>
+0x878B		# <reserved>
+0x878C		# <reserved>
+0x878D		# <reserved>
+0x878E		# <reserved>
+0x878F		# <reserved>
+0x8790		# <reserved>	Windows: U+2252
+0x8791		# <reserved>	Windows: U+2261
+0x8792		# <reserved>	Windows: U+222B
+0x8793		# <reserved>
+0x8794		# <reserved>	Windows: U+2211
+0x8795		# <reserved>	Windows: U+221A
+0x8796		# <reserved>	Windows: U+22A5
+0x8797		# <reserved>	Windows: U+2220
+0x8798		# <reserved>
+0x8799		# <reserved>
+0x879A		# <reserved>	Windows: U+2235
+0x879B		# <reserved>	Windows: U+2229
+0x879C		# <reserved>	Windows: U+222A
+0x879D		# <reserved>
+0x879E		# <reserved>
+0x879F		# <reserved>
+0x87A0		# <reserved>
+0x87A1		# <reserved>
+0x87A2		# <reserved>
+0x87A3		# <reserved>
+0x87A4		# <reserved>
+0x87A5		# <reserved>
+0x87A6		# <reserved>
+0x87A7		# <reserved>
+0x87A8		# <reserved>
+0x87A9		# <reserved>
+0x87AA		# <reserved>
+0x87AB		# <reserved>
+0x87AC		# <reserved>
+0x87AD		# <reserved>
+0x87AE		# <reserved>
+0x87AF		# <reserved>
+0x87B0		# <reserved>
+0x87B1		# <reserved>
+0x87B2		# <reserved>
+0x87B3		# <reserved>
+0x87B4		# <reserved>
+0x87B5		# <reserved>
+0x87B6		# <reserved>
+0x87B7		# <reserved>
+0x87B8		# <reserved>
+0x87B9		# <reserved>
+0x87BA		# <reserved>
+0x87BB		# <reserved>
+0x87BC		# <reserved>
+0x87BD		# <reserved>
+0x87BE		# <reserved>
+0x87BF		# <reserved>
+0x87C0		# <reserved>
+0x87C1		# <reserved>
+0x87C2		# <reserved>
+0x87C3		# <reserved>
+0x87C4		# <reserved>
+0x87C5		# <reserved>
+0x87C6		# <reserved>
+0x87C7		# <reserved>
+0x87C8		# <reserved>
+0x87C9		# <reserved>
+0x87CA		# <reserved>
+0x87CB		# <reserved>
+0x87CC		# <reserved>
+0x87CD		# <reserved>
+0x87CE		# <reserved>
+0x87CF		# <reserved>
+0x87D0		# <reserved>
+0x87D1		# <reserved>
+0x87D2		# <reserved>
+0x87D3		# <reserved>
+0x87D4		# <reserved>
+0x87D5		# <reserved>
+0x87D6		# <reserved>
+0x87D7		# <reserved>
+0x87D8		# <reserved>
+0x87D9		# <reserved>
+0x87DA		# <reserved>
+0x87DB		# <reserved>
+0x87DC		# <reserved>
+0x87DD		# <reserved>
+0x87DE		# <reserved>
+0x87DF		# <reserved>
+0x87E0		# <reserved>
+0x87E1		# <reserved>
+0x87E2		# <reserved>
+0x87E3		# <reserved>
+0x87E4		# <reserved>
+0x87E5		# <reserved>
+0x87E6		# <reserved>
+0x87E7		# <reserved>
+0x87E8		# <reserved>
+0x87E9		# <reserved>
+0x87EA		# <reserved>
+0x87EB		# <reserved>
+0x87EC		# <reserved>
+0x87ED		# <reserved>
+0x87EE		# <reserved>
+0x87EF		# <reserved>
+0x87F0		# <reserved>
+0x87F1		# <reserved>
+0x87F2		# <reserved>
+0x87F3		# <reserved>
+0x87F4		# <reserved>
+0x87F5		# <reserved>
+0x87F6		# <reserved>
+0x87F7		# <reserved>
+0x87F8		# <reserved>
+0x87F9		# <reserved>
+0x87FA		# <reserved>
+0x87FB		# <reserved>
+0x87FC		# <reserved>
+0x8840		# <reserved>
+0x8841		# <reserved>
+0x8842		# <reserved>
+0x8843		# <reserved>
+0x8844		# <reserved>
+0x8845		# <reserved>
+0x8846		# <reserved>
+0x8847		# <reserved>
+0x8848		# <reserved>
+0x8849		# <reserved>
+0x884A		# <reserved>
+0x884B		# <reserved>
+0x884C		# <reserved>
+0x884D		# <reserved>
+0x884E		# <reserved>
+0x884F		# <reserved>
+0x8850		# <reserved>
+0x8851		# <reserved>
+0x8852		# <reserved>
+0x8853		# <reserved>
+0x8854		# <reserved>
+0x8855		# <reserved>
+0x8856		# <reserved>
+0x8857		# <reserved>
+0x8858		# <reserved>
+0x8859		# <reserved>
+0x885A		# <reserved>
+0x885C		# <reserved>
+0x885D		# <reserved>
+0x885E		# <reserved>
+0x885F		# <reserved>
+0x8860		# <reserved>
+0x8861		# <reserved>
+0x8862		# <reserved>
+0x8863		# <reserved>
+0x8864		# <reserved>
+0x8865		# <reserved>
+0x8866		# <reserved>
+0x8867		# <reserved>
+0x8868		# <reserved>
+0x8869		# <reserved>
+0x886A		# <reserved>
+0x886B		# <reserved>
+0x886C		# <reserved>
+0x886D		# <reserved>
+0x886E		# <reserved>
+0x886F		# <reserved>
+0x8870		# <reserved>
+0x8871		# <reserved>
+0x8872		# <reserved>
+0x8873		# <reserved>
+0x8874		# <reserved>
+0x8875		# <reserved>
+0x8876		# <reserved>
+0x8877		# <reserved>
+0x8878		# <reserved>
+0x8879		# <reserved>
+0x887A		# <reserved>
+0x887B		# <reserved>
+0x887C		# <reserved>
+0x887D		# <reserved>
+0x887E		# <reserved>
+0x8880		# <reserved>
+0x8881		# <reserved>
+0x8882		# <reserved>
+0x8883		# <reserved>
+0x8884		# <reserved>
+0x8885		# <reserved>
+0x8886		# <reserved>
+0x8887		# <reserved>
+0x8888		# <reserved>
+0x8889		# <reserved>
+0x888A		# <reserved>
+0x888B		# <reserved>
+0x888C		# <reserved>
+0x888D		# <reserved>
+0x888E		# <reserved>
+0x888F		# <reserved>
+0x8890		# <reserved>
+0x8891		# <reserved>
+0x8892		# <reserved>
+0x8893		# <reserved>
+0x8894		# <reserved>
+0x8895		# <reserved>
+0x8896		# <reserved>
+0x8897		# <reserved>
+0x8898		# <reserved>
+0x8899		# <reserved>
+0x889A		# <reserved>
+0x889B		# <reserved>
+0x889C		# <reserved>
+0x889D		# <reserved>
+0x889E		# <reserved>
+0x889F	U+4E9C	# <cjk>
+0x88A0	U+5516	# <cjk>
+0x88A1	U+5A03	# <cjk>
+0x88A2	U+963F	# <cjk>
+0x88A3	U+54C0	# <cjk>
+0x88A4	U+611B	# <cjk>
+0x88A5	U+6328	# <cjk>
+0x88A6	U+59F6	# <cjk>
+0x88A7	U+9022	# <cjk>
+0x88A8	U+8475	# <cjk>
+0x88A9	U+831C	# <cjk>
+0x88AA	U+7A50	# <cjk>
+0x88AB	U+60AA	# <cjk>
+0x88AC	U+63E1	# <cjk>
+0x88AD	U+6E25	# <cjk>
+0x88AE	U+65ED	# <cjk>
+0x88AF	U+8466	# <cjk>
+0x88B0	U+82A6	# <cjk>
+0x88B1	U+9BF5	# <cjk>
+0x88B2	U+6893	# <cjk>
+0x88B3	U+5727	# <cjk>
+0x88B4	U+65A1	# <cjk>
+0x88B5	U+6271	# <cjk>
+0x88B6	U+5B9B	# <cjk>
+0x88B7	U+59D0	# <cjk>
+0x88B8	U+867B	# <cjk>
+0x88B9	U+98F4	# <cjk>
+0x88BA	U+7D62	# <cjk>
+0x88BB	U+7DBE	# <cjk>
+0x88BC	U+9B8E	# <cjk>
+0x88BD	U+6216	# <cjk>
+0x88BE	U+7C9F	# <cjk>
+0x88BF	U+88B7	# <cjk>
+0x88C0	U+5B89	# <cjk>
+0x88C1	U+5EB5	# <cjk>
+0x88C2	U+6309	# <cjk>
+0x88C3	U+6697	# <cjk>
+0x88C4	U+6848	# <cjk>
+0x88C5	U+95C7	# <cjk>
+0x88C6	U+978D	# <cjk>
+0x88C7	U+674F	# <cjk>
+0x88C8	U+4EE5	# <cjk>
+0x88C9	U+4F0A	# <cjk>
+0x88CA	U+4F4D	# <cjk>
+0x88CB	U+4F9D	# <cjk>
+0x88CC	U+5049	# <cjk>
+0x88CD	U+56F2	# <cjk>
+0x88CE	U+5937	# <cjk>
+0x88CF	U+59D4	# <cjk>
+0x88D0	U+5A01	# <cjk>
+0x88D1	U+5C09	# <cjk>
+0x88D2	U+60DF	# <cjk>
+0x88D3	U+610F	# <cjk>
+0x88D4	U+6170	# <cjk>
+0x88D5	U+6613	# <cjk>
+0x88D6	U+6905	# <cjk>
+0x88D7	U+70BA	# <cjk>
+0x88D8	U+754F	# <cjk>
+0x88D9	U+7570	# <cjk>
+0x88DA	U+79FB	# <cjk>
+0x88DB	U+7DAD	# <cjk>
+0x88DC	U+7DEF	# <cjk>
+0x88DD	U+80C3	# <cjk>
+0x88DE	U+840E	# <cjk>
+0x88DF	U+8863	# <cjk>
+0x88E0	U+8B02	# <cjk>
+0x88E1	U+9055	# <cjk>
+0x88E2	U+907A	# <cjk>
+0x88E3	U+533B	# <cjk>
+0x88E4	U+4E95	# <cjk>
+0x88E5	U+4EA5	# <cjk>
+0x88E6	U+57DF	# <cjk>
+0x88E7	U+80B2	# <cjk>
+0x88E8	U+90C1	# <cjk>
+0x88E9	U+78EF	# <cjk>
+0x88EA	U+4E00	# <cjk>
+0x88EB	U+58F1	# <cjk>
+0x88EC	U+6EA2	# <cjk>
+0x88ED	U+9038	# <cjk>
+0x88EE	U+7A32	# <cjk>
+0x88EF	U+8328	# <cjk>
+0x88F0	U+828B	# <cjk>
+0x88F1	U+9C2F	# <cjk>
+0x88F2	U+5141	# <cjk>
+0x88F3	U+5370	# <cjk>
+0x88F4	U+54BD	# <cjk>
+0x88F5	U+54E1	# <cjk>
+0x88F6	U+56E0	# <cjk>
+0x88F7	U+59FB	# <cjk>
+0x88F8	U+5F15	# <cjk>
+0x88F9	U+98F2	# <cjk>
+0x88FA	U+6DEB	# <cjk>
+0x88FB	U+80E4	# <cjk>
+0x88FC	U+852D	# <cjk>
+0x8940	U+9662	# <cjk>
+0x8941	U+9670	# <cjk>
+0x8942	U+96A0	# <cjk>
+0x8943	U+97FB	# <cjk>
+0x8944	U+540B	# <cjk>
+0x8945	U+53F3	# <cjk>
+0x8946	U+5B87	# <cjk>
+0x8947	U+70CF	# <cjk>
+0x8948	U+7FBD	# <cjk>
+0x8949	U+8FC2	# <cjk>
+0x894A	U+96E8	# <cjk>
+0x894B	U+536F	# <cjk>
+0x894C	U+9D5C	# <cjk>
+0x894D	U+7ABA	# <cjk>
+0x894E	U+4E11	# <cjk>
+0x894F	U+7893	# <cjk>
+0x8950	U+81FC	# <cjk>
+0x8951	U+6E26	# <cjk>
+0x8952	U+5618	# <cjk>
+0x8953	U+5504	# <cjk>
+0x8954	U+6B1D	# <cjk>
+0x8955	U+851A	# <cjk>
+0x8956	U+9C3B	# <cjk>
+0x8957	U+59E5	# <cjk>
+0x8958	U+53A9	# <cjk>
+0x8959	U+6D66	# <cjk>
+0x895A	U+74DC	# <cjk>
+0x895C	U+5642	# <cjk>
+0x895D	U+4E91	# <cjk>
+0x895E	U+904B	# <cjk>
+0x895F	U+96F2	# <cjk>
+0x8960	U+834F	# <cjk>
+0x8961	U+990C	# <cjk>
+0x8962	U+53E1	# <cjk>
+0x8963	U+55B6	# <cjk>
+0x8964	U+5B30	# <cjk>
+0x8965	U+5F71	# <cjk>
+0x8966	U+6620	# <cjk>
+0x8967	U+66F3	# <cjk>
+0x8968	U+6804	# <cjk>
+0x8969	U+6C38	# <cjk>
+0x896A	U+6CF3	# <cjk>
+0x896B	U+6D29	# <cjk>
+0x896C	U+745B	# <cjk>
+0x896D	U+76C8	# <cjk>
+0x896E	U+7A4E	# <cjk>
+0x896F	U+9834	# <cjk>
+0x8970	U+82F1	# <cjk>
+0x8971	U+885B	# <cjk>
+0x8972	U+8A60	# <cjk>
+0x8973	U+92ED	# <cjk>
+0x8974	U+6DB2	# <cjk>
+0x8975	U+75AB	# <cjk>
+0x8976	U+76CA	# <cjk>
+0x8977	U+99C5	# <cjk>
+0x8978	U+60A6	# <cjk>
+0x8979	U+8B01	# <cjk>
+0x897A	U+8D8A	# <cjk>
+0x897B	U+95B2	# <cjk>
+0x897C	U+698E	# <cjk>
+0x897D	U+53AD	# <cjk>
+0x897E	U+5186	# <cjk>
+0x8980	U+5712	# <cjk>
+0x8981	U+5830	# <cjk>
+0x8982	U+5944	# <cjk>
+0x8983	U+5BB4	# <cjk>
+0x8984	U+5EF6	# <cjk>
+0x8985	U+6028	# <cjk>
+0x8986	U+63A9	# <cjk>
+0x8987	U+63F4	# <cjk>
+0x8988	U+6CBF	# <cjk>
+0x8989	U+6F14	# <cjk>
+0x898A	U+708E	# <cjk>
+0x898B	U+7114	# <cjk>
+0x898C	U+7159	# <cjk>
+0x898D	U+71D5	# <cjk>
+0x898E	U+733F	# <cjk>
+0x898F	U+7E01	# <cjk>
+0x8990	U+8276	# <cjk>
+0x8991	U+82D1	# <cjk>
+0x8992	U+8597	# <cjk>
+0x8993	U+9060	# <cjk>
+0x8994	U+925B	# <cjk>
+0x8995	U+9D1B	# <cjk>
+0x8996	U+5869	# <cjk>
+0x8997	U+65BC	# <cjk>
+0x8998	U+6C5A	# <cjk>
+0x8999	U+7525	# <cjk>
+0x899A	U+51F9	# <cjk>
+0x899B	U+592E	# <cjk>
+0x899C	U+5965	# <cjk>
+0x899D	U+5F80	# <cjk>
+0x899E	U+5FDC	# <cjk>
+0x899F	U+62BC	# <cjk>
+0x89A0	U+65FA	# <cjk>
+0x89A1	U+6A2A	# <cjk>
+0x89A2	U+6B27	# <cjk>
+0x89A3	U+6BB4	# <cjk>
+0x89A4	U+738B	# <cjk>
+0x89A5	U+7FC1	# <cjk>
+0x89A6	U+8956	# <cjk>
+0x89A7	U+9D2C	# <cjk>
+0x89A8	U+9D0E	# <cjk>
+0x89A9	U+9EC4	# <cjk>
+0x89AA	U+5CA1	# <cjk>
+0x89AB	U+6C96	# <cjk>
+0x89AC	U+837B	# <cjk>
+0x89AD	U+5104	# <cjk>
+0x89AE	U+5C4B	# <cjk>
+0x89AF	U+61B6	# <cjk>
+0x89B0	U+81C6	# <cjk>
+0x89B1	U+6876	# <cjk>
+0x89B2	U+7261	# <cjk>
+0x89B3	U+4E59	# <cjk>
+0x89B4	U+4FFA	# <cjk>
+0x89B5	U+5378	# <cjk>
+0x89B6	U+6069	# <cjk>
+0x89B7	U+6E29	# <cjk>
+0x89B8	U+7A4F	# <cjk>
+0x89B9	U+97F3	# <cjk>
+0x89BA	U+4E0B	# <cjk>
+0x89BB	U+5316	# <cjk>
+0x89BC	U+4EEE	# <cjk>
+0x89BD	U+4F55	# <cjk>
+0x89BE	U+4F3D	# <cjk>
+0x89BF	U+4FA1	# <cjk>
+0x89C0	U+4F73	# <cjk>
+0x89C1	U+52A0	# <cjk>
+0x89C2	U+53EF	# <cjk>
+0x89C3	U+5609	# <cjk>
+0x89C4	U+590F	# <cjk>
+0x89C5	U+5AC1	# <cjk>
+0x89C6	U+5BB6	# <cjk>
+0x89C7	U+5BE1	# <cjk>
+0x89C8	U+79D1	# <cjk>
+0x89C9	U+6687	# <cjk>
+0x89CA	U+679C	# <cjk>
+0x89CB	U+67B6	# <cjk>
+0x89CC	U+6B4C	# <cjk>
+0x89CD	U+6CB3	# <cjk>
+0x89CE	U+706B	# <cjk>
+0x89CF	U+73C2	# <cjk>
+0x89D0	U+798D	# <cjk>
+0x89D1	U+79BE	# <cjk>
+0x89D2	U+7A3C	# <cjk>
+0x89D3	U+7B87	# <cjk>
+0x89D4	U+82B1	# <cjk>
+0x89D5	U+82DB	# <cjk>
+0x89D6	U+8304	# <cjk>
+0x89D7	U+8377	# <cjk>
+0x89D8	U+83EF	# <cjk>
+0x89D9	U+83D3	# <cjk>
+0x89DA	U+8766	# <cjk>
+0x89DB	U+8AB2	# <cjk>
+0x89DC	U+5629	# <cjk>
+0x89DD	U+8CA8	# <cjk>
+0x89DE	U+8FE6	# <cjk>
+0x89DF	U+904E	# <cjk>
+0x89E0	U+971E	# <cjk>
+0x89E1	U+868A	# <cjk>
+0x89E2	U+4FC4	# <cjk>
+0x89E3	U+5CE8	# <cjk>
+0x89E4	U+6211	# <cjk>
+0x89E5	U+7259	# <cjk>
+0x89E6	U+753B	# <cjk>
+0x89E7	U+81E5	# <cjk>
+0x89E8	U+82BD	# <cjk>
+0x89E9	U+86FE	# <cjk>
+0x89EA	U+8CC0	# <cjk>
+0x89EB	U+96C5	# <cjk>
+0x89EC	U+9913	# <cjk>
+0x89ED	U+99D5	# <cjk>
+0x89EE	U+4ECB	# <cjk>
+0x89EF	U+4F1A	# <cjk>
+0x89F0	U+89E3	# <cjk>
+0x89F1	U+56DE	# <cjk>
+0x89F2	U+584A	# <cjk>
+0x89F3	U+58CA	# <cjk>
+0x89F4	U+5EFB	# <cjk>
+0x89F5	U+5FEB	# <cjk>
+0x89F6	U+602A	# <cjk>
+0x89F7	U+6094	# <cjk>
+0x89F8	U+6062	# <cjk>
+0x89F9	U+61D0	# <cjk>
+0x89FA	U+6212	# <cjk>
+0x89FB	U+62D0	# <cjk>
+0x89FC	U+6539	# <cjk>
+0x8A40	U+9B41	# <cjk>
+0x8A41	U+6666	# <cjk>
+0x8A42	U+68B0	# <cjk>
+0x8A43	U+6D77	# <cjk>
+0x8A44	U+7070	# <cjk>
+0x8A45	U+754C	# <cjk>
+0x8A46	U+7686	# <cjk>
+0x8A47	U+7D75	# <cjk>
+0x8A48	U+82A5	# <cjk>
+0x8A49	U+87F9	# <cjk>
+0x8A4A	U+958B	# <cjk>
+0x8A4B	U+968E	# <cjk>
+0x8A4C	U+8C9D	# <cjk>
+0x8A4D	U+51F1	# <cjk>
+0x8A4E	U+52BE	# <cjk>
+0x8A4F	U+5916	# <cjk>
+0x8A50	U+54B3	# <cjk>
+0x8A51	U+5BB3	# <cjk>
+0x8A52	U+5D16	# <cjk>
+0x8A53	U+6168	# <cjk>
+0x8A54	U+6982	# <cjk>
+0x8A55	U+6DAF	# <cjk>
+0x8A56	U+788D	# <cjk>
+0x8A57	U+84CB	# <cjk>
+0x8A58	U+8857	# <cjk>
+0x8A59	U+8A72	# <cjk>
+0x8A5A	U+93A7	# <cjk>
+0x8A5C	U+6D6C	# <cjk>
+0x8A5D	U+99A8	# <cjk>
+0x8A5E	U+86D9	# <cjk>
+0x8A5F	U+57A3	# <cjk>
+0x8A60	U+67FF	# <cjk>
+0x8A61	U+86CE	# <cjk>
+0x8A62	U+920E	# <cjk>
+0x8A63	U+5283	# <cjk>
+0x8A64	U+5687	# <cjk>
+0x8A65	U+5404	# <cjk>
+0x8A66	U+5ED3	# <cjk>
+0x8A67	U+62E1	# <cjk>
+0x8A68	U+64B9	# <cjk>
+0x8A69	U+683C	# <cjk>
+0x8A6A	U+6838	# <cjk>
+0x8A6B	U+6BBB	# <cjk>
+0x8A6C	U+7372	# <cjk>
+0x8A6D	U+78BA	# <cjk>
+0x8A6E	U+7A6B	# <cjk>
+0x8A6F	U+899A	# <cjk>
+0x8A70	U+89D2	# <cjk>
+0x8A71	U+8D6B	# <cjk>
+0x8A72	U+8F03	# <cjk>
+0x8A73	U+90ED	# <cjk>
+0x8A74	U+95A3	# <cjk>
+0x8A75	U+9694	# <cjk>
+0x8A76	U+9769	# <cjk>
+0x8A77	U+5B66	# <cjk>
+0x8A78	U+5CB3	# <cjk>
+0x8A79	U+697D	# <cjk>
+0x8A7A	U+984D	# <cjk>
+0x8A7B	U+984E	# <cjk>
+0x8A7C	U+639B	# <cjk>
+0x8A7D	U+7B20	# <cjk>
+0x8A7E	U+6A2B	# <cjk>
+0x8A80	U+6A7F	# <cjk>
+0x8A81	U+68B6	# <cjk>
+0x8A82	U+9C0D	# <cjk>
+0x8A83	U+6F5F	# <cjk>
+0x8A84	U+5272	# <cjk>
+0x8A85	U+559D	# <cjk>
+0x8A86	U+6070	# <cjk>
+0x8A87	U+62EC	# <cjk>
+0x8A88	U+6D3B	# <cjk>
+0x8A89	U+6E07	# <cjk>
+0x8A8A	U+6ED1	# <cjk>
+0x8A8B	U+845B	# <cjk>
+0x8A8C	U+8910	# <cjk>
+0x8A8D	U+8F44	# <cjk>
+0x8A8E	U+4E14	# <cjk>
+0x8A8F	U+9C39	# <cjk>
+0x8A90	U+53F6	# <cjk>
+0x8A91	U+691B	# <cjk>
+0x8A92	U+6A3A	# <cjk>
+0x8A93	U+9784	# <cjk>
+0x8A94	U+682A	# <cjk>
+0x8A95	U+515C	# <cjk>
+0x8A96	U+7AC3	# <cjk>
+0x8A97	U+84B2	# <cjk>
+0x8A98	U+91DC	# <cjk>
+0x8A99	U+938C	# <cjk>
+0x8A9A	U+565B	# <cjk>
+0x8A9B	U+9D28	# <cjk>
+0x8A9C	U+6822	# <cjk>
+0x8A9D	U+8305	# <cjk>
+0x8A9E	U+8431	# <cjk>
+0x8A9F	U+7CA5	# <cjk>
+0x8AA0	U+5208	# <cjk>
+0x8AA1	U+82C5	# <cjk>
+0x8AA2	U+74E6	# <cjk>
+0x8AA3	U+4E7E	# <cjk>
+0x8AA4	U+4F83	# <cjk>
+0x8AA5	U+51A0	# <cjk>
+0x8AA6	U+5BD2	# <cjk>
+0x8AA7	U+520A	# <cjk>
+0x8AA8	U+52D8	# <cjk>
+0x8AA9	U+52E7	# <cjk>
+0x8AAA	U+5DFB	# <cjk>
+0x8AAB	U+559A	# <cjk>
+0x8AAC	U+582A	# <cjk>
+0x8AAD	U+59E6	# <cjk>
+0x8AAE	U+5B8C	# <cjk>
+0x8AAF	U+5B98	# <cjk>
+0x8AB0	U+5BDB	# <cjk>
+0x8AB1	U+5E72	# <cjk>
+0x8AB2	U+5E79	# <cjk>
+0x8AB3	U+60A3	# <cjk>
+0x8AB4	U+611F	# <cjk>
+0x8AB5	U+6163	# <cjk>
+0x8AB6	U+61BE	# <cjk>
+0x8AB7	U+63DB	# <cjk>
+0x8AB8	U+6562	# <cjk>
+0x8AB9	U+67D1	# <cjk>
+0x8ABA	U+6853	# <cjk>
+0x8ABB	U+68FA	# <cjk>
+0x8ABC	U+6B3E	# <cjk>
+0x8ABD	U+6B53	# <cjk>
+0x8ABE	U+6C57	# <cjk>
+0x8ABF	U+6F22	# <cjk>
+0x8AC0	U+6F97	# <cjk>
+0x8AC1	U+6F45	# <cjk>
+0x8AC2	U+74B0	# <cjk>
+0x8AC3	U+7518	# <cjk>
+0x8AC4	U+76E3	# <cjk>
+0x8AC5	U+770B	# <cjk>
+0x8AC6	U+7AFF	# <cjk>
+0x8AC7	U+7BA1	# <cjk>
+0x8AC8	U+7C21	# <cjk>
+0x8AC9	U+7DE9	# <cjk>
+0x8ACA	U+7F36	# <cjk>
+0x8ACB	U+7FF0	# <cjk>
+0x8ACC	U+809D	# <cjk>
+0x8ACD	U+8266	# <cjk>
+0x8ACE	U+839E	# <cjk>
+0x8ACF	U+89B3	# <cjk>
+0x8AD0	U+8ACC	# <cjk>
+0x8AD1	U+8CAB	# <cjk>
+0x8AD2	U+9084	# <cjk>
+0x8AD3	U+9451	# <cjk>
+0x8AD4	U+9593	# <cjk>
+0x8AD5	U+9591	# <cjk>
+0x8AD6	U+95A2	# <cjk>
+0x8AD7	U+9665	# <cjk>
+0x8AD8	U+97D3	# <cjk>
+0x8AD9	U+9928	# <cjk>
+0x8ADA	U+8218	# <cjk>
+0x8ADB	U+4E38	# <cjk>
+0x8ADC	U+542B	# <cjk>
+0x8ADD	U+5CB8	# <cjk>
+0x8ADE	U+5DCC	# <cjk>
+0x8ADF	U+73A9	# <cjk>
+0x8AE0	U+764C	# <cjk>
+0x8AE1	U+773C	# <cjk>
+0x8AE2	U+5CA9	# <cjk>
+0x8AE3	U+7FEB	# <cjk>
+0x8AE4	U+8D0B	# <cjk>
+0x8AE5	U+96C1	# <cjk>
+0x8AE6	U+9811	# <cjk>
+0x8AE7	U+9854	# <cjk>
+0x8AE8	U+9858	# <cjk>
+0x8AE9	U+4F01	# <cjk>
+0x8AEA	U+4F0E	# <cjk>
+0x8AEB	U+5371	# <cjk>
+0x8AEC	U+559C	# <cjk>
+0x8AED	U+5668	# <cjk>
+0x8AEE	U+57FA	# <cjk>
+0x8AEF	U+5947	# <cjk>
+0x8AF0	U+5B09	# <cjk>
+0x8AF1	U+5BC4	# <cjk>
+0x8AF2	U+5C90	# <cjk>
+0x8AF3	U+5E0C	# <cjk>
+0x8AF4	U+5E7E	# <cjk>
+0x8AF5	U+5FCC	# <cjk>
+0x8AF6	U+63EE	# <cjk>
+0x8AF7	U+673A	# <cjk>
+0x8AF8	U+65D7	# <cjk>
+0x8AF9	U+65E2	# <cjk>
+0x8AFA	U+671F	# <cjk>
+0x8AFB	U+68CB	# <cjk>
+0x8AFC	U+68C4	# <cjk>
+0x8B40	U+6A5F	# <cjk>
+0x8B41	U+5E30	# <cjk>
+0x8B42	U+6BC5	# <cjk>
+0x8B43	U+6C17	# <cjk>
+0x8B44	U+6C7D	# <cjk>
+0x8B45	U+757F	# <cjk>
+0x8B46	U+7948	# <cjk>
+0x8B47	U+5B63	# <cjk>
+0x8B48	U+7A00	# <cjk>
+0x8B49	U+7D00	# <cjk>
+0x8B4A	U+5FBD	# <cjk>
+0x8B4B	U+898F	# <cjk>
+0x8B4C	U+8A18	# <cjk>
+0x8B4D	U+8CB4	# <cjk>
+0x8B4E	U+8D77	# <cjk>
+0x8B4F	U+8ECC	# <cjk>
+0x8B50	U+8F1D	# <cjk>
+0x8B51	U+98E2	# <cjk>
+0x8B52	U+9A0E	# <cjk>
+0x8B53	U+9B3C	# <cjk>
+0x8B54	U+4E80	# <cjk>
+0x8B55	U+507D	# <cjk>
+0x8B56	U+5100	# <cjk>
+0x8B57	U+5993	# <cjk>
+0x8B58	U+5B9C	# <cjk>
+0x8B59	U+622F	# <cjk>
+0x8B5A	U+6280	# <cjk>
+0x8B5C	U+6B3A	# <cjk>
+0x8B5D	U+72A0	# <cjk>
+0x8B5E	U+7591	# <cjk>
+0x8B5F	U+7947	# <cjk>
+0x8B60	U+7FA9	# <cjk>
+0x8B61	U+87FB	# <cjk>
+0x8B62	U+8ABC	# <cjk>
+0x8B63	U+8B70	# <cjk>
+0x8B64	U+63AC	# <cjk>
+0x8B65	U+83CA	# <cjk>
+0x8B66	U+97A0	# <cjk>
+0x8B67	U+5409	# <cjk>
+0x8B68	U+5403	# <cjk>
+0x8B69	U+55AB	# <cjk>
+0x8B6A	U+6854	# <cjk>
+0x8B6B	U+6A58	# <cjk>
+0x8B6C	U+8A70	# <cjk>
+0x8B6D	U+7827	# <cjk>
+0x8B6E	U+6775	# <cjk>
+0x8B6F	U+9ECD	# <cjk>
+0x8B70	U+5374	# <cjk>
+0x8B71	U+5BA2	# <cjk>
+0x8B72	U+811A	# <cjk>
+0x8B73	U+8650	# <cjk>
+0x8B74	U+9006	# <cjk>
+0x8B75	U+4E18	# <cjk>
+0x8B76	U+4E45	# <cjk>
+0x8B77	U+4EC7	# <cjk>
+0x8B78	U+4F11	# <cjk>
+0x8B79	U+53CA	# <cjk>
+0x8B7A	U+5438	# <cjk>
+0x8B7B	U+5BAE	# <cjk>
+0x8B7C	U+5F13	# <cjk>
+0x8B7D	U+6025	# <cjk>
+0x8B7E	U+6551	# <cjk>
+0x8B80	U+673D	# <cjk>
+0x8B81	U+6C42	# <cjk>
+0x8B82	U+6C72	# <cjk>
+0x8B83	U+6CE3	# <cjk>
+0x8B84	U+7078	# <cjk>
+0x8B85	U+7403	# <cjk>
+0x8B86	U+7A76	# <cjk>
+0x8B87	U+7AAE	# <cjk>
+0x8B88	U+7B08	# <cjk>
+0x8B89	U+7D1A	# <cjk>
+0x8B8A	U+7CFE	# <cjk>
+0x8B8B	U+7D66	# <cjk>
+0x8B8C	U+65E7	# <cjk>
+0x8B8D	U+725B	# <cjk>
+0x8B8E	U+53BB	# <cjk>
+0x8B8F	U+5C45	# <cjk>
+0x8B90	U+5DE8	# <cjk>
+0x8B91	U+62D2	# <cjk>
+0x8B92	U+62E0	# <cjk>
+0x8B93	U+6319	# <cjk>
+0x8B94	U+6E20	# <cjk>
+0x8B95	U+865A	# <cjk>
+0x8B96	U+8A31	# <cjk>
+0x8B97	U+8DDD	# <cjk>
+0x8B98	U+92F8	# <cjk>
+0x8B99	U+6F01	# <cjk>
+0x8B9A	U+79A6	# <cjk>
+0x8B9B	U+9B5A	# <cjk>
+0x8B9C	U+4EA8	# <cjk>
+0x8B9D	U+4EAB	# <cjk>
+0x8B9E	U+4EAC	# <cjk>
+0x8B9F	U+4F9B	# <cjk>
+0x8BA0	U+4FA0	# <cjk>
+0x8BA1	U+50D1	# <cjk>
+0x8BA2	U+5147	# <cjk>
+0x8BA3	U+7AF6	# <cjk>
+0x8BA4	U+5171	# <cjk>
+0x8BA5	U+51F6	# <cjk>
+0x8BA6	U+5354	# <cjk>
+0x8BA7	U+5321	# <cjk>
+0x8BA8	U+537F	# <cjk>
+0x8BA9	U+53EB	# <cjk>
+0x8BAA	U+55AC	# <cjk>
+0x8BAB	U+5883	# <cjk>
+0x8BAC	U+5CE1	# <cjk>
+0x8BAD	U+5F37	# <cjk>
+0x8BAE	U+5F4A	# <cjk>
+0x8BAF	U+602F	# <cjk>
+0x8BB0	U+6050	# <cjk>
+0x8BB1	U+606D	# <cjk>
+0x8BB2	U+631F	# <cjk>
+0x8BB3	U+6559	# <cjk>
+0x8BB4	U+6A4B	# <cjk>
+0x8BB5	U+6CC1	# <cjk>
+0x8BB6	U+72C2	# <cjk>
+0x8BB7	U+72ED	# <cjk>
+0x8BB8	U+77EF	# <cjk>
+0x8BB9	U+80F8	# <cjk>
+0x8BBA	U+8105	# <cjk>
+0x8BBB	U+8208	# <cjk>
+0x8BBC	U+854E	# <cjk>
+0x8BBD	U+90F7	# <cjk>
+0x8BBE	U+93E1	# <cjk>
+0x8BBF	U+97FF	# <cjk>
+0x8BC0	U+9957	# <cjk>
+0x8BC1	U+9A5A	# <cjk>
+0x8BC2	U+4EF0	# <cjk>
+0x8BC3	U+51DD	# <cjk>
+0x8BC4	U+5C2D	# <cjk>
+0x8BC5	U+6681	# <cjk>
+0x8BC6	U+696D	# <cjk>
+0x8BC7	U+5C40	# <cjk>
+0x8BC8	U+66F2	# <cjk>
+0x8BC9	U+6975	# <cjk>
+0x8BCA	U+7389	# <cjk>
+0x8BCB	U+6850	# <cjk>
+0x8BCC	U+7C81	# <cjk>
+0x8BCD	U+50C5	# <cjk>
+0x8BCE	U+52E4	# <cjk>
+0x8BCF	U+5747	# <cjk>
+0x8BD0	U+5DFE	# <cjk>
+0x8BD1	U+9326	# <cjk>
+0x8BD2	U+65A4	# <cjk>
+0x8BD3	U+6B23	# <cjk>
+0x8BD4	U+6B3D	# <cjk>
+0x8BD5	U+7434	# <cjk>
+0x8BD6	U+7981	# <cjk>
+0x8BD7	U+79BD	# <cjk>
+0x8BD8	U+7B4B	# <cjk>
+0x8BD9	U+7DCA	# <cjk>
+0x8BDA	U+82B9	# <cjk>
+0x8BDB	U+83CC	# <cjk>
+0x8BDC	U+887F	# <cjk>
+0x8BDD	U+895F	# <cjk>
+0x8BDE	U+8B39	# <cjk>
+0x8BDF	U+8FD1	# <cjk>
+0x8BE0	U+91D1	# <cjk>
+0x8BE1	U+541F	# <cjk>
+0x8BE2	U+9280	# <cjk>
+0x8BE3	U+4E5D	# <cjk>
+0x8BE4	U+5036	# <cjk>
+0x8BE5	U+53E5	# <cjk>
+0x8BE6	U+533A	# <cjk>
+0x8BE7	U+72D7	# <cjk>
+0x8BE8	U+7396	# <cjk>
+0x8BE9	U+77E9	# <cjk>
+0x8BEA	U+82E6	# <cjk>
+0x8BEB	U+8EAF	# <cjk>
+0x8BEC	U+99C6	# <cjk>
+0x8BED	U+99C8	# <cjk>
+0x8BEE	U+99D2	# <cjk>
+0x8BEF	U+5177	# <cjk>
+0x8BF0	U+611A	# <cjk>
+0x8BF1	U+865E	# <cjk>
+0x8BF2	U+55B0	# <cjk>
+0x8BF3	U+7A7A	# <cjk>
+0x8BF4	U+5076	# <cjk>
+0x8BF5	U+5BD3	# <cjk>
+0x8BF6	U+9047	# <cjk>
+0x8BF7	U+9685	# <cjk>
+0x8BF8	U+4E32	# <cjk>
+0x8BF9	U+6ADB	# <cjk>
+0x8BFA	U+91E7	# <cjk>
+0x8BFB	U+5C51	# <cjk>
+0x8BFC	U+5C48	# <cjk>
+0x8C40	U+6398	# <cjk>
+0x8C41	U+7A9F	# <cjk>
+0x8C42	U+6C93	# <cjk>
+0x8C43	U+9774	# <cjk>
+0x8C44	U+8F61	# <cjk>
+0x8C45	U+7AAA	# <cjk>
+0x8C46	U+718A	# <cjk>
+0x8C47	U+9688	# <cjk>
+0x8C48	U+7C82	# <cjk>
+0x8C49	U+6817	# <cjk>
+0x8C4A	U+7E70	# <cjk>
+0x8C4B	U+6851	# <cjk>
+0x8C4C	U+936C	# <cjk>
+0x8C4D	U+52F2	# <cjk>
+0x8C4E	U+541B	# <cjk>
+0x8C4F	U+85AB	# <cjk>
+0x8C50	U+8A13	# <cjk>
+0x8C51	U+7FA4	# <cjk>
+0x8C52	U+8ECD	# <cjk>
+0x8C53	U+90E1	# <cjk>
+0x8C54	U+5366	# <cjk>
+0x8C55	U+8888	# <cjk>
+0x8C56	U+7941	# <cjk>
+0x8C57	U+4FC2	# <cjk>
+0x8C58	U+50BE	# <cjk>
+0x8C59	U+5211	# <cjk>
+0x8C5A	U+5144	# <cjk>
+0x8C5C	U+572D	# <cjk>
+0x8C5D	U+73EA	# <cjk>
+0x8C5E	U+578B	# <cjk>
+0x8C5F	U+5951	# <cjk>
+0x8C60	U+5F62	# <cjk>
+0x8C61	U+5F84	# <cjk>
+0x8C62	U+6075	# <cjk>
+0x8C63	U+6176	# <cjk>
+0x8C64	U+6167	# <cjk>
+0x8C65	U+61A9	# <cjk>
+0x8C66	U+63B2	# <cjk>
+0x8C67	U+643A	# <cjk>
+0x8C68	U+656C	# <cjk>
+0x8C69	U+666F	# <cjk>
+0x8C6A	U+6842	# <cjk>
+0x8C6B	U+6E13	# <cjk>
+0x8C6C	U+7566	# <cjk>
+0x8C6D	U+7A3D	# <cjk>
+0x8C6E	U+7CFB	# <cjk>
+0x8C6F	U+7D4C	# <cjk>
+0x8C70	U+7D99	# <cjk>
+0x8C71	U+7E4B	# <cjk>
+0x8C72	U+7F6B	# <cjk>
+0x8C73	U+830E	# <cjk>
+0x8C74	U+834A	# <cjk>
+0x8C75	U+86CD	# <cjk>
+0x8C76	U+8A08	# <cjk>
+0x8C77	U+8A63	# <cjk>
+0x8C78	U+8B66	# <cjk>
+0x8C79	U+8EFD	# <cjk>
+0x8C7A	U+981A	# <cjk>
+0x8C7B	U+9D8F	# <cjk>
+0x8C7C	U+82B8	# <cjk>
+0x8C7D	U+8FCE	# <cjk>
+0x8C7E	U+9BE8	# <cjk>
+0x8C80	U+5287	# <cjk>
+0x8C81	U+621F	# <cjk>
+0x8C82	U+6483	# <cjk>
+0x8C83	U+6FC0	# <cjk>
+0x8C84	U+9699	# <cjk>
+0x8C85	U+6841	# <cjk>
+0x8C86	U+5091	# <cjk>
+0x8C87	U+6B20	# <cjk>
+0x8C88	U+6C7A	# <cjk>
+0x8C89	U+6F54	# <cjk>
+0x8C8A	U+7A74	# <cjk>
+0x8C8B	U+7D50	# <cjk>
+0x8C8C	U+8840	# <cjk>
+0x8C8D	U+8A23	# <cjk>
+0x8C8E	U+6708	# <cjk>
+0x8C8F	U+4EF6	# <cjk>
+0x8C90	U+5039	# <cjk>
+0x8C91	U+5026	# <cjk>
+0x8C92	U+5065	# <cjk>
+0x8C93	U+517C	# <cjk>
+0x8C94	U+5238	# <cjk>
+0x8C95	U+5263	# <cjk>
+0x8C96	U+55A7	# <cjk>
+0x8C97	U+570F	# <cjk>
+0x8C98	U+5805	# <cjk>
+0x8C99	U+5ACC	# <cjk>
+0x8C9A	U+5EFA	# <cjk>
+0x8C9B	U+61B2	# <cjk>
+0x8C9C	U+61F8	# <cjk>
+0x8C9D	U+62F3	# <cjk>
+0x8C9E	U+6372	# <cjk>
+0x8C9F	U+691C	# <cjk>
+0x8CA0	U+6A29	# <cjk>
+0x8CA1	U+727D	# <cjk>
+0x8CA2	U+72AC	# <cjk>
+0x8CA3	U+732E	# <cjk>
+0x8CA4	U+7814	# <cjk>
+0x8CA5	U+786F	# <cjk>
+0x8CA6	U+7D79	# <cjk>
+0x8CA7	U+770C	# <cjk>
+0x8CA8	U+80A9	# <cjk>
+0x8CA9	U+898B	# <cjk>
+0x8CAA	U+8B19	# <cjk>
+0x8CAB	U+8CE2	# <cjk>
+0x8CAC	U+8ED2	# <cjk>
+0x8CAD	U+9063	# <cjk>
+0x8CAE	U+9375	# <cjk>
+0x8CAF	U+967A	# <cjk>
+0x8CB0	U+9855	# <cjk>
+0x8CB1	U+9A13	# <cjk>
+0x8CB2	U+9E78	# <cjk>
+0x8CB3	U+5143	# <cjk>
+0x8CB4	U+539F	# <cjk>
+0x8CB5	U+53B3	# <cjk>
+0x8CB6	U+5E7B	# <cjk>
+0x8CB7	U+5F26	# <cjk>
+0x8CB8	U+6E1B	# <cjk>
+0x8CB9	U+6E90	# <cjk>
+0x8CBA	U+7384	# <cjk>
+0x8CBB	U+73FE	# <cjk>
+0x8CBC	U+7D43	# <cjk>
+0x8CBD	U+8237	# <cjk>
+0x8CBE	U+8A00	# <cjk>
+0x8CBF	U+8AFA	# <cjk>
+0x8CC0	U+9650	# <cjk>
+0x8CC1	U+4E4E	# <cjk>
+0x8CC2	U+500B	# <cjk>
+0x8CC3	U+53E4	# <cjk>
+0x8CC4	U+547C	# <cjk>
+0x8CC5	U+56FA	# <cjk>
+0x8CC6	U+59D1	# <cjk>
+0x8CC7	U+5B64	# <cjk>
+0x8CC8	U+5DF1	# <cjk>
+0x8CC9	U+5EAB	# <cjk>
+0x8CCA	U+5F27	# <cjk>
+0x8CCB	U+6238	# <cjk>
+0x8CCC	U+6545	# <cjk>
+0x8CCD	U+67AF	# <cjk>
+0x8CCE	U+6E56	# <cjk>
+0x8CCF	U+72D0	# <cjk>
+0x8CD0	U+7CCA	# <cjk>
+0x8CD1	U+88B4	# <cjk>
+0x8CD2	U+80A1	# <cjk>
+0x8CD3	U+80E1	# <cjk>
+0x8CD4	U+83F0	# <cjk>
+0x8CD5	U+864E	# <cjk>
+0x8CD6	U+8A87	# <cjk>
+0x8CD7	U+8DE8	# <cjk>
+0x8CD8	U+9237	# <cjk>
+0x8CD9	U+96C7	# <cjk>
+0x8CDA	U+9867	# <cjk>
+0x8CDB	U+9F13	# <cjk>
+0x8CDC	U+4E94	# <cjk>
+0x8CDD	U+4E92	# <cjk>
+0x8CDE	U+4F0D	# <cjk>
+0x8CDF	U+5348	# <cjk>
+0x8CE0	U+5449	# <cjk>
+0x8CE1	U+543E	# <cjk>
+0x8CE2	U+5A2F	# <cjk>
+0x8CE3	U+5F8C	# <cjk>
+0x8CE4	U+5FA1	# <cjk>
+0x8CE5	U+609F	# <cjk>
+0x8CE6	U+68A7	# <cjk>
+0x8CE7	U+6A8E	# <cjk>
+0x8CE8	U+745A	# <cjk>
+0x8CE9	U+7881	# <cjk>
+0x8CEA	U+8A9E	# <cjk>
+0x8CEB	U+8AA4	# <cjk>
+0x8CEC	U+8B77	# <cjk>
+0x8CED	U+9190	# <cjk>
+0x8CEE	U+4E5E	# <cjk>
+0x8CEF	U+9BC9	# <cjk>
+0x8CF0	U+4EA4	# <cjk>
+0x8CF1	U+4F7C	# <cjk>
+0x8CF2	U+4FAF	# <cjk>
+0x8CF3	U+5019	# <cjk>
+0x8CF4	U+5016	# <cjk>
+0x8CF5	U+5149	# <cjk>
+0x8CF6	U+516C	# <cjk>
+0x8CF7	U+529F	# <cjk>
+0x8CF8	U+52B9	# <cjk>
+0x8CF9	U+52FE	# <cjk>
+0x8CFA	U+539A	# <cjk>
+0x8CFB	U+53E3	# <cjk>
+0x8CFC	U+5411	# <cjk>
+0x8D40	U+540E	# <cjk>
+0x8D41	U+5589	# <cjk>
+0x8D42	U+5751	# <cjk>
+0x8D43	U+57A2	# <cjk>
+0x8D44	U+597D	# <cjk>
+0x8D45	U+5B54	# <cjk>
+0x8D46	U+5B5D	# <cjk>
+0x8D47	U+5B8F	# <cjk>
+0x8D48	U+5DE5	# <cjk>
+0x8D49	U+5DE7	# <cjk>
+0x8D4A	U+5DF7	# <cjk>
+0x8D4B	U+5E78	# <cjk>
+0x8D4C	U+5E83	# <cjk>
+0x8D4D	U+5E9A	# <cjk>
+0x8D4E	U+5EB7	# <cjk>
+0x8D4F	U+5F18	# <cjk>
+0x8D50	U+6052	# <cjk>
+0x8D51	U+614C	# <cjk>
+0x8D52	U+6297	# <cjk>
+0x8D53	U+62D8	# <cjk>
+0x8D54	U+63A7	# <cjk>
+0x8D55	U+653B	# <cjk>
+0x8D56	U+6602	# <cjk>
+0x8D57	U+6643	# <cjk>
+0x8D58	U+66F4	# <cjk>
+0x8D59	U+676D	# <cjk>
+0x8D5A	U+6821	# <cjk>
+0x8D5C	U+69CB	# <cjk>
+0x8D5D	U+6C5F	# <cjk>
+0x8D5E	U+6D2A	# <cjk>
+0x8D5F	U+6D69	# <cjk>
+0x8D60	U+6E2F	# <cjk>
+0x8D61	U+6E9D	# <cjk>
+0x8D62	U+7532	# <cjk>
+0x8D63	U+7687	# <cjk>
+0x8D64	U+786C	# <cjk>
+0x8D65	U+7A3F	# <cjk>
+0x8D66	U+7CE0	# <cjk>
+0x8D67	U+7D05	# <cjk>
+0x8D68	U+7D18	# <cjk>
+0x8D69	U+7D5E	# <cjk>
+0x8D6A	U+7DB1	# <cjk>
+0x8D6B	U+8015	# <cjk>
+0x8D6C	U+8003	# <cjk>
+0x8D6D	U+80AF	# <cjk>
+0x8D6E	U+80B1	# <cjk>
+0x8D6F	U+8154	# <cjk>
+0x8D70	U+818F	# <cjk>
+0x8D71	U+822A	# <cjk>
+0x8D72	U+8352	# <cjk>
+0x8D73	U+884C	# <cjk>
+0x8D74	U+8861	# <cjk>
+0x8D75	U+8B1B	# <cjk>
+0x8D76	U+8CA2	# <cjk>
+0x8D77	U+8CFC	# <cjk>
+0x8D78	U+90CA	# <cjk>
+0x8D79	U+9175	# <cjk>
+0x8D7A	U+9271	# <cjk>
+0x8D7B	U+783F	# <cjk>
+0x8D7C	U+92FC	# <cjk>
+0x8D7D	U+95A4	# <cjk>
+0x8D7E	U+964D	# <cjk>
+0x8D80	U+9805	# <cjk>
+0x8D81	U+9999	# <cjk>
+0x8D82	U+9AD8	# <cjk>
+0x8D83	U+9D3B	# <cjk>
+0x8D84	U+525B	# <cjk>
+0x8D85	U+52AB	# <cjk>
+0x8D86	U+53F7	# <cjk>
+0x8D87	U+5408	# <cjk>
+0x8D88	U+58D5	# <cjk>
+0x8D89	U+62F7	# <cjk>
+0x8D8A	U+6FE0	# <cjk>
+0x8D8B	U+8C6A	# <cjk>
+0x8D8C	U+8F5F	# <cjk>
+0x8D8D	U+9EB9	# <cjk>
+0x8D8E	U+514B	# <cjk>
+0x8D8F	U+523B	# <cjk>
+0x8D90	U+544A	# <cjk>
+0x8D91	U+56FD	# <cjk>
+0x8D92	U+7A40	# <cjk>
+0x8D93	U+9177	# <cjk>
+0x8D94	U+9D60	# <cjk>
+0x8D95	U+9ED2	# <cjk>
+0x8D96	U+7344	# <cjk>
+0x8D97	U+6F09	# <cjk>
+0x8D98	U+8170	# <cjk>
+0x8D99	U+7511	# <cjk>
+0x8D9A	U+5FFD	# <cjk>
+0x8D9B	U+60DA	# <cjk>
+0x8D9C	U+9AA8	# <cjk>
+0x8D9D	U+72DB	# <cjk>
+0x8D9E	U+8FBC	# <cjk>
+0x8D9F	U+6B64	# <cjk>
+0x8DA0	U+9803	# <cjk>
+0x8DA1	U+4ECA	# <cjk>
+0x8DA2	U+56F0	# <cjk>
+0x8DA3	U+5764	# <cjk>
+0x8DA4	U+58BE	# <cjk>
+0x8DA5	U+5A5A	# <cjk>
+0x8DA6	U+6068	# <cjk>
+0x8DA7	U+61C7	# <cjk>
+0x8DA8	U+660F	# <cjk>
+0x8DA9	U+6606	# <cjk>
+0x8DAA	U+6839	# <cjk>
+0x8DAB	U+68B1	# <cjk>
+0x8DAC	U+6DF7	# <cjk>
+0x8DAD	U+75D5	# <cjk>
+0x8DAE	U+7D3A	# <cjk>
+0x8DAF	U+826E	# <cjk>
+0x8DB0	U+9B42	# <cjk>
+0x8DB1	U+4E9B	# <cjk>
+0x8DB2	U+4F50	# <cjk>
+0x8DB3	U+53C9	# <cjk>
+0x8DB4	U+5506	# <cjk>
+0x8DB5	U+5D6F	# <cjk>
+0x8DB6	U+5DE6	# <cjk>
+0x8DB7	U+5DEE	# <cjk>
+0x8DB8	U+67FB	# <cjk>
+0x8DB9	U+6C99	# <cjk>
+0x8DBA	U+7473	# <cjk>
+0x8DBB	U+7802	# <cjk>
+0x8DBC	U+8A50	# <cjk>
+0x8DBD	U+9396	# <cjk>
+0x8DBE	U+88DF	# <cjk>
+0x8DBF	U+5750	# <cjk>
+0x8DC0	U+5EA7	# <cjk>
+0x8DC1	U+632B	# <cjk>
+0x8DC2	U+50B5	# <cjk>
+0x8DC3	U+50AC	# <cjk>
+0x8DC4	U+518D	# <cjk>
+0x8DC5	U+6700	# <cjk>
+0x8DC6	U+54C9	# <cjk>
+0x8DC7	U+585E	# <cjk>
+0x8DC8	U+59BB	# <cjk>
+0x8DC9	U+5BB0	# <cjk>
+0x8DCA	U+5F69	# <cjk>
+0x8DCB	U+624D	# <cjk>
+0x8DCC	U+63A1	# <cjk>
+0x8DCD	U+683D	# <cjk>
+0x8DCE	U+6B73	# <cjk>
+0x8DCF	U+6E08	# <cjk>
+0x8DD0	U+707D	# <cjk>
+0x8DD1	U+91C7	# <cjk>
+0x8DD2	U+7280	# <cjk>
+0x8DD3	U+7815	# <cjk>
+0x8DD4	U+7826	# <cjk>
+0x8DD5	U+796D	# <cjk>
+0x8DD6	U+658E	# <cjk>
+0x8DD7	U+7D30	# <cjk>
+0x8DD8	U+83DC	# <cjk>
+0x8DD9	U+88C1	# <cjk>
+0x8DDA	U+8F09	# <cjk>
+0x8DDB	U+969B	# <cjk>
+0x8DDC	U+5264	# <cjk>
+0x8DDD	U+5728	# <cjk>
+0x8DDE	U+6750	# <cjk>
+0x8DDF	U+7F6A	# <cjk>
+0x8DE0	U+8CA1	# <cjk>
+0x8DE1	U+51B4	# <cjk>
+0x8DE2	U+5742	# <cjk>
+0x8DE3	U+962A	# <cjk>
+0x8DE4	U+583A	# <cjk>
+0x8DE5	U+698A	# <cjk>
+0x8DE6	U+80B4	# <cjk>
+0x8DE7	U+54B2	# <cjk>
+0x8DE8	U+5D0E	# <cjk>
+0x8DE9	U+57FC	# <cjk>
+0x8DEA	U+7895	# <cjk>
+0x8DEB	U+9DFA	# <cjk>
+0x8DEC	U+4F5C	# <cjk>
+0x8DED	U+524A	# <cjk>
+0x8DEE	U+548B	# <cjk>
+0x8DEF	U+643E	# <cjk>
+0x8DF0	U+6628	# <cjk>
+0x8DF1	U+6714	# <cjk>
+0x8DF2	U+67F5	# <cjk>
+0x8DF3	U+7A84	# <cjk>
+0x8DF4	U+7B56	# <cjk>
+0x8DF5	U+7D22	# <cjk>
+0x8DF6	U+932F	# <cjk>
+0x8DF7	U+685C	# <cjk>
+0x8DF8	U+9BAD	# <cjk>
+0x8DF9	U+7B39	# <cjk>
+0x8DFA	U+5319	# <cjk>
+0x8DFB	U+518A	# <cjk>
+0x8DFC	U+5237	# <cjk>
+0x8E40	U+5BDF	# <cjk>
+0x8E41	U+62F6	# <cjk>
+0x8E42	U+64AE	# <cjk>
+0x8E43	U+64E6	# <cjk>
+0x8E44	U+672D	# <cjk>
+0x8E45	U+6BBA	# <cjk>
+0x8E46	U+85A9	# <cjk>
+0x8E47	U+96D1	# <cjk>
+0x8E48	U+7690	# <cjk>
+0x8E49	U+9BD6	# <cjk>
+0x8E4A	U+634C	# <cjk>
+0x8E4B	U+9306	# <cjk>
+0x8E4C	U+9BAB	# <cjk>
+0x8E4D	U+76BF	# <cjk>
+0x8E4E	U+6652	# <cjk>
+0x8E4F	U+4E09	# <cjk>
+0x8E50	U+5098	# <cjk>
+0x8E51	U+53C2	# <cjk>
+0x8E52	U+5C71	# <cjk>
+0x8E53	U+60E8	# <cjk>
+0x8E54	U+6492	# <cjk>
+0x8E55	U+6563	# <cjk>
+0x8E56	U+685F	# <cjk>
+0x8E57	U+71E6	# <cjk>
+0x8E58	U+73CA	# <cjk>
+0x8E59	U+7523	# <cjk>
+0x8E5A	U+7B97	# <cjk>
+0x8E5C	U+8695	# <cjk>
+0x8E5D	U+8B83	# <cjk>
+0x8E5E	U+8CDB	# <cjk>
+0x8E5F	U+9178	# <cjk>
+0x8E60	U+9910	# <cjk>
+0x8E61	U+65AC	# <cjk>
+0x8E62	U+66AB	# <cjk>
+0x8E63	U+6B8B	# <cjk>
+0x8E64	U+4ED5	# <cjk>
+0x8E65	U+4ED4	# <cjk>
+0x8E66	U+4F3A	# <cjk>
+0x8E67	U+4F7F	# <cjk>
+0x8E68	U+523A	# <cjk>
+0x8E69	U+53F8	# <cjk>
+0x8E6A	U+53F2	# <cjk>
+0x8E6B	U+55E3	# <cjk>
+0x8E6C	U+56DB	# <cjk>
+0x8E6D	U+58EB	# <cjk>
+0x8E6E	U+59CB	# <cjk>
+0x8E6F	U+59C9	# <cjk>
+0x8E70	U+59FF	# <cjk>
+0x8E71	U+5B50	# <cjk>
+0x8E72	U+5C4D	# <cjk>
+0x8E73	U+5E02	# <cjk>
+0x8E74	U+5E2B	# <cjk>
+0x8E75	U+5FD7	# <cjk>
+0x8E76	U+601D	# <cjk>
+0x8E77	U+6307	# <cjk>
+0x8E78	U+652F	# <cjk>
+0x8E79	U+5B5C	# <cjk>
+0x8E7A	U+65AF	# <cjk>
+0x8E7B	U+65BD	# <cjk>
+0x8E7C	U+65E8	# <cjk>
+0x8E7D	U+679D	# <cjk>
+0x8E7E	U+6B62	# <cjk>
+0x8E80	U+6B7B	# <cjk>
+0x8E81	U+6C0F	# <cjk>
+0x8E82	U+7345	# <cjk>
+0x8E83	U+7949	# <cjk>
+0x8E84	U+79C1	# <cjk>
+0x8E85	U+7CF8	# <cjk>
+0x8E86	U+7D19	# <cjk>
+0x8E87	U+7D2B	# <cjk>
+0x8E88	U+80A2	# <cjk>
+0x8E89	U+8102	# <cjk>
+0x8E8A	U+81F3	# <cjk>
+0x8E8B	U+8996	# <cjk>
+0x8E8C	U+8A5E	# <cjk>
+0x8E8D	U+8A69	# <cjk>
+0x8E8E	U+8A66	# <cjk>
+0x8E8F	U+8A8C	# <cjk>
+0x8E90	U+8AEE	# <cjk>
+0x8E91	U+8CC7	# <cjk>
+0x8E92	U+8CDC	# <cjk>
+0x8E93	U+96CC	# <cjk>
+0x8E94	U+98FC	# <cjk>
+0x8E95	U+6B6F	# <cjk>
+0x8E96	U+4E8B	# <cjk>
+0x8E97	U+4F3C	# <cjk>
+0x8E98	U+4F8D	# <cjk>
+0x8E99	U+5150	# <cjk>
+0x8E9A	U+5B57	# <cjk>
+0x8E9B	U+5BFA	# <cjk>
+0x8E9C	U+6148	# <cjk>
+0x8E9D	U+6301	# <cjk>
+0x8E9E	U+6642	# <cjk>
+0x8E9F	U+6B21	# <cjk>
+0x8EA0	U+6ECB	# <cjk>
+0x8EA1	U+6CBB	# <cjk>
+0x8EA2	U+723E	# <cjk>
+0x8EA3	U+74BD	# <cjk>
+0x8EA4	U+75D4	# <cjk>
+0x8EA5	U+78C1	# <cjk>
+0x8EA6	U+793A	# <cjk>
+0x8EA7	U+800C	# <cjk>
+0x8EA8	U+8033	# <cjk>
+0x8EA9	U+81EA	# <cjk>
+0x8EAA	U+8494	# <cjk>
+0x8EAB	U+8F9E	# <cjk>
+0x8EAC	U+6C50	# <cjk>
+0x8EAD	U+9E7F	# <cjk>
+0x8EAE	U+5F0F	# <cjk>
+0x8EAF	U+8B58	# <cjk>
+0x8EB0	U+9D2B	# <cjk>
+0x8EB1	U+7AFA	# <cjk>
+0x8EB2	U+8EF8	# <cjk>
+0x8EB3	U+5B8D	# <cjk>
+0x8EB4	U+96EB	# <cjk>
+0x8EB5	U+4E03	# <cjk>
+0x8EB6	U+53F1	# <cjk>
+0x8EB7	U+57F7	# <cjk>
+0x8EB8	U+5931	# <cjk>
+0x8EB9	U+5AC9	# <cjk>
+0x8EBA	U+5BA4	# <cjk>
+0x8EBB	U+6089	# <cjk>
+0x8EBC	U+6E7F	# <cjk>
+0x8EBD	U+6F06	# <cjk>
+0x8EBE	U+75BE	# <cjk>
+0x8EBF	U+8CEA	# <cjk>
+0x8EC0	U+5B9F	# <cjk>
+0x8EC1	U+8500	# <cjk>
+0x8EC2	U+7BE0	# <cjk>
+0x8EC3	U+5072	# <cjk>
+0x8EC4	U+67F4	# <cjk>
+0x8EC5	U+829D	# <cjk>
+0x8EC6	U+5C61	# <cjk>
+0x8EC7	U+854A	# <cjk>
+0x8EC8	U+7E1E	# <cjk>
+0x8EC9	U+820E	# <cjk>
+0x8ECA	U+5199	# <cjk>
+0x8ECB	U+5C04	# <cjk>
+0x8ECC	U+6368	# <cjk>
+0x8ECD	U+8D66	# <cjk>
+0x8ECE	U+659C	# <cjk>
+0x8ECF	U+716E	# <cjk>
+0x8ED0	U+793E	# <cjk>
+0x8ED1	U+7D17	# <cjk>
+0x8ED2	U+8005	# <cjk>
+0x8ED3	U+8B1D	# <cjk>
+0x8ED4	U+8ECA	# <cjk>
+0x8ED5	U+906E	# <cjk>
+0x8ED6	U+86C7	# <cjk>
+0x8ED7	U+90AA	# <cjk>
+0x8ED8	U+501F	# <cjk>
+0x8ED9	U+52FA	# <cjk>
+0x8EDA	U+5C3A	# <cjk>
+0x8EDB	U+6753	# <cjk>
+0x8EDC	U+707C	# <cjk>
+0x8EDD	U+7235	# <cjk>
+0x8EDE	U+914C	# <cjk>
+0x8EDF	U+91C8	# <cjk>
+0x8EE0	U+932B	# <cjk>
+0x8EE1	U+82E5	# <cjk>
+0x8EE2	U+5BC2	# <cjk>
+0x8EE3	U+5F31	# <cjk>
+0x8EE4	U+60F9	# <cjk>
+0x8EE5	U+4E3B	# <cjk>
+0x8EE6	U+53D6	# <cjk>
+0x8EE7	U+5B88	# <cjk>
+0x8EE8	U+624B	# <cjk>
+0x8EE9	U+6731	# <cjk>
+0x8EEA	U+6B8A	# <cjk>
+0x8EEB	U+72E9	# <cjk>
+0x8EEC	U+73E0	# <cjk>
+0x8EED	U+7A2E	# <cjk>
+0x8EEE	U+816B	# <cjk>
+0x8EEF	U+8DA3	# <cjk>
+0x8EF0	U+9152	# <cjk>
+0x8EF1	U+9996	# <cjk>
+0x8EF2	U+5112	# <cjk>
+0x8EF3	U+53D7	# <cjk>
+0x8EF4	U+546A	# <cjk>
+0x8EF5	U+5BFF	# <cjk>
+0x8EF6	U+6388	# <cjk>
+0x8EF7	U+6A39	# <cjk>
+0x8EF8	U+7DAC	# <cjk>
+0x8EF9	U+9700	# <cjk>
+0x8EFA	U+56DA	# <cjk>
+0x8EFB	U+53CE	# <cjk>
+0x8EFC	U+5468	# <cjk>
+0x8F40	U+5B97	# <cjk>
+0x8F41	U+5C31	# <cjk>
+0x8F42	U+5DDE	# <cjk>
+0x8F43	U+4FEE	# <cjk>
+0x8F44	U+6101	# <cjk>
+0x8F45	U+62FE	# <cjk>
+0x8F46	U+6D32	# <cjk>
+0x8F47	U+79C0	# <cjk>
+0x8F48	U+79CB	# <cjk>
+0x8F49	U+7D42	# <cjk>
+0x8F4A	U+7E4D	# <cjk>
+0x8F4B	U+7FD2	# <cjk>
+0x8F4C	U+81ED	# <cjk>
+0x8F4D	U+821F	# <cjk>
+0x8F4E	U+8490	# <cjk>
+0x8F4F	U+8846	# <cjk>
+0x8F50	U+8972	# <cjk>
+0x8F51	U+8B90	# <cjk>
+0x8F52	U+8E74	# <cjk>
+0x8F53	U+8F2F	# <cjk>
+0x8F54	U+9031	# <cjk>
+0x8F55	U+914B	# <cjk>
+0x8F56	U+916C	# <cjk>
+0x8F57	U+96C6	# <cjk>
+0x8F58	U+919C	# <cjk>
+0x8F59	U+4EC0	# <cjk>
+0x8F5A	U+4F4F	# <cjk>
+0x8F5C	U+5341	# <cjk>
+0x8F5D	U+5F93	# <cjk>
+0x8F5E	U+620E	# <cjk>
+0x8F5F	U+67D4	# <cjk>
+0x8F60	U+6C41	# <cjk>
+0x8F61	U+6E0B	# <cjk>
+0x8F62	U+7363	# <cjk>
+0x8F63	U+7E26	# <cjk>
+0x8F64	U+91CD	# <cjk>
+0x8F65	U+9283	# <cjk>
+0x8F66	U+53D4	# <cjk>
+0x8F67	U+5919	# <cjk>
+0x8F68	U+5BBF	# <cjk>
+0x8F69	U+6DD1	# <cjk>
+0x8F6A	U+795D	# <cjk>
+0x8F6B	U+7E2E	# <cjk>
+0x8F6C	U+7C9B	# <cjk>
+0x8F6D	U+587E	# <cjk>
+0x8F6E	U+719F	# <cjk>
+0x8F6F	U+51FA	# <cjk>
+0x8F70	U+8853	# <cjk>
+0x8F71	U+8FF0	# <cjk>
+0x8F72	U+4FCA	# <cjk>
+0x8F73	U+5CFB	# <cjk>
+0x8F74	U+6625	# <cjk>
+0x8F75	U+77AC	# <cjk>
+0x8F76	U+7AE3	# <cjk>
+0x8F77	U+821C	# <cjk>
+0x8F78	U+99FF	# <cjk>
+0x8F79	U+51C6	# <cjk>
+0x8F7A	U+5FAA	# <cjk>
+0x8F7B	U+65EC	# <cjk>
+0x8F7C	U+696F	# <cjk>
+0x8F7D	U+6B89	# <cjk>
+0x8F7E	U+6DF3	# <cjk>
+0x8F80	U+6E96	# <cjk>
+0x8F81	U+6F64	# <cjk>
+0x8F82	U+76FE	# <cjk>
+0x8F83	U+7D14	# <cjk>
+0x8F84	U+5DE1	# <cjk>
+0x8F85	U+9075	# <cjk>
+0x8F86	U+9187	# <cjk>
+0x8F87	U+9806	# <cjk>
+0x8F88	U+51E6	# <cjk>
+0x8F89	U+521D	# <cjk>
+0x8F8A	U+6240	# <cjk>
+0x8F8B	U+6691	# <cjk>
+0x8F8C	U+66D9	# <cjk>
+0x8F8D	U+6E1A	# <cjk>
+0x8F8E	U+5EB6	# <cjk>
+0x8F8F	U+7DD2	# <cjk>
+0x8F90	U+7F72	# <cjk>
+0x8F91	U+66F8	# <cjk>
+0x8F92	U+85AF	# <cjk>
+0x8F93	U+85F7	# <cjk>
+0x8F94	U+8AF8	# <cjk>
+0x8F95	U+52A9	# <cjk>
+0x8F96	U+53D9	# <cjk>
+0x8F97	U+5973	# <cjk>
+0x8F98	U+5E8F	# <cjk>
+0x8F99	U+5F90	# <cjk>
+0x8F9A	U+6055	# <cjk>
+0x8F9B	U+92E4	# <cjk>
+0x8F9C	U+9664	# <cjk>
+0x8F9D	U+50B7	# <cjk>
+0x8F9E	U+511F	# <cjk>
+0x8F9F	U+52DD	# <cjk>
+0x8FA0	U+5320	# <cjk>
+0x8FA1	U+5347	# <cjk>
+0x8FA2	U+53EC	# <cjk>
+0x8FA3	U+54E8	# <cjk>
+0x8FA4	U+5546	# <cjk>
+0x8FA5	U+5531	# <cjk>
+0x8FA6	U+5617	# <cjk>
+0x8FA7	U+5968	# <cjk>
+0x8FA8	U+59BE	# <cjk>
+0x8FA9	U+5A3C	# <cjk>
+0x8FAA	U+5BB5	# <cjk>
+0x8FAB	U+5C06	# <cjk>
+0x8FAC	U+5C0F	# <cjk>
+0x8FAD	U+5C11	# <cjk>
+0x8FAE	U+5C1A	# <cjk>
+0x8FAF	U+5E84	# <cjk>
+0x8FB0	U+5E8A	# <cjk>
+0x8FB1	U+5EE0	# <cjk>
+0x8FB2	U+5F70	# <cjk>
+0x8FB3	U+627F	# <cjk>
+0x8FB4	U+6284	# <cjk>
+0x8FB5	U+62DB	# <cjk>
+0x8FB6	U+638C	# <cjk>
+0x8FB7	U+6377	# <cjk>
+0x8FB8	U+6607	# <cjk>
+0x8FB9	U+660C	# <cjk>
+0x8FBA	U+662D	# <cjk>
+0x8FBB	U+6676	# <cjk>
+0x8FBC	U+677E	# <cjk>
+0x8FBD	U+68A2	# <cjk>
+0x8FBE	U+6A1F	# <cjk>
+0x8FBF	U+6A35	# <cjk>
+0x8FC0	U+6CBC	# <cjk>
+0x8FC1	U+6D88	# <cjk>
+0x8FC2	U+6E09	# <cjk>
+0x8FC3	U+6E58	# <cjk>
+0x8FC4	U+713C	# <cjk>
+0x8FC5	U+7126	# <cjk>
+0x8FC6	U+7167	# <cjk>
+0x8FC7	U+75C7	# <cjk>
+0x8FC8	U+7701	# <cjk>
+0x8FC9	U+785D	# <cjk>
+0x8FCA	U+7901	# <cjk>
+0x8FCB	U+7965	# <cjk>
+0x8FCC	U+79F0	# <cjk>
+0x8FCD	U+7AE0	# <cjk>
+0x8FCE	U+7B11	# <cjk>
+0x8FCF	U+7CA7	# <cjk>
+0x8FD0	U+7D39	# <cjk>
+0x8FD1	U+8096	# <cjk>
+0x8FD2	U+83D6	# <cjk>
+0x8FD3	U+848B	# <cjk>
+0x8FD4	U+8549	# <cjk>
+0x8FD5	U+885D	# <cjk>
+0x8FD6	U+88F3	# <cjk>
+0x8FD7	U+8A1F	# <cjk>
+0x8FD8	U+8A3C	# <cjk>
+0x8FD9	U+8A54	# <cjk>
+0x8FDA	U+8A73	# <cjk>
+0x8FDB	U+8C61	# <cjk>
+0x8FDC	U+8CDE	# <cjk>
+0x8FDD	U+91A4	# <cjk>
+0x8FDE	U+9266	# <cjk>
+0x8FDF	U+937E	# <cjk>
+0x8FE0	U+9418	# <cjk>
+0x8FE1	U+969C	# <cjk>
+0x8FE2	U+9798	# <cjk>
+0x8FE3	U+4E0A	# <cjk>
+0x8FE4	U+4E08	# <cjk>
+0x8FE5	U+4E1E	# <cjk>
+0x8FE6	U+4E57	# <cjk>
+0x8FE7	U+5197	# <cjk>
+0x8FE8	U+5270	# <cjk>
+0x8FE9	U+57CE	# <cjk>
+0x8FEA	U+5834	# <cjk>
+0x8FEB	U+58CC	# <cjk>
+0x8FEC	U+5B22	# <cjk>
+0x8FED	U+5E38	# <cjk>
+0x8FEE	U+60C5	# <cjk>
+0x8FEF	U+64FE	# <cjk>
+0x8FF0	U+6761	# <cjk>
+0x8FF1	U+6756	# <cjk>
+0x8FF2	U+6D44	# <cjk>
+0x8FF3	U+72B6	# <cjk>
+0x8FF4	U+7573	# <cjk>
+0x8FF5	U+7A63	# <cjk>
+0x8FF6	U+84B8	# <cjk>
+0x8FF7	U+8B72	# <cjk>
+0x8FF8	U+91B8	# <cjk>
+0x8FF9	U+9320	# <cjk>
+0x8FFA	U+5631	# <cjk>
+0x8FFB	U+57F4	# <cjk>
+0x8FFC	U+98FE	# <cjk>
+0x9040	U+62ED	# <cjk>
+0x9041	U+690D	# <cjk>
+0x9042	U+6B96	# <cjk>
+0x9043	U+71ED	# <cjk>
+0x9044	U+7E54	# <cjk>
+0x9045	U+8077	# <cjk>
+0x9046	U+8272	# <cjk>
+0x9047	U+89E6	# <cjk>
+0x9048	U+98DF	# <cjk>
+0x9049	U+8755	# <cjk>
+0x904A	U+8FB1	# <cjk>
+0x904B	U+5C3B	# <cjk>
+0x904C	U+4F38	# <cjk>
+0x904D	U+4FE1	# <cjk>
+0x904E	U+4FB5	# <cjk>
+0x904F	U+5507	# <cjk>
+0x9050	U+5A20	# <cjk>
+0x9051	U+5BDD	# <cjk>
+0x9052	U+5BE9	# <cjk>
+0x9053	U+5FC3	# <cjk>
+0x9054	U+614E	# <cjk>
+0x9055	U+632F	# <cjk>
+0x9056	U+65B0	# <cjk>
+0x9057	U+664B	# <cjk>
+0x9058	U+68EE	# <cjk>
+0x9059	U+699B	# <cjk>
+0x905A	U+6D78	# <cjk>
+0x905C	U+7533	# <cjk>
+0x905D	U+75B9	# <cjk>
+0x905E	U+771F	# <cjk>
+0x905F	U+795E	# <cjk>
+0x9060	U+79E6	# <cjk>
+0x9061	U+7D33	# <cjk>
+0x9062	U+81E3	# <cjk>
+0x9063	U+82AF	# <cjk>
+0x9064	U+85AA	# <cjk>
+0x9065	U+89AA	# <cjk>
+0x9066	U+8A3A	# <cjk>
+0x9067	U+8EAB	# <cjk>
+0x9068	U+8F9B	# <cjk>
+0x9069	U+9032	# <cjk>
+0x906A	U+91DD	# <cjk>
+0x906B	U+9707	# <cjk>
+0x906C	U+4EBA	# <cjk>
+0x906D	U+4EC1	# <cjk>
+0x906E	U+5203	# <cjk>
+0x906F	U+5875	# <cjk>
+0x9070	U+58EC	# <cjk>
+0x9071	U+5C0B	# <cjk>
+0x9072	U+751A	# <cjk>
+0x9073	U+5C3D	# <cjk>
+0x9074	U+814E	# <cjk>
+0x9075	U+8A0A	# <cjk>
+0x9076	U+8FC5	# <cjk>
+0x9077	U+9663	# <cjk>
+0x9078	U+976D	# <cjk>
+0x9079	U+7B25	# <cjk>
+0x907A	U+8ACF	# <cjk>
+0x907B	U+9808	# <cjk>
+0x907C	U+9162	# <cjk>
+0x907D	U+56F3	# <cjk>
+0x907E	U+53A8	# <cjk>
+0x9080	U+9017	# <cjk>
+0x9081	U+5439	# <cjk>
+0x9082	U+5782	# <cjk>
+0x9083	U+5E25	# <cjk>
+0x9084	U+63A8	# <cjk>
+0x9085	U+6C34	# <cjk>
+0x9086	U+708A	# <cjk>
+0x9087	U+7761	# <cjk>
+0x9088	U+7C8B	# <cjk>
+0x9089	U+7FE0	# <cjk>
+0x908A	U+8870	# <cjk>
+0x908B	U+9042	# <cjk>
+0x908C	U+9154	# <cjk>
+0x908D	U+9310	# <cjk>
+0x908E	U+9318	# <cjk>
+0x908F	U+968F	# <cjk>
+0x9090	U+745E	# <cjk>
+0x9091	U+9AC4	# <cjk>
+0x9092	U+5D07	# <cjk>
+0x9093	U+5D69	# <cjk>
+0x9094	U+6570	# <cjk>
+0x9095	U+67A2	# <cjk>
+0x9096	U+8DA8	# <cjk>
+0x9097	U+96DB	# <cjk>
+0x9098	U+636E	# <cjk>
+0x9099	U+6749	# <cjk>
+0x909A	U+6919	# <cjk>
+0x909B	U+83C5	# <cjk>
+0x909C	U+9817	# <cjk>
+0x909D	U+96C0	# <cjk>
+0x909E	U+88FE	# <cjk>
+0x909F	U+6F84	# <cjk>
+0x90A0	U+647A	# <cjk>
+0x90A1	U+5BF8	# <cjk>
+0x90A2	U+4E16	# <cjk>
+0x90A3	U+702C	# <cjk>
+0x90A4	U+755D	# <cjk>
+0x90A5	U+662F	# <cjk>
+0x90A6	U+51C4	# <cjk>
+0x90A7	U+5236	# <cjk>
+0x90A8	U+52E2	# <cjk>
+0x90A9	U+59D3	# <cjk>
+0x90AA	U+5F81	# <cjk>
+0x90AB	U+6027	# <cjk>
+0x90AC	U+6210	# <cjk>
+0x90AD	U+653F	# <cjk>
+0x90AE	U+6574	# <cjk>
+0x90AF	U+661F	# <cjk>
+0x90B0	U+6674	# <cjk>
+0x90B1	U+68F2	# <cjk>
+0x90B2	U+6816	# <cjk>
+0x90B3	U+6B63	# <cjk>
+0x90B4	U+6E05	# <cjk>
+0x90B5	U+7272	# <cjk>
+0x90B6	U+751F	# <cjk>
+0x90B7	U+76DB	# <cjk>
+0x90B8	U+7CBE	# <cjk>
+0x90B9	U+8056	# <cjk>
+0x90BA	U+58F0	# <cjk>
+0x90BB	U+88FD	# <cjk>
+0x90BC	U+897F	# <cjk>
+0x90BD	U+8AA0	# <cjk>
+0x90BE	U+8A93	# <cjk>
+0x90BF	U+8ACB	# <cjk>
+0x90C0	U+901D	# <cjk>
+0x90C1	U+9192	# <cjk>
+0x90C2	U+9752	# <cjk>
+0x90C3	U+9759	# <cjk>
+0x90C4	U+6589	# <cjk>
+0x90C5	U+7A0E	# <cjk>
+0x90C6	U+8106	# <cjk>
+0x90C7	U+96BB	# <cjk>
+0x90C8	U+5E2D	# <cjk>
+0x90C9	U+60DC	# <cjk>
+0x90CA	U+621A	# <cjk>
+0x90CB	U+65A5	# <cjk>
+0x90CC	U+6614	# <cjk>
+0x90CD	U+6790	# <cjk>
+0x90CE	U+77F3	# <cjk>
+0x90CF	U+7A4D	# <cjk>
+0x90D0	U+7C4D	# <cjk>
+0x90D1	U+7E3E	# <cjk>
+0x90D2	U+810A	# <cjk>
+0x90D3	U+8CAC	# <cjk>
+0x90D4	U+8D64	# <cjk>
+0x90D5	U+8DE1	# <cjk>
+0x90D6	U+8E5F	# <cjk>
+0x90D7	U+78A9	# <cjk>
+0x90D8	U+5207	# <cjk>
+0x90D9	U+62D9	# <cjk>
+0x90DA	U+63A5	# <cjk>
+0x90DB	U+6442	# <cjk>
+0x90DC	U+6298	# <cjk>
+0x90DD	U+8A2D	# <cjk>
+0x90DE	U+7A83	# <cjk>
+0x90DF	U+7BC0	# <cjk>
+0x90E0	U+8AAC	# <cjk>
+0x90E1	U+96EA	# <cjk>
+0x90E2	U+7D76	# <cjk>
+0x90E3	U+820C	# <cjk>
+0x90E4	U+8749	# <cjk>
+0x90E5	U+4ED9	# <cjk>
+0x90E6	U+5148	# <cjk>
+0x90E7	U+5343	# <cjk>
+0x90E8	U+5360	# <cjk>
+0x90E9	U+5BA3	# <cjk>
+0x90EA	U+5C02	# <cjk>
+0x90EB	U+5C16	# <cjk>
+0x90EC	U+5DDD	# <cjk>
+0x90ED	U+6226	# <cjk>
+0x90EE	U+6247	# <cjk>
+0x90EF	U+64B0	# <cjk>
+0x90F0	U+6813	# <cjk>
+0x90F1	U+6834	# <cjk>
+0x90F2	U+6CC9	# <cjk>
+0x90F3	U+6D45	# <cjk>
+0x90F4	U+6D17	# <cjk>
+0x90F5	U+67D3	# <cjk>
+0x90F6	U+6F5C	# <cjk>
+0x90F7	U+714E	# <cjk>
+0x90F8	U+717D	# <cjk>
+0x90F9	U+65CB	# <cjk>
+0x90FA	U+7A7F	# <cjk>
+0x90FB	U+7BAD	# <cjk>
+0x90FC	U+7DDA	# <cjk>
+0x9140	U+7E4A	# <cjk>
+0x9141	U+7FA8	# <cjk>
+0x9142	U+817A	# <cjk>
+0x9143	U+821B	# <cjk>
+0x9144	U+8239	# <cjk>
+0x9145	U+85A6	# <cjk>
+0x9146	U+8A6E	# <cjk>
+0x9147	U+8CCE	# <cjk>
+0x9148	U+8DF5	# <cjk>
+0x9149	U+9078	# <cjk>
+0x914A	U+9077	# <cjk>
+0x914B	U+92AD	# <cjk>
+0x914C	U+9291	# <cjk>
+0x914D	U+9583	# <cjk>
+0x914E	U+9BAE	# <cjk>
+0x914F	U+524D	# <cjk>
+0x9150	U+5584	# <cjk>
+0x9151	U+6F38	# <cjk>
+0x9152	U+7136	# <cjk>
+0x9153	U+5168	# <cjk>
+0x9154	U+7985	# <cjk>
+0x9155	U+7E55	# <cjk>
+0x9156	U+81B3	# <cjk>
+0x9157	U+7CCE	# <cjk>
+0x9158	U+564C	# <cjk>
+0x9159	U+5851	# <cjk>
+0x915A	U+5CA8	# <cjk>
+0x915C	U+66FE	# <cjk>
+0x915D	U+66FD	# <cjk>
+0x915E	U+695A	# <cjk>
+0x915F	U+72D9	# <cjk>
+0x9160	U+758F	# <cjk>
+0x9161	U+758E	# <cjk>
+0x9162	U+790E	# <cjk>
+0x9163	U+7956	# <cjk>
+0x9164	U+79DF	# <cjk>
+0x9165	U+7C97	# <cjk>
+0x9166	U+7D20	# <cjk>
+0x9167	U+7D44	# <cjk>
+0x9168	U+8607	# <cjk>
+0x9169	U+8A34	# <cjk>
+0x916A	U+963B	# <cjk>
+0x916B	U+9061	# <cjk>
+0x916C	U+9F20	# <cjk>
+0x916D	U+50E7	# <cjk>
+0x916E	U+5275	# <cjk>
+0x916F	U+53CC	# <cjk>
+0x9170	U+53E2	# <cjk>
+0x9171	U+5009	# <cjk>
+0x9172	U+55AA	# <cjk>
+0x9173	U+58EE	# <cjk>
+0x9174	U+594F	# <cjk>
+0x9175	U+723D	# <cjk>
+0x9176	U+5B8B	# <cjk>
+0x9177	U+5C64	# <cjk>
+0x9178	U+531D	# <cjk>
+0x9179	U+60E3	# <cjk>
+0x917A	U+60F3	# <cjk>
+0x917B	U+635C	# <cjk>
+0x917C	U+6383	# <cjk>
+0x917D	U+633F	# <cjk>
+0x917E	U+63BB	# <cjk>
+0x9180	U+64CD	# <cjk>
+0x9181	U+65E9	# <cjk>
+0x9182	U+66F9	# <cjk>
+0x9183	U+5DE3	# <cjk>
+0x9184	U+69CD	# <cjk>
+0x9185	U+69FD	# <cjk>
+0x9186	U+6F15	# <cjk>
+0x9187	U+71E5	# <cjk>
+0x9188	U+4E89	# <cjk>
+0x9189	U+75E9	# <cjk>
+0x918A	U+76F8	# <cjk>
+0x918B	U+7A93	# <cjk>
+0x918C	U+7CDF	# <cjk>
+0x918D	U+7DCF	# <cjk>
+0x918E	U+7D9C	# <cjk>
+0x918F	U+8061	# <cjk>
+0x9190	U+8349	# <cjk>
+0x9191	U+8358	# <cjk>
+0x9192	U+846C	# <cjk>
+0x9193	U+84BC	# <cjk>
+0x9194	U+85FB	# <cjk>
+0x9195	U+88C5	# <cjk>
+0x9196	U+8D70	# <cjk>
+0x9197	U+9001	# <cjk>
+0x9198	U+906D	# <cjk>
+0x9199	U+9397	# <cjk>
+0x919A	U+971C	# <cjk>
+0x919B	U+9A12	# <cjk>
+0x919C	U+50CF	# <cjk>
+0x919D	U+5897	# <cjk>
+0x919E	U+618E	# <cjk>
+0x919F	U+81D3	# <cjk>
+0x91A0	U+8535	# <cjk>
+0x91A1	U+8D08	# <cjk>
+0x91A2	U+9020	# <cjk>
+0x91A3	U+4FC3	# <cjk>
+0x91A4	U+5074	# <cjk>
+0x91A5	U+5247	# <cjk>
+0x91A6	U+5373	# <cjk>
+0x91A7	U+606F	# <cjk>
+0x91A8	U+6349	# <cjk>
+0x91A9	U+675F	# <cjk>
+0x91AA	U+6E2C	# <cjk>
+0x91AB	U+8DB3	# <cjk>
+0x91AC	U+901F	# <cjk>
+0x91AD	U+4FD7	# <cjk>
+0x91AE	U+5C5E	# <cjk>
+0x91AF	U+8CCA	# <cjk>
+0x91B0	U+65CF	# <cjk>
+0x91B1	U+7D9A	# <cjk>
+0x91B2	U+5352	# <cjk>
+0x91B3	U+8896	# <cjk>
+0x91B4	U+5176	# <cjk>
+0x91B5	U+63C3	# <cjk>
+0x91B6	U+5B58	# <cjk>
+0x91B7	U+5B6B	# <cjk>
+0x91B8	U+5C0A	# <cjk>
+0x91B9	U+640D	# <cjk>
+0x91BA	U+6751	# <cjk>
+0x91BB	U+905C	# <cjk>
+0x91BC	U+4ED6	# <cjk>
+0x91BD	U+591A	# <cjk>
+0x91BE	U+592A	# <cjk>
+0x91BF	U+6C70	# <cjk>
+0x91C0	U+8A51	# <cjk>
+0x91C1	U+553E	# <cjk>
+0x91C2	U+5815	# <cjk>
+0x91C3	U+59A5	# <cjk>
+0x91C4	U+60F0	# <cjk>
+0x91C5	U+6253	# <cjk>
+0x91C6	U+67C1	# <cjk>
+0x91C7	U+8235	# <cjk>
+0x91C8	U+6955	# <cjk>
+0x91C9	U+9640	# <cjk>
+0x91CA	U+99C4	# <cjk>
+0x91CB	U+9A28	# <cjk>
+0x91CC	U+4F53	# <cjk>
+0x91CD	U+5806	# <cjk>
+0x91CE	U+5BFE	# <cjk>
+0x91CF	U+8010	# <cjk>
+0x91D0	U+5CB1	# <cjk>
+0x91D1	U+5E2F	# <cjk>
+0x91D2	U+5F85	# <cjk>
+0x91D3	U+6020	# <cjk>
+0x91D4	U+614B	# <cjk>
+0x91D5	U+6234	# <cjk>
+0x91D6	U+66FF	# <cjk>
+0x91D7	U+6CF0	# <cjk>
+0x91D8	U+6EDE	# <cjk>
+0x91D9	U+80CE	# <cjk>
+0x91DA	U+817F	# <cjk>
+0x91DB	U+82D4	# <cjk>
+0x91DC	U+888B	# <cjk>
+0x91DD	U+8CB8	# <cjk>
+0x91DE	U+9000	# <cjk>
+0x91DF	U+902E	# <cjk>
+0x91E0	U+968A	# <cjk>
+0x91E1	U+9EDB	# <cjk>
+0x91E2	U+9BDB	# <cjk>
+0x91E3	U+4EE3	# <cjk>
+0x91E4	U+53F0	# <cjk>
+0x91E5	U+5927	# <cjk>
+0x91E6	U+7B2C	# <cjk>
+0x91E7	U+918D	# <cjk>
+0x91E8	U+984C	# <cjk>
+0x91E9	U+9DF9	# <cjk>
+0x91EA	U+6EDD	# <cjk>
+0x91EB	U+7027	# <cjk>
+0x91EC	U+5353	# <cjk>
+0x91ED	U+5544	# <cjk>
+0x91EE	U+5B85	# <cjk>
+0x91EF	U+6258	# <cjk>
+0x91F0	U+629E	# <cjk>
+0x91F1	U+62D3	# <cjk>
+0x91F2	U+6CA2	# <cjk>
+0x91F3	U+6FEF	# <cjk>
+0x91F4	U+7422	# <cjk>
+0x91F5	U+8A17	# <cjk>
+0x91F6	U+9438	# <cjk>
+0x91F7	U+6FC1	# <cjk>
+0x91F8	U+8AFE	# <cjk>
+0x91F9	U+8338	# <cjk>
+0x91FA	U+51E7	# <cjk>
+0x91FB	U+86F8	# <cjk>
+0x91FC	U+53EA	# <cjk>
+0x9240	U+53E9	# <cjk>
+0x9241	U+4F46	# <cjk>
+0x9242	U+9054	# <cjk>
+0x9243	U+8FB0	# <cjk>
+0x9244	U+596A	# <cjk>
+0x9245	U+8131	# <cjk>
+0x9246	U+5DFD	# <cjk>
+0x9247	U+7AEA	# <cjk>
+0x9248	U+8FBF	# <cjk>
+0x9249	U+68DA	# <cjk>
+0x924A	U+8C37	# <cjk>
+0x924B	U+72F8	# <cjk>
+0x924C	U+9C48	# <cjk>
+0x924D	U+6A3D	# <cjk>
+0x924E	U+8AB0	# <cjk>
+0x924F	U+4E39	# <cjk>
+0x9250	U+5358	# <cjk>
+0x9251	U+5606	# <cjk>
+0x9252	U+5766	# <cjk>
+0x9253	U+62C5	# <cjk>
+0x9254	U+63A2	# <cjk>
+0x9255	U+65E6	# <cjk>
+0x9256	U+6B4E	# <cjk>
+0x9257	U+6DE1	# <cjk>
+0x9258	U+6E5B	# <cjk>
+0x9259	U+70AD	# <cjk>
+0x925A	U+77ED	# <cjk>
+0x925C	U+7BAA	# <cjk>
+0x925D	U+7DBB	# <cjk>
+0x925E	U+803D	# <cjk>
+0x925F	U+80C6	# <cjk>
+0x9260	U+86CB	# <cjk>
+0x9261	U+8A95	# <cjk>
+0x9262	U+935B	# <cjk>
+0x9263	U+56E3	# <cjk>
+0x9264	U+58C7	# <cjk>
+0x9265	U+5F3E	# <cjk>
+0x9266	U+65AD	# <cjk>
+0x9267	U+6696	# <cjk>
+0x9268	U+6A80	# <cjk>
+0x9269	U+6BB5	# <cjk>
+0x926A	U+7537	# <cjk>
+0x926B	U+8AC7	# <cjk>
+0x926C	U+5024	# <cjk>
+0x926D	U+77E5	# <cjk>
+0x926E	U+5730	# <cjk>
+0x926F	U+5F1B	# <cjk>
+0x9270	U+6065	# <cjk>
+0x9271	U+667A	# <cjk>
+0x9272	U+6C60	# <cjk>
+0x9273	U+75F4	# <cjk>
+0x9274	U+7A1A	# <cjk>
+0x9275	U+7F6E	# <cjk>
+0x9276	U+81F4	# <cjk>
+0x9277	U+8718	# <cjk>
+0x9278	U+9045	# <cjk>
+0x9279	U+99B3	# <cjk>
+0x927A	U+7BC9	# <cjk>
+0x927B	U+755C	# <cjk>
+0x927C	U+7AF9	# <cjk>
+0x927D	U+7B51	# <cjk>
+0x927E	U+84C4	# <cjk>
+0x9280	U+9010	# <cjk>
+0x9281	U+79E9	# <cjk>
+0x9282	U+7A92	# <cjk>
+0x9283	U+8336	# <cjk>
+0x9284	U+5AE1	# <cjk>
+0x9285	U+7740	# <cjk>
+0x9286	U+4E2D	# <cjk>
+0x9287	U+4EF2	# <cjk>
+0x9288	U+5B99	# <cjk>
+0x9289	U+5FE0	# <cjk>
+0x928A	U+62BD	# <cjk>
+0x928B	U+663C	# <cjk>
+0x928C	U+67F1	# <cjk>
+0x928D	U+6CE8	# <cjk>
+0x928E	U+866B	# <cjk>
+0x928F	U+8877	# <cjk>
+0x9290	U+8A3B	# <cjk>
+0x9291	U+914E	# <cjk>
+0x9292	U+92F3	# <cjk>
+0x9293	U+99D0	# <cjk>
+0x9294	U+6A17	# <cjk>
+0x9295	U+7026	# <cjk>
+0x9296	U+732A	# <cjk>
+0x9297	U+82E7	# <cjk>
+0x9298	U+8457	# <cjk>
+0x9299	U+8CAF	# <cjk>
+0x929A	U+4E01	# <cjk>
+0x929B	U+5146	# <cjk>
+0x929C	U+51CB	# <cjk>
+0x929D	U+558B	# <cjk>
+0x929E	U+5BF5	# <cjk>
+0x929F	U+5E16	# <cjk>
+0x92A0	U+5E33	# <cjk>
+0x92A1	U+5E81	# <cjk>
+0x92A2	U+5F14	# <cjk>
+0x92A3	U+5F35	# <cjk>
+0x92A4	U+5F6B	# <cjk>
+0x92A5	U+5FB4	# <cjk>
+0x92A6	U+61F2	# <cjk>
+0x92A7	U+6311	# <cjk>
+0x92A8	U+66A2	# <cjk>
+0x92A9	U+671D	# <cjk>
+0x92AA	U+6F6E	# <cjk>
+0x92AB	U+7252	# <cjk>
+0x92AC	U+753A	# <cjk>
+0x92AD	U+773A	# <cjk>
+0x92AE	U+8074	# <cjk>
+0x92AF	U+8139	# <cjk>
+0x92B0	U+8178	# <cjk>
+0x92B1	U+8776	# <cjk>
+0x92B2	U+8ABF	# <cjk>
+0x92B3	U+8ADC	# <cjk>
+0x92B4	U+8D85	# <cjk>
+0x92B5	U+8DF3	# <cjk>
+0x92B6	U+929A	# <cjk>
+0x92B7	U+9577	# <cjk>
+0x92B8	U+9802	# <cjk>
+0x92B9	U+9CE5	# <cjk>
+0x92BA	U+52C5	# <cjk>
+0x92BB	U+6357	# <cjk>
+0x92BC	U+76F4	# <cjk>
+0x92BD	U+6715	# <cjk>
+0x92BE	U+6C88	# <cjk>
+0x92BF	U+73CD	# <cjk>
+0x92C0	U+8CC3	# <cjk>
+0x92C1	U+93AE	# <cjk>
+0x92C2	U+9673	# <cjk>
+0x92C3	U+6D25	# <cjk>
+0x92C4	U+589C	# <cjk>
+0x92C5	U+690E	# <cjk>
+0x92C6	U+69CC	# <cjk>
+0x92C7	U+8FFD	# <cjk>
+0x92C8	U+939A	# <cjk>
+0x92C9	U+75DB	# <cjk>
+0x92CA	U+901A	# <cjk>
+0x92CB	U+585A	# <cjk>
+0x92CC	U+6802	# <cjk>
+0x92CD	U+63B4	# <cjk>
+0x92CE	U+69FB	# <cjk>
+0x92CF	U+4F43	# <cjk>
+0x92D0	U+6F2C	# <cjk>
+0x92D1	U+67D8	# <cjk>
+0x92D2	U+8FBB	# <cjk>
+0x92D3	U+8526	# <cjk>
+0x92D4	U+7DB4	# <cjk>
+0x92D5	U+9354	# <cjk>
+0x92D6	U+693F	# <cjk>
+0x92D7	U+6F70	# <cjk>
+0x92D8	U+576A	# <cjk>
+0x92D9	U+58F7	# <cjk>
+0x92DA	U+5B2C	# <cjk>
+0x92DB	U+7D2C	# <cjk>
+0x92DC	U+722A	# <cjk>
+0x92DD	U+540A	# <cjk>
+0x92DE	U+91E3	# <cjk>
+0x92DF	U+9DB4	# <cjk>
+0x92E0	U+4EAD	# <cjk>
+0x92E1	U+4F4E	# <cjk>
+0x92E2	U+505C	# <cjk>
+0x92E3	U+5075	# <cjk>
+0x92E4	U+5243	# <cjk>
+0x92E5	U+8C9E	# <cjk>
+0x92E6	U+5448	# <cjk>
+0x92E7	U+5824	# <cjk>
+0x92E8	U+5B9A	# <cjk>
+0x92E9	U+5E1D	# <cjk>
+0x92EA	U+5E95	# <cjk>
+0x92EB	U+5EAD	# <cjk>
+0x92EC	U+5EF7	# <cjk>
+0x92ED	U+5F1F	# <cjk>
+0x92EE	U+608C	# <cjk>
+0x92EF	U+62B5	# <cjk>
+0x92F0	U+633A	# <cjk>
+0x92F1	U+63D0	# <cjk>
+0x92F2	U+68AF	# <cjk>
+0x92F3	U+6C40	# <cjk>
+0x92F4	U+7887	# <cjk>
+0x92F5	U+798E	# <cjk>
+0x92F6	U+7A0B	# <cjk>
+0x92F7	U+7DE0	# <cjk>
+0x92F8	U+8247	# <cjk>
+0x92F9	U+8A02	# <cjk>
+0x92FA	U+8AE6	# <cjk>
+0x92FB	U+8E44	# <cjk>
+0x92FC	U+9013	# <cjk>
+0x9340	U+90B8	# <cjk>
+0x9341	U+912D	# <cjk>
+0x9342	U+91D8	# <cjk>
+0x9343	U+9F0E	# <cjk>
+0x9344	U+6CE5	# <cjk>
+0x9345	U+6458	# <cjk>
+0x9346	U+64E2	# <cjk>
+0x9347	U+6575	# <cjk>
+0x9348	U+6EF4	# <cjk>
+0x9349	U+7684	# <cjk>
+0x934A	U+7B1B	# <cjk>
+0x934B	U+9069	# <cjk>
+0x934C	U+93D1	# <cjk>
+0x934D	U+6EBA	# <cjk>
+0x934E	U+54F2	# <cjk>
+0x934F	U+5FB9	# <cjk>
+0x9350	U+64A4	# <cjk>
+0x9351	U+8F4D	# <cjk>
+0x9352	U+8FED	# <cjk>
+0x9353	U+9244	# <cjk>
+0x9354	U+5178	# <cjk>
+0x9355	U+586B	# <cjk>
+0x9356	U+5929	# <cjk>
+0x9357	U+5C55	# <cjk>
+0x9358	U+5E97	# <cjk>
+0x9359	U+6DFB	# <cjk>
+0x935A	U+7E8F	# <cjk>
+0x935C	U+8CBC	# <cjk>
+0x935D	U+8EE2	# <cjk>
+0x935E	U+985B	# <cjk>
+0x935F	U+70B9	# <cjk>
+0x9360	U+4F1D	# <cjk>
+0x9361	U+6BBF	# <cjk>
+0x9362	U+6FB1	# <cjk>
+0x9363	U+7530	# <cjk>
+0x9364	U+96FB	# <cjk>
+0x9365	U+514E	# <cjk>
+0x9366	U+5410	# <cjk>
+0x9367	U+5835	# <cjk>
+0x9368	U+5857	# <cjk>
+0x9369	U+59AC	# <cjk>
+0x936A	U+5C60	# <cjk>
+0x936B	U+5F92	# <cjk>
+0x936C	U+6597	# <cjk>
+0x936D	U+675C	# <cjk>
+0x936E	U+6E21	# <cjk>
+0x936F	U+767B	# <cjk>
+0x9370	U+83DF	# <cjk>
+0x9371	U+8CED	# <cjk>
+0x9372	U+9014	# <cjk>
+0x9373	U+90FD	# <cjk>
+0x9374	U+934D	# <cjk>
+0x9375	U+7825	# <cjk>
+0x9376	U+783A	# <cjk>
+0x9377	U+52AA	# <cjk>
+0x9378	U+5EA6	# <cjk>
+0x9379	U+571F	# <cjk>
+0x937A	U+5974	# <cjk>
+0x937B	U+6012	# <cjk>
+0x937C	U+5012	# <cjk>
+0x937D	U+515A	# <cjk>
+0x937E	U+51AC	# <cjk>
+0x9380	U+51CD	# <cjk>
+0x9381	U+5200	# <cjk>
+0x9382	U+5510	# <cjk>
+0x9383	U+5854	# <cjk>
+0x9384	U+5858	# <cjk>
+0x9385	U+5957	# <cjk>
+0x9386	U+5B95	# <cjk>
+0x9387	U+5CF6	# <cjk>
+0x9388	U+5D8B	# <cjk>
+0x9389	U+60BC	# <cjk>
+0x938A	U+6295	# <cjk>
+0x938B	U+642D	# <cjk>
+0x938C	U+6771	# <cjk>
+0x938D	U+6843	# <cjk>
+0x938E	U+68BC	# <cjk>
+0x938F	U+68DF	# <cjk>
+0x9390	U+76D7	# <cjk>
+0x9391	U+6DD8	# <cjk>
+0x9392	U+6E6F	# <cjk>
+0x9393	U+6D9B	# <cjk>
+0x9394	U+706F	# <cjk>
+0x9395	U+71C8	# <cjk>
+0x9396	U+5F53	# <cjk>
+0x9397	U+75D8	# <cjk>
+0x9398	U+7977	# <cjk>
+0x9399	U+7B49	# <cjk>
+0x939A	U+7B54	# <cjk>
+0x939B	U+7B52	# <cjk>
+0x939C	U+7CD6	# <cjk>
+0x939D	U+7D71	# <cjk>
+0x939E	U+5230	# <cjk>
+0x939F	U+8463	# <cjk>
+0x93A0	U+8569	# <cjk>
+0x93A1	U+85E4	# <cjk>
+0x93A2	U+8A0E	# <cjk>
+0x93A3	U+8B04	# <cjk>
+0x93A4	U+8C46	# <cjk>
+0x93A5	U+8E0F	# <cjk>
+0x93A6	U+9003	# <cjk>
+0x93A7	U+900F	# <cjk>
+0x93A8	U+9419	# <cjk>
+0x93A9	U+9676	# <cjk>
+0x93AA	U+982D	# <cjk>
+0x93AB	U+9A30	# <cjk>
+0x93AC	U+95D8	# <cjk>
+0x93AD	U+50CD	# <cjk>
+0x93AE	U+52D5	# <cjk>
+0x93AF	U+540C	# <cjk>
+0x93B0	U+5802	# <cjk>
+0x93B1	U+5C0E	# <cjk>
+0x93B2	U+61A7	# <cjk>
+0x93B3	U+649E	# <cjk>
+0x93B4	U+6D1E	# <cjk>
+0x93B5	U+77B3	# <cjk>
+0x93B6	U+7AE5	# <cjk>
+0x93B7	U+80F4	# <cjk>
+0x93B8	U+8404	# <cjk>
+0x93B9	U+9053	# <cjk>
+0x93BA	U+9285	# <cjk>
+0x93BB	U+5CE0	# <cjk>
+0x93BC	U+9D07	# <cjk>
+0x93BD	U+533F	# <cjk>
+0x93BE	U+5F97	# <cjk>
+0x93BF	U+5FB3	# <cjk>
+0x93C0	U+6D9C	# <cjk>
+0x93C1	U+7279	# <cjk>
+0x93C2	U+7763	# <cjk>
+0x93C3	U+79BF	# <cjk>
+0x93C4	U+7BE4	# <cjk>
+0x93C5	U+6BD2	# <cjk>
+0x93C6	U+72EC	# <cjk>
+0x93C7	U+8AAD	# <cjk>
+0x93C8	U+6803	# <cjk>
+0x93C9	U+6A61	# <cjk>
+0x93CA	U+51F8	# <cjk>
+0x93CB	U+7A81	# <cjk>
+0x93CC	U+6934	# <cjk>
+0x93CD	U+5C4A	# <cjk>
+0x93CE	U+9CF6	# <cjk>
+0x93CF	U+82EB	# <cjk>
+0x93D0	U+5BC5	# <cjk>
+0x93D1	U+9149	# <cjk>
+0x93D2	U+701E	# <cjk>
+0x93D3	U+5678	# <cjk>
+0x93D4	U+5C6F	# <cjk>
+0x93D5	U+60C7	# <cjk>
+0x93D6	U+6566	# <cjk>
+0x93D7	U+6C8C	# <cjk>
+0x93D8	U+8C5A	# <cjk>
+0x93D9	U+9041	# <cjk>
+0x93DA	U+9813	# <cjk>
+0x93DB	U+5451	# <cjk>
+0x93DC	U+66C7	# <cjk>
+0x93DD	U+920D	# <cjk>
+0x93DE	U+5948	# <cjk>
+0x93DF	U+90A3	# <cjk>
+0x93E0	U+5185	# <cjk>
+0x93E1	U+4E4D	# <cjk>
+0x93E2	U+51EA	# <cjk>
+0x93E3	U+8599	# <cjk>
+0x93E4	U+8B0E	# <cjk>
+0x93E5	U+7058	# <cjk>
+0x93E6	U+637A	# <cjk>
+0x93E7	U+934B	# <cjk>
+0x93E8	U+6962	# <cjk>
+0x93E9	U+99B4	# <cjk>
+0x93EA	U+7E04	# <cjk>
+0x93EB	U+7577	# <cjk>
+0x93EC	U+5357	# <cjk>
+0x93ED	U+6960	# <cjk>
+0x93EE	U+8EDF	# <cjk>
+0x93EF	U+96E3	# <cjk>
+0x93F0	U+6C5D	# <cjk>
+0x93F1	U+4E8C	# <cjk>
+0x93F2	U+5C3C	# <cjk>
+0x93F3	U+5F10	# <cjk>
+0x93F4	U+8FE9	# <cjk>
+0x93F5	U+5302	# <cjk>
+0x93F6	U+8CD1	# <cjk>
+0x93F7	U+8089	# <cjk>
+0x93F8	U+8679	# <cjk>
+0x93F9	U+5EFF	# <cjk>
+0x93FA	U+65E5	# <cjk>
+0x93FB	U+4E73	# <cjk>
+0x93FC	U+5165	# <cjk>
+0x9440	U+5982	# <cjk>
+0x9441	U+5C3F	# <cjk>
+0x9442	U+97EE	# <cjk>
+0x9443	U+4EFB	# <cjk>
+0x9444	U+598A	# <cjk>
+0x9445	U+5FCD	# <cjk>
+0x9446	U+8A8D	# <cjk>
+0x9447	U+6FE1	# <cjk>
+0x9448	U+79B0	# <cjk>
+0x9449	U+7962	# <cjk>
+0x944A	U+5BE7	# <cjk>
+0x944B	U+8471	# <cjk>
+0x944C	U+732B	# <cjk>
+0x944D	U+71B1	# <cjk>
+0x944E	U+5E74	# <cjk>
+0x944F	U+5FF5	# <cjk>
+0x9450	U+637B	# <cjk>
+0x9451	U+649A	# <cjk>
+0x9452	U+71C3	# <cjk>
+0x9453	U+7C98	# <cjk>
+0x9454	U+4E43	# <cjk>
+0x9455	U+5EFC	# <cjk>
+0x9456	U+4E4B	# <cjk>
+0x9457	U+57DC	# <cjk>
+0x9458	U+56A2	# <cjk>
+0x9459	U+60A9	# <cjk>
+0x945A	U+6FC3	# <cjk>
+0x945C	U+80FD	# <cjk>
+0x945D	U+8133	# <cjk>
+0x945E	U+81BF	# <cjk>
+0x945F	U+8FB2	# <cjk>
+0x9460	U+8997	# <cjk>
+0x9461	U+86A4	# <cjk>
+0x9462	U+5DF4	# <cjk>
+0x9463	U+628A	# <cjk>
+0x9464	U+64AD	# <cjk>
+0x9465	U+8987	# <cjk>
+0x9466	U+6777	# <cjk>
+0x9467	U+6CE2	# <cjk>
+0x9468	U+6D3E	# <cjk>
+0x9469	U+7436	# <cjk>
+0x946A	U+7834	# <cjk>
+0x946B	U+5A46	# <cjk>
+0x946C	U+7F75	# <cjk>
+0x946D	U+82AD	# <cjk>
+0x946E	U+99AC	# <cjk>
+0x946F	U+4FF3	# <cjk>
+0x9470	U+5EC3	# <cjk>
+0x9471	U+62DD	# <cjk>
+0x9472	U+6392	# <cjk>
+0x9473	U+6557	# <cjk>
+0x9474	U+676F	# <cjk>
+0x9475	U+76C3	# <cjk>
+0x9476	U+724C	# <cjk>
+0x9477	U+80CC	# <cjk>
+0x9478	U+80BA	# <cjk>
+0x9479	U+8F29	# <cjk>
+0x947A	U+914D	# <cjk>
+0x947B	U+500D	# <cjk>
+0x947C	U+57F9	# <cjk>
+0x947D	U+5A92	# <cjk>
+0x947E	U+6885	# <cjk>
+0x9480	U+6973	# <cjk>
+0x9481	U+7164	# <cjk>
+0x9482	U+72FD	# <cjk>
+0x9483	U+8CB7	# <cjk>
+0x9484	U+58F2	# <cjk>
+0x9485	U+8CE0	# <cjk>
+0x9486	U+966A	# <cjk>
+0x9487	U+9019	# <cjk>
+0x9488	U+877F	# <cjk>
+0x9489	U+79E4	# <cjk>
+0x948A	U+77E7	# <cjk>
+0x948B	U+8429	# <cjk>
+0x948C	U+4F2F	# <cjk>
+0x948D	U+5265	# <cjk>
+0x948E	U+535A	# <cjk>
+0x948F	U+62CD	# <cjk>
+0x9490	U+67CF	# <cjk>
+0x9491	U+6CCA	# <cjk>
+0x9492	U+767D	# <cjk>
+0x9493	U+7B94	# <cjk>
+0x9494	U+7C95	# <cjk>
+0x9495	U+8236	# <cjk>
+0x9496	U+8584	# <cjk>
+0x9497	U+8FEB	# <cjk>
+0x9498	U+66DD	# <cjk>
+0x9499	U+6F20	# <cjk>
+0x949A	U+7206	# <cjk>
+0x949B	U+7E1B	# <cjk>
+0x949C	U+83AB	# <cjk>
+0x949D	U+99C1	# <cjk>
+0x949E	U+9EA6	# <cjk>
+0x949F	U+51FD	# <cjk>
+0x94A0	U+7BB1	# <cjk>
+0x94A1	U+7872	# <cjk>
+0x94A2	U+7BB8	# <cjk>
+0x94A3	U+8087	# <cjk>
+0x94A4	U+7B48	# <cjk>
+0x94A5	U+6AE8	# <cjk>
+0x94A6	U+5E61	# <cjk>
+0x94A7	U+808C	# <cjk>
+0x94A8	U+7551	# <cjk>
+0x94A9	U+7560	# <cjk>
+0x94AA	U+516B	# <cjk>
+0x94AB	U+9262	# <cjk>
+0x94AC	U+6E8C	# <cjk>
+0x94AD	U+767A	# <cjk>
+0x94AE	U+9197	# <cjk>
+0x94AF	U+9AEA	# <cjk>
+0x94B0	U+4F10	# <cjk>
+0x94B1	U+7F70	# <cjk>
+0x94B2	U+629C	# <cjk>
+0x94B3	U+7B4F	# <cjk>
+0x94B4	U+95A5	# <cjk>
+0x94B5	U+9CE9	# <cjk>
+0x94B6	U+567A	# <cjk>
+0x94B7	U+5859	# <cjk>
+0x94B8	U+86E4	# <cjk>
+0x94B9	U+96BC	# <cjk>
+0x94BA	U+4F34	# <cjk>
+0x94BB	U+5224	# <cjk>
+0x94BC	U+534A	# <cjk>
+0x94BD	U+53CD	# <cjk>
+0x94BE	U+53DB	# <cjk>
+0x94BF	U+5E06	# <cjk>
+0x94C0	U+642C	# <cjk>
+0x94C1	U+6591	# <cjk>
+0x94C2	U+677F	# <cjk>
+0x94C3	U+6C3E	# <cjk>
+0x94C4	U+6C4E	# <cjk>
+0x94C5	U+7248	# <cjk>
+0x94C6	U+72AF	# <cjk>
+0x94C7	U+73ED	# <cjk>
+0x94C8	U+7554	# <cjk>
+0x94C9	U+7E41	# <cjk>
+0x94CA	U+822C	# <cjk>
+0x94CB	U+85E9	# <cjk>
+0x94CC	U+8CA9	# <cjk>
+0x94CD	U+7BC4	# <cjk>
+0x94CE	U+91C6	# <cjk>
+0x94CF	U+7169	# <cjk>
+0x94D0	U+9812	# <cjk>
+0x94D1	U+98EF	# <cjk>
+0x94D2	U+633D	# <cjk>
+0x94D3	U+6669	# <cjk>
+0x94D4	U+756A	# <cjk>
+0x94D5	U+76E4	# <cjk>
+0x94D6	U+78D0	# <cjk>
+0x94D7	U+8543	# <cjk>
+0x94D8	U+86EE	# <cjk>
+0x94D9	U+532A	# <cjk>
+0x94DA	U+5351	# <cjk>
+0x94DB	U+5426	# <cjk>
+0x94DC	U+5983	# <cjk>
+0x94DD	U+5E87	# <cjk>
+0x94DE	U+5F7C	# <cjk>
+0x94DF	U+60B2	# <cjk>
+0x94E0	U+6249	# <cjk>
+0x94E1	U+6279	# <cjk>
+0x94E2	U+62AB	# <cjk>
+0x94E3	U+6590	# <cjk>
+0x94E4	U+6BD4	# <cjk>
+0x94E5	U+6CCC	# <cjk>
+0x94E6	U+75B2	# <cjk>
+0x94E7	U+76AE	# <cjk>
+0x94E8	U+7891	# <cjk>
+0x94E9	U+79D8	# <cjk>
+0x94EA	U+7DCB	# <cjk>
+0x94EB	U+7F77	# <cjk>
+0x94EC	U+80A5	# <cjk>
+0x94ED	U+88AB	# <cjk>
+0x94EE	U+8AB9	# <cjk>
+0x94EF	U+8CBB	# <cjk>
+0x94F0	U+907F	# <cjk>
+0x94F1	U+975E	# <cjk>
+0x94F2	U+98DB	# <cjk>
+0x94F3	U+6A0B	# <cjk>
+0x94F4	U+7C38	# <cjk>
+0x94F5	U+5099	# <cjk>
+0x94F6	U+5C3E	# <cjk>
+0x94F7	U+5FAE	# <cjk>
+0x94F8	U+6787	# <cjk>
+0x94F9	U+6BD8	# <cjk>
+0x94FA	U+7435	# <cjk>
+0x94FB	U+7709	# <cjk>
+0x94FC	U+7F8E	# <cjk>
+0x9540	U+9F3B	# <cjk>
+0x9541	U+67CA	# <cjk>
+0x9542	U+7A17	# <cjk>
+0x9543	U+5339	# <cjk>
+0x9544	U+758B	# <cjk>
+0x9545	U+9AED	# <cjk>
+0x9546	U+5F66	# <cjk>
+0x9547	U+819D	# <cjk>
+0x9548	U+83F1	# <cjk>
+0x9549	U+8098	# <cjk>
+0x954A	U+5F3C	# <cjk>
+0x954B	U+5FC5	# <cjk>
+0x954C	U+7562	# <cjk>
+0x954D	U+7B46	# <cjk>
+0x954E	U+903C	# <cjk>
+0x954F	U+6867	# <cjk>
+0x9550	U+59EB	# <cjk>
+0x9551	U+5A9B	# <cjk>
+0x9552	U+7D10	# <cjk>
+0x9553	U+767E	# <cjk>
+0x9554	U+8B2C	# <cjk>
+0x9555	U+4FF5	# <cjk>
+0x9556	U+5F6A	# <cjk>
+0x9557	U+6A19	# <cjk>
+0x9558	U+6C37	# <cjk>
+0x9559	U+6F02	# <cjk>
+0x955A	U+74E2	# <cjk>
+0x955C	U+8868	# <cjk>
+0x955D	U+8A55	# <cjk>
+0x955E	U+8C79	# <cjk>
+0x955F	U+5EDF	# <cjk>
+0x9560	U+63CF	# <cjk>
+0x9561	U+75C5	# <cjk>
+0x9562	U+79D2	# <cjk>
+0x9563	U+82D7	# <cjk>
+0x9564	U+9328	# <cjk>
+0x9565	U+92F2	# <cjk>
+0x9566	U+849C	# <cjk>
+0x9567	U+86ED	# <cjk>
+0x9568	U+9C2D	# <cjk>
+0x9569	U+54C1	# <cjk>
+0x956A	U+5F6C	# <cjk>
+0x956B	U+658C	# <cjk>
+0x956C	U+6D5C	# <cjk>
+0x956D	U+7015	# <cjk>
+0x956E	U+8CA7	# <cjk>
+0x956F	U+8CD3	# <cjk>
+0x9570	U+983B	# <cjk>
+0x9571	U+654F	# <cjk>
+0x9572	U+74F6	# <cjk>
+0x9573	U+4E0D	# <cjk>
+0x9574	U+4ED8	# <cjk>
+0x9575	U+57E0	# <cjk>
+0x9576	U+592B	# <cjk>
+0x9577	U+5A66	# <cjk>
+0x9578	U+5BCC	# <cjk>
+0x9579	U+51A8	# <cjk>
+0x957A	U+5E03	# <cjk>
+0x957B	U+5E9C	# <cjk>
+0x957C	U+6016	# <cjk>
+0x957D	U+6276	# <cjk>
+0x957E	U+6577	# <cjk>
+0x9580	U+65A7	# <cjk>
+0x9581	U+666E	# <cjk>
+0x9582	U+6D6E	# <cjk>
+0x9583	U+7236	# <cjk>
+0x9584	U+7B26	# <cjk>
+0x9585	U+8150	# <cjk>
+0x9586	U+819A	# <cjk>
+0x9587	U+8299	# <cjk>
+0x9588	U+8B5C	# <cjk>
+0x9589	U+8CA0	# <cjk>
+0x958A	U+8CE6	# <cjk>
+0x958B	U+8D74	# <cjk>
+0x958C	U+961C	# <cjk>
+0x958D	U+9644	# <cjk>
+0x958E	U+4FAE	# <cjk>
+0x958F	U+64AB	# <cjk>
+0x9590	U+6B66	# <cjk>
+0x9591	U+821E	# <cjk>
+0x9592	U+8461	# <cjk>
+0x9593	U+856A	# <cjk>
+0x9594	U+90E8	# <cjk>
+0x9595	U+5C01	# <cjk>
+0x9596	U+6953	# <cjk>
+0x9597	U+98A8	# <cjk>
+0x9598	U+847A	# <cjk>
+0x9599	U+8557	# <cjk>
+0x959A	U+4F0F	# <cjk>
+0x959B	U+526F	# <cjk>
+0x959C	U+5FA9	# <cjk>
+0x959D	U+5E45	# <cjk>
+0x959E	U+670D	# <cjk>
+0x959F	U+798F	# <cjk>
+0x95A0	U+8179	# <cjk>
+0x95A1	U+8907	# <cjk>
+0x95A2	U+8986	# <cjk>
+0x95A3	U+6DF5	# <cjk>
+0x95A4	U+5F17	# <cjk>
+0x95A5	U+6255	# <cjk>
+0x95A6	U+6CB8	# <cjk>
+0x95A7	U+4ECF	# <cjk>
+0x95A8	U+7269	# <cjk>
+0x95A9	U+9B92	# <cjk>
+0x95AA	U+5206	# <cjk>
+0x95AB	U+543B	# <cjk>
+0x95AC	U+5674	# <cjk>
+0x95AD	U+58B3	# <cjk>
+0x95AE	U+61A4	# <cjk>
+0x95AF	U+626E	# <cjk>
+0x95B0	U+711A	# <cjk>
+0x95B1	U+596E	# <cjk>
+0x95B2	U+7C89	# <cjk>
+0x95B3	U+7CDE	# <cjk>
+0x95B4	U+7D1B	# <cjk>
+0x95B5	U+96F0	# <cjk>
+0x95B6	U+6587	# <cjk>
+0x95B7	U+805E	# <cjk>
+0x95B8	U+4E19	# <cjk>
+0x95B9	U+4F75	# <cjk>
+0x95BA	U+5175	# <cjk>
+0x95BB	U+5840	# <cjk>
+0x95BC	U+5E63	# <cjk>
+0x95BD	U+5E73	# <cjk>
+0x95BE	U+5F0A	# <cjk>
+0x95BF	U+67C4	# <cjk>
+0x95C0	U+4E26	# <cjk>
+0x95C1	U+853D	# <cjk>
+0x95C2	U+9589	# <cjk>
+0x95C3	U+965B	# <cjk>
+0x95C4	U+7C73	# <cjk>
+0x95C5	U+9801	# <cjk>
+0x95C6	U+50FB	# <cjk>
+0x95C7	U+58C1	# <cjk>
+0x95C8	U+7656	# <cjk>
+0x95C9	U+78A7	# <cjk>
+0x95CA	U+5225	# <cjk>
+0x95CB	U+77A5	# <cjk>
+0x95CC	U+8511	# <cjk>
+0x95CD	U+7B86	# <cjk>
+0x95CE	U+504F	# <cjk>
+0x95CF	U+5909	# <cjk>
+0x95D0	U+7247	# <cjk>
+0x95D1	U+7BC7	# <cjk>
+0x95D2	U+7DE8	# <cjk>
+0x95D3	U+8FBA	# <cjk>
+0x95D4	U+8FD4	# <cjk>
+0x95D5	U+904D	# <cjk>
+0x95D6	U+4FBF	# <cjk>
+0x95D7	U+52C9	# <cjk>
+0x95D8	U+5A29	# <cjk>
+0x95D9	U+5F01	# <cjk>
+0x95DA	U+97AD	# <cjk>
+0x95DB	U+4FDD	# <cjk>
+0x95DC	U+8217	# <cjk>
+0x95DD	U+92EA	# <cjk>
+0x95DE	U+5703	# <cjk>
+0x95DF	U+6355	# <cjk>
+0x95E0	U+6B69	# <cjk>
+0x95E1	U+752B	# <cjk>
+0x95E2	U+88DC	# <cjk>
+0x95E3	U+8F14	# <cjk>
+0x95E4	U+7A42	# <cjk>
+0x95E5	U+52DF	# <cjk>
+0x95E6	U+5893	# <cjk>
+0x95E7	U+6155	# <cjk>
+0x95E8	U+620A	# <cjk>
+0x95E9	U+66AE	# <cjk>
+0x95EA	U+6BCD	# <cjk>
+0x95EB	U+7C3F	# <cjk>
+0x95EC	U+83E9	# <cjk>
+0x95ED	U+5023	# <cjk>
+0x95EE	U+4FF8	# <cjk>
+0x95EF	U+5305	# <cjk>
+0x95F0	U+5446	# <cjk>
+0x95F1	U+5831	# <cjk>
+0x95F2	U+5949	# <cjk>
+0x95F3	U+5B9D	# <cjk>
+0x95F4	U+5CF0	# <cjk>
+0x95F5	U+5CEF	# <cjk>
+0x95F6	U+5D29	# <cjk>
+0x95F7	U+5E96	# <cjk>
+0x95F8	U+62B1	# <cjk>
+0x95F9	U+6367	# <cjk>
+0x95FA	U+653E	# <cjk>
+0x95FB	U+65B9	# <cjk>
+0x95FC	U+670B	# <cjk>
+0x9640	U+6CD5	# <cjk>
+0x9641	U+6CE1	# <cjk>
+0x9642	U+70F9	# <cjk>
+0x9643	U+7832	# <cjk>
+0x9644	U+7E2B	# <cjk>
+0x9645	U+80DE	# <cjk>
+0x9646	U+82B3	# <cjk>
+0x9647	U+840C	# <cjk>
+0x9648	U+84EC	# <cjk>
+0x9649	U+8702	# <cjk>
+0x964A	U+8912	# <cjk>
+0x964B	U+8A2A	# <cjk>
+0x964C	U+8C4A	# <cjk>
+0x964D	U+90A6	# <cjk>
+0x964E	U+92D2	# <cjk>
+0x964F	U+98FD	# <cjk>
+0x9650	U+9CF3	# <cjk>
+0x9651	U+9D6C	# <cjk>
+0x9652	U+4E4F	# <cjk>
+0x9653	U+4EA1	# <cjk>
+0x9654	U+508D	# <cjk>
+0x9655	U+5256	# <cjk>
+0x9656	U+574A	# <cjk>
+0x9657	U+59A8	# <cjk>
+0x9658	U+5E3D	# <cjk>
+0x9659	U+5FD8	# <cjk>
+0x965A	U+5FD9	# <cjk>
+0x965C	U+66B4	# <cjk>
+0x965D	U+671B	# <cjk>
+0x965E	U+67D0	# <cjk>
+0x965F	U+68D2	# <cjk>
+0x9660	U+5192	# <cjk>
+0x9661	U+7D21	# <cjk>
+0x9662	U+80AA	# <cjk>
+0x9663	U+81A8	# <cjk>
+0x9664	U+8B00	# <cjk>
+0x9665	U+8C8C	# <cjk>
+0x9666	U+8CBF	# <cjk>
+0x9667	U+927E	# <cjk>
+0x9668	U+9632	# <cjk>
+0x9669	U+5420	# <cjk>
+0x966A	U+982C	# <cjk>
+0x966B	U+5317	# <cjk>
+0x966C	U+50D5	# <cjk>
+0x966D	U+535C	# <cjk>
+0x966E	U+58A8	# <cjk>
+0x966F	U+64B2	# <cjk>
+0x9670	U+6734	# <cjk>
+0x9671	U+7267	# <cjk>
+0x9672	U+7766	# <cjk>
+0x9673	U+7A46	# <cjk>
+0x9674	U+91E6	# <cjk>
+0x9675	U+52C3	# <cjk>
+0x9676	U+6CA1	# <cjk>
+0x9677	U+6B86	# <cjk>
+0x9678	U+5800	# <cjk>
+0x9679	U+5E4C	# <cjk>
+0x967A	U+5954	# <cjk>
+0x967B	U+672C	# <cjk>
+0x967C	U+7FFB	# <cjk>
+0x967D	U+51E1	# <cjk>
+0x967E	U+76C6	# <cjk>
+0x9680	U+6469	# <cjk>
+0x9681	U+78E8	# <cjk>
+0x9682	U+9B54	# <cjk>
+0x9683	U+9EBB	# <cjk>
+0x9684	U+57CB	# <cjk>
+0x9685	U+59B9	# <cjk>
+0x9686	U+6627	# <cjk>
+0x9687	U+679A	# <cjk>
+0x9688	U+6BCE	# <cjk>
+0x9689	U+54E9	# <cjk>
+0x968A	U+69D9	# <cjk>
+0x968B	U+5E55	# <cjk>
+0x968C	U+819C	# <cjk>
+0x968D	U+6795	# <cjk>
+0x968E	U+9BAA	# <cjk>
+0x968F	U+67FE	# <cjk>
+0x9690	U+9C52	# <cjk>
+0x9691	U+685D	# <cjk>
+0x9692	U+4EA6	# <cjk>
+0x9693	U+4FE3	# <cjk>
+0x9694	U+53C8	# <cjk>
+0x9695	U+62B9	# <cjk>
+0x9696	U+672B	# <cjk>
+0x9697	U+6CAB	# <cjk>
+0x9698	U+8FC4	# <cjk>
+0x9699	U+4FAD	# <cjk>
+0x969A	U+7E6D	# <cjk>
+0x969B	U+9EBF	# <cjk>
+0x969C	U+4E07	# <cjk>
+0x969D	U+6162	# <cjk>
+0x969E	U+6E80	# <cjk>
+0x969F	U+6F2B	# <cjk>
+0x96A0	U+8513	# <cjk>
+0x96A1	U+5473	# <cjk>
+0x96A2	U+672A	# <cjk>
+0x96A3	U+9B45	# <cjk>
+0x96A4	U+5DF3	# <cjk>
+0x96A5	U+7B95	# <cjk>
+0x96A6	U+5CAC	# <cjk>
+0x96A7	U+5BC6	# <cjk>
+0x96A8	U+871C	# <cjk>
+0x96A9	U+6E4A	# <cjk>
+0x96AA	U+84D1	# <cjk>
+0x96AB	U+7A14	# <cjk>
+0x96AC	U+8108	# <cjk>
+0x96AD	U+5999	# <cjk>
+0x96AE	U+7C8D	# <cjk>
+0x96AF	U+6C11	# <cjk>
+0x96B0	U+7720	# <cjk>
+0x96B1	U+52D9	# <cjk>
+0x96B2	U+5922	# <cjk>
+0x96B3	U+7121	# <cjk>
+0x96B4	U+725F	# <cjk>
+0x96B5	U+77DB	# <cjk>
+0x96B6	U+9727	# <cjk>
+0x96B7	U+9D61	# <cjk>
+0x96B8	U+690B	# <cjk>
+0x96B9	U+5A7F	# <cjk>
+0x96BA	U+5A18	# <cjk>
+0x96BB	U+51A5	# <cjk>
+0x96BC	U+540D	# <cjk>
+0x96BD	U+547D	# <cjk>
+0x96BE	U+660E	# <cjk>
+0x96BF	U+76DF	# <cjk>
+0x96C0	U+8FF7	# <cjk>
+0x96C1	U+9298	# <cjk>
+0x96C2	U+9CF4	# <cjk>
+0x96C3	U+59EA	# <cjk>
+0x96C4	U+725D	# <cjk>
+0x96C5	U+6EC5	# <cjk>
+0x96C6	U+514D	# <cjk>
+0x96C7	U+68C9	# <cjk>
+0x96C8	U+7DBF	# <cjk>
+0x96C9	U+7DEC	# <cjk>
+0x96CA	U+9762	# <cjk>
+0x96CB	U+9EBA	# <cjk>
+0x96CC	U+6478	# <cjk>
+0x96CD	U+6A21	# <cjk>
+0x96CE	U+8302	# <cjk>
+0x96CF	U+5984	# <cjk>
+0x96D0	U+5B5F	# <cjk>
+0x96D1	U+6BDB	# <cjk>
+0x96D2	U+731B	# <cjk>
+0x96D3	U+76F2	# <cjk>
+0x96D4	U+7DB2	# <cjk>
+0x96D5	U+8017	# <cjk>
+0x96D6	U+8499	# <cjk>
+0x96D7	U+5132	# <cjk>
+0x96D8	U+6728	# <cjk>
+0x96D9	U+9ED9	# <cjk>
+0x96DA	U+76EE	# <cjk>
+0x96DB	U+6762	# <cjk>
+0x96DC	U+52FF	# <cjk>
+0x96DD	U+9905	# <cjk>
+0x96DE	U+5C24	# <cjk>
+0x96DF	U+623B	# <cjk>
+0x96E0	U+7C7E	# <cjk>
+0x96E1	U+8CB0	# <cjk>
+0x96E2	U+554F	# <cjk>
+0x96E3	U+60B6	# <cjk>
+0x96E4	U+7D0B	# <cjk>
+0x96E5	U+9580	# <cjk>
+0x96E6	U+5301	# <cjk>
+0x96E7	U+4E5F	# <cjk>
+0x96E8	U+51B6	# <cjk>
+0x96E9	U+591C	# <cjk>
+0x96EA	U+723A	# <cjk>
+0x96EB	U+8036	# <cjk>
+0x96EC	U+91CE	# <cjk>
+0x96ED	U+5F25	# <cjk>
+0x96EE	U+77E2	# <cjk>
+0x96EF	U+5384	# <cjk>
+0x96F0	U+5F79	# <cjk>
+0x96F1	U+7D04	# <cjk>
+0x96F2	U+85AC	# <cjk>
+0x96F3	U+8A33	# <cjk>
+0x96F4	U+8E8D	# <cjk>
+0x96F5	U+9756	# <cjk>
+0x96F6	U+67F3	# <cjk>
+0x96F7	U+85AE	# <cjk>
+0x96F8	U+9453	# <cjk>
+0x96F9	U+6109	# <cjk>
+0x96FA	U+6108	# <cjk>
+0x96FB	U+6CB9	# <cjk>
+0x96FC	U+7652	# <cjk>
+0x9740	U+8AED	# <cjk>
+0x9741	U+8F38	# <cjk>
+0x9742	U+552F	# <cjk>
+0x9743	U+4F51	# <cjk>
+0x9744	U+512A	# <cjk>
+0x9745	U+52C7	# <cjk>
+0x9746	U+53CB	# <cjk>
+0x9747	U+5BA5	# <cjk>
+0x9748	U+5E7D	# <cjk>
+0x9749	U+60A0	# <cjk>
+0x974A	U+6182	# <cjk>
+0x974B	U+63D6	# <cjk>
+0x974C	U+6709	# <cjk>
+0x974D	U+67DA	# <cjk>
+0x974E	U+6E67	# <cjk>
+0x974F	U+6D8C	# <cjk>
+0x9750	U+7336	# <cjk>
+0x9751	U+7337	# <cjk>
+0x9752	U+7531	# <cjk>
+0x9753	U+7950	# <cjk>
+0x9754	U+88D5	# <cjk>
+0x9755	U+8A98	# <cjk>
+0x9756	U+904A	# <cjk>
+0x9757	U+9091	# <cjk>
+0x9758	U+90F5	# <cjk>
+0x9759	U+96C4	# <cjk>
+0x975A	U+878D	# <cjk>
+0x975C	U+4E88	# <cjk>
+0x975D	U+4F59	# <cjk>
+0x975E	U+4E0E	# <cjk>
+0x975F	U+8A89	# <cjk>
+0x9760	U+8F3F	# <cjk>
+0x9761	U+9810	# <cjk>
+0x9762	U+50AD	# <cjk>
+0x9763	U+5E7C	# <cjk>
+0x9764	U+5996	# <cjk>
+0x9765	U+5BB9	# <cjk>
+0x9766	U+5EB8	# <cjk>
+0x9767	U+63DA	# <cjk>
+0x9768	U+63FA	# <cjk>
+0x9769	U+64C1	# <cjk>
+0x976A	U+66DC	# <cjk>
+0x976B	U+694A	# <cjk>
+0x976C	U+69D8	# <cjk>
+0x976D	U+6D0B	# <cjk>
+0x976E	U+6EB6	# <cjk>
+0x976F	U+7194	# <cjk>
+0x9770	U+7528	# <cjk>
+0x9771	U+7AAF	# <cjk>
+0x9772	U+7F8A	# <cjk>
+0x9773	U+8000	# <cjk>
+0x9774	U+8449	# <cjk>
+0x9775	U+84C9	# <cjk>
+0x9776	U+8981	# <cjk>
+0x9777	U+8B21	# <cjk>
+0x9778	U+8E0A	# <cjk>
+0x9779	U+9065	# <cjk>
+0x977A	U+967D	# <cjk>
+0x977B	U+990A	# <cjk>
+0x977C	U+617E	# <cjk>
+0x977D	U+6291	# <cjk>
+0x977E	U+6B32	# <cjk>
+0x9780	U+6C83	# <cjk>
+0x9781	U+6D74	# <cjk>
+0x9782	U+7FCC	# <cjk>
+0x9783	U+7FFC	# <cjk>
+0x9784	U+6DC0	# <cjk>
+0x9785	U+7F85	# <cjk>
+0x9786	U+87BA	# <cjk>
+0x9787	U+88F8	# <cjk>
+0x9788	U+6765	# <cjk>
+0x9789	U+83B1	# <cjk>
+0x978A	U+983C	# <cjk>
+0x978B	U+96F7	# <cjk>
+0x978C	U+6D1B	# <cjk>
+0x978D	U+7D61	# <cjk>
+0x978E	U+843D	# <cjk>
+0x978F	U+916A	# <cjk>
+0x9790	U+4E71	# <cjk>
+0x9791	U+5375	# <cjk>
+0x9792	U+5D50	# <cjk>
+0x9793	U+6B04	# <cjk>
+0x9794	U+6FEB	# <cjk>
+0x9795	U+85CD	# <cjk>
+0x9796	U+862D	# <cjk>
+0x9797	U+89A7	# <cjk>
+0x9798	U+5229	# <cjk>
+0x9799	U+540F	# <cjk>
+0x979A	U+5C65	# <cjk>
+0x979B	U+674E	# <cjk>
+0x979C	U+68A8	# <cjk>
+0x979D	U+7406	# <cjk>
+0x979E	U+7483	# <cjk>
+0x979F	U+75E2	# <cjk>
+0x97A0	U+88CF	# <cjk>
+0x97A1	U+88E1	# <cjk>
+0x97A2	U+91CC	# <cjk>
+0x97A3	U+96E2	# <cjk>
+0x97A4	U+9678	# <cjk>
+0x97A5	U+5F8B	# <cjk>
+0x97A6	U+7387	# <cjk>
+0x97A7	U+7ACB	# <cjk>
+0x97A8	U+844E	# <cjk>
+0x97A9	U+63A0	# <cjk>
+0x97AA	U+7565	# <cjk>
+0x97AB	U+5289	# <cjk>
+0x97AC	U+6D41	# <cjk>
+0x97AD	U+6E9C	# <cjk>
+0x97AE	U+7409	# <cjk>
+0x97AF	U+7559	# <cjk>
+0x97B0	U+786B	# <cjk>
+0x97B1	U+7C92	# <cjk>
+0x97B2	U+9686	# <cjk>
+0x97B3	U+7ADC	# <cjk>
+0x97B4	U+9F8D	# <cjk>
+0x97B5	U+4FB6	# <cjk>
+0x97B6	U+616E	# <cjk>
+0x97B7	U+65C5	# <cjk>
+0x97B8	U+865C	# <cjk>
+0x97B9	U+4E86	# <cjk>
+0x97BA	U+4EAE	# <cjk>
+0x97BB	U+50DA	# <cjk>
+0x97BC	U+4E21	# <cjk>
+0x97BD	U+51CC	# <cjk>
+0x97BE	U+5BEE	# <cjk>
+0x97BF	U+6599	# <cjk>
+0x97C0	U+6881	# <cjk>
+0x97C1	U+6DBC	# <cjk>
+0x97C2	U+731F	# <cjk>
+0x97C3	U+7642	# <cjk>
+0x97C4	U+77AD	# <cjk>
+0x97C5	U+7A1C	# <cjk>
+0x97C6	U+7CE7	# <cjk>
+0x97C7	U+826F	# <cjk>
+0x97C8	U+8AD2	# <cjk>
+0x97C9	U+907C	# <cjk>
+0x97CA	U+91CF	# <cjk>
+0x97CB	U+9675	# <cjk>
+0x97CC	U+9818	# <cjk>
+0x97CD	U+529B	# <cjk>
+0x97CE	U+7DD1	# <cjk>
+0x97CF	U+502B	# <cjk>
+0x97D0	U+5398	# <cjk>
+0x97D1	U+6797	# <cjk>
+0x97D2	U+6DCB	# <cjk>
+0x97D3	U+71D0	# <cjk>
+0x97D4	U+7433	# <cjk>
+0x97D5	U+81E8	# <cjk>
+0x97D6	U+8F2A	# <cjk>
+0x97D7	U+96A3	# <cjk>
+0x97D8	U+9C57	# <cjk>
+0x97D9	U+9E9F	# <cjk>
+0x97DA	U+7460	# <cjk>
+0x97DB	U+5841	# <cjk>
+0x97DC	U+6D99	# <cjk>
+0x97DD	U+7D2F	# <cjk>
+0x97DE	U+985E	# <cjk>
+0x97DF	U+4EE4	# <cjk>
+0x97E0	U+4F36	# <cjk>
+0x97E1	U+4F8B	# <cjk>
+0x97E2	U+51B7	# <cjk>
+0x97E3	U+52B1	# <cjk>
+0x97E4	U+5DBA	# <cjk>
+0x97E5	U+601C	# <cjk>
+0x97E6	U+73B2	# <cjk>
+0x97E7	U+793C	# <cjk>
+0x97E8	U+82D3	# <cjk>
+0x97E9	U+9234	# <cjk>
+0x97EA	U+96B7	# <cjk>
+0x97EB	U+96F6	# <cjk>
+0x97EC	U+970A	# <cjk>
+0x97ED	U+9E97	# <cjk>
+0x97EE	U+9F62	# <cjk>
+0x97EF	U+66A6	# <cjk>
+0x97F0	U+6B74	# <cjk>
+0x97F1	U+5217	# <cjk>
+0x97F2	U+52A3	# <cjk>
+0x97F3	U+70C8	# <cjk>
+0x97F4	U+88C2	# <cjk>
+0x97F5	U+5EC9	# <cjk>
+0x97F6	U+604B	# <cjk>
+0x97F7	U+6190	# <cjk>
+0x97F8	U+6F23	# <cjk>
+0x97F9	U+7149	# <cjk>
+0x97FA	U+7C3E	# <cjk>
+0x97FB	U+7DF4	# <cjk>
+0x97FC	U+806F	# <cjk>
+0x9840	U+84EE	# <cjk>
+0x9841	U+9023	# <cjk>
+0x9842	U+932C	# <cjk>
+0x9843	U+5442	# <cjk>
+0x9844	U+9B6F	# <cjk>
+0x9845	U+6AD3	# <cjk>
+0x9846	U+7089	# <cjk>
+0x9847	U+8CC2	# <cjk>
+0x9848	U+8DEF	# <cjk>
+0x9849	U+9732	# <cjk>
+0x984A	U+52B4	# <cjk>
+0x984B	U+5A41	# <cjk>
+0x984C	U+5ECA	# <cjk>
+0x984D	U+5F04	# <cjk>
+0x984E	U+6717	# <cjk>
+0x984F	U+697C	# <cjk>
+0x9850	U+6994	# <cjk>
+0x9851	U+6D6A	# <cjk>
+0x9852	U+6F0F	# <cjk>
+0x9853	U+7262	# <cjk>
+0x9854	U+72FC	# <cjk>
+0x9855	U+7BED	# <cjk>
+0x9856	U+8001	# <cjk>
+0x9857	U+807E	# <cjk>
+0x9858	U+874B	# <cjk>
+0x9859	U+90CE	# <cjk>
+0x985A	U+516D	# <cjk>
+0x985C	U+7984	# <cjk>
+0x985D	U+808B	# <cjk>
+0x985E	U+9332	# <cjk>
+0x985F	U+8AD6	# <cjk>
+0x9860	U+502D	# <cjk>
+0x9861	U+548C	# <cjk>
+0x9862	U+8A71	# <cjk>
+0x9863	U+6B6A	# <cjk>
+0x9864	U+8CC4	# <cjk>
+0x9865	U+8107	# <cjk>
+0x9866	U+60D1	# <cjk>
+0x9867	U+67A0	# <cjk>
+0x9868	U+9DF2	# <cjk>
+0x9869	U+4E99	# <cjk>
+0x986A	U+4E98	# <cjk>
+0x986B	U+9C10	# <cjk>
+0x986C	U+8A6B	# <cjk>
+0x986D	U+85C1	# <cjk>
+0x986E	U+8568	# <cjk>
+0x986F	U+6900	# <cjk>
+0x9870	U+6E7E	# <cjk>
+0x9871	U+7897	# <cjk>
+0x9872	U+8155	# <cjk>
+0x9873		# <reserved>
+0x9874		# <reserved>
+0x9875		# <reserved>
+0x9876		# <reserved>
+0x9877		# <reserved>
+0x9878		# <reserved>
+0x9879		# <reserved>
+0x987A		# <reserved>
+0x987B		# <reserved>
+0x987C		# <reserved>
+0x987D		# <reserved>
+0x987E		# <reserved>
+0x9880		# <reserved>
+0x9881		# <reserved>
+0x9882		# <reserved>
+0x9883		# <reserved>
+0x9884		# <reserved>
+0x9885		# <reserved>
+0x9886		# <reserved>
+0x9887		# <reserved>
+0x9888		# <reserved>
+0x9889		# <reserved>
+0x988A		# <reserved>
+0x988B		# <reserved>
+0x988C		# <reserved>
+0x988D		# <reserved>
+0x988E		# <reserved>
+0x988F		# <reserved>
+0x9890		# <reserved>
+0x9891		# <reserved>
+0x9892		# <reserved>
+0x9893		# <reserved>
+0x9894		# <reserved>
+0x9895		# <reserved>
+0x9896		# <reserved>
+0x9897		# <reserved>
+0x9898		# <reserved>
+0x9899		# <reserved>
+0x989A		# <reserved>
+0x989B		# <reserved>
+0x989C		# <reserved>
+0x989D		# <reserved>
+0x989E		# <reserved>
+0x989F	U+5F0C	# <cjk>
+0x98A0	U+4E10	# <cjk>
+0x98A1	U+4E15	# <cjk>
+0x98A2	U+4E2A	# <cjk>
+0x98A3	U+4E31	# <cjk>
+0x98A4	U+4E36	# <cjk>
+0x98A5	U+4E3C	# <cjk>
+0x98A6	U+4E3F	# <cjk>
+0x98A7	U+4E42	# <cjk>
+0x98A8	U+4E56	# <cjk>
+0x98A9	U+4E58	# <cjk>
+0x98AA	U+4E82	# <cjk>
+0x98AB	U+4E85	# <cjk>
+0x98AC	U+8C6B	# <cjk>
+0x98AD	U+4E8A	# <cjk>
+0x98AE	U+8212	# <cjk>
+0x98AF	U+5F0D	# <cjk>
+0x98B0	U+4E8E	# <cjk>
+0x98B1	U+4E9E	# <cjk>
+0x98B2	U+4E9F	# <cjk>
+0x98B3	U+4EA0	# <cjk>
+0x98B4	U+4EA2	# <cjk>
+0x98B5	U+4EB0	# <cjk>
+0x98B6	U+4EB3	# <cjk>
+0x98B7	U+4EB6	# <cjk>
+0x98B8	U+4ECE	# <cjk>
+0x98B9	U+4ECD	# <cjk>
+0x98BA	U+4EC4	# <cjk>
+0x98BB	U+4EC6	# <cjk>
+0x98BC	U+4EC2	# <cjk>
+0x98BD	U+4ED7	# <cjk>
+0x98BE	U+4EDE	# <cjk>
+0x98BF	U+4EED	# <cjk>
+0x98C0	U+4EDF	# <cjk>
+0x98C1	U+4EF7	# <cjk>
+0x98C2	U+4F09	# <cjk>
+0x98C3	U+4F5A	# <cjk>
+0x98C4	U+4F30	# <cjk>
+0x98C5	U+4F5B	# <cjk>
+0x98C6	U+4F5D	# <cjk>
+0x98C7	U+4F57	# <cjk>
+0x98C8	U+4F47	# <cjk>
+0x98C9	U+4F76	# <cjk>
+0x98CA	U+4F88	# <cjk>
+0x98CB	U+4F8F	# <cjk>
+0x98CC	U+4F98	# <cjk>
+0x98CD	U+4F7B	# <cjk>
+0x98CE	U+4F69	# <cjk>
+0x98CF	U+4F70	# <cjk>
+0x98D0	U+4F91	# <cjk>
+0x98D1	U+4F6F	# <cjk>
+0x98D2	U+4F86	# <cjk>
+0x98D3	U+4F96	# <cjk>
+0x98D4	U+5118	# <cjk>
+0x98D5	U+4FD4	# <cjk>
+0x98D6	U+4FDF	# <cjk>
+0x98D7	U+4FCE	# <cjk>
+0x98D8	U+4FD8	# <cjk>
+0x98D9	U+4FDB	# <cjk>
+0x98DA	U+4FD1	# <cjk>
+0x98DB	U+4FDA	# <cjk>
+0x98DC	U+4FD0	# <cjk>
+0x98DD	U+4FE4	# <cjk>
+0x98DE	U+4FE5	# <cjk>
+0x98DF	U+501A	# <cjk>
+0x98E0	U+5028	# <cjk>
+0x98E1	U+5014	# <cjk>
+0x98E2	U+502A	# <cjk>
+0x98E3	U+5025	# <cjk>
+0x98E4	U+5005	# <cjk>
+0x98E5	U+4F1C	# <cjk>
+0x98E6	U+4FF6	# <cjk>
+0x98E7	U+5021	# <cjk>
+0x98E8	U+5029	# <cjk>
+0x98E9	U+502C	# <cjk>
+0x98EA	U+4FFE	# <cjk>
+0x98EB	U+4FEF	# <cjk>
+0x98EC	U+5011	# <cjk>
+0x98ED	U+5006	# <cjk>
+0x98EE	U+5043	# <cjk>
+0x98EF	U+5047	# <cjk>
+0x98F0	U+6703	# <cjk>
+0x98F1	U+5055	# <cjk>
+0x98F2	U+5050	# <cjk>
+0x98F3	U+5048	# <cjk>
+0x98F4	U+505A	# <cjk>
+0x98F5	U+5056	# <cjk>
+0x98F6	U+506C	# <cjk>
+0x98F7	U+5078	# <cjk>
+0x98F8	U+5080	# <cjk>
+0x98F9	U+509A	# <cjk>
+0x98FA	U+5085	# <cjk>
+0x98FB	U+50B4	# <cjk>
+0x98FC	U+50B2	# <cjk>
+0x9940	U+50C9	# <cjk>
+0x9941	U+50CA	# <cjk>
+0x9942	U+50B3	# <cjk>
+0x9943	U+50C2	# <cjk>
+0x9944	U+50D6	# <cjk>
+0x9945	U+50DE	# <cjk>
+0x9946	U+50E5	# <cjk>
+0x9947	U+50ED	# <cjk>
+0x9948	U+50E3	# <cjk>
+0x9949	U+50EE	# <cjk>
+0x994A	U+50F9	# <cjk>
+0x994B	U+50F5	# <cjk>
+0x994C	U+5109	# <cjk>
+0x994D	U+5101	# <cjk>
+0x994E	U+5102	# <cjk>
+0x994F	U+5116	# <cjk>
+0x9950	U+5115	# <cjk>
+0x9951	U+5114	# <cjk>
+0x9952	U+511A	# <cjk>
+0x9953	U+5121	# <cjk>
+0x9954	U+513A	# <cjk>
+0x9955	U+5137	# <cjk>
+0x9956	U+513C	# <cjk>
+0x9957	U+513B	# <cjk>
+0x9958	U+513F	# <cjk>
+0x9959	U+5140	# <cjk>
+0x995A	U+5152	# <cjk>
+0x995C	U+5154	# <cjk>
+0x995D	U+5162	# <cjk>
+0x995E	U+7AF8	# <cjk>
+0x995F	U+5169	# <cjk>
+0x9960	U+516A	# <cjk>
+0x9961	U+516E	# <cjk>
+0x9962	U+5180	# <cjk>
+0x9963	U+5182	# <cjk>
+0x9964	U+56D8	# <cjk>
+0x9965	U+518C	# <cjk>
+0x9966	U+5189	# <cjk>
+0x9967	U+518F	# <cjk>
+0x9968	U+5191	# <cjk>
+0x9969	U+5193	# <cjk>
+0x996A	U+5195	# <cjk>
+0x996B	U+5196	# <cjk>
+0x996C	U+51A4	# <cjk>
+0x996D	U+51A6	# <cjk>
+0x996E	U+51A2	# <cjk>
+0x996F	U+51A9	# <cjk>
+0x9970	U+51AA	# <cjk>
+0x9971	U+51AB	# <cjk>
+0x9972	U+51B3	# <cjk>
+0x9973	U+51B1	# <cjk>
+0x9974	U+51B2	# <cjk>
+0x9975	U+51B0	# <cjk>
+0x9976	U+51B5	# <cjk>
+0x9977	U+51BD	# <cjk>
+0x9978	U+51C5	# <cjk>
+0x9979	U+51C9	# <cjk>
+0x997A	U+51DB	# <cjk>
+0x997B	U+51E0	# <cjk>
+0x997C	U+8655	# <cjk>
+0x997D	U+51E9	# <cjk>
+0x997E	U+51ED	# <cjk>
+0x9980	U+51F0	# <cjk>
+0x9981	U+51F5	# <cjk>
+0x9982	U+51FE	# <cjk>
+0x9983	U+5204	# <cjk>
+0x9984	U+520B	# <cjk>
+0x9985	U+5214	# <cjk>
+0x9986	U+520E	# <cjk>
+0x9987	U+5227	# <cjk>
+0x9988	U+522A	# <cjk>
+0x9989	U+522E	# <cjk>
+0x998A	U+5233	# <cjk>
+0x998B	U+5239	# <cjk>
+0x998C	U+524F	# <cjk>
+0x998D	U+5244	# <cjk>
+0x998E	U+524B	# <cjk>
+0x998F	U+524C	# <cjk>
+0x9990	U+525E	# <cjk>
+0x9991	U+5254	# <cjk>
+0x9992	U+526A	# <cjk>
+0x9993	U+5274	# <cjk>
+0x9994	U+5269	# <cjk>
+0x9995	U+5273	# <cjk>
+0x9996	U+527F	# <cjk>
+0x9997	U+527D	# <cjk>
+0x9998	U+528D	# <cjk>
+0x9999	U+5294	# <cjk>
+0x999A	U+5292	# <cjk>
+0x999B	U+5271	# <cjk>
+0x999C	U+5288	# <cjk>
+0x999D	U+5291	# <cjk>
+0x999E	U+8FA8	# <cjk>
+0x999F	U+8FA7	# <cjk>
+0x99A0	U+52AC	# <cjk>
+0x99A1	U+52AD	# <cjk>
+0x99A2	U+52BC	# <cjk>
+0x99A3	U+52B5	# <cjk>
+0x99A4	U+52C1	# <cjk>
+0x99A5	U+52CD	# <cjk>
+0x99A6	U+52D7	# <cjk>
+0x99A7	U+52DE	# <cjk>
+0x99A8	U+52E3	# <cjk>
+0x99A9	U+52E6	# <cjk>
+0x99AA	U+98ED	# <cjk>
+0x99AB	U+52E0	# <cjk>
+0x99AC	U+52F3	# <cjk>
+0x99AD	U+52F5	# <cjk>
+0x99AE	U+52F8	# <cjk>
+0x99AF	U+52F9	# <cjk>
+0x99B0	U+5306	# <cjk>
+0x99B1	U+5308	# <cjk>
+0x99B2	U+7538	# <cjk>
+0x99B3	U+530D	# <cjk>
+0x99B4	U+5310	# <cjk>
+0x99B5	U+530F	# <cjk>
+0x99B6	U+5315	# <cjk>
+0x99B7	U+531A	# <cjk>
+0x99B8	U+5323	# <cjk>
+0x99B9	U+532F	# <cjk>
+0x99BA	U+5331	# <cjk>
+0x99BB	U+5333	# <cjk>
+0x99BC	U+5338	# <cjk>
+0x99BD	U+5340	# <cjk>
+0x99BE	U+5346	# <cjk>
+0x99BF	U+5345	# <cjk>
+0x99C0	U+4E17	# <cjk>
+0x99C1	U+5349	# <cjk>
+0x99C2	U+534D	# <cjk>
+0x99C3	U+51D6	# <cjk>
+0x99C4	U+535E	# <cjk>
+0x99C5	U+5369	# <cjk>
+0x99C6	U+536E	# <cjk>
+0x99C7	U+5918	# <cjk>
+0x99C8	U+537B	# <cjk>
+0x99C9	U+5377	# <cjk>
+0x99CA	U+5382	# <cjk>
+0x99CB	U+5396	# <cjk>
+0x99CC	U+53A0	# <cjk>
+0x99CD	U+53A6	# <cjk>
+0x99CE	U+53A5	# <cjk>
+0x99CF	U+53AE	# <cjk>
+0x99D0	U+53B0	# <cjk>
+0x99D1	U+53B6	# <cjk>
+0x99D2	U+53C3	# <cjk>
+0x99D3	U+7C12	# <cjk>
+0x99D4	U+96D9	# <cjk>
+0x99D5	U+53DF	# <cjk>
+0x99D6	U+66FC	# <cjk>
+0x99D7	U+71EE	# <cjk>
+0x99D8	U+53EE	# <cjk>
+0x99D9	U+53E8	# <cjk>
+0x99DA	U+53ED	# <cjk>
+0x99DB	U+53FA	# <cjk>
+0x99DC	U+5401	# <cjk>
+0x99DD	U+543D	# <cjk>
+0x99DE	U+5440	# <cjk>
+0x99DF	U+542C	# <cjk>
+0x99E0	U+542D	# <cjk>
+0x99E1	U+543C	# <cjk>
+0x99E2	U+542E	# <cjk>
+0x99E3	U+5436	# <cjk>
+0x99E4	U+5429	# <cjk>
+0x99E5	U+541D	# <cjk>
+0x99E6	U+544E	# <cjk>
+0x99E7	U+548F	# <cjk>
+0x99E8	U+5475	# <cjk>
+0x99E9	U+548E	# <cjk>
+0x99EA	U+545F	# <cjk>
+0x99EB	U+5471	# <cjk>
+0x99EC	U+5477	# <cjk>
+0x99ED	U+5470	# <cjk>
+0x99EE	U+5492	# <cjk>
+0x99EF	U+547B	# <cjk>
+0x99F0	U+5480	# <cjk>
+0x99F1	U+5476	# <cjk>
+0x99F2	U+5484	# <cjk>
+0x99F3	U+5490	# <cjk>
+0x99F4	U+5486	# <cjk>
+0x99F5	U+54C7	# <cjk>
+0x99F6	U+54A2	# <cjk>
+0x99F7	U+54B8	# <cjk>
+0x99F8	U+54A5	# <cjk>
+0x99F9	U+54AC	# <cjk>
+0x99FA	U+54C4	# <cjk>
+0x99FB	U+54C8	# <cjk>
+0x99FC	U+54A8	# <cjk>
+0x9A40	U+54AB	# <cjk>
+0x9A41	U+54C2	# <cjk>
+0x9A42	U+54A4	# <cjk>
+0x9A43	U+54BE	# <cjk>
+0x9A44	U+54BC	# <cjk>
+0x9A45	U+54D8	# <cjk>
+0x9A46	U+54E5	# <cjk>
+0x9A47	U+54E6	# <cjk>
+0x9A48	U+550F	# <cjk>
+0x9A49	U+5514	# <cjk>
+0x9A4A	U+54FD	# <cjk>
+0x9A4B	U+54EE	# <cjk>
+0x9A4C	U+54ED	# <cjk>
+0x9A4D	U+54FA	# <cjk>
+0x9A4E	U+54E2	# <cjk>
+0x9A4F	U+5539	# <cjk>
+0x9A50	U+5540	# <cjk>
+0x9A51	U+5563	# <cjk>
+0x9A52	U+554C	# <cjk>
+0x9A53	U+552E	# <cjk>
+0x9A54	U+555C	# <cjk>
+0x9A55	U+5545	# <cjk>
+0x9A56	U+5556	# <cjk>
+0x9A57	U+5557	# <cjk>
+0x9A58	U+5538	# <cjk>
+0x9A59	U+5533	# <cjk>
+0x9A5A	U+555D	# <cjk>
+0x9A5C	U+5580	# <cjk>
+0x9A5D	U+54AF	# <cjk>
+0x9A5E	U+558A	# <cjk>
+0x9A5F	U+559F	# <cjk>
+0x9A60	U+557B	# <cjk>
+0x9A61	U+557E	# <cjk>
+0x9A62	U+5598	# <cjk>
+0x9A63	U+559E	# <cjk>
+0x9A64	U+55AE	# <cjk>
+0x9A65	U+557C	# <cjk>
+0x9A66	U+5583	# <cjk>
+0x9A67	U+55A9	# <cjk>
+0x9A68	U+5587	# <cjk>
+0x9A69	U+55A8	# <cjk>
+0x9A6A	U+55DA	# <cjk>
+0x9A6B	U+55C5	# <cjk>
+0x9A6C	U+55DF	# <cjk>
+0x9A6D	U+55C4	# <cjk>
+0x9A6E	U+55DC	# <cjk>
+0x9A6F	U+55E4	# <cjk>
+0x9A70	U+55D4	# <cjk>
+0x9A71	U+5614	# <cjk>
+0x9A72	U+55F7	# <cjk>
+0x9A73	U+5616	# <cjk>
+0x9A74	U+55FE	# <cjk>
+0x9A75	U+55FD	# <cjk>
+0x9A76	U+561B	# <cjk>
+0x9A77	U+55F9	# <cjk>
+0x9A78	U+564E	# <cjk>
+0x9A79	U+5650	# <cjk>
+0x9A7A	U+71DF	# <cjk>
+0x9A7B	U+5634	# <cjk>
+0x9A7C	U+5636	# <cjk>
+0x9A7D	U+5632	# <cjk>
+0x9A7E	U+5638	# <cjk>
+0x9A80	U+566B	# <cjk>
+0x9A81	U+5664	# <cjk>
+0x9A82	U+562F	# <cjk>
+0x9A83	U+566C	# <cjk>
+0x9A84	U+566A	# <cjk>
+0x9A85	U+5686	# <cjk>
+0x9A86	U+5680	# <cjk>
+0x9A87	U+568A	# <cjk>
+0x9A88	U+56A0	# <cjk>
+0x9A89	U+5694	# <cjk>
+0x9A8A	U+568F	# <cjk>
+0x9A8B	U+56A5	# <cjk>
+0x9A8C	U+56AE	# <cjk>
+0x9A8D	U+56B6	# <cjk>
+0x9A8E	U+56B4	# <cjk>
+0x9A8F	U+56C2	# <cjk>
+0x9A90	U+56BC	# <cjk>
+0x9A91	U+56C1	# <cjk>
+0x9A92	U+56C3	# <cjk>
+0x9A93	U+56C0	# <cjk>
+0x9A94	U+56C8	# <cjk>
+0x9A95	U+56CE	# <cjk>
+0x9A96	U+56D1	# <cjk>
+0x9A97	U+56D3	# <cjk>
+0x9A98	U+56D7	# <cjk>
+0x9A99	U+56EE	# <cjk>
+0x9A9A	U+56F9	# <cjk>
+0x9A9B	U+5700	# <cjk>
+0x9A9C	U+56FF	# <cjk>
+0x9A9D	U+5704	# <cjk>
+0x9A9E	U+5709	# <cjk>
+0x9A9F	U+5708	# <cjk>
+0x9AA0	U+570B	# <cjk>
+0x9AA1	U+570D	# <cjk>
+0x9AA2	U+5713	# <cjk>
+0x9AA3	U+5718	# <cjk>
+0x9AA4	U+5716	# <cjk>
+0x9AA5	U+55C7	# <cjk>
+0x9AA6	U+571C	# <cjk>
+0x9AA7	U+5726	# <cjk>
+0x9AA8	U+5737	# <cjk>
+0x9AA9	U+5738	# <cjk>
+0x9AAA	U+574E	# <cjk>
+0x9AAB	U+573B	# <cjk>
+0x9AAC	U+5740	# <cjk>
+0x9AAD	U+574F	# <cjk>
+0x9AAE	U+5769	# <cjk>
+0x9AAF	U+57C0	# <cjk>
+0x9AB0	U+5788	# <cjk>
+0x9AB1	U+5761	# <cjk>
+0x9AB2	U+577F	# <cjk>
+0x9AB3	U+5789	# <cjk>
+0x9AB4	U+5793	# <cjk>
+0x9AB5	U+57A0	# <cjk>
+0x9AB6	U+57B3	# <cjk>
+0x9AB7	U+57A4	# <cjk>
+0x9AB8	U+57AA	# <cjk>
+0x9AB9	U+57B0	# <cjk>
+0x9ABA	U+57C3	# <cjk>
+0x9ABB	U+57C6	# <cjk>
+0x9ABC	U+57D4	# <cjk>
+0x9ABD	U+57D2	# <cjk>
+0x9ABE	U+57D3	# <cjk>
+0x9ABF	U+580A	# <cjk>
+0x9AC0	U+57D6	# <cjk>
+0x9AC1	U+57E3	# <cjk>
+0x9AC2	U+580B	# <cjk>
+0x9AC3	U+5819	# <cjk>
+0x9AC4	U+581D	# <cjk>
+0x9AC5	U+5872	# <cjk>
+0x9AC6	U+5821	# <cjk>
+0x9AC7	U+5862	# <cjk>
+0x9AC8	U+584B	# <cjk>
+0x9AC9	U+5870	# <cjk>
+0x9ACA	U+6BC0	# <cjk>
+0x9ACB	U+5852	# <cjk>
+0x9ACC	U+583D	# <cjk>
+0x9ACD	U+5879	# <cjk>
+0x9ACE	U+5885	# <cjk>
+0x9ACF	U+58B9	# <cjk>
+0x9AD0	U+589F	# <cjk>
+0x9AD1	U+58AB	# <cjk>
+0x9AD2	U+58BA	# <cjk>
+0x9AD3	U+58DE	# <cjk>
+0x9AD4	U+58BB	# <cjk>
+0x9AD5	U+58B8	# <cjk>
+0x9AD6	U+58AE	# <cjk>
+0x9AD7	U+58C5	# <cjk>
+0x9AD8	U+58D3	# <cjk>
+0x9AD9	U+58D1	# <cjk>
+0x9ADA	U+58D7	# <cjk>
+0x9ADB	U+58D9	# <cjk>
+0x9ADC	U+58D8	# <cjk>
+0x9ADD	U+58E5	# <cjk>
+0x9ADE	U+58DC	# <cjk>
+0x9ADF	U+58E4	# <cjk>
+0x9AE0	U+58DF	# <cjk>
+0x9AE1	U+58EF	# <cjk>
+0x9AE2	U+58FA	# <cjk>
+0x9AE3	U+58F9	# <cjk>
+0x9AE4	U+58FB	# <cjk>
+0x9AE5	U+58FC	# <cjk>
+0x9AE6	U+58FD	# <cjk>
+0x9AE7	U+5902	# <cjk>
+0x9AE8	U+590A	# <cjk>
+0x9AE9	U+5910	# <cjk>
+0x9AEA	U+591B	# <cjk>
+0x9AEB	U+68A6	# <cjk>
+0x9AEC	U+5925	# <cjk>
+0x9AED	U+592C	# <cjk>
+0x9AEE	U+592D	# <cjk>
+0x9AEF	U+5932	# <cjk>
+0x9AF0	U+5938	# <cjk>
+0x9AF1	U+593E	# <cjk>
+0x9AF2	U+7AD2	# <cjk>
+0x9AF3	U+5955	# <cjk>
+0x9AF4	U+5950	# <cjk>
+0x9AF5	U+594E	# <cjk>
+0x9AF6	U+595A	# <cjk>
+0x9AF7	U+5958	# <cjk>
+0x9AF8	U+5962	# <cjk>
+0x9AF9	U+5960	# <cjk>
+0x9AFA	U+5967	# <cjk>
+0x9AFB	U+596C	# <cjk>
+0x9AFC	U+5969	# <cjk>
+0x9B40	U+5978	# <cjk>
+0x9B41	U+5981	# <cjk>
+0x9B42	U+599D	# <cjk>
+0x9B43	U+4F5E	# <cjk>
+0x9B44	U+4FAB	# <cjk>
+0x9B45	U+59A3	# <cjk>
+0x9B46	U+59B2	# <cjk>
+0x9B47	U+59C6	# <cjk>
+0x9B48	U+59E8	# <cjk>
+0x9B49	U+59DC	# <cjk>
+0x9B4A	U+598D	# <cjk>
+0x9B4B	U+59D9	# <cjk>
+0x9B4C	U+59DA	# <cjk>
+0x9B4D	U+5A25	# <cjk>
+0x9B4E	U+5A1F	# <cjk>
+0x9B4F	U+5A11	# <cjk>
+0x9B50	U+5A1C	# <cjk>
+0x9B51	U+5A09	# <cjk>
+0x9B52	U+5A1A	# <cjk>
+0x9B53	U+5A40	# <cjk>
+0x9B54	U+5A6C	# <cjk>
+0x9B55	U+5A49	# <cjk>
+0x9B56	U+5A35	# <cjk>
+0x9B57	U+5A36	# <cjk>
+0x9B58	U+5A62	# <cjk>
+0x9B59	U+5A6A	# <cjk>
+0x9B5A	U+5A9A	# <cjk>
+0x9B5C	U+5ABE	# <cjk>
+0x9B5D	U+5ACB	# <cjk>
+0x9B5E	U+5AC2	# <cjk>
+0x9B5F	U+5ABD	# <cjk>
+0x9B60	U+5AE3	# <cjk>
+0x9B61	U+5AD7	# <cjk>
+0x9B62	U+5AE6	# <cjk>
+0x9B63	U+5AE9	# <cjk>
+0x9B64	U+5AD6	# <cjk>
+0x9B65	U+5AFA	# <cjk>
+0x9B66	U+5AFB	# <cjk>
+0x9B67	U+5B0C	# <cjk>
+0x9B68	U+5B0B	# <cjk>
+0x9B69	U+5B16	# <cjk>
+0x9B6A	U+5B32	# <cjk>
+0x9B6B	U+5AD0	# <cjk>
+0x9B6C	U+5B2A	# <cjk>
+0x9B6D	U+5B36	# <cjk>
+0x9B6E	U+5B3E	# <cjk>
+0x9B6F	U+5B43	# <cjk>
+0x9B70	U+5B45	# <cjk>
+0x9B71	U+5B40	# <cjk>
+0x9B72	U+5B51	# <cjk>
+0x9B73	U+5B55	# <cjk>
+0x9B74	U+5B5A	# <cjk>
+0x9B75	U+5B5B	# <cjk>
+0x9B76	U+5B65	# <cjk>
+0x9B77	U+5B69	# <cjk>
+0x9B78	U+5B70	# <cjk>
+0x9B79	U+5B73	# <cjk>
+0x9B7A	U+5B75	# <cjk>
+0x9B7B	U+5B78	# <cjk>
+0x9B7C	U+6588	# <cjk>
+0x9B7D	U+5B7A	# <cjk>
+0x9B7E	U+5B80	# <cjk>
+0x9B80	U+5B83	# <cjk>
+0x9B81	U+5BA6	# <cjk>
+0x9B82	U+5BB8	# <cjk>
+0x9B83	U+5BC3	# <cjk>
+0x9B84	U+5BC7	# <cjk>
+0x9B85	U+5BC9	# <cjk>
+0x9B86	U+5BD4	# <cjk>
+0x9B87	U+5BD0	# <cjk>
+0x9B88	U+5BE4	# <cjk>
+0x9B89	U+5BE6	# <cjk>
+0x9B8A	U+5BE2	# <cjk>
+0x9B8B	U+5BDE	# <cjk>
+0x9B8C	U+5BE5	# <cjk>
+0x9B8D	U+5BEB	# <cjk>
+0x9B8E	U+5BF0	# <cjk>
+0x9B8F	U+5BF6	# <cjk>
+0x9B90	U+5BF3	# <cjk>
+0x9B91	U+5C05	# <cjk>
+0x9B92	U+5C07	# <cjk>
+0x9B93	U+5C08	# <cjk>
+0x9B94	U+5C0D	# <cjk>
+0x9B95	U+5C13	# <cjk>
+0x9B96	U+5C20	# <cjk>
+0x9B97	U+5C22	# <cjk>
+0x9B98	U+5C28	# <cjk>
+0x9B99	U+5C38	# <cjk>
+0x9B9A	U+5C39	# <cjk>
+0x9B9B	U+5C41	# <cjk>
+0x9B9C	U+5C46	# <cjk>
+0x9B9D	U+5C4E	# <cjk>
+0x9B9E	U+5C53	# <cjk>
+0x9B9F	U+5C50	# <cjk>
+0x9BA0	U+5C4F	# <cjk>
+0x9BA1	U+5B71	# <cjk>
+0x9BA2	U+5C6C	# <cjk>
+0x9BA3	U+5C6E	# <cjk>
+0x9BA4	U+4E62	# <cjk>
+0x9BA5	U+5C76	# <cjk>
+0x9BA6	U+5C79	# <cjk>
+0x9BA7	U+5C8C	# <cjk>
+0x9BA8	U+5C91	# <cjk>
+0x9BA9	U+5C94	# <cjk>
+0x9BAA	U+599B	# <cjk>
+0x9BAB	U+5CAB	# <cjk>
+0x9BAC	U+5CBB	# <cjk>
+0x9BAD	U+5CB6	# <cjk>
+0x9BAE	U+5CBC	# <cjk>
+0x9BAF	U+5CB7	# <cjk>
+0x9BB0	U+5CC5	# <cjk>
+0x9BB1	U+5CBE	# <cjk>
+0x9BB2	U+5CC7	# <cjk>
+0x9BB3	U+5CD9	# <cjk>
+0x9BB4	U+5CE9	# <cjk>
+0x9BB5	U+5CFD	# <cjk>
+0x9BB6	U+5CFA	# <cjk>
+0x9BB7	U+5CED	# <cjk>
+0x9BB8	U+5D8C	# <cjk>
+0x9BB9	U+5CEA	# <cjk>
+0x9BBA	U+5D0B	# <cjk>
+0x9BBB	U+5D15	# <cjk>
+0x9BBC	U+5D17	# <cjk>
+0x9BBD	U+5D5C	# <cjk>
+0x9BBE	U+5D1F	# <cjk>
+0x9BBF	U+5D1B	# <cjk>
+0x9BC0	U+5D11	# <cjk>
+0x9BC1	U+5D14	# <cjk>
+0x9BC2	U+5D22	# <cjk>
+0x9BC3	U+5D1A	# <cjk>
+0x9BC4	U+5D19	# <cjk>
+0x9BC5	U+5D18	# <cjk>
+0x9BC6	U+5D4C	# <cjk>
+0x9BC7	U+5D52	# <cjk>
+0x9BC8	U+5D4E	# <cjk>
+0x9BC9	U+5D4B	# <cjk>
+0x9BCA	U+5D6C	# <cjk>
+0x9BCB	U+5D73	# <cjk>
+0x9BCC	U+5D76	# <cjk>
+0x9BCD	U+5D87	# <cjk>
+0x9BCE	U+5D84	# <cjk>
+0x9BCF	U+5D82	# <cjk>
+0x9BD0	U+5DA2	# <cjk>
+0x9BD1	U+5D9D	# <cjk>
+0x9BD2	U+5DAC	# <cjk>
+0x9BD3	U+5DAE	# <cjk>
+0x9BD4	U+5DBD	# <cjk>
+0x9BD5	U+5D90	# <cjk>
+0x9BD6	U+5DB7	# <cjk>
+0x9BD7	U+5DBC	# <cjk>
+0x9BD8	U+5DC9	# <cjk>
+0x9BD9	U+5DCD	# <cjk>
+0x9BDA	U+5DD3	# <cjk>
+0x9BDB	U+5DD2	# <cjk>
+0x9BDC	U+5DD6	# <cjk>
+0x9BDD	U+5DDB	# <cjk>
+0x9BDE	U+5DEB	# <cjk>
+0x9BDF	U+5DF2	# <cjk>
+0x9BE0	U+5DF5	# <cjk>
+0x9BE1	U+5E0B	# <cjk>
+0x9BE2	U+5E1A	# <cjk>
+0x9BE3	U+5E19	# <cjk>
+0x9BE4	U+5E11	# <cjk>
+0x9BE5	U+5E1B	# <cjk>
+0x9BE6	U+5E36	# <cjk>
+0x9BE7	U+5E37	# <cjk>
+0x9BE8	U+5E44	# <cjk>
+0x9BE9	U+5E43	# <cjk>
+0x9BEA	U+5E40	# <cjk>
+0x9BEB	U+5E4E	# <cjk>
+0x9BEC	U+5E57	# <cjk>
+0x9BED	U+5E54	# <cjk>
+0x9BEE	U+5E5F	# <cjk>
+0x9BEF	U+5E62	# <cjk>
+0x9BF0	U+5E64	# <cjk>
+0x9BF1	U+5E47	# <cjk>
+0x9BF2	U+5E75	# <cjk>
+0x9BF3	U+5E76	# <cjk>
+0x9BF4	U+5E7A	# <cjk>
+0x9BF5	U+9EBC	# <cjk>
+0x9BF6	U+5E7F	# <cjk>
+0x9BF7	U+5EA0	# <cjk>
+0x9BF8	U+5EC1	# <cjk>
+0x9BF9	U+5EC2	# <cjk>
+0x9BFA	U+5EC8	# <cjk>
+0x9BFB	U+5ED0	# <cjk>
+0x9BFC	U+5ECF	# <cjk>
+0x9C40	U+5ED6	# <cjk>
+0x9C41	U+5EE3	# <cjk>
+0x9C42	U+5EDD	# <cjk>
+0x9C43	U+5EDA	# <cjk>
+0x9C44	U+5EDB	# <cjk>
+0x9C45	U+5EE2	# <cjk>
+0x9C46	U+5EE1	# <cjk>
+0x9C47	U+5EE8	# <cjk>
+0x9C48	U+5EE9	# <cjk>
+0x9C49	U+5EEC	# <cjk>
+0x9C4A	U+5EF1	# <cjk>
+0x9C4B	U+5EF3	# <cjk>
+0x9C4C	U+5EF0	# <cjk>
+0x9C4D	U+5EF4	# <cjk>
+0x9C4E	U+5EF8	# <cjk>
+0x9C4F	U+5EFE	# <cjk>
+0x9C50	U+5F03	# <cjk>
+0x9C51	U+5F09	# <cjk>
+0x9C52	U+5F5D	# <cjk>
+0x9C53	U+5F5C	# <cjk>
+0x9C54	U+5F0B	# <cjk>
+0x9C55	U+5F11	# <cjk>
+0x9C56	U+5F16	# <cjk>
+0x9C57	U+5F29	# <cjk>
+0x9C58	U+5F2D	# <cjk>
+0x9C59	U+5F38	# <cjk>
+0x9C5A	U+5F41	# <cjk>
+0x9C5C	U+5F4C	# <cjk>
+0x9C5D	U+5F4E	# <cjk>
+0x9C5E	U+5F2F	# <cjk>
+0x9C5F	U+5F51	# <cjk>
+0x9C60	U+5F56	# <cjk>
+0x9C61	U+5F57	# <cjk>
+0x9C62	U+5F59	# <cjk>
+0x9C63	U+5F61	# <cjk>
+0x9C64	U+5F6D	# <cjk>
+0x9C65	U+5F73	# <cjk>
+0x9C66	U+5F77	# <cjk>
+0x9C67	U+5F83	# <cjk>
+0x9C68	U+5F82	# <cjk>
+0x9C69	U+5F7F	# <cjk>
+0x9C6A	U+5F8A	# <cjk>
+0x9C6B	U+5F88	# <cjk>
+0x9C6C	U+5F91	# <cjk>
+0x9C6D	U+5F87	# <cjk>
+0x9C6E	U+5F9E	# <cjk>
+0x9C6F	U+5F99	# <cjk>
+0x9C70	U+5F98	# <cjk>
+0x9C71	U+5FA0	# <cjk>
+0x9C72	U+5FA8	# <cjk>
+0x9C73	U+5FAD	# <cjk>
+0x9C74	U+5FBC	# <cjk>
+0x9C75	U+5FD6	# <cjk>
+0x9C76	U+5FFB	# <cjk>
+0x9C77	U+5FE4	# <cjk>
+0x9C78	U+5FF8	# <cjk>
+0x9C79	U+5FF1	# <cjk>
+0x9C7A	U+5FDD	# <cjk>
+0x9C7B	U+60B3	# <cjk>
+0x9C7C	U+5FFF	# <cjk>
+0x9C7D	U+6021	# <cjk>
+0x9C7E	U+6060	# <cjk>
+0x9C80	U+6019	# <cjk>
+0x9C81	U+6010	# <cjk>
+0x9C82	U+6029	# <cjk>
+0x9C83	U+600E	# <cjk>
+0x9C84	U+6031	# <cjk>
+0x9C85	U+601B	# <cjk>
+0x9C86	U+6015	# <cjk>
+0x9C87	U+602B	# <cjk>
+0x9C88	U+6026	# <cjk>
+0x9C89	U+600F	# <cjk>
+0x9C8A	U+603A	# <cjk>
+0x9C8B	U+605A	# <cjk>
+0x9C8C	U+6041	# <cjk>
+0x9C8D	U+606A	# <cjk>
+0x9C8E	U+6077	# <cjk>
+0x9C8F	U+605F	# <cjk>
+0x9C90	U+604A	# <cjk>
+0x9C91	U+6046	# <cjk>
+0x9C92	U+604D	# <cjk>
+0x9C93	U+6063	# <cjk>
+0x9C94	U+6043	# <cjk>
+0x9C95	U+6064	# <cjk>
+0x9C96	U+6042	# <cjk>
+0x9C97	U+606C	# <cjk>
+0x9C98	U+606B	# <cjk>
+0x9C99	U+6059	# <cjk>
+0x9C9A	U+6081	# <cjk>
+0x9C9B	U+608D	# <cjk>
+0x9C9C	U+60E7	# <cjk>
+0x9C9D	U+6083	# <cjk>
+0x9C9E	U+609A	# <cjk>
+0x9C9F	U+6084	# <cjk>
+0x9CA0	U+609B	# <cjk>
+0x9CA1	U+6096	# <cjk>
+0x9CA2	U+6097	# <cjk>
+0x9CA3	U+6092	# <cjk>
+0x9CA4	U+60A7	# <cjk>
+0x9CA5	U+608B	# <cjk>
+0x9CA6	U+60E1	# <cjk>
+0x9CA7	U+60B8	# <cjk>
+0x9CA8	U+60E0	# <cjk>
+0x9CA9	U+60D3	# <cjk>
+0x9CAA	U+60B4	# <cjk>
+0x9CAB	U+5FF0	# <cjk>
+0x9CAC	U+60BD	# <cjk>
+0x9CAD	U+60C6	# <cjk>
+0x9CAE	U+60B5	# <cjk>
+0x9CAF	U+60D8	# <cjk>
+0x9CB0	U+614D	# <cjk>
+0x9CB1	U+6115	# <cjk>
+0x9CB2	U+6106	# <cjk>
+0x9CB3	U+60F6	# <cjk>
+0x9CB4	U+60F7	# <cjk>
+0x9CB5	U+6100	# <cjk>
+0x9CB6	U+60F4	# <cjk>
+0x9CB7	U+60FA	# <cjk>
+0x9CB8	U+6103	# <cjk>
+0x9CB9	U+6121	# <cjk>
+0x9CBA	U+60FB	# <cjk>
+0x9CBB	U+60F1	# <cjk>
+0x9CBC	U+610D	# <cjk>
+0x9CBD	U+610E	# <cjk>
+0x9CBE	U+6147	# <cjk>
+0x9CBF	U+613E	# <cjk>
+0x9CC0	U+6128	# <cjk>
+0x9CC1	U+6127	# <cjk>
+0x9CC2	U+614A	# <cjk>
+0x9CC3	U+613F	# <cjk>
+0x9CC4	U+613C	# <cjk>
+0x9CC5	U+612C	# <cjk>
+0x9CC6	U+6134	# <cjk>
+0x9CC7	U+613D	# <cjk>
+0x9CC8	U+6142	# <cjk>
+0x9CC9	U+6144	# <cjk>
+0x9CCA	U+6173	# <cjk>
+0x9CCB	U+6177	# <cjk>
+0x9CCC	U+6158	# <cjk>
+0x9CCD	U+6159	# <cjk>
+0x9CCE	U+615A	# <cjk>
+0x9CCF	U+616B	# <cjk>
+0x9CD0	U+6174	# <cjk>
+0x9CD1	U+616F	# <cjk>
+0x9CD2	U+6165	# <cjk>
+0x9CD3	U+6171	# <cjk>
+0x9CD4	U+615F	# <cjk>
+0x9CD5	U+615D	# <cjk>
+0x9CD6	U+6153	# <cjk>
+0x9CD7	U+6175	# <cjk>
+0x9CD8	U+6199	# <cjk>
+0x9CD9	U+6196	# <cjk>
+0x9CDA	U+6187	# <cjk>
+0x9CDB	U+61AC	# <cjk>
+0x9CDC	U+6194	# <cjk>
+0x9CDD	U+619A	# <cjk>
+0x9CDE	U+618A	# <cjk>
+0x9CDF	U+6191	# <cjk>
+0x9CE0	U+61AB	# <cjk>
+0x9CE1	U+61AE	# <cjk>
+0x9CE2	U+61CC	# <cjk>
+0x9CE3	U+61CA	# <cjk>
+0x9CE4	U+61C9	# <cjk>
+0x9CE5	U+61F7	# <cjk>
+0x9CE6	U+61C8	# <cjk>
+0x9CE7	U+61C3	# <cjk>
+0x9CE8	U+61C6	# <cjk>
+0x9CE9	U+61BA	# <cjk>
+0x9CEA	U+61CB	# <cjk>
+0x9CEB	U+7F79	# <cjk>
+0x9CEC	U+61CD	# <cjk>
+0x9CED	U+61E6	# <cjk>
+0x9CEE	U+61E3	# <cjk>
+0x9CEF	U+61F6	# <cjk>
+0x9CF0	U+61FA	# <cjk>
+0x9CF1	U+61F4	# <cjk>
+0x9CF2	U+61FF	# <cjk>
+0x9CF3	U+61FD	# <cjk>
+0x9CF4	U+61FC	# <cjk>
+0x9CF5	U+61FE	# <cjk>
+0x9CF6	U+6200	# <cjk>
+0x9CF7	U+6208	# <cjk>
+0x9CF8	U+6209	# <cjk>
+0x9CF9	U+620D	# <cjk>
+0x9CFA	U+620C	# <cjk>
+0x9CFB	U+6214	# <cjk>
+0x9CFC	U+621B	# <cjk>
+0x9D40	U+621E	# <cjk>
+0x9D41	U+6221	# <cjk>
+0x9D42	U+622A	# <cjk>
+0x9D43	U+622E	# <cjk>
+0x9D44	U+6230	# <cjk>
+0x9D45	U+6232	# <cjk>
+0x9D46	U+6233	# <cjk>
+0x9D47	U+6241	# <cjk>
+0x9D48	U+624E	# <cjk>
+0x9D49	U+625E	# <cjk>
+0x9D4A	U+6263	# <cjk>
+0x9D4B	U+625B	# <cjk>
+0x9D4C	U+6260	# <cjk>
+0x9D4D	U+6268	# <cjk>
+0x9D4E	U+627C	# <cjk>
+0x9D4F	U+6282	# <cjk>
+0x9D50	U+6289	# <cjk>
+0x9D51	U+627E	# <cjk>
+0x9D52	U+6292	# <cjk>
+0x9D53	U+6293	# <cjk>
+0x9D54	U+6296	# <cjk>
+0x9D55	U+62D4	# <cjk>
+0x9D56	U+6283	# <cjk>
+0x9D57	U+6294	# <cjk>
+0x9D58	U+62D7	# <cjk>
+0x9D59	U+62D1	# <cjk>
+0x9D5A	U+62BB	# <cjk>
+0x9D5C	U+62FF	# <cjk>
+0x9D5D	U+62C6	# <cjk>
+0x9D5E	U+64D4	# <cjk>
+0x9D5F	U+62C8	# <cjk>
+0x9D60	U+62DC	# <cjk>
+0x9D61	U+62CC	# <cjk>
+0x9D62	U+62CA	# <cjk>
+0x9D63	U+62C2	# <cjk>
+0x9D64	U+62C7	# <cjk>
+0x9D65	U+629B	# <cjk>
+0x9D66	U+62C9	# <cjk>
+0x9D67	U+630C	# <cjk>
+0x9D68	U+62EE	# <cjk>
+0x9D69	U+62F1	# <cjk>
+0x9D6A	U+6327	# <cjk>
+0x9D6B	U+6302	# <cjk>
+0x9D6C	U+6308	# <cjk>
+0x9D6D	U+62EF	# <cjk>
+0x9D6E	U+62F5	# <cjk>
+0x9D6F	U+6350	# <cjk>
+0x9D70	U+633E	# <cjk>
+0x9D71	U+634D	# <cjk>
+0x9D72	U+641C	# <cjk>
+0x9D73	U+634F	# <cjk>
+0x9D74	U+6396	# <cjk>
+0x9D75	U+638E	# <cjk>
+0x9D76	U+6380	# <cjk>
+0x9D77	U+63AB	# <cjk>
+0x9D78	U+6376	# <cjk>
+0x9D79	U+63A3	# <cjk>
+0x9D7A	U+638F	# <cjk>
+0x9D7B	U+6389	# <cjk>
+0x9D7C	U+639F	# <cjk>
+0x9D7D	U+63B5	# <cjk>
+0x9D7E	U+636B	# <cjk>
+0x9D80	U+6369	# <cjk>
+0x9D81	U+63BE	# <cjk>
+0x9D82	U+63E9	# <cjk>
+0x9D83	U+63C0	# <cjk>
+0x9D84	U+63C6	# <cjk>
+0x9D85	U+63E3	# <cjk>
+0x9D86	U+63C9	# <cjk>
+0x9D87	U+63D2	# <cjk>
+0x9D88	U+63F6	# <cjk>
+0x9D89	U+63C4	# <cjk>
+0x9D8A	U+6416	# <cjk>
+0x9D8B	U+6434	# <cjk>
+0x9D8C	U+6406	# <cjk>
+0x9D8D	U+6413	# <cjk>
+0x9D8E	U+6426	# <cjk>
+0x9D8F	U+6436	# <cjk>
+0x9D90	U+651D	# <cjk>
+0x9D91	U+6417	# <cjk>
+0x9D92	U+6428	# <cjk>
+0x9D93	U+640F	# <cjk>
+0x9D94	U+6467	# <cjk>
+0x9D95	U+646F	# <cjk>
+0x9D96	U+6476	# <cjk>
+0x9D97	U+644E	# <cjk>
+0x9D98	U+652A	# <cjk>
+0x9D99	U+6495	# <cjk>
+0x9D9A	U+6493	# <cjk>
+0x9D9B	U+64A5	# <cjk>
+0x9D9C	U+64A9	# <cjk>
+0x9D9D	U+6488	# <cjk>
+0x9D9E	U+64BC	# <cjk>
+0x9D9F	U+64DA	# <cjk>
+0x9DA0	U+64D2	# <cjk>
+0x9DA1	U+64C5	# <cjk>
+0x9DA2	U+64C7	# <cjk>
+0x9DA3	U+64BB	# <cjk>
+0x9DA4	U+64D8	# <cjk>
+0x9DA5	U+64C2	# <cjk>
+0x9DA6	U+64F1	# <cjk>
+0x9DA7	U+64E7	# <cjk>
+0x9DA8	U+8209	# <cjk>
+0x9DA9	U+64E0	# <cjk>
+0x9DAA	U+64E1	# <cjk>
+0x9DAB	U+62AC	# <cjk>
+0x9DAC	U+64E3	# <cjk>
+0x9DAD	U+64EF	# <cjk>
+0x9DAE	U+652C	# <cjk>
+0x9DAF	U+64F6	# <cjk>
+0x9DB0	U+64F4	# <cjk>
+0x9DB1	U+64F2	# <cjk>
+0x9DB2	U+64FA	# <cjk>
+0x9DB3	U+6500	# <cjk>
+0x9DB4	U+64FD	# <cjk>
+0x9DB5	U+6518	# <cjk>
+0x9DB6	U+651C	# <cjk>
+0x9DB7	U+6505	# <cjk>
+0x9DB8	U+6524	# <cjk>
+0x9DB9	U+6523	# <cjk>
+0x9DBA	U+652B	# <cjk>
+0x9DBB	U+6534	# <cjk>
+0x9DBC	U+6535	# <cjk>
+0x9DBD	U+6537	# <cjk>
+0x9DBE	U+6536	# <cjk>
+0x9DBF	U+6538	# <cjk>
+0x9DC0	U+754B	# <cjk>
+0x9DC1	U+6548	# <cjk>
+0x9DC2	U+6556	# <cjk>
+0x9DC3	U+6555	# <cjk>
+0x9DC4	U+654D	# <cjk>
+0x9DC5	U+6558	# <cjk>
+0x9DC6	U+655E	# <cjk>
+0x9DC7	U+655D	# <cjk>
+0x9DC8	U+6572	# <cjk>
+0x9DC9	U+6578	# <cjk>
+0x9DCA	U+6582	# <cjk>
+0x9DCB	U+6583	# <cjk>
+0x9DCC	U+8B8A	# <cjk>
+0x9DCD	U+659B	# <cjk>
+0x9DCE	U+659F	# <cjk>
+0x9DCF	U+65AB	# <cjk>
+0x9DD0	U+65B7	# <cjk>
+0x9DD1	U+65C3	# <cjk>
+0x9DD2	U+65C6	# <cjk>
+0x9DD3	U+65C1	# <cjk>
+0x9DD4	U+65C4	# <cjk>
+0x9DD5	U+65CC	# <cjk>
+0x9DD6	U+65D2	# <cjk>
+0x9DD7	U+65DB	# <cjk>
+0x9DD8	U+65D9	# <cjk>
+0x9DD9	U+65E0	# <cjk>
+0x9DDA	U+65E1	# <cjk>
+0x9DDB	U+65F1	# <cjk>
+0x9DDC	U+6772	# <cjk>
+0x9DDD	U+660A	# <cjk>
+0x9DDE	U+6603	# <cjk>
+0x9DDF	U+65FB	# <cjk>
+0x9DE0	U+6773	# <cjk>
+0x9DE1	U+6635	# <cjk>
+0x9DE2	U+6636	# <cjk>
+0x9DE3	U+6634	# <cjk>
+0x9DE4	U+661C	# <cjk>
+0x9DE5	U+664F	# <cjk>
+0x9DE6	U+6644	# <cjk>
+0x9DE7	U+6649	# <cjk>
+0x9DE8	U+6641	# <cjk>
+0x9DE9	U+665E	# <cjk>
+0x9DEA	U+665D	# <cjk>
+0x9DEB	U+6664	# <cjk>
+0x9DEC	U+6667	# <cjk>
+0x9DED	U+6668	# <cjk>
+0x9DEE	U+665F	# <cjk>
+0x9DEF	U+6662	# <cjk>
+0x9DF0	U+6670	# <cjk>
+0x9DF1	U+6683	# <cjk>
+0x9DF2	U+6688	# <cjk>
+0x9DF3	U+668E	# <cjk>
+0x9DF4	U+6689	# <cjk>
+0x9DF5	U+6684	# <cjk>
+0x9DF6	U+6698	# <cjk>
+0x9DF7	U+669D	# <cjk>
+0x9DF8	U+66C1	# <cjk>
+0x9DF9	U+66B9	# <cjk>
+0x9DFA	U+66C9	# <cjk>
+0x9DFB	U+66BE	# <cjk>
+0x9DFC	U+66BC	# <cjk>
+0x9E40	U+66C4	# <cjk>
+0x9E41	U+66B8	# <cjk>
+0x9E42	U+66D6	# <cjk>
+0x9E43	U+66DA	# <cjk>
+0x9E44	U+66E0	# <cjk>
+0x9E45	U+663F	# <cjk>
+0x9E46	U+66E6	# <cjk>
+0x9E47	U+66E9	# <cjk>
+0x9E48	U+66F0	# <cjk>
+0x9E49	U+66F5	# <cjk>
+0x9E4A	U+66F7	# <cjk>
+0x9E4B	U+670F	# <cjk>
+0x9E4C	U+6716	# <cjk>
+0x9E4D	U+671E	# <cjk>
+0x9E4E	U+6726	# <cjk>
+0x9E4F	U+6727	# <cjk>
+0x9E50	U+9738	# <cjk>
+0x9E51	U+672E	# <cjk>
+0x9E52	U+673F	# <cjk>
+0x9E53	U+6736	# <cjk>
+0x9E54	U+6741	# <cjk>
+0x9E55	U+6738	# <cjk>
+0x9E56	U+6737	# <cjk>
+0x9E57	U+6746	# <cjk>
+0x9E58	U+675E	# <cjk>
+0x9E59	U+6760	# <cjk>
+0x9E5A	U+6759	# <cjk>
+0x9E5C	U+6764	# <cjk>
+0x9E5D	U+6789	# <cjk>
+0x9E5E	U+6770	# <cjk>
+0x9E5F	U+67A9	# <cjk>
+0x9E60	U+677C	# <cjk>
+0x9E61	U+676A	# <cjk>
+0x9E62	U+678C	# <cjk>
+0x9E63	U+678B	# <cjk>
+0x9E64	U+67A6	# <cjk>
+0x9E65	U+67A1	# <cjk>
+0x9E66	U+6785	# <cjk>
+0x9E67	U+67B7	# <cjk>
+0x9E68	U+67EF	# <cjk>
+0x9E69	U+67B4	# <cjk>
+0x9E6A	U+67EC	# <cjk>
+0x9E6B	U+67B3	# <cjk>
+0x9E6C	U+67E9	# <cjk>
+0x9E6D	U+67B8	# <cjk>
+0x9E6E	U+67E4	# <cjk>
+0x9E6F	U+67DE	# <cjk>
+0x9E70	U+67DD	# <cjk>
+0x9E71	U+67E2	# <cjk>
+0x9E72	U+67EE	# <cjk>
+0x9E73	U+67B9	# <cjk>
+0x9E74	U+67CE	# <cjk>
+0x9E75	U+67C6	# <cjk>
+0x9E76	U+67E7	# <cjk>
+0x9E77	U+6A9C	# <cjk>
+0x9E78	U+681E	# <cjk>
+0x9E79	U+6846	# <cjk>
+0x9E7A	U+6829	# <cjk>
+0x9E7B	U+6840	# <cjk>
+0x9E7C	U+684D	# <cjk>
+0x9E7D	U+6832	# <cjk>
+0x9E7E	U+684E	# <cjk>
+0x9E80	U+68B3	# <cjk>
+0x9E81	U+682B	# <cjk>
+0x9E82	U+6859	# <cjk>
+0x9E83	U+6863	# <cjk>
+0x9E84	U+6877	# <cjk>
+0x9E85	U+687F	# <cjk>
+0x9E86	U+689F	# <cjk>
+0x9E87	U+688F	# <cjk>
+0x9E88	U+68AD	# <cjk>
+0x9E89	U+6894	# <cjk>
+0x9E8A	U+689D	# <cjk>
+0x9E8B	U+689B	# <cjk>
+0x9E8C	U+6883	# <cjk>
+0x9E8D	U+6AAE	# <cjk>
+0x9E8E	U+68B9	# <cjk>
+0x9E8F	U+6874	# <cjk>
+0x9E90	U+68B5	# <cjk>
+0x9E91	U+68A0	# <cjk>
+0x9E92	U+68BA	# <cjk>
+0x9E93	U+690F	# <cjk>
+0x9E94	U+688D	# <cjk>
+0x9E95	U+687E	# <cjk>
+0x9E96	U+6901	# <cjk>
+0x9E97	U+68CA	# <cjk>
+0x9E98	U+6908	# <cjk>
+0x9E99	U+68D8	# <cjk>
+0x9E9A	U+6922	# <cjk>
+0x9E9B	U+6926	# <cjk>
+0x9E9C	U+68E1	# <cjk>
+0x9E9D	U+690C	# <cjk>
+0x9E9E	U+68CD	# <cjk>
+0x9E9F	U+68D4	# <cjk>
+0x9EA0	U+68E7	# <cjk>
+0x9EA1	U+68D5	# <cjk>
+0x9EA2	U+6936	# <cjk>
+0x9EA3	U+6912	# <cjk>
+0x9EA4	U+6904	# <cjk>
+0x9EA5	U+68D7	# <cjk>
+0x9EA6	U+68E3	# <cjk>
+0x9EA7	U+6925	# <cjk>
+0x9EA8	U+68F9	# <cjk>
+0x9EA9	U+68E0	# <cjk>
+0x9EAA	U+68EF	# <cjk>
+0x9EAB	U+6928	# <cjk>
+0x9EAC	U+692A	# <cjk>
+0x9EAD	U+691A	# <cjk>
+0x9EAE	U+6923	# <cjk>
+0x9EAF	U+6921	# <cjk>
+0x9EB0	U+68C6	# <cjk>
+0x9EB1	U+6979	# <cjk>
+0x9EB2	U+6977	# <cjk>
+0x9EB3	U+695C	# <cjk>
+0x9EB4	U+6978	# <cjk>
+0x9EB5	U+696B	# <cjk>
+0x9EB6	U+6954	# <cjk>
+0x9EB7	U+697E	# <cjk>
+0x9EB8	U+696E	# <cjk>
+0x9EB9	U+6939	# <cjk>
+0x9EBA	U+6974	# <cjk>
+0x9EBB	U+693D	# <cjk>
+0x9EBC	U+6959	# <cjk>
+0x9EBD	U+6930	# <cjk>
+0x9EBE	U+6961	# <cjk>
+0x9EBF	U+695E	# <cjk>
+0x9EC0	U+695D	# <cjk>
+0x9EC1	U+6981	# <cjk>
+0x9EC2	U+696A	# <cjk>
+0x9EC3	U+69B2	# <cjk>
+0x9EC4	U+69AE	# <cjk>
+0x9EC5	U+69D0	# <cjk>
+0x9EC6	U+69BF	# <cjk>
+0x9EC7	U+69C1	# <cjk>
+0x9EC8	U+69D3	# <cjk>
+0x9EC9	U+69BE	# <cjk>
+0x9ECA	U+69CE	# <cjk>
+0x9ECB	U+5BE8	# <cjk>
+0x9ECC	U+69CA	# <cjk>
+0x9ECD	U+69DD	# <cjk>
+0x9ECE	U+69BB	# <cjk>
+0x9ECF	U+69C3	# <cjk>
+0x9ED0	U+69A7	# <cjk>
+0x9ED1	U+6A2E	# <cjk>
+0x9ED2	U+6991	# <cjk>
+0x9ED3	U+69A0	# <cjk>
+0x9ED4	U+699C	# <cjk>
+0x9ED5	U+6995	# <cjk>
+0x9ED6	U+69B4	# <cjk>
+0x9ED7	U+69DE	# <cjk>
+0x9ED8	U+69E8	# <cjk>
+0x9ED9	U+6A02	# <cjk>
+0x9EDA	U+6A1B	# <cjk>
+0x9EDB	U+69FF	# <cjk>
+0x9EDC	U+6B0A	# <cjk>
+0x9EDD	U+69F9	# <cjk>
+0x9EDE	U+69F2	# <cjk>
+0x9EDF	U+69E7	# <cjk>
+0x9EE0	U+6A05	# <cjk>
+0x9EE1	U+69B1	# <cjk>
+0x9EE2	U+6A1E	# <cjk>
+0x9EE3	U+69ED	# <cjk>
+0x9EE4	U+6A14	# <cjk>
+0x9EE5	U+69EB	# <cjk>
+0x9EE6	U+6A0A	# <cjk>
+0x9EE7	U+6A12	# <cjk>
+0x9EE8	U+6AC1	# <cjk>
+0x9EE9	U+6A23	# <cjk>
+0x9EEA	U+6A13	# <cjk>
+0x9EEB	U+6A44	# <cjk>
+0x9EEC	U+6A0C	# <cjk>
+0x9EED	U+6A72	# <cjk>
+0x9EEE	U+6A36	# <cjk>
+0x9EEF	U+6A78	# <cjk>
+0x9EF0	U+6A47	# <cjk>
+0x9EF1	U+6A62	# <cjk>
+0x9EF2	U+6A59	# <cjk>
+0x9EF3	U+6A66	# <cjk>
+0x9EF4	U+6A48	# <cjk>
+0x9EF5	U+6A38	# <cjk>
+0x9EF6	U+6A22	# <cjk>
+0x9EF7	U+6A90	# <cjk>
+0x9EF8	U+6A8D	# <cjk>
+0x9EF9	U+6AA0	# <cjk>
+0x9EFA	U+6A84	# <cjk>
+0x9EFB	U+6AA2	# <cjk>
+0x9EFC	U+6AA3	# <cjk>
+0x9F40	U+6A97	# <cjk>
+0x9F41	U+8617	# <cjk>
+0x9F42	U+6ABB	# <cjk>
+0x9F43	U+6AC3	# <cjk>
+0x9F44	U+6AC2	# <cjk>
+0x9F45	U+6AB8	# <cjk>
+0x9F46	U+6AB3	# <cjk>
+0x9F47	U+6AAC	# <cjk>
+0x9F48	U+6ADE	# <cjk>
+0x9F49	U+6AD1	# <cjk>
+0x9F4A	U+6ADF	# <cjk>
+0x9F4B	U+6AAA	# <cjk>
+0x9F4C	U+6ADA	# <cjk>
+0x9F4D	U+6AEA	# <cjk>
+0x9F4E	U+6AFB	# <cjk>
+0x9F4F	U+6B05	# <cjk>
+0x9F50	U+8616	# <cjk>
+0x9F51	U+6AFA	# <cjk>
+0x9F52	U+6B12	# <cjk>
+0x9F53	U+6B16	# <cjk>
+0x9F54	U+9B31	# <cjk>
+0x9F55	U+6B1F	# <cjk>
+0x9F56	U+6B38	# <cjk>
+0x9F57	U+6B37	# <cjk>
+0x9F58	U+76DC	# <cjk>
+0x9F59	U+6B39	# <cjk>
+0x9F5A	U+98EE	# <cjk>
+0x9F5C	U+6B43	# <cjk>
+0x9F5D	U+6B49	# <cjk>
+0x9F5E	U+6B50	# <cjk>
+0x9F5F	U+6B59	# <cjk>
+0x9F60	U+6B54	# <cjk>
+0x9F61	U+6B5B	# <cjk>
+0x9F62	U+6B5F	# <cjk>
+0x9F63	U+6B61	# <cjk>
+0x9F64	U+6B78	# <cjk>
+0x9F65	U+6B79	# <cjk>
+0x9F66	U+6B7F	# <cjk>
+0x9F67	U+6B80	# <cjk>
+0x9F68	U+6B84	# <cjk>
+0x9F69	U+6B83	# <cjk>
+0x9F6A	U+6B8D	# <cjk>
+0x9F6B	U+6B98	# <cjk>
+0x9F6C	U+6B95	# <cjk>
+0x9F6D	U+6B9E	# <cjk>
+0x9F6E	U+6BA4	# <cjk>
+0x9F6F	U+6BAA	# <cjk>
+0x9F70	U+6BAB	# <cjk>
+0x9F71	U+6BAF	# <cjk>
+0x9F72	U+6BB2	# <cjk>
+0x9F73	U+6BB1	# <cjk>
+0x9F74	U+6BB3	# <cjk>
+0x9F75	U+6BB7	# <cjk>
+0x9F76	U+6BBC	# <cjk>
+0x9F77	U+6BC6	# <cjk>
+0x9F78	U+6BCB	# <cjk>
+0x9F79	U+6BD3	# <cjk>
+0x9F7A	U+6BDF	# <cjk>
+0x9F7B	U+6BEC	# <cjk>
+0x9F7C	U+6BEB	# <cjk>
+0x9F7D	U+6BF3	# <cjk>
+0x9F7E	U+6BEF	# <cjk>
+0x9F80	U+9EBE	# <cjk>
+0x9F81	U+6C08	# <cjk>
+0x9F82	U+6C13	# <cjk>
+0x9F83	U+6C14	# <cjk>
+0x9F84	U+6C1B	# <cjk>
+0x9F85	U+6C24	# <cjk>
+0x9F86	U+6C23	# <cjk>
+0x9F87	U+6C5E	# <cjk>
+0x9F88	U+6C55	# <cjk>
+0x9F89	U+6C62	# <cjk>
+0x9F8A	U+6C6A	# <cjk>
+0x9F8B	U+6C82	# <cjk>
+0x9F8C	U+6C8D	# <cjk>
+0x9F8D	U+6C9A	# <cjk>
+0x9F8E	U+6C81	# <cjk>
+0x9F8F	U+6C9B	# <cjk>
+0x9F90	U+6C7E	# <cjk>
+0x9F91	U+6C68	# <cjk>
+0x9F92	U+6C73	# <cjk>
+0x9F93	U+6C92	# <cjk>
+0x9F94	U+6C90	# <cjk>
+0x9F95	U+6CC4	# <cjk>
+0x9F96	U+6CF1	# <cjk>
+0x9F97	U+6CD3	# <cjk>
+0x9F98	U+6CBD	# <cjk>
+0x9F99	U+6CD7	# <cjk>
+0x9F9A	U+6CC5	# <cjk>
+0x9F9B	U+6CDD	# <cjk>
+0x9F9C	U+6CAE	# <cjk>
+0x9F9D	U+6CB1	# <cjk>
+0x9F9E	U+6CBE	# <cjk>
+0x9F9F	U+6CBA	# <cjk>
+0x9FA0	U+6CDB	# <cjk>
+0x9FA1	U+6CEF	# <cjk>
+0x9FA2	U+6CD9	# <cjk>
+0x9FA3	U+6CEA	# <cjk>
+0x9FA4	U+6D1F	# <cjk>
+0x9FA5	U+884D	# <cjk>
+0x9FA6	U+6D36	# <cjk>
+0x9FA7	U+6D2B	# <cjk>
+0x9FA8	U+6D3D	# <cjk>
+0x9FA9	U+6D38	# <cjk>
+0x9FAA	U+6D19	# <cjk>
+0x9FAB	U+6D35	# <cjk>
+0x9FAC	U+6D33	# <cjk>
+0x9FAD	U+6D12	# <cjk>
+0x9FAE	U+6D0C	# <cjk>
+0x9FAF	U+6D63	# <cjk>
+0x9FB0	U+6D93	# <cjk>
+0x9FB1	U+6D64	# <cjk>
+0x9FB2	U+6D5A	# <cjk>
+0x9FB3	U+6D79	# <cjk>
+0x9FB4	U+6D59	# <cjk>
+0x9FB5	U+6D8E	# <cjk>
+0x9FB6	U+6D95	# <cjk>
+0x9FB7	U+6FE4	# <cjk>
+0x9FB8	U+6D85	# <cjk>
+0x9FB9	U+6DF9	# <cjk>
+0x9FBA	U+6E15	# <cjk>
+0x9FBB	U+6E0A	# <cjk>
+0x9FBC	U+6DB5	# <cjk>
+0x9FBD	U+6DC7	# <cjk>
+0x9FBE	U+6DE6	# <cjk>
+0x9FBF	U+6DB8	# <cjk>
+0x9FC0	U+6DC6	# <cjk>
+0x9FC1	U+6DEC	# <cjk>
+0x9FC2	U+6DDE	# <cjk>
+0x9FC3	U+6DCC	# <cjk>
+0x9FC4	U+6DE8	# <cjk>
+0x9FC5	U+6DD2	# <cjk>
+0x9FC6	U+6DC5	# <cjk>
+0x9FC7	U+6DFA	# <cjk>
+0x9FC8	U+6DD9	# <cjk>
+0x9FC9	U+6DE4	# <cjk>
+0x9FCA	U+6DD5	# <cjk>
+0x9FCB	U+6DEA	# <cjk>
+0x9FCC	U+6DEE	# <cjk>
+0x9FCD	U+6E2D	# <cjk>
+0x9FCE	U+6E6E	# <cjk>
+0x9FCF	U+6E2E	# <cjk>
+0x9FD0	U+6E19	# <cjk>
+0x9FD1	U+6E72	# <cjk>
+0x9FD2	U+6E5F	# <cjk>
+0x9FD3	U+6E3E	# <cjk>
+0x9FD4	U+6E23	# <cjk>
+0x9FD5	U+6E6B	# <cjk>
+0x9FD6	U+6E2B	# <cjk>
+0x9FD7	U+6E76	# <cjk>
+0x9FD8	U+6E4D	# <cjk>
+0x9FD9	U+6E1F	# <cjk>
+0x9FDA	U+6E43	# <cjk>
+0x9FDB	U+6E3A	# <cjk>
+0x9FDC	U+6E4E	# <cjk>
+0x9FDD	U+6E24	# <cjk>
+0x9FDE	U+6EFF	# <cjk>
+0x9FDF	U+6E1D	# <cjk>
+0x9FE0	U+6E38	# <cjk>
+0x9FE1	U+6E82	# <cjk>
+0x9FE2	U+6EAA	# <cjk>
+0x9FE3	U+6E98	# <cjk>
+0x9FE4	U+6EC9	# <cjk>
+0x9FE5	U+6EB7	# <cjk>
+0x9FE6	U+6ED3	# <cjk>
+0x9FE7	U+6EBD	# <cjk>
+0x9FE8	U+6EAF	# <cjk>
+0x9FE9	U+6EC4	# <cjk>
+0x9FEA	U+6EB2	# <cjk>
+0x9FEB	U+6ED4	# <cjk>
+0x9FEC	U+6ED5	# <cjk>
+0x9FED	U+6E8F	# <cjk>
+0x9FEE	U+6EA5	# <cjk>
+0x9FEF	U+6EC2	# <cjk>
+0x9FF0	U+6E9F	# <cjk>
+0x9FF1	U+6F41	# <cjk>
+0x9FF2	U+6F11	# <cjk>
+0x9FF3	U+704C	# <cjk>
+0x9FF4	U+6EEC	# <cjk>
+0x9FF5	U+6EF8	# <cjk>
+0x9FF6	U+6EFE	# <cjk>
+0x9FF7	U+6F3F	# <cjk>
+0x9FF8	U+6EF2	# <cjk>
+0x9FF9	U+6F31	# <cjk>
+0x9FFA	U+6EEF	# <cjk>
+0x9FFB	U+6F32	# <cjk>
+0x9FFC	U+6ECC	# <cjk>
+0xE040	U+6F3E	# <cjk>
+0xE041	U+6F13	# <cjk>
+0xE042	U+6EF7	# <cjk>
+0xE043	U+6F86	# <cjk>
+0xE044	U+6F7A	# <cjk>
+0xE045	U+6F78	# <cjk>
+0xE046	U+6F81	# <cjk>
+0xE047	U+6F80	# <cjk>
+0xE048	U+6F6F	# <cjk>
+0xE049	U+6F5B	# <cjk>
+0xE04A	U+6FF3	# <cjk>
+0xE04B	U+6F6D	# <cjk>
+0xE04C	U+6F82	# <cjk>
+0xE04D	U+6F7C	# <cjk>
+0xE04E	U+6F58	# <cjk>
+0xE04F	U+6F8E	# <cjk>
+0xE050	U+6F91	# <cjk>
+0xE051	U+6FC2	# <cjk>
+0xE052	U+6F66	# <cjk>
+0xE053	U+6FB3	# <cjk>
+0xE054	U+6FA3	# <cjk>
+0xE055	U+6FA1	# <cjk>
+0xE056	U+6FA4	# <cjk>
+0xE057	U+6FB9	# <cjk>
+0xE058	U+6FC6	# <cjk>
+0xE059	U+6FAA	# <cjk>
+0xE05A	U+6FDF	# <cjk>
+0xE05C	U+6FEC	# <cjk>
+0xE05D	U+6FD4	# <cjk>
+0xE05E	U+6FD8	# <cjk>
+0xE05F	U+6FF1	# <cjk>
+0xE060	U+6FEE	# <cjk>
+0xE061	U+6FDB	# <cjk>
+0xE062	U+7009	# <cjk>
+0xE063	U+700B	# <cjk>
+0xE064	U+6FFA	# <cjk>
+0xE065	U+7011	# <cjk>
+0xE066	U+7001	# <cjk>
+0xE067	U+700F	# <cjk>
+0xE068	U+6FFE	# <cjk>
+0xE069	U+701B	# <cjk>
+0xE06A	U+701A	# <cjk>
+0xE06B	U+6F74	# <cjk>
+0xE06C	U+701D	# <cjk>
+0xE06D	U+7018	# <cjk>
+0xE06E	U+701F	# <cjk>
+0xE06F	U+7030	# <cjk>
+0xE070	U+703E	# <cjk>
+0xE071	U+7032	# <cjk>
+0xE072	U+7051	# <cjk>
+0xE073	U+7063	# <cjk>
+0xE074	U+7099	# <cjk>
+0xE075	U+7092	# <cjk>
+0xE076	U+70AF	# <cjk>
+0xE077	U+70F1	# <cjk>
+0xE078	U+70AC	# <cjk>
+0xE079	U+70B8	# <cjk>
+0xE07A	U+70B3	# <cjk>
+0xE07B	U+70AE	# <cjk>
+0xE07C	U+70DF	# <cjk>
+0xE07D	U+70CB	# <cjk>
+0xE07E	U+70DD	# <cjk>
+0xE080	U+70D9	# <cjk>
+0xE081	U+7109	# <cjk>
+0xE082	U+70FD	# <cjk>
+0xE083	U+711C	# <cjk>
+0xE084	U+7119	# <cjk>
+0xE085	U+7165	# <cjk>
+0xE086	U+7155	# <cjk>
+0xE087	U+7188	# <cjk>
+0xE088	U+7166	# <cjk>
+0xE089	U+7162	# <cjk>
+0xE08A	U+714C	# <cjk>
+0xE08B	U+7156	# <cjk>
+0xE08C	U+716C	# <cjk>
+0xE08D	U+718F	# <cjk>
+0xE08E	U+71FB	# <cjk>
+0xE08F	U+7184	# <cjk>
+0xE090	U+7195	# <cjk>
+0xE091	U+71A8	# <cjk>
+0xE092	U+71AC	# <cjk>
+0xE093	U+71D7	# <cjk>
+0xE094	U+71B9	# <cjk>
+0xE095	U+71BE	# <cjk>
+0xE096	U+71D2	# <cjk>
+0xE097	U+71C9	# <cjk>
+0xE098	U+71D4	# <cjk>
+0xE099	U+71CE	# <cjk>
+0xE09A	U+71E0	# <cjk>
+0xE09B	U+71EC	# <cjk>
+0xE09C	U+71E7	# <cjk>
+0xE09D	U+71F5	# <cjk>
+0xE09E	U+71FC	# <cjk>
+0xE09F	U+71F9	# <cjk>
+0xE0A0	U+71FF	# <cjk>
+0xE0A1	U+720D	# <cjk>
+0xE0A2	U+7210	# <cjk>
+0xE0A3	U+721B	# <cjk>
+0xE0A4	U+7228	# <cjk>
+0xE0A5	U+722D	# <cjk>
+0xE0A6	U+722C	# <cjk>
+0xE0A7	U+7230	# <cjk>
+0xE0A8	U+7232	# <cjk>
+0xE0A9	U+723B	# <cjk>
+0xE0AA	U+723C	# <cjk>
+0xE0AB	U+723F	# <cjk>
+0xE0AC	U+7240	# <cjk>
+0xE0AD	U+7246	# <cjk>
+0xE0AE	U+724B	# <cjk>
+0xE0AF	U+7258	# <cjk>
+0xE0B0	U+7274	# <cjk>
+0xE0B1	U+727E	# <cjk>
+0xE0B2	U+7282	# <cjk>
+0xE0B3	U+7281	# <cjk>
+0xE0B4	U+7287	# <cjk>
+0xE0B5	U+7292	# <cjk>
+0xE0B6	U+7296	# <cjk>
+0xE0B7	U+72A2	# <cjk>
+0xE0B8	U+72A7	# <cjk>
+0xE0B9	U+72B9	# <cjk>
+0xE0BA	U+72B2	# <cjk>
+0xE0BB	U+72C3	# <cjk>
+0xE0BC	U+72C6	# <cjk>
+0xE0BD	U+72C4	# <cjk>
+0xE0BE	U+72CE	# <cjk>
+0xE0BF	U+72D2	# <cjk>
+0xE0C0	U+72E2	# <cjk>
+0xE0C1	U+72E0	# <cjk>
+0xE0C2	U+72E1	# <cjk>
+0xE0C3	U+72F9	# <cjk>
+0xE0C4	U+72F7	# <cjk>
+0xE0C5	U+500F	# <cjk>
+0xE0C6	U+7317	# <cjk>
+0xE0C7	U+730A	# <cjk>
+0xE0C8	U+731C	# <cjk>
+0xE0C9	U+7316	# <cjk>
+0xE0CA	U+731D	# <cjk>
+0xE0CB	U+7334	# <cjk>
+0xE0CC	U+732F	# <cjk>
+0xE0CD	U+7329	# <cjk>
+0xE0CE	U+7325	# <cjk>
+0xE0CF	U+733E	# <cjk>
+0xE0D0	U+734E	# <cjk>
+0xE0D1	U+734F	# <cjk>
+0xE0D2	U+9ED8	# <cjk>
+0xE0D3	U+7357	# <cjk>
+0xE0D4	U+736A	# <cjk>
+0xE0D5	U+7368	# <cjk>
+0xE0D6	U+7370	# <cjk>
+0xE0D7	U+7378	# <cjk>
+0xE0D8	U+7375	# <cjk>
+0xE0D9	U+737B	# <cjk>
+0xE0DA	U+737A	# <cjk>
+0xE0DB	U+73C8	# <cjk>
+0xE0DC	U+73B3	# <cjk>
+0xE0DD	U+73CE	# <cjk>
+0xE0DE	U+73BB	# <cjk>
+0xE0DF	U+73C0	# <cjk>
+0xE0E0	U+73E5	# <cjk>
+0xE0E1	U+73EE	# <cjk>
+0xE0E2	U+73DE	# <cjk>
+0xE0E3	U+74A2	# <cjk>
+0xE0E4	U+7405	# <cjk>
+0xE0E5	U+746F	# <cjk>
+0xE0E6	U+7425	# <cjk>
+0xE0E7	U+73F8	# <cjk>
+0xE0E8	U+7432	# <cjk>
+0xE0E9	U+743A	# <cjk>
+0xE0EA	U+7455	# <cjk>
+0xE0EB	U+743F	# <cjk>
+0xE0EC	U+745F	# <cjk>
+0xE0ED	U+7459	# <cjk>
+0xE0EE	U+7441	# <cjk>
+0xE0EF	U+745C	# <cjk>
+0xE0F0	U+7469	# <cjk>
+0xE0F1	U+7470	# <cjk>
+0xE0F2	U+7463	# <cjk>
+0xE0F3	U+746A	# <cjk>
+0xE0F4	U+7476	# <cjk>
+0xE0F5	U+747E	# <cjk>
+0xE0F6	U+748B	# <cjk>
+0xE0F7	U+749E	# <cjk>
+0xE0F8	U+74A7	# <cjk>
+0xE0F9	U+74CA	# <cjk>
+0xE0FA	U+74CF	# <cjk>
+0xE0FB	U+74D4	# <cjk>
+0xE0FC	U+73F1	# <cjk>
+0xE140	U+74E0	# <cjk>
+0xE141	U+74E3	# <cjk>
+0xE142	U+74E7	# <cjk>
+0xE143	U+74E9	# <cjk>
+0xE144	U+74EE	# <cjk>
+0xE145	U+74F2	# <cjk>
+0xE146	U+74F0	# <cjk>
+0xE147	U+74F1	# <cjk>
+0xE148	U+74F8	# <cjk>
+0xE149	U+74F7	# <cjk>
+0xE14A	U+7504	# <cjk>
+0xE14B	U+7503	# <cjk>
+0xE14C	U+7505	# <cjk>
+0xE14D	U+750C	# <cjk>
+0xE14E	U+750E	# <cjk>
+0xE14F	U+750D	# <cjk>
+0xE150	U+7515	# <cjk>
+0xE151	U+7513	# <cjk>
+0xE152	U+751E	# <cjk>
+0xE153	U+7526	# <cjk>
+0xE154	U+752C	# <cjk>
+0xE155	U+753C	# <cjk>
+0xE156	U+7544	# <cjk>
+0xE157	U+754D	# <cjk>
+0xE158	U+754A	# <cjk>
+0xE159	U+7549	# <cjk>
+0xE15A	U+755B	# <cjk>
+0xE15C	U+755A	# <cjk>
+0xE15D	U+7569	# <cjk>
+0xE15E	U+7564	# <cjk>
+0xE15F	U+7567	# <cjk>
+0xE160	U+756B	# <cjk>
+0xE161	U+756D	# <cjk>
+0xE162	U+7578	# <cjk>
+0xE163	U+7576	# <cjk>
+0xE164	U+7586	# <cjk>
+0xE165	U+7587	# <cjk>
+0xE166	U+7574	# <cjk>
+0xE167	U+758A	# <cjk>
+0xE168	U+7589	# <cjk>
+0xE169	U+7582	# <cjk>
+0xE16A	U+7594	# <cjk>
+0xE16B	U+759A	# <cjk>
+0xE16C	U+759D	# <cjk>
+0xE16D	U+75A5	# <cjk>
+0xE16E	U+75A3	# <cjk>
+0xE16F	U+75C2	# <cjk>
+0xE170	U+75B3	# <cjk>
+0xE171	U+75C3	# <cjk>
+0xE172	U+75B5	# <cjk>
+0xE173	U+75BD	# <cjk>
+0xE174	U+75B8	# <cjk>
+0xE175	U+75BC	# <cjk>
+0xE176	U+75B1	# <cjk>
+0xE177	U+75CD	# <cjk>
+0xE178	U+75CA	# <cjk>
+0xE179	U+75D2	# <cjk>
+0xE17A	U+75D9	# <cjk>
+0xE17B	U+75E3	# <cjk>
+0xE17C	U+75DE	# <cjk>
+0xE17D	U+75FE	# <cjk>
+0xE17E	U+75FF	# <cjk>
+0xE180	U+75FC	# <cjk>
+0xE181	U+7601	# <cjk>
+0xE182	U+75F0	# <cjk>
+0xE183	U+75FA	# <cjk>
+0xE184	U+75F2	# <cjk>
+0xE185	U+75F3	# <cjk>
+0xE186	U+760B	# <cjk>
+0xE187	U+760D	# <cjk>
+0xE188	U+7609	# <cjk>
+0xE189	U+761F	# <cjk>
+0xE18A	U+7627	# <cjk>
+0xE18B	U+7620	# <cjk>
+0xE18C	U+7621	# <cjk>
+0xE18D	U+7622	# <cjk>
+0xE18E	U+7624	# <cjk>
+0xE18F	U+7634	# <cjk>
+0xE190	U+7630	# <cjk>
+0xE191	U+763B	# <cjk>
+0xE192	U+7647	# <cjk>
+0xE193	U+7648	# <cjk>
+0xE194	U+7646	# <cjk>
+0xE195	U+765C	# <cjk>
+0xE196	U+7658	# <cjk>
+0xE197	U+7661	# <cjk>
+0xE198	U+7662	# <cjk>
+0xE199	U+7668	# <cjk>
+0xE19A	U+7669	# <cjk>
+0xE19B	U+766A	# <cjk>
+0xE19C	U+7667	# <cjk>
+0xE19D	U+766C	# <cjk>
+0xE19E	U+7670	# <cjk>
+0xE19F	U+7672	# <cjk>
+0xE1A0	U+7676	# <cjk>
+0xE1A1	U+7678	# <cjk>
+0xE1A2	U+767C	# <cjk>
+0xE1A3	U+7680	# <cjk>
+0xE1A4	U+7683	# <cjk>
+0xE1A5	U+7688	# <cjk>
+0xE1A6	U+768B	# <cjk>
+0xE1A7	U+768E	# <cjk>
+0xE1A8	U+7696	# <cjk>
+0xE1A9	U+7693	# <cjk>
+0xE1AA	U+7699	# <cjk>
+0xE1AB	U+769A	# <cjk>
+0xE1AC	U+76B0	# <cjk>
+0xE1AD	U+76B4	# <cjk>
+0xE1AE	U+76B8	# <cjk>
+0xE1AF	U+76B9	# <cjk>
+0xE1B0	U+76BA	# <cjk>
+0xE1B1	U+76C2	# <cjk>
+0xE1B2	U+76CD	# <cjk>
+0xE1B3	U+76D6	# <cjk>
+0xE1B4	U+76D2	# <cjk>
+0xE1B5	U+76DE	# <cjk>
+0xE1B6	U+76E1	# <cjk>
+0xE1B7	U+76E5	# <cjk>
+0xE1B8	U+76E7	# <cjk>
+0xE1B9	U+76EA	# <cjk>
+0xE1BA	U+862F	# <cjk>
+0xE1BB	U+76FB	# <cjk>
+0xE1BC	U+7708	# <cjk>
+0xE1BD	U+7707	# <cjk>
+0xE1BE	U+7704	# <cjk>
+0xE1BF	U+7729	# <cjk>
+0xE1C0	U+7724	# <cjk>
+0xE1C1	U+771E	# <cjk>
+0xE1C2	U+7725	# <cjk>
+0xE1C3	U+7726	# <cjk>
+0xE1C4	U+771B	# <cjk>
+0xE1C5	U+7737	# <cjk>
+0xE1C6	U+7738	# <cjk>
+0xE1C7	U+7747	# <cjk>
+0xE1C8	U+775A	# <cjk>
+0xE1C9	U+7768	# <cjk>
+0xE1CA	U+776B	# <cjk>
+0xE1CB	U+775B	# <cjk>
+0xE1CC	U+7765	# <cjk>
+0xE1CD	U+777F	# <cjk>
+0xE1CE	U+777E	# <cjk>
+0xE1CF	U+7779	# <cjk>
+0xE1D0	U+778E	# <cjk>
+0xE1D1	U+778B	# <cjk>
+0xE1D2	U+7791	# <cjk>
+0xE1D3	U+77A0	# <cjk>
+0xE1D4	U+779E	# <cjk>
+0xE1D5	U+77B0	# <cjk>
+0xE1D6	U+77B6	# <cjk>
+0xE1D7	U+77B9	# <cjk>
+0xE1D8	U+77BF	# <cjk>
+0xE1D9	U+77BC	# <cjk>
+0xE1DA	U+77BD	# <cjk>
+0xE1DB	U+77BB	# <cjk>
+0xE1DC	U+77C7	# <cjk>
+0xE1DD	U+77CD	# <cjk>
+0xE1DE	U+77D7	# <cjk>
+0xE1DF	U+77DA	# <cjk>
+0xE1E0	U+77DC	# <cjk>
+0xE1E1	U+77E3	# <cjk>
+0xE1E2	U+77EE	# <cjk>
+0xE1E3	U+77FC	# <cjk>
+0xE1E4	U+780C	# <cjk>
+0xE1E5	U+7812	# <cjk>
+0xE1E6	U+7926	# <cjk>
+0xE1E7	U+7820	# <cjk>
+0xE1E8	U+792A	# <cjk>
+0xE1E9	U+7845	# <cjk>
+0xE1EA	U+788E	# <cjk>
+0xE1EB	U+7874	# <cjk>
+0xE1EC	U+7886	# <cjk>
+0xE1ED	U+787C	# <cjk>
+0xE1EE	U+789A	# <cjk>
+0xE1EF	U+788C	# <cjk>
+0xE1F0	U+78A3	# <cjk>
+0xE1F1	U+78B5	# <cjk>
+0xE1F2	U+78AA	# <cjk>
+0xE1F3	U+78AF	# <cjk>
+0xE1F4	U+78D1	# <cjk>
+0xE1F5	U+78C6	# <cjk>
+0xE1F6	U+78CB	# <cjk>
+0xE1F7	U+78D4	# <cjk>
+0xE1F8	U+78BE	# <cjk>
+0xE1F9	U+78BC	# <cjk>
+0xE1FA	U+78C5	# <cjk>
+0xE1FB	U+78CA	# <cjk>
+0xE1FC	U+78EC	# <cjk>
+0xE240	U+78E7	# <cjk>
+0xE241	U+78DA	# <cjk>
+0xE242	U+78FD	# <cjk>
+0xE243	U+78F4	# <cjk>
+0xE244	U+7907	# <cjk>
+0xE245	U+7912	# <cjk>
+0xE246	U+7911	# <cjk>
+0xE247	U+7919	# <cjk>
+0xE248	U+792C	# <cjk>
+0xE249	U+792B	# <cjk>
+0xE24A	U+7940	# <cjk>
+0xE24B	U+7960	# <cjk>
+0xE24C	U+7957	# <cjk>
+0xE24D	U+795F	# <cjk>
+0xE24E	U+795A	# <cjk>
+0xE24F	U+7955	# <cjk>
+0xE250	U+7953	# <cjk>
+0xE251	U+797A	# <cjk>
+0xE252	U+797F	# <cjk>
+0xE253	U+798A	# <cjk>
+0xE254	U+799D	# <cjk>
+0xE255	U+79A7	# <cjk>
+0xE256	U+9F4B	# <cjk>
+0xE257	U+79AA	# <cjk>
+0xE258	U+79AE	# <cjk>
+0xE259	U+79B3	# <cjk>
+0xE25A	U+79B9	# <cjk>
+0xE25C	U+79C9	# <cjk>
+0xE25D	U+79D5	# <cjk>
+0xE25E	U+79E7	# <cjk>
+0xE25F	U+79EC	# <cjk>
+0xE260	U+79E1	# <cjk>
+0xE261	U+79E3	# <cjk>
+0xE262	U+7A08	# <cjk>
+0xE263	U+7A0D	# <cjk>
+0xE264	U+7A18	# <cjk>
+0xE265	U+7A19	# <cjk>
+0xE266	U+7A20	# <cjk>
+0xE267	U+7A1F	# <cjk>
+0xE268	U+7980	# <cjk>
+0xE269	U+7A31	# <cjk>
+0xE26A	U+7A3B	# <cjk>
+0xE26B	U+7A3E	# <cjk>
+0xE26C	U+7A37	# <cjk>
+0xE26D	U+7A43	# <cjk>
+0xE26E	U+7A57	# <cjk>
+0xE26F	U+7A49	# <cjk>
+0xE270	U+7A61	# <cjk>
+0xE271	U+7A62	# <cjk>
+0xE272	U+7A69	# <cjk>
+0xE273	U+9F9D	# <cjk>
+0xE274	U+7A70	# <cjk>
+0xE275	U+7A79	# <cjk>
+0xE276	U+7A7D	# <cjk>
+0xE277	U+7A88	# <cjk>
+0xE278	U+7A97	# <cjk>
+0xE279	U+7A95	# <cjk>
+0xE27A	U+7A98	# <cjk>
+0xE27B	U+7A96	# <cjk>
+0xE27C	U+7AA9	# <cjk>
+0xE27D	U+7AC8	# <cjk>
+0xE27E	U+7AB0	# <cjk>
+0xE280	U+7AB6	# <cjk>
+0xE281	U+7AC5	# <cjk>
+0xE282	U+7AC4	# <cjk>
+0xE283	U+7ABF	# <cjk>
+0xE284	U+9083	# <cjk>
+0xE285	U+7AC7	# <cjk>
+0xE286	U+7ACA	# <cjk>
+0xE287	U+7ACD	# <cjk>
+0xE288	U+7ACF	# <cjk>
+0xE289	U+7AD5	# <cjk>
+0xE28A	U+7AD3	# <cjk>
+0xE28B	U+7AD9	# <cjk>
+0xE28C	U+7ADA	# <cjk>
+0xE28D	U+7ADD	# <cjk>
+0xE28E	U+7AE1	# <cjk>
+0xE28F	U+7AE2	# <cjk>
+0xE290	U+7AE6	# <cjk>
+0xE291	U+7AED	# <cjk>
+0xE292	U+7AF0	# <cjk>
+0xE293	U+7B02	# <cjk>
+0xE294	U+7B0F	# <cjk>
+0xE295	U+7B0A	# <cjk>
+0xE296	U+7B06	# <cjk>
+0xE297	U+7B33	# <cjk>
+0xE298	U+7B18	# <cjk>
+0xE299	U+7B19	# <cjk>
+0xE29A	U+7B1E	# <cjk>
+0xE29B	U+7B35	# <cjk>
+0xE29C	U+7B28	# <cjk>
+0xE29D	U+7B36	# <cjk>
+0xE29E	U+7B50	# <cjk>
+0xE29F	U+7B7A	# <cjk>
+0xE2A0	U+7B04	# <cjk>
+0xE2A1	U+7B4D	# <cjk>
+0xE2A2	U+7B0B	# <cjk>
+0xE2A3	U+7B4C	# <cjk>
+0xE2A4	U+7B45	# <cjk>
+0xE2A5	U+7B75	# <cjk>
+0xE2A6	U+7B65	# <cjk>
+0xE2A7	U+7B74	# <cjk>
+0xE2A8	U+7B67	# <cjk>
+0xE2A9	U+7B70	# <cjk>
+0xE2AA	U+7B71	# <cjk>
+0xE2AB	U+7B6C	# <cjk>
+0xE2AC	U+7B6E	# <cjk>
+0xE2AD	U+7B9D	# <cjk>
+0xE2AE	U+7B98	# <cjk>
+0xE2AF	U+7B9F	# <cjk>
+0xE2B0	U+7B8D	# <cjk>
+0xE2B1	U+7B9C	# <cjk>
+0xE2B2	U+7B9A	# <cjk>
+0xE2B3	U+7B8B	# <cjk>
+0xE2B4	U+7B92	# <cjk>
+0xE2B5	U+7B8F	# <cjk>
+0xE2B6	U+7B5D	# <cjk>
+0xE2B7	U+7B99	# <cjk>
+0xE2B8	U+7BCB	# <cjk>
+0xE2B9	U+7BC1	# <cjk>
+0xE2BA	U+7BCC	# <cjk>
+0xE2BB	U+7BCF	# <cjk>
+0xE2BC	U+7BB4	# <cjk>
+0xE2BD	U+7BC6	# <cjk>
+0xE2BE	U+7BDD	# <cjk>
+0xE2BF	U+7BE9	# <cjk>
+0xE2C0	U+7C11	# <cjk>
+0xE2C1	U+7C14	# <cjk>
+0xE2C2	U+7BE6	# <cjk>
+0xE2C3	U+7BE5	# <cjk>
+0xE2C4	U+7C60	# <cjk>
+0xE2C5	U+7C00	# <cjk>
+0xE2C6	U+7C07	# <cjk>
+0xE2C7	U+7C13	# <cjk>
+0xE2C8	U+7BF3	# <cjk>
+0xE2C9	U+7BF7	# <cjk>
+0xE2CA	U+7C17	# <cjk>
+0xE2CB	U+7C0D	# <cjk>
+0xE2CC	U+7BF6	# <cjk>
+0xE2CD	U+7C23	# <cjk>
+0xE2CE	U+7C27	# <cjk>
+0xE2CF	U+7C2A	# <cjk>
+0xE2D0	U+7C1F	# <cjk>
+0xE2D1	U+7C37	# <cjk>
+0xE2D2	U+7C2B	# <cjk>
+0xE2D3	U+7C3D	# <cjk>
+0xE2D4	U+7C4C	# <cjk>
+0xE2D5	U+7C43	# <cjk>
+0xE2D6	U+7C54	# <cjk>
+0xE2D7	U+7C4F	# <cjk>
+0xE2D8	U+7C40	# <cjk>
+0xE2D9	U+7C50	# <cjk>
+0xE2DA	U+7C58	# <cjk>
+0xE2DB	U+7C5F	# <cjk>
+0xE2DC	U+7C64	# <cjk>
+0xE2DD	U+7C56	# <cjk>
+0xE2DE	U+7C65	# <cjk>
+0xE2DF	U+7C6C	# <cjk>
+0xE2E0	U+7C75	# <cjk>
+0xE2E1	U+7C83	# <cjk>
+0xE2E2	U+7C90	# <cjk>
+0xE2E3	U+7CA4	# <cjk>
+0xE2E4	U+7CAD	# <cjk>
+0xE2E5	U+7CA2	# <cjk>
+0xE2E6	U+7CAB	# <cjk>
+0xE2E7	U+7CA1	# <cjk>
+0xE2E8	U+7CA8	# <cjk>
+0xE2E9	U+7CB3	# <cjk>
+0xE2EA	U+7CB2	# <cjk>
+0xE2EB	U+7CB1	# <cjk>
+0xE2EC	U+7CAE	# <cjk>
+0xE2ED	U+7CB9	# <cjk>
+0xE2EE	U+7CBD	# <cjk>
+0xE2EF	U+7CC0	# <cjk>
+0xE2F0	U+7CC5	# <cjk>
+0xE2F1	U+7CC2	# <cjk>
+0xE2F2	U+7CD8	# <cjk>
+0xE2F3	U+7CD2	# <cjk>
+0xE2F4	U+7CDC	# <cjk>
+0xE2F5	U+7CE2	# <cjk>
+0xE2F6	U+9B3B	# <cjk>
+0xE2F7	U+7CEF	# <cjk>
+0xE2F8	U+7CF2	# <cjk>
+0xE2F9	U+7CF4	# <cjk>
+0xE2FA	U+7CF6	# <cjk>
+0xE2FB	U+7CFA	# <cjk>
+0xE2FC	U+7D06	# <cjk>
+0xE340	U+7D02	# <cjk>
+0xE341	U+7D1C	# <cjk>
+0xE342	U+7D15	# <cjk>
+0xE343	U+7D0A	# <cjk>
+0xE344	U+7D45	# <cjk>
+0xE345	U+7D4B	# <cjk>
+0xE346	U+7D2E	# <cjk>
+0xE347	U+7D32	# <cjk>
+0xE348	U+7D3F	# <cjk>
+0xE349	U+7D35	# <cjk>
+0xE34A	U+7D46	# <cjk>
+0xE34B	U+7D73	# <cjk>
+0xE34C	U+7D56	# <cjk>
+0xE34D	U+7D4E	# <cjk>
+0xE34E	U+7D72	# <cjk>
+0xE34F	U+7D68	# <cjk>
+0xE350	U+7D6E	# <cjk>
+0xE351	U+7D4F	# <cjk>
+0xE352	U+7D63	# <cjk>
+0xE353	U+7D93	# <cjk>
+0xE354	U+7D89	# <cjk>
+0xE355	U+7D5B	# <cjk>
+0xE356	U+7D8F	# <cjk>
+0xE357	U+7D7D	# <cjk>
+0xE358	U+7D9B	# <cjk>
+0xE359	U+7DBA	# <cjk>
+0xE35A	U+7DAE	# <cjk>
+0xE35C	U+7DB5	# <cjk>
+0xE35D	U+7DC7	# <cjk>
+0xE35E	U+7DBD	# <cjk>
+0xE35F	U+7DAB	# <cjk>
+0xE360	U+7E3D	# <cjk>
+0xE361	U+7DA2	# <cjk>
+0xE362	U+7DAF	# <cjk>
+0xE363	U+7DDC	# <cjk>
+0xE364	U+7DB8	# <cjk>
+0xE365	U+7D9F	# <cjk>
+0xE366	U+7DB0	# <cjk>
+0xE367	U+7DD8	# <cjk>
+0xE368	U+7DDD	# <cjk>
+0xE369	U+7DE4	# <cjk>
+0xE36A	U+7DDE	# <cjk>
+0xE36B	U+7DFB	# <cjk>
+0xE36C	U+7DF2	# <cjk>
+0xE36D	U+7DE1	# <cjk>
+0xE36E	U+7E05	# <cjk>
+0xE36F	U+7E0A	# <cjk>
+0xE370	U+7E23	# <cjk>
+0xE371	U+7E21	# <cjk>
+0xE372	U+7E12	# <cjk>
+0xE373	U+7E31	# <cjk>
+0xE374	U+7E1F	# <cjk>
+0xE375	U+7E09	# <cjk>
+0xE376	U+7E0B	# <cjk>
+0xE377	U+7E22	# <cjk>
+0xE378	U+7E46	# <cjk>
+0xE379	U+7E66	# <cjk>
+0xE37A	U+7E3B	# <cjk>
+0xE37B	U+7E35	# <cjk>
+0xE37C	U+7E39	# <cjk>
+0xE37D	U+7E43	# <cjk>
+0xE37E	U+7E37	# <cjk>
+0xE380	U+7E32	# <cjk>
+0xE381	U+7E3A	# <cjk>
+0xE382	U+7E67	# <cjk>
+0xE383	U+7E5D	# <cjk>
+0xE384	U+7E56	# <cjk>
+0xE385	U+7E5E	# <cjk>
+0xE386	U+7E59	# <cjk>
+0xE387	U+7E5A	# <cjk>
+0xE388	U+7E79	# <cjk>
+0xE389	U+7E6A	# <cjk>
+0xE38A	U+7E69	# <cjk>
+0xE38B	U+7E7C	# <cjk>
+0xE38C	U+7E7B	# <cjk>
+0xE38D	U+7E83	# <cjk>
+0xE38E	U+7DD5	# <cjk>
+0xE38F	U+7E7D	# <cjk>
+0xE390	U+8FAE	# <cjk>
+0xE391	U+7E7F	# <cjk>
+0xE392	U+7E88	# <cjk>
+0xE393	U+7E89	# <cjk>
+0xE394	U+7E8C	# <cjk>
+0xE395	U+7E92	# <cjk>
+0xE396	U+7E90	# <cjk>
+0xE397	U+7E93	# <cjk>
+0xE398	U+7E94	# <cjk>
+0xE399	U+7E96	# <cjk>
+0xE39A	U+7E8E	# <cjk>
+0xE39B	U+7E9B	# <cjk>
+0xE39C	U+7E9C	# <cjk>
+0xE39D	U+7F38	# <cjk>
+0xE39E	U+7F3A	# <cjk>
+0xE39F	U+7F45	# <cjk>
+0xE3A0	U+7F4C	# <cjk>
+0xE3A1	U+7F4D	# <cjk>
+0xE3A2	U+7F4E	# <cjk>
+0xE3A3	U+7F50	# <cjk>
+0xE3A4	U+7F51	# <cjk>
+0xE3A5	U+7F55	# <cjk>
+0xE3A6	U+7F54	# <cjk>
+0xE3A7	U+7F58	# <cjk>
+0xE3A8	U+7F5F	# <cjk>
+0xE3A9	U+7F60	# <cjk>
+0xE3AA	U+7F68	# <cjk>
+0xE3AB	U+7F69	# <cjk>
+0xE3AC	U+7F67	# <cjk>
+0xE3AD	U+7F78	# <cjk>
+0xE3AE	U+7F82	# <cjk>
+0xE3AF	U+7F86	# <cjk>
+0xE3B0	U+7F83	# <cjk>
+0xE3B1	U+7F88	# <cjk>
+0xE3B2	U+7F87	# <cjk>
+0xE3B3	U+7F8C	# <cjk>
+0xE3B4	U+7F94	# <cjk>
+0xE3B5	U+7F9E	# <cjk>
+0xE3B6	U+7F9D	# <cjk>
+0xE3B7	U+7F9A	# <cjk>
+0xE3B8	U+7FA3	# <cjk>
+0xE3B9	U+7FAF	# <cjk>
+0xE3BA	U+7FB2	# <cjk>
+0xE3BB	U+7FB9	# <cjk>
+0xE3BC	U+7FAE	# <cjk>
+0xE3BD	U+7FB6	# <cjk>
+0xE3BE	U+7FB8	# <cjk>
+0xE3BF	U+8B71	# <cjk>
+0xE3C0	U+7FC5	# <cjk>
+0xE3C1	U+7FC6	# <cjk>
+0xE3C2	U+7FCA	# <cjk>
+0xE3C3	U+7FD5	# <cjk>
+0xE3C4	U+7FD4	# <cjk>
+0xE3C5	U+7FE1	# <cjk>
+0xE3C6	U+7FE6	# <cjk>
+0xE3C7	U+7FE9	# <cjk>
+0xE3C8	U+7FF3	# <cjk>
+0xE3C9	U+7FF9	# <cjk>
+0xE3CA	U+98DC	# <cjk>
+0xE3CB	U+8006	# <cjk>
+0xE3CC	U+8004	# <cjk>
+0xE3CD	U+800B	# <cjk>
+0xE3CE	U+8012	# <cjk>
+0xE3CF	U+8018	# <cjk>
+0xE3D0	U+8019	# <cjk>
+0xE3D1	U+801C	# <cjk>
+0xE3D2	U+8021	# <cjk>
+0xE3D3	U+8028	# <cjk>
+0xE3D4	U+803F	# <cjk>
+0xE3D5	U+803B	# <cjk>
+0xE3D6	U+804A	# <cjk>
+0xE3D7	U+8046	# <cjk>
+0xE3D8	U+8052	# <cjk>
+0xE3D9	U+8058	# <cjk>
+0xE3DA	U+805A	# <cjk>
+0xE3DB	U+805F	# <cjk>
+0xE3DC	U+8062	# <cjk>
+0xE3DD	U+8068	# <cjk>
+0xE3DE	U+8073	# <cjk>
+0xE3DF	U+8072	# <cjk>
+0xE3E0	U+8070	# <cjk>
+0xE3E1	U+8076	# <cjk>
+0xE3E2	U+8079	# <cjk>
+0xE3E3	U+807D	# <cjk>
+0xE3E4	U+807F	# <cjk>
+0xE3E5	U+8084	# <cjk>
+0xE3E6	U+8086	# <cjk>
+0xE3E7	U+8085	# <cjk>
+0xE3E8	U+809B	# <cjk>
+0xE3E9	U+8093	# <cjk>
+0xE3EA	U+809A	# <cjk>
+0xE3EB	U+80AD	# <cjk>
+0xE3EC	U+5190	# <cjk>
+0xE3ED	U+80AC	# <cjk>
+0xE3EE	U+80DB	# <cjk>
+0xE3EF	U+80E5	# <cjk>
+0xE3F0	U+80D9	# <cjk>
+0xE3F1	U+80DD	# <cjk>
+0xE3F2	U+80C4	# <cjk>
+0xE3F3	U+80DA	# <cjk>
+0xE3F4	U+80D6	# <cjk>
+0xE3F5	U+8109	# <cjk>
+0xE3F6	U+80EF	# <cjk>
+0xE3F7	U+80F1	# <cjk>
+0xE3F8	U+811B	# <cjk>
+0xE3F9	U+8129	# <cjk>
+0xE3FA	U+8123	# <cjk>
+0xE3FB	U+812F	# <cjk>
+0xE3FC	U+814B	# <cjk>
+0xE440	U+968B	# <cjk>
+0xE441	U+8146	# <cjk>
+0xE442	U+813E	# <cjk>
+0xE443	U+8153	# <cjk>
+0xE444	U+8151	# <cjk>
+0xE445	U+80FC	# <cjk>
+0xE446	U+8171	# <cjk>
+0xE447	U+816E	# <cjk>
+0xE448	U+8165	# <cjk>
+0xE449	U+8166	# <cjk>
+0xE44A	U+8174	# <cjk>
+0xE44B	U+8183	# <cjk>
+0xE44C	U+8188	# <cjk>
+0xE44D	U+818A	# <cjk>
+0xE44E	U+8180	# <cjk>
+0xE44F	U+8182	# <cjk>
+0xE450	U+81A0	# <cjk>
+0xE451	U+8195	# <cjk>
+0xE452	U+81A4	# <cjk>
+0xE453	U+81A3	# <cjk>
+0xE454	U+815F	# <cjk>
+0xE455	U+8193	# <cjk>
+0xE456	U+81A9	# <cjk>
+0xE457	U+81B0	# <cjk>
+0xE458	U+81B5	# <cjk>
+0xE459	U+81BE	# <cjk>
+0xE45A	U+81B8	# <cjk>
+0xE45C	U+81C0	# <cjk>
+0xE45D	U+81C2	# <cjk>
+0xE45E	U+81BA	# <cjk>
+0xE45F	U+81C9	# <cjk>
+0xE460	U+81CD	# <cjk>
+0xE461	U+81D1	# <cjk>
+0xE462	U+81D9	# <cjk>
+0xE463	U+81D8	# <cjk>
+0xE464	U+81C8	# <cjk>
+0xE465	U+81DA	# <cjk>
+0xE466	U+81DF	# <cjk>
+0xE467	U+81E0	# <cjk>
+0xE468	U+81E7	# <cjk>
+0xE469	U+81FA	# <cjk>
+0xE46A	U+81FB	# <cjk>
+0xE46B	U+81FE	# <cjk>
+0xE46C	U+8201	# <cjk>
+0xE46D	U+8202	# <cjk>
+0xE46E	U+8205	# <cjk>
+0xE46F	U+8207	# <cjk>
+0xE470	U+820A	# <cjk>
+0xE471	U+820D	# <cjk>
+0xE472	U+8210	# <cjk>
+0xE473	U+8216	# <cjk>
+0xE474	U+8229	# <cjk>
+0xE475	U+822B	# <cjk>
+0xE476	U+8238	# <cjk>
+0xE477	U+8233	# <cjk>
+0xE478	U+8240	# <cjk>
+0xE479	U+8259	# <cjk>
+0xE47A	U+8258	# <cjk>
+0xE47B	U+825D	# <cjk>
+0xE47C	U+825A	# <cjk>
+0xE47D	U+825F	# <cjk>
+0xE47E	U+8264	# <cjk>
+0xE480	U+8262	# <cjk>
+0xE481	U+8268	# <cjk>
+0xE482	U+826A	# <cjk>
+0xE483	U+826B	# <cjk>
+0xE484	U+822E	# <cjk>
+0xE485	U+8271	# <cjk>
+0xE486	U+8277	# <cjk>
+0xE487	U+8278	# <cjk>
+0xE488	U+827E	# <cjk>
+0xE489	U+828D	# <cjk>
+0xE48A	U+8292	# <cjk>
+0xE48B	U+82AB	# <cjk>
+0xE48C	U+829F	# <cjk>
+0xE48D	U+82BB	# <cjk>
+0xE48E	U+82AC	# <cjk>
+0xE48F	U+82E1	# <cjk>
+0xE490	U+82E3	# <cjk>
+0xE491	U+82DF	# <cjk>
+0xE492	U+82D2	# <cjk>
+0xE493	U+82F4	# <cjk>
+0xE494	U+82F3	# <cjk>
+0xE495	U+82FA	# <cjk>
+0xE496	U+8393	# <cjk>
+0xE497	U+8303	# <cjk>
+0xE498	U+82FB	# <cjk>
+0xE499	U+82F9	# <cjk>
+0xE49A	U+82DE	# <cjk>
+0xE49B	U+8306	# <cjk>
+0xE49C	U+82DC	# <cjk>
+0xE49D	U+8309	# <cjk>
+0xE49E	U+82D9	# <cjk>
+0xE49F	U+8335	# <cjk>
+0xE4A0	U+8334	# <cjk>
+0xE4A1	U+8316	# <cjk>
+0xE4A2	U+8332	# <cjk>
+0xE4A3	U+8331	# <cjk>
+0xE4A4	U+8340	# <cjk>
+0xE4A5	U+8339	# <cjk>
+0xE4A6	U+8350	# <cjk>
+0xE4A7	U+8345	# <cjk>
+0xE4A8	U+832F	# <cjk>
+0xE4A9	U+832B	# <cjk>
+0xE4AA	U+8317	# <cjk>
+0xE4AB	U+8318	# <cjk>
+0xE4AC	U+8385	# <cjk>
+0xE4AD	U+839A	# <cjk>
+0xE4AE	U+83AA	# <cjk>
+0xE4AF	U+839F	# <cjk>
+0xE4B0	U+83A2	# <cjk>
+0xE4B1	U+8396	# <cjk>
+0xE4B2	U+8323	# <cjk>
+0xE4B3	U+838E	# <cjk>
+0xE4B4	U+8387	# <cjk>
+0xE4B5	U+838A	# <cjk>
+0xE4B6	U+837C	# <cjk>
+0xE4B7	U+83B5	# <cjk>
+0xE4B8	U+8373	# <cjk>
+0xE4B9	U+8375	# <cjk>
+0xE4BA	U+83A0	# <cjk>
+0xE4BB	U+8389	# <cjk>
+0xE4BC	U+83A8	# <cjk>
+0xE4BD	U+83F4	# <cjk>
+0xE4BE	U+8413	# <cjk>
+0xE4BF	U+83EB	# <cjk>
+0xE4C0	U+83CE	# <cjk>
+0xE4C1	U+83FD	# <cjk>
+0xE4C2	U+8403	# <cjk>
+0xE4C3	U+83D8	# <cjk>
+0xE4C4	U+840B	# <cjk>
+0xE4C5	U+83C1	# <cjk>
+0xE4C6	U+83F7	# <cjk>
+0xE4C7	U+8407	# <cjk>
+0xE4C8	U+83E0	# <cjk>
+0xE4C9	U+83F2	# <cjk>
+0xE4CA	U+840D	# <cjk>
+0xE4CB	U+8422	# <cjk>
+0xE4CC	U+8420	# <cjk>
+0xE4CD	U+83BD	# <cjk>
+0xE4CE	U+8438	# <cjk>
+0xE4CF	U+8506	# <cjk>
+0xE4D0	U+83FB	# <cjk>
+0xE4D1	U+846D	# <cjk>
+0xE4D2	U+842A	# <cjk>
+0xE4D3	U+843C	# <cjk>
+0xE4D4	U+855A	# <cjk>
+0xE4D5	U+8484	# <cjk>
+0xE4D6	U+8477	# <cjk>
+0xE4D7	U+846B	# <cjk>
+0xE4D8	U+84AD	# <cjk>
+0xE4D9	U+846E	# <cjk>
+0xE4DA	U+8482	# <cjk>
+0xE4DB	U+8469	# <cjk>
+0xE4DC	U+8446	# <cjk>
+0xE4DD	U+842C	# <cjk>
+0xE4DE	U+846F	# <cjk>
+0xE4DF	U+8479	# <cjk>
+0xE4E0	U+8435	# <cjk>
+0xE4E1	U+84CA	# <cjk>
+0xE4E2	U+8462	# <cjk>
+0xE4E3	U+84B9	# <cjk>
+0xE4E4	U+84BF	# <cjk>
+0xE4E5	U+849F	# <cjk>
+0xE4E6	U+84D9	# <cjk>
+0xE4E7	U+84CD	# <cjk>
+0xE4E8	U+84BB	# <cjk>
+0xE4E9	U+84DA	# <cjk>
+0xE4EA	U+84D0	# <cjk>
+0xE4EB	U+84C1	# <cjk>
+0xE4EC	U+84C6	# <cjk>
+0xE4ED	U+84D6	# <cjk>
+0xE4EE	U+84A1	# <cjk>
+0xE4EF	U+8521	# <cjk>
+0xE4F0	U+84FF	# <cjk>
+0xE4F1	U+84F4	# <cjk>
+0xE4F2	U+8517	# <cjk>
+0xE4F3	U+8518	# <cjk>
+0xE4F4	U+852C	# <cjk>
+0xE4F5	U+851F	# <cjk>
+0xE4F6	U+8515	# <cjk>
+0xE4F7	U+8514	# <cjk>
+0xE4F8	U+84FC	# <cjk>
+0xE4F9	U+8540	# <cjk>
+0xE4FA	U+8563	# <cjk>
+0xE4FB	U+8558	# <cjk>
+0xE4FC	U+8548	# <cjk>
+0xE540	U+8541	# <cjk>
+0xE541	U+8602	# <cjk>
+0xE542	U+854B	# <cjk>
+0xE543	U+8555	# <cjk>
+0xE544	U+8580	# <cjk>
+0xE545	U+85A4	# <cjk>
+0xE546	U+8588	# <cjk>
+0xE547	U+8591	# <cjk>
+0xE548	U+858A	# <cjk>
+0xE549	U+85A8	# <cjk>
+0xE54A	U+856D	# <cjk>
+0xE54B	U+8594	# <cjk>
+0xE54C	U+859B	# <cjk>
+0xE54D	U+85EA	# <cjk>
+0xE54E	U+8587	# <cjk>
+0xE54F	U+859C	# <cjk>
+0xE550	U+8577	# <cjk>
+0xE551	U+857E	# <cjk>
+0xE552	U+8590	# <cjk>
+0xE553	U+85C9	# <cjk>
+0xE554	U+85BA	# <cjk>
+0xE555	U+85CF	# <cjk>
+0xE556	U+85B9	# <cjk>
+0xE557	U+85D0	# <cjk>
+0xE558	U+85D5	# <cjk>
+0xE559	U+85DD	# <cjk>
+0xE55A	U+85E5	# <cjk>
+0xE55C	U+85F9	# <cjk>
+0xE55D	U+860A	# <cjk>
+0xE55E	U+8613	# <cjk>
+0xE55F	U+860B	# <cjk>
+0xE560	U+85FE	# <cjk>
+0xE561	U+85FA	# <cjk>
+0xE562	U+8606	# <cjk>
+0xE563	U+8622	# <cjk>
+0xE564	U+861A	# <cjk>
+0xE565	U+8630	# <cjk>
+0xE566	U+863F	# <cjk>
+0xE567	U+864D	# <cjk>
+0xE568	U+4E55	# <cjk>
+0xE569	U+8654	# <cjk>
+0xE56A	U+865F	# <cjk>
+0xE56B	U+8667	# <cjk>
+0xE56C	U+8671	# <cjk>
+0xE56D	U+8693	# <cjk>
+0xE56E	U+86A3	# <cjk>
+0xE56F	U+86A9	# <cjk>
+0xE570	U+86AA	# <cjk>
+0xE571	U+868B	# <cjk>
+0xE572	U+868C	# <cjk>
+0xE573	U+86B6	# <cjk>
+0xE574	U+86AF	# <cjk>
+0xE575	U+86C4	# <cjk>
+0xE576	U+86C6	# <cjk>
+0xE577	U+86B0	# <cjk>
+0xE578	U+86C9	# <cjk>
+0xE579	U+8823	# <cjk>
+0xE57A	U+86AB	# <cjk>
+0xE57B	U+86D4	# <cjk>
+0xE57C	U+86DE	# <cjk>
+0xE57D	U+86E9	# <cjk>
+0xE57E	U+86EC	# <cjk>
+0xE580	U+86DF	# <cjk>
+0xE581	U+86DB	# <cjk>
+0xE582	U+86EF	# <cjk>
+0xE583	U+8712	# <cjk>
+0xE584	U+8706	# <cjk>
+0xE585	U+8708	# <cjk>
+0xE586	U+8700	# <cjk>
+0xE587	U+8703	# <cjk>
+0xE588	U+86FB	# <cjk>
+0xE589	U+8711	# <cjk>
+0xE58A	U+8709	# <cjk>
+0xE58B	U+870D	# <cjk>
+0xE58C	U+86F9	# <cjk>
+0xE58D	U+870A	# <cjk>
+0xE58E	U+8734	# <cjk>
+0xE58F	U+873F	# <cjk>
+0xE590	U+8737	# <cjk>
+0xE591	U+873B	# <cjk>
+0xE592	U+8725	# <cjk>
+0xE593	U+8729	# <cjk>
+0xE594	U+871A	# <cjk>
+0xE595	U+8760	# <cjk>
+0xE596	U+875F	# <cjk>
+0xE597	U+8778	# <cjk>
+0xE598	U+874C	# <cjk>
+0xE599	U+874E	# <cjk>
+0xE59A	U+8774	# <cjk>
+0xE59B	U+8757	# <cjk>
+0xE59C	U+8768	# <cjk>
+0xE59D	U+876E	# <cjk>
+0xE59E	U+8759	# <cjk>
+0xE59F	U+8753	# <cjk>
+0xE5A0	U+8763	# <cjk>
+0xE5A1	U+876A	# <cjk>
+0xE5A2	U+8805	# <cjk>
+0xE5A3	U+87A2	# <cjk>
+0xE5A4	U+879F	# <cjk>
+0xE5A5	U+8782	# <cjk>
+0xE5A6	U+87AF	# <cjk>
+0xE5A7	U+87CB	# <cjk>
+0xE5A8	U+87BD	# <cjk>
+0xE5A9	U+87C0	# <cjk>
+0xE5AA	U+87D0	# <cjk>
+0xE5AB	U+96D6	# <cjk>
+0xE5AC	U+87AB	# <cjk>
+0xE5AD	U+87C4	# <cjk>
+0xE5AE	U+87B3	# <cjk>
+0xE5AF	U+87C7	# <cjk>
+0xE5B0	U+87C6	# <cjk>
+0xE5B1	U+87BB	# <cjk>
+0xE5B2	U+87EF	# <cjk>
+0xE5B3	U+87F2	# <cjk>
+0xE5B4	U+87E0	# <cjk>
+0xE5B5	U+880F	# <cjk>
+0xE5B6	U+880D	# <cjk>
+0xE5B7	U+87FE	# <cjk>
+0xE5B8	U+87F6	# <cjk>
+0xE5B9	U+87F7	# <cjk>
+0xE5BA	U+880E	# <cjk>
+0xE5BB	U+87D2	# <cjk>
+0xE5BC	U+8811	# <cjk>
+0xE5BD	U+8816	# <cjk>
+0xE5BE	U+8815	# <cjk>
+0xE5BF	U+8822	# <cjk>
+0xE5C0	U+8821	# <cjk>
+0xE5C1	U+8831	# <cjk>
+0xE5C2	U+8836	# <cjk>
+0xE5C3	U+8839	# <cjk>
+0xE5C4	U+8827	# <cjk>
+0xE5C5	U+883B	# <cjk>
+0xE5C6	U+8844	# <cjk>
+0xE5C7	U+8842	# <cjk>
+0xE5C8	U+8852	# <cjk>
+0xE5C9	U+8859	# <cjk>
+0xE5CA	U+885E	# <cjk>
+0xE5CB	U+8862	# <cjk>
+0xE5CC	U+886B	# <cjk>
+0xE5CD	U+8881	# <cjk>
+0xE5CE	U+887E	# <cjk>
+0xE5CF	U+889E	# <cjk>
+0xE5D0	U+8875	# <cjk>
+0xE5D1	U+887D	# <cjk>
+0xE5D2	U+88B5	# <cjk>
+0xE5D3	U+8872	# <cjk>
+0xE5D4	U+8882	# <cjk>
+0xE5D5	U+8897	# <cjk>
+0xE5D6	U+8892	# <cjk>
+0xE5D7	U+88AE	# <cjk>
+0xE5D8	U+8899	# <cjk>
+0xE5D9	U+88A2	# <cjk>
+0xE5DA	U+888D	# <cjk>
+0xE5DB	U+88A4	# <cjk>
+0xE5DC	U+88B0	# <cjk>
+0xE5DD	U+88BF	# <cjk>
+0xE5DE	U+88B1	# <cjk>
+0xE5DF	U+88C3	# <cjk>
+0xE5E0	U+88C4	# <cjk>
+0xE5E1	U+88D4	# <cjk>
+0xE5E2	U+88D8	# <cjk>
+0xE5E3	U+88D9	# <cjk>
+0xE5E4	U+88DD	# <cjk>
+0xE5E5	U+88F9	# <cjk>
+0xE5E6	U+8902	# <cjk>
+0xE5E7	U+88FC	# <cjk>
+0xE5E8	U+88F4	# <cjk>
+0xE5E9	U+88E8	# <cjk>
+0xE5EA	U+88F2	# <cjk>
+0xE5EB	U+8904	# <cjk>
+0xE5EC	U+890C	# <cjk>
+0xE5ED	U+890A	# <cjk>
+0xE5EE	U+8913	# <cjk>
+0xE5EF	U+8943	# <cjk>
+0xE5F0	U+891E	# <cjk>
+0xE5F1	U+8925	# <cjk>
+0xE5F2	U+892A	# <cjk>
+0xE5F3	U+892B	# <cjk>
+0xE5F4	U+8941	# <cjk>
+0xE5F5	U+8944	# <cjk>
+0xE5F6	U+893B	# <cjk>
+0xE5F7	U+8936	# <cjk>
+0xE5F8	U+8938	# <cjk>
+0xE5F9	U+894C	# <cjk>
+0xE5FA	U+891D	# <cjk>
+0xE5FB	U+8960	# <cjk>
+0xE5FC	U+895E	# <cjk>
+0xE640	U+8966	# <cjk>
+0xE641	U+8964	# <cjk>
+0xE642	U+896D	# <cjk>
+0xE643	U+896A	# <cjk>
+0xE644	U+896F	# <cjk>
+0xE645	U+8974	# <cjk>
+0xE646	U+8977	# <cjk>
+0xE647	U+897E	# <cjk>
+0xE648	U+8983	# <cjk>
+0xE649	U+8988	# <cjk>
+0xE64A	U+898A	# <cjk>
+0xE64B	U+8993	# <cjk>
+0xE64C	U+8998	# <cjk>
+0xE64D	U+89A1	# <cjk>
+0xE64E	U+89A9	# <cjk>
+0xE64F	U+89A6	# <cjk>
+0xE650	U+89AC	# <cjk>
+0xE651	U+89AF	# <cjk>
+0xE652	U+89B2	# <cjk>
+0xE653	U+89BA	# <cjk>
+0xE654	U+89BD	# <cjk>
+0xE655	U+89BF	# <cjk>
+0xE656	U+89C0	# <cjk>
+0xE657	U+89DA	# <cjk>
+0xE658	U+89DC	# <cjk>
+0xE659	U+89DD	# <cjk>
+0xE65A	U+89E7	# <cjk>
+0xE65C	U+89F8	# <cjk>
+0xE65D	U+8A03	# <cjk>
+0xE65E	U+8A16	# <cjk>
+0xE65F	U+8A10	# <cjk>
+0xE660	U+8A0C	# <cjk>
+0xE661	U+8A1B	# <cjk>
+0xE662	U+8A1D	# <cjk>
+0xE663	U+8A25	# <cjk>
+0xE664	U+8A36	# <cjk>
+0xE665	U+8A41	# <cjk>
+0xE666	U+8A5B	# <cjk>
+0xE667	U+8A52	# <cjk>
+0xE668	U+8A46	# <cjk>
+0xE669	U+8A48	# <cjk>
+0xE66A	U+8A7C	# <cjk>
+0xE66B	U+8A6D	# <cjk>
+0xE66C	U+8A6C	# <cjk>
+0xE66D	U+8A62	# <cjk>
+0xE66E	U+8A85	# <cjk>
+0xE66F	U+8A82	# <cjk>
+0xE670	U+8A84	# <cjk>
+0xE671	U+8AA8	# <cjk>
+0xE672	U+8AA1	# <cjk>
+0xE673	U+8A91	# <cjk>
+0xE674	U+8AA5	# <cjk>
+0xE675	U+8AA6	# <cjk>
+0xE676	U+8A9A	# <cjk>
+0xE677	U+8AA3	# <cjk>
+0xE678	U+8AC4	# <cjk>
+0xE679	U+8ACD	# <cjk>
+0xE67A	U+8AC2	# <cjk>
+0xE67B	U+8ADA	# <cjk>
+0xE67C	U+8AEB	# <cjk>
+0xE67D	U+8AF3	# <cjk>
+0xE67E	U+8AE7	# <cjk>
+0xE680	U+8AE4	# <cjk>
+0xE681	U+8AF1	# <cjk>
+0xE682	U+8B14	# <cjk>
+0xE683	U+8AE0	# <cjk>
+0xE684	U+8AE2	# <cjk>
+0xE685	U+8AF7	# <cjk>
+0xE686	U+8ADE	# <cjk>
+0xE687	U+8ADB	# <cjk>
+0xE688	U+8B0C	# <cjk>
+0xE689	U+8B07	# <cjk>
+0xE68A	U+8B1A	# <cjk>
+0xE68B	U+8AE1	# <cjk>
+0xE68C	U+8B16	# <cjk>
+0xE68D	U+8B10	# <cjk>
+0xE68E	U+8B17	# <cjk>
+0xE68F	U+8B20	# <cjk>
+0xE690	U+8B33	# <cjk>
+0xE691	U+97AB	# <cjk>
+0xE692	U+8B26	# <cjk>
+0xE693	U+8B2B	# <cjk>
+0xE694	U+8B3E	# <cjk>
+0xE695	U+8B28	# <cjk>
+0xE696	U+8B41	# <cjk>
+0xE697	U+8B4C	# <cjk>
+0xE698	U+8B4F	# <cjk>
+0xE699	U+8B4E	# <cjk>
+0xE69A	U+8B49	# <cjk>
+0xE69B	U+8B56	# <cjk>
+0xE69C	U+8B5B	# <cjk>
+0xE69D	U+8B5A	# <cjk>
+0xE69E	U+8B6B	# <cjk>
+0xE69F	U+8B5F	# <cjk>
+0xE6A0	U+8B6C	# <cjk>
+0xE6A1	U+8B6F	# <cjk>
+0xE6A2	U+8B74	# <cjk>
+0xE6A3	U+8B7D	# <cjk>
+0xE6A4	U+8B80	# <cjk>
+0xE6A5	U+8B8C	# <cjk>
+0xE6A6	U+8B8E	# <cjk>
+0xE6A7	U+8B92	# <cjk>
+0xE6A8	U+8B93	# <cjk>
+0xE6A9	U+8B96	# <cjk>
+0xE6AA	U+8B99	# <cjk>
+0xE6AB	U+8B9A	# <cjk>
+0xE6AC	U+8C3A	# <cjk>
+0xE6AD	U+8C41	# <cjk>
+0xE6AE	U+8C3F	# <cjk>
+0xE6AF	U+8C48	# <cjk>
+0xE6B0	U+8C4C	# <cjk>
+0xE6B1	U+8C4E	# <cjk>
+0xE6B2	U+8C50	# <cjk>
+0xE6B3	U+8C55	# <cjk>
+0xE6B4	U+8C62	# <cjk>
+0xE6B5	U+8C6C	# <cjk>
+0xE6B6	U+8C78	# <cjk>
+0xE6B7	U+8C7A	# <cjk>
+0xE6B8	U+8C82	# <cjk>
+0xE6B9	U+8C89	# <cjk>
+0xE6BA	U+8C85	# <cjk>
+0xE6BB	U+8C8A	# <cjk>
+0xE6BC	U+8C8D	# <cjk>
+0xE6BD	U+8C8E	# <cjk>
+0xE6BE	U+8C94	# <cjk>
+0xE6BF	U+8C7C	# <cjk>
+0xE6C0	U+8C98	# <cjk>
+0xE6C1	U+621D	# <cjk>
+0xE6C2	U+8CAD	# <cjk>
+0xE6C3	U+8CAA	# <cjk>
+0xE6C4	U+8CBD	# <cjk>
+0xE6C5	U+8CB2	# <cjk>
+0xE6C6	U+8CB3	# <cjk>
+0xE6C7	U+8CAE	# <cjk>
+0xE6C8	U+8CB6	# <cjk>
+0xE6C9	U+8CC8	# <cjk>
+0xE6CA	U+8CC1	# <cjk>
+0xE6CB	U+8CE4	# <cjk>
+0xE6CC	U+8CE3	# <cjk>
+0xE6CD	U+8CDA	# <cjk>
+0xE6CE	U+8CFD	# <cjk>
+0xE6CF	U+8CFA	# <cjk>
+0xE6D0	U+8CFB	# <cjk>
+0xE6D1	U+8D04	# <cjk>
+0xE6D2	U+8D05	# <cjk>
+0xE6D3	U+8D0A	# <cjk>
+0xE6D4	U+8D07	# <cjk>
+0xE6D5	U+8D0F	# <cjk>
+0xE6D6	U+8D0D	# <cjk>
+0xE6D7	U+8D10	# <cjk>
+0xE6D8	U+9F4E	# <cjk>
+0xE6D9	U+8D13	# <cjk>
+0xE6DA	U+8CCD	# <cjk>
+0xE6DB	U+8D14	# <cjk>
+0xE6DC	U+8D16	# <cjk>
+0xE6DD	U+8D67	# <cjk>
+0xE6DE	U+8D6D	# <cjk>
+0xE6DF	U+8D71	# <cjk>
+0xE6E0	U+8D73	# <cjk>
+0xE6E1	U+8D81	# <cjk>
+0xE6E2	U+8D99	# <cjk>
+0xE6E3	U+8DC2	# <cjk>
+0xE6E4	U+8DBE	# <cjk>
+0xE6E5	U+8DBA	# <cjk>
+0xE6E6	U+8DCF	# <cjk>
+0xE6E7	U+8DDA	# <cjk>
+0xE6E8	U+8DD6	# <cjk>
+0xE6E9	U+8DCC	# <cjk>
+0xE6EA	U+8DDB	# <cjk>
+0xE6EB	U+8DCB	# <cjk>
+0xE6EC	U+8DEA	# <cjk>
+0xE6ED	U+8DEB	# <cjk>
+0xE6EE	U+8DDF	# <cjk>
+0xE6EF	U+8DE3	# <cjk>
+0xE6F0	U+8DFC	# <cjk>
+0xE6F1	U+8E08	# <cjk>
+0xE6F2	U+8E09	# <cjk>
+0xE6F3	U+8DFF	# <cjk>
+0xE6F4	U+8E1D	# <cjk>
+0xE6F5	U+8E1E	# <cjk>
+0xE6F6	U+8E10	# <cjk>
+0xE6F7	U+8E1F	# <cjk>
+0xE6F8	U+8E42	# <cjk>
+0xE6F9	U+8E35	# <cjk>
+0xE6FA	U+8E30	# <cjk>
+0xE6FB	U+8E34	# <cjk>
+0xE6FC	U+8E4A	# <cjk>
+0xE740	U+8E47	# <cjk>
+0xE741	U+8E49	# <cjk>
+0xE742	U+8E4C	# <cjk>
+0xE743	U+8E50	# <cjk>
+0xE744	U+8E48	# <cjk>
+0xE745	U+8E59	# <cjk>
+0xE746	U+8E64	# <cjk>
+0xE747	U+8E60	# <cjk>
+0xE748	U+8E2A	# <cjk>
+0xE749	U+8E63	# <cjk>
+0xE74A	U+8E55	# <cjk>
+0xE74B	U+8E76	# <cjk>
+0xE74C	U+8E72	# <cjk>
+0xE74D	U+8E7C	# <cjk>
+0xE74E	U+8E81	# <cjk>
+0xE74F	U+8E87	# <cjk>
+0xE750	U+8E85	# <cjk>
+0xE751	U+8E84	# <cjk>
+0xE752	U+8E8B	# <cjk>
+0xE753	U+8E8A	# <cjk>
+0xE754	U+8E93	# <cjk>
+0xE755	U+8E91	# <cjk>
+0xE756	U+8E94	# <cjk>
+0xE757	U+8E99	# <cjk>
+0xE758	U+8EAA	# <cjk>
+0xE759	U+8EA1	# <cjk>
+0xE75A	U+8EAC	# <cjk>
+0xE75C	U+8EC6	# <cjk>
+0xE75D	U+8EB1	# <cjk>
+0xE75E	U+8EBE	# <cjk>
+0xE75F	U+8EC5	# <cjk>
+0xE760	U+8EC8	# <cjk>
+0xE761	U+8ECB	# <cjk>
+0xE762	U+8EDB	# <cjk>
+0xE763	U+8EE3	# <cjk>
+0xE764	U+8EFC	# <cjk>
+0xE765	U+8EFB	# <cjk>
+0xE766	U+8EEB	# <cjk>
+0xE767	U+8EFE	# <cjk>
+0xE768	U+8F0A	# <cjk>
+0xE769	U+8F05	# <cjk>
+0xE76A	U+8F15	# <cjk>
+0xE76B	U+8F12	# <cjk>
+0xE76C	U+8F19	# <cjk>
+0xE76D	U+8F13	# <cjk>
+0xE76E	U+8F1C	# <cjk>
+0xE76F	U+8F1F	# <cjk>
+0xE770	U+8F1B	# <cjk>
+0xE771	U+8F0C	# <cjk>
+0xE772	U+8F26	# <cjk>
+0xE773	U+8F33	# <cjk>
+0xE774	U+8F3B	# <cjk>
+0xE775	U+8F39	# <cjk>
+0xE776	U+8F45	# <cjk>
+0xE777	U+8F42	# <cjk>
+0xE778	U+8F3E	# <cjk>
+0xE779	U+8F4C	# <cjk>
+0xE77A	U+8F49	# <cjk>
+0xE77B	U+8F46	# <cjk>
+0xE77C	U+8F4E	# <cjk>
+0xE77D	U+8F57	# <cjk>
+0xE77E	U+8F5C	# <cjk>
+0xE780	U+8F62	# <cjk>
+0xE781	U+8F63	# <cjk>
+0xE782	U+8F64	# <cjk>
+0xE783	U+8F9C	# <cjk>
+0xE784	U+8F9F	# <cjk>
+0xE785	U+8FA3	# <cjk>
+0xE786	U+8FAD	# <cjk>
+0xE787	U+8FAF	# <cjk>
+0xE788	U+8FB7	# <cjk>
+0xE789	U+8FDA	# <cjk>
+0xE78A	U+8FE5	# <cjk>
+0xE78B	U+8FE2	# <cjk>
+0xE78C	U+8FEA	# <cjk>
+0xE78D	U+8FEF	# <cjk>
+0xE78E	U+9087	# <cjk>
+0xE78F	U+8FF4	# <cjk>
+0xE790	U+9005	# <cjk>
+0xE791	U+8FF9	# <cjk>
+0xE792	U+8FFA	# <cjk>
+0xE793	U+9011	# <cjk>
+0xE794	U+9015	# <cjk>
+0xE795	U+9021	# <cjk>
+0xE796	U+900D	# <cjk>
+0xE797	U+901E	# <cjk>
+0xE798	U+9016	# <cjk>
+0xE799	U+900B	# <cjk>
+0xE79A	U+9027	# <cjk>
+0xE79B	U+9036	# <cjk>
+0xE79C	U+9035	# <cjk>
+0xE79D	U+9039	# <cjk>
+0xE79E	U+8FF8	# <cjk>
+0xE79F	U+904F	# <cjk>
+0xE7A0	U+9050	# <cjk>
+0xE7A1	U+9051	# <cjk>
+0xE7A2	U+9052	# <cjk>
+0xE7A3	U+900E	# <cjk>
+0xE7A4	U+9049	# <cjk>
+0xE7A5	U+903E	# <cjk>
+0xE7A6	U+9056	# <cjk>
+0xE7A7	U+9058	# <cjk>
+0xE7A8	U+905E	# <cjk>
+0xE7A9	U+9068	# <cjk>
+0xE7AA	U+906F	# <cjk>
+0xE7AB	U+9076	# <cjk>
+0xE7AC	U+96A8	# <cjk>
+0xE7AD	U+9072	# <cjk>
+0xE7AE	U+9082	# <cjk>
+0xE7AF	U+907D	# <cjk>
+0xE7B0	U+9081	# <cjk>
+0xE7B1	U+9080	# <cjk>
+0xE7B2	U+908A	# <cjk>
+0xE7B3	U+9089	# <cjk>
+0xE7B4	U+908F	# <cjk>
+0xE7B5	U+90A8	# <cjk>
+0xE7B6	U+90AF	# <cjk>
+0xE7B7	U+90B1	# <cjk>
+0xE7B8	U+90B5	# <cjk>
+0xE7B9	U+90E2	# <cjk>
+0xE7BA	U+90E4	# <cjk>
+0xE7BB	U+6248	# <cjk>
+0xE7BC	U+90DB	# <cjk>
+0xE7BD	U+9102	# <cjk>
+0xE7BE	U+9112	# <cjk>
+0xE7BF	U+9119	# <cjk>
+0xE7C0	U+9132	# <cjk>
+0xE7C1	U+9130	# <cjk>
+0xE7C2	U+914A	# <cjk>
+0xE7C3	U+9156	# <cjk>
+0xE7C4	U+9158	# <cjk>
+0xE7C5	U+9163	# <cjk>
+0xE7C6	U+9165	# <cjk>
+0xE7C7	U+9169	# <cjk>
+0xE7C8	U+9173	# <cjk>
+0xE7C9	U+9172	# <cjk>
+0xE7CA	U+918B	# <cjk>
+0xE7CB	U+9189	# <cjk>
+0xE7CC	U+9182	# <cjk>
+0xE7CD	U+91A2	# <cjk>
+0xE7CE	U+91AB	# <cjk>
+0xE7CF	U+91AF	# <cjk>
+0xE7D0	U+91AA	# <cjk>
+0xE7D1	U+91B5	# <cjk>
+0xE7D2	U+91B4	# <cjk>
+0xE7D3	U+91BA	# <cjk>
+0xE7D4	U+91C0	# <cjk>
+0xE7D5	U+91C1	# <cjk>
+0xE7D6	U+91C9	# <cjk>
+0xE7D7	U+91CB	# <cjk>
+0xE7D8	U+91D0	# <cjk>
+0xE7D9	U+91D6	# <cjk>
+0xE7DA	U+91DF	# <cjk>
+0xE7DB	U+91E1	# <cjk>
+0xE7DC	U+91DB	# <cjk>
+0xE7DD	U+91FC	# <cjk>
+0xE7DE	U+91F5	# <cjk>
+0xE7DF	U+91F6	# <cjk>
+0xE7E0	U+921E	# <cjk>
+0xE7E1	U+91FF	# <cjk>
+0xE7E2	U+9214	# <cjk>
+0xE7E3	U+922C	# <cjk>
+0xE7E4	U+9215	# <cjk>
+0xE7E5	U+9211	# <cjk>
+0xE7E6	U+925E	# <cjk>
+0xE7E7	U+9257	# <cjk>
+0xE7E8	U+9245	# <cjk>
+0xE7E9	U+9249	# <cjk>
+0xE7EA	U+9264	# <cjk>
+0xE7EB	U+9248	# <cjk>
+0xE7EC	U+9295	# <cjk>
+0xE7ED	U+923F	# <cjk>
+0xE7EE	U+924B	# <cjk>
+0xE7EF	U+9250	# <cjk>
+0xE7F0	U+929C	# <cjk>
+0xE7F1	U+9296	# <cjk>
+0xE7F2	U+9293	# <cjk>
+0xE7F3	U+929B	# <cjk>
+0xE7F4	U+925A	# <cjk>
+0xE7F5	U+92CF	# <cjk>
+0xE7F6	U+92B9	# <cjk>
+0xE7F7	U+92B7	# <cjk>
+0xE7F8	U+92E9	# <cjk>
+0xE7F9	U+930F	# <cjk>
+0xE7FA	U+92FA	# <cjk>
+0xE7FB	U+9344	# <cjk>
+0xE7FC	U+932E	# <cjk>
+0xE840	U+9319	# <cjk>
+0xE841	U+9322	# <cjk>
+0xE842	U+931A	# <cjk>
+0xE843	U+9323	# <cjk>
+0xE844	U+933A	# <cjk>
+0xE845	U+9335	# <cjk>
+0xE846	U+933B	# <cjk>
+0xE847	U+935C	# <cjk>
+0xE848	U+9360	# <cjk>
+0xE849	U+937C	# <cjk>
+0xE84A	U+936E	# <cjk>
+0xE84B	U+9356	# <cjk>
+0xE84C	U+93B0	# <cjk>
+0xE84D	U+93AC	# <cjk>
+0xE84E	U+93AD	# <cjk>
+0xE84F	U+9394	# <cjk>
+0xE850	U+93B9	# <cjk>
+0xE851	U+93D6	# <cjk>
+0xE852	U+93D7	# <cjk>
+0xE853	U+93E8	# <cjk>
+0xE854	U+93E5	# <cjk>
+0xE855	U+93D8	# <cjk>
+0xE856	U+93C3	# <cjk>
+0xE857	U+93DD	# <cjk>
+0xE858	U+93D0	# <cjk>
+0xE859	U+93C8	# <cjk>
+0xE85A	U+93E4	# <cjk>
+0xE85C	U+9414	# <cjk>
+0xE85D	U+9413	# <cjk>
+0xE85E	U+9403	# <cjk>
+0xE85F	U+9407	# <cjk>
+0xE860	U+9410	# <cjk>
+0xE861	U+9436	# <cjk>
+0xE862	U+942B	# <cjk>
+0xE863	U+9435	# <cjk>
+0xE864	U+9421	# <cjk>
+0xE865	U+943A	# <cjk>
+0xE866	U+9441	# <cjk>
+0xE867	U+9452	# <cjk>
+0xE868	U+9444	# <cjk>
+0xE869	U+945B	# <cjk>
+0xE86A	U+9460	# <cjk>
+0xE86B	U+9462	# <cjk>
+0xE86C	U+945E	# <cjk>
+0xE86D	U+946A	# <cjk>
+0xE86E	U+9229	# <cjk>
+0xE86F	U+9470	# <cjk>
+0xE870	U+9475	# <cjk>
+0xE871	U+9477	# <cjk>
+0xE872	U+947D	# <cjk>
+0xE873	U+945A	# <cjk>
+0xE874	U+947C	# <cjk>
+0xE875	U+947E	# <cjk>
+0xE876	U+9481	# <cjk>
+0xE877	U+947F	# <cjk>
+0xE878	U+9582	# <cjk>
+0xE879	U+9587	# <cjk>
+0xE87A	U+958A	# <cjk>
+0xE87B	U+9594	# <cjk>
+0xE87C	U+9596	# <cjk>
+0xE87D	U+9598	# <cjk>
+0xE87E	U+9599	# <cjk>
+0xE880	U+95A0	# <cjk>
+0xE881	U+95A8	# <cjk>
+0xE882	U+95A7	# <cjk>
+0xE883	U+95AD	# <cjk>
+0xE884	U+95BC	# <cjk>
+0xE885	U+95BB	# <cjk>
+0xE886	U+95B9	# <cjk>
+0xE887	U+95BE	# <cjk>
+0xE888	U+95CA	# <cjk>
+0xE889	U+6FF6	# <cjk>
+0xE88A	U+95C3	# <cjk>
+0xE88B	U+95CD	# <cjk>
+0xE88C	U+95CC	# <cjk>
+0xE88D	U+95D5	# <cjk>
+0xE88E	U+95D4	# <cjk>
+0xE88F	U+95D6	# <cjk>
+0xE890	U+95DC	# <cjk>
+0xE891	U+95E1	# <cjk>
+0xE892	U+95E5	# <cjk>
+0xE893	U+95E2	# <cjk>
+0xE894	U+9621	# <cjk>
+0xE895	U+9628	# <cjk>
+0xE896	U+962E	# <cjk>
+0xE897	U+962F	# <cjk>
+0xE898	U+9642	# <cjk>
+0xE899	U+964C	# <cjk>
+0xE89A	U+964F	# <cjk>
+0xE89B	U+964B	# <cjk>
+0xE89C	U+9677	# <cjk>
+0xE89D	U+965C	# <cjk>
+0xE89E	U+965E	# <cjk>
+0xE89F	U+965D	# <cjk>
+0xE8A0	U+965F	# <cjk>
+0xE8A1	U+9666	# <cjk>
+0xE8A2	U+9672	# <cjk>
+0xE8A3	U+966C	# <cjk>
+0xE8A4	U+968D	# <cjk>
+0xE8A5	U+9698	# <cjk>
+0xE8A6	U+9695	# <cjk>
+0xE8A7	U+9697	# <cjk>
+0xE8A8	U+96AA	# <cjk>
+0xE8A9	U+96A7	# <cjk>
+0xE8AA	U+96B1	# <cjk>
+0xE8AB	U+96B2	# <cjk>
+0xE8AC	U+96B0	# <cjk>
+0xE8AD	U+96B4	# <cjk>
+0xE8AE	U+96B6	# <cjk>
+0xE8AF	U+96B8	# <cjk>
+0xE8B0	U+96B9	# <cjk>
+0xE8B1	U+96CE	# <cjk>
+0xE8B2	U+96CB	# <cjk>
+0xE8B3	U+96C9	# <cjk>
+0xE8B4	U+96CD	# <cjk>
+0xE8B5	U+894D	# <cjk>
+0xE8B6	U+96DC	# <cjk>
+0xE8B7	U+970D	# <cjk>
+0xE8B8	U+96D5	# <cjk>
+0xE8B9	U+96F9	# <cjk>
+0xE8BA	U+9704	# <cjk>
+0xE8BB	U+9706	# <cjk>
+0xE8BC	U+9708	# <cjk>
+0xE8BD	U+9713	# <cjk>
+0xE8BE	U+970E	# <cjk>
+0xE8BF	U+9711	# <cjk>
+0xE8C0	U+970F	# <cjk>
+0xE8C1	U+9716	# <cjk>
+0xE8C2	U+9719	# <cjk>
+0xE8C3	U+9724	# <cjk>
+0xE8C4	U+972A	# <cjk>
+0xE8C5	U+9730	# <cjk>
+0xE8C6	U+9739	# <cjk>
+0xE8C7	U+973D	# <cjk>
+0xE8C8	U+973E	# <cjk>
+0xE8C9	U+9744	# <cjk>
+0xE8CA	U+9746	# <cjk>
+0xE8CB	U+9748	# <cjk>
+0xE8CC	U+9742	# <cjk>
+0xE8CD	U+9749	# <cjk>
+0xE8CE	U+975C	# <cjk>
+0xE8CF	U+9760	# <cjk>
+0xE8D0	U+9764	# <cjk>
+0xE8D1	U+9766	# <cjk>
+0xE8D2	U+9768	# <cjk>
+0xE8D3	U+52D2	# <cjk>
+0xE8D4	U+976B	# <cjk>
+0xE8D5	U+9771	# <cjk>
+0xE8D6	U+9779	# <cjk>
+0xE8D7	U+9785	# <cjk>
+0xE8D8	U+977C	# <cjk>
+0xE8D9	U+9781	# <cjk>
+0xE8DA	U+977A	# <cjk>
+0xE8DB	U+9786	# <cjk>
+0xE8DC	U+978B	# <cjk>
+0xE8DD	U+978F	# <cjk>
+0xE8DE	U+9790	# <cjk>
+0xE8DF	U+979C	# <cjk>
+0xE8E0	U+97A8	# <cjk>
+0xE8E1	U+97A6	# <cjk>
+0xE8E2	U+97A3	# <cjk>
+0xE8E3	U+97B3	# <cjk>
+0xE8E4	U+97B4	# <cjk>
+0xE8E5	U+97C3	# <cjk>
+0xE8E6	U+97C6	# <cjk>
+0xE8E7	U+97C8	# <cjk>
+0xE8E8	U+97CB	# <cjk>
+0xE8E9	U+97DC	# <cjk>
+0xE8EA	U+97ED	# <cjk>
+0xE8EB	U+9F4F	# <cjk>
+0xE8EC	U+97F2	# <cjk>
+0xE8ED	U+7ADF	# <cjk>
+0xE8EE	U+97F6	# <cjk>
+0xE8EF	U+97F5	# <cjk>
+0xE8F0	U+980F	# <cjk>
+0xE8F1	U+980C	# <cjk>
+0xE8F2	U+9838	# <cjk>
+0xE8F3	U+9824	# <cjk>
+0xE8F4	U+9821	# <cjk>
+0xE8F5	U+9837	# <cjk>
+0xE8F6	U+983D	# <cjk>
+0xE8F7	U+9846	# <cjk>
+0xE8F8	U+984F	# <cjk>
+0xE8F9	U+984B	# <cjk>
+0xE8FA	U+986B	# <cjk>
+0xE8FB	U+986F	# <cjk>
+0xE8FC	U+9870	# <cjk>
+0xE940	U+9871	# <cjk>
+0xE941	U+9874	# <cjk>
+0xE942	U+9873	# <cjk>
+0xE943	U+98AA	# <cjk>
+0xE944	U+98AF	# <cjk>
+0xE945	U+98B1	# <cjk>
+0xE946	U+98B6	# <cjk>
+0xE947	U+98C4	# <cjk>
+0xE948	U+98C3	# <cjk>
+0xE949	U+98C6	# <cjk>
+0xE94A	U+98E9	# <cjk>
+0xE94B	U+98EB	# <cjk>
+0xE94C	U+9903	# <cjk>
+0xE94D	U+9909	# <cjk>
+0xE94E	U+9912	# <cjk>
+0xE94F	U+9914	# <cjk>
+0xE950	U+9918	# <cjk>
+0xE951	U+9921	# <cjk>
+0xE952	U+991D	# <cjk>
+0xE953	U+991E	# <cjk>
+0xE954	U+9924	# <cjk>
+0xE955	U+9920	# <cjk>
+0xE956	U+992C	# <cjk>
+0xE957	U+992E	# <cjk>
+0xE958	U+993D	# <cjk>
+0xE959	U+993E	# <cjk>
+0xE95A	U+9942	# <cjk>
+0xE95C	U+9945	# <cjk>
+0xE95D	U+9950	# <cjk>
+0xE95E	U+994B	# <cjk>
+0xE95F	U+9951	# <cjk>
+0xE960	U+9952	# <cjk>
+0xE961	U+994C	# <cjk>
+0xE962	U+9955	# <cjk>
+0xE963	U+9997	# <cjk>
+0xE964	U+9998	# <cjk>
+0xE965	U+99A5	# <cjk>
+0xE966	U+99AD	# <cjk>
+0xE967	U+99AE	# <cjk>
+0xE968	U+99BC	# <cjk>
+0xE969	U+99DF	# <cjk>
+0xE96A	U+99DB	# <cjk>
+0xE96B	U+99DD	# <cjk>
+0xE96C	U+99D8	# <cjk>
+0xE96D	U+99D1	# <cjk>
+0xE96E	U+99ED	# <cjk>
+0xE96F	U+99EE	# <cjk>
+0xE970	U+99F1	# <cjk>
+0xE971	U+99F2	# <cjk>
+0xE972	U+99FB	# <cjk>
+0xE973	U+99F8	# <cjk>
+0xE974	U+9A01	# <cjk>
+0xE975	U+9A0F	# <cjk>
+0xE976	U+9A05	# <cjk>
+0xE977	U+99E2	# <cjk>
+0xE978	U+9A19	# <cjk>
+0xE979	U+9A2B	# <cjk>
+0xE97A	U+9A37	# <cjk>
+0xE97B	U+9A45	# <cjk>
+0xE97C	U+9A42	# <cjk>
+0xE97D	U+9A40	# <cjk>
+0xE97E	U+9A43	# <cjk>
+0xE980	U+9A3E	# <cjk>
+0xE981	U+9A55	# <cjk>
+0xE982	U+9A4D	# <cjk>
+0xE983	U+9A5B	# <cjk>
+0xE984	U+9A57	# <cjk>
+0xE985	U+9A5F	# <cjk>
+0xE986	U+9A62	# <cjk>
+0xE987	U+9A65	# <cjk>
+0xE988	U+9A64	# <cjk>
+0xE989	U+9A69	# <cjk>
+0xE98A	U+9A6B	# <cjk>
+0xE98B	U+9A6A	# <cjk>
+0xE98C	U+9AAD	# <cjk>
+0xE98D	U+9AB0	# <cjk>
+0xE98E	U+9ABC	# <cjk>
+0xE98F	U+9AC0	# <cjk>
+0xE990	U+9ACF	# <cjk>
+0xE991	U+9AD1	# <cjk>
+0xE992	U+9AD3	# <cjk>
+0xE993	U+9AD4	# <cjk>
+0xE994	U+9ADE	# <cjk>
+0xE995	U+9ADF	# <cjk>
+0xE996	U+9AE2	# <cjk>
+0xE997	U+9AE3	# <cjk>
+0xE998	U+9AE6	# <cjk>
+0xE999	U+9AEF	# <cjk>
+0xE99A	U+9AEB	# <cjk>
+0xE99B	U+9AEE	# <cjk>
+0xE99C	U+9AF4	# <cjk>
+0xE99D	U+9AF1	# <cjk>
+0xE99E	U+9AF7	# <cjk>
+0xE99F	U+9AFB	# <cjk>
+0xE9A0	U+9B06	# <cjk>
+0xE9A1	U+9B18	# <cjk>
+0xE9A2	U+9B1A	# <cjk>
+0xE9A3	U+9B1F	# <cjk>
+0xE9A4	U+9B22	# <cjk>
+0xE9A5	U+9B23	# <cjk>
+0xE9A6	U+9B25	# <cjk>
+0xE9A7	U+9B27	# <cjk>
+0xE9A8	U+9B28	# <cjk>
+0xE9A9	U+9B29	# <cjk>
+0xE9AA	U+9B2A	# <cjk>
+0xE9AB	U+9B2E	# <cjk>
+0xE9AC	U+9B2F	# <cjk>
+0xE9AD	U+9B32	# <cjk>
+0xE9AE	U+9B44	# <cjk>
+0xE9AF	U+9B43	# <cjk>
+0xE9B0	U+9B4F	# <cjk>
+0xE9B1	U+9B4D	# <cjk>
+0xE9B2	U+9B4E	# <cjk>
+0xE9B3	U+9B51	# <cjk>
+0xE9B4	U+9B58	# <cjk>
+0xE9B5	U+9B74	# <cjk>
+0xE9B6	U+9B93	# <cjk>
+0xE9B7	U+9B83	# <cjk>
+0xE9B8	U+9B91	# <cjk>
+0xE9B9	U+9B96	# <cjk>
+0xE9BA	U+9B97	# <cjk>
+0xE9BB	U+9B9F	# <cjk>
+0xE9BC	U+9BA0	# <cjk>
+0xE9BD	U+9BA8	# <cjk>
+0xE9BE	U+9BB4	# <cjk>
+0xE9BF	U+9BC0	# <cjk>
+0xE9C0	U+9BCA	# <cjk>
+0xE9C1	U+9BB9	# <cjk>
+0xE9C2	U+9BC6	# <cjk>
+0xE9C3	U+9BCF	# <cjk>
+0xE9C4	U+9BD1	# <cjk>
+0xE9C5	U+9BD2	# <cjk>
+0xE9C6	U+9BE3	# <cjk>
+0xE9C7	U+9BE2	# <cjk>
+0xE9C8	U+9BE4	# <cjk>
+0xE9C9	U+9BD4	# <cjk>
+0xE9CA	U+9BE1	# <cjk>
+0xE9CB	U+9C3A	# <cjk>
+0xE9CC	U+9BF2	# <cjk>
+0xE9CD	U+9BF1	# <cjk>
+0xE9CE	U+9BF0	# <cjk>
+0xE9CF	U+9C15	# <cjk>
+0xE9D0	U+9C14	# <cjk>
+0xE9D1	U+9C09	# <cjk>
+0xE9D2	U+9C13	# <cjk>
+0xE9D3	U+9C0C	# <cjk>
+0xE9D4	U+9C06	# <cjk>
+0xE9D5	U+9C08	# <cjk>
+0xE9D6	U+9C12	# <cjk>
+0xE9D7	U+9C0A	# <cjk>
+0xE9D8	U+9C04	# <cjk>
+0xE9D9	U+9C2E	# <cjk>
+0xE9DA	U+9C1B	# <cjk>
+0xE9DB	U+9C25	# <cjk>
+0xE9DC	U+9C24	# <cjk>
+0xE9DD	U+9C21	# <cjk>
+0xE9DE	U+9C30	# <cjk>
+0xE9DF	U+9C47	# <cjk>
+0xE9E0	U+9C32	# <cjk>
+0xE9E1	U+9C46	# <cjk>
+0xE9E2	U+9C3E	# <cjk>
+0xE9E3	U+9C5A	# <cjk>
+0xE9E4	U+9C60	# <cjk>
+0xE9E5	U+9C67	# <cjk>
+0xE9E6	U+9C76	# <cjk>
+0xE9E7	U+9C78	# <cjk>
+0xE9E8	U+9CE7	# <cjk>
+0xE9E9	U+9CEC	# <cjk>
+0xE9EA	U+9CF0	# <cjk>
+0xE9EB	U+9D09	# <cjk>
+0xE9EC	U+9D08	# <cjk>
+0xE9ED	U+9CEB	# <cjk>
+0xE9EE	U+9D03	# <cjk>
+0xE9EF	U+9D06	# <cjk>
+0xE9F0	U+9D2A	# <cjk>
+0xE9F1	U+9D26	# <cjk>
+0xE9F2	U+9DAF	# <cjk>
+0xE9F3	U+9D23	# <cjk>
+0xE9F4	U+9D1F	# <cjk>
+0xE9F5	U+9D44	# <cjk>
+0xE9F6	U+9D15	# <cjk>
+0xE9F7	U+9D12	# <cjk>
+0xE9F8	U+9D41	# <cjk>
+0xE9F9	U+9D3F	# <cjk>
+0xE9FA	U+9D3E	# <cjk>
+0xE9FB	U+9D46	# <cjk>
+0xE9FC	U+9D48	# <cjk>
+0xEA40	U+9D5D	# <cjk>
+0xEA41	U+9D5E	# <cjk>
+0xEA42	U+9D64	# <cjk>
+0xEA43	U+9D51	# <cjk>
+0xEA44	U+9D50	# <cjk>
+0xEA45	U+9D59	# <cjk>
+0xEA46	U+9D72	# <cjk>
+0xEA47	U+9D89	# <cjk>
+0xEA48	U+9D87	# <cjk>
+0xEA49	U+9DAB	# <cjk>
+0xEA4A	U+9D6F	# <cjk>
+0xEA4B	U+9D7A	# <cjk>
+0xEA4C	U+9D9A	# <cjk>
+0xEA4D	U+9DA4	# <cjk>
+0xEA4E	U+9DA9	# <cjk>
+0xEA4F	U+9DB2	# <cjk>
+0xEA50	U+9DC4	# <cjk>
+0xEA51	U+9DC1	# <cjk>
+0xEA52	U+9DBB	# <cjk>
+0xEA53	U+9DB8	# <cjk>
+0xEA54	U+9DBA	# <cjk>
+0xEA55	U+9DC6	# <cjk>
+0xEA56	U+9DCF	# <cjk>
+0xEA57	U+9DC2	# <cjk>
+0xEA58	U+9DD9	# <cjk>
+0xEA59	U+9DD3	# <cjk>
+0xEA5A	U+9DF8	# <cjk>
+0xEA5C	U+9DED	# <cjk>
+0xEA5D	U+9DEF	# <cjk>
+0xEA5E	U+9DFD	# <cjk>
+0xEA5F	U+9E1A	# <cjk>
+0xEA60	U+9E1B	# <cjk>
+0xEA61	U+9E1E	# <cjk>
+0xEA62	U+9E75	# <cjk>
+0xEA63	U+9E79	# <cjk>
+0xEA64	U+9E7D	# <cjk>
+0xEA65	U+9E81	# <cjk>
+0xEA66	U+9E88	# <cjk>
+0xEA67	U+9E8B	# <cjk>
+0xEA68	U+9E8C	# <cjk>
+0xEA69	U+9E92	# <cjk>
+0xEA6A	U+9E95	# <cjk>
+0xEA6B	U+9E91	# <cjk>
+0xEA6C	U+9E9D	# <cjk>
+0xEA6D	U+9EA5	# <cjk>
+0xEA6E	U+9EA9	# <cjk>
+0xEA6F	U+9EB8	# <cjk>
+0xEA70	U+9EAA	# <cjk>
+0xEA71	U+9EAD	# <cjk>
+0xEA72	U+9761	# <cjk>
+0xEA73	U+9ECC	# <cjk>
+0xEA74	U+9ECE	# <cjk>
+0xEA75	U+9ECF	# <cjk>
+0xEA76	U+9ED0	# <cjk>
+0xEA77	U+9ED4	# <cjk>
+0xEA78	U+9EDC	# <cjk>
+0xEA79	U+9EDE	# <cjk>
+0xEA7A	U+9EDD	# <cjk>
+0xEA7B	U+9EE0	# <cjk>
+0xEA7C	U+9EE5	# <cjk>
+0xEA7D	U+9EE8	# <cjk>
+0xEA7E	U+9EEF	# <cjk>
+0xEA80	U+9EF4	# <cjk>
+0xEA81	U+9EF6	# <cjk>
+0xEA82	U+9EF7	# <cjk>
+0xEA83	U+9EF9	# <cjk>
+0xEA84	U+9EFB	# <cjk>
+0xEA85	U+9EFC	# <cjk>
+0xEA86	U+9EFD	# <cjk>
+0xEA87	U+9F07	# <cjk>
+0xEA88	U+9F08	# <cjk>
+0xEA89	U+76B7	# <cjk>
+0xEA8A	U+9F15	# <cjk>
+0xEA8B	U+9F21	# <cjk>
+0xEA8C	U+9F2C	# <cjk>
+0xEA8D	U+9F3E	# <cjk>
+0xEA8E	U+9F4A	# <cjk>
+0xEA8F	U+9F52	# <cjk>
+0xEA90	U+9F54	# <cjk>
+0xEA91	U+9F63	# <cjk>
+0xEA92	U+9F5F	# <cjk>
+0xEA93	U+9F60	# <cjk>
+0xEA94	U+9F61	# <cjk>
+0xEA95	U+9F66	# <cjk>
+0xEA96	U+9F67	# <cjk>
+0xEA97	U+9F6C	# <cjk>
+0xEA98	U+9F6A	# <cjk>
+0xEA99	U+9F77	# <cjk>
+0xEA9A	U+9F72	# <cjk>
+0xEA9B	U+9F76	# <cjk>
+0xEA9C	U+9F95	# <cjk>
+0xEA9D	U+9F9C	# <cjk>
+0xEA9E	U+9FA0	# <cjk>
+0xEA9F	U+582F	# <cjk>	[1983]
+0xEAA0	U+69C7	# <cjk>	[1983]
+0xEAA1	U+9059	# <cjk>	[1983]
+0xEAA2	U+7464	# <cjk>	[1983]
+0xEAA3	U+51DC	# <cjk>	[1990]
+0xEAA4	U+7199	# <cjk>	[1990]
+0xEAA5		# <reserved>
+0xEAA6		# <reserved>
+0xEAA7		# <reserved>
+0xEAA8		# <reserved>
+0xEAA9		# <reserved>
+0xEAAA		# <reserved>
+0xEAAB		# <reserved>
+0xEAAC		# <reserved>
+0xEAAD		# <reserved>
+0xEAAE		# <reserved>
+0xEAAF		# <reserved>
+0xEAB0		# <reserved>
+0xEAB1		# <reserved>
+0xEAB2		# <reserved>
+0xEAB3		# <reserved>
+0xEAB4		# <reserved>
+0xEAB5		# <reserved>
+0xEAB6		# <reserved>
+0xEAB7		# <reserved>
+0xEAB8		# <reserved>
+0xEAB9		# <reserved>
+0xEABA		# <reserved>
+0xEABB		# <reserved>
+0xEABC		# <reserved>
+0xEABD		# <reserved>
+0xEABE		# <reserved>
+0xEABF		# <reserved>
+0xEAC0		# <reserved>
+0xEAC1		# <reserved>
+0xEAC2		# <reserved>
+0xEAC3		# <reserved>
+0xEAC4		# <reserved>
+0xEAC5		# <reserved>
+0xEAC6		# <reserved>
+0xEAC7		# <reserved>
+0xEAC8		# <reserved>
+0xEAC9		# <reserved>
+0xEACA		# <reserved>
+0xEACB		# <reserved>
+0xEACC		# <reserved>
+0xEACD		# <reserved>
+0xEACE		# <reserved>
+0xEACF		# <reserved>
+0xEAD0		# <reserved>
+0xEAD1		# <reserved>
+0xEAD2		# <reserved>
+0xEAD3		# <reserved>
+0xEAD4		# <reserved>
+0xEAD5		# <reserved>
+0xEAD6		# <reserved>
+0xEAD7		# <reserved>
+0xEAD8		# <reserved>
+0xEAD9		# <reserved>
+0xEADA		# <reserved>
+0xEADB		# <reserved>
+0xEADC		# <reserved>
+0xEADD		# <reserved>
+0xEADE		# <reserved>
+0xEADF		# <reserved>
+0xEAE0		# <reserved>
+0xEAE1		# <reserved>
+0xEAE2		# <reserved>
+0xEAE3		# <reserved>
+0xEAE4		# <reserved>
+0xEAE5		# <reserved>
+0xEAE6		# <reserved>
+0xEAE7		# <reserved>
+0xEAE8		# <reserved>
+0xEAE9		# <reserved>
+0xEAEA		# <reserved>
+0xEAEB		# <reserved>
+0xEAEC		# <reserved>
+0xEAED		# <reserved>
+0xEAEE		# <reserved>
+0xEAEF		# <reserved>
+0xEAF0		# <reserved>
+0xEAF1		# <reserved>
+0xEAF2		# <reserved>
+0xEAF3		# <reserved>
+0xEAF4		# <reserved>
+0xEAF5		# <reserved>
+0xEAF6		# <reserved>
+0xEAF7		# <reserved>
+0xEAF8		# <reserved>
+0xEAF9		# <reserved>
+0xEAFA		# <reserved>
+0xEAFB		# <reserved>
+0xEAFC		# <reserved>
+0xEB40		# <reserved>
+0xEB41		# <reserved>
+0xEB42		# <reserved>
+0xEB43		# <reserved>
+0xEB44		# <reserved>
+0xEB45		# <reserved>
+0xEB46		# <reserved>
+0xEB47		# <reserved>
+0xEB48		# <reserved>
+0xEB49		# <reserved>
+0xEB4A		# <reserved>
+0xEB4B		# <reserved>
+0xEB4C		# <reserved>
+0xEB4D		# <reserved>
+0xEB4E		# <reserved>
+0xEB4F		# <reserved>
+0xEB50		# <reserved>
+0xEB51		# <reserved>
+0xEB52		# <reserved>
+0xEB53		# <reserved>
+0xEB54		# <reserved>
+0xEB55		# <reserved>
+0xEB56		# <reserved>
+0xEB57		# <reserved>
+0xEB58		# <reserved>
+0xEB59		# <reserved>
+0xEB5A		# <reserved>
+0xEB5C		# <reserved>
+0xEB5D		# <reserved>
+0xEB5E		# <reserved>
+0xEB5F		# <reserved>
+0xEB60		# <reserved>
+0xEB61		# <reserved>
+0xEB62		# <reserved>
+0xEB63		# <reserved>
+0xEB64		# <reserved>
+0xEB65		# <reserved>
+0xEB66		# <reserved>
+0xEB67		# <reserved>
+0xEB68		# <reserved>
+0xEB69		# <reserved>
+0xEB6A		# <reserved>
+0xEB6B		# <reserved>
+0xEB6C		# <reserved>
+0xEB6D		# <reserved>
+0xEB6E		# <reserved>
+0xEB6F		# <reserved>
+0xEB70		# <reserved>
+0xEB71		# <reserved>
+0xEB72		# <reserved>
+0xEB73		# <reserved>
+0xEB74		# <reserved>
+0xEB75		# <reserved>
+0xEB76		# <reserved>
+0xEB77		# <reserved>
+0xEB78		# <reserved>
+0xEB79		# <reserved>
+0xEB7A		# <reserved>
+0xEB7B		# <reserved>
+0xEB7C		# <reserved>
+0xEB7D		# <reserved>
+0xEB7E		# <reserved>
+0xEB80		# <reserved>
+0xEB81		# <reserved>
+0xEB82		# <reserved>
+0xEB83		# <reserved>
+0xEB84		# <reserved>
+0xEB85		# <reserved>
+0xEB86		# <reserved>
+0xEB87		# <reserved>
+0xEB88		# <reserved>
+0xEB89		# <reserved>
+0xEB8A		# <reserved>
+0xEB8B		# <reserved>
+0xEB8C		# <reserved>
+0xEB8D		# <reserved>
+0xEB8E		# <reserved>
+0xEB8F		# <reserved>
+0xEB90		# <reserved>
+0xEB91		# <reserved>
+0xEB92		# <reserved>
+0xEB93		# <reserved>
+0xEB94		# <reserved>
+0xEB95		# <reserved>
+0xEB96		# <reserved>
+0xEB97		# <reserved>
+0xEB98		# <reserved>
+0xEB99		# <reserved>
+0xEB9A		# <reserved>
+0xEB9B		# <reserved>
+0xEB9C		# <reserved>
+0xEB9D		# <reserved>
+0xEB9E		# <reserved>
+0xEB9F		# <reserved>
+0xEBA0		# <reserved>
+0xEBA1		# <reserved>
+0xEBA2		# <reserved>
+0xEBA3		# <reserved>
+0xEBA4		# <reserved>
+0xEBA5		# <reserved>
+0xEBA6		# <reserved>
+0xEBA7		# <reserved>
+0xEBA8		# <reserved>
+0xEBA9		# <reserved>
+0xEBAA		# <reserved>
+0xEBAB		# <reserved>
+0xEBAC		# <reserved>
+0xEBAD		# <reserved>
+0xEBAE		# <reserved>
+0xEBAF		# <reserved>
+0xEBB0		# <reserved>
+0xEBB1		# <reserved>
+0xEBB2		# <reserved>
+0xEBB3		# <reserved>
+0xEBB4		# <reserved>
+0xEBB5		# <reserved>
+0xEBB6		# <reserved>
+0xEBB7		# <reserved>
+0xEBB8		# <reserved>
+0xEBB9		# <reserved>
+0xEBBA		# <reserved>
+0xEBBB		# <reserved>
+0xEBBC		# <reserved>
+0xEBBD		# <reserved>
+0xEBBE		# <reserved>
+0xEBBF		# <reserved>
+0xEBC0		# <reserved>
+0xEBC1		# <reserved>
+0xEBC2		# <reserved>
+0xEBC3		# <reserved>
+0xEBC4		# <reserved>
+0xEBC5		# <reserved>
+0xEBC6		# <reserved>
+0xEBC7		# <reserved>
+0xEBC8		# <reserved>
+0xEBC9		# <reserved>
+0xEBCA		# <reserved>
+0xEBCB		# <reserved>
+0xEBCC		# <reserved>
+0xEBCD		# <reserved>
+0xEBCE		# <reserved>
+0xEBCF		# <reserved>
+0xEBD0		# <reserved>
+0xEBD1		# <reserved>
+0xEBD2		# <reserved>
+0xEBD3		# <reserved>
+0xEBD4		# <reserved>
+0xEBD5		# <reserved>
+0xEBD6		# <reserved>
+0xEBD7		# <reserved>
+0xEBD8		# <reserved>
+0xEBD9		# <reserved>
+0xEBDA		# <reserved>
+0xEBDB		# <reserved>
+0xEBDC		# <reserved>
+0xEBDD		# <reserved>
+0xEBDE		# <reserved>
+0xEBDF		# <reserved>
+0xEBE0		# <reserved>
+0xEBE1		# <reserved>
+0xEBE2		# <reserved>
+0xEBE3		# <reserved>
+0xEBE4		# <reserved>
+0xEBE5		# <reserved>
+0xEBE6		# <reserved>
+0xEBE7		# <reserved>
+0xEBE8		# <reserved>
+0xEBE9		# <reserved>
+0xEBEA		# <reserved>
+0xEBEB		# <reserved>
+0xEBEC		# <reserved>
+0xEBED		# <reserved>
+0xEBEE		# <reserved>
+0xEBEF		# <reserved>
+0xEBF0		# <reserved>
+0xEBF1		# <reserved>
+0xEBF2		# <reserved>
+0xEBF3		# <reserved>
+0xEBF4		# <reserved>
+0xEBF5		# <reserved>
+0xEBF6		# <reserved>
+0xEBF7		# <reserved>
+0xEBF8		# <reserved>
+0xEBF9		# <reserved>
+0xEBFA		# <reserved>
+0xEBFB		# <reserved>
+0xEBFC		# <reserved>
+0xEC40		# <reserved>
+0xEC41		# <reserved>
+0xEC42		# <reserved>
+0xEC43		# <reserved>
+0xEC44		# <reserved>
+0xEC45		# <reserved>
+0xEC46		# <reserved>
+0xEC47		# <reserved>
+0xEC48		# <reserved>
+0xEC49		# <reserved>
+0xEC4A		# <reserved>
+0xEC4B		# <reserved>
+0xEC4C		# <reserved>
+0xEC4D		# <reserved>
+0xEC4E		# <reserved>
+0xEC4F		# <reserved>
+0xEC50		# <reserved>
+0xEC51		# <reserved>
+0xEC52		# <reserved>
+0xEC53		# <reserved>
+0xEC54		# <reserved>
+0xEC55		# <reserved>
+0xEC56		# <reserved>
+0xEC57		# <reserved>
+0xEC58		# <reserved>
+0xEC59		# <reserved>
+0xEC5A		# <reserved>
+0xEC5C		# <reserved>
+0xEC5D		# <reserved>
+0xEC5E		# <reserved>
+0xEC5F		# <reserved>
+0xEC60		# <reserved>
+0xEC61		# <reserved>
+0xEC62		# <reserved>
+0xEC63		# <reserved>
+0xEC64		# <reserved>
+0xEC65		# <reserved>
+0xEC66		# <reserved>
+0xEC67		# <reserved>
+0xEC68		# <reserved>
+0xEC69		# <reserved>
+0xEC6A		# <reserved>
+0xEC6B		# <reserved>
+0xEC6C		# <reserved>
+0xEC6D		# <reserved>
+0xEC6E		# <reserved>
+0xEC6F		# <reserved>
+0xEC70		# <reserved>
+0xEC71		# <reserved>
+0xEC72		# <reserved>
+0xEC73		# <reserved>
+0xEC74		# <reserved>
+0xEC75		# <reserved>
+0xEC76		# <reserved>
+0xEC77		# <reserved>
+0xEC78		# <reserved>
+0xEC79		# <reserved>
+0xEC7A		# <reserved>
+0xEC7B		# <reserved>
+0xEC7C		# <reserved>
+0xEC7D		# <reserved>
+0xEC7E		# <reserved>
+0xEC80		# <reserved>
+0xEC81		# <reserved>
+0xEC82		# <reserved>
+0xEC83		# <reserved>
+0xEC84		# <reserved>
+0xEC85		# <reserved>
+0xEC86		# <reserved>
+0xEC87		# <reserved>
+0xEC88		# <reserved>
+0xEC89		# <reserved>
+0xEC8A		# <reserved>
+0xEC8B		# <reserved>
+0xEC8C		# <reserved>
+0xEC8D		# <reserved>
+0xEC8E		# <reserved>
+0xEC8F		# <reserved>
+0xEC90		# <reserved>
+0xEC91		# <reserved>
+0xEC92		# <reserved>
+0xEC93		# <reserved>
+0xEC94		# <reserved>
+0xEC95		# <reserved>
+0xEC96		# <reserved>
+0xEC97		# <reserved>
+0xEC98		# <reserved>
+0xEC99		# <reserved>
+0xEC9A		# <reserved>
+0xEC9B		# <reserved>
+0xEC9C		# <reserved>
+0xEC9D		# <reserved>
+0xEC9E		# <reserved>
+0xEC9F		# <reserved>
+0xECA0		# <reserved>
+0xECA1		# <reserved>
+0xECA2		# <reserved>
+0xECA3		# <reserved>
+0xECA4		# <reserved>
+0xECA5		# <reserved>
+0xECA6		# <reserved>
+0xECA7		# <reserved>
+0xECA8		# <reserved>
+0xECA9		# <reserved>
+0xECAA		# <reserved>
+0xECAB		# <reserved>
+0xECAC		# <reserved>
+0xECAD		# <reserved>
+0xECAE		# <reserved>
+0xECAF		# <reserved>
+0xECB0		# <reserved>
+0xECB1		# <reserved>
+0xECB2		# <reserved>
+0xECB3		# <reserved>
+0xECB4		# <reserved>
+0xECB5		# <reserved>
+0xECB6		# <reserved>
+0xECB7		# <reserved>
+0xECB8		# <reserved>
+0xECB9		# <reserved>
+0xECBA		# <reserved>
+0xECBB		# <reserved>
+0xECBC		# <reserved>
+0xECBD		# <reserved>
+0xECBE		# <reserved>
+0xECBF		# <reserved>
+0xECC0		# <reserved>
+0xECC1		# <reserved>
+0xECC2		# <reserved>
+0xECC3		# <reserved>
+0xECC4		# <reserved>
+0xECC5		# <reserved>
+0xECC6		# <reserved>
+0xECC7		# <reserved>
+0xECC8		# <reserved>
+0xECC9		# <reserved>
+0xECCA		# <reserved>
+0xECCB		# <reserved>
+0xECCC		# <reserved>
+0xECCD		# <reserved>
+0xECCE		# <reserved>
+0xECCF		# <reserved>
+0xECD0		# <reserved>
+0xECD1		# <reserved>
+0xECD2		# <reserved>
+0xECD3		# <reserved>
+0xECD4		# <reserved>
+0xECD5		# <reserved>
+0xECD6		# <reserved>
+0xECD7		# <reserved>
+0xECD8		# <reserved>
+0xECD9		# <reserved>
+0xECDA		# <reserved>
+0xECDB		# <reserved>
+0xECDC		# <reserved>
+0xECDD		# <reserved>
+0xECDE		# <reserved>
+0xECDF		# <reserved>
+0xECE0		# <reserved>
+0xECE1		# <reserved>
+0xECE2		# <reserved>
+0xECE3		# <reserved>
+0xECE4		# <reserved>
+0xECE5		# <reserved>
+0xECE6		# <reserved>
+0xECE7		# <reserved>
+0xECE8		# <reserved>
+0xECE9		# <reserved>
+0xECEA		# <reserved>
+0xECEB		# <reserved>
+0xECEC		# <reserved>
+0xECED		# <reserved>
+0xECEE		# <reserved>
+0xECEF		# <reserved>
+0xECF0		# <reserved>
+0xECF1		# <reserved>
+0xECF2		# <reserved>
+0xECF3		# <reserved>
+0xECF4		# <reserved>
+0xECF5		# <reserved>
+0xECF6		# <reserved>
+0xECF7		# <reserved>
+0xECF8		# <reserved>
+0xECF9		# <reserved>
+0xECFA		# <reserved>
+0xECFB		# <reserved>
+0xECFC		# <reserved>
+0xED40		# <reserved>
+0xED41		# <reserved>
+0xED42		# <reserved>
+0xED43		# <reserved>
+0xED44		# <reserved>
+0xED45		# <reserved>
+0xED46		# <reserved>
+0xED47		# <reserved>
+0xED48		# <reserved>
+0xED49		# <reserved>
+0xED4A		# <reserved>
+0xED4B		# <reserved>
+0xED4C		# <reserved>
+0xED4D		# <reserved>
+0xED4E		# <reserved>
+0xED4F		# <reserved>
+0xED50		# <reserved>
+0xED51		# <reserved>
+0xED52		# <reserved>
+0xED53		# <reserved>
+0xED54		# <reserved>
+0xED55		# <reserved>
+0xED56		# <reserved>
+0xED57		# <reserved>
+0xED58		# <reserved>
+0xED59		# <reserved>
+0xED5A		# <reserved>
+0xED5C		# <reserved>
+0xED5D		# <reserved>
+0xED5E		# <reserved>
+0xED5F		# <reserved>
+0xED60		# <reserved>
+0xED61		# <reserved>
+0xED62		# <reserved>
+0xED63		# <reserved>
+0xED64		# <reserved>
+0xED65		# <reserved>
+0xED66		# <reserved>
+0xED67		# <reserved>
+0xED68		# <reserved>
+0xED69		# <reserved>
+0xED6A		# <reserved>
+0xED6B		# <reserved>
+0xED6C		# <reserved>
+0xED6D		# <reserved>
+0xED6E		# <reserved>
+0xED6F		# <reserved>
+0xED70		# <reserved>
+0xED71		# <reserved>
+0xED72		# <reserved>
+0xED73		# <reserved>
+0xED74		# <reserved>
+0xED75		# <reserved>
+0xED76		# <reserved>
+0xED77		# <reserved>
+0xED78		# <reserved>
+0xED79		# <reserved>
+0xED7A		# <reserved>
+0xED7B		# <reserved>
+0xED7C		# <reserved>
+0xED7D		# <reserved>
+0xED7E		# <reserved>
+0xED80		# <reserved>
+0xED81		# <reserved>
+0xED82		# <reserved>
+0xED83		# <reserved>
+0xED84		# <reserved>
+0xED85		# <reserved>
+0xED86		# <reserved>
+0xED87		# <reserved>
+0xED88		# <reserved>
+0xED89		# <reserved>
+0xED8A		# <reserved>
+0xED8B		# <reserved>
+0xED8C		# <reserved>
+0xED8D		# <reserved>
+0xED8E		# <reserved>
+0xED8F		# <reserved>
+0xED90		# <reserved>
+0xED91		# <reserved>
+0xED92		# <reserved>
+0xED93		# <reserved>
+0xED94		# <reserved>
+0xED95		# <reserved>
+0xED96		# <reserved>
+0xED97		# <reserved>
+0xED98		# <reserved>
+0xED99		# <reserved>
+0xED9A		# <reserved>
+0xED9B		# <reserved>
+0xED9C		# <reserved>
+0xED9D		# <reserved>
+0xED9E		# <reserved>
+0xED9F		# <reserved>
+0xEDA0		# <reserved>
+0xEDA1		# <reserved>
+0xEDA2		# <reserved>
+0xEDA3		# <reserved>
+0xEDA4		# <reserved>
+0xEDA5		# <reserved>
+0xEDA6		# <reserved>
+0xEDA7		# <reserved>
+0xEDA8		# <reserved>
+0xEDA9		# <reserved>
+0xEDAA		# <reserved>
+0xEDAB		# <reserved>
+0xEDAC		# <reserved>
+0xEDAD		# <reserved>
+0xEDAE		# <reserved>
+0xEDAF		# <reserved>
+0xEDB0		# <reserved>
+0xEDB1		# <reserved>
+0xEDB2		# <reserved>
+0xEDB3		# <reserved>
+0xEDB4		# <reserved>
+0xEDB5		# <reserved>
+0xEDB6		# <reserved>
+0xEDB7		# <reserved>
+0xEDB8		# <reserved>
+0xEDB9		# <reserved>
+0xEDBA		# <reserved>
+0xEDBB		# <reserved>
+0xEDBC		# <reserved>
+0xEDBD		# <reserved>
+0xEDBE		# <reserved>
+0xEDBF		# <reserved>
+0xEDC0		# <reserved>
+0xEDC1		# <reserved>
+0xEDC2		# <reserved>
+0xEDC3		# <reserved>
+0xEDC4		# <reserved>
+0xEDC5		# <reserved>
+0xEDC6		# <reserved>
+0xEDC7		# <reserved>
+0xEDC8		# <reserved>
+0xEDC9		# <reserved>
+0xEDCA		# <reserved>
+0xEDCB		# <reserved>
+0xEDCC		# <reserved>
+0xEDCD		# <reserved>
+0xEDCE		# <reserved>
+0xEDCF		# <reserved>
+0xEDD0		# <reserved>
+0xEDD1		# <reserved>
+0xEDD2		# <reserved>
+0xEDD3		# <reserved>
+0xEDD4		# <reserved>
+0xEDD5		# <reserved>
+0xEDD6		# <reserved>
+0xEDD7		# <reserved>
+0xEDD8		# <reserved>
+0xEDD9		# <reserved>
+0xEDDA		# <reserved>
+0xEDDB		# <reserved>
+0xEDDC		# <reserved>
+0xEDDD		# <reserved>
+0xEDDE		# <reserved>
+0xEDDF		# <reserved>
+0xEDE0		# <reserved>
+0xEDE1		# <reserved>
+0xEDE2		# <reserved>
+0xEDE3		# <reserved>
+0xEDE4		# <reserved>
+0xEDE5		# <reserved>
+0xEDE6		# <reserved>
+0xEDE7		# <reserved>
+0xEDE8		# <reserved>
+0xEDE9		# <reserved>
+0xEDEA		# <reserved>
+0xEDEB		# <reserved>
+0xEDEC		# <reserved>
+0xEDED		# <reserved>
+0xEDEE		# <reserved>
+0xEDEF		# <reserved>
+0xEDF0		# <reserved>
+0xEDF1		# <reserved>
+0xEDF2		# <reserved>
+0xEDF3		# <reserved>
+0xEDF4		# <reserved>
+0xEDF5		# <reserved>
+0xEDF6		# <reserved>
+0xEDF7		# <reserved>
+0xEDF8		# <reserved>
+0xEDF9		# <reserved>
+0xEDFA		# <reserved>
+0xEDFB		# <reserved>
+0xEDFC		# <reserved>
+0xEE40		# <reserved>
+0xEE41		# <reserved>
+0xEE42		# <reserved>
+0xEE43		# <reserved>
+0xEE44		# <reserved>
+0xEE45		# <reserved>
+0xEE46		# <reserved>
+0xEE47		# <reserved>
+0xEE48		# <reserved>
+0xEE49		# <reserved>
+0xEE4A		# <reserved>
+0xEE4B		# <reserved>
+0xEE4C		# <reserved>
+0xEE4D		# <reserved>
+0xEE4E		# <reserved>
+0xEE4F		# <reserved>
+0xEE50		# <reserved>
+0xEE51		# <reserved>
+0xEE52		# <reserved>
+0xEE53		# <reserved>
+0xEE54		# <reserved>
+0xEE55		# <reserved>
+0xEE56		# <reserved>
+0xEE57		# <reserved>
+0xEE58		# <reserved>
+0xEE59		# <reserved>
+0xEE5A		# <reserved>
+0xEE5C		# <reserved>
+0xEE5D		# <reserved>
+0xEE5E		# <reserved>
+0xEE5F		# <reserved>
+0xEE60		# <reserved>
+0xEE61		# <reserved>
+0xEE62		# <reserved>
+0xEE63		# <reserved>
+0xEE64		# <reserved>
+0xEE65		# <reserved>
+0xEE66		# <reserved>
+0xEE67		# <reserved>
+0xEE68		# <reserved>
+0xEE69		# <reserved>
+0xEE6A		# <reserved>
+0xEE6B		# <reserved>
+0xEE6C		# <reserved>
+0xEE6D		# <reserved>
+0xEE6E		# <reserved>
+0xEE6F		# <reserved>
+0xEE70		# <reserved>
+0xEE71		# <reserved>
+0xEE72		# <reserved>
+0xEE73		# <reserved>
+0xEE74		# <reserved>
+0xEE75		# <reserved>
+0xEE76		# <reserved>
+0xEE77		# <reserved>
+0xEE78		# <reserved>
+0xEE79		# <reserved>
+0xEE7A		# <reserved>
+0xEE7B		# <reserved>
+0xEE7C		# <reserved>
+0xEE7D		# <reserved>
+0xEE7E		# <reserved>
+0xEE80		# <reserved>
+0xEE81		# <reserved>
+0xEE82		# <reserved>
+0xEE83		# <reserved>
+0xEE84		# <reserved>
+0xEE85		# <reserved>
+0xEE86		# <reserved>
+0xEE87		# <reserved>
+0xEE88		# <reserved>
+0xEE89		# <reserved>
+0xEE8A		# <reserved>
+0xEE8B		# <reserved>
+0xEE8C		# <reserved>
+0xEE8D		# <reserved>
+0xEE8E		# <reserved>
+0xEE8F		# <reserved>
+0xEE90		# <reserved>
+0xEE91		# <reserved>
+0xEE92		# <reserved>
+0xEE93		# <reserved>
+0xEE94		# <reserved>
+0xEE95		# <reserved>
+0xEE96		# <reserved>
+0xEE97		# <reserved>
+0xEE98		# <reserved>
+0xEE99		# <reserved>
+0xEE9A		# <reserved>
+0xEE9B		# <reserved>
+0xEE9C		# <reserved>
+0xEE9D		# <reserved>
+0xEE9E		# <reserved>
+0xEE9F		# <reserved>
+0xEEA0		# <reserved>
+0xEEA1		# <reserved>
+0xEEA2		# <reserved>
+0xEEA3		# <reserved>
+0xEEA4		# <reserved>
+0xEEA5		# <reserved>
+0xEEA6		# <reserved>
+0xEEA7		# <reserved>
+0xEEA8		# <reserved>
+0xEEA9		# <reserved>
+0xEEAA		# <reserved>
+0xEEAB		# <reserved>
+0xEEAC		# <reserved>
+0xEEAD		# <reserved>
+0xEEAE		# <reserved>
+0xEEAF		# <reserved>
+0xEEB0		# <reserved>
+0xEEB1		# <reserved>
+0xEEB2		# <reserved>
+0xEEB3		# <reserved>
+0xEEB4		# <reserved>
+0xEEB5		# <reserved>
+0xEEB6		# <reserved>
+0xEEB7		# <reserved>
+0xEEB8		# <reserved>
+0xEEB9		# <reserved>
+0xEEBA		# <reserved>
+0xEEBB		# <reserved>
+0xEEBC		# <reserved>
+0xEEBD		# <reserved>
+0xEEBE		# <reserved>
+0xEEBF		# <reserved>
+0xEEC0		# <reserved>
+0xEEC1		# <reserved>
+0xEEC2		# <reserved>
+0xEEC3		# <reserved>
+0xEEC4		# <reserved>
+0xEEC5		# <reserved>
+0xEEC6		# <reserved>
+0xEEC7		# <reserved>
+0xEEC8		# <reserved>
+0xEEC9		# <reserved>
+0xEECA		# <reserved>
+0xEECB		# <reserved>
+0xEECC		# <reserved>
+0xEECD		# <reserved>
+0xEECE		# <reserved>
+0xEECF		# <reserved>
+0xEED0		# <reserved>
+0xEED1		# <reserved>
+0xEED2		# <reserved>
+0xEED3		# <reserved>
+0xEED4		# <reserved>
+0xEED5		# <reserved>
+0xEED6		# <reserved>
+0xEED7		# <reserved>
+0xEED8		# <reserved>
+0xEED9		# <reserved>
+0xEEDA		# <reserved>
+0xEEDB		# <reserved>
+0xEEDC		# <reserved>
+0xEEDD		# <reserved>
+0xEEDE		# <reserved>
+0xEEDF		# <reserved>
+0xEEE0		# <reserved>
+0xEEE1		# <reserved>
+0xEEE2		# <reserved>
+0xEEE3		# <reserved>
+0xEEE4		# <reserved>
+0xEEE5		# <reserved>
+0xEEE6		# <reserved>
+0xEEE7		# <reserved>
+0xEEE8		# <reserved>
+0xEEE9		# <reserved>
+0xEEEA		# <reserved>
+0xEEEB		# <reserved>
+0xEEEC		# <reserved>
+0xEEED		# <reserved>
+0xEEEE		# <reserved>
+0xEEEF		# <reserved>
+0xEEF0		# <reserved>
+0xEEF1		# <reserved>
+0xEEF2		# <reserved>
+0xEEF3		# <reserved>
+0xEEF4		# <reserved>
+0xEEF5		# <reserved>
+0xEEF6		# <reserved>
+0xEEF7		# <reserved>
+0xEEF8		# <reserved>
+0xEEF9		# <reserved>
+0xEEFA		# <reserved>
+0xEEFB		# <reserved>
+0xEEFC		# <reserved>
+0xEF40		# <reserved>
+0xEF41		# <reserved>
+0xEF42		# <reserved>
+0xEF43		# <reserved>
+0xEF44		# <reserved>
+0xEF45		# <reserved>
+0xEF46		# <reserved>
+0xEF47		# <reserved>
+0xEF48		# <reserved>
+0xEF49		# <reserved>
+0xEF4A		# <reserved>
+0xEF4B		# <reserved>
+0xEF4C		# <reserved>
+0xEF4D		# <reserved>
+0xEF4E		# <reserved>
+0xEF4F		# <reserved>
+0xEF50		# <reserved>
+0xEF51		# <reserved>
+0xEF52		# <reserved>
+0xEF53		# <reserved>
+0xEF54		# <reserved>
+0xEF55		# <reserved>
+0xEF56		# <reserved>
+0xEF57		# <reserved>
+0xEF58		# <reserved>
+0xEF59		# <reserved>
+0xEF5A		# <reserved>
+0xEF5C		# <reserved>
+0xEF5D		# <reserved>
+0xEF5E		# <reserved>
+0xEF5F		# <reserved>
+0xEF60		# <reserved>
+0xEF61		# <reserved>
+0xEF62		# <reserved>
+0xEF63		# <reserved>
+0xEF64		# <reserved>
+0xEF65		# <reserved>
+0xEF66		# <reserved>
+0xEF67		# <reserved>
+0xEF68		# <reserved>
+0xEF69		# <reserved>
+0xEF6A		# <reserved>
+0xEF6B		# <reserved>
+0xEF6C		# <reserved>
+0xEF6D		# <reserved>
+0xEF6E		# <reserved>
+0xEF6F		# <reserved>
+0xEF70		# <reserved>
+0xEF71		# <reserved>
+0xEF72		# <reserved>
+0xEF73		# <reserved>
+0xEF74		# <reserved>
+0xEF75		# <reserved>
+0xEF76		# <reserved>
+0xEF77		# <reserved>
+0xEF78		# <reserved>
+0xEF79		# <reserved>
+0xEF7A		# <reserved>
+0xEF7B		# <reserved>
+0xEF7C		# <reserved>
+0xEF7D		# <reserved>
+0xEF7E		# <reserved>
+0xEF80		# <reserved>
+0xEF81		# <reserved>
+0xEF82		# <reserved>
+0xEF83		# <reserved>
+0xEF84		# <reserved>
+0xEF85		# <reserved>
+0xEF86		# <reserved>
+0xEF87		# <reserved>
+0xEF88		# <reserved>
+0xEF89		# <reserved>
+0xEF8A		# <reserved>
+0xEF8B		# <reserved>
+0xEF8C		# <reserved>
+0xEF8D		# <reserved>
+0xEF8E		# <reserved>
+0xEF8F		# <reserved>
+0xEF90		# <reserved>
+0xEF91		# <reserved>
+0xEF92		# <reserved>
+0xEF93		# <reserved>
+0xEF94		# <reserved>
+0xEF95		# <reserved>
+0xEF96		# <reserved>
+0xEF97		# <reserved>
+0xEF98		# <reserved>
+0xEF99		# <reserved>
+0xEF9A		# <reserved>
+0xEF9B		# <reserved>
+0xEF9C		# <reserved>
+0xEF9D		# <reserved>
+0xEF9E		# <reserved>
+0xEF9F		# <reserved>
+0xEFA0		# <reserved>
+0xEFA1		# <reserved>
+0xEFA2		# <reserved>
+0xEFA3		# <reserved>
+0xEFA4		# <reserved>
+0xEFA5		# <reserved>
+0xEFA6		# <reserved>
+0xEFA7		# <reserved>
+0xEFA8		# <reserved>
+0xEFA9		# <reserved>
+0xEFAA		# <reserved>
+0xEFAB		# <reserved>
+0xEFAC		# <reserved>
+0xEFAD		# <reserved>
+0xEFAE		# <reserved>
+0xEFAF		# <reserved>
+0xEFB0		# <reserved>
+0xEFB1		# <reserved>
+0xEFB2		# <reserved>
+0xEFB3		# <reserved>
+0xEFB4		# <reserved>
+0xEFB5		# <reserved>
+0xEFB6		# <reserved>
+0xEFB7		# <reserved>
+0xEFB8		# <reserved>
+0xEFB9		# <reserved>
+0xEFBA		# <reserved>
+0xEFBB		# <reserved>
+0xEFBC		# <reserved>
+0xEFBD		# <reserved>
+0xEFBE		# <reserved>
+0xEFBF		# <reserved>
+0xEFC0		# <reserved>
+0xEFC1		# <reserved>
+0xEFC2		# <reserved>
+0xEFC3		# <reserved>
+0xEFC4		# <reserved>
+0xEFC5		# <reserved>
+0xEFC6		# <reserved>
+0xEFC7		# <reserved>
+0xEFC8		# <reserved>
+0xEFC9		# <reserved>
+0xEFCA		# <reserved>
+0xEFCB		# <reserved>
+0xEFCC		# <reserved>
+0xEFCD		# <reserved>
+0xEFCE		# <reserved>
+0xEFCF		# <reserved>
+0xEFD0		# <reserved>
+0xEFD1		# <reserved>
+0xEFD2		# <reserved>
+0xEFD3		# <reserved>
+0xEFD4		# <reserved>
+0xEFD5		# <reserved>
+0xEFD6		# <reserved>
+0xEFD7		# <reserved>
+0xEFD8		# <reserved>
+0xEFD9		# <reserved>
+0xEFDA		# <reserved>
+0xEFDB		# <reserved>
+0xEFDC		# <reserved>
+0xEFDD		# <reserved>
+0xEFDE		# <reserved>
+0xEFDF		# <reserved>
+0xEFE0		# <reserved>
+0xEFE1		# <reserved>
+0xEFE2		# <reserved>
+0xEFE3		# <reserved>
+0xEFE4		# <reserved>
+0xEFE5		# <reserved>
+0xEFE6		# <reserved>
+0xEFE7		# <reserved>
+0xEFE8		# <reserved>
+0xEFE9		# <reserved>
+0xEFEA		# <reserved>
+0xEFEB		# <reserved>
+0xEFEC		# <reserved>
+0xEFED		# <reserved>
+0xEFEE		# <reserved>
+0xEFEF		# <reserved>
+0xEFF0		# <reserved>
+0xEFF1		# <reserved>
+0xEFF2		# <reserved>
+0xEFF3		# <reserved>
+0xEFF4		# <reserved>
+0xEFF5		# <reserved>
+0xEFF6		# <reserved>
+0xEFF7		# <reserved>
+0xEFF8		# <reserved>
+0xEFF9		# <reserved>
+0xEFFA		# <reserved>
+0xEFFB		# <reserved>
+0xEFFC		# <reserved>
diff --git a/basis/io/encodings/japanese/summary.txt b/basis/io/encodings/japanese/summary.txt
new file mode 100644
index 0000000000..e14f42d92e
--- /dev/null
+++ b/basis/io/encodings/japanese/summary.txt
@@ -0,0 +1 @@
+Japanese text encodings
diff --git a/basis/io/encodings/japanese/tags.txt b/basis/io/encodings/japanese/tags.txt
new file mode 100644
index 0000000000..8e27be7d61
--- /dev/null
+++ b/basis/io/encodings/japanese/tags.txt
@@ -0,0 +1 @@
+text
diff --git a/core/io/binary/binary-tests.factor b/core/io/binary/binary-tests.factor
index 5a496093d5..82a8293082 100644
--- a/core/io/binary/binary-tests.factor
+++ b/core/io/binary/binary-tests.factor
@@ -10,3 +10,7 @@ IN: io.binary.tests
 [ 1234 ] [ 1234 4 >le le> ] unit-test
 
 [ fixnum ] [ B{ 0 0 0 0 0 0 0 0 0 0 } be> class ] unit-test
+
+[ HEX: 56780000 HEX: 12340000 ] [ HEX: 1234000056780000 d>w/w ] unit-test
+[ HEX: 5678 HEX: 1234 ] [ HEX: 12345678 w>h/h ] unit-test
+[ HEX: 34 HEX: 12 ] [ HEX: 1234 h>b/b ] unit-test
diff --git a/core/io/binary/binary.factor b/core/io/binary/binary.factor
index f3d236433f..d2e50c2a6a 100644
--- a/core/io/binary/binary.factor
+++ b/core/io/binary/binary.factor
@@ -14,13 +14,13 @@ IN: io.binary
 : >be ( x n -- byte-array ) >le dup reverse-here ;
 
 : d>w/w ( d -- w1 w2 )
-    dup HEX: ffffffff bitand
-    swap -32 shift HEX: ffffffff bitand ;
+    [ HEX: ffffffff bitand ]
+    [ -32 shift HEX: ffffffff bitand ] bi ;
 
 : w>h/h ( w -- h1 h2 )
-    dup HEX: ffff bitand
-    swap -16 shift HEX: ffff bitand ;
+    [ HEX: ffff bitand ]
+    [ -16 shift HEX: ffff bitand ] bi ;
 
 : h>b/b ( h -- b1 b2 )
-    dup mask-byte
-    swap -8 shift mask-byte ;
+    [ mask-byte ]
+    [ -8 shift mask-byte ] bi ;

From 7512ec11104c6d5b3a7675ffaf300c333db0a8c1 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 00:11:33 -0600
Subject: [PATCH 72/86] Add >biassoc word, and define new-assoc on biassocs so
 that assoc-map and such can produce biassocs when given biassocs as inputs

---
 basis/biassocs/biassocs-docs.factor  | 13 +++++++++++--
 basis/biassocs/biassocs-tests.factor | 10 ++++++++++
 basis/biassocs/biassocs.factor       | 10 ++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/basis/biassocs/biassocs-docs.factor b/basis/biassocs/biassocs-docs.factor
index 1fde3d05b3..31258a7ddc 100644
--- a/basis/biassocs/biassocs-docs.factor
+++ b/basis/biassocs/biassocs-docs.factor
@@ -16,13 +16,22 @@ HELP: once-at
 { $values { "value" object } { "key" object } { "assoc" assoc } }
 { $description "If the assoc does not contain the given key, adds the key/value pair to the assoc, otherwise does nothing." } ;
 
+HELP: >biassoc
+{ $values { "assoc" assoc } { "biassoc" biassoc } }
+{ $description "Costructs a new biassoc with the same key/value pairs as the given assoc." } ;
+
 ARTICLE: "biassocs" "Bidirectional assocs"
 "A " { $emphasis "bidirectional assoc" } " combines a pair of assocs to form a data structure where both normal assoc opeartions (eg, " { $link at } "), as well as " { $link "assocs-values" } " (eg, " { $link value-at } ") run in sub-linear time."
 $nl
-"Bidirectional assocs implement the entire assoc protocol with the exception of " { $link delete-at } ". Duplicate values are allowed, however value lookups with " { $link value-at } " only return the first key that a given value was stored with."
+"Bidirectional assocs implement the entire " { $link "assoc-protocol" } " with the exception of " { $link delete-at } ". Duplicate values are allowed, however value lookups with " { $link value-at } " only return the first key that a given value was stored with."
+$nl
+"The class of biassocs:"
 { $subsection biassoc }
 { $subsection biassoc? }
+"Creating new biassocs:"
 { $subsection <biassoc> }
-{ $subsection <bihash> } ;
+{ $subsection <bihash> }
+"Converting existing assocs to biassocs:"
+{ $subsection >biassoc } ;
 
 ABOUT: "biassocs"
diff --git a/basis/biassocs/biassocs-tests.factor b/basis/biassocs/biassocs-tests.factor
index 4cd7f00f80..f408cc82a8 100644
--- a/basis/biassocs/biassocs-tests.factor
+++ b/basis/biassocs/biassocs-tests.factor
@@ -20,3 +20,13 @@ USING: biassocs assocs namespaces tools.test ;
 [ 2 ] [ 1 "h" get value-at ] unit-test
 
 [ 2 ] [ "h" get assoc-size ] unit-test
+
+H{ { "a" "A" } { "b" "B" } } "a" set
+
+[ ] [ "a" get >biassoc "b" set ] unit-test
+
+[ t ] [ "b" get biassoc? ] unit-test
+
+[ "A" ] [ "a" "b" get at ] unit-test
+
+[ "a" ] [ "A" "b" get value-at ] unit-test
\ No newline at end of file
diff --git a/basis/biassocs/biassocs.factor b/basis/biassocs/biassocs.factor
index a9f0cabd10..5956589ba5 100644
--- a/basis/biassocs/biassocs.factor
+++ b/basis/biassocs/biassocs.factor
@@ -1,6 +1,6 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel assocs accessors summary ;
+USING: kernel assocs accessors summary hashtables ;
 IN: biassocs
 
 TUPLE: biassoc from to ;
@@ -37,4 +37,10 @@ M: biassoc >alist
 M: biassoc clear-assoc
     [ from>> clear-assoc ] [ to>> clear-assoc ] bi ;
 
+M: biassoc new-assoc
+    drop [ <hashtable> ] [ <hashtable> ] bi biassoc boa ;
+
 INSTANCE: biassoc assoc
+
+: >biassoc ( assoc -- biassoc )
+    T{ biassoc } assoc-clone-like ;
\ No newline at end of file

From ce83be67a40fe2e6b90be954206881fb82850573 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Mon, 2 Feb 2009 00:16:33 -0600
Subject: [PATCH 73/86] Cleanup of various encodings implementations

---
 basis/io/encodings/japanese/japanese.factor | 22 +++++++++------------
 basis/io/encodings/utf16/utf16.factor       |  4 ++--
 basis/io/encodings/utf32/utf32.factor       |  4 ++--
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/basis/io/encodings/japanese/japanese.factor b/basis/io/encodings/japanese/japanese.factor
index 23ff807245..d9c6627854 100644
--- a/basis/io/encodings/japanese/japanese.factor
+++ b/basis/io/encodings/japanese/japanese.factor
@@ -2,28 +2,24 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: sequences kernel io io.files combinators.short-circuit
 math.order values assocs io.encodings io.binary fry strings
-math io.encodings.utf8 arrays accessors splitting math.parser ;
+math io.encodings.ascii arrays accessors splitting math.parser
+biassocs ;
 IN: io.encodings.japanese
 
-! The code page used is Microsoft Code Page 932, 
-! which is a set of extensions to JIS X 0208:1997
-
 VALUE: shift-jis
 
 VALUE: windows-31j
 
 <PRIVATE
 
-TUPLE: jis jis>ch ch>jis ;
+TUPLE: jis assoc ;
 
 : <jis> ( assoc -- jis )
-    [ nip ] assoc-filter
-    [ H{ } assoc-like ]
-    [ [ swap ] H{ } assoc-map-as ] bi
-    jis boa ;
+    [ nip ] assoc-filter H{ } assoc-like
+    >biassoc jis boa ;
 
-: ch>jis ( ch tuple -- jis ) ch>jis>> at [ encode-error ] unless* ;
-: jis>ch ( jis tuple -- string ) jis>ch>> at replacement-char or ;
+: ch>jis ( ch tuple -- jis ) assoc>> value-at [ encode-error ] unless* ;
+: jis>ch ( jis tuple -- string ) assoc>> at replacement-char or ;
 
 : process-jis ( lines -- assoc )
     [ "#" split1 drop ] map harvest [
@@ -32,7 +28,7 @@ TUPLE: jis jis>ch ch>jis ;
     ] map ;
 
 : make-jis ( filename -- jis )
-    utf8 file-lines process-jis <jis> ;
+    ascii file-lines process-jis <jis> ;
 
 "resource:basis/io/encodings/japanese/CP932.txt"
 make-jis to: windows-31j
@@ -45,7 +41,7 @@ make-jis to: shift-jis
     { [ 0 HEX: 7F between? ] [ HEX: A1 HEX: DF between? ] } 1|| ;
 
 : write-halfword ( stream halfword -- )
-    h>b/b swap 2array >string swap stream-write ;
+    h>b/b swap B{ } 2sequence swap stream-write ;
 
 M: jis encode-char
     swapd ch>jis
diff --git a/basis/io/encodings/utf16/utf16.factor b/basis/io/encodings/utf16/utf16.factor
index d8c553684e..f8a6434d90 100644
--- a/basis/io/encodings/utf16/utf16.factor
+++ b/basis/io/encodings/utf16/utf16.factor
@@ -101,9 +101,9 @@ M: utf16le encode-char ( char stream encoding -- )
 
 ! UTF-16
 
-: bom-le B{ HEX: ff HEX: fe } ; inline
+CONSTANT: bom-le B{ HEX: ff HEX: fe }
 
-: bom-be B{ HEX: fe HEX: ff } ; inline
+CONSTANT: bom-be B{ HEX: fe HEX: ff }
 
 : bom>le/be ( bom -- le/be )
     dup bom-le sequence= [ drop utf16le ] [
diff --git a/basis/io/encodings/utf32/utf32.factor b/basis/io/encodings/utf32/utf32.factor
index 1eaccb3e6b..1b220cf242 100644
--- a/basis/io/encodings/utf32/utf32.factor
+++ b/basis/io/encodings/utf32/utf32.factor
@@ -40,9 +40,9 @@ M: utf32le encode-char
 
 ! UTF-32
 
-: bom-le B{ HEX: ff HEX: fe 0 0 } ; inline
+CONSTANT: bom-le B{ HEX: ff HEX: fe 0 0 }
 
-: bom-be B{ 0 0 HEX: fe HEX: ff } ; inline
+CONSTANT: bom-be B{ 0 0 HEX: fe HEX: ff }
 
 : bom>le/be ( bom -- le/be )
     dup bom-le sequence= [ drop utf32le ] [

From b684db297a07b3d8258e4c9b7d4184fa8068a2ef Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 03:46:10 -0600
Subject: [PATCH 74/86] Use [ max ] map-reduce instead of map supremum; would
 be nice to find a good name for this and put it in sequences vocab

---
 basis/alien/structs/structs.factor                          | 6 +++---
 .../tree/normalization/introductions/introductions.factor   | 4 ++--
 basis/stack-checker/branches/branches.factor                | 4 ++--
 basis/tools/disassembler/udis/udis.factor                   | 5 +++--
 extra/project-euler/008/008.factor                          | 4 ++--
 extra/project-euler/011/011.factor                          | 4 ++--
 extra/project-euler/056/056.factor                          | 2 +-
 extra/sequences/modified/modified.factor                    | 5 +++--
 extra/tetris/tetromino/tetromino.factor                     | 6 +++---
 9 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/basis/alien/structs/structs.factor b/basis/alien/structs/structs.factor
index a3c616cda2..42923fb28b 100644
--- a/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays generic hashtables kernel kernel.private
 math namespaces parser sequences strings words libc fry
-alien.c-types alien.structs.fields cpu.architecture ;
+alien.c-types alien.structs.fields cpu.architecture math.order ;
 IN: alien.structs
 
 TUPLE: struct-type size align fields ;
@@ -47,7 +47,7 @@ M: struct-type stack-size
     [ first2 <field-spec> ] with with map ;
 
 : compute-struct-align ( types -- n )
-    [ c-type-align ] map supremum ;
+    [ c-type-align ] [ max ] map-reduce ;
 
 : define-struct ( name vocab fields -- )
     [
@@ -59,5 +59,5 @@ M: struct-type stack-size
 
 : define-union ( name members -- )
     [ expand-constants ] map
-    [ [ heap-size ] map supremum ] keep
+    [ [ heap-size ] [ max ] map-reduce ] keep
     compute-struct-align f (define-struct) ;
diff --git a/basis/compiler/tree/normalization/introductions/introductions.factor b/basis/compiler/tree/normalization/introductions/introductions.factor
index 9e96dc0472..743b8c56da 100644
--- a/basis/compiler/tree/normalization/introductions/introductions.factor
+++ b/basis/compiler/tree/normalization/introductions/introductions.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces sequences accessors math kernel
-compiler.tree ;
+compiler.tree math.order ;
 IN: compiler.tree.normalization.introductions
 
 SYMBOL: introductions
@@ -25,7 +25,7 @@ M: #introduce count-introductions*
 
 M: #branch count-introductions*
     children>>
-    [ count-introductions ] map supremum
+    [ count-introductions ] [ max ] map-reduce
     introductions+ ;
 
 M: #recursive count-introductions*
diff --git a/basis/stack-checker/branches/branches.factor b/basis/stack-checker/branches/branches.factor
index 2eb4fb46a9..690af39c28 100755
--- a/basis/stack-checker/branches/branches.factor
+++ b/basis/stack-checker/branches/branches.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry vectors sequences assocs math accessors kernel
+USING: fry vectors sequences assocs math math.order accessors kernel
 combinators quotations namespaces grouping stack-checker.state
 stack-checker.backend stack-checker.errors stack-checker.visitor
 stack-checker.values stack-checker.recursive-state ;
@@ -16,7 +16,7 @@ SYMBOL: +bottom+
 
 : pad-with-bottom ( seq -- newseq )
     dup empty? [
-        dup [ length ] map supremum
+        dup [ length ] [ max ] map-reduce
         '[ _ +bottom+ pad-head ] map
     ] unless ;
 
diff --git a/basis/tools/disassembler/udis/udis.factor b/basis/tools/disassembler/udis/udis.factor
index cb52b1d5db..cfa2483c7e 100644
--- a/basis/tools/disassembler/udis/udis.factor
+++ b/basis/tools/disassembler/udis/udis.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: tools.disassembler namespaces combinators
 alien alien.syntax alien.c-types lexer parser kernel
-sequences layouts math math.parser system make fry arrays ;
+sequences layouts math math.order
+math.parser system make fry arrays ;
 IN: tools.disassembler.udis
 
 <<
@@ -56,7 +57,7 @@ SINGLETON: udis-disassembler
 : buf/len ( from to -- buf len ) [ drop <alien> ] [ swap - ] 2bi ;
 
 : format-disassembly ( lines -- lines' )
-    dup [ second length ] map supremum
+    dup [ second length ] [ max ] map-reduce
     '[
         [
             [ first >hex cell 2 * CHAR: 0 pad-head % ": " % ]
diff --git a/extra/project-euler/008/008.factor b/extra/project-euler/008/008.factor
index 24ccbb443a..1e8dade646 100644
--- a/extra/project-euler/008/008.factor
+++ b/extra/project-euler/008/008.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: grouping math.parser sequences ;
+USING: grouping math.order math.parser sequences ;
 IN: project-euler.008
 
 ! http://projecteuler.net/index.php?section=problems&id=8
@@ -64,7 +64,7 @@ IN: project-euler.008
 PRIVATE>
 
 : euler008 ( -- answer )
-    source-008 5 clump [ string>digits product ] map supremum ;
+    source-008 5 clump [ string>digits product ] [ max ] map-reduce ;
 
 ! [ euler008 ] 100 ave-time
 ! 2 ms ave run time - 0.79 SD (100 trials)
diff --git a/extra/project-euler/011/011.factor b/extra/project-euler/011/011.factor
index 0940695726..122eec2c2e 100644
--- a/extra/project-euler/011/011.factor
+++ b/extra/project-euler/011/011.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: grouping kernel make sequences ;
+USING: grouping kernel make math.order sequences ;
 IN: project-euler.011
 
 ! http://projecteuler.net/index.php?section=problems&id=11
@@ -88,7 +88,7 @@ IN: project-euler.011
 
 : max-product ( matrix width -- n )
     [ clump ] curry map concat
-    [ product ] map supremum ; inline
+    [ product ] [ max ] map-reduce ; inline
 
 PRIVATE>
 
diff --git a/extra/project-euler/056/056.factor b/extra/project-euler/056/056.factor
index 34626b796d..4e7bbdc0df 100644
--- a/extra/project-euler/056/056.factor
+++ b/extra/project-euler/056/056.factor
@@ -23,7 +23,7 @@ IN: project-euler.056
 
 : euler056 ( -- answer )
     90 100 [a,b) dup cartesian-product
-    [ first2 ^ number>digits sum ] map supremum ;
+    [ first2 ^ number>digits sum ] [ max ] map-reduce ;
 
 ! [ euler056 ] 100 ave-time
 ! 22 ms ave run time - 2.13 SD (100 trials)
diff --git a/extra/sequences/modified/modified.factor b/extra/sequences/modified/modified.factor
index 3e4c1b1bdc..d552f2dc77 100644
--- a/extra/sequences/modified/modified.factor
+++ b/extra/sequences/modified/modified.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays kernel math sequences sequences.private shuffle ;
+USING: accessors arrays kernel math math.order
+sequences sequences.private shuffle ;
 IN: sequences.modified
 
 TUPLE: modified ;
@@ -50,7 +51,7 @@ M: offset modified-set-nth ( elt n seq -- )
 TUPLE: summed < modified seqs ;
 C: <summed> summed
 
-M: summed length seqs>> [ length ] map supremum ;
+M: summed length seqs>> [ length ] [ max ] map-reduce ;
 
 <PRIVATE
 : ?+ ( x/f y/f -- sum )
diff --git a/extra/tetris/tetromino/tetromino.factor b/extra/tetris/tetromino/tetromino.factor
index 7e6b2ecf34..127e4854e0 100644
--- a/extra/tetris/tetromino/tetromino.factor
+++ b/extra/tetris/tetromino/tetromino.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel arrays namespaces sequences math math.vectors
-colors random ;
+USING: kernel arrays namespaces sequences math math.order
+math.vectors colors random ;
 IN: tetris.tetromino
 
 TUPLE: tetromino states colour ;
@@ -104,7 +104,7 @@ SYMBOL: tetrominoes
     tetrominoes get random ;
 
 : blocks-max ( blocks quot -- max )
-    map [ 1+ ] map supremum ; inline
+    map [ 1+ ] [ max ] map-reduce ; inline
 
 : blocks-width ( blocks -- width )
     [ first ] blocks-max ;

From 0497132a4737f1b9e1da7e3e36387a991467a4e9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 03:47:45 -0600
Subject: [PATCH 75/86] Refactor basis/wrap to have a more flexible API

---
 basis/wrap/wrap-tests.factor   | 48 +++++++++++++++++++++++++
 basis/wrap/wrap.factor         | 66 ++++++++++++++++++++++++----------
 basis/xml/writer/writer.factor |  2 +-
 3 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 basis/wrap/wrap-tests.factor

diff --git a/basis/wrap/wrap-tests.factor b/basis/wrap/wrap-tests.factor
new file mode 100644
index 0000000000..b2d18761e2
--- /dev/null
+++ b/basis/wrap/wrap-tests.factor
@@ -0,0 +1,48 @@
+IN: wrap.tests
+USING: tools.test wrap multiline sequences ;
+    
+[
+    {
+        {
+            T{ word f 1 10 f }
+            T{ word f 2 10 f }
+            T{ word f 3 2 t }
+        }
+        {
+            T{ word f 4 10 f }
+            T{ word f 5 10 f }
+        }
+    }
+] [
+    {
+        T{ word f 1 10 f }
+        T{ word f 2 10 f }
+        T{ word f 3 2 t }
+        T{ word f 4 10 f }
+        T{ word f 5 10 f }
+    } 35 wrap [ { } like ] map
+] unit-test
+
+[
+    <" This is a
+long piece
+of text
+that we
+wish to
+word wrap.">
+] [
+    <" This is a long piece of text that we wish to word wrap."> 10
+    wrap-string
+] unit-test
+    
+[
+    <"   This is a
+  long piece
+  of text
+  that we
+  wish to
+  word wrap.">
+] [
+    <" This is a long piece of text that we wish to word wrap."> 12
+    "  " wrap-indented-string
+] unit-test
\ No newline at end of file
diff --git a/basis/wrap/wrap.factor b/basis/wrap/wrap.factor
index 87a870d75d..8e4e2753a8 100644
--- a/basis/wrap/wrap.factor
+++ b/basis/wrap/wrap.factor
@@ -1,32 +1,60 @@
-USING: sequences kernel namespaces make splitting math math.order ;
+USING: sequences kernel namespaces make splitting
+math math.order fry assocs accessors ;
 IN: wrap
 
-! Very stupid word wrapping/line breaking
-! This will be replaced by a Unicode-aware method,
-! which works with variable-width fonts
+! Word wrapping/line breaking -- not Unicode-aware
+
+TUPLE: word key width break? ;
+
+C: <word> word
+
+<PRIVATE
 
 SYMBOL: width
 
-: line-chunks ( string -- words-lines )
-    "\n" split [ " \t" split harvest ] map ;
+: break-here? ( column word -- ? )
+    break?>> not [ width get > ] [ drop f ] if ;
 
-: (split-chunk) ( words -- )
-    -1 over [ length + 1+ dup width get > ] find drop nip
-    [ 1 max cut-slice swap , (split-chunk) ] [ , ] if* ;
+: find-optimal-break ( words -- n )
+    [ 0 ] dip [ [ width>> + dup ] keep break-here? ] find drop nip ;
 
-: split-chunk ( words -- lines )
-    [ (split-chunk) ] { } make ;
+: (wrap) ( words -- )
+    dup find-optimal-break
+    [ 1 max cut-slice [ , ] [ (wrap) ] bi* ] [ , ] if* ;
 
-: join-spaces ( words-seqs -- lines )
-    [ [ " " join ] map ] map concat ;
+: intersperse ( seq elt -- seq' )
+    [ '[ _ , ] [ , ] interleave ] { } make ;
 
-: broken-lines ( string width -- lines )
+: split-lines ( string -- words-lines )
+    string-lines [
+        " \t" split harvest
+        [ dup length f <word> ] map
+        " " 1 t <word> intersperse
+    ] map ;
+
+: join-words ( wrapped-lines -- lines )
+    [
+        [ break?>> ]
+        [ trim-head-slice ]
+        [ trim-tail-slice ] bi
+        [ key>> ] map concat
+    ] map ;
+
+: join-lines ( strings -- string )
+    "\n" join ;
+
+PRIVATE>
+
+: wrap ( words width -- lines )
     width [
-        line-chunks [ split-chunk ] map join-spaces
+        [ (wrap) ] { } make
     ] with-variable ;
 
-: line-break ( string width -- newstring )
-    broken-lines "\n" join ;
+: wrap-lines ( lines width -- newlines )
+    [ split-lines ] dip '[ _ wrap join-words ] map concat ;
 
-: indented-break ( string width indent -- newstring )
-    [ length - broken-lines ] keep [ prepend ] curry map "\n" join ;
+: wrap-string ( string width -- newstring )
+    wrap-lines join-lines ;
+
+: wrap-indented-string ( string width indent -- newstring )
+    [ length - wrap-lines ] keep '[ _ prepend ] map join-lines ;
diff --git a/basis/xml/writer/writer.factor b/basis/xml/writer/writer.factor
index 146e67e70f..a713790973 100755
--- a/basis/xml/writer/writer.factor
+++ b/basis/xml/writer/writer.factor
@@ -69,7 +69,7 @@ M: string write-xml
     escape-string xml-pprint? get [
         dup [ blank? ] all?
         [ drop "" ]
-        [ nl 80 indent-string indented-break ] if
+        [ nl 80 indent-string wrap-indented-string ] if
     ] when write ;
 
 : write-tag ( tag -- )

From bb2452c86e3e14b77675acbebae84eca6ed39c2d Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 05:47:29 -0600
Subject: [PATCH 76/86] Fix biassocs docs

---
 basis/biassocs/biassocs-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/biassocs/biassocs-docs.factor b/basis/biassocs/biassocs-docs.factor
index 31258a7ddc..b55af5b902 100644
--- a/basis/biassocs/biassocs-docs.factor
+++ b/basis/biassocs/biassocs-docs.factor
@@ -23,7 +23,7 @@ HELP: >biassoc
 ARTICLE: "biassocs" "Bidirectional assocs"
 "A " { $emphasis "bidirectional assoc" } " combines a pair of assocs to form a data structure where both normal assoc opeartions (eg, " { $link at } "), as well as " { $link "assocs-values" } " (eg, " { $link value-at } ") run in sub-linear time."
 $nl
-"Bidirectional assocs implement the entire " { $link "assoc-protocol" } " with the exception of " { $link delete-at } ". Duplicate values are allowed, however value lookups with " { $link value-at } " only return the first key that a given value was stored with."
+"Bidirectional assocs implement the entire " { $link "assocs-protocol" } " with the exception of " { $link delete-at } ". Duplicate values are allowed, however value lookups with " { $link value-at } " only return the first key that a given value was stored with."
 $nl
 "The class of biassocs:"
 { $subsection biassoc }

From 25f8eeab6f5adcc6736176aa2cf56b6916bc76e5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 05:49:21 -0600
Subject: [PATCH 77/86] Fix io.encodings.japanese on case-sensitive file sysems

---
 basis/io/encodings/japanese/{CP932.TXT => CP932.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename basis/io/encodings/japanese/{CP932.TXT => CP932.txt} (100%)

diff --git a/basis/io/encodings/japanese/CP932.TXT b/basis/io/encodings/japanese/CP932.txt
similarity index 100%
rename from basis/io/encodings/japanese/CP932.TXT
rename to basis/io/encodings/japanese/CP932.txt

From e88812b76a14bc47c296fda86709ae5a631a6240 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Feb 2009 06:04:29 -0600
Subject: [PATCH 78/86] map infimum => [ min ] map-reduce

---
 basis/compiler/tree/normalization/normalization.factor | 4 ++--
 extra/project-euler/044/044.factor                     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/basis/compiler/tree/normalization/normalization.factor b/basis/compiler/tree/normalization/normalization.factor
index 3f1e9e2667..ee7bf8672e 100644
--- a/basis/compiler/tree/normalization/normalization.factor
+++ b/basis/compiler/tree/normalization/normalization.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry namespaces sequences math accessors kernel arrays
+USING: fry namespaces sequences math math.order accessors kernel arrays
 combinators compiler.utilities assocs
 stack-checker.backend
 stack-checker.branches
@@ -54,7 +54,7 @@ M: #branch normalize*
         ] map unzip swap
     ] change-children swap
     [ remaining-introductions set ]
-    [ [ length ] map infimum introduction-stack [ swap head ] change ]
+    [ [ length ] [ min ] map-reduce introduction-stack [ swap head ] change ]
     bi ;
 
 : eliminate-phi-introductions ( introductions seq terminated -- seq' )
diff --git a/extra/project-euler/044/044.factor b/extra/project-euler/044/044.factor
index e7b1959023..46b20253ee 100644
--- a/extra/project-euler/044/044.factor
+++ b/extra/project-euler/044/044.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions math.ranges project-euler.common sequences ;
+USING: kernel math math.functions math.ranges math.order
+project-euler.common sequences ;
 IN: project-euler.044
 
 ! http://projecteuler.net/index.php?section=problems&id=44
@@ -37,7 +38,7 @@ PRIVATE>
 
 : euler044 ( -- answer )
     2500 [1,b] [ nth-pentagonal ] map dup cartesian-product
-    [ first2 sum-and-diff? ] filter [ first2 - abs ] map infimum ;
+    [ first2 sum-and-diff? ] filter [ first2 - abs ] [ min ] map-reduce ;
 
 ! [ euler044 ] 10 ave-time
 ! 4996 ms ave run time - 87.46 SD (10 trials)

From d32d436154f1fd40887460a32c65f85eb402b73b Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 2 Feb 2009 13:16:03 -0600
Subject: [PATCH 79/86] quadtrees vocab

---
 extra/quadtrees/quadtrees-tests.factor | 193 +++++++++++++++++++++++++
 extra/quadtrees/quadtrees.factor       | 178 +++++++++++++++++++++++
 2 files changed, 371 insertions(+)
 create mode 100644 extra/quadtrees/quadtrees-tests.factor
 create mode 100644 extra/quadtrees/quadtrees.factor

diff --git a/extra/quadtrees/quadtrees-tests.factor b/extra/quadtrees/quadtrees-tests.factor
new file mode 100644
index 0000000000..e1b885ccc0
--- /dev/null
+++ b/extra/quadtrees/quadtrees-tests.factor
@@ -0,0 +1,193 @@
+USING: assocs kernel tools.test quadtrees math.geometry.rect sorting ;
+IN: quadtrees.tests
+
+: unit-bounds ( -- rect ) { -1.0 -1.0 } { 2.0 2.0 } <rect> ;
+
+: value>>key ( assoc value key -- assoc )
+    pick set-at ; inline
+: delete>>key ( assoc key -- assoc )
+    over delete-at ; inline
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } {  0.0  -0.25 } "a" f f f f t } ]
+[
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } {  0.0  -0.25 } "b" f f f f t } ]
+[
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.0  -0.25 } value>>key
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
+    T{ quadtree f T{ rect f { -1.0 -1.0 } { 1.0 1.0 } } { -0.5  -0.75 } "c" f f f f t }
+    T{ quadtree f T{ rect f {  0.0 -1.0 } { 1.0 1.0 } } {  0.0  -0.25 } "a" f f f f t }
+    T{ quadtree f T{ rect f { -1.0  0.0 } { 1.0 1.0 } } f               f   f f f f t }
+    T{ quadtree f T{ rect f {  0.0  0.0 } { 1.0 1.0 } } {  0.25  0.25 } "b" f f f f t }
+    f 
+} ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
+    T{ quadtree f T{ rect f { -1.0 -1.0 } { 1.0 1.0 } } { -0.5  -0.75 } "c" f f f f t }
+    T{ quadtree f T{ rect f {  0.0 -1.0 } { 1.0 1.0 } } {  0.0  -0.25 } "a" f f f f t }
+    T{ quadtree f T{ rect f { -1.0  0.0 } { 1.0 1.0 } } f               f   f f f f t }
+    T{ quadtree f T{ rect f {  0.0  0.0 } { 1.0 1.0 } } f f
+        T{ quadtree f T{ rect f {  0.0  0.0 } { 0.5 0.5 } } {  0.25  0.25 } "b" f f f f t }
+        T{ quadtree f T{ rect f {  0.5  0.0 } { 0.5 0.5 } } {  0.75  0.25 } "d" f f f f t }
+        T{ quadtree f T{ rect f {  0.0  0.5 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f {  0.5  0.5 } { 0.5 0.5 } } f               f   f f f f t }
+    }
+    f
+} ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+] unit-test
+
+[ "b" t ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+
+    {  0.25  0.25 } swap at*
+] unit-test
+
+[ f f ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+
+    {  1.0   1.0  } swap at*
+] unit-test
+
+[ { "a" "c" } ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+
+    { -0.6 -0.8 } { 0.8 1.0 } <rect> swap in-rect natural-sort
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
+    T{ quadtree f T{ rect f { -1.0 -1.0 } { 1.0 1.0 } } { -0.5  -0.75 } "c" f f f f t }
+    T{ quadtree f T{ rect f {  0.0 -1.0 } { 1.0 1.0 } } {  0.0  -0.25 } "a" f f f f t }
+    T{ quadtree f T{ rect f { -1.0  0.0 } { 1.0 1.0 } } f               f   f f f f t }
+    T{ quadtree f T{ rect f {  0.0  0.0 } { 1.0 1.0 } } {  0.75  0.25 } "d" f f f f t }
+    f
+} ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+
+        {  0.25  0.25 } delete>>key
+        prune
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
+    T{ quadtree f T{ rect f { -1.0 -1.0 } { 1.0 1.0 } } { -0.5  -0.75 } "c" f f f f t }
+    T{ quadtree f T{ rect f {  0.0 -1.0 } { 1.0 1.0 } } {  0.0  -0.25 } "a" f f f f t }
+    T{ quadtree f T{ rect f { -1.0  0.0 } { 1.0 1.0 } } f               f   f f f f t }
+    T{ quadtree f T{ rect f {  0.0  0.0 } { 1.0 1.0 } } f               f   f f f f t }
+    f
+} ] [
+    unit-bounds <quadtree>
+        "a" {  0.0  -0.25 } value>>key
+        "b" {  0.25  0.25 } value>>key
+        "c" { -0.5  -0.75 } value>>key
+        "d" {  0.75  0.25 } value>>key
+
+        {  0.25  0.25 } delete>>key
+        {  0.75  0.25 } delete>>key
+        prune
+] unit-test
+
+[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
+    T{ quadtree f T{ rect f { -1.0 -1.0 } { 1.0 1.0 } } f f
+        T{ quadtree f T{ rect f { -1.0 -1.0 } { 0.5 0.5 } } { -0.75 -0.75 } "b" f f f f t }
+        T{ quadtree f T{ rect f { -0.5 -1.0 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f { -1.0 -0.5 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f { -0.5 -0.5 } { 0.5 0.5 } } { -0.25 -0.25 } "a" f f f f t }
+        f
+    }
+    T{ quadtree f T{ rect f {  0.0 -1.0 } { 1.0 1.0 } } f f
+        T{ quadtree f T{ rect f {  0.0 -1.0 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f {  0.5 -1.0 } { 0.5 0.5 } } {  0.75 -0.75 } "f" f f f f t }
+        T{ quadtree f T{ rect f {  0.0 -0.5 } { 0.5 0.5 } } {  0.25 -0.25 } "e" f f f f t }
+        T{ quadtree f T{ rect f {  0.5 -0.5 } { 0.5 0.5 } } f               f   f f f f t }
+        f
+    }
+    T{ quadtree f T{ rect f { -1.0  0.0 } { 1.0 1.0 } } f f
+        T{ quadtree f T{ rect f { -1.0  0.0 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f { -0.5  0.0 } { 0.5 0.5 } } { -0.25  0.25 } "c" f f f f t }
+        T{ quadtree f T{ rect f { -1.0  0.5 } { 0.5 0.5 } } { -0.75  0.75 } "d" f f f f t }
+        T{ quadtree f T{ rect f { -0.5  0.5 } { 0.5 0.5 } } f               f   f f f f t }
+        f
+    }
+    T{ quadtree f T{ rect f {  0.0  0.0 } { 1.0 1.0 } } f f
+        T{ quadtree f T{ rect f {  0.0  0.0 } { 0.5 0.5 } } {  0.25  0.25 } "g" f f f f t }
+        T{ quadtree f T{ rect f {  0.5  0.0 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f {  0.0  0.5 } { 0.5 0.5 } } f               f   f f f f t }
+        T{ quadtree f T{ rect f {  0.5  0.5 } { 0.5 0.5 } } {  0.75  0.75 } "h" f f f f t }
+        f
+    }
+    f
+} ] [
+    unit-bounds <quadtree>
+        "a" { -0.25 -0.25 } value>>key
+        "b" { -0.75 -0.75 } value>>key
+        "c" { -0.25  0.25 } value>>key
+        "d" { -0.75  0.75 } value>>key
+        "e" {  0.25 -0.25 } value>>key
+        "f" {  0.75 -0.75 } value>>key
+        "g" {  0.25  0.25 } value>>key
+        "h" {  0.75  0.75 } value>>key
+
+        prune
+] unit-test
+
+[ 8 ] [
+    unit-bounds <quadtree>
+        "a" { -0.25 -0.25 } value>>key
+        "b" { -0.75 -0.75 } value>>key
+        "c" { -0.25  0.25 } value>>key
+        "d" { -0.75  0.75 } value>>key
+        "e" {  0.25 -0.25 } value>>key
+        "f" {  0.75 -0.75 } value>>key
+        "g" {  0.25  0.25 } value>>key
+        "h" {  0.75  0.75 } value>>key
+
+        assoc-size
+] unit-test
+
+[ 8 ] [
+    unit-bounds <quadtree>
+        "a" { -0.25 -0.25 } value>>key
+        "b" { -0.75 -0.75 } value>>key
+        "c" { -0.25  0.25 } value>>key
+        "d" { -0.75  0.75 } value>>key
+        "e" {  0.25 -0.25 } value>>key
+        "f" {  0.75 -0.75 } value>>key
+        "g" {  0.25  0.25 } value>>key
+        "h" {  0.75  0.75 } value>>key
+
+        assoc-size
+] unit-test
+
+
diff --git a/extra/quadtrees/quadtrees.factor b/extra/quadtrees/quadtrees.factor
new file mode 100644
index 0000000000..66b3c2f15d
--- /dev/null
+++ b/extra/quadtrees/quadtrees.factor
@@ -0,0 +1,178 @@
+USING: assocs kernel math.geometry.rect combinators accessors
+math.vectors vectors sequences math math.points math.geometry
+combinators.short-circuit arrays fry locals ;
+IN: quadtrees
+
+TUPLE: quadtree { bounds rect } point value ll lr ul ur leaf? ;
+
+: <quadtree> ( bounds -- quadtree ) f f f f f f t quadtree boa ;
+
+: rect-ll ( rect -- point ) loc>> ;
+: rect-lr ( rect -- point ) [ loc>> ] [ width  ] bi v+x ;
+: rect-ul ( rect -- point ) [ loc>> ] [ height ] bi v+y ;
+: rect-ur ( rect -- point ) [ loc>> ] [ dim>>  ] bi v+  ;
+
+: rect-center ( rect -- point ) [ loc>> ] [ dim>> 0.5 v*n ] bi v+ ; inline
+
+<PRIVATE
+
+DEFER: (prune)
+DEFER: insert
+DEFER: erase
+DEFER: at-point
+DEFER: quadtree>alist
+DEFER: node-insert
+DEFER: in-rect*
+
+: child-dim ( rect -- dim/2 ) dim>> 0.5 v*n ; inline
+: ll-bounds ( rect -- rect' )
+    [   loc>>                                  ] [ child-dim ] bi <rect> ;
+: lr-bounds ( rect -- rect' )
+    [ [ loc>> ] [ dim>> { 0.5 0.0 } v* ] bi v+ ] [ child-dim ] bi <rect> ;
+: ul-bounds ( rect -- rect' )
+    [ [ loc>> ] [ dim>> { 0.0 0.5 } v* ] bi v+ ] [ child-dim ] bi <rect> ;
+: ur-bounds ( rect -- rect' )
+    [ [ loc>> ] [ dim>> { 0.5 0.5 } v* ] bi v+ ] [ child-dim ] bi <rect> ;
+
+: (quadrant) ( pt node -- quadrant )
+    swap [ first 0.0 < ] [ second 0.0 < ] bi
+    [ [ ll>> ] [ lr>> ] if ]
+    [ [ ul>> ] [ ur>> ] if ] if ;
+
+: quadrant ( pt node -- quadrant )
+    [ bounds>> rect-center v- ] keep (quadrant) ;
+
+: descend ( pt node -- pt subnode )
+    [ drop ] [ quadrant ] 2bi ; inline
+
+: {quadrants} ( node -- quadrants )
+    { [ ll>> ] [ lr>> ] [ ul>> ] [ ur>> ] } cleave 4array ;
+
+:: each-quadrant ( node quot -- array )
+    node ll>> quot call
+    node lr>> quot call
+    node ul>> quot call
+    node ur>> quot call ; inline
+: map-quadrant ( node quot: ( child-node -- x ) -- array )
+    each-quadrant 4array ; inline
+
+: add-subnodes ( node -- node )
+    dup bounds>> {
+        [ ll-bounds <quadtree> >>ll ]
+        [ lr-bounds <quadtree> >>lr ]
+        [ ul-bounds <quadtree> >>ul ]
+        [ ur-bounds <quadtree> >>ur ]
+    } cleave
+    f >>leaf? ;
+
+: split-leaf ( value point leaf -- )
+    add-subnodes
+    [ value>> ] [ point>> ] [ ] tri
+    [ node-insert ] [ node-insert ] bi ;
+
+: leaf-replaceable? ( pt leaf -- ? ) point>> { [ nip not ] [ = ] } 2|| ;
+: leaf-insert ( value point leaf -- )
+    2dup leaf-replaceable?
+    [ [ (>>point) ] [ (>>value) ] bi ]
+    [ split-leaf ] if ;
+
+: node-insert ( value point node -- )
+    descend insert ;
+
+: insert ( value point tree -- )
+    dup leaf?>> [ leaf-insert ] [ node-insert ] if ;
+
+: leaf-at-point ( point leaf -- value/f ? )
+    tuck point>> = [ value>> t ] [ drop f f ] if ;
+
+: node-at-point ( point node -- value/f ? )
+    descend at-point ;
+
+: at-point ( point tree -- value/f ? )
+    dup leaf?>> [ leaf-at-point ] [ node-at-point ] if ;
+
+: (node-in-rect*) ( values rect node -- values )
+    2dup bounds>> intersects? [ in-rect* ] [ 2drop ] if ;
+: node-in-rect* ( values rect node -- values )
+    [ (node-in-rect*) ] with each-quadrant ;
+
+: leaf-in-rect* ( values rect leaf -- values ) 
+    tuck { [ nip point>> ] [ point>> swap intersects? ] } 2&&
+    [ value>> over push ] [ drop ] if ;
+
+: in-rect* ( values rect tree -- values )
+    dup leaf?>> [ leaf-in-rect* ] [ node-in-rect* ] if ;
+
+: leaf-erase ( point leaf -- )
+    tuck point>> = [ f >>point f >>value ] when drop ;
+
+: node-erase ( point node -- )
+    descend erase ;
+
+: erase ( point tree -- )
+    dup leaf?>> [ leaf-erase ] [ node-erase ] if ;
+
+: (?leaf) ( quadrant -- {point,value}/f )
+    dup point>> [ swap value>> 2array ] [ drop f ] if* ;
+: ?leaf ( quadrants -- {point,value}/f )
+    [ (?leaf) ] map sift dup length {
+        { 1 [ first ] }
+        { 0 [ drop { f f } ] }
+        [ 2drop f ]
+    } case ;
+
+: collapseable? ( node -- {point,value}/f )
+    {quadrants} { [ [ leaf?>> ] all? ] [ ?leaf ] } 1&& ;
+
+: remove-subnodes ( node -- leaf ) f >>ll f >>lr f >>ul f >>ur t >>leaf? ;
+
+: collapse ( node {point,value} -- )
+    first2 [ >>point ] [ >>value ] bi* remove-subnodes drop ;
+
+: node-prune ( node -- )
+    [ [ (prune) ] each-quadrant ] [ ] [ collapseable? ] tri
+    [ collapse ] [ drop ] if* ;
+
+: (prune) ( tree -- )
+    dup leaf?>> [ drop ] [ node-prune ] if ;
+
+: leaf>alist ( leaf -- alist )
+    dup point>> [ [ point>> ] [ value>> ] bi 2array 1array ] [ drop { } ] if ;
+
+: node>alist ( node -- alist ) [ quadtree>alist ] map-quadrant concat ;
+
+: quadtree>alist ( tree -- assoc )
+    dup leaf?>> [ leaf>alist ] [ node>alist ] if ;
+
+: leaf= ( a b -- ? ) [ [ point>> ] [ value>> ] bi 2array ] bi@ = ;
+
+: node= ( a b -- ? ) [ {quadrants} ] bi@ = ;
+
+: (tree=) ( a b -- ? ) dup leaf?>> [ leaf= ] [ node= ] if ;
+
+: tree= ( a b -- ? )
+    2dup [ leaf?>> ] bi@ = [ (tree=) ] [ 2drop f ] if ;
+
+PRIVATE>
+
+: prune ( tree -- tree ) [ (prune) ] keep ;
+
+: in-rect ( tree rect -- values )
+    [ 16 <vector> ] 2dip in-rect* ;
+
+M: quadtree equal? ( a b -- ? )
+    over quadtree? [ tree= ] [ 2drop f ] if ;
+
+INSTANCE: quadtree assoc
+
+M: quadtree at* ( key assoc -- value/f ? ) at-point ;
+M: quadtree assoc-size ( assoc -- n ) quadtree>alist length ; ! XXX implement proper
+M: quadtree >alist ( assoc -- alist ) quadtree>alist ;
+M: quadtree set-at ( value key assoc -- ) insert ;
+M: quadtree delete-at ( key assoc -- ) erase ;
+M: quadtree clear-assoc ( assoc -- )
+    t >>leaf?
+    f >>point
+    f >>value
+    drop ;
+

From cffb6340019c2301802d28cbe49ba3516b3dee67 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 2 Feb 2009 13:19:08 -0600
Subject: [PATCH 80/86] add test for quadtree >alist

---
 extra/quadtrees/quadtrees-tests.factor | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/extra/quadtrees/quadtrees-tests.factor b/extra/quadtrees/quadtrees-tests.factor
index e1b885ccc0..715adc0729 100644
--- a/extra/quadtrees/quadtrees-tests.factor
+++ b/extra/quadtrees/quadtrees-tests.factor
@@ -176,7 +176,16 @@ IN: quadtrees.tests
         assoc-size
 ] unit-test
 
-[ 8 ] [
+[ {
+    { { -0.75 -0.75 } "b" }
+    { { -0.75  0.75 } "d" }
+    { { -0.25 -0.25 } "a" }
+    { { -0.25  0.25 } "c" }
+    { {  0.25 -0.25 } "e" }
+    { {  0.25  0.25 } "g" }
+    { {  0.75 -0.75 } "f" }
+    { {  0.75  0.75 } "h" }
+} ] [
     unit-bounds <quadtree>
         "a" { -0.25 -0.25 } value>>key
         "b" { -0.75 -0.75 } value>>key
@@ -187,7 +196,7 @@ IN: quadtrees.tests
         "g" {  0.25  0.25 } value>>key
         "h" {  0.75  0.75 } value>>key
 
-        assoc-size
+        >alist natural-sort
 ] unit-test
 
 

From b2d0daa68d7fba36a45e12fcd584fc64294f6776 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 2 Feb 2009 14:25:29 -0600
Subject: [PATCH 81/86] non-retarded implementation of quadtree assoc-size

---
 extra/quadtrees/quadtrees-tests.factor |  1 -
 extra/quadtrees/quadtrees.factor       | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/extra/quadtrees/quadtrees-tests.factor b/extra/quadtrees/quadtrees-tests.factor
index 715adc0729..8dd4b53dcb 100644
--- a/extra/quadtrees/quadtrees-tests.factor
+++ b/extra/quadtrees/quadtrees-tests.factor
@@ -199,4 +199,3 @@ IN: quadtrees.tests
         >alist natural-sort
 ] unit-test
 
-
diff --git a/extra/quadtrees/quadtrees.factor b/extra/quadtrees/quadtrees.factor
index 66b3c2f15d..a56b94e7d3 100644
--- a/extra/quadtrees/quadtrees.factor
+++ b/extra/quadtrees/quadtrees.factor
@@ -21,6 +21,7 @@ DEFER: insert
 DEFER: erase
 DEFER: at-point
 DEFER: quadtree>alist
+DEFER: quadtree-size
 DEFER: node-insert
 DEFER: in-rect*
 
@@ -144,6 +145,14 @@ DEFER: in-rect*
 : quadtree>alist ( tree -- assoc )
     dup leaf?>> [ leaf>alist ] [ node>alist ] if ;
 
+: leaf-size ( leaf -- count )
+    point>> [ 1 ] [ 0 ] if ;
+: node-size ( node -- count )
+    0 swap [ quadtree-size + ] each-quadrant ; 
+    
+: quadtree-size ( tree -- count )
+    dup leaf?>> [ leaf-size ] [ node-size ] if ;
+
 : leaf= ( a b -- ? ) [ [ point>> ] [ value>> ] bi 2array ] bi@ = ;
 
 : node= ( a b -- ? ) [ {quadrants} ] bi@ = ;
@@ -166,7 +175,7 @@ M: quadtree equal? ( a b -- ? )
 INSTANCE: quadtree assoc
 
 M: quadtree at* ( key assoc -- value/f ? ) at-point ;
-M: quadtree assoc-size ( assoc -- n ) quadtree>alist length ; ! XXX implement proper
+M: quadtree assoc-size ( assoc -- n ) quadtree-size ;
 M: quadtree >alist ( assoc -- alist ) quadtree>alist ;
 M: quadtree set-at ( value key assoc -- ) insert ;
 M: quadtree delete-at ( key assoc -- ) erase ;

From 82daca7f6f7c5899c2e8b5e0b8531d3121654702 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 2 Feb 2009 15:16:03 -0600
Subject: [PATCH 82/86] gold-plate quadtrees

---
 extra/quadtrees/authors.txt            |  1 +
 extra/quadtrees/quadtrees-docs.factor  | 34 ++++++++++++++++++++++
 extra/quadtrees/quadtrees-tests.factor |  1 +
 extra/quadtrees/quadtrees.factor       | 39 +++++++++++++-------------
 extra/quadtrees/summary.txt            |  1 +
 extra/quadtrees/tags.txt               |  2 ++
 6 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 extra/quadtrees/authors.txt
 create mode 100644 extra/quadtrees/quadtrees-docs.factor
 create mode 100644 extra/quadtrees/summary.txt
 create mode 100644 extra/quadtrees/tags.txt

diff --git a/extra/quadtrees/authors.txt b/extra/quadtrees/authors.txt
new file mode 100644
index 0000000000..f13c9c1e77
--- /dev/null
+++ b/extra/quadtrees/authors.txt
@@ -0,0 +1 @@
+Joe Groff
diff --git a/extra/quadtrees/quadtrees-docs.factor b/extra/quadtrees/quadtrees-docs.factor
new file mode 100644
index 0000000000..f2de89ce3d
--- /dev/null
+++ b/extra/quadtrees/quadtrees-docs.factor
@@ -0,0 +1,34 @@
+USING: arrays assocs help.markup help.syntax math.geometry.rect quadtrees quotations sequences ;
+IN: quadtrees
+
+ARTICLE: "quadtrees" "Quadtrees"
+"The " { $snippet "quadtrees" } " vocabulary implements the quadtree structure in Factor. Quadtrees follow the " { $link "assocs-protocol" } " for insertion, deletion, and querying of exact points, using two-dimensional vectors as keys. Additional words are provided for spatial queries and pruning the tree structure:"
+{ $subsection prune }
+{ $subsection in-rect }
+"The following words are provided to help write quadtree algorithms:"
+{ $subsection descend }
+{ $subsection each-quadrant }
+{ $subsection map-quadrant } ;
+
+ABOUT: "quadtrees"
+
+HELP: prune
+{ $values { "tree" quadtree } }
+{ $description "Removes empty nodes from " { $snippet "tree" } "." } ;
+
+HELP: in-rect
+{ $values { "tree" quadtree } { "rect" rect } { "values" sequence } }
+{ $description "Returns a " { $link sequence } " of values from " { $snippet "tree" } " whose keys lie inside " { $snippet "rect" } "." } ;
+
+HELP: descend
+{ $values { "pt" sequence } { "node" quadtree } { "subnode" quadtree } }
+{ $description "Descends into the subnode of quadtree node " { $snippet "node" } " that contains " { $snippet "pt" } ", leaving " { $snippet "pt" } " on the stack." } ;
+
+HELP: each-quadrant
+{ $values { "node" quadtree } { "quot" quotation } }
+{ $description "Calls " { $snippet "quot" } " with each subnode of " { $snippet "node" } " on the top of the stack in turn." } ;
+
+HELP: map-quadrant
+{ $values { "node" quadtree } { "quot" quotation } { "array" array } }
+{ $description "Calls " { $snippet "quot" } " with each subnode of " { $snippet "node" } " on the top of the stack in turn, collecting the four results into " { $snippet "array" } "." } ;
+
diff --git a/extra/quadtrees/quadtrees-tests.factor b/extra/quadtrees/quadtrees-tests.factor
index 8dd4b53dcb..b96cdd82bf 100644
--- a/extra/quadtrees/quadtrees-tests.factor
+++ b/extra/quadtrees/quadtrees-tests.factor
@@ -1,3 +1,4 @@
+! (c) 2009 Joe Groff, see BSD license
 USING: assocs kernel tools.test quadtrees math.geometry.rect sorting ;
 IN: quadtrees.tests
 
diff --git a/extra/quadtrees/quadtrees.factor b/extra/quadtrees/quadtrees.factor
index a56b94e7d3..60446f4bf8 100644
--- a/extra/quadtrees/quadtrees.factor
+++ b/extra/quadtrees/quadtrees.factor
@@ -1,3 +1,4 @@
+! (c) 2009 Joe Groff, see BSD license
 USING: assocs kernel math.geometry.rect combinators accessors
 math.vectors vectors sequences math math.points math.geometry
 combinators.short-circuit arrays fry locals ;
@@ -14,6 +15,25 @@ TUPLE: quadtree { bounds rect } point value ll lr ul ur leaf? ;
 
 : rect-center ( rect -- point ) [ loc>> ] [ dim>> 0.5 v*n ] bi v+ ; inline
 
+: (quadrant) ( pt node -- quadrant )
+    swap [ first 0.0 < ] [ second 0.0 < ] bi
+    [ [ ll>> ] [ lr>> ] if ]
+    [ [ ul>> ] [ ur>> ] if ] if ;
+
+: quadrant ( pt node -- quadrant )
+    [ bounds>> rect-center v- ] keep (quadrant) ;
+
+: descend ( pt node -- pt subnode )
+    [ drop ] [ quadrant ] 2bi ; inline
+
+:: each-quadrant ( node quot -- )
+    node ll>> quot call
+    node lr>> quot call
+    node ul>> quot call
+    node ur>> quot call ; inline
+: map-quadrant ( node quot: ( child-node -- x ) -- array )
+    each-quadrant 4array ; inline
+
 <PRIVATE
 
 DEFER: (prune)
@@ -35,28 +55,9 @@ DEFER: in-rect*
 : ur-bounds ( rect -- rect' )
     [ [ loc>> ] [ dim>> { 0.5 0.5 } v* ] bi v+ ] [ child-dim ] bi <rect> ;
 
-: (quadrant) ( pt node -- quadrant )
-    swap [ first 0.0 < ] [ second 0.0 < ] bi
-    [ [ ll>> ] [ lr>> ] if ]
-    [ [ ul>> ] [ ur>> ] if ] if ;
-
-: quadrant ( pt node -- quadrant )
-    [ bounds>> rect-center v- ] keep (quadrant) ;
-
-: descend ( pt node -- pt subnode )
-    [ drop ] [ quadrant ] 2bi ; inline
-
 : {quadrants} ( node -- quadrants )
     { [ ll>> ] [ lr>> ] [ ul>> ] [ ur>> ] } cleave 4array ;
 
-:: each-quadrant ( node quot -- array )
-    node ll>> quot call
-    node lr>> quot call
-    node ul>> quot call
-    node ur>> quot call ; inline
-: map-quadrant ( node quot: ( child-node -- x ) -- array )
-    each-quadrant 4array ; inline
-
 : add-subnodes ( node -- node )
     dup bounds>> {
         [ ll-bounds <quadtree> >>ll ]
diff --git a/extra/quadtrees/summary.txt b/extra/quadtrees/summary.txt
new file mode 100644
index 0000000000..dd846a0a97
--- /dev/null
+++ b/extra/quadtrees/summary.txt
@@ -0,0 +1 @@
+Quadtree spatial indices
diff --git a/extra/quadtrees/tags.txt b/extra/quadtrees/tags.txt
new file mode 100644
index 0000000000..c133c6df7e
--- /dev/null
+++ b/extra/quadtrees/tags.txt
@@ -0,0 +1,2 @@
+assocs
+graphics

From 475f89645d9217e9a721dc22fb300659776c5843 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 2 Feb 2009 15:51:42 -0600
Subject: [PATCH 83/86] fix load error

---
 extra/project-euler/056/056.factor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extra/project-euler/056/056.factor b/extra/project-euler/056/056.factor
index 4e7bbdc0df..e2d95e27c1 100644
--- a/extra/project-euler/056/056.factor
+++ b/extra/project-euler/056/056.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.functions math.ranges project-euler.common sequences ;
+USING: kernel math.functions math.ranges project-euler.common
+sequences math.order ;
 IN: project-euler.056
 
 ! http://projecteuler.net/index.php?section=problems&id=56

From 7644d51e3bfe37878d817c25728d35be02cf70b9 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 2 Feb 2009 16:03:03 -0600
Subject: [PATCH 84/86] assocs -> collections in quadtree tags to be consistent

---
 extra/quadtrees/tags.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/quadtrees/tags.txt b/extra/quadtrees/tags.txt
index c133c6df7e..216000f731 100644
--- a/extra/quadtrees/tags.txt
+++ b/extra/quadtrees/tags.txt
@@ -1,2 +1,2 @@
-assocs
+collections
 graphics

From e9f2197590f2c785f43818efe2f2c5fc094e598f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 2 Feb 2009 16:35:30 -0600
Subject: [PATCH 85/86] remove a couple usings and nrev

---
 basis/generalizations/generalizations-docs.factor | 10 ----------
 basis/generalizations/generalizations.factor      |  7 ++-----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/basis/generalizations/generalizations-docs.factor b/basis/generalizations/generalizations-docs.factor
index a676be3be8..912f69587e 100644
--- a/basis/generalizations/generalizations-docs.factor
+++ b/basis/generalizations/generalizations-docs.factor
@@ -139,15 +139,6 @@ HELP: -nrot
     }
 } ;
 
-HELP: nrev
-{ $values { "n" integer } }
-{ $description "A generalization of " { $link spin } " that reverses any number of items at the top of the stack."
-}
-{ $examples
-  { $example "USING: prettyprint generalizations ;" "1 2 3 4 4 nrev .s" "4\n3\n2\n1" }
-  "The " { $link spin } " word is equivalent to " { $snippet "3 nrev" } "."
-} ;
-
 HELP: ndip
 { $values { "quot" quotation } { "n" integer } }
 { $description "A generalization of " { $link dip } " that can work " 
@@ -327,7 +318,6 @@ $nl
 { $subsection nnip }
 { $subsection ndrop }
 { $subsection ntuck }
-{ $subsection nrev }
 { $subsection mnswap }
 "Generalized combinators:"
 { $subsection ndip }
diff --git a/basis/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor
index c6a17df099..4692fd20db 100644
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Chris Double, Doug Coleman, Eduardo
 ! Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences sequences.private math math.ranges
-combinators macros quotations fry macros locals ;
+USING: kernel sequences sequences.private math combinators
+macros quotations fry ;
 IN: generalizations
 
 <<
@@ -51,9 +51,6 @@ MACRO: nnip ( n -- )
 MACRO: ntuck ( n -- )
     2 + '[ dup _ -nrot ] ;
 
-MACRO: nrev ( n -- )
-    1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ;
-
 MACRO: ndip ( quot n -- )
     [ '[ _ dip ] ] times ;
 

From 346a61f4978049689012e9fa84a893d4fa5234cf Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 2 Feb 2009 16:37:36 -0600
Subject: [PATCH 86/86] slight cleanup in memoize

---
 basis/memoize/memoize.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor
index 1c31156311..7b8c30c534 100644
--- a/basis/memoize/memoize.factor
+++ b/basis/memoize/memoize.factor
@@ -35,7 +35,7 @@ M: too-many-arguments summary
     drop "There must be no more than 4 input and 4 output arguments" ;
 
 : check-memoized ( word -- )
-    dup #in 4 > swap #out 4 > or [ too-many-arguments ] when ;
+    [ #in ] [ #out ] bi [ 4 > ] either? [ too-many-arguments ] when ;
 
 : define-memoized ( word quot -- )
     over check-memoized