Apply new glyph-image conventions for `ucs@*', `adobe-japan1-*',

[chise/xemacs-chise.git-] / lisp / mule / mule-conf.el

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 69b0f23..6f03d11 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -404,34 +404,46 @@
            final ?@
            graphic 0))
   (make-charset
-   '=jis-x0208@1978/-4X
-   "JIS X 0208:1978, index before the 4th impression."
+   '=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
+             mother =jis-x0208@1978/1pr
              =>iso-ir 42
-              ;; final ?@
+             ;; final ?@
              graphic 0
              partial t))
   (make-charset
-   '=jis-x0208@1978/1er-pr
-   "JIS X 0208:1978, fixed by errata [Nov 1978]."
+   '=jis-x0208@1978/-4X
+   "JIS X 0208:1978, index before the 4th impression."
    '(registry "jisx0208\\.1978"
              dimension 2
              chars 94
              mother =jis-x0208@1978
-              =>iso-ir 42
-             ;; final ?@
+             =>iso-ir 42
+              ;; final ?@
              graphic 0
              partial t))
+  ;; (make-charset
+  ;;  '=jis-x0208@1978/1er-pr
+  ;;  "JIS X 0208:1978, fixed by errata [Nov 1978]."
+  ;;  '(registry "jisx0208\\.1978"
+  ;;             dimension 2
+  ;;             chars 94
+  ;;             mother =jis-x0208@1978
+  ;;             =>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/1er-pr
+             mother =jis-x0208@1978
               =>iso-ir 42
              ;; final ?@
              graphic 0
@@ -1011,6 +1023,15 @@
              =>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$"
@@ -2547,16 +2568,16 @@
               ;; max-code #xA4CF
               ))
   (make-charset
-   '=ucs-bmp-cjk@unicode
-   "CJK Characters in BMP of Unicode"
-   '(long-name "Unicode-BMP-CJK"
+   '=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@unicode
+              mother =ucs@gb
               min-code #x2E00
                max-code #x9FA5
               ;; max-code #xA4CF
@@ -2665,6 +2686,20 @@
               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"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "-ja-.*-ucs-0"
+              mother =+>ucs@jis
+              min-code #xF900
+              max-code #xFAFF
+              ))
+  (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
    '(long-name "UCS CJK Ext-B"