Modify order of definitions of some coded-charsets.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 5 Sep 2012 10:23:06 +0000 (19:23 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 5 Sep 2012 10:23:06 +0000 (19:23 +0900)
lisp/mule/mule-conf.el

index be8df6d..e47d79a 100644 (file)
              =>iso-ir 187
              graphic 0))
 
-  (make-charset '=big5-cdp
-               "Big5 with CDP extension"
-               '(long-name     "Big5-CDP"
+  (make-charset '=big5-eten
+               "Big5 ETEN"
+               '(long-name     "Big5-ETEN"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 registry      "big5\\.cdp-0"
                  mother        chinese-big5
                  min-code      #x8140
-                 max-code      #x8DFE))
-  (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
-
-  (make-charset '=>>big5-cdp
-               "Abstract glyphs of Big5-CDP"
-               '(long-name     "Big5-CDP glyphs"
+                 max-code      #xFEFE
+                 registry      "Big5\\.ETEN"))
+  (define-charset-alias 'chinese-big5-eten '=big5-eten)
+  (make-charset 'chinese-big5-eten-a
+               "Big5 ETEN (#xF9D6 .. #xF9FE)"
+               '(long-name     "Big5-ETEN-a"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 registry      "big5\\.cdp-0"
-                 mother        =big5-cdp))
-
-  (make-charset '=>big5-cdp
-               "Big5-CDP abstract characters"
-               '(long-name     "Big5-CDP abstract characters"
+                 mother        chinese-big5
+                 min-code      #xF9D6
+                 max-code      #xF9FE
+                 registry      "Big5\\.ETEN"))
+  (make-charset 'chinese-big5-eten-b
+               "Big5 ETEN (#xC6A1 .. #xC8FE)"
+               '(long-name     "Big5-ETEN-b"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 registry      "big5\\.cdp-0"
-                 mother        =>>big5-cdp))
+                 mother        chinese-big5
+                 min-code      #xC6A1
+                 max-code      #xC8FE
+                 registry      "Big5\\.ETEN"))
 
-  (make-charset '=gt
-               "GT 2000"
-               `(long-name     "GT"
-                 chars         256
-                 dimension     3
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      ""
-                 min-code      ,(lsh #x6100 16)
-                 max-code      ,(+ (lsh #x6100 16) 67547)
-                 code-offset   ,(lsh #x6100 16)))
-  (define-charset-alias 'ideograph-gt '=gt)
-  (make-charset '=>>>gt
-               "GT 2000 abstract glyph-forms"
-               '(long-name     "GT abstract glyph-forms"
-                 chars         256
-                 dimension     3
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =gt))
-  (make-charset '=>>gt
-               "GT 2000 abstract glyphs"
-               '(long-name     "GT abstract glyphs"
-                 chars         256
-                 dimension     3
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =>>>gt))
-  (define-charset-alias '<=>gt '=>>gt)
-  (define-charset-alias '<==>gt '=>>gt)
-  (make-charset '=+>gt
-               "GT 2000 unified abstract glyphs"
-               '(long-name     "Unified abstract GT glyphs"
-                 chars         256
-                 dimension     3
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =>>gt))
-  (make-charset '=>gt
-               "GT 2000 abstract characters"
-               '(long-name     "abstract GT characters"
-                 chars         256
-                 dimension     3
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =+>gt))
-  (make-charset '=gt-k
-               "Ideographic components of GT"
-               `(long-name     "GT components"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      ""
-                 min-code      ,(lsh #x6110 16)
-                 max-code      ,(+ (lsh #x6110 16) 17090)
-                 code-offset   ,(lsh #x6110 16)))
-  (define-charset-alias 'ideograph-gt-k '=gt-k)
-  (make-charset '=>>gt-k
-               "abstract glyphs of GT-K"
-               '(long-name     "GT-K abstract glyphs"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =gt-k))
-  (make-charset '=>gt-k
-               "GT-K abstract characters"
-               '(long-name     "GT-K abstract characters"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =>>gt-k))
-  (let ((i 1))
-    (while (<= i 11)
-      (make-charset
-       (intern (format "=gt-pj-%d" i))
-       (format "GT 2000 (pseudo JIS encoding) part %d" i)
-       `(long-name ,(format "GT PJ %d" i)
-                  chars 94
-                  dimension 2
-                  columns 2
-                  graphic 0
-                  direction l2r
-                  registry ,(format "\\(GTpj-%d\\|jisx0208\\.GT-%d\\)$" i i)))
-      (define-charset-alias
-       (intern (format "ideograph-gt-pj-%d" i))
-       (intern (format "=gt-pj-%d" i)))
-      (setq i (1+ i))))
   (make-charset
-   '=gt-pj-k1
-   "Ideographic parts of GT (pseudo JIS encoding) part 1"
-   '(long-name "GT K1"
-              chars 94
+   '=adobe-japan1-base
+   "Adobe-Japan1 Character Collection for CID-Keyed Fonts"
+   `(long-name "Adobe-Japan1"
+              chars 256
               dimension 2
               columns 2
-              graphic 0
+              graphic 2
               direction l2r
-              registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
-  (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
+              registry "AdobeJapan1-[0-6]$"
+              min-code ,(lsh #x6300 16)
+              max-code ,(+ (lsh #x6300 16) 23057)
+              code-offset      ,(lsh #x6300 16)))
   (make-charset
-   '=gt-pj-k2
-   "Ideographic parts of GT (pseudo JIS encoding) part 2"
-   '(long-name "GT K2"
-              chars 94
+   '=adobe-japan1-0
+   "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-0"
+              chars 256
               dimension 2
               columns 2
-              graphic 0
+              graphic 2
               direction l2r
-              registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
-  (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
+              mother =adobe-japan1-base
+              min-code 0
+              max-code 8283
+              registry "AdobeJapan1-0$"))
+  (make-charset
+   '=adobe-japan1-1
+   "Adobe-Japan1-1 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-1"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-0
+              min-code 0
+              max-code 8358
+              registry "AdobeJapan1-1$"))
+  (make-charset
+   '=adobe-japan1-2
+   "Adobe-Japan1-2 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-2"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-1
+              min-code 0
+              max-code 8719
+              registry "AdobeJapan1-2$"))
+  (make-charset
+   '=adobe-japan1-3
+   "Adobe-Japan1-3 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-3"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-2
+              min-code 0
+              max-code 9353
+              registry "AdobeJapan1-3$"))
+  (make-charset
+   '=adobe-japan1-4
+   "Adobe-Japan1-4 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-4"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-3
+              min-code 0
+              max-code 15443
+              registry "AdobeJapan1-4$"))
+  (make-charset
+   '=adobe-japan1-5
+   "Adobe-Japan1-5 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-5"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-4
+              min-code 0
+              max-code 20316
+              registry "AdobeJapan1-5$"))
+  (make-charset
+   '=adobe-japan1-6
+   "Adobe-Japan1-6 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-6"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-5
+              min-code 0
+              max-code 23057
+              registry "AdobeJapan1-6$"))
+  (define-charset-alias '=adobe-japan1 '=adobe-japan1-6)
 
-  (make-charset '=daikanwa
-               "Daikanwa dictionary (unchanged part)"
-               `(long-name     "Daikanwa"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
-                 min-code      #xE00000
-                 max-code      ,(+ #xE00000 50100)
-                 code-offset   #xE00000))
-  (define-charset-alias 'ideograph-daikanwa '=daikanwa)
-
-  (make-charset '=daikanwa@rev1
-               "Daikanwa dictionary (revised version)"
-               '(long-name     "Daikanwa Rev."
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      "Daikanwa\\(\\.[0-9]+\\)?-2"
-                 mother        =daikanwa))
-  (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa@rev1)
-  (define-charset-alias '=daikanwa-rev1 '=daikanwa@rev1)
+  (make-charset
+   '=>>>adobe-japan1-0
+   "Adobe-Japan1-0 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-0 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-0
+              registry "AdobeJapan1-0$"))
+  (make-charset
+   '=>>>adobe-japan1-1
+   "Adobe-Japan1-1 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-1 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-0
+              registry "AdobeJapan1-1$"))
+  (make-charset
+   '=>>>adobe-japan1-2
+   "Adobe-Japan1-2 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-2 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-1
+              registry "AdobeJapan1-2$"))
+  (make-charset
+   '=>>>adobe-japan1-3
+   "Adobe-Japan1-3 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-3 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-2
+              registry "AdobeJapan1-3$"))
+  (make-charset
+   '=>>>adobe-japan1-4
+   "Adobe-Japan1-4 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-4 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-3
+              registry "AdobeJapan1-4$"))
+  (make-charset
+   '=>>>adobe-japan1-5
+   "Adobe-Japan1-5 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-5 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-4
+              registry "AdobeJapan1-5$"))
+  (make-charset
+   '=>>>adobe-japan1-6
+   "Adobe-Japan1-6 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-6 abstract glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1-5
+              registry "AdobeJapan1-6$"))
+  (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
 
-  (make-charset '=daikanwa@rev2
-               "Daikanwa dictionary (revised version 2)"
-               '(long-name     "Daikanwa"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
-                 mother        =daikanwa
-                 min-code      1
-                  max-code     49964))
-  (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
+  (make-charset
+   '=>>adobe-japan1-0
+   "Adobe-Japan1-0 abstract glyphs"
+   '(long-name "Adobe-Japan1-0 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>adobe-japan1
+              registry "AdobeJapan1-0$"))
+  (make-charset
+   '=>>adobe-japan1-1
+   "Adobe-Japan1-1 abstract glyphs"
+   '(long-name "Adobe-Japan1-1 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-0
+              registry "AdobeJapan1-1"))
+  (make-charset
+   '=>>adobe-japan1-2
+   "Adobe-Japan1-2 abstract glyphs"
+   '(long-name "Adobe-Japan1-2 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-1
+              registry "AdobeJapan1-2"))
+  (make-charset
+   '=>>adobe-japan1-3
+   "Adobe-Japan1-3 abstract glyphs"
+   '(long-name "Adobe-Japan1-3 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-2
+              registry "AdobeJapan1-3"))
+  (make-charset
+   '=>>adobe-japan1-4
+   "Adobe-Japan1-4 abstract glyphs"
+   '(long-name "Adobe-Japan1-4 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-3
+              registry "AdobeJapan1-4"))
+  (make-charset
+   '=>>adobe-japan1-5
+   "Adobe-Japan1-5 abstract glyphs"
+   '(long-name "Adobe-Japan1-5 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-4
+              registry "AdobeJapan1-5"))
+  (make-charset
+   '=>>adobe-japan1-6
+   "Adobe-Japan1-6 abstract glyphs"
+   '(long-name "Adobe-Japan1-6 abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1-5
+              registry "AdobeJapan1-6"))
+  (define-charset-alias '=>>adobe-japan1 '=>>adobe-japan1-6)
 
-  (make-charset '=daikanwa/+p
-               "Daikanwa dictionary (ddddd')"
-               '(long-name     "Daikanwa ddddd'"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r))
-  (make-charset '=daikanwa/+2p
-               "Daikanwa dictionary (ddddd'')"
-               '(long-name     "Daikanwa ddddd''"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r))
-  (make-charset '=daikanwa/ho
-               "Daikanwa dictionary (Hokan)"
-               '(long-name     "Daikanwa-ho"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r))
+  (make-charset
+   '=+>adobe-japan1
+   "Adobe-Japan1 unified abstract glyphs"
+   '(long-name "Adobe-Japan1 unified abstract glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>adobe-japan1
+              registry "AdobeJapan1-6$"))
 
-  (make-charset '=>>daikanwa
-               "Daikanwa abstract glyphs"
-               '(long-name     "Daikanwa glyphs"
+  (make-charset '=big5-cdp
+               "Big5 with CDP extension"
+               '(long-name     "Big5-CDP"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
-                 mother        =daikanwa))
-  (make-charset '=>>daikanwa/+p
-               "Daikanwa abstract glyphs (ddddd')"
-               '(long-name     "Daikanwa glyphs (ddddd')"
+                 registry      "big5\\.cdp-0"
+                 mother        chinese-big5
+                 min-code      #x8140
+                 max-code      #x8DFE))
+  (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
+
+  (make-charset '=>>big5-cdp
+               "Abstract glyphs of Big5-CDP"
+               '(long-name     "Big5-CDP glyphs"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =daikanwa/+p))
-  (make-charset '=>>daikanwa/+2p
-               "Daikanwa abstract glyphs (ddddd'')"
-               '(long-name     "Daikanwa glyphs (ddddd'')"
+                 registry      "big5\\.cdp-0"
+                 mother        =big5-cdp))
+
+  (make-charset '=>big5-cdp
+               "Big5-CDP abstract characters"
+               '(long-name     "Big5-CDP abstract characters"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =daikanwa/+2p))
-  (make-charset '=>>daikanwa/ho
-               "Daikanwa abstract glyphs (Hokan)"
-               '(long-name     "Daikanwa-ho glyph"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =daikanwa/ho))
+                 registry      "big5\\.cdp-0"
+                 mother        =>>big5-cdp))
 
-  (make-charset '=>daikanwa
-               "Daikanwa abstract characters"
-               '(long-name     "abstract Daikanwa"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
-                 mother        =>>daikanwa))
-  (make-charset '=>daikanwa/ho
-               "Daikanwa abstract characters (Hokan)"
-               '(long-name     "abstract Daikanwa-ho"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 mother        =>>daikanwa/ho))
+  (make-charset
+   '=hanyo-denshi/ja
+   "JA (JIS X0208) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/JA"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JA-0$"
+              min-code ,(lsh #x6400 16)
+              max-code ,(+ (lsh #x6400 16) (1- (* 94 94)))
+              code-offset ,(lsh #x6400 16)))
+  (make-charset
+   '=hanyo-denshi/jb
+   "JB (JIS X0212) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/JB"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JB-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 2)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94))))
+  (make-charset
+   '=hanyo-denshi/jc
+   "JC (JIS X0213:2000 Plane 1) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/JC"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JC-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 2))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 3)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 2))))
+  (make-charset
+   '=hanyo-denshi/jd
+   "JD (JIS X0213:2000 Plane 1) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/JD"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JD-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 3))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 4)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 3))))
+  (make-charset
+   '=hanyo-denshi/ft
+   "FT (FDPC additional) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/FT"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.FT-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 4))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 5)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 4))))
+  (make-charset
+   '=hanyo-denshi/ia
+   "IA part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/IA"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IA-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 5))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 6)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 5))))
+  (make-charset
+   '=hanyo-denshi/ib
+   "IB part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/IB"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IB-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 6))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 7)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 6))))
+  (make-charset
+   '=hanyo-denshi/hg
+   "HG (HyouGai Kanji) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/HG"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.HG-0$"
+              min-code    ,(+ (lsh #x6400 16) (* 94 94 7))
+              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 8)))
+              code-offset ,(+ (lsh #x6400 16) (* 94 94 7))))
+  (make-charset
+   '=hanyo-denshi/ip
+   "IP (for IPA) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/IP"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IP-0$"
+              min-code    ,(+ (lsh #x6402 16) #x4E00)
+              max-code    ,(+ (lsh #x6402 16) #x9FFF)
+              code-offset ,(+ (lsh #x6402 16))))
+  (make-charset
+   '=hanyo-denshi/jt
+   "JT (Juuki Touitsu Moji) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/JT"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JT-0$"
+              min-code    ,(+ (lsh #x6402 16) #xAC00)
+              max-code    ,(+ (lsh #x6402 16) #xD7AF)
+              code-offset ,(+ (lsh #x6402 16))))
+  (make-charset
+   '=hanyo-denshi/ks
+   "KS (KoSeki) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/KS font encoding"
+              chars 256
+              dimension 3
+              columns 2
+              graphic 2
+              direction l2r))
+  (make-charset
+   '=hanyo-denshi/ks/mf
+   "font encoding for KS (KoSeki) characters"
+   `(long-name "Han'you-Denshi/KS font encoding"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.KSMF-0$"
+              min-code       ,(lsh #x6403 16)
+              max-code    ,(+ (lsh #x6403 16) #xFFFF)
+              code-offset    ,(lsh #x6403 16)))
 
-  (make-charset '=shinjigen
-               "Kadokawa ShinJigen dictionary (common parts)"
-               `(long-name     "Shinjigen common parts"
-                 chars         256
-                 dimension     2
-                 columns       2
-                 graphic       2
-                 direction     l2r
-                 registry      "Shinjigen\\(\\.[0-9]+\\)?-*"))
+  (make-charset
+   '=>>>hanyo-denshi/ja
+   "Han'you-Denshi/JA abstract glyph-forms"
+   '(long-name "Han'you-Denshi/JA glyph-forms"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JA-0$"
+              mother =hanyo-denshi/ja))
+  (make-charset
+   '=>>>hanyo-denshi/jc
+   "Han'you-Denshi/JC abstract glyph-forms"
+   '(long-name "Han'you-Denshi/JC glyph-forms"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JC-0$"
+              mother =hanyo-denshi/jc))
+  (make-charset
+   '=>>>hanyo-denshi/ft
+   "Han'you-Denshi/FT abstract glyph-forms"
+   '(long-name "Han'you-Denshi/FT glyph-forms"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.FT-0$"
+              mother =hanyo-denshi/ft))
+  (make-charset
+   '=>>>hanyo-denshi/ib
+   "Han'you-Denshi/IB abstract glyph-forms"
+   '(long-name "Han'you-Denshi/IB glyph-forms"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IB-0$"
+              mother =hanyo-denshi/ib))
+  (make-charset
+   '=>>>hanyo-denshi/jt
+   "JT (Juuki Touitsu Moji) abstract glyph-forms"
+   '(long-name "Han'you-Denshi/JT glyph-forms"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JT-0$"
+              mother =hanyo-denshi/jt))
+  (make-charset
+   '=>>>hanyo-denshi/ks
+   "KoSeki-touitsu-moji abstract glyph-forms"
+   '(long-name "Han'you-Denshi/KS glyph-forms"
+              chars 256
+              dimension 3
+              columns 2
+              graphic 2
+              direction l2r
+              mother =hanyo-denshi/ks))
 
-  (make-charset '=shinjigen@1ed
-               "Kadokawa ShinJigen dictionary (the first edition)"
-               `(long-name     "Shinjigen-1"
-                 chars         256
-                 dimension     2
+  (make-charset
+   '=>>hanyo-denshi/ja
+   "Han'you-Denshi/JA abstract glyphs"
+   '(long-name "Han'you-Denshi/JA glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JA-0$"
+              mother =>>>hanyo-denshi/ja))
+  (make-charset
+   '=>>hanyo-denshi/jb
+   "Han'you-Denshi/JB abstract glyphs"
+   '(long-name "Han'you-Denshi/JB glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JB-0$"
+              mother =hanyo-denshi/jb))
+  (make-charset
+   '=>>hanyo-denshi/jc
+   "Han'you-Denshi/JC abstract glyphs"
+   '(long-name "Han'you-Denshi/JC glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JC-0$"
+              mother =>>>hanyo-denshi/jc))
+  (make-charset
+   '=>>hanyo-denshi/jd
+   "Han'you-Denshi/JD abstract glyphs"
+   '(long-name "Han'you-Denshi/JD glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JD-0$"
+              mother =hanyo-denshi/jd))
+  (make-charset
+   '=>>hanyo-denshi/ft
+   "Han'you-Denshi/FT abstract glyphs"
+   '(long-name "Han'you-Denshi/FT glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.FT-0$"
+              mother =>>>hanyo-denshi/ft))
+  (make-charset
+   '=>>hanyo-denshi/ia
+   "Han'you-Denshi/IA abstract glyphs"
+   '(long-name "Han'you-Denshi/IA glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IA-0$"
+              mother =hanyo-denshi/ia))
+  (make-charset
+   '=>>hanyo-denshi/ib
+   "Han'you-Denshi/IB abstract glyphs"
+   '(long-name "Han'you-Denshi/IB abstract glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.IB-0$"
+              mother =>>>hanyo-denshi/ib))
+  (make-charset
+   '=>>hanyo-denshi/hg
+   "Han'you-Denshi/HG abstract glyphs"
+   '(long-name "Han'you-Denshi/HG abstract glyphs"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.HG-0$"
+              mother =hanyo-denshi/hg))
+  (make-charset
+   '=>>hanyo-denshi/jt
+   "JT (Juuki Touitsu Moji) abstract glyphs"
+   '(long-name "Han'you-Denshi/JT glyphs"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "HanyoDenshi\\.JT-0$"
+              mother =>>>hanyo-denshi/jt))
+  (make-charset
+   '=>>hanyo-denshi/ks
+   "Han'you-Denshi/KS abstract glyphs"
+   '(long-name "Han'you-Denshi/KS glyphs"
+              chars 256
+              dimension 3
+              columns 2
+              graphic 2
+              direction l2r
+              mother =>>>hanyo-denshi/ks))
+
+  (make-charset '=gt
+               "GT 2000"
+               `(long-name     "GT"
+                 chars         256
+                 dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =shinjigen
-                 registry      "Shinjigen\\(\\.[0-9]+\\)?-1"))
-  (define-charset-alias 'shinjigen-1 '=shinjigen@1ed)
-
-  (make-charset '=shinjigen@1ed/24pr
-               "Kadokawa ShinJigen dictionary (the 24th impression)"
-               `(long-name     "Shinjigen-1 24pr"
+                 registry      ""
+                 min-code      ,(lsh #x6100 16)
+                 max-code      ,(+ (lsh #x6100 16) 67547)
+                 code-offset   ,(lsh #x6100 16)))
+  (define-charset-alias 'ideograph-gt '=gt)
+  (make-charset '=>>>gt
+               "GT 2000 abstract glyph-forms"
+               '(long-name     "GT abstract glyph-forms"
                  chars         256
-                 dimension     2
+                 dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =shinjigen@1ed))
-
-  (make-charset '=shinjigen@rev
-               "Kadokawa ShinJigen dictionary (the revised edition)"
-               `(long-name     "Shinjigen-2"
+                 mother        =gt))
+  (make-charset '=>>gt
+               "GT 2000 abstract glyphs"
+               '(long-name     "GT abstract glyphs"
                  chars         256
-                 dimension     2
+                 dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        =shinjigen
-                 registry      "Shinjigen\\(\\.[0-9]+\\)?-2"))
-  (define-charset-alias 'shinjigen-2 '=shinjigen@rev)
-  (make-charset '=shinjigen/+p@rev
-               "ShinJigen (the second edition) number with '"
-               `(long-name     "Shinjigen-2 with '"
+                 mother        =>>>gt))
+  (define-charset-alias '<=>gt '=>>gt)
+  (define-charset-alias '<==>gt '=>>gt)
+  (make-charset '=+>gt
+               "GT 2000 unified abstract glyphs"
+               '(long-name     "Unified abstract GT glyphs"
                  chars         256
-                 dimension     2
+                 dimension     3
                  columns       2
                  graphic       2
-                 direction     l2r))
-  (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
-
-  (make-charset '=big5-pua
-               "Big5 with private used area"
-               '(long-name     "Big5-PUA"
+                 direction     l2r
+                 mother        =>>gt))
+  (make-charset '=>gt
+               "GT 2000 abstract characters"
+               '(long-name     "abstract GT characters"
                  chars         256
-                 dimension     2
+                 dimension     3
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        chinese-big5
-                 registry      "Big5\\.ETEN"))
-  (define-charset-alias 'chinese-big5-pua '=big5-pua)
-  (make-charset '=big5-eten
-               "Big5 ETEN"
-               '(long-name     "Big5-ETEN"
+                 mother        =+>gt))
+  (make-charset '=gt-k
+               "Ideographic components of GT"
+               `(long-name     "GT components"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        chinese-big5
-                 min-code      #x8140
-                 max-code      #xFEFE
-                 registry      "Big5\\.ETEN"))
-  (define-charset-alias 'chinese-big5-eten '=big5-eten)
-  (make-charset 'chinese-big5-eten-a
-               "Big5 ETEN (#xF9D6 .. #xF9FE)"
-               '(long-name     "Big5-ETEN-a"
+                 registry      ""
+                 min-code      ,(lsh #x6110 16)
+                 max-code      ,(+ (lsh #x6110 16) 17090)
+                 code-offset   ,(lsh #x6110 16)))
+  (define-charset-alias 'ideograph-gt-k '=gt-k)
+  (make-charset '=>>gt-k
+               "abstract glyphs of GT-K"
+               '(long-name     "GT-K abstract glyphs"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        chinese-big5
-                 min-code      #xF9D6
-                 max-code      #xF9FE
-                 registry      "Big5\\.ETEN"))
-  (make-charset 'chinese-big5-eten-b
-               "Big5 ETEN (#xC6A1 .. #xC8FE)"
-               '(long-name     "Big5-ETEN-b"
+                 mother        =gt-k))
+  (make-charset '=>gt-k
+               "GT-K abstract characters"
+               '(long-name     "GT-K abstract characters"
                  chars         256
                  dimension     2
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        chinese-big5
-                 min-code      #xC6A1
-                 max-code      #xC8FE
-                 registry      "Big5\\.ETEN"))
-
-  (let* ((i 1)
-        (hzk-min (+ (lsh #x6200 16) 65536))
-        (hzk-max (+ hzk-min 65535)))
-    (while (<= i 12)
+                 mother        =>>gt-k))
+  (let ((i 1))
+    (while (<= i 11)
       (make-charset
-       (intern (format "=hanziku-%d" i))
-       (format "HANZIKU (pseudo BIG5 encoding) part %d" i)
-       `(long-name ,(format "HANZIKU-%d" i)
-                  chars 256
+       (intern (format "=gt-pj-%d" i))
+       (format "GT 2000 (pseudo JIS encoding) part %d" i)
+       `(long-name ,(format "GT PJ %d" i)
+                  chars 94
                   dimension 2
                   columns 2
-                  graphic 2
+                  graphic 0
                   direction l2r
-                  registry ,(format "hanziku-%d$" i i)
-                  min-code ,hzk-min
-                  max-code ,hzk-max
-                  code-offset ,hzk-min))
+                  registry ,(format "\\(GTpj-%d\\|jisx0208\\.GT-%d\\)$" i i)))
       (define-charset-alias
-       (intern (format "ideograph-hanziku-%d" i))
-       (intern (format "=hanziku-%d" i)))
-      (setq hzk-min (1+ hzk-max)
-           hzk-max (+ hzk-min 65535))
+       (intern (format "ideograph-gt-pj-%d" i))
+       (intern (format "=gt-pj-%d" i)))
       (setq i (1+ i))))
-
-  (make-charset '=cbeta "CBETA private characters"
-               '(long-name     "CBETA PUA"
-                 chars         256
-                 dimension     2
-                 registry      "cbeta-0"
-                 graphic       2
-                 min-code      #xE20000
-                 max-code      #xE2FFFF
-                 code-offset   #xE20000
-                 columns       2
-                 direction     l2r))
-  (define-charset-alias 'ideograph-cbeta '=cbeta)
-
-  (make-charset '=>>cbeta "CBETA abstract glyphs"
+  (make-charset
+   '=gt-pj-k1
+   "Ideographic parts of GT (pseudo JIS encoding) part 1"
+   '(long-name "GT K1"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 0
+              direction l2r
+              registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
+  (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
+  (make-charset
+   '=gt-pj-k2
+   "Ideographic parts of GT (pseudo JIS encoding) part 2"
+   '(long-name "GT K2"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 0
+              direction l2r
+              registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
+  (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
+
+  (make-charset '=daikanwa
+               "Daikanwa dictionary (unchanged part)"
+               `(long-name     "Daikanwa"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
+                 min-code      #xE00000
+                 max-code      ,(+ #xE00000 50100)
+                 code-offset   #xE00000))
+  (define-charset-alias 'ideograph-daikanwa '=daikanwa)
+
+  (make-charset '=daikanwa@rev1
+               "Daikanwa dictionary (revised version)"
+               '(long-name     "Daikanwa Rev."
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-2"
+                 mother        =daikanwa))
+  (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa@rev1)
+  (define-charset-alias '=daikanwa-rev1 '=daikanwa@rev1)
+
+  (make-charset '=daikanwa@rev2
+               "Daikanwa dictionary (revised version 2)"
+               '(long-name     "Daikanwa"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
+                 mother        =daikanwa
+                 min-code      1
+                  max-code     49964))
+  (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
+
+  (make-charset '=daikanwa/+p
+               "Daikanwa dictionary (ddddd')"
+               '(long-name     "Daikanwa ddddd'"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r))
+  (make-charset '=daikanwa/+2p
+               "Daikanwa dictionary (ddddd'')"
+               '(long-name     "Daikanwa ddddd''"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r))
+  (make-charset '=daikanwa/ho
+               "Daikanwa dictionary (Hokan)"
+               '(long-name     "Daikanwa-ho"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r))
+
+  (make-charset '=>>daikanwa
+               "Daikanwa abstract glyphs"
+               '(long-name     "Daikanwa glyphs"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
+                 mother        =daikanwa))
+  (make-charset '=>>daikanwa/+p
+               "Daikanwa abstract glyphs (ddddd')"
+               '(long-name     "Daikanwa glyphs (ddddd')"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =daikanwa/+p))
+  (make-charset '=>>daikanwa/+2p
+               "Daikanwa abstract glyphs (ddddd'')"
+               '(long-name     "Daikanwa glyphs (ddddd'')"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =daikanwa/+2p))
+  (make-charset '=>>daikanwa/ho
+               "Daikanwa abstract glyphs (Hokan)"
+               '(long-name     "Daikanwa-ho glyph"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =daikanwa/ho))
+
+  (make-charset '=>daikanwa
+               "Daikanwa abstract characters"
+               '(long-name     "abstract Daikanwa"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
+                 mother        =>>daikanwa))
+  (make-charset '=>daikanwa/ho
+               "Daikanwa abstract characters (Hokan)"
+               '(long-name     "abstract Daikanwa-ho"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =>>daikanwa/ho))
+
+  (make-charset '=shinjigen
+               "Kadokawa ShinJigen dictionary (common parts)"
+               `(long-name     "Shinjigen common parts"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-*"))
+
+  (make-charset '=shinjigen@1ed
+               "Kadokawa ShinJigen dictionary (the first edition)"
+               `(long-name     "Shinjigen-1"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-1"))
+  (define-charset-alias 'shinjigen-1 '=shinjigen@1ed)
+
+  (make-charset '=shinjigen@1ed/24pr
+               "Kadokawa ShinJigen dictionary (the 24th impression)"
+               `(long-name     "Shinjigen-1 24pr"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen@1ed))
+
+  (make-charset '=shinjigen@rev
+               "Kadokawa ShinJigen dictionary (the revised edition)"
+               `(long-name     "Shinjigen-2"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-2"))
+  (define-charset-alias 'shinjigen-2 '=shinjigen@rev)
+  (make-charset '=shinjigen/+p@rev
+               "ShinJigen (the second edition) number with '"
+               `(long-name     "Shinjigen-2 with '"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r))
+  (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
+
+  (make-charset '=big5-pua
+               "Big5 with private used area"
+               '(long-name     "Big5-PUA"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        chinese-big5
+                 registry      "Big5\\.ETEN"))
+  (define-charset-alias 'chinese-big5-pua '=big5-pua)
+
+  (let* ((i 1)
+        (hzk-min (+ (lsh #x6200 16) 65536))
+        (hzk-max (+ hzk-min 65535)))
+    (while (<= i 12)
+      (make-charset
+       (intern (format "=hanziku-%d" i))
+       (format "HANZIKU (pseudo BIG5 encoding) part %d" i)
+       `(long-name ,(format "HANZIKU-%d" i)
+                  chars 256
+                  dimension 2
+                  columns 2
+                  graphic 2
+                  direction l2r
+                  registry ,(format "hanziku-%d$" i i)
+                  min-code ,hzk-min
+                  max-code ,hzk-max
+                  code-offset ,hzk-min))
+      (define-charset-alias
+       (intern (format "ideograph-hanziku-%d" i))
+       (intern (format "=hanziku-%d" i)))
+      (setq hzk-min (1+ hzk-max)
+           hzk-max (+ hzk-min 65535))
+      (setq i (1+ i))))
+
+  (make-charset '=cbeta "CBETA private characters"
+               '(long-name     "CBETA PUA"
+                 chars         256
+                 dimension     2
+                 registry      "cbeta-0"
+                 graphic       2
+                 min-code      #xE20000
+                 max-code      #xE2FFFF
+                 code-offset   #xE20000
+                 columns       2
+                 direction     l2r))
+  (define-charset-alias 'ideograph-cbeta '=cbeta)
+
+  (make-charset '=>>cbeta "CBETA abstract glyphs"
                '(long-name     "CBETA glyphs"
                  chars         256
                  dimension     2
                  mother        =ucs@big5))
 
   (make-charset
-   '=ucs-radicals
-   "CJK Radicals of UCS"
-   '(long-name "UCS-Radicals"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zhRadicals-.*-ucs-0"
-              mother ucs-bmp
-              min-code #x2E00 max-code #x2FFF))
-  (make-charset
-   '=ucs-radicals@unicode
-   "CJK Radicals of UCS"
-   '(long-name "UCS-Radicals"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zhRadicals-.*-ucs-0"
-              mother =ucs@unicode
-              min-code #x2E00 max-code #x2FFF))
-  (make-charset
-   '=ucs-hangul
-   "Hangul Syllables of UCS"
-   '(long-name "UCS-Hangul-Syllables"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-Hangul-.*-ucs-0"
-              mother =ucs
-              min-code #xAC00 max-code #xD7AF))
-  (make-charset
-   '=ucs-bmp-cjk
-   "CJK Characters in BMP of UCS"
-   '(long-name "UCS-BMP-CJK"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zh-.*-ucs-0"
-              mother ucs-bmp
-              min-code #x2E00
-              max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=ucs-bmp-cjk@unicode
-   "CJK Characters in BMP of Unicode"
-   '(long-name "Unicode-BMP-CJK"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zh-.*-ucs-0"
-              mother =ucs@unicode
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=ucs-bmp-cjk@JP
-   "CJK Characters in BMP with JIS representative glyphs"
-   '(long-name "CJK in BMP@JP"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-ja-.*-ucs-0"
-              mother =ucs@JP
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=ucs-bmp-cjk@JP/hanazono
-   "CJK Characters in BMP with Hanazono font"
-   '(long-name "CJK in BMP@JP/Hanazono"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-ja-.*-ucs-0"
-              mother =ucs@JP/hanazono
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=+>ucs-bmp-cjk@unicode
-   "Unicode representative characters of CJK Unified Ideographs in BMP"
-   '(long-name "Unicode-BMP-CJK unified abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zh-.*-ucs-0"
-              mother =+>ucs@unicode
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=>ucs-bmp-cjk@unicode
-   "Unicode representative characters of CJK Unified Ideographs in BMP"
-   '(long-name "Unicode-BMP-CJK"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zh-.*-ucs-0"
-              mother =>ucs@unicode
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '==>ucs-bmp-cjk@bucs
-   "CJK Characters in BMP of BUCS"
-   '(long-name "BUCS-BMP-CJK"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-zh-.*-ucs-0"
-              mother ==>ucs@bucs
-              min-code #x2E00
-               max-code #x9FA5
-              ;; max-code #xA4CF
-              ))
-  (make-charset
-   '=ucs-bmp-cjk-compat
-   "CJK Compatibility Ideographs in BMP of UCS"
-   '(long-name "CJK Compatibility Ideographs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-ja-.*-ucs-0"
-              mother ucs-bmp
-              min-code #xF900
-              max-code #xFAFF
-              ))
-  (make-charset
-   '=ucs-bmp-cjk-compat@unicode
-   "CJK Compatibility Ideographs of Unicode representatives"
-   '(long-name "CJK Compatibility Ideographs of Unicode"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "-ja-.*-ucs-0"
-              mother =ucs@unicode
-              min-code #xF900
-              max-code #xFAFF
-              ))
-  (make-charset
-   '=ucs-sip-ext-b
-   "CJK Ideographs Extension B"
-   '(long-name "UCS CJK Ext-B"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "\\(iso10646\\|ucs02\\)-2$"
-              mother ucs
-              min-code #x20000 max-code #x2A6D6
-              code-offset #x20000))
-  (make-charset
-   '=ucs-sip-ext-b@iso
-   "CJK Ideographs Extension B (ISO/IEC 10646-2)"
-   '(long-name "UCS CJK Ext-B"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "\\(iso10646\\|ucs02\\)-2$"
-              mother =ucs@iso
-              min-code #x20000 max-code #x2A6D6
-              code-offset #x20000))
-
-  (make-charset
-   '=adobe-japan1-base
-   "Adobe-Japan1 Character Collection for CID-Keyed Fonts"
-   `(long-name "Adobe-Japan1"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "AdobeJapan1-[0-6]$"
-              min-code ,(lsh #x6300 16)
-              max-code ,(+ (lsh #x6300 16) 23057)
-              code-offset      ,(lsh #x6300 16)))
-  (make-charset
-   '=adobe-japan1-0
-   "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-0"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-base
-              min-code 0
-              max-code 8283
-              registry "AdobeJapan1-0$"))
-  (make-charset
-   '=adobe-japan1-1
-   "Adobe-Japan1-1 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-1"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-0
-              min-code 0
-              max-code 8358
-              registry "AdobeJapan1-1$"))
-  (make-charset
-   '=adobe-japan1-2
-   "Adobe-Japan1-2 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-2"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-1
-              min-code 0
-              max-code 8719
-              registry "AdobeJapan1-2$"))
-  (make-charset
-   '=adobe-japan1-3
-   "Adobe-Japan1-3 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-3"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-2
-              min-code 0
-              max-code 9353
-              registry "AdobeJapan1-3$"))
-  (make-charset
-   '=adobe-japan1-4
-   "Adobe-Japan1-4 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-4"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-3
-              min-code 0
-              max-code 15443
-              registry "AdobeJapan1-4$"))
-  (make-charset
-   '=adobe-japan1-5
-   "Adobe-Japan1-5 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-5"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-4
-              min-code 0
-              max-code 20316
-              registry "AdobeJapan1-5$"))
-  (make-charset
-   '=adobe-japan1-6
-   "Adobe-Japan1-6 Character Collection for CID-Keyed Fonts"
-   '(long-name "Adobe-Japan1-6"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-5
-              min-code 0
-              max-code 23057
-              registry "AdobeJapan1-6$"))
-  (define-charset-alias '=adobe-japan1 '=adobe-japan1-6)
-
-  (make-charset
-   '=>>>adobe-japan1-0
-   "Adobe-Japan1-0 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-0 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =adobe-japan1-0
-              registry "AdobeJapan1-0$"))
-  (make-charset
-   '=>>>adobe-japan1-1
-   "Adobe-Japan1-1 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-1 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-0
-              registry "AdobeJapan1-1$"))
-  (make-charset
-   '=>>>adobe-japan1-2
-   "Adobe-Japan1-2 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-2 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-1
-              registry "AdobeJapan1-2$"))
-  (make-charset
-   '=>>>adobe-japan1-3
-   "Adobe-Japan1-3 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-3 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-2
-              registry "AdobeJapan1-3$"))
-  (make-charset
-   '=>>>adobe-japan1-4
-   "Adobe-Japan1-4 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-4 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-3
-              registry "AdobeJapan1-4$"))
-  (make-charset
-   '=>>>adobe-japan1-5
-   "Adobe-Japan1-5 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-5 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-4
-              registry "AdobeJapan1-5$"))
-  (make-charset
-   '=>>>adobe-japan1-6
-   "Adobe-Japan1-6 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-6 abstract glyph-forms"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1-5
-              registry "AdobeJapan1-6$"))
-  (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
-
-  (make-charset
-   '=>>adobe-japan1-0
-   "Adobe-Japan1-0 abstract glyphs"
-   '(long-name "Adobe-Japan1-0 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>>adobe-japan1
-              registry "AdobeJapan1-0$"))
-  (make-charset
-   '=>>adobe-japan1-1
-   "Adobe-Japan1-1 abstract glyphs"
-   '(long-name "Adobe-Japan1-1 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-0
-              registry "AdobeJapan1-1"))
-  (make-charset
-   '=>>adobe-japan1-2
-   "Adobe-Japan1-2 abstract glyphs"
-   '(long-name "Adobe-Japan1-2 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-1
-              registry "AdobeJapan1-2"))
-  (make-charset
-   '=>>adobe-japan1-3
-   "Adobe-Japan1-3 abstract glyphs"
-   '(long-name "Adobe-Japan1-3 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-2
-              registry "AdobeJapan1-3"))
-  (make-charset
-   '=>>adobe-japan1-4
-   "Adobe-Japan1-4 abstract glyphs"
-   '(long-name "Adobe-Japan1-4 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-3
-              registry "AdobeJapan1-4"))
-  (make-charset
-   '=>>adobe-japan1-5
-   "Adobe-Japan1-5 abstract glyphs"
-   '(long-name "Adobe-Japan1-5 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-4
-              registry "AdobeJapan1-5"))
-  (make-charset
-   '=>>adobe-japan1-6
-   "Adobe-Japan1-6 abstract glyphs"
-   '(long-name "Adobe-Japan1-6 abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1-5
-              registry "AdobeJapan1-6"))
-  (define-charset-alias '=>>adobe-japan1 '=>>adobe-japan1-6)
-
-  (make-charset
-   '=+>adobe-japan1
-   "Adobe-Japan1 unified abstract glyphs"
-   '(long-name "Adobe-Japan1 unified abstract glyphs"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              mother =>>adobe-japan1
-              registry "AdobeJapan1-6$"))
-
-  (make-charset
-   '=hanyo-denshi/ja
-   "JA (JIS X0208) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/JA"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JA-0$"
-              min-code ,(lsh #x6400 16)
-              max-code ,(+ (lsh #x6400 16) (1- (* 94 94)))
-              code-offset ,(lsh #x6400 16)))
-  (make-charset
-   '=hanyo-denshi/jb
-   "JB (JIS X0212) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/JB"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JB-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 2)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94))))
-  (make-charset
-   '=hanyo-denshi/jc
-   "JC (JIS X0213:2000 Plane 1) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/JC"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JC-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 2))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 3)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 2))))
-  (make-charset
-   '=hanyo-denshi/jd
-   "JD (JIS X0213:2000 Plane 1) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/JD"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JD-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 3))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 4)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 3))))
-  (make-charset
-   '=hanyo-denshi/ft
-   "FT (FDPC additional) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/FT"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.FT-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 4))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 5)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 4))))
-  (make-charset
-   '=hanyo-denshi/ia
-   "IA part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/IA"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.IA-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 5))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 6)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 5))))
-  (make-charset
-   '=hanyo-denshi/ib
-   "IB part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/IB"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.IB-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 6))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 7)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 6))))
-  (make-charset
-   '=hanyo-denshi/hg
-   "HG (HyouGai Kanji) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/HG"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.HG-0$"
-              min-code    ,(+ (lsh #x6400 16) (* 94 94 7))
-              max-code    ,(+ (lsh #x6400 16) (1- (* 94 94 8)))
-              code-offset ,(+ (lsh #x6400 16) (* 94 94 7))))
-  (make-charset
-   '=hanyo-denshi/ip
-   "IP (for IPA) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/IP"
-              chars 256
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.IP-0$"
-              min-code    ,(+ (lsh #x6402 16) #x4E00)
-              max-code    ,(+ (lsh #x6402 16) #x9FFF)
-              code-offset ,(+ (lsh #x6402 16))))
-  (make-charset
-   '=hanyo-denshi/jt
-   "JT (Juuki Touitsu Moji) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/JT"
+   '=ucs-radicals
+   "CJK Radicals of UCS"
+   '(long-name "UCS-Radicals"
               chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JT-0$"
-              min-code    ,(+ (lsh #x6402 16) #xAC00)
-              max-code    ,(+ (lsh #x6402 16) #xD7AF)
-              code-offset ,(+ (lsh #x6402 16))))
-  (make-charset
-   '=hanyo-denshi/ks
-   "KS (KoSeki) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/KS font encoding"
-              chars 256
-              dimension 3
-              columns 2
-              graphic 2
-              direction l2r))
+              registry "-zhRadicals-.*-ucs-0"
+              mother ucs-bmp
+              min-code #x2E00 max-code #x2FFF))
   (make-charset
-   '=hanyo-denshi/ks/mf
-   "font encoding for KS (KoSeki) characters"
-   `(long-name "Han'you-Denshi/KS font encoding"
+   '=ucs-radicals@unicode
+   "CJK Radicals of UCS"
+   '(long-name "UCS-Radicals"
               chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.KSMF-0$"
-              min-code       ,(lsh #x6403 16)
-              max-code    ,(+ (lsh #x6403 16) #xFFFF)
-              code-offset    ,(lsh #x6403 16)))
-
-  (make-charset
-   '=>>>hanyo-denshi/ja
-   "Han'you-Denshi/JA abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JA glyph-forms"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JA-0$"
-              mother =hanyo-denshi/ja))
-  (make-charset
-   '=>>>hanyo-denshi/jc
-   "Han'you-Denshi/JC abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JC glyph-forms"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.JC-0$"
-              mother =hanyo-denshi/jc))
-  (make-charset
-   '=>>>hanyo-denshi/ft
-   "Han'you-Denshi/FT abstract glyph-forms"
-   '(long-name "Han'you-Denshi/FT glyph-forms"
-              chars 94
-              dimension 2
-              columns 2
-              graphic 2
-              direction l2r
-              registry "HanyoDenshi\\.FT-0$"
-              mother =hanyo-denshi/ft))
+              registry "-zhRadicals-.*-ucs-0"
+              mother =ucs@unicode
+              min-code #x2E00 max-code #x2FFF))
   (make-charset
-   '=>>>hanyo-denshi/ib
-   "Han'you-Denshi/IB abstract glyph-forms"
-   '(long-name "Han'you-Denshi/IB glyph-forms"
-              chars 94
+   '=ucs-hangul
+   "Hangul Syllables of UCS"
+   '(long-name "UCS-Hangul-Syllables"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.IB-0$"
-              mother =hanyo-denshi/ib))
+              registry "-Hangul-.*-ucs-0"
+              mother =ucs
+              min-code #xAC00 max-code #xD7AF))
   (make-charset
-   '=>>>hanyo-denshi/jt
-   "JT (Juuki Touitsu Moji) abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JT glyph-forms"
+   '=ucs-bmp-cjk
+   "CJK Characters in BMP of UCS"
+   '(long-name "UCS-BMP-CJK"
               chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JT-0$"
-              mother =hanyo-denshi/jt))
+              registry "-zh-.*-ucs-0"
+              mother ucs-bmp
+              min-code #x2E00
+              max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>>hanyo-denshi/ks
-   "KoSeki-touitsu-moji abstract glyph-forms"
-   '(long-name "Han'you-Denshi/KS glyph-forms"
+   '=ucs-bmp-cjk@unicode
+   "CJK Characters in BMP of Unicode"
+   '(long-name "Unicode-BMP-CJK"
               chars 256
-              dimension 3
-              columns 2
-              graphic 2
-              direction l2r
-              mother =hanyo-denshi/ks))
-
-  (make-charset
-   '=>>hanyo-denshi/ja
-   "Han'you-Denshi/JA abstract glyphs"
-   '(long-name "Han'you-Denshi/JA glyphs"
-              chars 94
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JA-0$"
-              mother =>>>hanyo-denshi/ja))
+              registry "-zh-.*-ucs-0"
+              mother =ucs@unicode
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/jb
-   "Han'you-Denshi/JB abstract glyphs"
-   '(long-name "Han'you-Denshi/JB glyphs"
-              chars 94
+   '=ucs-bmp-cjk@JP
+   "CJK Characters in BMP with JIS representative glyphs"
+   '(long-name "CJK in BMP@JP"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JB-0$"
-              mother =hanyo-denshi/jb))
+              registry "-ja-.*-ucs-0"
+              mother =ucs@JP
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/jc
-   "Han'you-Denshi/JC abstract glyphs"
-   '(long-name "Han'you-Denshi/JC glyphs"
-              chars 94
+   '=ucs-bmp-cjk@JP/hanazono
+   "CJK Characters in BMP with Hanazono font"
+   '(long-name "CJK in BMP@JP/Hanazono"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JC-0$"
-              mother =>>>hanyo-denshi/jc))
+              registry "-ja-.*-ucs-0"
+              mother =ucs@JP/hanazono
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/jd
-   "Han'you-Denshi/JD abstract glyphs"
-   '(long-name "Han'you-Denshi/JD glyphs"
-              chars 94
+   '=+>ucs-bmp-cjk@unicode
+   "Unicode representative characters of CJK Unified Ideographs in BMP"
+   '(long-name "Unicode-BMP-CJK unified abstract glyphs"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JD-0$"
-              mother =hanyo-denshi/jd))
+              registry "-zh-.*-ucs-0"
+              mother =+>ucs@unicode
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/ft
-   "Han'you-Denshi/FT abstract glyphs"
-   '(long-name "Han'you-Denshi/FT glyphs"
-              chars 94
+   '=>ucs-bmp-cjk@unicode
+   "Unicode representative characters of CJK Unified Ideographs in BMP"
+   '(long-name "Unicode-BMP-CJK"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.FT-0$"
-              mother =>>>hanyo-denshi/ft))
+              registry "-zh-.*-ucs-0"
+              mother =>ucs@unicode
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/ia
-   "Han'you-Denshi/IA abstract glyphs"
-   '(long-name "Han'you-Denshi/IA glyphs"
-              chars 94
+   '==>ucs-bmp-cjk@bucs
+   "CJK Characters in BMP of BUCS"
+   '(long-name "BUCS-BMP-CJK"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.IA-0$"
-              mother =hanyo-denshi/ia))
+              registry "-zh-.*-ucs-0"
+              mother ==>ucs@bucs
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
-   '=>>hanyo-denshi/ib
-   "Han'you-Denshi/IB abstract glyphs"
-   '(long-name "Han'you-Denshi/IB abstract glyphs"
-              chars 94
+   '=ucs-bmp-cjk-compat
+   "CJK Compatibility Ideographs in BMP of UCS"
+   '(long-name "CJK Compatibility Ideographs"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.IB-0$"
-              mother =>>>hanyo-denshi/ib))
+              registry "-ja-.*-ucs-0"
+              mother ucs-bmp
+              min-code #xF900
+              max-code #xFAFF
+              ))
   (make-charset
-   '=>>hanyo-denshi/hg
-   "Han'you-Denshi/HG abstract glyphs"
-   '(long-name "Han'you-Denshi/HG abstract glyphs"
-              chars 94
+   '=ucs-bmp-cjk-compat@unicode
+   "CJK Compatibility Ideographs of Unicode representatives"
+   '(long-name "CJK Compatibility Ideographs of Unicode"
+              chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.HG-0$"
-              mother =hanyo-denshi/hg))
+              registry "-ja-.*-ucs-0"
+              mother =ucs@unicode
+              min-code #xF900
+              max-code #xFAFF
+              ))
   (make-charset
-   '=>>hanyo-denshi/jt
-   "JT (Juuki Touitsu Moji) abstract glyphs"
-   '(long-name "Han'you-Denshi/JT glyphs"
+   '=ucs-sip-ext-b
+   "CJK Ideographs Extension B"
+   '(long-name "UCS CJK Ext-B"
               chars 256
               dimension 2
               columns 2
               graphic 2
               direction l2r
-              registry "HanyoDenshi\\.JT-0$"
-              mother =>>>hanyo-denshi/jt))
+              registry "\\(iso10646\\|ucs02\\)-2$"
+              mother ucs
+              min-code #x20000 max-code #x2A6D6
+              code-offset #x20000))
   (make-charset
-   '=>>hanyo-denshi/ks
-   "Han'you-Denshi/KS abstract glyphs"
-   '(long-name "Han'you-Denshi/KS glyphs"
+   '=ucs-sip-ext-b@iso
+   "CJK Ideographs Extension B (ISO/IEC 10646-2)"
+   '(long-name "UCS CJK Ext-B"
               chars 256
-              dimension 3
+              dimension 2
               columns 2
               graphic 2
               direction l2r
-              mother =>>>hanyo-denshi/ks))
+              registry "\\(iso10646\\|ucs02\\)-2$"
+              mother =ucs@iso
+              min-code #x20000 max-code #x2A6D6
+              code-offset #x20000))
   )
 
 ;;; mule-conf.el ends here