X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=3503ff7af11a1fe95f4a5538839fcdc78a4aadf8;hb=69a082b98889c2fe94d0ed8100bb58f0b8c44f1f;hp=7d99e2f1a5b9b31c7c4119402b51990e0e4e0927;hpb=c6699cfcff3c770da6032de1e7f2a1844ba4e746;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 7d99e2f..3503ff7 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
-;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+;;   2020, 2021 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -1483,24 +1484,60 @@
 
   (make-charset
    '=>>cns11643-1
-   "CNS 11643 Plane 1 abstract glyphs."
+   "CNS 11643 Plane 1 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-1
-	      =>iso-ir 184
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-2
+   "CNS 11643 Plane 2 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-2
+	      =>iso-ir 172
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-3
+   "CNS 11643 Plane 3 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?3$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-3
+	      =>iso-ir 183
 	      graphic 0))
   (make-charset
    '=>>cns11643-4
-   "CNS 11643 Plane 4 abstract glyphs."
+   "CNS 11643 Plane 4 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-4
 	      =>iso-ir 184
 	      graphic 0))
+  (make-charset
+   '=>>cns11643-6
+   "CNS 11643 Plane 6 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-6
+	      =>iso-ir 186
+	      graphic 0))
 
   (make-charset
+   '=>cns11643-1
+   "CNS 11643 Plane 1 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-1
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
    '=>cns11643-2
    "CNS 11643 Plane 2 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
@@ -1510,6 +1547,15 @@
 	      =>iso-ir 172
 	      graphic 0))
   (make-charset
+   '=>cns11643-4
+   "CNS 11643 Plane 4 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-4
+	      =>iso-ir 184
+	      graphic 0))
+  (make-charset
    '=>cns11643-5
    "CNS 11643 Plane 5 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?5$"
@@ -1621,6 +1667,17 @@
 		  registry	"big5\\.cdp-0"
 		  mother	=big5-cdp))
 
+  (make-charset '=+>big5-cdp
+		"Big5-CDP unified glyphs"
+		'(long-name	"Big5-CDP unified glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=big5-cdp))
+
   (make-charset '=>big5-cdp
 		"Big5-CDP abstract characters"
 		'(long-name	"Big5-CDP abstract characters"
@@ -1630,7 +1687,40 @@
 		  graphic	2
 		  direction	l2r
 		  registry	"big5\\.cdp-0"
-		  mother	=>>big5-cdp))
+		  mother	=big5-cdp))
+
+  (make-charset '=>big5-cdp@iwds-1
+		"Big5-CDP abstract characters based on IWDS-1"
+		'(long-name	"Big5-CDP IWDS-1 abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
+
+  (make-charset '=>big5-cdp@component
+		"Big5-CDP abstract components"
+		'(long-name	"Big5-CDP abstract components"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
+
+  (make-charset '=>big5-cdp@cognate
+		"Big5-CDP abstract components based on cognate"
+		'(long-name	"Big5-CDP abstract cognate components"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>big5-cdp))
 
   (make-charset
    '=mj
@@ -2759,6 +2849,49 @@
 		  direction	l2r
 		  mother	=>>daikanwa/ho))
 
+  (make-charset '=daijiten
+		"Daijiten dictionary glyphs"
+		`(long-name	"Daijiten glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"Daijiten-*"
+		  min-code	#xE50000
+		  max-code	,(+ #xE50000 14924)
+		  code-offset	#xE50000))
+  (make-charset '==daijiten
+		"Daijiten dictionary glyph-forms"
+		`(long-name	"Daijiten glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=daijiten
+		  registry	"Daijiten-*"))
+  (make-charset '===daijiten
+		"Daijiten dictionary glyph-images"
+		`(long-name	"Daijiten glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==daijiten
+		  registry	"Daijiten-*"))
+  (make-charset '==>daijiten
+		"Jishu of Daijiten dictionary"
+		`(long-name	"Daijiten jishu"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=daijiten
+		  registry	"Daijiten-*"))
+  
   (make-charset '=shinjigen
 		"Kadokawa ShinJigen dictionary (common parts)"
 		`(long-name	"Shinjigen common parts"
@@ -2969,6 +3102,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-fhs "HNG:P2195妙法蓮華經卷六"
+		'(long-name "HNG/P2195"
+		  chars		256
+		  dimension	2
+		  registry	"hng-12$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-hok "HNG:妙法蓮華經卷八（S.2577）"
 		'(long-name "HNG/S2577"
 		  chars		256
@@ -3057,6 +3198,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-kkh "HNG:金剛般若經（京都国立博物館本）"
+		'(long-name "HNG/京博金般"
+		  chars		256
+		  dimension	2
+		  registry	"hng-27$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-nak "HNG:華嚴孔目（高山寺本）"
 		'(long-name "HNG/華厳孔目"
 		  chars		256
@@ -3121,6 +3270,14 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-ini "HNG:日本書紀卷二(鴨脚本)"
+		'(long-name "HNG/鴨脚紀2"
+		  chars		256
+		  dimension	2
+		  registry	"hng-38$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-nkk "HNG:日本書紀 卷二（兼方本）"
 		'(long-name "HNG/兼方紀2"
 		  chars		256
@@ -3249,6 +3406,22 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-sai "HNG:最上秘密那拏天經(東禪寺版日本寫本)"
+		'(long-name "HNG/最上秘密"
+		  chars		256
+		  dimension	2
+		  registry	"hng-61$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kad "HNG:大般若經卷八十(春日版)"
+		'(long-name "HNG/春日般若"
+		  chars		256
+		  dimension	2
+		  registry	"hng-62$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-kss "HNG:華嚴信種義（明惠自筆）"
 		'(long-name "HNG/華嚴信種"
 		  chars		256
@@ -3265,6 +3438,46 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-ykk "HNG:守屋本藥師功徳經"
+		'(long-name "HNG/藥師功徳"
+		  chars		256
+		  dimension	2
+		  registry	"hng-68$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-saa "HNG:阿毘達磨大毘婆沙論卷百七十(正倉院本)"
+		'(long-name "HNG/正毘170"
+		  chars		256
+		  dimension	2
+		  registry	"hng-70$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-sab "HNG:阿毘達磨大毘婆沙論卷百七十八(正倉院本)"
+		'(long-name "HNG/正毘178"
+		  chars		256
+		  dimension	2
+		  registry	"hng-71$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-wks "HNG:花嚴經卷六十七(守屋本)"
+		'(long-name "HNG/和寧華67"
+		  chars		256
+		  dimension	2
+		  registry	"hng-72$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-wke "HNG:花嚴經卷六十八(守屋本)"
+		'(long-name "HNG/和寧華68"
+		  chars		256
+		  dimension	2
+		  registry	"hng-73$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
   (make-charset '===hng-smk "HNG:西夏版妙法蓮華經卷一"
 		'(long-name "HNG/西夏法華"
 		  chars		256
@@ -3273,6 +3486,30 @@
 		  graphic	2
 		  columns	2
 		  direction	l2r))
+  (make-charset '===hng-sgs "HNG:四分律卷第十六(正倉院五月一日經)"
+		'(long-name "HNG/正四分16"
+		  chars		256
+		  dimension	2
+		  registry	"hng-77$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-sts "HNG:四分律卷第二十(正倉院唐經)"
+		'(long-name "HNG/正四分20"
+		  chars		256
+		  dimension	2
+		  registry	"hng-78$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+  (make-charset '===hng-kkd "HNG:金剛大教王經卷第二(高山寺本)"
+		'(long-name "HNG/院政大教"
+		  chars		256
+		  dimension	2
+		  registry	"hng-79$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
 
   (make-charset '=cbeta "CBETA private characters"
 		'(long-name	"CBETA PUA"
@@ -3414,6 +3651,16 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	==ruimoku-v6))
+  (make-charset '=>>ruimoku-v6
+		"RUIMOKU Version.6 detailed-glyphs."
+		'(long-name	"RUI6 characters."
+		  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."
@@ -3424,7 +3671,33 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	=ruimoku-v6))
-  (define-charset-alias '=>>ruimoku-v6 '=>ruimoku-v6)
+
+  (make-charset '=shuowen-jiguge "汲古閣本説文解字"
+		'(long-name "汲古閣本説文解字（抽象字体）"
+		  chars		256
+		  dimension	2
+		  registry	"ShuowenJiguge-5$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
+  (make-charset '===shuowen-jiguge4 "淮南書局4次様本説文解字"
+		'(long-name "京大人文研所蔵説文解字淮南書局4次様本"
+		  chars		256
+		  dimension	2
+		  registry	"ShuowenJiguge-4$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
+  (make-charset '===shuowen-jiguge5 "汲古閣通行本説文解字"
+		'(long-name "京大人文研所蔵汲古閣通行本説文解字"
+		  chars		256
+		  dimension	2
+		  registry	"ShuowenJiguge-5$"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
 
   ;; (make-charset
   ;;  '=zihai
@@ -3479,7 +3752,7 @@
 		  mother        =big5-cdp-itaiji-001))
 
   (make-charset '=big5-cdp-itaiji-002
-		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		"Big5-CDP-itaiji-002 glyphs of GlyphWiki"
 		'(long-name     "Big5-CDP-itaiji-002"
 		  chars         256
 		  dimension     2
@@ -3488,9 +3761,29 @@
 		  direction     l2r
 		  registry      "cdp\\.itaiji-2$"
 		  mother        =big5-cdp))
+  (make-charset '=>big5-cdp-itaiji-002
+		"Big5-CDP-itaiji-002 abstract characters 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-itaiji-002))
 
   (make-charset '=big5-cdp-itaiji-003
-		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		"Big5-CDP-itaiji-003 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-003"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-3$"
+		  mother        =big5-cdp))
+  (make-charset '=>big5-cdp-itaiji-003
+		"Big5-CDP-itaiji-003 abstract characters of GlyphWiki"
 		'(long-name     "Big5-CDP-itaiji-003"
 		  chars         256
 		  dimension     2
@@ -3498,10 +3791,42 @@
 		  graphic       2
 		  direction     l2r
 		  registry      "cdp\\.itaiji-3$"
+		  mother        =big5-cdp-itaiji-003))
+
+  (make-charset '=big5-cdp-itaiji-004
+		"Big5-CDP-itaiji-004 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-004"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-4$"
+		  mother        =big5-cdp))
+  (make-charset '=>big5-cdp-itaiji-004
+		"Big5-CDP-itaiji-004 abstract characters of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-004"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-4$"
+		  mother        =big5-cdp-itaiji-004))
+
+  (make-charset '=big5-cdp-itaiji-005
+		"Big5-CDP-itaiji-005 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-005"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-5$"
 		  mother        =big5-cdp))
 
   (make-charset '=big5-cdp-var-001
-		"Big5-CDP-var-001 glyph-images of GlyphWiki"
+		"Big5-CDP-var-001 glyphs of GlyphWiki"
 		'(long-name     "Big5-CDP-var-001"
 		  chars         256
 		  dimension     2
@@ -3511,6 +3836,17 @@
 		  registry      "cdp\\.var-1$"
 		  mother        =big5-cdp))
 
+  (make-charset '=>big5-cdp-var-001
+		"Big5-CDP-var-001 abstract characters of GlyphWiki"
+		'(long-name     "Big5-CDP-var-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-1$"
+		  mother        =big5-cdp-var-001))
+
   (make-charset '=big5-cdp-var-002
 		"Big5-CDP-var-002 glyph-images of GlyphWiki"
 		'(long-name     "Big5-CDP-var-002"
@@ -3557,6 +3893,28 @@
 		  mother        =big5-cdp))
   (define-charset-alias '=big5-cdp-var-5 '=big5-cdp-var-005)
 
+  (make-charset '=big5-cdp-var-007
+		"Big5-CDP-var-007 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-007"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-7$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-010
+		"Big5-CDP-var-010 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-010"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-10$"
+		  mother        =big5-cdp))
+
   (make-charset '==>ucs@bucs
 		"Basic Subset of Coded Character Sets (BUCS)"
 		'(long-name	"BUCS abstract characters"
@@ -3567,6 +3925,16 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=ucs))
+  (make-charset '==>ucs@esu
+		"Extended Subset of Coded Character Sets (ESU)"
+		'(long-name	"BUCS abstract characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	==>ucs@bucs))
 
   (make-charset '=>iwds-1
 		"The IRG Working Document Series 1: List of UCV of Ideograhs."
@@ -3587,6 +3955,16 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=ucs))
+  (make-charset '=>ucs@iwds-1/normalized
+		"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@iwds-1))
 
   (make-charset '=>ucs@cognate
 		"UCS abstract characters based on cognate."
@@ -3998,6 +4376,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
+		  ;; mother	=>ucs@iwds-1
 		  mother	=ucs@cns
 		  ;; mother	=>>ucs@cns
 		  ))
@@ -4328,7 +4707,7 @@
                   ;; =>iso-ir	177
 		  mother	=ucs-var-001
 		  min-code #x2E00
-		  max-code #x9FCC
+		  max-code #x9FEA
 		  registry "ucs\\.var001-0"))
   (make-charset '=ucs-sip-var-001
 		"uXXXX-var-001 glyph-images in SIP"
@@ -4341,12 +4720,57 @@
 		  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"
+  (make-charset '=ucs-tip-var-001
+		"uXXXX-var-001 glyph-images in TIP"
+		'(long-name	"UCS-TIP-var-001"
 		  chars		256
-		  dimension	3
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-001
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.var001-3"))
+  (make-charset '==ucs-var-001
+		"Abstract glyph-forms corresponding with uXXXX-var-001 of GlyphWiki"
+		'(long-name	"UCS-var-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-001))
+  (make-charset '==ucs-bmp-var-001
+		"uXXXX-var-001's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-var-001 glyph-forms"
+		  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's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-var-001 glyph-forms"
+		  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"
+		  chars		256
+		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
@@ -4376,6 +4800,17 @@
 		  mother	=ucs-var-002
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var002-2"))
+  (make-charset '=ucs-tip-var-002
+		"uXXXX-var-002 glyph-images in TIP"
+		'(long-name	"UCS-TIP-var-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-002
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.var002-3"))
   (make-charset '==ucs-var-002
 		"Abstract glyph-forms corresponding with uXXXX-var-002 of GlyphWiki"
 		'(long-name	"UCS-var-002"
@@ -4445,6 +4880,17 @@
 		  mother	=ucs-var-003
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var003-2"))
+  (make-charset '=ucs-tip-var-003
+		"uXXXX-var-003 glyph-images in TIP"
+		'(long-name	"UCS-TIP-var-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-003
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.var003-3"))
   (make-charset '=+>ucs-var-003
 		"uXXXX-var-003's unified glyphs of GlyphWiki"
 		'(long-name	"UCS-var-003 unified glyphs"
@@ -4468,6 +4914,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var003-0"))
+  (make-charset '=+>ucs-tip-var-003
+		"uXXXX-var-003 unified glyphs in TIP"
+		'(long-name	"UCS-TIP-var-003 unified glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=+>ucs-var-003
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.var003-3"))
 
   (make-charset '=ucs-var-004
 		"uXXXX-var-004 glyph-images of GlyphWiki"
@@ -4503,6 +4960,18 @@
 		  mother	=ucs-var-004
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var004-2"))
+  (make-charset '=ucs-tip-var-004
+		"uXXXX-var-004 glyph-images in TIP"
+		'(long-name	"UCS-TIP-var-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-004
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.var004-3"))
+
   (make-charset '=ucs-var-005
 		"uXXXX-var-005 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-005"
@@ -4526,6 +4995,18 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var005-0"))
+  (make-charset '=ucs-sip-var-005
+		"uXXXX-var-005 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var005-2"))
+
   (make-charset '=ucs-var-006
 		"uXXXX-var-006 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-006"
@@ -4560,6 +5041,31 @@
 		  mother	=ucs-var-006
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var006-2"))
+
+  (make-charset '=ucs-var-007
+		"uXXXX-var-007 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-007"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-var-007
+		"uXXXX-var-007 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var007-0"))
+
   (make-charset '=ucs-var-008
 		"uXXXX-var-008 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-008"
@@ -4641,6 +5147,17 @@
 		  mother	=ucs-itaiji-001
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=ucs-tip-itaiji-001
+		"uXXXX-itaiji-001 glyph-images in TIP"
+		'(long-name	"UCS-TIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-001
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.itaiji001-3"))
   (make-charset '=>ucs-itaiji-001
 		"Abstract characters corresponding with uXXXX-itaiji-001 of GlyphWiki"
 		'(long-name	"UCS-itaiji-001"
@@ -4675,6 +5192,17 @@
 		  mother	=>ucs-itaiji-001
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-tip-itaiji-001
+		"uXXXX-itaiji-001 characters in TIP"
+		'(long-name	"UCS-TIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001
+		  min-code #x30000 max-code #x3FFFF
+		  registry "ucs00\\.itaiji001-3"))
   (make-charset '==ucs-itaiji-001
 		"Abstract glyph-forms corresponding with uXXXX-itaiji-001 of GlyphWiki"
 		'(long-name	"UCS-itaiji-001"
@@ -4685,6 +5213,19 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs-itaiji-001))
+  (make-charset '==ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-001
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
   (make-charset '==ucs-sip-itaiji-001
 		"uXXXX-itaiji-001's abstract glyph-forms in SIP"
 		'(long-name	"UCS-SIP-itaiji-001"
@@ -4696,6 +5237,40 @@
 		  mother	==ucs-itaiji-001
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-itaiji-001@iwds-1
+		"uXXXX-itaiji-001's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001))
+  (make-charset '=>ucs-bmp-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in BMP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=>ucs-sip-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in SIP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in SIP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
 
   (make-charset '=ucs-itaiji-002
 		"uXXXX-itaiji-002 glyphs of GlyphWiki"
@@ -4799,6 +5374,40 @@
 		  mother	==ucs-itaiji-002
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji002-2"))
+  (make-charset '=>ucs-itaiji-002@iwds-1
+		"uXXXX-itaiji-002's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-002))
+  (make-charset '=>ucs-bmp-itaiji-002@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-002 in BMP"
+		'(long-name	"=>ucs-itaiji-002@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-002@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '=>ucs-sip-itaiji-002@iwds-1
+		"IWDS-1 abstract characters of uXXXX-itaiji-002 in SIP"
+		'(long-name	"=>ucs-itaiji-002@iwds-1 in SIP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-002@iwds-1
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
 
   (make-charset '=ucs-itaiji-003
 		"uXXXX-itaiji-003 glyphs of GlyphWiki"
@@ -4824,7 +5433,7 @@
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji003-0"))
   (make-charset '=ucs-sip-itaiji-003
-		"uXXXX-itaiji-003 glyph-images in SIP"
+		"uXXXX-itaiji-003 glyphs in SIP"
 		'(long-name	"UCS-SIP-itaiji-003"
 		  chars		256
 		  dimension	2
@@ -4846,7 +5455,7 @@
 		  mother	=ucs-itaiji-003))
   (make-charset '=>ucs-bmp-itaiji-003
 		"uXXXX-itaiji-003's abstract characters in BMP"
-		'(long-name	"UCS-BMP-itaiji-003 characters"
+		'(long-name	"UCS-BMP-itaiji-003 abstract characters"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -4857,6 +5466,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji003-0"))
+  (make-charset '=>ucs-sip-itaiji-003
+		"uXXXX-itaiji-003's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-003 abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
   (make-charset '==ucs-itaiji-003
 		"Abstract glyph-forms corresponding with uXXXX-itaiji-003 of GlyphWiki"
 		'(long-name	"UCS-itaiji-003"
@@ -4869,7 +5489,7 @@
 		  mother	=ucs-itaiji-003))
   (make-charset '==ucs-bmp-itaiji-003
 		"uXXXX-itaiji-003's abstract glyph-forms in BMP"
-		'(long-name	"UCS-BMP-itaiji-003 characters"
+		'(long-name	"UCS-BMP-itaiji-003 glyph-forms"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -4891,6 +5511,40 @@
 		  mother	==ucs-itaiji-003
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji003-2"))
+  (make-charset '=>ucs-itaiji-003@iwds-1
+		"uXXXX-itaiji-003's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-003))
+  (make-charset '=>ucs-bmp-itaiji-003@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-003 in BMP"
+		'(long-name	"=>ucs-itaiji-003@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-003@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '=>ucs-sip-itaiji-003@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-003 in SIP"
+		'(long-name	"=>ucs-itaiji-003@iwds-1 in SIP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-003@iwds-1
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
 
   (make-charset '=ucs-itaiji-004
 		"uXXXX-itaiji-004 glyphs of GlyphWiki"
@@ -5018,6 +5672,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=>ucs-sip-itaiji-005
+		"uXXXX-itaiji-005's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
   (make-charset '==ucs-itaiji-005
 		"Abstract glyph-forms corresponding with uXXXX-itaiji-005 of GlyphWiki"
 		'(long-name	"UCS-itaiji-005"
@@ -5053,7 +5718,7 @@
                   ;; =>iso-ir	177
 		  mother	=ucs))
   (make-charset '=ucs-bmp-itaiji-006
-		"uXXXX-itaiji-006 glyph-images in BMP"
+		"uXXXX-itaiji-006 glyphs in BMP"
 		'(long-name	"UCS-BMP-itaiji-006"
 		  chars		256
 		  dimension	2
@@ -5065,6 +5730,40 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=ucs-sip-itaiji-006
+		"uXXXX-itaiji-006 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-006"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji006-2"))
+  (make-charset '==ucs-itaiji-006
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-006 of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006))
+  (make-charset '==ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-006 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
   (make-charset '=>ucs-itaiji-006
 		"Abstract characters corresponding with uXXXX-itaiji-006 of GlyphWiki"
 		'(long-name	"UCS-itaiji-006"
@@ -5088,6 +5787,40 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=>ucs-sip-itaiji-006
+		"uXXXX-itaiji-006's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-006 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji006-2"))
+  (make-charset '=>ucs-itaiji-006@iwds-1
+		"uXXXX-itaiji-006's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-006))
+  (make-charset '=>ucs-bmp-itaiji-006@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-006 in BMP"
+		'(long-name	"=>ucs-itaiji-006@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-006@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
 
   (make-charset '=ucs-itaiji-007
 		"uXXXX-itaiji-007 glyphs of GlyphWiki"
@@ -5181,6 +5914,51 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji008-0"))
+  (make-charset '=ucs-sip-itaiji-008
+		"uXXXX-itaiji-008 abstract glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-008"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-008
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji008-2"))
+  (make-charset '=>ucs-itaiji-008
+		"Abstract characters corresponding with uXXXX-itaiji-008 of GlyphWiki"
+		'(long-name	"UCS-itaiji-008 characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-008
+		"uXXXX-itaiji-008's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-008 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-008
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji008-0"))
+  (make-charset '=>ucs-sip-itaiji-008
+		"uXXXX-itaiji-008's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-008 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-008
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji008-2"))
 
   (make-charset '=ucs-itaiji-009
 		"uXXXX-itaiji-009 glyphs of GlyphWiki"
@@ -5205,6 +5983,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji009-0"))
+  (make-charset '=ucs-sip-itaiji-009
+		"uXXXX-itaiji-009 abstract glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-009"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-009
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji009-2"))
   (make-charset '=>ucs-itaiji-009
 		"Abstract characters corresponding with uXXXX-itaiji-009 of GlyphWiki"
 		'(long-name	"UCS-itaiji-009"
@@ -5252,6 +6041,29 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji010-0"))
+  (make-charset '=>ucs-itaiji-010
+		"Abstract characters corresponding with uXXXX-itaiji-010 of GlyphWiki"
+		'(long-name	"UCS-itaiji-010"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-010
+		"uXXXX-itaiji-010's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-010 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji010-0"))
 
   (make-charset '=ucs-itaiji-011
 		"uXXXX-itaiji-011 glyphs of GlyphWiki"
@@ -5287,6 +6099,135 @@
 		  mother	=ucs-itaiji-011
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji011-2"))
+  (make-charset '=>ucs-itaiji-011
+		"Abstract characters corresponding with uXXXX-itaiji-011 of GlyphWiki"
+		'(long-name	"UCS-itaiji-011"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-011
+		"uXXXX-itaiji-011's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-011 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-011
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji011-0"))
+
+  (make-charset '=ucs-itaiji-012
+		"uXXXX-itaiji-012 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-012"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-012
+		"uXXXX-itaiji-012 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-012"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-012
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji012-0"))
+  (make-charset '=ucs-sip-itaiji-012
+		"uXXXX-itaiji-012 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-012"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-012
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji012-2"))
+
+  (make-charset '=ucs-itaiji-014
+		"uXXXX-itaiji-014 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-014"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-014
+		"uXXXX-itaiji-014 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-014"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-014
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji014-0"))
+  (make-charset '=>ucs-itaiji-014
+		"Abstract characters corresponding with uXXXX-itaiji-014 of GlyphWiki"
+		'(long-name	"UCS-itaiji-014"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-014
+		"uXXXX-itaiji-014's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-014 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-014
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji014-0"))
+
+  (make-charset '=ucs-itaiji-016
+		"uXXXX-itaiji-016 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-016"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-016
+		"uXXXX-itaiji-016 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-016"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-016
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji016-0"))
 
   (make-charset '=ucs-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
@@ -5451,7 +6392,7 @@
 	       registry "-ja-.*-ucs-0"
 	       mother =ucs@JP/hanazono
 	       min-code #x2E00
-               max-code #x9FCC
+               max-code #x9FFC
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -5470,6 +6411,22 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>>ucs-bmp-cjk@unicode
+   "Unicode representative detailed-glyphs of CJK Unified Ideographs in BMP"
+   '(long-name "Unicode-BMP-CJK detailed-glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother =>>ucs@unicode
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=+>ucs-bmp-cjk@unicode
    "Unicode representative characters of CJK Unified Ideographs in BMP"
    '(long-name "Unicode-BMP-CJK unified abstract glyphs"
@@ -5547,6 +6504,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@iwds-1/normalized
+   "CJK Characters in BMP for IWDS-1 abstract characters."
+   '(long-name "CJK in BMP@iwds-1/normalized"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@iwds-1/normalized
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '==>ucs-bmp-cjk@bucs
    "CJK Characters in BMP of BUCS"
    '(long-name "BUCS-BMP-CJK"
@@ -5699,6 +6671,45 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (make-charset
+   '=ucs-sip@gb
+   "UCS G-source glyphs of UCS SIP"
+   '(long-name "u2XXXX-g glyphs of UCS"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ucs00\\.g-2$"
+	       mother =ucs@gb
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=ucs-tip
+   "Tertiary Ideographic Plane of UCS"
+   '(long-name "UCS TUP"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "\\(iso10646\\|ucs00\\)-3$"
+	       mother ucs
+	       min-code #x30000 max-code #x3134A
+	       code-offset #x30000))
+  (make-charset
+   '=ucs-tip@JP/hanazono
+   "Hanazono glyphs of UCS TIP"
+   '(long-name "Hanazono TIP glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-3$"
+	       mother =ucs@JP/hanazono
+	       min-code #x30000 max-code #x3134A
+	       code-offset #x30000))
+  (make-charset
    '=>ucs-sip@iwds-1
    "CJK Characters in SIP based on IWDS-1."
    '(long-name "CJK in SIP@IWDS-1"
@@ -5725,6 +6736,19 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (make-charset
+   '=>ucs-tip@cognate
+   "CJK Characters in TIP for abstract characters based on cognate."
+   '(long-name "CJK in TIP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-3$"
+	       mother =>ucs@cognate
+	       min-code #x30000 max-code #x3FFFF
+	       code-offset #x30000))
+  (make-charset
    '=>ucs-sip@component
    "CJK Characters in SIP for IWDS-1 abstract components."
    '(long-name "CJK in SIP@component"
@@ -5738,6 +6762,32 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (make-charset
+   '=>ucs-tip@component
+   "CJK Characters in TIP for IWDS-1 abstract components."
+   '(long-name "CJK in TIP@component"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-3$"
+	       mother =>ucs@component
+	       min-code #x30000 max-code #x3134A
+	       code-offset #x30000))
+  (make-charset
+   '==>ucs-sip@esu
+   "UCS glyphs in UCS SIP of ESU"
+   '(long-name "ESU SIP"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother ==>ucs@esu
+	       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"
@@ -5776,6 +6826,19 @@
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
   (make-charset
+   '==ucs-tip@JP/hanazono
+   "Hanazono glyphs-forms of UCS TIP"
+   '(long-name "Hanazono TIP glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-3$"
+	       mother ==ucs@JP/hanazono
+	       min-code #x30000 max-code #x3134A
+	       code-offset #x30000))
+  (make-charset
    '===ucs-sip@iso
    "ISO representative glyph-images of ISO/IEC 10646 Plane 2"
    '(long-name "SIP rep-glyph-images"