X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=85d6c89d01774fab9ba74563ba516014602d8282;hb=cb821bb049bb7cb488b777806c7b5e7b61135107;hp=a0ca2a69c4b6369ae1d758728eae74441c72ae81;hpb=7d02a00dba99d6dfa2479f8c1525fdb6e311959d;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index a0ca2a6..85d6c89 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,7 @@
 ;; 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 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -730,7 +730,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
@@ -820,6 +820,17 @@
 	      graphic 0
 	      partial t))
   (make-charset
+   '==jis-x0208@1978/-4X
+   "JIS X 0208:1978, index before the 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978
+	      =>iso-ir 42
+              ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
    '==jis-x0208@1978/2-pr
    "JIS X 0208:1978, 2nd impression or later."
    '(registry "jisx0208\\.1978"
@@ -832,7 +843,40 @@
 	      graphic 0
 	      ;; partial t
 	      ))
-    (make-charset
+  (make-charset
+   '==jis-x0208@1978/4er
+   "JIS X 0208:1978, replaced by errata of 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '==jis-x0208@1978/4-pr
+   "JIS X 0208:1978, 4th impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '==jis-x0208@1978/5pr
+   "JIS X 0208:1978, 5th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978/4-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
    '==jis-x0208@1983
    "JIS X 0208:1983 abstract glyph-forms."
    '(registry "jisx0208\\.1983"
@@ -881,7 +925,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))
@@ -973,7 +1017,7 @@
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother ===jis-x0208
+	      mother ==jis-x0208@1978
 	      =>iso-ir 42
 	      ;; final ?@
 	      graphic 0))
@@ -983,7 +1027,7 @@
    '(registry "jisx0208\\.1983"
 	      dimension 2
 	      chars 94
-	      mother ===jis-x0208
+	      mother ==jis-x0208@1983
 	      =>iso-ir 87
 	      graphic 0))
   (make-charset
@@ -992,7 +1036,7 @@
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother ===jis-x0208
+	      mother ==jis-x0208@1990
 	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
@@ -1015,7 +1059,7 @@
    '(registry "jisx0213\\(\\.2000\\)-1"
 	      dimension 2
 	      chars 94
-	      mother ===jis-x0213-1
+	      mother ==jis-x0213-1@2000
 	      =>iso-ir 228
 	      ;; final ?O
 	      graphic 0
@@ -1024,9 +1068,9 @@
   (make-charset
    '===jis-x0213-1@2004
    "JIS X 0213:2004 Plain 1 detailed representative glyph-images."
-   '(mother ===jis-x0213-1
+   '(mother ==jis-x0213-1@2004
 	    =>iso-ir 233
-	    ;; registry "jisx0213\\(\\.2004\\)-1"
+	    registry "jisx0213\\.2004-1"
 	    dimension 2
 	    chars 94
 	    graphic 0))
@@ -1138,7 +1182,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
@@ -1214,7 +1258,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
@@ -1277,7 +1321,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
@@ -1466,6 +1510,15 @@
 	      =>iso-ir 172
 	      graphic 0))
   (make-charset
+   '=>cns11643-5
+   "CNS 11643 Plane 5 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?5$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-5
+	      =>iso-ir 185
+	      graphic 0))
+  (make-charset
    '=>cns11643-6
    "CNS 11643 Plane 6 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
@@ -1584,7 +1637,7 @@
    "Moji-Jouhou-Kiban characters"
    `(long-name "Moji-Jouhou-Kiban"
 	       chars 256
-	       dimension 2
+	       dimension 3
 	       columns 2
 	       graphic 2
 	       direction l2r
@@ -1622,6 +1675,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
@@ -1756,7 +1833,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
@@ -1920,6 +2006,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
@@ -2086,6 +2182,16 @@
 	       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
    '===mj
@@ -2516,6 +2622,15 @@
 		  graphic	2
 		  direction	l2r
 		  mother	=daikanwa/+p))
+  (make-charset '==daikanwa/+2p
+		"Daikanwa detailed glyph-images (ddddd'')"
+		'(long-name	"Daikanwa glyph-images ddddd''"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=daikanwa/+2p))
   (make-charset '==daikanwa/ho
 		"Daikanwa detailed glyph-images (Hokan)"
 		'(long-name	"Daikanwa-ho detailed glyph-images"
@@ -2743,888 +2858,1883 @@
 	    hzk-max (+ hzk-min 65535))
       (setq i (1+ i))))
 
-  (make-charset '=cbeta "CBETA private characters"
-		'(long-name	"CBETA PUA"
+  (make-charset '===hng-jou "HNG:誠實論卷八（P.2179）"
+		'(long-name "HNG/P2179"
 		  chars		256
 		  dimension	2
-		  registry	"cbeta-0"
+		  registry	"hng-1$"
 		  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 private characters"
-		'(long-name	"CBETA PUA glyph-images"
+  (make-charset '===hng-keg "HNG:華嚴經卷十六（S.2067）"
+		'(long-name "HNG/S2067"
 		  chars		256
 		  dimension	2
-		  registry	"cbeta-0"
+		  registry	"hng-2$"
 		  graphic	2
 		  columns	2
-		  direction	l2r
-		  mother	=cbeta))
-  (make-charset '===cbeta "CBETA private characters"
-		'(long-name	"CBETA PUA glyph-images"
+		  direction	l2r))
+  (make-charset '===hng-dng "HNG:大般涅槃經卷十一（S.81）"
+		'(long-name "HNG/S81"
 		  chars		256
 		  dimension	2
-		  registry	"cbeta-0"
+		  registry	"hng-3$"
 		  graphic	2
 		  columns	2
-		  direction	l2r
-		  mother	==cbeta))
-  (make-charset '=>>cbeta "CBETA abstract glyphs"
-		'(long-name	"CBETA glyphs"
+		  direction	l2r))
+  (make-charset '===hng-mam "HNG:摩訶摩耶經卷上（P.2160）"
+		'(long-name "HNG/P2160"
 		  chars		256
 		  dimension	2
-		  registry	"cbeta-0"
+		  registry	"hng-5$"
 		  graphic	2
 		  columns	2
-		  direction	l2r
-		  mother	=cbeta))
-  (make-charset '=>cbeta "CBETA abstract characters"
-		'(long-name	"CBETA characters"
+		  direction	l2r))
+  (make-charset '===hng-drt "HNG:大樓炭經卷三（P.2413）"
+		'(long-name "HNG/P2413"
 		  chars		256
 		  dimension	2
-		  registry	"cbeta-0"
+		  registry	"hng-6$"
 		  graphic	2
 		  columns	2
-		  direction	l2r
-		  mother	=cbeta))
-
-  (make-charset '=zinbun-oracle
-		"Oracle Bones Script"
-		`(long-name	"Oracle Bones Script in Zinbun, Kyoto Univ."
+		  direction	l2r))
+  (make-charset '===hng-kgk "HNG:賢劫經卷二（正倉院本）"
+		'(long-name "HNG/賢劫經二"
 		  chars		256
 		  dimension	2
-		  registry	"zob1968-0"
+		  registry	"hng-7$"
 		  graphic	2
-		  min-code	#xE70000
-		  max-code	,(+ #xE70000 8192)
-		  code-offset	#xE70000
 		  columns	2
 		  direction	l2r))
-
-  (make-charset '=>zinbun-oracle
-		"Abstract Oracle Bones"
-		'(long-name	"Abstract characters of Zinbun Oracle Bones."
+  (make-charset '===hng-myz "HNG:妙法蓮華經卷五（P.2334）"
+		'(long-name "HNG/P2334"
 		  chars		256
 		  dimension	2
-		  mother	=zinbun-oracle
-		  registry	"zob1968-0"
+		  registry	"hng-8$"
 		  graphic	2
 		  columns	2
 		  direction	l2r))
-
-  (make-charset '=jef-china3
-		"JEF + CHINA3 private characters"
-		'(long-name	"JEF + CHINA3"
+  (make-charset '===hng-kda "HNG:大品經卷二十八（京都国立博物館本）"
+		'(long-name "HNG/京博大品"
 		  chars		256
 		  dimension	2
+		  registry	"hng-9$"
+		  graphic	2
 		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-khi "HNG:妙法蓮華經卷五（今西本）"
+		'(long-name "HNG/宮廷今西"
+		  chars		256
+		  dimension	2
+		  registry	"hng-10$"
 		  graphic	2
-		  direction	l2r
-		  registry	"china3jef-0"
-		  min-code	#xE80000
-		  max-code	#xE8FFFF
-		  code-offset	#xE80000))
-  (define-charset-alias 'china3-jef '=jef-china3)
-  (make-charset '==jef-china3
-		"JEF + CHINA3 abstract glyph-images."
-		'(long-name	"JEF + CHINA3"
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-khm "HNG:妙法蓮華經卷三（守屋本）"
+		'(long-name "HNG/宮廷守屋"
 		  chars		256
 		  dimension	2
+		  registry	"hng-11$"
+		  graphic	2
 		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-hok "HNG:妙法蓮華經卷八（S.2577）"
+		'(long-name "HNG/S2577"
+		  chars		256
+		  dimension	2
+		  registry	"hng-13$"
 		  graphic	2
-		  direction	l2r
-		  registry	"china3jef-0"
-		  mother	=jef-china3))
-  (make-charset '===jef-china3
-		"JEF + CHINA3 glyph-images."
-		'(long-name	"JEF-CHINA3 glyph-images"
+		  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
+		  dimension	2
+		  registry	"hng-15$"
 		  graphic	2
-		  direction	l2r
-		  registry	"china3jef-0"
-		  mother	==jef-china3))
-
-  (make-charset '=ruimoku-v6
-		"private characters used in RUIMOKU Version.6"
-		`(long-name	"RUI6"
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-yhk "HNG:瑜伽法鏡經（S.2423）"
+		'(long-name "HNG/S2423"
 		  chars		256
 		  dimension	2
+		  registry	"hng-16$"
+		  graphic	2
 		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kak "HNG:開成石經孝經"
+		'(long-name "HNG/開成孝經"
+		  chars		256
+		  dimension	2
+		  registry	"hng-17$"
 		  graphic	2
-		  direction	l2r
-		  registry	"rui6-0"
-                  ;; mother	ucs
-		  min-code	#xE90000 ; #xE000
-		  max-code	#xE908FF ; #xE8FF
-		  code-offset	,(- #xE90000 #xE000)))
-  (make-charset '==ruimoku-v6
-		"RUIMOKU Version.6 glyph-images."
-		'(long-name	"RUI6 glyph-images."
+		  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
-		  direction	l2r
-		  registry	"rui6-0"
-		  mother	=ruimoku-v6))
-  (make-charset '===ruimoku-v6
-		"RUIMOKU Version.6 representative glyph-images."
-		'(long-name	"RUI6 rep-glyph-images."
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-sys "HNG:瑜伽師地論卷三十（S.5309）"
+		'(long-name "HNG/S5309"
 		  chars		256
 		  dimension	2
+		  registry	"hng-22$"
+		  graphic	2
 		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-tsu "HNG:通典卷一"
+		'(long-name "HNG/通典卷一"
+		  chars		256
+		  dimension	2
+		  registry	"hng-24$"
 		  graphic	2
-		  direction	l2r
-		  registry	"rui6-0"
-		  mother	==ruimoku-v6))
-  (make-charset '=>>ruimoku-v6
-		"RUIMOKU Version.6 glyphs"
-		'(long-name	"RUI6 glyphs"
+		  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
-		  direction	l2r
-		  registry	"rui6-0"
-		  mother	=ruimoku-v6))
-
-  ;; (make-charset
-  ;;  '=zihai
-  ;;  "ZhongHua-ZiHai glyph-images"
-  ;;  '(long-name "ZhongHua-ZiHai (pppp-nn)"
-  ;;              chars 256
-  ;;              dimension 3
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r))
-
-  ;; (make-charset
-  ;;  '=zihai-17xx
-  ;;  "ZhongHua-ZiHai (pp.1700$B!A(B1781) glyph-images"
-  ;;  '(long-name "ZhongHua-ZiHai pp.17xx"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              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"
-		  chars         256
-		  dimension     2
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  registry      "cdp\\.var-3$"
-		  mother        =big5-cdp))
-
-  (make-charset '=big5-cdp-var-5
-		"Big5-CDP-var-5 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-5"
-		  chars         256
-		  dimension     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
+		  dimension	2
+		  registry	"hng-30$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-gok "HNG:後漢書光武帝紀"
+		'(long-name "HNG/光武帝紀"
+		  chars		256
+		  dimension	2
+		  registry	"hng-31$"
+		  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
+		  dimension	2
+		  registry	"hng-34$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-nkm "HNG:日本書紀 卷二十四（兼右本）"
+		'(long-name "HNG/兼右紀24"
+		  chars		256
+		  dimension	2
+		  registry	"hng-36$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-k24 "HNG:日本書紀 卷二十四（寛文九年版）"
+		'(long-name "HNG/寛九紀24"
+		  chars		256
+		  dimension	2
+		  registry	"hng-37$"
+		  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
+		  dimension	2
+		  registry	"hng-42$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kbk "HNG:日本書紀 卷二（寛文九年版）"
+		'(long-name "HNG/寛九紀2"
+		  chars		256
+		  dimension	2
+		  registry	"hng-43$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-sik "HNG:花嚴經卷八（新羅本寫本）"
+		'(long-name "HNG/花嚴新羅"
+		  chars		256
+		  dimension	2
+		  registry	"hng-44$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-skk "HNG:華嚴經卷二十（晉本高麗古版）"
+		'(long-name "HNG/古麗華20"
+		  chars		256
+		  dimension	2
+		  registry	"hng-46$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kyu "HNG:初麗瑜5"
+		'(long-name "HNG/瑜伽師地論卷五（高麗初彫本）"
+		  chars		256
+		  dimension	2
+		  registry	"hng-47$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-ksk "HNG:華嚴經卷六（高麗再彫本）"
+		'(long-name "HNG/再麗華6"
+		  chars		256
+		  dimension	2
+		  registry	"hng-48$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-wan "HNG:華嚴經卷三十八（趙氏藏本）"
+		'(long-name "HNG/和寧華38"
+		  chars		256
+		  dimension	2
+		  registry	"hng-49$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-okd "HNG:金剛場陀羅尼經（小川本）"
+		'(long-name "HNG/金剛小川"
+		  chars		256
+		  dimension	2
+		  registry	"hng-50$"
+		  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
+		  dimension	2
+		  registry	"hng-55$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-zkd "HNG:續高僧傳（五月一日經）（天平寫經）"
+		'(long-name "HNG/五一續高"
+		  chars		256
+		  dimension	2
+		  registry	"hng-56$"
+		  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
+		  dimension	2
+		  registry	"hng-58$"
+		  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
+		  dimension	2
+		  registry	"hng-64$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kyo "HNG:教行信証卷四（親鸞自筆）"
+		'(long-name "HNG/教行信証"
+		  chars		256
+		  dimension	2
+		  registry	"hng-66$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-smk "HNG:西夏版妙法蓮華經卷一"
+		'(long-name "HNG/西夏法華"
+		  chars		256
+		  dimension	2
+		  registry	"hng-74$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
+  (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 private characters"
+		'(long-name	"CBETA PUA glyph-images"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	=cbeta))
+  (make-charset '===cbeta "CBETA private characters"
+		'(long-name	"CBETA PUA glyph-images"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	==cbeta))
+  (make-charset '=>>cbeta "CBETA abstract glyphs"
+		'(long-name	"CBETA glyphs"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	=cbeta))
+  (make-charset '=>cbeta "CBETA abstract characters"
+		'(long-name	"CBETA characters"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	=cbeta))
+
+  (make-charset '=zinbun-oracle
+		"Oracle Bones Script"
+		`(long-name	"Oracle Bones Script in Zinbun, Kyoto Univ."
+		  chars		256
+		  dimension	2
+		  registry	"zob1968-0"
+		  graphic	2
+		  min-code	#xE70000
+		  max-code	,(+ #xE70000 8192)
+		  code-offset	#xE70000
+		  columns	2
+		  direction	l2r))
+
+  (make-charset '=>zinbun-oracle
+		"Abstract Oracle Bones"
+		'(long-name	"Abstract characters of Zinbun Oracle Bones."
+		  chars		256
+		  dimension	2
+		  mother	=zinbun-oracle
+		  registry	"zob1968-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
+  (make-charset '=jef-china3
+		"JEF + CHINA3 private characters"
+		'(long-name	"JEF + CHINA3"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"china3jef-0"
+		  min-code	#xE80000
+		  max-code	#xE8FFFF
+		  code-offset	#xE80000))
+  (define-charset-alias 'china3-jef '=jef-china3)
+  (make-charset '==jef-china3
+		"JEF + CHINA3 abstract glyph-images."
+		'(long-name	"JEF + CHINA3"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"china3jef-0"
+		  mother	=jef-china3))
+  (make-charset '===jef-china3
+		"JEF + CHINA3 glyph-images."
+		'(long-name	"JEF-CHINA3 glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"china3jef-0"
+		  mother	==jef-china3))
+
+  (make-charset '=ruimoku-v6
+		"private characters used in RUIMOKU Version.6"
+		`(long-name	"RUI6"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+                  ;; mother	ucs
+		  min-code	#xE90000 ; #xE000
+		  max-code	#xE908FF ; #xE8FF
+		  code-offset	,(- #xE90000 #xE000)))
+  (make-charset '==ruimoku-v6
+		"RUIMOKU Version.6 glyph-images."
+		'(long-name	"RUI6 glyph-images."
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+		  mother	=ruimoku-v6))
+  (make-charset '===ruimoku-v6
+		"RUIMOKU Version.6 representative glyph-images."
+		'(long-name	"RUI6 rep-glyph-images."
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+		  mother	==ruimoku-v6))
+  (make-charset '=>ruimoku-v6
+		"RUIMOKU Version.6 abstract characters."
+		'(long-name	"RUI6 characters."
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+		  mother	=ruimoku-v6))
+  (define-charset-alias '=>>ruimoku-v6 '=>ruimoku-v6)
+
+  ;; (make-charset
+  ;;  '=zihai
+  ;;  "ZhongHua-ZiHai glyph-images"
+  ;;  '(long-name "ZhongHua-ZiHai (pppp-nn)"
+  ;;              chars 256
+  ;;              dimension 3
+  ;;              columns 2
+  ;;              graphic 2
+  ;;              direction l2r))
+
+  ;; (make-charset
+  ;;  '=zihai-17xx
+  ;;  "ZhongHua-ZiHai (pp.1700〜1781) glyph-images"
+  ;;  '(long-name "ZhongHua-ZiHai pp.17xx"
+  ;;              chars 256
+  ;;              dimension 2
+  ;;              columns 2
+  ;;              graphic 2
+  ;;              direction l2r
+  ;;              registry "zihai\\.cp-17$"))
+
+  (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-001 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-001 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-003
+		"Big5-CDP-var-003 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-003"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  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-005
+		"Big5-CDP-var-005 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-005"
+		  chars         256
+		  dimension     2
 		  columns       2
 		  graphic       2
 		  direction     l2r
 		  registry      "cdp\\.var-5$"
 		  mother        =big5-cdp))
+  (define-charset-alias '=big5-cdp-var-5 '=big5-cdp-var-005)
+
+  (make-charset '==>ucs@bucs
+		"Basic Subset of Coded Character Sets (BUCS)"
+		'(long-name	"BUCS abstract characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs))
+
+  (make-charset '=>iwds-1
+		"The IRG Working Document Series 1: List of UCV of Ideograhs."
+		'(long-name	"IWDS 1: List of UCV"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r))
+
+  (make-charset '=>ucs@iwds-1
+		"UCS abstract characters based on IWDS-1."
+		'(long-name	"UCS based on IWDS-1"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>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"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>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"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs@unicode
+		"Abstract characters of Unicode representatives"
+		'(long-name	"UCS characters for Unicode"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+  (make-charset '=>ucs@jis
+		"UCS representative characters for JIS X0208/0212/0213"
+		'(long-name	"UCS characters for JIS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  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"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@unicode))
+  (make-charset '=>ucs@cns
+		"UCS representatives characters for CNS 11643 sources"
+		'(long-name	"UCS characters for CNS 11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@unicode))
+
+  (make-charset '=+>ucs@iso
+		"UCS based on ISO/IEC 10646 representative glyphs"
+		'(long-name	"Unified abstract glyphs of UCS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+  (make-charset '=+>ucs@unicode
+		"Unicode representative unified abstract glyphs"
+		'(long-name	"UCS unified abstract glyphs for Unicode"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@iso))
+  (make-charset '=+>ucs@jis
+		"UCS based on Japanese usual unification"
+		'(long-name	"UCS unified abstract glyphs for JP"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
+  (define-charset-alias '=>ucs@JP '=+>ucs@jis)
+  (make-charset '=+>ucs@jis/1990
+		"UCS representative characters for JIS X0208/0212:1990"
+		'(long-name	"UCS characters for JIS:1990"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@jis))
+  (define-charset-alias '=>ucs@jis/1990 '=+>ucs@jis/1990)
+  (make-charset '=+>ucs@jis/2004
+		"UCS representative characters for JIS X 0213:2004"
+		'(long-name	"UCS characters 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 unified abstract glyphs for Korean Standards"
+		'(long-name	"UCS unified abstract glyphs for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
+  (make-charset '=+>ucs@cns
+		"UCS representatives unified abstract glyphs for CNS 11643 sources"
+		'(long-name	"UCS unified abstract glyphs for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
+
+  (make-charset '=ucs@iso
+		"ISO/IEC 10646 for its representative glyphs"
+		'(long-name	"UCS for ISO"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+                  mother	=+>ucs@iso
+		  ))
+  (make-charset '=ucs@unicode
+		"Unicode for its representative glyphs"
+		'(long-name	"UCS for Unicode"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@iso))
+  (make-charset '=ucs@gb
+		"ISO/IEC 10646 for GB"
+		'(long-name	"UCS for GB"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@unicode))
+  (define-charset-alias 'ucs-gb '=ucs@gb)
+  (make-charset '=ucs@gb/fw
+		"ISO/IEC 10646 for GB with fullwidth"
+		'(long-name	"UCS for GB-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@gb))
+  (make-charset '=ucs-bmp@gb
+		"ISO/IEC 10646 BMP for GB"
+		'(long-name	"BMP for GB"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@gb
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '=ucs@cns
+		"ISO/IEC 10646 for CNS 11643"
+		'(long-name	"UCS for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@unicode))
+  (define-charset-alias 'ucs-cns '=ucs@cns)
+  (make-charset '=ucs@cns/fw
+		"ISO/IEC 10646 for CNS 11643 with fullwidth"
+		'(long-name	"UCS for CNS-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@cns))
+  (make-charset '=ucs-bmp@cns
+		"ISO/IEC 10646 BMP for CNS"
+		'(long-name	"BMP for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@cns
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '=ucs@jis
+		"ISO/IEC 10646 for JIS X0208/0212/0213"
+		'(long-name	"UCS for JIS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@unicode))
+  (define-charset-alias 'ucs-jis '=ucs@jis)
+  (make-charset '=ucs@jis/fw
+		"ISO/IEC 10646 for JIS X0208/0212/0213 with fullwidth"
+		'(long-name	"UCS for JIS-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@jis))
+  (make-charset '=ucs-bmp@jis
+		"ISO/IEC 10646 BMP for JIS"
+		'(long-name	"BMP for JIS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@jis
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  ;; (make-charset '=ucs@jis/1983
+  ;;               "ISO/IEC 10646 for JIS X 0208:1983"
+  ;;               '(long-name     "UCS for JIS:1983"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =ucs@jis))
+  (make-charset '=ucs@jis/1990
+		"ISO/IEC 10646 for JIS X 0208/0212:1990"
+		'(long-name	"UCS for JIS:1990"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@jis))
+  (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
+  (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
+  (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))
+  (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
+  (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
+  (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@JP
+		"UCS for common glyphs used in Japan"
+		'(long-name	"UCS for Japan"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@jis/2004))
+  (define-charset-alias '=ucs@jp '=ucs@JP)
+  (make-charset '=ucs@JP/hanazono
+		"Japanese glyph-images of Hanazono Mincho"
+		'(long-name	"UCS for Hana-Min"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@JP))
+  (make-charset '=ucs@ks
+		"ISO/IEC 10646 for Korean Standards"
+		'(long-name	"UCS for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@unicode))
+  (define-charset-alias 'ucs-ks '=ucs@ks)
+  (make-charset '=ucs@ks/2012
+		"Mapping for Korean Standards in ISO/IEC 10646:2012"
+		'(long-name	"UCS:2012 for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@ks))
+  (make-charset '=ucs-bmp@ks
+		"ISO/IEC 10646 BMP for KS"
+		'(long-name	"BMP for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@ks
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '=ucs@cns11643
+		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
+		'(long-name	"UCS for CNS11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@cns))
+  (make-charset '=ucs@big5
+		"ISO/IEC 10646 for Big5"
+		'(long-name	"UCS for Big5"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@cns
+		  ;; mother	=>>ucs@cns
+		  ))
+  (define-charset-alias 'ucs-big5 '=ucs@big5)
+  (make-charset '=ucs@big5/cns11643
+		"ISO/IEC 10646 for Big5 based on www.cns11643.gov.tw"
+		'(long-name	"UCS for Big5@CNS11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@big5))
 
-  (make-charset '==>ucs@bucs
-		"Basic Subset of Coded Character Sets (BUCS)"
-		'(long-name	"BUCS abstract characters"
+  (make-charset '=>>ucs@iso
+		"Representative abstract-glyphs of ISO/IEC 10646"
+		'(long-name	"UCS abstract glyphs for UCS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@iso))
+  (make-charset '=>>ucs@unicode
+		"Representative abstract-glyphs of Unicode"
+		'(long-name	"Unicode abstract glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@iso))
+  (make-charset '=>>ucs@jis
+		"UCS Representative abstract-glyphs for JIS X0208/0212/0213"
+		'(long-name	"UCS abstract glyphs for JIS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>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"
+		  mother	=>>ucs@unicode))
+  (make-charset '=>>ucs@jis/1990
+		"UCS Representative glyphs for JIS X 0208/0212:1990"
+		'(long-name	"UCS glyphs for JIS:1990"
 		  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"
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2000
+		"UCS Representative glyphs for JIS X 0213:2000"
+		'(long-name	"UCS glyphs for JIS:2000"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=ucs))
-  (make-charset '=>ucs@unicode
-		"Abstract characters of Unicode representatives"
-		'(long-name	"UCS characters for Unicode"
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2004
+		"UCS Representative glyphs for JIS X 0213:2004"
+		'(long-name	"UCS glyphs for JIS:2004"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@iso))
-  (make-charset '=>ucs@jis
-		"UCS representative characters for JIS X0208/0212/0213"
-		'(long-name	"UCS characters for JIS"
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@JP
+		"UCS abstract-glyphs based on Japanese style glyphs"
+		'(long-name	"UCS glyphs for JP"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@unicode))
-  (make-charset '=>ucs@ks
-		"UCS representative characters for Korean Standards"
-		'(long-name	"UCS characters for KS"
+		  mother	=>>ucs@jis/2004))
+  (make-charset '=>>ucs@ks
+		"UCS Representative glyphs for Korean Standards"
+		'(long-name	"UCS glyphs for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@unicode))
-  (make-charset '=>ucs@cns
-		"UCS representatives characters for CNS 11643 sources"
-		'(long-name	"UCS characters for CNS 11643"
+		  mother	=>>ucs@unicode))
+  (make-charset '=>>ucs@cns
+		"UCS Representative glyphs for CNS 11643 sources"
+		'(long-name	"UCS glyphs for CNS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@unicode))
+		  mother	=>>ucs@unicode))
 
-  (make-charset '=+>ucs@iso
-		"UCS based on ISO/IEC 10646 representative glyphs"
-		'(long-name	"Unified abstract glyphs of UCS"
+  (make-charset '==ucs@iso
+		"Representative glyph-forms of ISO/IEC 10646."
+		'(long-name     "UCS glyph-forms for UCS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        =>>ucs@iso))
+  (define-charset-alias '=>>>ucs@iso '==ucs@iso)
+  (make-charset '==ucs@unicode
+		"Representative glyph-forms of Unicode."
+		'(long-name     "UCS glyph-forms for Unicode"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@iso))
+  (define-charset-alias '=>>>ucs@unicode '==ucs@unicode)
+  (make-charset '==ucs@gb
+		"ISO/IEC 10646 for GB"
+		'(long-name	"UCS for GB"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@iso))
-  (make-charset '=+>ucs@unicode
-		"Unicode representative unified abstract glyphs"
-		'(long-name	"UCS unified abstract glyphs for Unicode"
+		  mother	==ucs@unicode))
+  (make-charset '==ucs-bmp@gb
+		"ISO/IEC 10646 BMP for GB"
+		'(long-name	"BMP for GB"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs@gb
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '==ucs@cns
+		"UCS Representative glyph-forms for CNS 11643 sources."
+		'(long-name     "UCS glyph-forms for CNS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@cns '==ucs@cns)
+  (make-charset '==ucs-bmp@cns
+		"ISO/IEC 10646 BMP for CNS"
+		'(long-name	"BMP for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs@cns
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '==ucs@jis
+		"UCS Representative glyph-forms for JIS X0208/0212/0213."
+		'(long-name     "UCS glyph-forms for JIS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@jis '==ucs@jis)
+  (make-charset '==ucs@jis/1990
+		"UCS Representative glyph-forms for JIS X 0208/0212:1990."
+		'(long-name     "UCS glyph-forms for JIS:1990"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/1990 '==ucs@jis/1990)
+  (make-charset '==ucs@jis/2000
+		"UCS Representative glyph-forms for JIS X 0213:2000."
+		'(long-name     "UCS glyph-forms for JIS:2000"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/2000 '==ucs@jis/2000)
+  (make-charset '==ucs@jis/2004
+		"UCS Representative glyph-forms for JIS X 0213:2004."
+		'(long-name     "UCS glyph-forms for JIS:2004"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/2004 '==ucs@jis/2004)
+  (make-charset '==ucs@JP
+		"UCS for common glyph-forms used in Japan."
+		'(long-name	"UCS for Japan"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@iso))
-  (make-charset '=+>ucs@jis
-		"UCS based on Japanese usual unification"
-		'(long-name	"UCS unified abstract glyphs for JP"
+		  mother	==ucs@jis/2004))
+  (make-charset '==ucs@JP/hanazono
+		"Japanese glyph-forms of Hanazono Mincho."
+		'(long-name	"UCS for Hana-Min"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@unicode))
-  (define-charset-alias '=>ucs@JP '=+>ucs@jis)
-  (make-charset '=+>ucs@jis/1990
-		"UCS representative characters for JIS X0208/0212:1990"
-		'(long-name	"UCS characters for JIS:1990"
+		  mother	==ucs@JP))
+  (make-charset '==ucs@ks
+		"UCS Representative glyph-forms for Korean Standards."
+		'(long-name     "UCS glyph-forms for KS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@ks '==ucs@ks)
+  (make-charset '==ucs-bmp@ks
+		"ISO/IEC 10646 BMP for KS."
+		'(long-name	"BMP for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs@ks
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '==ucs@cns11643
+		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw."
+		'(long-name	"UCS for CNS11643"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@jis))
-  (define-charset-alias '=>ucs@jis/1990 '=+>ucs@jis/1990)
-  (make-charset '=+>ucs@jis/2004
-		"UCS representative characters for JIS X 0213:2004"
-		'(long-name	"UCS characters for JIS:2004"
+		  mother	==ucs@cns))
+
+  (make-charset '===ucs@iso
+		"ISO/IEC 10646-2 representative glyph-images."
+		'(long-name	"ISO rep-images for UCS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@jis))
-  (make-charset '=+>ucs@ks
-		"UCS representative unified abstract glyphs for Korean Standards"
-		'(long-name	"UCS unified abstract glyphs for KS"
+		  mother	==ucs@iso))
+  (make-charset '===ucs@unicode
+		"Unicode for its representative glyph-images."
+		'(long-name	"UCS for Unicode"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@unicode))
-  (make-charset '=+>ucs@cns
-		"UCS representatives unified abstract glyphs for CNS 11643 sources"
-		'(long-name	"UCS unified abstract glyphs for CNS"
+		  mother	==ucs@unicode))
+  (make-charset '===ucs@gb
+		"UCS representative glyph-images of GB."
+		'(long-name	"UCS rep-images for GB"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@unicode))
-
-  (make-charset '=>>ucs@iso
-		"Representative abstract-glyphs of ISO/IEC 10646"
-		'(long-name	"UCS abstract glyphs for UCS"
+		  mother	===ucs@unicode))
+  (make-charset '===ucs@ks
+		"UCS representative glyph-images of Korean Standards."
+		'(long-name	"UCS rep-images for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=+>ucs@iso))
-  (make-charset '=>>ucs@unicode
-		"Representative abstract-glyphs of Unicode"
-		'(long-name	"Unicode abstract glyphs"
+		  mother	==ucs@ks))
+
+  (make-charset '=ucs-var-001
+		"uXXXX-var-001 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-001
+		"uXXXX-var-001 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-001
+		  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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@iso))
-  (make-charset '=>>ucs@jis
-		"UCS Representative abstract-glyphs for JIS X0208/0212/0213"
-		'(long-name	"UCS abstract glyphs for JIS"
+		  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"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@unicode))
-  (make-charset '=>>ucs@jis/1990
-		"UCS Representative glyphs for JIS X 0208/0212:1990"
-		'(long-name	"UCS glyphs for JIS:1990"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-002
+		"uXXXX-var-002 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-002"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@jis))
-  (make-charset '=>>ucs@jis/2000
-		"UCS Representative glyphs for JIS X 0213:2000"
-		'(long-name	"UCS glyphs for JIS:2000"
+                  ;; =>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 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-002"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@jis))
-  (make-charset '=>>ucs@jis/2004
-		"UCS Representative glyphs for JIS X 0213:2004"
-		'(long-name	"UCS glyphs for JIS:2004"
+		  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"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@jis))
-  (make-charset '=>>ucs@JP
-		"UCS abstract-glyphs based on Japanese style glyphs"
-		'(long-name	"UCS glyphs for JP"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-003
+		"uXXXX-var-003 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-003"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@jis/2004))
-  (make-charset '=>>ucs@ks
-		"UCS Representative glyphs for Korean Standards"
-		'(long-name	"UCS glyphs for KS"
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var003-0"))
+  (make-charset '=ucs-sip-var-003
+		"uXXXX-var-003 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-003"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@unicode))
-  (make-charset '=>>ucs@cns
-		"UCS Representative glyphs for CNS 11643 sources"
-		'(long-name	"UCS glyphs for CNS"
+		  mother	=ucs-var-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var003-2"))
+  (make-charset '=ucs-var-004
+		"uXXXX-var-004 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-004"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@unicode))
-
-  (make-charset '=ucs@iso
-		"ISO/IEC 10646 for its representative glyphs"
-		'(long-name	"UCS for ISO"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-004
+		"uXXXX-var-004 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-004"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-                  mother	=>>ucs@iso
-		  ))
-  (make-charset '=ucs@unicode
-		"Unicode for its representative glyphs"
-		'(long-name	"UCS for Unicode"
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var004-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@iso))
-  (make-charset '=ucs@gb
-		"ISO/IEC 10646 for GB"
-		'(long-name	"UCS for GB"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@unicode))
-  (define-charset-alias 'ucs-gb '=ucs@gb)
-  (make-charset '=ucs@gb/fw
-		"ISO/IEC 10646 for GB with fullwidth"
-		'(long-name	"UCS for GB-fullwidth"
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var006-0"))
+  (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@gb))
-  (make-charset '=ucs-bmp@gb
-		"ISO/IEC 10646 BMP for GB"
-		'(long-name	"BMP for GB"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs@gb
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '=ucs@cns
-		"ISO/IEC 10646 for CNS 11643"
-		'(long-name	"UCS for CNS"
+                  ;; =>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@unicode))
-  (define-charset-alias 'ucs-cns '=ucs@cns)
-  (make-charset '=ucs@cns/fw
-		"ISO/IEC 10646 for CNS 11643 with fullwidth"
-		'(long-name	"UCS for CNS-fullwidth"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@cns))
-  (make-charset '=ucs-bmp@cns
-		"ISO/IEC 10646 BMP for CNS"
-		'(long-name	"BMP for CNS"
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var010-0"))
+
+  (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
-		  mother	=ucs@cns
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '=ucs@jis
-		"ISO/IEC 10646 for JIS X0208/0212/0213"
-		'(long-name	"UCS for JIS"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@unicode))
-  (define-charset-alias 'ucs-jis '=ucs@jis)
-  (make-charset '=ucs@jis/fw
-		"ISO/IEC 10646 for JIS X0208/0212/0213 with fullwidth"
-		'(long-name	"UCS for JIS-fullwidth"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@jis))
-  (make-charset '=ucs-bmp@jis
-		"ISO/IEC 10646 BMP for JIS"
-		'(long-name	"BMP for JIS"
+		  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
-		  mother	=ucs@jis
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  ;; (make-charset '=ucs@jis/1983
-  ;;               "ISO/IEC 10646 for JIS X 0208:1983"
-  ;;               '(long-name     "UCS for JIS:1983"
-  ;;                 chars         256
-  ;;                 dimension     3
-  ;;                 columns       2
-  ;;                 graphic       2
-  ;;                 direction     l2r
-  ;;                 =>iso-ir      177
-  ;;                 mother        =ucs@jis))
-  (make-charset '=ucs@jis/1990
-		"ISO/IEC 10646 for JIS X 0208/0212:1990"
-		'(long-name	"UCS for JIS:1990"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-sip-itaiji-001
+		"uXXXX-itaiji-001 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@jis))
-  (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
-  (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
-  (make-charset '=ucs@jis/2000
-		"ISO/IEC 10646 for JIS X 0213:2000"
-		'(long-name	"UCS for JIS:2000"
+		  mother	=>ucs-itaiji-001
+		  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@jis))
-  (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
-  (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
-  (make-charset '=ucs@jis/2004
-		"ISO/IEC 10646 for JIS X 0213:2004"
-		'(long-name	"UCS for JIS:2004"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@jis))
-  (make-charset '=ucs@JP
-		"UCS for common glyphs used in Japan"
-		'(long-name	"UCS for Japan"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@jis/2004))
-  (define-charset-alias '=ucs@jp '=ucs@JP)
-  (make-charset '=ucs@JP/hanazono
-		"Japanese glyph-images of Hanazono Mincho"
-		'(long-name	"UCS for Hana-Min"
+		  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@JP))
-  (make-charset '=ucs@ks
-		"ISO/IEC 10646 for Korean Standards"
-		'(long-name	"UCS for KS"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-002 characters"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@unicode))
-  (define-charset-alias 'ucs-ks '=ucs@ks)
-  (make-charset '=ucs@ks/2012
-		"Mapping for Korean Standards in ISO/IEC 10646:2012"
-		'(long-name	"UCS:2012 for KS"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@ks))
-  (make-charset '=ucs-bmp@ks
-		"ISO/IEC 10646 BMP for KS"
-		'(long-name	"BMP for KS"
+		  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
-		  mother	=ucs@ks
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '=ucs@cns11643
-		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
-		'(long-name	"UCS for CNS11643"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@cns))
-  (make-charset '=ucs@big5
-		"ISO/IEC 10646 for Big5"
-		'(long-name	"UCS for Big5"
+                  ;; =>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 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-003"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@cns
-		  ;; mother	=>>ucs@cns
-		  ))
-  (define-charset-alias 'ucs-big5 '=ucs@big5)
-  (make-charset '=ucs@big5/cns11643
-		"ISO/IEC 10646 for Big5 based on www.cns11643.gov.tw"
-		'(long-name	"UCS for Big5@CNS11643"
+		  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@big5))
-
-  (make-charset '==ucs@iso
-		"Representative glyph-forms of ISO/IEC 10646."
-		'(long-name     "UCS glyph-forms for UCS"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        =>>ucs@iso))
-  (define-charset-alias '=>>>ucs@iso '==ucs@iso)
-  (make-charset '==ucs@unicode
-		"Representative glyph-forms of Unicode."
-		'(long-name     "UCS glyph-forms for Unicode"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@iso))
-  (define-charset-alias '=>>>ucs@unicode '==ucs@unicode)
-  (make-charset '==ucs@gb
-		"ISO/IEC 10646 for GB"
-		'(long-name	"UCS for GB"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@unicode))
-  (make-charset '==ucs-bmp@gb
-		"ISO/IEC 10646 BMP for GB"
-		'(long-name	"BMP for GB"
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (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
-		  mother	==ucs@gb
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '==ucs@cns
-		"UCS Representative glyph-forms for CNS 11643 sources."
-		'(long-name     "UCS glyph-forms for CNS"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@unicode))
-  (define-charset-alias '=>>>ucs@cns '==ucs@cns)
-  (make-charset '==ucs-bmp@cns
-		"ISO/IEC 10646 BMP for CNS"
-		'(long-name	"BMP for CNS"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	==ucs@cns
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '==ucs@jis
-		"UCS Representative glyph-forms for JIS X0208/0212/0213."
-		'(long-name     "UCS glyph-forms for JIS"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@unicode))
-  (define-charset-alias '=>>>ucs@jis '==ucs@jis)
-  (make-charset '==ucs@jis/1990
-		"UCS Representative glyph-forms for JIS X 0208/0212:1990."
-		'(long-name     "UCS glyph-forms for JIS:1990"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@jis))
-  (define-charset-alias '=>>>ucs@jis/1990 '==ucs@jis/1990)
-  (make-charset '==ucs@jis/2000
-		"UCS Representative glyph-forms for JIS X 0213:2000."
-		'(long-name     "UCS glyph-forms for JIS:2000"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@jis))
-  (define-charset-alias '=>>>ucs@jis/2000 '==ucs@jis/2000)
-  (make-charset '==ucs@jis/2004
-		"UCS Representative glyph-forms for JIS X 0213:2004."
-		'(long-name     "UCS glyph-forms for JIS:2004"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@jis))
-  (define-charset-alias '=>>>ucs@jis/2004 '==ucs@jis/2004)
-  (make-charset '==ucs@JP
-		"UCS for common glyph-forms used in Japan."
-		'(long-name	"UCS for Japan"
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+  (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@jis/2004))
-  (make-charset '==ucs@JP/hanazono
-		"Japanese glyph-forms of Hanazono Mincho."
-		'(long-name	"UCS for Hana-Min"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@JP))
-  (make-charset '==ucs@ks
-		"UCS Representative glyph-forms for Korean Standards."
-		'(long-name     "UCS glyph-forms for KS"
-		  chars         256
-		  dimension     3
-		  columns       2
-		  graphic       2
-		  direction     l2r
-		  =>iso-ir      177
-		  mother        ==ucs@unicode))
-  (define-charset-alias '=>>>ucs@ks '==ucs@ks)
-  (make-charset '==ucs-bmp@ks
-		"ISO/IEC 10646 BMP for KS."
-		'(long-name	"BMP for KS"
+                  ;; =>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
-		  mother	==ucs@ks
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '==ucs@cns11643
-		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw."
-		'(long-name	"UCS for CNS11643"
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-006"
 		  chars		256
-		  dimension	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@cns))
-
-  (make-charset '===ucs@iso
-		"ISO/IEC 10646-2 representative glyph-images."
-		'(long-name	"ISO rep-images for UCS"
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
+  (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@iso))
-  (make-charset '===ucs@unicode
-		"Unicode for its representative glyph-images."
-		'(long-name	"UCS for Unicode"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	===ucs@iso))
-  (make-charset '===ucs@gb
-		"UCS representative glyph-images of GB."
-		'(long-name	"UCS rep-images for GB"
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-008
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji008-0"))
+  (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@unicode))
-  (make-charset '===ucs@ks
-		"UCS representative glyph-images of Korean Standards."
-		'(long-name	"UCS rep-images for KS"
+                  ;; =>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	3
+		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	===ucs@unicode))
-
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
   (make-charset '=ucs-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
 		'(long-name	"UCS-itaiji-084"
@@ -3646,7 +4756,7 @@
                   ;; =>iso-ir	177
 		  mother	=ucs-itaiji-084
 		  min-code #x2E00
-		  max-code #x9FA5
+		  max-code #x9FCC
 		  registry "ucs\\.itaiji084-0"))
 
   (make-charset
@@ -3710,6 +4820,7 @@
 	       mother ucs-bmp
 	       min-code #x2E00
 	       max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3725,6 +4836,7 @@
 	       mother =ucs@gb
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3740,6 +4852,7 @@
 	       mother ==ucs@gb
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3755,6 +4868,7 @@
 	       mother ===ucs@gb
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3769,7 +4883,7 @@
 	       registry "-ja-.*-ucs-0"
 	       mother =ucs@JP
 	       min-code #x2E00
-               max-code #x9FA5
+               max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3784,7 +4898,7 @@
 	       registry "-ja-.*-ucs-0"
 	       mother =ucs@JP/hanazono
 	       min-code #x2E00
-               max-code #x9FA5
+               max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3799,7 +4913,7 @@
 	       registry "-ja-.*-ucs-0"
 	       mother ==ucs@JP/hanazono
 	       min-code #x2E00
-               max-code #x9FA5
+               max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3815,6 +4929,7 @@
 	       mother =+>ucs@unicode
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3830,6 +4945,22 @@
 	       mother =>ucs@unicode
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; 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"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@component
+	       min-code #x2E00
+               max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3845,6 +4976,7 @@
 	       mother ==>ucs@bucs
 	       min-code #x2E00
                max-code #x9FA5
+	       ;; max-code #x9FCC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -3876,6 +5008,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"
@@ -3904,8 +5078,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
@@ -3929,6 +5103,32 @@
 	       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@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"