X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=f30b09c641e09d1a91425aca7043a8d4e4a2eb72;hb=a0d571d5cf10aeb3f0ce80b80b35c9f908d3233a;hp=24db5039d44d1e61e2c264a2014d78b57a0ecfe6;hpb=aa346ae90fec1f767e9891cbb77f84112851d21f;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 24db503..f30b09c 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, 2015 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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
@@ -925,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))
@@ -1070,7 +1070,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 +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
@@ -1258,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
@@ -1321,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
@@ -1637,7 +1637,7 @@
    "Moji-Jouhou-Kiban characters"
    `(long-name "Moji-Jouhou-Kiban"
 	       chars 256
-	       dimension 2
+	       dimension 3
 	       columns 2
 	       graphic 2
 	       direction l2r
@@ -1675,6 +1675,17 @@
 	       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
    '=hanyo-denshi/ja
@@ -1809,7 +1820,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 +1993,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 +2169,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
@@ -2805,11 +2845,387 @@
 	    hzk-max (+ hzk-min 65535))
       (setq i (1+ i))))
 
+  (make-charset '===hng-jou "HNG:誠實論卷八（P.2179）"
+		'(long-name "HNG/P2179"
+		  chars		256
+		  dimension	2
+		  registry	"hng-1$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-keg "HNG:華嚴經卷十六（S.2067）"
+		'(long-name "HNG/S2067"
+		  chars		256
+		  dimension	2
+		  registry	"hng-2$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-dng "HNG:大般涅槃經卷十一（S.81）"
+		'(long-name "HNG/S81"
+		  chars		256
+		  dimension	2
+		  registry	"hng-3$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-mam "HNG:摩訶摩耶經卷上（P.2160）"
+		'(long-name "HNG/P2160"
+		  chars		256
+		  dimension	2
+		  registry	"hng-5$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-drt "HNG:大樓炭經卷三（P.2413）"
+		'(long-name "HNG/P2413"
+		  chars		256
+		  dimension	2
+		  registry	"hng-6$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kgk "HNG:賢劫經卷二（正倉院本）"
+		'(long-name "HNG/賢劫經二"
+		  chars		256
+		  dimension	2
+		  registry	"hng-7$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-myz "HNG:妙法蓮華經卷五（P.2334）"
+		'(long-name "HNG/P2334"
+		  chars		256
+		  dimension	2
+		  registry	"hng-8$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (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	"hngkhi-0"
+		  registry	"hng-10$"
+		  graphic	2
+		  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
+		  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
+		  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
+		  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
+		  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
+		  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
+		  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))
@@ -2986,9 +3402,9 @@
   ;;              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-var-003
+		"Big5-CDP-var-003 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-003"
 		  chars         256
 		  dimension     2
 		  columns       2
@@ -2996,10 +3412,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-5
-		"Big5-CDP-var-5 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-5"
+  (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
@@ -3007,6 +3435,7 @@
 		  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)"
@@ -3750,6 +4179,17 @@
 		  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"
@@ -3773,6 +4213,17 @@
 		  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-003
 		"uXXXX-var-003 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-003"
@@ -3796,6 +4247,257 @@
 		  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	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-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))
+  (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-var-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var004-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-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-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-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 glyph-images 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-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-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 glyph-images 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-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-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
 		'(long-name	"UCS-itaiji-084"
@@ -4069,6 +4771,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"
@@ -4097,8 +4841,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
@@ -4122,6 +4866,19 @@
 	       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@iso
    "ISO representative abstract-glyph-images of ISO/IEC 10646 Plane 2"
    '(long-name "SIP abstract glyph-images"