(=cns11643-7): Renamed from `chinese-cns11643-7'.

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

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index bc9450d..6837318 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -25,6 +25,16 @@
 
 ;;; Code:
 
+(define-charset-alias 'japanese-jisx0208-1978  '=jis-x0208-1978)
+(define-charset-alias 'chinese-gb2312          '=gb2312)
+(define-charset-alias 'japanese-jisx0208       '=jis-x0208-1983)
+(define-charset-alias 'korean-ksc5601          '=ks-x1001)
+(define-charset-alias 'japanese-jisx0212       '=jis-x0212)
+(define-charset-alias 'chinese-cns11643-1      '=cns11643-1)
+(define-charset-alias 'chinese-cns11643-2      '=cns11643-2)
+(define-charset-alias 'chinese-gb12345         '=gb12345)
+(define-charset-alias 'chinese-big5            '=big5)
+
 ;; PinYin-ZhuYin
 (make-charset 'sisheng "PinYin-ZhuYin"
              '(registry "sisheng_cwnn\\|OMRON_UDC_ZH"
@@ -63,14 +73,15 @@
 ;; ISO-IR-165 (CCITT Extended GB)
 ;;    It is based on CCITT Recommendation T.101, includes GB 2312-80 +
 ;;    GB 8565-88 table A4 + 293 characters.
-(make-charset
- 'chinese-isoir165
- "ISO-IR-165 (CCITT Extended GB; Chinese simplified)"
- `(registry "isoir165"
-   dimension 2
-   chars 94
-   final ?E
-   graphic 0))
+(make-charset '=iso-ir165
+             "ISO-IR-165 (CCITT Extended GB; Chinese simplified)"
+             '(iso-ir 165
+                      dimension 2
+                      chars 94
+                      final ?E
+                      registry "isoir165"
+                      graphic 0))
+(define-charset-alias 'chinese-isoir165 '=iso-ir165)
 
 ;; CNS11643 Plane3 thru Plane7
 ;; These represent more and more obscure Chinese characters.
@@ -80,21 +91,27 @@
 
 (flet
     ((make-chinese-cns11643-charset
-      (name plane final)
+      (name iso-ir plane final)
       (make-charset
        name (concat "CNS 11643 Plane " plane " (Chinese traditional)")
-       `(registry 
+       `(iso-ir ,iso-ir
+        registry 
         ,(concat "CNS11643[.-]\\(.*[.-]\\)?" plane "$")
         dimension 2
         chars 94
         final ,final
         graphic 0))
       ))
-  (make-chinese-cns11643-charset 'chinese-cns11643-3 "3" ?I)
-  (make-chinese-cns11643-charset 'chinese-cns11643-4 "4" ?J)
-  (make-chinese-cns11643-charset 'chinese-cns11643-5 "5" ?K)
-  (make-chinese-cns11643-charset 'chinese-cns11643-6 "6" ?L)
-  (make-chinese-cns11643-charset 'chinese-cns11643-7 "7" ?M)
+  (make-chinese-cns11643-charset '=cns11643-3 183 "3" ?I)
+  (make-chinese-cns11643-charset '=cns11643-4 184 "4" ?J)
+  (make-chinese-cns11643-charset '=cns11643-5 185 "5" ?K)
+  (make-chinese-cns11643-charset '=cns11643-6 186 "6" ?L)
+  (make-chinese-cns11643-charset '=cns11643-7 187 "7" ?M)
+  (define-charset-alias 'chinese-cns11643-3    '=cns11643-3)
+  (define-charset-alias 'chinese-cns11643-4    '=cns11643-4)
+  (define-charset-alias 'chinese-cns11643-5    '=cns11643-5)
+  (define-charset-alias 'chinese-cns11643-6    '=cns11643-6)
+  (define-charset-alias 'chinese-cns11643-7    '=cns11643-7)
   )
 
 ;; JIS X 0213:2000
@@ -103,20 +120,22 @@
       (make-charset
        '=jis-x0213-1-2000
        "JIS X 0213:2000 Plain 1"
-       '(registry "jisx0213\\(\\.2000\\)-1"
-                 dimension 2
-                 chars 94
-                 mother =jis-x0208-1990
-                 final ?O
-                 graphic 0))
+       '(iso-ir 228
+               registry "jisx0213\\(\\.2000\\)-1"
+               dimension 2
+               chars 94
+               mother =jis-x0208-1990
+               final ?O
+               graphic 0))
       (make-charset
        '=jis-x0213-2-2000
        "JIS X 0213:2000 Plain 2"
-       '(registry "jisx0213\\(\\.2000\\)-2"
-                 dimension 2
-                 chars 94
-                 final ?P
-                 graphic 0))
+       '(iso-ir 229
+               registry "jisx0213\\(\\.2000\\)-2"
+               dimension 2
+               chars 94
+               final ?P
+               graphic 0))
       (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1-2000)
       (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2-2000)
       )
@@ -201,7 +220,7 @@
                  direction     l2r
                  mother        =ucs))
   (define-charset-alias 'ucs-ks '=ucs@ks)
-  (make-charset 'ucs-big5
+  (make-charset '=ucs@big5
                "UCS for Big5"
                `(long-name     "ISO/IEC 10646 for Big5"
                  chars         256
@@ -210,6 +229,7 @@
                  graphic       2
                  direction     l2r
                  mother        =ucs))
+  (define-charset-alias 'ucs-big5 '=ucs@big5)
 
   (make-charset 'ideograph-daikanwa
                "Daikanwa"