Sync up with r21-4-21-chise-0_24-=jis-x0213-1.
[chise/xemacs-chise.git] / lisp / mule / mule-conf.el
index 813fae7..ce6b22f 100644 (file)
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997,1999,2000,2002,2003,2004 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2000,2002,2003,2004,2005,2006,2008 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
   )
 
 ;; JIS X 0213:2000
-(if (featurep 'utf-2000)
-    (progn
-      (make-charset
-       '=jis-x0213-1-2000
-       "JIS X 0213:2000 Plain 1"
-       '(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"
-       '(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)
-      )
+(cond
+ ((featurep 'utf-2000)
+  (make-charset
+   '=jis-x0213-1
+   "JIS X 0213 Plain 1 (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+             dimension 2
+             chars 94
+             final ?O
+             graphic 0
+             partial t))
+
+  (make-charset
+   '=jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1"
+   '(iso-ir 228
+           registry "jisx0213\\(\\.2000\\)-1"
+           dimension 2
+           chars 94
+           mother =jis-x0213-1
+           final ?O
+           graphic 0))
+  (make-charset
+   '=jis-x0213-2
+   "JIS X 0213 Plain 2"
+   '(iso-ir 229
+           registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+           dimension 2
+           chars 94
+           final ?P
+           graphic 0))
+
+  (make-charset
+   '=jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1"
+   '(iso-ir 233
+           registry "jisx0213\\(\\.2004\\)-1"
+           dimension 2
+           chars 94
+           mother =jis-x0213-1
+           final ?Q
+           graphic 0))
+
+  (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1@2000)
+  (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2)
+  ;; (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1@2000)
+  (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1)
+  (define-charset-alias '=jis-x0213-2-2000 '=jis-x0213-2)
+  )
+ (t
   (make-charset
    'japanese-jisx0213-1
    "JIS X 0213:2000 Plain 1"
              chars 94
              final ?P
              graphic 0))
-  )
+  ))
 
 (when (featurep 'utf-2000)
   (define-charset-alias 'ucs '=ucs)
              mother =jis-x0208
              ;; final ?B
              graphic 0))
+  (make-charset
+   '=jis-x0208@1978/i1
+   "The first impression of JIS X 0208:1978."
+   '(registry "jisx0208\\.1978"
+             dimension 2
+             chars 94
+             mother =jis-x0208@1978
+             ;; final ?@
+             graphic 0))
+  (make-charset
+   '=jis-x0208@1978/i-4
+   "The second and third impressions of JIS X 0208:1978."
+   '(registry "jisx0208\\.1978"
+             dimension 2
+             chars 94
+             mother =jis-x0208@1978
+             ;; final ?@
+             graphic 0))
 
   (make-charset '=big5-cdp
                "Big5 with CDP extension"
                  ))
   (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
 
+  (make-charset '=shinjigen
+               "Kadokawa ShinJigen dictionary (common parts)"
+               `(long-name     "Shinjigen common parts"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-*"))
+
+  (make-charset '=shinjigen@1ed
+               "Kadokawa ShinJigen dictionary (the first edition)"
+               `(long-name     "Shinjigen-1"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-1"))
+  (define-charset-alias 'shinjigen-1 '=shinjigen@1ed)
+
+  (make-charset '=shinjigen@1ed/24pr
+               "Kadokawa ShinJigen dictionary (the 24th impression)"
+               `(long-name     "Shinjigen-1 24pr"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen@1ed))
+
+  (make-charset '=shinjigen@rev
+               "Kadokawa ShinJigen dictionary (the revised edition)"
+               `(long-name     "Shinjigen-2"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        =shinjigen
+                 registry      "Shinjigen\\(\\.[0-9]+\\)?-2"))
+  (define-charset-alias 'shinjigen-2 '=shinjigen@rev)
+  (make-charset '=shinjigen/+p@rev
+               "ShinJigen (the second edition) number with '"
+               `(long-name     "Shinjigen-2 with '"
+                 chars         256
+                 dimension     2
+                 columns       2
+                 graphic       2
+                 direction     l2r))
+  (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
+
   (make-charset '=big5-pua
                "Big5 with private used area"
                '(long-name     "Big5-PUA"
               direction l2r
               registry "-zh-.*-ucs-0"
               mother =ucs@unicode
-              min-code #x2E00 max-code #xA4CF))
+              min-code #x2E00
+               max-code #x9FA5
+              ;; max-code #xA4CF
+              ))
   (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
               mother =ucs@iso
               min-code #x20000 max-code #x2A6D6
               code-offset #x20000))
+
+  (make-charset
+   '=adobe-japan1-0
+   "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-0"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              registry "AdobeJapan1-0$"))
+  (make-charset
+   '=adobe-japan1-1
+   "Adobe-Japan1-1 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-1"
+              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 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-2"
+              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 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-3"
+              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 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-4"
+              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 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-5"
+              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 Character Collection for CID-Keyed Fonts"
+   '(long-name "Adobe-Japan1-6"
+              chars 256
+              dimension 2
+              columns 2
+              graphic 2
+              direction l2r
+              mother =adobe-japan1-5
+              registry "AdobeJapan1-6$"))
   )
 
 ;;; mule-conf.el ends here