(M-26872): Unify JC3-5EF3 and M054342.

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

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index c2cc7b9..27ac38a 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997,1999,2000,2002 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2000,2002,2003 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -98,26 +98,68 @@
   )
 
 ;; JIS X 0213:2000
-(make-charset
- 'japanese-jisx0213-1
- "JIS X 0213:2000 Plain 1"
- '(registry "jisx0213\\(\\.2000\\)-1"
-   dimension 2
-   chars 94
-   final ?O
-   graphic 0))
-
-(make-charset
- 'japanese-jisx0213-2
- "JIS X 0213:2000 Plain 2"
- '(registry "jisx0213\\(\\.2000\\)-2"
-   dimension 2
-   chars 94
-   final ?P
-   graphic 0))
+(if (featurep 'utf-2000)
+    (progn
+      (make-charset
+       '=jis-x0213-1-2000
+       "JIS X 0213:2000 Plain 1"
+       '(registry "jisx0213\\(\\.2000\\)-1"
+                 dimension 2
+                 chars 94
+                 mother japanese-jisx0208-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))
+      (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1-2000)
+      (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2-2000)
+      )
+  (make-charset
+   'japanese-jisx0213-1
+   "JIS X 0213:2000 Plain 1"
+   '(registry "jisx0213\\(\\.2000\\)-1"
+             dimension 2
+             chars 94
+             final ?O
+             graphic 0))
+  (make-charset
+   'japanese-jisx0213-2
+   "JIS X 0213:2000 Plain 2"
+   '(registry "jisx0213\\(\\.2000\\)-2"
+             dimension 2
+             chars 94
+             final ?P
+             graphic 0))
+  )
 
 (when (featurep 'utf-2000)
   (make-charset
+   '=ucs-jis-1990
+   "UCS for JIS:1990"
+   `(long-name "ISO/IEC 10646 for JIS X 0208/0212:1990"
+              chars 256
+              dimension 3
+              columns 2
+              graphic 2
+              direction l2r
+              mother ucs-jis))
+  (make-charset
+   '=ucs-jis-2000
+   "UCS for JIS:2000"
+   `(long-name "ISO/IEC 10646 for JIS X 0213:2000"
+              chars 256
+              dimension 3
+              columns 2
+              graphic 2
+              direction l2r
+              mother ucs-jis))
+  (make-charset
    'chinese-big5-pua
    "Big5-PUA"
    `(long-name "Big5 with private used area"
@@ -179,6 +221,65 @@
               ;; code-offset ,(lsh #x6200 16)
               mother chinese-big5
               min-code #x8140 max-code #x8DFE))
+  (make-charset
+   'ideograph-gt-k
+   "GT parts"
+   `(long-name "Ideographic parts of GT"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry ""
+              min-code ,(lsh #x6110 16)
+              max-code ,(+ (lsh #x6110 16) 17090)
+              code-offset ,(lsh #x6110 16)))
+  (make-charset
+   'ideograph-gt-pj-k1
+   "GT K1"
+   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 1"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 0
+              direction l2r
+              registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
+  (make-charset
+   'ideograph-gt-pj-k2
+   "GT K2"
+   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 2"
+              chars 94
+              dimension 2
+              columns 2
+              graphic 0
+              direction l2r
+              registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
+  (make-charset 'ideograph-cbeta "CBETA PUA"
+               '(long-name
+                 "CBETA private characters"
+                 chars         256
+                 dimension     2
+                 registry      "cbeta-0"
+                 graphic       2
+                 min-code      #xE20000
+                 max-code      #xE2FFFF
+                 code-offset   #xE20000
+                 columns       2
+                 direction     l2r))
+  (make-charset
+   '=jef-china3
+   "JEF + CHINA3"
+   `(long-name "JEF + CHINA3 private characters"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "china3jef-0"
+              min-code #xE80000
+              max-code #xE8FFFF
+              code-offset #xE80000))
+  (define-charset-alias 'china3-jef '=jef-china3)
   )
 
 ;;; mule-conf.el ends here