(japanese-jisx0213-a): New supplementary charset.

(japanese-jisx0213.2004-1): New charset.

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index a03cb38eb5832d051740ed4d683f1250bf743f96..1d0685f64ad66cac7ec07db2a72ae7f677d5cf0c 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -402,7 +402,7 @@
 ;; Note that jisx0213 contains characters not in Unicode (3.2?).  It's
 ;; arguable whether it should have a unify-map.
 (define-charset 'japanese-jisx0213-1
-  "JISX0213 Plane 1 (Japanese)"
+  "JISX0213.2000 Plane 1 (Japanese)"
   :short-name "JISX0213-1"
   :iso-final-char ?O
   :emacs-mule-id  151
@@ -411,7 +411,7 @@
   :code-offset #x14C000)
 
 (define-charset 'japanese-jisx0213-2
-  "JISX0213 Plane 2 (Japanese)"
+  "JISX0213.2000 Plane 2 (Japanese)"
   :short-name "JISX0213-2"
   :iso-final-char ?P
   :emacs-mule-id 254
@@ -419,6 +419,20 @@
   :code-space [33 126 33 126]
   :code-offset #x150000)
 
+(define-charset 'japanese-jisx0213-a
+  "JISX0213.2004 adds these characters to JISX0213.2000."
+  :short-name "JISX0213A"
+  :dimension 2
+  :code-space [33 126 33 126]
+  :supplementary-p t
+  :map "JISX213A")
+
+(define-charset 'japanese-jisx0213.2004-1
+  "JISX0213.2004 Plane1 (Japanese)"
+  :short-name "JISX0213.2004-1"
+  :iso-final-char ?Q
+  :superset '(japanese-jisx0213-a japanese-jisx0213-1))
+
 (define-charset 'katakana-sjis
   "Katakana part of Shift-JIS"
   :dimension 1