X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=884c3ef4e54cf3cca5af1dc1419346797bf08e1c;hp=f9134178ba5e1c32aba992964ca7b51a063e05b6;hb=414b512c0774e67ba8e160b605447d862d3be166;hpb=de9daa8ef07f0e09178f30b852a2596617e9bdf5

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index f913417..884c3ef 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
-;;   2009, 2010, 2011, 2012, 2013, 2014, 2015 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+;;   MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -730,7 +731,7 @@
    '=jis-x0213-1@2004
    "JIS X 0213:2004 Plain 1"
    '(iso-ir 233
-	    registry "jisx0213\\(\\.2004\\)-1"
+	    registry "jisx0213\\.2004-1"
 	    dimension 2
 	    chars 94
 	    mother =jis-x0213-1
@@ -925,7 +926,7 @@
    "JIS X 0213:2004 Plain 1 abstract glyph-forms"
    '(mother ==jis-x0213-1
 	    =>iso-ir 233
-	    ;; registry "jisx0213\\(\\.2004\\)-1"
+	    registry "jisx0213\\.2004-1"
 	    dimension 2
 	    chars 94
 	    graphic 0))
@@ -1070,7 +1071,7 @@
    "JIS X 0213:2004 Plain 1 detailed representative glyph-images."
    '(mother ==jis-x0213-1@2004
 	    =>iso-ir 233
-	    ;; registry "jisx0213\\(\\.2004\\)-1"
+	    registry "jisx0213\\.2004-1"
 	    dimension 2
 	    chars 94
 	    graphic 0))
@@ -1182,7 +1183,7 @@
   (make-charset
    '=>>jis-x0213-1@2004
    "JIS X 0213:2004 Plain 1 abstract glyphs"
-   '(registry "jisx0213\\(\\.2004\\)-1"
+   '(registry "jisx0213\\.2004-1"
 	      dimension 2
 	      chars 94
 	      mother =>>jis-x0213-1
@@ -1258,7 +1259,7 @@
   (make-charset
    '=+>jis-x0213-1@2004
    "JIS X 0213:2004 Plain 1 unified abstract glyphs"
-   '(registry "jisx0213\\(\\.2004\\)-1"
+   '(registry "jisx0213\\.2004-1"
 	      dimension 2
 	      chars 94
 	      mother =+>jis-x0213-1
@@ -1321,7 +1322,7 @@
   (make-charset
    '=>jis-x0213-1@2004
    "JIS X 0213:2004 Plain 1 abstract characters"
-   '(registry "jisx0213\\(\\.2004\\)-1"
+   '(registry "jisx0213\\.2004-1"
 	      dimension 2
 	      chars 94
 	      mother =>jis-x0213-1
@@ -1483,24 +1484,60 @@
 
   (make-charset
    '=>>cns11643-1
-   "CNS 11643 Plane 1 abstract glyphs."
+   "CNS 11643 Plane 1 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-1
-	      =>iso-ir 184
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-2
+   "CNS 11643 Plane 2 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-2
+	      =>iso-ir 172
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-3
+   "CNS 11643 Plane 3 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?3$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-3
+	      =>iso-ir 183
 	      graphic 0))
   (make-charset
    '=>>cns11643-4
-   "CNS 11643 Plane 4 abstract glyphs."
+   "CNS 11643 Plane 4 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-4
 	      =>iso-ir 184
 	      graphic 0))
+  (make-charset
+   '=>>cns11643-6
+   "CNS 11643 Plane 6 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-6
+	      =>iso-ir 186
+	      graphic 0))
 
   (make-charset
+   '=>cns11643-1
+   "CNS 11643 Plane 1 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-1
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
    '=>cns11643-2
    "CNS 11643 Plane 2 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
@@ -1510,6 +1547,15 @@
 	      =>iso-ir 172
 	      graphic 0))
   (make-charset
+   '=>cns11643-4
+   "CNS 11643 Plane 4 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-4
+	      =>iso-ir 184
+	      graphic 0))
+  (make-charset
    '=>cns11643-5
    "CNS 11643 Plane 5 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?5$"
@@ -1621,6 +1667,17 @@
 		  registry	"big5\\.cdp-0"
 		  mother	=big5-cdp))
 
+  (make-charset '=+>big5-cdp
+		"Big5-CDP unified glyphs"
+		'(long-name	"Big5-CDP unified glyphs"
+		  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"
@@ -1630,14 +1687,47 @@
 		  graphic	2
 		  direction	l2r
 		  registry	"big5\\.cdp-0"
-		  mother	=>>big5-cdp))
+		  mother	=big5-cdp))
+
+  (make-charset '=>big5-cdp@iwds-1
+		"Big5-CDP abstract characters based on IWDS-1"
+		'(long-name	"Big5-CDP IWDS-1 abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
+
+  (make-charset '=>big5-cdp@component
+		"Big5-CDP abstract components"
+		'(long-name	"Big5-CDP abstract components"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
+
+  (make-charset '=>big5-cdp@cognate
+		"Big5-CDP abstract components based on cognate"
+		'(long-name	"Big5-CDP abstract cognate components"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
 
   (make-charset
    '=mj
    "Moji-Jouhou-Kiban characters"
    `(long-name "Moji-Jouhou-Kiban"
 	       chars 256
-	       dimension 2
+	       dimension 3
 	       columns 2
 	       graphic 2
 	       direction l2r
@@ -1675,6 +1765,30 @@
 	       mother =mj
 	       min-code	#x10000
 	       code-offset #x10000))
+  (make-charset
+   '=>mj
+   "Moji-Jouhou-Kiban abstract characters"
+   `(long-name "Moji-Jouhou-Kiban"
+	       chars 256
+	       dimension 3
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =mj
+	       ))
+  (make-charset
+   '=>mj-0
+   "Moji-Jouhou-Kiban plane 0"
+   '(long-name "Moji-Jouhou-Kiban-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother =>mj
+	       min-code	0
+	       max-code	#xFFFF))
 
   (make-charset
    '=hanyo-denshi/ja
@@ -1809,7 +1923,16 @@
   (make-charset
    '=hanyo-denshi/ks
    "KS (KoSeki) part of Han'you-Denshi characters"
-   `(long-name "Han'you-Denshi/KS font encoding"
+   `(long-name "Han'you-Denshi/KS"
+	       chars 256
+	       dimension 3
+	       columns 2
+	       graphic 2
+	       direction l2r))
+  (make-charset
+   '=hanyo-denshi/tk
+   "TK (TouKi) part of Han'you-Denshi characters"
+   `(long-name "Han'you-Denshi/TK"
 	       chars 256
 	       dimension 3
 	       columns 2
@@ -1973,6 +2096,16 @@
 	       graphic 2
 	       direction l2r
 	       mother =hanyo-denshi/ks))
+  (make-charset
+   '==hanyo-denshi/tk
+   "TK (TouKi) part of Han'you-Denshi abstract glyph-forms."
+   `(long-name "Han'you-Denshi/TK glyph-forms"
+	       chars 256
+	       dimension 3
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =hanyo-denshi/tk))
 
   (make-charset
    '=koseki
@@ -2139,6 +2272,27 @@
 	       min-code	      ,(lsh #x6403 16)
 	       max-code	   ,(+ (lsh #x6403 16) #xFFFF)
 	       code-offset    ,(lsh #x6403 16)))
+  (make-charset
+   '=hanyo-denshi/tk/mf-01
+   "font encoding for TK (TouKi) characters"
+   `(long-name "Han'you-Denshi/TK font encoding"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "HanyoDenshi\\.TKMF-1$"))
+  (make-charset
+   '==hanyo-denshi/tk/mf-01
+   "font encoding for TK (TouKi) characters"
+   `(long-name "Han'you-Denshi/TK font encoding"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =hanyo-denshi/tk/mf-01
+	       registry "HanyoDenshi\\.TKMF-1$"))
 
   (make-charset
    '===mj
@@ -2473,6 +2627,16 @@
 	       registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
   (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
   (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\\)$"))
+  (make-charset
    '=gt-pj-k2
    "Ideographic parts of GT (pseudo JIS encoding) part 2"
    '(long-name "GT K2"
@@ -2483,6 +2647,16 @@
 	       direction l2r
 	       registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
   (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
+  (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\\)$"))
 
   (make-charset '=daikanwa
 		"Daikanwa dictionary (unchanged part)"
@@ -2893,6 +3067,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-kyd "HNG:漢書楊雄傳（上野本）"
+		'(long-name "HNG/漢書楊雄"
+		  chars		256
+		  dimension	2
+		  registry	"hng-14$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-sok "HNG:花嚴經卷八（守屋本）"
 		'(long-name "HNG/花嚴守屋"
 		  chars		256
@@ -2917,6 +3099,22 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-kar "HNG:開成石經論語"
+		'(long-name "HNG/開成論語"
+		  chars		256
+		  dimension	2
+		  registry	"hng-18$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kae "HNG:開成石經周易"
+		'(long-name "HNG/開成周易"
+		  chars		256
+		  dimension	2
+		  registry	"hng-19$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-sys "HNG:瑜伽師地論卷三十（S.5309）"
 		'(long-name "HNG/S5309"
 		  chars		256
@@ -2933,6 +3131,38 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-tzj "HNG:阿毘達磨毘婆沙論卷百七（東禪寺版）"
+		'(long-name "HNG/東禪毘婆"
+		  chars		256
+		  dimension	2
+		  registry	"hng-25$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-hos "HNG:齊民要術卷五（高山寺本）"
+		'(long-name "HNG/斉民要術"
+		  chars		256
+		  dimension	2
+		  registry	"hng-26$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-nak "HNG:華嚴孔目（高山寺本）"
+		'(long-name "HNG/華厳孔目"
+		  chars		256
+		  dimension	2
+		  registry	"hng-28$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-jhk "HNG:神足變化經（開元寺版）"
+		'(long-name "HNG/開元神足"
+		  chars		256
+		  dimension	2
+		  registry	"hng-29$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-hod "HNG:法藏和尚傳（高山寺本）"
 		'(long-name "HNG/法藏和尚"
 		  chars		256
@@ -2949,6 +3179,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-ink "HNG:日本書紀 卷二十四（岩崎本）"
+		'(long-name "HNG/岩崎紀24"
+		  chars		256
+		  dimension	2
+		  registry	"hng-33$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-nto "HNG:日本書紀 卷二十四（圖書寮本）"
 		'(long-name "HNG/圖書紀24"
 		  chars		256
@@ -2973,6 +3211,22 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-nkk "HNG:日本書紀 卷二（兼方本）"
+		'(long-name "HNG/兼方紀2"
+		  chars		256
+		  dimension	2
+		  registry	"hng-39$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kcc "HNG:日本書紀 卷二（慶長勅版）"
+		'(long-name "HNG/勅版紀2"
+		  chars		256
+		  dimension	2
+		  registry	"hng-41$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-kcj "HNG:日本書紀 卷二（慶長十五年版）"
 		'(long-name "HNG/慶長紀2"
 		  chars		256
@@ -3037,6 +3291,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-wad "HNG:大般若經卷二百五十（和銅經）"
+		'(long-name "HNG/和銅250"
+		  chars		256
+		  dimension	2
+		  registry	"hng-54$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-kmi "HNG:弥勒上生經（高山寺本）"
 		'(long-name "HNG/弥勒上生"
 		  chars		256
@@ -3053,6 +3315,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-doh "HNG:金剛大教王經卷一（高山寺本）"
+		'(long-name "HNG/金剛大教"
+		  chars		256
+		  dimension	2
+		  registry	"hng-57$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-jyu "HNG:成唯識論卷十（寛治二年刊本）"
 		'(long-name "HNG/成唯識10"
 		  chars		256
@@ -3061,6 +3331,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-tzs "HNG:佛説大教王經卷一（東禪寺版日本寫本）"
+		'(long-name "HNG/佛説大教"
+		  chars		256
+		  dimension	2
+		  registry	"hng-60$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-kss "HNG:華嚴信種義（明惠自筆）"
 		'(long-name "HNG/華嚴信種"
 		  chars		256
@@ -3226,9 +3504,9 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	==ruimoku-v6))
-  (make-charset '=>>ruimoku-v6
-		"RUIMOKU Version.6 glyphs"
-		'(long-name	"RUI6 glyphs"
+  (make-charset '=>ruimoku-v6
+		"RUIMOKU Version.6 abstract characters."
+		'(long-name	"RUI6 characters."
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -3236,6 +3514,7 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	=ruimoku-v6))
+  (define-charset-alias '=>>ruimoku-v6 '=>ruimoku-v6)
 
   ;; (make-charset
   ;;  '=zihai
@@ -3258,9 +3537,84 @@
   ;;              direction l2r
   ;;              registry "zihai\\.cp-17$"))
 
-  (make-charset '=big5-cdp-var-3
-		"Big5-CDP-var-3 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-3"
+  (make-charset '=big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp))
+  (make-charset '=>big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 abstract characters of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp-itaiji-001))
+  (make-charset '==big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 abstract glyph-image of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp-itaiji-001))
+
+  (make-charset '=big5-cdp-itaiji-002
+		"Big5-CDP-itaiji-002 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-002"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-2$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-itaiji-003
+		"Big5-CDP-itaiji-003 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-003"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-3$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-001
+		"Big5-CDP-var-001 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-1$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-002
+		"Big5-CDP-var-002 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-002"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-2$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-003
+		"Big5-CDP-var-003 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-003"
 		  chars         256
 		  dimension     2
 		  columns       2
@@ -3268,10 +3622,22 @@
 		  direction     l2r
 		  registry      "cdp\\.var-3$"
 		  mother        =big5-cdp))
+  (define-charset-alias '=big5-cdp-var-3 '=big5-cdp-var-003)
+
+  (make-charset '=big5-cdp-var-004
+		"Big5-CDP-var-004 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-004"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-4$"
+		  mother        =big5-cdp))
 
-  (make-charset '=big5-cdp-var-5
-		"Big5-CDP-var-5 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-5"
+  (make-charset '=big5-cdp-var-005
+		"Big5-CDP-var-005 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-005"
 		  chars         256
 		  dimension     2
 		  columns       2
@@ -3279,6 +3645,18 @@
 		  direction     l2r
 		  registry      "cdp\\.var-5$"
 		  mother        =big5-cdp))
+  (define-charset-alias '=big5-cdp-var-5 '=big5-cdp-var-005)
+
+  (make-charset '=big5-cdp-var-010
+		"Big5-CDP-var-010 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-010"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-10$"
+		  mother        =big5-cdp))
 
   (make-charset '==>ucs@bucs
 		"Basic Subset of Coded Character Sets (BUCS)"
@@ -3311,9 +3689,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@component
-		"UCS encoding for abstract components of IWDS-1."
-		'(long-name	"UCS for IWDS-1 abstract components"
+  (make-charset '=>ucs@cognate
+		"UCS abstract characters based on cognate."
+		'(long-name	"UCS based on cognate"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3322,9 +3700,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@hanyo-denshi
-		"UCS abstract characters based on Han'you-Denshi collection."
-		'(long-name	"UCS base characters of Han'you-Denshi"
+  (make-charset '=>ucs@component
+		"UCS encoding for abstract components of IWDS-1."
+		'(long-name	"UCS for IWDS-1 abstract components"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3333,6 +3711,17 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
+  ;; (make-charset '=>ucs@hanyo-denshi
+  ;;               "UCS abstract characters based on Han'you-Denshi collection."
+  ;;               '(long-name     "UCS base characters of Han'you-Denshi"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =ucs))
+
   (make-charset '=>ucs@iso
 		"Abstract characters of ISO/IEC 10646 representatives"
 		'(long-name	"UCS characters for ISO"
@@ -3363,6 +3752,26 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=>ucs@unicode))
+  (make-charset '=>ucs@jis/2000
+		"ISO/IEC 10646 for JIS X 0213:2000"
+		'(long-name	"UCS for JIS:2000"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@jis))
+  (make-charset '=>ucs@jis/2004
+		"ISO/IEC 10646 for JIS X 0213:2004"
+		'(long-name	"UCS for JIS:2004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@jis))
   (make-charset '=>ucs@ks
 		"UCS representative characters for Korean Standards"
 		'(long-name	"UCS characters for KS"
@@ -3690,6 +4099,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
+		  ;; mother	=>ucs@iwds-1
 		  mother	=ucs@cns
 		  ;; mother	=>>ucs@cns
 		  ))
@@ -4022,6 +4432,18 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var001-0"))
+  (make-charset '=ucs-sip-var-001
+		"uXXXX-var-001 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var001-2"))
+
   (make-charset '=ucs-var-002
 		"uXXXX-var-002 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-002"
@@ -4045,6 +4467,52 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var002-0"))
+  (make-charset '=ucs-sip-var-002
+		"uXXXX-var-002 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var002-2"))
+  (make-charset '==ucs-var-002
+		"Abstract glyph-forms corresponding with uXXXX-var-002 of GlyphWiki"
+		'(long-name	"UCS-var-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-002))
+  (make-charset '==ucs-bmp-var-002
+		"uXXXX-var-002's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-var-002 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-var-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var002-0"))
+  (make-charset '==ucs-sip-var-002
+		"uXXXX-var-002's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-var-002 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-var-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var002-2"))
+
   (make-charset '=ucs-var-003
 		"uXXXX-var-003 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-003"
@@ -4068,9 +4536,44 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var003-0"))
-  (make-charset '=ucs-itaiji-002
-		"uXXXX-itaiji-002 glyphs of GlyphWiki"
-		'(long-name	"UCS-itaiji-002"
+  (make-charset '=ucs-sip-var-003
+		"uXXXX-var-003 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var003-2"))
+  (make-charset '=+>ucs-var-003
+		"uXXXX-var-003's unified glyphs of GlyphWiki"
+		'(long-name	"UCS-var-003 unified glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-003))
+  (make-charset '=+>ucs-bmp-var-003
+		"uXXXX-var-003's unified glyphs in BMP"
+		'(long-name	"UCS-BMP-var-003 unified glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=+>ucs-var-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var003-0"))
+
+  (make-charset '=ucs-var-004
+		"uXXXX-var-004 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-004"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4078,22 +4581,33 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-002
-		"uXXXX-itaiji-002 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-002"
+  (make-charset '=ucs-bmp-var-004
+		"uXXXX-var-004 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-004"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-002
+		  mother	=ucs-var-004
 		  min-code #x2E00
 		  max-code #x9FCC
-		  registry "ucs\\.itaiji002-0"))
-  (make-charset '=ucs-itaiji-084
-		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
-		'(long-name	"UCS-itaiji-084"
+		  registry "ucs\\.var004-0"))
+  (make-charset '=ucs-sip-var-004
+		"uXXXX-var-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var004-2"))
+  (make-charset '=ucs-var-005
+		"uXXXX-var-005 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-005"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4101,119 +4615,1053 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-084
-		"uXXXX-itaiji-084 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-084"
+  (make-charset '=ucs-bmp-var-005
+		"uXXXX-var-005 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-005"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-084
+		  mother	=ucs-var-005
 		  min-code #x2E00
 		  max-code #x9FCC
-		  registry "ucs\\.itaiji084-0"))
+		  registry "ucs\\.var005-0"))
+  (make-charset '=ucs-var-006
+		"uXXXX-var-006 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-006
+		"uXXXX-var-006 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-006"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var006-0"))
+  (make-charset '=ucs-sip-var-006
+		"uXXXX-var-006 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-006"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var006-2"))
+  (make-charset '=ucs-var-008
+		"uXXXX-var-008 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-008"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-008
+		"uXXXX-var-008 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-008"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-008
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var008-0"))
+  (make-charset '=ucs-var-010
+		"uXXXX-var-010 glyph-forms of GlyphWiki"
+		'(long-name	"UCS-var-010"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-010
+		"uXXXX-var-010 glyph-forms in BMP"
+		'(long-name	"UCS-BMP-var-010"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var010-0"))
 
-  (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-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 #x9FCC
-	       ;; max-code #xA4CF
-	       ))
-  (make-charset
-   '=ucs-bmp-cjk@gb
-   "CJK Characters in BMP with GB representative glyph-images."
-   '(long-name "CJK in BMP@GB"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       registry "-zh-.*-ucs-0"
-	       mother =ucs@gb
-	       min-code #x2E00
-               max-code #x9FA5
-	       ;; max-code #x9FCC
-	       ;; max-code #xA4CF
-	       ))
-  (make-charset
-   '==ucs-bmp-cjk@gb
-   "CJK Characters in BMP with GB representative glyph-images."
-   '(long-name "CJK in BMP@GB"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       registry "-zh-.*-ucs-0"
-	       mother ==ucs@gb
-	       min-code #x2E00
-               max-code #x9FA5
-	       ;; max-code #x9FCC
-	       ;; max-code #xA4CF
-	       ))
-  (make-charset
-   '===ucs-bmp-cjk@gb
-   "CJK Characters in BMP with GB representative glyph-images."
+  (make-charset '=ucs-itaiji-001
+		"uXXXX-itaiji-001 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-001
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=ucs-sip-itaiji-001
+		"uXXXX-itaiji-001 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-itaiji-001
+		"Abstract characters corresponding with uXXXX-itaiji-001 of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-001 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=>ucs-sip-itaiji-001
+		"uXXXX-itaiji-001 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '==ucs-itaiji-001
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-001 of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-001))
+  (make-charset '==ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-001
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '==ucs-sip-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-itaiji-001@iwds-1
+		"uXXXX-itaiji-001's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001))
+  (make-charset '=>ucs-bmp-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in BMP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=>ucs-sip-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in SIP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in SIP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+
+  (make-charset '=ucs-itaiji-002
+		"uXXXX-itaiji-002 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '=ucs-sip-itaiji-002
+		"uXXXX-itaiji-002 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+  (make-charset '=>ucs-itaiji-002
+		"Abstract characters corresponding with uXXXX-itaiji-002 of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-002))
+  (make-charset '=>ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-002 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '=>ucs-sip-itaiji-002
+		"uXXXX-itaiji-002 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+  (make-charset '==ucs-itaiji-002
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-002 of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-002))
+  (make-charset '==ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-002 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '==ucs-sip-itaiji-002
+		"uXXXX-itaiji-002's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+
+  (make-charset '=ucs-itaiji-003
+		"uXXXX-itaiji-003 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '=ucs-sip-itaiji-003
+		"uXXXX-itaiji-003 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
+  (make-charset '=>ucs-itaiji-003
+		"Abstract characters corresponding with uXXXX-itaiji-003 of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003))
+  (make-charset '=>ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-003 abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '=>ucs-sip-itaiji-003
+		"uXXXX-itaiji-003's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-003 abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
+  (make-charset '==ucs-itaiji-003
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-003 of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003))
+  (make-charset '==ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-003 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '==ucs-sip-itaiji-003
+		"uXXXX-itaiji-003's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
+
+  (make-charset '=ucs-itaiji-004
+		"uXXXX-itaiji-004 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
+  (make-charset '=>ucs-itaiji-004
+		"Abstract characters corresponding with uXXXX-itaiji-004 of GlyphWiki"
+		'(long-name	"UCS-itaiji-004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004))
+  (make-charset '=>ucs-bmp-itaiji-004
+		"uXXXX-itaiji-004's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-004 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=>ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
+
+  (make-charset '=ucs-itaiji-005
+		"uXXXX-itaiji-005 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=ucs-sip-itaiji-005
+		"uXXXX-itaiji-005 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
+  (make-charset '=>ucs-itaiji-005
+		"Abstract characters corresponding with uXXXX-itaiji-005 of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=>ucs-sip-itaiji-005
+		"uXXXX-itaiji-005's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
+  (make-charset '==ucs-itaiji-005
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-005 of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-005))
+  (make-charset '==ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+
+  (make-charset '=ucs-itaiji-006
+		"uXXXX-itaiji-006 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006 glyphs in BMP"
+		'(long-name	"UCS-BMP-itaiji-006"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=ucs-sip-itaiji-006
+		"uXXXX-itaiji-006 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-006"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji006-2"))
+  (make-charset '==ucs-itaiji-006
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-006 of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006))
+  (make-charset '==ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-006 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=>ucs-itaiji-006
+		"Abstract characters corresponding with uXXXX-itaiji-006 of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006))
+  (make-charset '=>ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-006 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=>ucs-sip-itaiji-006
+		"uXXXX-itaiji-006's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-006 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji006-2"))
+
+  (make-charset '=ucs-itaiji-007
+		"uXXXX-itaiji-007 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-007"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji007-0"))
+  (make-charset '=ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-007
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji007-2"))
+  (make-charset '=>ucs-itaiji-007
+		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
+		'(long-name	"UCS-itaiji-007"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-007 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji007-0"))
+  (make-charset '=>ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-007
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji007-2"))
+
+  (make-charset '=ucs-itaiji-008
+		"uXXXX-itaiji-008 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-008"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-008
+		"uXXXX-itaiji-008 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-008"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-008
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji008-0"))
+  (make-charset '=ucs-sip-itaiji-008
+		"uXXXX-itaiji-008 abstract glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-008"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-008
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji008-2"))
+
+  (make-charset '=ucs-itaiji-009
+		"uXXXX-itaiji-009 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-009"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-009
+		"uXXXX-itaiji-009 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-009"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
+  (make-charset '=>ucs-itaiji-009
+		"Abstract characters corresponding with uXXXX-itaiji-009 of GlyphWiki"
+		'(long-name	"UCS-itaiji-009"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-009
+		"uXXXX-itaiji-009's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-009 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
+
+  (make-charset '=ucs-itaiji-010
+		"uXXXX-itaiji-010 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-010"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-010
+		"uXXXX-itaiji-010 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-010"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji010-0"))
+
+  (make-charset '=ucs-itaiji-011
+		"uXXXX-itaiji-011 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-011"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-011
+		"uXXXX-itaiji-011 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-011"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-011
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji011-0"))
+  (make-charset '=ucs-sip-itaiji-011
+		"uXXXX-itaiji-011 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-011"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-011
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji011-2"))
+
+  (make-charset '=ucs-itaiji-012
+		"uXXXX-itaiji-012 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-012"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-012
+		"uXXXX-itaiji-012 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-012"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-012
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji012-0"))
+
+  (make-charset '=ucs-itaiji-084
+		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
+		'(long-name	"UCS-itaiji-084"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-084
+		"uXXXX-itaiji-084 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-084"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-084
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji084-0"))
+
+  (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-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 #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
+   '=ucs-bmp-cjk@gb
+   "CJK Characters in BMP with GB representative glyph-images."
+   '(long-name "CJK in BMP@GB"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother =ucs@gb
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
+   '==ucs-bmp-cjk@gb
+   "CJK Characters in BMP with GB representative glyph-images."
+   '(long-name "CJK in BMP@GB"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother ==ucs@gb
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
+   '===ucs-bmp-cjk@gb
+   "CJK Characters in BMP with GB representative glyph-images."
    '(long-name "CJK in BMP@GB"
 	       chars 256
 	       dimension 2
@@ -4305,6 +5753,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@cognate
+   "CJK Characters in BMP for abstract characters based on cognate."
+   '(long-name "CJK in BMP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@cognate
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=>ucs-bmp-cjk@component
    "CJK Characters in BMP for IWDS-1 abstract components."
    '(long-name "CJK in BMP@component"
@@ -4320,6 +5783,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@iwds-1
+   "CJK Characters in BMP for IWDS-1 abstract characters."
+   '(long-name "CJK in BMP@iwds-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@iwds-1
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '==>ucs-bmp-cjk@bucs
    "CJK Characters in BMP of BUCS"
    '(long-name "BUCS-BMP-CJK"
@@ -4364,6 +5842,48 @@
 	       max-code #xFAFF
 	       ))
   (make-charset
+   '==ucs-bmp-cjk-compat@gb
+   "CJK Compatibility Ideographs of Unicode representatives"
+   '(long-name "CJK Compatibility Ideographs of Unicode"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother ==ucs@gb
+	       min-code #xF900
+	       max-code #xFAFF
+	       ))
+  (make-charset
+   '==ucs-bmp-cjk-compat@JP
+   "CJK Compatibility Ideographs for common glyph-forms used in Japan."
+   '(long-name "CJK Compatibility Ideographs for Japan"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother ==ucs@JP
+	       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-bmp-cjk-compat@jis
    "CJK Compatibility Ideographs of JIS representatives unified glyphs"
    '(long-name "JIS unified glyphs for CJK Compat chars"
@@ -4392,8 +5912,8 @@
 	       code-offset #x20000))
   (make-charset
    '=ucs-sip@iso
-   "CJK Ideographs Extension B (ISO/IEC 10646-2)"
-   '(long-name "UCS CJK Ext-B"
+   "UCS glyphs of UCS SIP"
+   '(long-name "UCS SIP"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -4417,6 +5937,71 @@
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
   (make-charset
+   '=ucs-sip@JP/hanazono
+   "Hanazono glyphs of UCS SIP"
+   '(long-name "Hanazono SIP glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =ucs@JP/hanazono
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@iwds-1
+   "CJK Characters in SIP based on IWDS-1."
+   '(long-name "CJK in SIP@IWDS-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@iwds-1
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@cognate
+   "CJK Characters in SIP for abstract characters based on cognate."
+   '(long-name "CJK in SIP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@cognate
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@component
+   "CJK Characters in SIP for IWDS-1 abstract components."
+   '(long-name "CJK in SIP@component"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@component
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '==ucs-sip@JP/hanazono
+   "Hanazono glyphs-forms of UCS SIP"
+   '(long-name "Hanazono SIP glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother ==ucs@JP/hanazono
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
    '==ucs-sip@iso
    "ISO representative abstract-glyph-images of ISO/IEC 10646 Plane 2"
    '(long-name "SIP abstract glyph-images"