Sync up with r21-4-11-chise-0_21-=daikanwa-rev1+2.

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

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 339e89e..0d7960c 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -106,7 +106,7 @@
        '(registry "jisx0213\\(\\.2000\\)-1"
                  dimension 2
                  chars 94
-                 mother japanese-jisx0208-1990
+                 mother =jis-x0208-1990
                  final ?O
                  graphic 0))
       (make-charset
@@ -139,6 +139,26 @@
   )
 
 (when (featurep 'utf-2000)
+  (define-charset-alias 'ucs '=ucs)
+  (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208-1990)
+  (make-charset 'ucs-gb
+               "UCS for GB"
+               `(long-name     "ISO/IEC 10646 for GB"
+                 chars         256
+                 dimension     3
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =ucs))
+  (make-charset 'ucs-cns
+               "UCS for CNS"
+               `(long-name     "ISO/IEC 10646 for CNS 11643"
+                 chars         256
+                 dimension     3
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =ucs))
   (make-charset 'ucs-jis
                "UCS for JIS"
                `(long-name     "ISO/IEC 10646 for JIS X0208/0212/0213"
@@ -147,7 +167,7 @@
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        ucs))
+                 mother        =ucs))
   (make-charset '=ucs-jis-1990
                "UCS for JIS:1990"
                `(long-name     "ISO/IEC 10646 for JIS X 0208/0212:1990"
@@ -174,7 +194,7 @@
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        ucs))
+                 mother        =ucs))
   (make-charset 'ucs-big5
                "UCS for Big5"
                `(long-name     "ISO/IEC 10646 for Big5"
@@ -183,9 +203,22 @@
                  columns       2
                  graphic       2
                  direction     l2r
-                 mother        ucs))
+                 mother        =ucs))
+
+  (make-charset 'ideograph-daikanwa
+               "Daikanwa"
+               `(long-name     "Daikanwa dictionary (revised version 2)"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Daikanwa\\(\\.[0-9]+\\)?-3"
+                 min-code      #xE00000
+                 max-code      ,(+ #xE00000 50100)
+                 code-offset   #xE00000))
 
-  (make-charset 'ideograph-daikanwa-2
+  (make-charset '=daikanwa-rev1
                "Daikanwa Rev."
                `(long-name     "Daikanwa dictionary (revised version)"
                  chars         256
@@ -194,8 +227,9 @@
                  graphic       2
                  direction     l2r
                  registry      "Daikanwa\\(\\.[0-9]+\\)?-2"))
+  (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa-rev1)
 
-  (make-charset 'ideograph-daikanwa
+  (make-charset '=daikanwa-rev2
                "Daikanwa"
                `(long-name     "Daikanwa dictionary (revised version 2)"
                  chars         256