X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=df892eb2e9e00e3b050a6c9eab4400482b39eb13;hb=e987931b8b056ba49a418a9214dda624dc28462d;hp=67015c6bb741b1632912583611b13e578a2b73d4;hpb=5b4c6d73c6b656bb4ce58c5563c2c3b2ecf76d3f;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 67015c6..df892eb 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
+;;   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
@@ -2192,6 +2282,17 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.TKMF-1$"))
+  (make-charset
+   '==hanyo-denshi/tk/mf-01
+   "font encoding for TK (TouKi) characters"
+   `(long-name "Han'you-Denshi/TK font encoding"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =hanyo-denshi/tk/mf-01
+	       registry "HanyoDenshi\\.TKMF-1$"))
 
   (make-charset
    '===mj
@@ -2748,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"
@@ -2958,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
@@ -3046,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
@@ -3110,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
@@ -3238,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
@@ -3254,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
@@ -3262,6 +3486,22 @@
 		  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 '=cbeta "CBETA private characters"
 		'(long-name	"CBETA PUA"
@@ -3415,6 +3655,33 @@
 		  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
   ;;  "ZhongHua-ZiHai glyph-images"
@@ -3468,7 +3735,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
@@ -3479,7 +3746,7 @@
 		  mother        =big5-cdp))
 
   (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
@@ -3490,7 +3757,7 @@
 		  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
@@ -3500,6 +3767,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"
@@ -3546,6 +3824,17 @@
 		  mother        =big5-cdp))
   (define-charset-alias '=big5-cdp-var-5 '=big5-cdp-var-005)
 
+  (make-charset '=big5-cdp-var-010
+		"Big5-CDP-var-010 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-010"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-10$"
+		  mother        =big5-cdp))
+
   (make-charset '==>ucs@bucs
 		"Basic Subset of Coded Character Sets (BUCS)"
 		'(long-name	"BUCS abstract characters"
@@ -3556,6 +3845,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."
@@ -3577,9 +3876,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@component
-		"UCS encoding for abstract components of IWDS-1."
-		'(long-name	"UCS for IWDS-1 abstract components"
+  (make-charset '=>ucs@cognate
+		"UCS abstract characters based on cognate."
+		'(long-name	"UCS based on cognate"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3588,9 +3887,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@hanyo-denshi
-		"UCS abstract characters based on Han'you-Denshi collection."
-		'(long-name	"UCS base characters of Han'you-Denshi"
+  (make-charset '=>ucs@component
+		"UCS encoding for abstract components of IWDS-1."
+		'(long-name	"UCS for IWDS-1 abstract components"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3599,6 +3898,17 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
+  ;; (make-charset '=>ucs@hanyo-denshi
+  ;;               "UCS abstract characters based on Han'you-Denshi collection."
+  ;;               '(long-name     "UCS base characters of Han'you-Denshi"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =ucs))
+
   (make-charset '=>ucs@iso
 		"Abstract characters of ISO/IEC 10646 representatives"
 		'(long-name	"UCS characters for ISO"
@@ -3976,6 +4286,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
+		  ;; mother	=>ucs@iwds-1
 		  mother	=ucs@cns
 		  ;; mother	=>>ucs@cns
 		  ))
@@ -4366,7 +4677,7 @@
 		  mother	=ucs-var-002))
   (make-charset '==ucs-bmp-var-002
 		"uXXXX-var-002's abstract glyph-forms in BMP"
-		'(long-name	"UCS-BMP-var-002 characters"
+		'(long-name	"UCS-BMP-var-002 glyph-forms"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -4377,6 +4688,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var002-0"))
+  (make-charset '==ucs-sip-var-002
+		"uXXXX-var-002's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-var-002 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-var-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var002-2"))
 
   (make-charset '=ucs-var-003
 		"uXXXX-var-003 glyph-images of GlyphWiki"
@@ -4412,6 +4734,30 @@
 		  mother	=ucs-var-003
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var003-2"))
+  (make-charset '=+>ucs-var-003
+		"uXXXX-var-003's unified glyphs of GlyphWiki"
+		'(long-name	"UCS-var-003 unified glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-003))
+  (make-charset '=+>ucs-bmp-var-003
+		"uXXXX-var-003's unified glyphs in BMP"
+		'(long-name	"UCS-BMP-var-003 unified glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=+>ucs-var-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var003-0"))
+
   (make-charset '=ucs-var-004
 		"uXXXX-var-004 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-004"
@@ -4446,6 +4792,7 @@
 		  mother	=ucs-var-004
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var004-2"))
+
   (make-charset '=ucs-var-005
 		"uXXXX-var-005 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-005"
@@ -4469,6 +4816,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"
@@ -4618,6 +4977,74 @@
 		  mother	=>ucs-itaiji-001
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '==ucs-itaiji-001
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-001 of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-001))
+  (make-charset '==ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-001
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '==ucs-sip-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-itaiji-001@iwds-1
+		"uXXXX-itaiji-001's abstract characters based on IWDS-1"
+		'(long-name	"IWDS-1 abstract characters of UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001))
+  (make-charset '=>ucs-bmp-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in BMP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in BMP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=>ucs-sip-itaiji-001@iwds-1
+		"IWDS-1 abstract characters of UCS-itaiji-001 in SIP"
+		'(long-name	"=>ucs-itaiji-001@iwds-1 in SIP"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001@iwds-1
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
 
   (make-charset '=ucs-itaiji-002
 		"uXXXX-itaiji-002 glyphs of GlyphWiki"
@@ -4746,7 +5173,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
@@ -4768,7 +5195,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
@@ -4779,6 +5206,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"
@@ -4791,7 +5229,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
@@ -4906,6 +5344,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=ucs-sip-itaiji-005
+		"uXXXX-itaiji-005 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
   (make-charset '=>ucs-itaiji-005
 		"Abstract characters corresponding with uXXXX-itaiji-005 of GlyphWiki"
 		'(long-name	"UCS-itaiji-005"
@@ -4929,6 +5378,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"
@@ -4964,7 +5424,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
@@ -4976,6 +5436,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"
@@ -4999,9 +5493,20 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji006-0"))
+  (make-charset '=>ucs-sip-itaiji-006
+		"uXXXX-itaiji-006's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-006 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-006
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji006-2"))
 
-  (make-charset '=>ucs-itaiji-007
-		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
+  (make-charset '=ucs-itaiji-007
+		"uXXXX-itaiji-007 glyphs of GlyphWiki"
 		'(long-name	"UCS-itaiji-007"
 		  chars		256
 		  dimension	3
@@ -5010,32 +5515,32 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=>ucs-bmp-itaiji-007
-		"uXXXX-itaiji-007's abstract characters in BMP"
-		'(long-name	"UCS-BMP-itaiji-007 characters"
+  (make-charset '=ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-007"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=>ucs-itaiji-007
+		  mother	=ucs-itaiji-007
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji007-0"))
-  (make-charset '=>ucs-sip-itaiji-007
-		"uXXXX-itaiji-007 characters in SIP"
+  (make-charset '=ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in SIP"
 		'(long-name	"UCS-SIP-itaiji-007"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=>ucs-itaiji-007
+		  mother	=ucs-itaiji-007
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji007-2"))
-  (make-charset '=ucs-itaiji-007
-		"uXXXX-itaiji-007 glyphs of GlyphWiki"
+  (make-charset '=>ucs-itaiji-007
+		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
 		'(long-name	"UCS-itaiji-007"
 		  chars		256
 		  dimension	3
@@ -5044,28 +5549,28 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-007
-		"uXXXX-itaiji-007 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-007"
+  (make-charset '=>ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-007 characters"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-007
+		  mother	=>ucs-itaiji-007
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji007-0"))
-  (make-charset '=ucs-sip-itaiji-007
-		"uXXXX-itaiji-007 glyph-images in SIP"
+  (make-charset '=>ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 characters in SIP"
 		'(long-name	"UCS-SIP-itaiji-007"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs-itaiji-007
+		  mother	=>ucs-itaiji-007
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji007-2"))
 
@@ -5092,6 +5597,40 @@
 		  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-itaiji-009
 		"uXXXX-itaiji-009 glyphs of GlyphWiki"
@@ -5116,6 +5655,29 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji009-0"))
+  (make-charset '=>ucs-itaiji-009
+		"Abstract characters corresponding with uXXXX-itaiji-009 of GlyphWiki"
+		'(long-name	"UCS-itaiji-009"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-009
+		"uXXXX-itaiji-009's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-009 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
 
   (make-charset '=ucs-itaiji-010
 		"uXXXX-itaiji-010 glyphs of GlyphWiki"
@@ -5176,6 +5738,30 @@
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji011-2"))
 
+  (make-charset '=ucs-itaiji-012
+		"uXXXX-itaiji-012 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-012"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-012
+		"uXXXX-itaiji-012 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-012"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-012
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji012-0"))
+
   (make-charset '=ucs-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
 		'(long-name	"UCS-itaiji-084"
@@ -5339,7 +5925,7 @@
 	       registry "-ja-.*-ucs-0"
 	       mother =ucs@JP/hanazono
 	       min-code #x2E00
-               max-code #x9FCC
+               max-code #x9FEA
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
@@ -5358,6 +5944,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"
@@ -5390,6 +5992,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@cognate
+   "CJK Characters in BMP for abstract characters based on cognate."
+   '(long-name "CJK in BMP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@cognate
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=>ucs-bmp-cjk@component
    "CJK Characters in BMP for IWDS-1 abstract components."
    '(long-name "CJK in BMP@component"
@@ -5585,6 +6202,19 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (make-charset
+   '=>ucs-sip@cognate
+   "CJK Characters in SIP for abstract characters based on cognate."
+   '(long-name "CJK in SIP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@cognate
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
    '=>ucs-sip@component
    "CJK Characters in SIP for IWDS-1 abstract components."
    '(long-name "CJK in SIP@component"
@@ -5598,6 +6228,19 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (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"