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

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 1ed38fe..67015c6 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, 2016 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -1686,6 +1686,19 @@
 	       direction l2r
 	       mother =mj
 	       ))
+  (make-charset
+   '=>mj-0
+   "Moji-Jouhou-Kiban plane 0"
+   '(long-name "Moji-Jouhou-Kiban-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother =>mj
+	       min-code	0
+	       max-code	#xFFFF))
 
   (make-charset
    '=hanyo-denshi/ja
@@ -2513,6 +2526,16 @@
 	       registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
   (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
   (make-charset
+   '==gt-pj-k1
+   "Ideographic parts of GT (pseudo JIS encoding) part 1"
+   '(long-name "GT K1"
+	       chars 94
+	       dimension 2
+	       columns 2
+	       graphic 0
+	       direction l2r
+	       registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
+  (make-charset
    '=gt-pj-k2
    "Ideographic parts of GT (pseudo JIS encoding) part 2"
    '(long-name "GT K2"
@@ -2523,6 +2546,16 @@
 	       direction l2r
 	       registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
   (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
+  (make-charset
+   '==gt-pj-k2
+   "Ideographic parts of GT (pseudo JIS encoding) part 2"
+   '(long-name "GT K2"
+	       chars 94
+	       dimension 2
+	       columns 2
+	       graphic 0
+	       direction l2r
+	       registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
 
   (make-charset '=daikanwa
 		"Daikanwa dictionary (unchanged part)"
@@ -3370,9 +3403,9 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	==ruimoku-v6))
-  (make-charset '=>>ruimoku-v6
-		"RUIMOKU Version.6 glyphs"
-		'(long-name	"RUI6 glyphs"
+  (make-charset '=>ruimoku-v6
+		"RUIMOKU Version.6 abstract characters."
+		'(long-name	"RUI6 characters."
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -3380,6 +3413,7 @@
 		  direction	l2r
 		  registry	"rui6-0"
 		  mother	=ruimoku-v6))
+  (define-charset-alias '=>>ruimoku-v6 '=>ruimoku-v6)
 
   ;; (make-charset
   ;;  '=zihai
@@ -3402,9 +3436,84 @@
   ;;              direction l2r
   ;;              registry "zihai\\.cp-17$"))
 
-  (make-charset '=big5-cdp-var-3
-		"Big5-CDP-var-3 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-3"
+  (make-charset '=big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp))
+  (make-charset '=>big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 abstract characters of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp-itaiji-001))
+  (make-charset '==big5-cdp-itaiji-001
+		"Big5-CDP-itaiji-001 abstract glyph-image of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-1$"
+		  mother        =big5-cdp-itaiji-001))
+
+  (make-charset '=big5-cdp-itaiji-002
+		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-002"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-2$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-itaiji-003
+		"Big5-CDP-itaiji-001 glyphs of GlyphWiki"
+		'(long-name     "Big5-CDP-itaiji-003"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.itaiji-3$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-001
+		"Big5-CDP-var-001 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-001"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-1$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-002
+		"Big5-CDP-var-002 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-002"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-2$"
+		  mother        =big5-cdp))
+
+  (make-charset '=big5-cdp-var-003
+		"Big5-CDP-var-003 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-003"
 		  chars         256
 		  dimension     2
 		  columns       2
@@ -3412,10 +3521,22 @@
 		  direction     l2r
 		  registry      "cdp\\.var-3$"
 		  mother        =big5-cdp))
+  (define-charset-alias '=big5-cdp-var-3 '=big5-cdp-var-003)
+
+  (make-charset '=big5-cdp-var-004
+		"Big5-CDP-var-004 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-004"
+		  chars         256
+		  dimension     2
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  registry      "cdp\\.var-4$"
+		  mother        =big5-cdp))
 
-  (make-charset '=big5-cdp-var-5
-		"Big5-CDP-var-5 glyph-images of GlyphWiki"
-		'(long-name     "Big5-CDP-var-5"
+  (make-charset '=big5-cdp-var-005
+		"Big5-CDP-var-005 glyph-images of GlyphWiki"
+		'(long-name     "Big5-CDP-var-005"
 		  chars         256
 		  dimension     2
 		  columns       2
@@ -3423,6 +3544,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)"
@@ -3507,6 +3629,26 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=>ucs@unicode))
+  (make-charset '=>ucs@jis/2000
+		"ISO/IEC 10646 for JIS X 0213:2000"
+		'(long-name	"UCS for JIS:2000"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@jis))
+  (make-charset '=>ucs@jis/2004
+		"ISO/IEC 10646 for JIS X 0213:2004"
+		'(long-name	"UCS for JIS:2004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@jis))
   (make-charset '=>ucs@ks
 		"UCS representative characters for Korean Standards"
 		'(long-name	"UCS characters for KS"
@@ -4177,6 +4319,7 @@
 		  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"
@@ -4211,6 +4354,30 @@
 		  mother	=ucs-var-002
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var002-2"))
+  (make-charset '==ucs-var-002
+		"Abstract glyph-forms corresponding with uXXXX-var-002 of GlyphWiki"
+		'(long-name	"UCS-var-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-002))
+  (make-charset '==ucs-bmp-var-002
+		"uXXXX-var-002's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-var-002 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-var-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var002-0"))
+
   (make-charset '=ucs-var-003
 		"uXXXX-var-003 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-003"
@@ -4268,9 +4435,20 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var004-0"))
-  (make-charset '=ucs-itaiji-001
-		"uXXXX-itaiji-001 glyphs of GlyphWiki"
-		'(long-name	"UCS-itaiji-001"
+  (make-charset '=ucs-sip-var-004
+		"uXXXX-var-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-var-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var004-2"))
+  (make-charset '=ucs-var-005
+		"uXXXX-var-005 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-005"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4278,33 +4456,22 @@
 		  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"
+  (make-charset '=ucs-bmp-var-005
+		"uXXXX-var-005 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-005"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-001
+		  mother	=ucs-var-005
 		  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"
+		  registry "ucs\\.var005-0"))
+  (make-charset '=ucs-var-006
+		"uXXXX-var-006 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-006"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4312,33 +4479,33 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-002
-		"uXXXX-itaiji-002 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-002"
+  (make-charset '=ucs-bmp-var-006
+		"uXXXX-var-006 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-006"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-002
+		  mother	=ucs-var-006
 		  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"
+		  registry "ucs\\.var006-0"))
+  (make-charset '=ucs-sip-var-006
+		"uXXXX-var-006 glyph-images in SIP"
+		'(long-name	"UCS-SIP-var-006"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs-itaiji-002
+		  mother	=ucs-var-006
 		  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"
+		  registry "ucs00\\.var006-2"))
+  (make-charset '=ucs-var-008
+		"uXXXX-var-008 glyph-images of GlyphWiki"
+		'(long-name	"UCS-var-008"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4346,22 +4513,22 @@
 		  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"
+  (make-charset '=ucs-bmp-var-008
+		"uXXXX-var-008 glyph-images in BMP"
+		'(long-name	"UCS-BMP-var-008"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-003
+		  mother	=ucs-var-008
 		  min-code #x2E00
 		  max-code #x9FCC
-		  registry "ucs\\.itaiji003-0"))
-  (make-charset '=ucs-itaiji-004
-		"uXXXX-itaiji-004 glyphs of GlyphWiki"
-		'(long-name	"UCS-itaiji-004"
+		  registry "ucs\\.var008-0"))
+  (make-charset '=ucs-var-010
+		"uXXXX-var-010 glyph-forms of GlyphWiki"
+		'(long-name	"UCS-var-010"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4369,22 +4536,23 @@
 		  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"
+  (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-itaiji-004
+		  mother	=ucs-var-010
 		  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"
+		  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
@@ -4392,22 +4560,33 @@
 		  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"
+  (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-005
+		  mother	=ucs-itaiji-001
 		  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"
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=ucs-sip-itaiji-001
+		"uXXXX-itaiji-001 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '=>ucs-itaiji-001
+		"Abstract characters corresponding with uXXXX-itaiji-001 of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4415,22 +4594,34 @@
 		  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"
+  (make-charset '=>ucs-bmp-itaiji-001
+		"uXXXX-itaiji-001's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-001 characters"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-006
+		  mother	=>ucs-itaiji-001
 		  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"
+		  registry "ucs\\.itaiji001-0"))
+  (make-charset '=>ucs-sip-itaiji-001
+		"uXXXX-itaiji-001 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
+
+  (make-charset '=ucs-itaiji-002
+		"uXXXX-itaiji-002 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -4438,44 +4629,578 @@
 		  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"
+  (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-008
+		  mother	=ucs-itaiji-002
 		  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"
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '=ucs-sip-itaiji-002
+		"uXXXX-itaiji-002 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+  (make-charset '=>ucs-itaiji-002
+		"Abstract characters corresponding with uXXXX-itaiji-002 of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-084
-		"uXXXX-itaiji-084 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-084"
+		  mother	=ucs-itaiji-002))
+  (make-charset '=>ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-002 characters"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-084
+		  mother	=>ucs-itaiji-002
 		  min-code #x2E00
 		  max-code #x9FCC
-		  registry "ucs\\.itaiji084-0"))
-
-  (make-charset
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '=>ucs-sip-itaiji-002
+		"uXXXX-itaiji-002 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+  (make-charset '==ucs-itaiji-002
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-002 of GlyphWiki"
+		'(long-name	"UCS-itaiji-002"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-002))
+  (make-charset '==ucs-bmp-itaiji-002
+		"uXXXX-itaiji-002's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-002 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-002
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji002-0"))
+  (make-charset '==ucs-sip-itaiji-002
+		"uXXXX-itaiji-002's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-002"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji002-2"))
+
+  (make-charset '=ucs-itaiji-003
+		"uXXXX-itaiji-003 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '=ucs-sip-itaiji-003
+		"uXXXX-itaiji-003 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-003
+		"Abstract characters corresponding with uXXXX-itaiji-003 of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003))
+  (make-charset '=>ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-003 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '==ucs-itaiji-003
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-003 of GlyphWiki"
+		'(long-name	"UCS-itaiji-003"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-003))
+  (make-charset '==ucs-bmp-itaiji-003
+		"uXXXX-itaiji-003's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-003 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji003-0"))
+  (make-charset '==ucs-sip-itaiji-003
+		"uXXXX-itaiji-003's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-003"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-003
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji003-2"))
+
+  (make-charset '=ucs-itaiji-004
+		"uXXXX-itaiji-004 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
+  (make-charset '=>ucs-itaiji-004
+		"Abstract characters corresponding with uXXXX-itaiji-004 of GlyphWiki"
+		'(long-name	"UCS-itaiji-004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004))
+  (make-charset '=>ucs-bmp-itaiji-004
+		"uXXXX-itaiji-004's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-004 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=>ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
+
+  (make-charset '=ucs-itaiji-005
+		"uXXXX-itaiji-005 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=>ucs-itaiji-005
+		"Abstract characters corresponding with uXXXX-itaiji-005 of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+  (make-charset '==ucs-itaiji-005
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-005 of GlyphWiki"
+		'(long-name	"UCS-itaiji-005"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-005))
+  (make-charset '==ucs-bmp-itaiji-005
+		"uXXXX-itaiji-005's abstract glyph-forms in BMP"
+		'(long-name	"UCS-BMP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	==ucs-itaiji-005
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji005-0"))
+
+  (make-charset '=ucs-itaiji-006
+		"uXXXX-itaiji-006 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006 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-006
+		"Abstract characters corresponding with uXXXX-itaiji-006 of GlyphWiki"
+		'(long-name	"UCS-itaiji-006"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-006))
+  (make-charset '=>ucs-bmp-itaiji-006
+		"uXXXX-itaiji-006's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-006 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-006
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji006-0"))
+
+  (make-charset '=>ucs-itaiji-007
+		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
+		'(long-name	"UCS-itaiji-007"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-007 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji007-0"))
+  (make-charset '=>ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-007
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji007-2"))
+  (make-charset '=ucs-itaiji-007
+		"uXXXX-itaiji-007 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-007"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji007-0"))
+  (make-charset '=ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-007
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji007-2"))
+
+  (make-charset '=ucs-itaiji-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-009
+		"uXXXX-itaiji-009 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-009"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-009
+		"uXXXX-itaiji-009 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-009"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
+
+  (make-charset '=ucs-itaiji-010
+		"uXXXX-itaiji-010 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-010"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-010
+		"uXXXX-itaiji-010 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-010"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji010-0"))
+
+  (make-charset '=ucs-itaiji-011
+		"uXXXX-itaiji-011 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-011"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-011
+		"uXXXX-itaiji-011 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-011"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-011
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji011-0"))
+  (make-charset '=ucs-sip-itaiji-011
+		"uXXXX-itaiji-011 glyphs in SIP"
+		'(long-name	"UCS-SIP-itaiji-011"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-011
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji011-2"))
+
+  (make-charset '=ucs-itaiji-084
+		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
+		'(long-name	"UCS-itaiji-084"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-084
+		"uXXXX-itaiji-084 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-084"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-084
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji084-0"))
+
+  (make-charset
    '=ucs-radicals
    "CJK Radicals of UCS"
    '(long-name "UCS-Radicals"
@@ -4680,6 +5405,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@iwds-1
+   "CJK Characters in BMP for IWDS-1 abstract characters."
+   '(long-name "CJK in BMP@iwds-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@iwds-1
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '==>ucs-bmp-cjk@bucs
    "CJK Characters in BMP of BUCS"
    '(long-name "BUCS-BMP-CJK"
@@ -4752,6 +5492,20 @@
 	       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"
@@ -4780,8 +5534,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
@@ -4805,6 +5559,58 @@
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
   (make-charset
+   '=ucs-sip@JP/hanazono
+   "Hanazono glyphs of UCS SIP"
+   '(long-name "Hanazono SIP glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =ucs@JP/hanazono
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@iwds-1
+   "CJK Characters in SIP based on IWDS-1."
+   '(long-name "CJK in SIP@IWDS-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@iwds-1
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@component
+   "CJK Characters in SIP for IWDS-1 abstract components."
+   '(long-name "CJK in SIP@component"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@component
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '==ucs-sip@JP/hanazono
+   "Hanazono glyphs-forms of UCS SIP"
+   '(long-name "Hanazono SIP glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother ==ucs@JP/hanazono
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
    '==ucs-sip@iso
    "ISO representative abstract-glyph-images of ISO/IEC 10646 Plane 2"
    '(long-name "SIP abstract glyph-images"