X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=987ed8c4a1dad2e4ca3e76fbdb331399aecb70a5;hb=63e48eecfef35f22c8812a3fc05ce0c28ce21bac;hp=3da1b9decc90050088347af548efb8e99489c580;hpb=a2364ec90a807722a873df08628797ba827f9a4c;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 3da1b9d..987ed8c 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 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -38,9 +38,13 @@
 	       graphic 2
 	       direction l2r
 	       registry "AdobeJapan1-[0-6]$"
-	       min-code	,(lsh #x6300 16)
-	       max-code	,(+ (lsh #x6300 16) 23057)
-	       code-offset	,(lsh #x6300 16)))
+	       min-code	    #xE10000
+	       max-code	,(+ #xE10000 23057)
+	       code-offset  #xE10000
+               ;; min-code	,(lsh #x6300 16)
+               ;; max-code	,(+ (lsh #x6300 16) 23057)
+               ;; code-offset	,(lsh #x6300 16)
+	       ))
   (make-charset
    '=adobe-japan1-0
    "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
@@ -136,8 +140,8 @@
 
   (make-charset
    '==adobe-japan1-0
-   "Adobe-Japan1-0 detailed glyph-images."
-   '(long-name "Adobe-Japan1-0 glyph-images"
+   "Adobe-Japan1-0 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-0 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -147,8 +151,8 @@
 	       registry "AdobeJapan1-0$"))
   (make-charset
    '==adobe-japan1-1
-   "Adobe-Japan1-1 detailed glyph-images."
-   '(long-name "Adobe-Japan1-1 glyph-images"
+   "Adobe-Japan1-1 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-1 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -158,8 +162,8 @@
 	       registry "AdobeJapan1-1$"))
   (make-charset
    '==adobe-japan1-2
-   "Adobe-Japan1-2 detailed glyph-images."
-   '(long-name "Adobe-Japan1-2 glyph-images"
+   "Adobe-Japan1-2 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-2 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -169,8 +173,8 @@
 	       registry "AdobeJapan1-2$"))
   (make-charset
    '==adobe-japan1-3
-   "Adobe-Japan1-3 detailed glyph-images."
-   '(long-name "Adobe-Japan1-3 glyph-images"
+   "Adobe-Japan1-3 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-3 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -180,8 +184,8 @@
 	       registry "AdobeJapan1-3$"))
   (make-charset
    '==adobe-japan1-4
-   "Adobe-Japan1-4 detailed glyph-images."
-   '(long-name "Adobe-Japan1-4 glyph-images"
+   "Adobe-Japan1-4 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-4 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -191,8 +195,8 @@
 	       registry "AdobeJapan1-4$"))
   (make-charset
    '==adobe-japan1-5
-   "Adobe-Japan1-5 detailed glyph-images."
-   '(long-name "Adobe-Japan1-5 glyph-images"
+   "Adobe-Japan1-5 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-5 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -202,8 +206,8 @@
 	       registry "AdobeJapan1-5$"))
   (make-charset
    '==adobe-japan1-6
-   "Adobe-Japan1-6 detailed glyph-images."
-   '(long-name "Adobe-Japan1-6 glyph-images"
+   "Adobe-Japan1-6 abstract glyph-forms."
+   '(long-name "Adobe-Japan1-6 abstract glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -213,93 +217,95 @@
 	       registry "AdobeJapan1-6$"))
   (define-charset-alias '==adobe-japan1 '==adobe-japan1-6)
 
-  (define-charset-alias '=>>>adobe-japan1-0 '=adobe-japan1-0)
-  (define-charset-alias '=>>>adobe-japan1-1 '=adobe-japan1-1)
-  (define-charset-alias '=>>>adobe-japan1-2 '=adobe-japan1-2)
-  (define-charset-alias '=>>>adobe-japan1-3 '=adobe-japan1-3)
-  (define-charset-alias '=>>>adobe-japan1-4 '=adobe-japan1-4)
-  (define-charset-alias '=>>>adobe-japan1-5 '=adobe-japan1-5)
-  (define-charset-alias '=>>>adobe-japan1-6 '=adobe-japan1-6)
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-0
-  ;;  "Adobe-Japan1-0 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-0 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =adobe-japan1-0
-  ;;              registry "AdobeJapan1-0$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-1
-  ;;  "Adobe-Japan1-1 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-1 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-0
-  ;;              registry "AdobeJapan1-1$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-2
-  ;;  "Adobe-Japan1-2 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-2 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-1
-  ;;              registry "AdobeJapan1-2$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-3
-  ;;  "Adobe-Japan1-3 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-3 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-2
-  ;;              registry "AdobeJapan1-3$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-4
-  ;;  "Adobe-Japan1-4 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-4 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-3
-  ;;              registry "AdobeJapan1-4$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-5
-  ;;  "Adobe-Japan1-5 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-5 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-4
-  ;;              registry "AdobeJapan1-5$"))
-  ;; (make-charset
-  ;;  '=>>>adobe-japan1-6
-  ;;  "Adobe-Japan1-6 abstract glyph-forms"
-  ;;  '(long-name "Adobe-Japan1-6 abstract glyph-forms"
-  ;;              chars 256
-  ;;              dimension 2
-  ;;              columns 2
-  ;;              graphic 2
-  ;;              direction l2r
-  ;;              mother =>>>adobe-japan1-5
-  ;;              registry "AdobeJapan1-6$"))
+  (define-charset-alias '=>>>adobe-japan1-0 '==adobe-japan1-0)
+  (define-charset-alias '=>>>adobe-japan1-1 '==adobe-japan1-1)
+  (define-charset-alias '=>>>adobe-japan1-2 '==adobe-japan1-2)
+  (define-charset-alias '=>>>adobe-japan1-3 '==adobe-japan1-3)
+  (define-charset-alias '=>>>adobe-japan1-4 '==adobe-japan1-4)
+  (define-charset-alias '=>>>adobe-japan1-5 '==adobe-japan1-5)
+  (define-charset-alias '=>>>adobe-japan1-6 '==adobe-japan1-6)
   (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
 
   (make-charset
+   '===adobe-japan1-0
+   "Adobe-Japan1-0 detailed glyph-images."
+   '(long-name "Adobe-Japan1-0 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ==adobe-japan1-0
+	       registry "AdobeJapan1-0$"))
+  (make-charset
+   '===adobe-japan1-1
+   "Adobe-Japan1-1 detailed glyph-images."
+   '(long-name "Adobe-Japan1-1 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-0
+	       registry "AdobeJapan1-1$"))
+  (make-charset
+   '===adobe-japan1-2
+   "Adobe-Japan1-2 detailed glyph-images."
+   '(long-name "Adobe-Japan1-2 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-1
+	       registry "AdobeJapan1-2$"))
+  (make-charset
+   '===adobe-japan1-3
+   "Adobe-Japan1-3 detailed glyph-images."
+   '(long-name "Adobe-Japan1-3 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-2
+	       registry "AdobeJapan1-3$"))
+  (make-charset
+   '===adobe-japan1-4
+   "Adobe-Japan1-4 detailed glyph-images."
+   '(long-name "Adobe-Japan1-4 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-3
+	       registry "AdobeJapan1-4$"))
+  (make-charset
+   '===adobe-japan1-5
+   "Adobe-Japan1-5 detailed glyph-images."
+   '(long-name "Adobe-Japan1-5 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-4
+	       registry "AdobeJapan1-5$"))
+  (make-charset
+   '===adobe-japan1-6
+   "Adobe-Japan1-6 detailed glyph-images."
+   '(long-name "Adobe-Japan1-6 glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ===adobe-japan1-5
+	       registry "AdobeJapan1-6$"))
+  (define-charset-alias '===adobe-japan1 '===adobe-japan1-6)
+
+  (make-charset
    '=>>adobe-japan1-0
    "Adobe-Japan1-0 abstract glyphs"
    '(long-name "Adobe-Japan1-0 abstract glyphs"
@@ -308,7 +314,7 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       mother =>>>adobe-japan1
+	       mother =adobe-japan1
 	       registry "AdobeJapan1-0$"))
   (make-charset
    '=>>adobe-japan1-1
@@ -387,7 +393,7 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       mother =>>adobe-japan1
+	       mother =adobe-japan1
 	       registry "AdobeJapan1-0$"))
   (make-charset
    '=+>adobe-japan1-1
@@ -762,7 +768,7 @@
 
   (make-charset
    '==jis-x0208
-   "JIS X 0208 detailed representative glyph-images (unchanged part)."
+   "JIS X 0208 abstract glyph-forms (unchanged part)."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
@@ -772,7 +778,7 @@
 	      graphic 0))
   (make-charset
    '==jis-x0208@1978
-   "JIS X 0208:1978 detailed representative glyph-images."
+   "JIS X 0208:1978 abstract glyph-forms."
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
@@ -781,8 +787,54 @@
 	      ;; final ?@
 	      graphic 0))
   (make-charset
+   '==jis-x0208@1978/-4pr
+   "JIS X 0208:1978, 1st - 3rd impressions."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978
+	      =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      ;; partial t
+	      ))
+  (make-charset
+   '==jis-x0208@1978/1pr
+   "JIS X 0208:1978, 1st impression."
+   '(registry "jisx0208\\.1978"
+	      =>iso-ir 42
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978/-4pr
+	      ;; final ?@
+	      graphic 0))
+  (make-charset
+   '==jis-x0208@1978/1pr/fixed
+   "JIS X 0208:1978, correct glyph in the errata of 1st impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0208@1978/1pr
+	      =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '==jis-x0208@1978/2-pr
+   "JIS X 0208:1978, 2nd impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+              ;; mother =jis-x0208@1978/1er-pr
+	      mother ==jis-x0208@1978
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      ;; partial t
+	      ))
+    (make-charset
    '==jis-x0208@1983
-   "JIS X 0208:1983 detailed representative glyph-images."
+   "JIS X 0208:1983 abstract glyph-forms."
    '(registry "jisx0208\\.1983"
 	      dimension 2
 	      chars 94
@@ -791,7 +843,7 @@
 	      graphic 0))
   (make-charset
    '==jis-x0208@1990
-   "JIS X 0208:1990 detailed representative glyph-images."
+   "JIS X 0208:1990 abstract glyph-forms."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
@@ -802,31 +854,31 @@
 
   (make-charset
    '==jis-x0213-1
-   "JIS X 0213 Plain 1 detailed representative glyph-images (unchanged part)."
+   "JIS X 0213 Plain 1 abstract glyph-forms (unchanged part)"
    '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
 	      dimension 2
 	      chars 94
 	      mother =jis-x0213-1
 	      =>iso-ir 228
-              ;; final ?O
+	      ;; final ?O
 	      graphic 0
-              ;; partial t
+	      ;; partial t
 	      ))
   (make-charset
    '==jis-x0213-1@2000
-   "JIS X 0213:2000 Plain 1 detailed representative glyph-images."
+   "JIS X 0213:2000 Plain 1 abstract glyph-forms"
    '(registry "jisx0213\\(\\.2000\\)-1"
 	      dimension 2
 	      chars 94
 	      mother ==jis-x0213-1
 	      =>iso-ir 228
-              ;; final ?O
+	      ;; final ?O
 	      graphic 0
 	      ;; partial t
 	      ))
   (make-charset
    '==jis-x0213-1@2004
-   "JIS X 0213:2004 Plain 1 detailed representative glyph-images."
+   "JIS X 0213:2004 Plain 1 abstract glyph-forms"
    '(mother ==jis-x0213-1
 	    =>iso-ir 233
 	    ;; registry "jisx0213\\(\\.2004\\)-1"
@@ -836,7 +888,7 @@
 
   (make-charset
    '==jis-x0213-2
-   "JIS X 0213 Plain 2 detailed representative glyph-images."
+   "JIS X 0213 Plain 2 abstract glyph-forms"
    '(mother =jis-x0213-2
 	    =>iso-ir 229
 	    registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
@@ -895,82 +947,93 @@
 	      ;; final ?C
 	      graphic 0))
 
+  (define-charset-alias '=>>>jis-x0208      '==jis-x0208)
+  (define-charset-alias '=>>>jis-x0208@1978 '==jis-x0208@1978)
+  (define-charset-alias '=>>>jis-x0208@1983 '==jis-x0208@1983)
+  (define-charset-alias '=>>>jis-x0208@1990 '==jis-x0208@1990)
+
+  (define-charset-alias '=>>>jis-x0213-1      '==jis-x0213-1)
+  (define-charset-alias '=>>>jis-x0213-1@2000 '==jis-x0213-1@2000)
+  (define-charset-alias '=>>>jis-x0213-1@2004 '==jis-x0213-1@2004)
+  (define-charset-alias '=>>>jis-x0213-2      '==jis-x0213-2)
+
   (make-charset
-   '=>>>jis-x0208
-   "JIS X 0208 abstract glyph-forms (unchanged part)."
+   '===jis-x0208
+   "JIS X 0208 detailed representative glyph-images (unchanged part)."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208
+	      mother ==jis-x0208
 	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
   (make-charset
-   '=>>>jis-x0208@1978
-   "JIS X 0208:1978 abstract glyph-forms."
+   '===jis-x0208@1978
+   "JIS X 0208:1978 detailed representative glyph-images."
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0208
+	      mother ===jis-x0208
 	      =>iso-ir 42
 	      ;; final ?@
 	      graphic 0))
   (make-charset
-   '=>>>jis-x0208@1983
-   "JIS X 0208:1983 abstract glyph-forms."
+   '===jis-x0208@1983
+   "JIS X 0208:1983 detailed representative glyph-images."
    '(registry "jisx0208\\.1983"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0208
+	      mother ===jis-x0208
 	      =>iso-ir 87
 	      graphic 0))
   (make-charset
-   '=>>>jis-x0208@1990
-   "JIS X 0208:1990 abstract glyph-forms."
+   '===jis-x0208@1990
+   "JIS X 0208:1990 detailed representative glyph-images."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0208
+	      mother ===jis-x0208
 	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
+
   (make-charset
-   '=>>>jis-x0213-1
-   "JIS X 0213 Plain 1 abstract glyph-forms (unchanged part)"
+   '===jis-x0213-1
+   "JIS X 0213 Plain 1 detailed representative glyph-images (unchanged part)."
    '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0213-1
+	      mother ==jis-x0213-1
 	      =>iso-ir 228
               ;; final ?O
 	      graphic 0
               ;; partial t
 	      ))
   (make-charset
-   '=>>>jis-x0213-1@2000
-   "JIS X 0213:2000 Plain 1 abstract glyph-forms"
+   '===jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1 detailed representative glyph-images."
    '(registry "jisx0213\\(\\.2000\\)-1"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0213-1
+	      mother ===jis-x0213-1
 	      =>iso-ir 228
-              ;; final ?O
+	      ;; final ?O
 	      graphic 0
 	      ;; partial t
 	      ))
   (make-charset
-   '=>>>jis-x0213-1@2004
-   "JIS X 0213:2004 Plain 1 abstract glyph-forms"
-   '(mother =>>>jis-x0213-1
+   '===jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 detailed representative glyph-images."
+   '(mother ===jis-x0213-1
 	    =>iso-ir 233
 	    ;; registry "jisx0213\\(\\.2004\\)-1"
 	    dimension 2
 	    chars 94
 	    graphic 0))
   (make-charset
-   '=>>>jis-x0213-2
-   "JIS X 0213 Plain 2 abstract glyph-forms"
-   '(mother =jis-x0213-2
+   '===jis-x0213-2
+   "JIS X 0213 Plain 2 detailed representative glyph-images."
+   '(mother ==jis-x0213-2
 	    =>iso-ir 229
 	    registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
 	    dimension 2
@@ -978,12 +1041,34 @@
 	    graphic 0))
 
   (make-charset
+   '===jis-x0212
+   "JIS X 0212 representative glyph-images."
+   '(registry "jisx0212"
+	      dimension 2
+	      chars 94
+	      mother ==jis-x0212
+	      =>iso-ir 159
+	      ;; final ?D
+	      graphic 0))
+
+  (make-charset
+   '===ks-x1001
+   "KS X 1001 representative glyph-images."
+   '(registry "ksc5601"
+	      dimension 2
+	      chars 94
+	      mother ==ks-x1001
+	      =>iso-ir 149
+	      ;; final ?C
+	      graphic 0))
+
+  (make-charset
    '=>>jis-x0208
    "JIS X 0208 abstract glyphs (unchanged part)."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0208
+	      mother =jis-x0208
 	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
@@ -1022,7 +1107,7 @@
    '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0213-1
+	      mother =jis-x0213-1
 	      =>iso-ir 228
               ;; final ?O
 	      graphic 0
@@ -1046,7 +1131,7 @@
    '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
 	      dimension 2
 	      chars 94
-	      mother =>>>jis-x0213-2
+	      mother =jis-x0213-2
 	      =>iso-ir 229
               ;; final ?P
 	      graphic 0))
@@ -1228,7 +1313,7 @@
    '==cns11643-1
    "CNS 11643 Plane 1 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-1
 	      =>iso-ir 171
@@ -1237,7 +1322,7 @@
    '==cns11643-2
    "CNS 11643 Plane 2 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-2
 	      =>iso-ir 172
@@ -1246,7 +1331,7 @@
    '==cns11643-3
    "CNS 11643 Plane 3 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?3$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-3
 	      =>iso-ir 183
@@ -1255,7 +1340,7 @@
    '==cns11643-4
    "CNS 11643 Plane 4 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-4
 	      =>iso-ir 184
@@ -1264,7 +1349,7 @@
    '==cns11643-5
    "CNS 11643 Plane 5 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?5$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-5
 	      =>iso-ir 185
@@ -1273,7 +1358,7 @@
    '==cns11643-6
    "CNS 11643 Plane 6 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-6
 	      =>iso-ir 186
@@ -1282,45 +1367,118 @@
    '==cns11643-7
    "CNS 11643 Plane 7 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
-	      dimension 1
+	      dimension 2
 	      chars 94
 	      mother =cns11643-7
 	      =>iso-ir 187
 	      graphic 0))
 
   (make-charset
-   '=>>cns11643-4
-   "CNS 11643 Plane 4 abstract glyphs."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+   '===cns11643-1
+   "CNS 11643 Plane 1 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-4
-	      =>iso-ir 184
+	      mother ==cns11643-1
+	      =>iso-ir 171
 	      graphic 0))
-
   (make-charset
-   '=>cns11643-2
-   "CNS 11643 Plane 2 abstract characters."
+   '===cns11643-2
+   "CNS 11643 Plane 2 representative glyph-images."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-2
+	      mother ==cns11643-2
 	      =>iso-ir 172
 	      graphic 0))
   (make-charset
-   '=>cns11643-6
-   "CNS 11643 Plane 6 abstract characters."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+   '===cns11643-3
+   "CNS 11643 Plane 3 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?3$"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-6
-	      =>iso-ir 186
+	      mother ==cns11643-3
+	      =>iso-ir 183
 	      graphic 0))
   (make-charset
-   '=>cns11643-7
-   "CNS 11643 Plane 7 abstract characters."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
-	      dimension 2
+   '===cns11643-4
+   "CNS 11643 Plane 4 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+	      dimension 2
+	      chars 94
+	      mother ==cns11643-4
+	      =>iso-ir 184
+	      graphic 0))
+  (make-charset
+   '===cns11643-5
+   "CNS 11643 Plane 5 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?5$"
+	      dimension 2
+	      chars 94
+	      mother ==cns11643-5
+	      =>iso-ir 185
+	      graphic 0))
+  (make-charset
+   '===cns11643-6
+   "CNS 11643 Plane 6 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+	      dimension 2
+	      chars 94
+	      mother ==cns11643-6
+	      =>iso-ir 186
+	      graphic 0))
+  (make-charset
+   '===cns11643-7
+   "CNS 11643 Plane 7 representative glyph-images."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
+	      dimension 2
+	      chars 94
+	      mother ==cns11643-7
+	      =>iso-ir 187
+	      graphic 0))
+
+  (make-charset
+   '=>>cns11643-1
+   "CNS 11643 Plane 1 abstract glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-1
+	      =>iso-ir 184
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-4
+   "CNS 11643 Plane 4 abstract glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-4
+	      =>iso-ir 184
+	      graphic 0))
+
+  (make-charset
+   '=>cns11643-2
+   "CNS 11643 Plane 2 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-2
+	      =>iso-ir 172
+	      graphic 0))
+  (make-charset
+   '=>cns11643-6
+   "CNS 11643 Plane 6 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-6
+	      =>iso-ir 186
+	      graphic 0))
+  (make-charset
+   '=>cns11643-7
+   "CNS 11643 Plane 7 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
+	      dimension 2
 	      chars 94
 	      mother =cns11643-7
 	      =>iso-ir 187
@@ -1379,6 +1537,16 @@
   (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
 
   (make-charset '==big5-cdp
+		"Abstract glyph-images of Big5-CDP"
+		'(long-name	"Big5-CDP glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=big5-cdp))
+  (make-charset '===big5-cdp
 		"Representative glyph-images of Big5-CDP"
 		'(long-name	"Big5-CDP glyph-images"
 		  chars		256
@@ -1387,7 +1555,7 @@
 		  graphic	2
 		  direction	l2r
 		  registry	"big5\\.cdp-0"
-		  mother	=big5-cdp))
+		  mother	==big5-cdp))
 
   (make-charset '=>>big5-cdp
 		"Abstract glyphs of Big5-CDP"
@@ -1412,6 +1580,50 @@
 		  mother	=>>big5-cdp))
 
   (make-charset
+   '=mj
+   "Moji-Jouhou-Kiban characters"
+   `(long-name "Moji-Jouhou-Kiban"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+               ;; registry "mj-0$"
+	       min-code     #xE30000
+	       max-code ,(+ #xE30000 68053)
+	       code-offset  #xE30000
+	       ;; min-code	      ,(lsh #x6404 16)
+               ;; max-code	   ,(+ (lsh #x6404 16) 68053)
+               ;; code-offset    ,(lsh #x6404 16)
+	       ))
+  (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
+   '=mj-1
+   "Moji-Jouhou-Kiban plane 1"
+   '(long-name "Moji-Jouhou-Kiban-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-1$"
+	       mother =mj
+	       min-code	#x10000
+	       code-offset #x10000))
+
+  (make-charset
    '=hanyo-denshi/ja
    "JA (JIS X0208) part of Han'you-Denshi characters"
    `(long-name "Han'you-Denshi/JA"
@@ -1552,9 +1764,46 @@
 	       direction l2r))
 
   (make-charset
+   '==mj
+   "Moji-Jouhou-Kiban detailed glyph-images."
+   '(long-name "MJ glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =mj))
+  (make-charset
+   '==mj-0
+   "MJ detailed glyph-images plane 0"
+   '(long-name "MJ glyph-images-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother ==mj
+	       min-code	0
+	       max-code	#xFFFF))
+  (make-charset
+   '==mj-1
+   "MJ detailed glyph-images plane 1"
+   '(long-name "MJ glyph-images-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-1$"
+	       mother ==mj
+	       min-code	#x10000
+	       code-offset #x10000))
+
+  (make-charset
    '==hanyo-denshi/ja
-   "Han'you-Denshi/JA detailed glyph-images."
-   '(long-name "Han'you-Denshi/JA glyph-images"
+   "Han'you-Denshi/JA abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JA glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1564,8 +1813,8 @@
 	       mother =hanyo-denshi/ja))
   (make-charset
    '==hanyo-denshi/jb
-   "Han'you-Denshi/JB detailed glyph-images."
-   '(long-name "Han'you-Denshi/JB glyph-images"
+   "Han'you-Denshi/JB abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JB glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1575,8 +1824,8 @@
 	       mother =hanyo-denshi/jb))
   (make-charset
    '==hanyo-denshi/jc
-   "Han'you-Denshi/JC detailed glyph-images."
-   '(long-name "Han'you-Denshi/JC glyph-images"
+   "Han'you-Denshi/JC abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JC glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1586,8 +1835,8 @@
 	       mother =hanyo-denshi/jc))
   (make-charset
    '==hanyo-denshi/jd
-   "Han'you-Denshi/JD detailed glyph-images."
-   '(long-name "Han'you-Denshi/JD glyph-images"
+   "Han'you-Denshi/JD abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JD glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1597,8 +1846,8 @@
 	       mother =hanyo-denshi/jd))
   (make-charset
    '==hanyo-denshi/ft
-   "Han'you-Denshi/FT detailed glyph-images."
-   '(long-name "Han'you-Denshi/FT glyph-images"
+   "Han'you-Denshi/FT abstract glyph-forms."
+   '(long-name "Han'you-Denshi/FT glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1608,7 +1857,7 @@
 	       mother =hanyo-denshi/ft))
   (make-charset
    '==hanyo-denshi/ia
-   "Han'you-Denshi/IA representative glyph-images."
+   "Han'you-Denshi/IA abstract glyph-forms."
    '(long-name "Han'you-Denshi/IA glyph-images"
 	       chars 94
 	       dimension 2
@@ -1619,8 +1868,8 @@
 	       mother =hanyo-denshi/ia))
   (make-charset
    '==hanyo-denshi/ib
-   "Han'you-Denshi/IB detailed glyph-images."
-   '(long-name "Han'you-Denshi/IB glyph-images"
+   "Han'you-Denshi/IB abstract glyph-forms."
+   '(long-name "Han'you-Denshi/IB glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1630,8 +1879,8 @@
 	       mother =hanyo-denshi/ib))
   (make-charset
    '==hanyo-denshi/hg
-   "Han'you-Denshi/HG detailed glyph-images."
-   '(long-name "Han'you-Denshi/HG glyph-images"
+   "Han'you-Denshi/HG abstract glyph-forms."
+   '(long-name "Han'you-Denshi/HG glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -1640,9 +1889,20 @@
 	       registry "HanyoDenshi\\.HG-0$"
 	       mother =hanyo-denshi/hg))
   (make-charset
+   '==hanyo-denshi/ip
+   "Han'you-Denshi/IP abstract glyph-forms."
+   '(long-name "Han'you-Denshi/IP glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "HanyoDenshi\\.IP-0$"
+	       mother =hanyo-denshi/ip))
+  (make-charset
    '==hanyo-denshi/jt
-   "JT (Juuki Touitsu Moji) detailed glyph-images."
-   '(long-name "Han'you-Denshi/JT glyph-images"
+   "JT (Juuki Touitsu Moji) abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JT glyph-forms"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -1652,8 +1912,8 @@
 	       mother =hanyo-denshi/jt))
   (make-charset
    '==hanyo-denshi/ks
-   "KoSeki-touitsu-moji detailed glyph-images."
-   '(long-name "Han'you-Denshi/KS glyph-images"
+   "KoSeki-touitsu-moji abstract glyph-forms."
+   '(long-name "Han'you-Denshi/KS glyph-forms"
 	       chars 256
 	       dimension 3
 	       columns 2
@@ -1662,100 +1922,180 @@
 	       mother =hanyo-denshi/ks))
 
   (make-charset
-   '=hanyo-denshi/ks/mf
-   "font encoding for KS (KoSeki) characters"
-   `(long-name "Han'you-Denshi/KS font encoding"
+   '=koseki
+   "Representative glyph-images of KoSeki-touitsu-moji."
+   '(long-name "KoSeki-touitsu-moji"
 	       chars 256
-	       dimension 2
+	       dimension 3
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.KSMF-0$"
-	       min-code	      ,(lsh #x6403 16)
-	       max-code	   ,(+ (lsh #x6403 16) #xFFFF)
-	       code-offset    ,(lsh #x6403 16)))
+	       mother =hanyo-denshi/ks))
+
+  (define-charset-alias '=>>>hanyo-denshi/ja '==hanyo-denshi/ja)
+  (define-charset-alias '=>>>hanyo-denshi/jb '==hanyo-denshi/jb)
+  (define-charset-alias '=>>>hanyo-denshi/jc '==hanyo-denshi/jc)
+  (define-charset-alias '=>>>hanyo-denshi/jd '==hanyo-denshi/jd)
+  (define-charset-alias '=>>>hanyo-denshi/ft '==hanyo-denshi/ft)
+  (define-charset-alias '=>>>hanyo-denshi/ib '==hanyo-denshi/ib)
+  (define-charset-alias '=>>>hanyo-denshi/hg '==hanyo-denshi/hg)
+  (define-charset-alias '=>>>hanyo-denshi/jt '==hanyo-denshi/jt)
+  (define-charset-alias '=>>>hanyo-denshi/ks '==hanyo-denshi/ks)
 
+  ;; (make-charset
+  ;;  '===hanyo-denshi/ja
+  ;;  "Han'you-Denshi/JA detailed glyph-images."
+  ;;  '(long-name "Han'you-Denshi/JA glyph-images"
+  ;;              chars 94
+  ;;              dimension 2
+  ;;              columns 2
+  ;;              graphic 2
+  ;;              direction l2r
+  ;;              registry "HanyoDenshi\\.JA-0$"
+  ;;              mother ==hanyo-denshi/ja))
   (make-charset
-   '=>>>hanyo-denshi/ja
-   "Han'you-Denshi/JA abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JA glyph-forms"
+   '===hanyo-denshi/jb
+   "Han'you-Denshi/JB detailed glyph-images."
+   '(long-name "Han'you-Denshi/JB glyph-images"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.JA-0$"
-	       mother =hanyo-denshi/ja))
+	       registry "HanyoDenshi\\.JB-0$"
+	       mother ==hanyo-denshi/jb))
   (make-charset
-   '=>>>hanyo-denshi/jb
-   "Han'you-Denshi/JB abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JB glyph-forms"
+   '===hanyo-denshi/jd
+   "Han'you-Denshi/JD abstract glyph-forms."
+   '(long-name "Han'you-Denshi/JD glyph-forms"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.JB-0$"
-	       mother =hanyo-denshi/jb))
+	       registry "HanyoDenshi\\.JD-0$"
+	       mother ==hanyo-denshi/jd))
   (make-charset
-   '=>>>hanyo-denshi/jc
-   "Han'you-Denshi/JC abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JC glyph-forms"
+   '===hanyo-denshi/ft
+   "Han'you-Denshi/FT detailed glyph-images."
+   '(long-name "Han'you-Denshi/FT glyph-images"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.JC-0$"
-	       mother =hanyo-denshi/jc))
+	       registry "HanyoDenshi\\.FT-0$"
+	       mother ==hanyo-denshi/ft))
   (make-charset
-   '=>>>hanyo-denshi/jd
-   "Han'you-Denshi/JD abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JD glyph-forms"
+   '===hanyo-denshi/ib
+   "Han'you-Denshi/IB detailed glyph-images."
+   '(long-name "Han'you-Denshi/IB glyph-images"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.JD-0$"
-	       mother =hanyo-denshi/jd))
+	       registry "HanyoDenshi\\.IB-0$"
+	       mother ==hanyo-denshi/ib))
   (make-charset
-   '=>>>hanyo-denshi/ft
-   "Han'you-Denshi/FT abstract glyph-forms"
-   '(long-name "Han'you-Denshi/FT glyph-forms"
+   '===hanyo-denshi/hg
+   "Han'you-Denshi/HG detailed glyph-images."
+   '(long-name "Han'you-Denshi/HG glyph-images"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.FT-0$"
-	       mother =hanyo-denshi/ft))
+	       registry "HanyoDenshi\\.HG-0$"
+	       mother ==hanyo-denshi/hg))
   (make-charset
-   '=>>>hanyo-denshi/ib
-   "Han'you-Denshi/IB abstract glyph-forms"
-   '(long-name "Han'you-Denshi/IB glyph-forms"
-	       chars 94
+   '===hanyo-denshi/jt
+   "JT (Juuki Touitsu Moji) detailed glyph-images."
+   '(long-name "Han'you-Denshi/JT glyph-images"
+	       chars 256
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.IB-0$"
-	       mother =hanyo-denshi/ib))
+	       registry "HanyoDenshi\\.JT-0$"
+	       mother ==hanyo-denshi/jt))
   (make-charset
-   '=>>>hanyo-denshi/hg
-   "Han'you-Denshi/HG abstract glyph-forms"
-   '(long-name "Han'you-Denshi/HG glyph-forms"
+   '===hanyo-denshi/ks
+   "KoSeki-touitsu-moji detailed glyph-images."
+   '(long-name "Han'you-Denshi/KS glyph-images"
+	       chars 256
+	       dimension 3
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ==hanyo-denshi/ks))
+
+  (make-charset
+   '=hanyo-denshi/ks/mf
+   "font encoding for KS (KoSeki) characters"
+   `(long-name "Han'you-Denshi/KS font encoding"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "HanyoDenshi\\.KSMF-0$"
+	       min-code	      ,(lsh #x6403 16)
+	       max-code	   ,(+ (lsh #x6403 16) #xFFFF)
+	       code-offset    ,(lsh #x6403 16)))
+
+  (make-charset
+   '===mj
+   "Moji-Jouhou-Kiban detailed glyph-images."
+   '(long-name "MJ glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother ==mj))
+  (make-charset
+   '===mj-0
+   "MJ detailed glyph-images plane 0"
+   '(long-name "MJ glyph-images-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother ===mj
+	       min-code	0
+	       max-code	#xFFFF))
+  (make-charset
+   '===mj-1
+   "MJ detailed glyph-images plane 1"
+   '(long-name "MJ glyph-images-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-1$"
+	       mother ===mj
+	       min-code	#x10000
+	       code-offset #x10000))
+
+  (make-charset
+   '=+>hanyo-denshi/ft
+   "Han'you-Denshi/FT abstract glyphs"
+   '(long-name "Han'you-Denshi/FT glyphs"
 	       chars 94
 	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "HanyoDenshi\\.HG-0$"
-	       mother =hanyo-denshi/hg))
+	       registry "HanyoDenshi\\.FT-0$"
+	       mother =hanyo-denshi/ft))
   (make-charset
-   '=>>>hanyo-denshi/jt
-   "JT (Juuki Touitsu Moji) abstract glyph-forms"
-   '(long-name "Han'you-Denshi/JT glyph-forms"
+   '=+>hanyo-denshi/jt
+   "JT (Juuki Touitsu Moji) unified abstract glyphs."
+   '(long-name "Han'you-Denshi/JT unified glyphs"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -1763,16 +2103,17 @@
 	       direction l2r
 	       registry "HanyoDenshi\\.JT-0$"
 	       mother =hanyo-denshi/jt))
+
   (make-charset
-   '=>>>hanyo-denshi/ks
-   "KoSeki-touitsu-moji abstract glyph-forms"
-   '(long-name "Han'you-Denshi/KS glyph-forms"
+   '=>>mj
+   "Moji-Jouhou-Kiban abstract glyphs."
+   '(long-name "MJ glyphs"
 	       chars 256
-	       dimension 3
+	       dimension 2
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       mother =hanyo-denshi/ks))
+	       mother =mj))
 
   (make-charset
    '=>>hanyo-denshi/ja
@@ -1784,7 +2125,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.JA-0$"
-	       mother =>>>hanyo-denshi/ja))
+	       mother =hanyo-denshi/ja))
   (make-charset
    '=>>hanyo-denshi/jb
    "Han'you-Denshi/JB abstract glyphs"
@@ -1795,7 +2136,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.JB-0$"
-	       mother =>>>hanyo-denshi/jb))
+	       mother =hanyo-denshi/jb))
   (make-charset
    '=>>hanyo-denshi/jc
    "Han'you-Denshi/JC abstract glyphs"
@@ -1806,7 +2147,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.JC-0$"
-	       mother =>>>hanyo-denshi/jc))
+	       mother =hanyo-denshi/jc))
   (make-charset
    '=>>hanyo-denshi/jd
    "Han'you-Denshi/JD abstract glyphs"
@@ -1817,7 +2158,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.JD-0$"
-	       mother =>>>hanyo-denshi/jd))
+	       mother =hanyo-denshi/jd))
   (make-charset
    '=>>hanyo-denshi/ft
    "Han'you-Denshi/FT abstract glyphs"
@@ -1828,7 +2169,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.FT-0$"
-	       mother =>>>hanyo-denshi/ft))
+	       mother =hanyo-denshi/ft))
   (make-charset
    '=>>hanyo-denshi/ia
    "Han'you-Denshi/IA abstract glyphs"
@@ -1850,7 +2191,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.IB-0$"
-	       mother =>>>hanyo-denshi/ib))
+	       mother =hanyo-denshi/ib))
   (make-charset
    '=>>hanyo-denshi/hg
    "Han'you-Denshi/HG abstract glyphs"
@@ -1861,7 +2202,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.HG-0$"
-	       mother =>>>hanyo-denshi/hg))
+	       mother =hanyo-denshi/hg))
   (make-charset
    '=>>hanyo-denshi/ip
    "Han'you-Denshi/IP abstract glyphs"
@@ -1883,7 +2224,7 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.JT-0$"
-	       mother =>>>hanyo-denshi/jt))
+	       mother =hanyo-denshi/jt))
   (make-charset
    '=>>hanyo-denshi/ks
    "Han'you-Denshi/KS abstract glyphs"
@@ -1893,7 +2234,7 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       mother =>>>hanyo-denshi/ks))
+	       mother =hanyo-denshi/ks))
 
   (make-charset '=gt
 		"GT 2000"
@@ -1908,6 +2249,15 @@
 		  max-code	,(+ (lsh #x6100 16) 67547)
 		  code-offset	,(lsh #x6100 16)))
   (make-charset '==gt
+		"GT 2000 abstract glyph-forms."
+		'(long-name     "GT abstract glyph-forms"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  mother        =gt))
+  (make-charset '===gt
 		"GT 2000 detailed glyph-images."
 		'(long-name	"GT glyph-images"
 		  chars		256
@@ -1915,20 +2265,12 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=gt
+		  mother	==gt
                   ;; min-code	1
                   ;; max-code	67392
 		  ))
   (define-charset-alias 'ideograph-gt '=gt)
-  (make-charset '=>>>gt
-		"GT 2000 abstract glyph-forms"
-		'(long-name	"GT abstract glyph-forms"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  mother	=gt))
+  (define-charset-alias '=>>>gt '==gt)
   (make-charset '=>>gt
 		"GT 2000 abstract glyphs"
 		'(long-name	"GT abstract glyphs"
@@ -1937,7 +2279,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=>>>gt))
+		  mother	=gt))
   (define-charset-alias '<=>gt '=>>gt)
   (define-charset-alias '<==>gt '=>>gt)
   (make-charset '=+>gt
@@ -1972,7 +2314,7 @@
 		  code-offset	,(lsh #x6110 16)))
   (define-charset-alias 'ideograph-gt-k '=gt-k)
   (make-charset '==gt-k
-		"Representative glyph-images of GT-K"
+		"Abstract glyph-images of GT-K"
 		'(long-name	"GT-K glyph-images"
 		  chars		256
 		  dimension	2
@@ -1980,6 +2322,15 @@
 		  graphic	2
 		  direction	l2r
 		  mother	=gt-k))
+  (make-charset '===gt-k
+		"Representative glyph-images of GT-K"
+		'(long-name	"GT-K glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==gt-k))
   (make-charset '=>>gt-k
 		"abstract glyphs of GT-K"
 		'(long-name	"GT-K abstract glyphs"
@@ -2104,6 +2455,35 @@
 		  direction	l2r))
 
   (make-charset '==daikanwa
+		"Daikanwa glyph-images."
+		'(long-name	"Daikanwa glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"Daikanwa\\(\\.[0-9]+\\)?-3"
+		  mother	=daikanwa))
+  (make-charset '==daikanwa/+p
+		"Daikanwa detailed glyph-images (ddddd')"
+		'(long-name	"Daikanwa detailed glyphs-images (ddddd')"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=daikanwa/+p))
+  (make-charset '==daikanwa/ho
+		"Daikanwa detailed glyph-images (Hokan)"
+		'(long-name	"Daikanwa-ho detailed glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=daikanwa/ho))
+
+  (make-charset '===daikanwa
 		"Daikanwa detailed glyph-images."
 		'(long-name	"Daikanwa detailed glyph-images"
 		  chars		256
@@ -2112,7 +2492,25 @@
 		  graphic	2
 		  direction	l2r
 		  registry	"Daikanwa\\(\\.[0-9]+\\)?-3"
-		  mother	=daikanwa))
+		  mother	==daikanwa))
+  (make-charset '===daikanwa/+p
+		"Daikanwa detailed glyph-images (ddddd')"
+		'(long-name	"Daikanwa detailed glyphs-images (ddddd')"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==daikanwa/+p))
+  (make-charset '===daikanwa/ho
+		"Daikanwa detailed glyph-images (Hokan)"
+		'(long-name	"Daikanwa-ho detailed glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==daikanwa/ho))
 
   (make-charset '=>>daikanwa
 		"Daikanwa abstract glyphs"
@@ -2226,8 +2624,8 @@
   (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
 
   (make-charset '==shinjigen
-		"Kadokawa ShinJigen dictionary (common parts)"
-		`(long-name	"Shinjigen common parts"
+		"Detailed glyph-images of ShinJigen (common parts)"
+		'(long-name	"Shinjigen common parts"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -2235,6 +2633,36 @@
 		  direction	l2r
 		  mother	=shinjigen
 		  registry	"Shinjigen\\(\\.[0-9]+\\)?-*"))
+  (make-charset '==shinjigen@1ed
+		"Detailed glyph-images of ShinJigen (the first edition)"
+		'(long-name	"Detailed glyph-images of Shinjigen-1"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==shinjigen
+		  registry	"Shinjigen\\(\\.[0-9]+\\)?-1"))
+  (make-charset '==shinjigen@rev
+		"Detailed glyph-images of ShinJigen (the revised edition)"
+		'(long-name	"Detailed glyph-images of Shinjigen-2"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==shinjigen
+		  registry	"Shinjigen\\(\\.[0-9]+\\)?-2"))
+  (make-charset
+   '==shinjigen/+p@rev
+   "Detailed glyph-images of ShinJigen (the second edition) number with '"
+   '(long-name	"Detailed glyph-images of Shinjigen-2 with '"
+		mother	=shinjigen/+p@rev
+		chars		256
+		dimension	2
+		columns	2
+		graphic	2
+		direction	l2r))
 
   (make-charset '=big5-pua
 		"Big5 with private used area"
@@ -2284,7 +2712,24 @@
 		  columns	2
 		  direction	l2r))
   (define-charset-alias 'ideograph-cbeta '=cbeta)
-
+  (make-charset '==cbeta "CBETA private characters"
+		'(long-name	"CBETA PUA glyph-images"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	=cbeta))
+  (make-charset '===cbeta "CBETA private characters"
+		'(long-name	"CBETA PUA glyph-images"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	==cbeta))
   (make-charset '=>>cbeta "CBETA abstract glyphs"
 		'(long-name	"CBETA glyphs"
 		  chars		256
@@ -2294,6 +2739,15 @@
 		  columns	2
 		  direction	l2r
 		  mother	=cbeta))
+  (make-charset '=>cbeta "CBETA abstract characters"
+		'(long-name	"CBETA characters"
+		  chars		256
+		  dimension	2
+		  registry	"cbeta-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r
+		  mother	=cbeta))
 
   (make-charset '=zinbun-oracle
 		"Oracle Bones Script"
@@ -2328,10 +2782,30 @@
 		  graphic	2
 		  direction	l2r
 		  registry	"china3jef-0"
-		  min-code	#xE80000
-		  max-code	#xE8FFFF
-		  code-offset	#xE80000))
-  (define-charset-alias 'china3-jef '=jef-china3)
+		  min-code	#xE80000
+		  max-code	#xE8FFFF
+		  code-offset	#xE80000))
+  (define-charset-alias 'china3-jef '=jef-china3)
+  (make-charset '==jef-china3
+		"JEF + CHINA3 abstract glyph-images."
+		'(long-name	"JEF + CHINA3"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"china3jef-0"
+		  mother	=jef-china3))
+  (make-charset '===jef-china3
+		"JEF + CHINA3 glyph-images."
+		'(long-name	"JEF-CHINA3 glyph-images"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"china3jef-0"
+		  mother	==jef-china3))
 
   (make-charset '=ruimoku-v6
 		"private characters used in RUIMOKU Version.6"
@@ -2346,6 +2820,26 @@
 		  min-code	#xE90000 ; #xE000
 		  max-code	#xE908FF ; #xE8FF
 		  code-offset	,(- #xE90000 #xE000)))
+  (make-charset '==ruimoku-v6
+		"RUIMOKU Version.6 glyph-images."
+		'(long-name	"RUI6 glyph-images."
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+		  mother	=ruimoku-v6))
+  (make-charset '===ruimoku-v6
+		"RUIMOKU Version.6 representative glyph-images."
+		'(long-name	"RUI6 rep-glyph-images."
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"rui6-0"
+		  mother	==ruimoku-v6))
   (make-charset '=>>ruimoku-v6
 		"RUIMOKU Version.6 glyphs"
 		'(long-name	"RUI6 glyphs"
@@ -2411,6 +2905,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"
@@ -2626,87 +3131,6 @@
 		  =>iso-ir	177
 		  mother	=>>ucs@unicode))
 
-  (make-charset '=>>>ucs@iso
-		"Representative glyph-forms of ISO/IEC 10646"
-		'(long-name	"UCS glyph-forms for UCS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@iso))
-  (make-charset '=>>>ucs@unicode
-		"Representative glyph-forms of Unicode"
-		'(long-name	"UCS glyph-forms for Unicode"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@iso))
-  (make-charset '=>>>ucs@jis
-		"UCS Representative glyph-forms for JIS X0208/0212/0213"
-		'(long-name	"UCS glyph-forms for JIS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@unicode))
-  (make-charset '=>>>ucs@jis/1990
-		"UCS Representative glyph-forms for JIS X 0208/0212:1990"
-		'(long-name	"UCS glyph-forms for JIS:1990"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@jis))
-  (make-charset '=>>>ucs@jis/2000
-		"UCS Representative glyph-forms for JIS X 0213:2000"
-		'(long-name	"UCS glyph-forms for JIS:2000"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@jis))
-  (make-charset '=>>>ucs@jis/2004
-		"UCS Representative glyph-forms for JIS X 0213:2004"
-		'(long-name	"UCS glyph-forms for JIS:2004"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@jis))
-  (make-charset '=>>>ucs@ks
-		"UCS Representative glyph-forms for Korean Standards"
-		'(long-name	"UCS glyph-forms for KS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@unicode))
-  (make-charset '=>>>ucs@cns
-		"UCS Representative glyph-forms for CNS 11643 sources"
-		'(long-name	"UCS glyph-forms for CNS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@unicode))
-
   (make-charset '=ucs@iso
 		"ISO/IEC 10646 for its representative glyphs"
 		'(long-name	"UCS for ISO"
@@ -2716,7 +3140,8 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>>>ucs@iso))
+                  mother	=>>ucs@iso
+		  ))
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
 		'(long-name	"UCS for Unicode"
@@ -2899,6 +3324,16 @@
 		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-ks '=ucs@ks)
+  (make-charset '=ucs@ks/2012
+		"Mapping for Korean Standards in ISO/IEC 10646:2012"
+		'(long-name	"UCS:2012 for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@ks))
   (make-charset '=ucs-bmp@ks
 		"ISO/IEC 10646 BMP for KS"
 		'(long-name	"BMP for KS"
@@ -2929,7 +3364,9 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>>ucs@cns))
+		  mother	=ucs@cns
+		  ;; mother	=>>ucs@cns
+		  ))
   (define-charset-alias 'ucs-big5 '=ucs@big5)
   (make-charset '=ucs@big5/cns11643
 		"ISO/IEC 10646 for Big5 based on www.cns11643.gov.tw"
@@ -2943,25 +3380,27 @@
 		  mother	=ucs@big5))
 
   (make-charset '==ucs@iso
-		"ISO/IEC 10646 for its representative glyph-images."
-		'(long-name	"ISO rep-image for UCS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@iso))
+		"Representative glyph-forms of ISO/IEC 10646."
+		'(long-name     "UCS glyph-forms for UCS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        =>>ucs@iso))
+  (define-charset-alias '=>>>ucs@iso '==ucs@iso)
   (make-charset '==ucs@unicode
-		"Unicode for its representative glyph-images."
-		'(long-name	"UCS for Unicode"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@iso))
+		"Representative glyph-forms of Unicode."
+		'(long-name     "UCS glyph-forms for Unicode"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@iso))
+  (define-charset-alias '=>>>ucs@unicode '==ucs@unicode)
   (make-charset '==ucs@gb
 		"ISO/IEC 10646 for GB"
 		'(long-name	"UCS for GB"
@@ -2984,15 +3423,16 @@
 		  min-code	#x0000
 		  max-code	#xFFFF))
   (make-charset '==ucs@cns
-		"ISO/IEC 10646 for CNS 11643"
-		'(long-name	"UCS for CNS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@unicode))
+		"UCS Representative glyph-forms for CNS 11643 sources."
+		'(long-name     "UCS glyph-forms for CNS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@cns '==ucs@cns)
   (make-charset '==ucs-bmp@cns
 		"ISO/IEC 10646 BMP for CNS"
 		'(long-name	"BMP for CNS"
@@ -3005,96 +3445,142 @@
 		  min-code	#x0000
 		  max-code	#xFFFF))
   (make-charset '==ucs@jis
-		"ISO/IEC 10646 for JIS X0208/0212/0213"
-		'(long-name	"UCS for JIS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@unicode))
+		"UCS Representative glyph-forms for JIS X0208/0212/0213."
+		'(long-name     "UCS glyph-forms for JIS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@jis '==ucs@jis)
   (make-charset '==ucs@jis/1990
-		"ISO/IEC 10646 for JIS X 0208/0212:1990"
-		'(long-name	"UCS for JIS:1990"
+		"UCS Representative glyph-forms for JIS X 0208/0212:1990."
+		'(long-name     "UCS glyph-forms for JIS:1990"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/1990 '==ucs@jis/1990)
+  (make-charset '==ucs@jis/2000
+		"UCS Representative glyph-forms for JIS X 0213:2000."
+		'(long-name     "UCS glyph-forms for JIS:2000"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/2000 '==ucs@jis/2000)
+  (make-charset '==ucs@jis/2004
+		"UCS Representative glyph-forms for JIS X 0213:2004."
+		'(long-name     "UCS glyph-forms for JIS:2004"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@jis))
+  (define-charset-alias '=>>>ucs@jis/2004 '==ucs@jis/2004)
+  (make-charset '==ucs@JP
+		"UCS for common glyph-forms used in Japan."
+		'(long-name	"UCS for Japan"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@jis))
-  (make-charset '==ucs@jis/2000
-		"ISO/IEC 10646 for JIS X 0213:2000"
-		'(long-name	"UCS for JIS:2000"
+		  mother	==ucs@jis/2004))
+  (make-charset '==ucs@JP/hanazono
+		"Japanese glyph-forms of Hanazono Mincho."
+		'(long-name	"UCS for Hana-Min"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@jis))
-  (make-charset '==ucs@jis/2004
-		"ISO/IEC 10646 for JIS X 0213:2004"
-		'(long-name	"UCS for JIS:2004"
+		  mother	==ucs@JP))
+  (make-charset '==ucs@ks
+		"UCS Representative glyph-forms for Korean Standards."
+		'(long-name     "UCS glyph-forms for KS"
+		  chars         256
+		  dimension     3
+		  columns       2
+		  graphic       2
+		  direction     l2r
+		  =>iso-ir      177
+		  mother        ==ucs@unicode))
+  (define-charset-alias '=>>>ucs@ks '==ucs@ks)
+  (make-charset '==ucs-bmp@ks
+		"ISO/IEC 10646 BMP for KS."
+		'(long-name	"BMP for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  =>iso-ir	177
-		  mother	==ucs@jis))
-  (make-charset '==ucs@JP
-		"UCS for common glyph-images used in Japan."
-		'(long-name	"UCS for Japan"
+		  mother	==ucs@ks
+		  min-code	#x0000
+		  max-code	#xFFFF))
+  (make-charset '==ucs@cns11643
+		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw."
+		'(long-name	"UCS for CNS11643"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@jis/2004))
-  (make-charset '==ucs@JP/hanazono
-		"Japanese glyph-images of Hanazono Mincho."
-		'(long-name	"UCS for Hana-Min"
+		  mother	==ucs@cns))
+
+  (make-charset '===ucs@iso
+		"ISO/IEC 10646-2 representative glyph-images."
+		'(long-name	"ISO rep-images for UCS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@JP))
-  (make-charset '==ucs@ks
-		"ISO/IEC 10646 for Korean Standards."
-		'(long-name	"UCS for KS"
+		  mother	==ucs@iso))
+  (make-charset '===ucs@unicode
+		"Unicode for its representative glyph-images."
+		'(long-name	"UCS for Unicode"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@unicode))
-  (make-charset '==ucs-bmp@ks
-		"ISO/IEC 10646 BMP for KS."
-		'(long-name	"BMP for KS"
+		  mother	===ucs@iso))
+  (make-charset '===ucs@gb
+		"UCS representative glyph-images of GB."
+		'(long-name	"UCS rep-images for GB"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	==ucs@ks
-		  min-code	#x0000
-		  max-code	#xFFFF))
-  (make-charset '==ucs@cns11643
-		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw."
-		'(long-name	"UCS for CNS11643"
+		  =>iso-ir	177
+		  mother	===ucs@unicode))
+  (make-charset '===ucs@ks
+		"UCS representative glyph-images of Korean Standards."
+		'(long-name	"UCS rep-images for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	==ucs@cns))
+		  mother	===ucs@unicode))
 
   (make-charset '=ucs-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
@@ -3202,6 +3688,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '===ucs-bmp-cjk@gb
+   "CJK Characters in BMP with GB representative glyph-images."
+   '(long-name "CJK in BMP@GB"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother ===ucs@gb
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=ucs-bmp-cjk@JP
    "CJK Characters in BMP with JIS representative glyphs"
    '(long-name "CJK in BMP@JP"
@@ -3342,11 +3843,24 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "\\(iso10646\\|ucs02\\)-2$"
+	       registry "\\(iso10646\\|ucs00\\)-2$"
 	       mother ucs
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
   (make-charset
+   '=ucs-sip@iso
+   "CJK Ideographs Extension B (ISO/IEC 10646-2)"
+   '(long-name "UCS CJK Ext-B"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =ucs@iso
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
    '=ucs-sip-ext-b@iso
    "CJK Ideographs Extension B (ISO/IEC 10646-2)"
    '(long-name "UCS CJK Ext-B"
@@ -3355,11 +3869,23 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "\\(iso10646\\|ucs02\\)-2$"
+	       registry "\\(iso10646\\|ucs00\\)-2$"
 	       mother =ucs@iso
 	       min-code #x20000 max-code #x2A6D6
 	       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"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "\\(ucs00\\)-2$"
+	       mother ==ucs@iso
+	       code-offset #x20000))
+  (make-charset
    '==ucs-sip-ext-b@iso
    "CJK Ideographs Extension B (ISO/IEC 10646-2)"
    '(long-name "UCS CJK Ext-B"
@@ -3368,10 +3894,35 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       registry "\\(iso10646\\|ucs02\\)-2$"
+	       registry "\\(iso10646\\|ucs00\\)-2$"
 	       mother ==ucs@iso
 	       min-code #x20000 max-code #x2A6D6
 	       code-offset #x20000))
+  (make-charset
+   '===ucs-sip@iso
+   "ISO representative glyph-images of ISO/IEC 10646 Plane 2"
+   '(long-name "SIP rep-glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "\\(ucs00\\)-2$"
+	       mother ===ucs@iso
+	       code-offset #x20000))
+  (make-charset
+   '===ucs-sip-ext-b@iso
+   "CJK Ideographs Extension B (ISO/IEC 10646-2)"
+   '(long-name "UCS CJK Ext-B"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "\\(iso10646\\|ucs00\\)-2$"
+	       mother ===ucs@iso
+	       min-code #x20000 max-code #x2A6D6
+	       code-offset #x20000))
   )
 
 ;;; mule-conf.el ends here