From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Fri, 7 Sep 2012 10:31:35 +0000 (+0900)
Subject: Define coded-charsets about Adobe-Japan1 at the top.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=6f825ac265c01306eace27257a3c6d594605e6c3;p=chise%2Fxemacs-chise.git-

Define coded-charsets about Adobe-Japan1 at the top.
---

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 094e1f9..c59c751 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -29,6 +29,282 @@
 (cond
  ((featurep 'utf-2000)
   (make-charset
+   '=adobe-japan1-base
+   "Adobe-Japan1 Character Collection for CID-Keyed Fonts"
+   `(long-name "Adobe-Japan1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "AdobeJapan1-[0-6]$"
+	       min-code	,(lsh #x6300 16)
+	       max-code	,(+ (lsh #x6300 16) 23057)
+	       code-offset	,(lsh #x6300 16)))
+  (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
+	       mother =adobe-japan1-base
+	       min-code 0
+	       max-code 8283
+	       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
+	       min-code 0
+	       max-code 8358
+	       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
+	       min-code 0
+	       max-code 8719
+	       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
+	       min-code 0
+	       max-code 9353
+	       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
+	       min-code 0
+	       max-code 15443
+	       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
+	       min-code 0
+	       max-code 20316
+	       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
+	       min-code 0
+	       max-code 23057
+	       registry "AdobeJapan1-6$"))
+  (define-charset-alias '=adobe-japan1 '=adobe-japan1-6)
+
+  (make-charset
+   '=>>>adobe-japan1-0
+   "Adobe-Japan1-0 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-0 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-0
+	       registry "AdobeJapan1-0$"))
+  (make-charset
+   '=>>>adobe-japan1-1
+   "Adobe-Japan1-1 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-1 abstract glyph-forms"
+	       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 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-2 abstract glyph-forms"
+	       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 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-3 abstract glyph-forms"
+	       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 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-4 abstract glyph-forms"
+	       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 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-5 abstract glyph-forms"
+	       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 abstract glyph-forms"
+   '(long-name "Adobe-Japan1-6 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-5
+	       registry "AdobeJapan1-6$"))
+  (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
+
+  (make-charset
+   '=>>adobe-japan1-0
+   "Adobe-Japan1-0 abstract glyphs"
+   '(long-name "Adobe-Japan1-0 abstract glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1
+	       registry "AdobeJapan1-0$"))
+  (make-charset
+   '=>>adobe-japan1-1
+   "Adobe-Japan1-1 abstract glyphs"
+   '(long-name "Adobe-Japan1-1 abstract glyphs"
+	       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 abstract glyphs"
+   '(long-name "Adobe-Japan1-2 abstract glyphs"
+	       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 abstract glyphs"
+   '(long-name "Adobe-Japan1-3 abstract glyphs"
+	       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 abstract glyphs"
+   '(long-name "Adobe-Japan1-4 abstract glyphs"
+	       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 abstract glyphs"
+   '(long-name "Adobe-Japan1-5 abstract glyphs"
+	       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 abstract glyphs"
+   '(long-name "Adobe-Japan1-6 abstract glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>adobe-japan1-5
+	       registry "AdobeJapan1-6"))
+  (define-charset-alias '=>>adobe-japan1 '=>>adobe-japan1-6)
+
+  (make-charset
+   '=+>adobe-japan1
+   "Adobe-Japan1 unified abstract glyphs"
+   '(long-name "Adobe-Japan1 unified abstract glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>adobe-japan1
+	       registry "AdobeJapan1-6$"))
+
+  (make-charset
    '=jis-x0208@1978
    "JIS X 0208:1978, unchanged part."
    '(registry "jisx0208\\.1978"
@@ -488,496 +764,220 @@
 	      ))
 
   (make-charset
-   '=+>jis-x0208
-   "JIS X 0208 based on usual unification."
-   '(registry "jisx0208\\.1990"
-	      dimension 2
-	      chars 94
-	      mother =>>jis-x0208
-	      =>iso-ir 168
-	      ;; final ?B
-	      graphic 0))
-  (define-charset-alias '=>jis-x0208@usual '=+>jis-x0208)
-  (make-charset
-   '=+>jis-x0208@1978
-   "JIS X 0208:1978 unified abstract glyphs."
-   '(registry "jisx0208\\.1978"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0208
-	      =>iso-ir 42
-	      ;; final ?@
-	      graphic 0))
-  (make-charset
-   '=+>jis-x0208@1983
-   "JIS X 0208:1983 unified abstract glyphs."
-   '(registry "jisx0208\\.1983"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0208
-	      =>iso-ir 87
-	      graphic 0))
-  (make-charset
-   '=+>jis-x0208@1990
-   "JIS X 0208:1990 unified abstract glyphs."
-   '(registry "jisx0208\\.1990"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0208
-	      =>iso-ir 168
-	      graphic 0))
-  (make-charset
-   '=+>jis-x0213-1
-   "JIS X 0213 Plain 1 unified abstract glyphs (unchanged part)"
-   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
-	      dimension 2
-	      chars 94
-	      mother =>>jis-x0213-1
-	      =>iso-ir 228
-              ;; final ?O
-	      graphic 0
-              ;; partial t
-	      ))
-  (make-charset
-   '=+>jis-x0213-1@2000
-   "JIS X 0213:2000 Plain 1 unified abstract glyphs"
-   '(registry "jisx0213\\(\\.2000\\)-1"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0213-1
-	      =>iso-ir 228
-              ;; final ?O
-	      graphic 0
-	      ;; partial t
-	      ))
-
-  (make-charset
-   '=>jis-x0208
-   "JIS X 0208 based on the unchanged unification rules."
-   '(registry "jisx0208\\.1990"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0208
-	      =>iso-ir 168
-	      ;; final ?B
-	      graphic 0))
-  (define-charset-alias '<=>jis-x0208 '=>jis-x0208)
-  (make-charset
-   '=>jis-x0208@1997
-   "JIS X 0208 based on the unification rule of 1997 edition."
-   '(registry "jisx0208\\.1990"
-	      dimension 2
-	      chars 94
-	      mother =>jis-x0208
-	      =>iso-ir 168
-	      ;; final ?B
-	      graphic 0))
-  (define-charset-alias '<=>jis-x0208@1997 '=>jis-x0208@1997)
-  (define-charset-alias '  =jis-x0208@1997 '=>jis-x0208@1997)
-
-  (make-charset
-   '=>jis-x0213-1
-   "JIS X 0213 Plain 1 abstract characters (unchanged part)"
-   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
-	      dimension 2
-	      chars 94
-	      mother =+>jis-x0213-1
-	      =>iso-ir 228
-              ;; final ?O
-	      graphic 0
-              ;; partial t
-	      ))
-  (define-charset-alias '<=>jis-x0213-1 '=>jis-x0213-1)
-  (make-charset
-   '=>jis-x0213-1@2000
-   "JIS X 0213:2000 Plain 1 abstract characters"
-   '(registry "jisx0213\\(\\.2000\\)-1"
-	      dimension 2
-	      chars 94
-	      mother =>jis-x0213-1
-	      =>iso-ir 228
-              ;; final ?O
-	      graphic 0
-	      ;; partial t
-	      ))
-  (define-charset-alias '<=>jis-x0213-1@2000 '=>jis-x0213-1@2000)
-  (make-charset
-   '=>jis-x0213-1@2004
-   "JIS X 0213:2004 Plain 1 abstract characters"
-   '(registry "jisx0213\\(\\.2004\\)-1"
-	      dimension 2
-	      chars 94
-	      mother =>jis-x0213-1
-	      =>iso-ir 233
-              ;; final ?Q
-	      graphic 0
-              ;; partial t
-	      ))
-  (define-charset-alias '<=>jis-x0213-1@2004 '=>jis-x0213-1@2004)
-  (make-charset
-   '=+>jis-x0213-2
-   "JIS X 0213 Plain 2 based on usual unification."
-   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
-	      dimension 2
-	      chars 94
-	      mother =>>jis-x0213-2
-	      =>iso-ir 229
-              ;; final ?P
-	      graphic 0))
-  (define-charset-alias '=>jis-x0213-2@usual '=+>jis-x0213-2)
-  (make-charset
-   '=>jis-x0213-2
-   "JIS X 0213 Plain 2 abstract characters"
-   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+   '=+>jis-x0208
+   "JIS X 0208 based on usual unification."
+   '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother =+>jis-x0213-2
-	      =>iso-ir 229
-              ;; final ?P
+	      mother =>>jis-x0208
+	      =>iso-ir 168
+	      ;; final ?B
 	      graphic 0))
-
+  (define-charset-alias '=>jis-x0208@usual '=+>jis-x0208)
   (make-charset
-   '=>>cns11643-4
-   "CNS 11643 Plane 4 abstract glyphs."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+   '=+>jis-x0208@1978
+   "JIS X 0208:1978 unified abstract glyphs."
+   '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-4
-	      =>iso-ir 184
+	      mother =+>jis-x0208
+	      =>iso-ir 42
+	      ;; final ?@
 	      graphic 0))
-
   (make-charset
-   '=>cns11643-2
-   "CNS 11643 Plane 2 abstract characters."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+   '=+>jis-x0208@1983
+   "JIS X 0208:1983 unified abstract glyphs."
+   '(registry "jisx0208\\.1983"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-2
-	      =>iso-ir 172
+	      mother =+>jis-x0208
+	      =>iso-ir 87
 	      graphic 0))
   (make-charset
-   '=>cns11643-7
-   "CNS 11643 Plane 7 abstract characters."
-   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
+   '=+>jis-x0208@1990
+   "JIS X 0208:1990 unified abstract glyphs."
+   '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
-	      mother =cns11643-7
-	      =>iso-ir 187
+	      mother =+>jis-x0208
+	      =>iso-ir 168
 	      graphic 0))
-
-  (make-charset '=big5-eten
-		"Big5 ETEN"
-		'(long-name	"Big5-ETEN"
-		  chars		256
-		  dimension	2
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  mother	chinese-big5
-		  min-code	#x8140
-		  max-code	#xFEFE
-		  registry	"Big5\\.ETEN"))
-  (define-charset-alias 'chinese-big5-eten '=big5-eten)
-  (make-charset 'chinese-big5-eten-a
-		"Big5 ETEN (#xF9D6 .. #xF9FE)"
-		'(long-name	"Big5-ETEN-a"
-		  chars		256
-		  dimension	2
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  mother	chinese-big5
-		  min-code	#xF9D6
-		  max-code	#xF9FE
-		  registry	"Big5\\.ETEN"))
-  (make-charset 'chinese-big5-eten-b
-		"Big5 ETEN (#xC6A1 .. #xC8FE)"
-		'(long-name	"Big5-ETEN-b"
-		  chars		256
-		  dimension	2
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  mother	chinese-big5
-		  min-code	#xC6A1
-		  max-code	#xC8FE
-		  registry	"Big5\\.ETEN"))
-
-  (make-charset
-   '=adobe-japan1-base
-   "Adobe-Japan1 Character Collection for CID-Keyed Fonts"
-   `(long-name "Adobe-Japan1"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       registry "AdobeJapan1-[0-6]$"
-	       min-code	,(lsh #x6300 16)
-	       max-code	,(+ (lsh #x6300 16) 23057)
-	       code-offset	,(lsh #x6300 16)))
-  (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
-	       mother =adobe-japan1-base
-	       min-code 0
-	       max-code 8283
-	       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
-	       min-code 0
-	       max-code 8358
-	       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
-	       min-code 0
-	       max-code 8719
-	       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
-	       min-code 0
-	       max-code 9353
-	       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
-	       min-code 0
-	       max-code 15443
-	       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
-	       min-code 0
-	       max-code 20316
-	       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
-	       min-code 0
-	       max-code 23057
-	       registry "AdobeJapan1-6$"))
-  (define-charset-alias '=adobe-japan1 '=adobe-japan1-6)
-
-  (make-charset
-   '=>>>adobe-japan1-0
-   "Adobe-Japan1-0 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-0 abstract glyph-forms"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =adobe-japan1-0
-	       registry "AdobeJapan1-0$"))
-  (make-charset
-   '=>>>adobe-japan1-1
-   "Adobe-Japan1-1 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-1 abstract glyph-forms"
-	       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 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-2 abstract glyph-forms"
-	       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 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-3 abstract glyph-forms"
-	       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 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-4 abstract glyph-forms"
-	       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 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-5 abstract glyph-forms"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>>adobe-japan1-4
-	       registry "AdobeJapan1-5$"))
+   '=+>jis-x0213-1
+   "JIS X 0213 Plain 1 unified abstract glyphs (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+              ;; partial t
+	      ))
   (make-charset
-   '=>>>adobe-japan1-6
-   "Adobe-Japan1-6 abstract glyph-forms"
-   '(long-name "Adobe-Japan1-6 abstract glyph-forms"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>>adobe-japan1-5
-	       registry "AdobeJapan1-6$"))
-  (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
+   '=+>jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1 unified abstract glyphs"
+   '(registry "jisx0213\\(\\.2000\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =+>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+	      ;; partial t
+	      ))
 
   (make-charset
-   '=>>adobe-japan1-0
-   "Adobe-Japan1-0 abstract glyphs"
-   '(long-name "Adobe-Japan1-0 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>>adobe-japan1
-	       registry "AdobeJapan1-0$"))
+   '=>jis-x0208
+   "JIS X 0208 based on the unchanged unification rules."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =+>jis-x0208
+	      =>iso-ir 168
+	      ;; final ?B
+	      graphic 0))
+  (define-charset-alias '<=>jis-x0208 '=>jis-x0208)
   (make-charset
-   '=>>adobe-japan1-1
-   "Adobe-Japan1-1 abstract glyphs"
-   '(long-name "Adobe-Japan1-1 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-0
-	       registry "AdobeJapan1-1"))
+   '=>jis-x0208@1997
+   "JIS X 0208 based on the unification rule of 1997 edition."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0208
+	      =>iso-ir 168
+	      ;; final ?B
+	      graphic 0))
+  (define-charset-alias '<=>jis-x0208@1997 '=>jis-x0208@1997)
+  (define-charset-alias '  =jis-x0208@1997 '=>jis-x0208@1997)
+
   (make-charset
-   '=>>adobe-japan1-2
-   "Adobe-Japan1-2 abstract glyphs"
-   '(long-name "Adobe-Japan1-2 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-1
-	       registry "AdobeJapan1-2"))
+   '=>jis-x0213-1
+   "JIS X 0213 Plain 1 abstract characters (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+	      dimension 2
+	      chars 94
+	      mother =+>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+              ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1 '=>jis-x0213-1)
   (make-charset
-   '=>>adobe-japan1-3
-   "Adobe-Japan1-3 abstract glyphs"
-   '(long-name "Adobe-Japan1-3 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-2
-	       registry "AdobeJapan1-3"))
+   '=>jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1 abstract characters"
+   '(registry "jisx0213\\(\\.2000\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+	      ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1@2000 '=>jis-x0213-1@2000)
   (make-charset
-   '=>>adobe-japan1-4
-   "Adobe-Japan1-4 abstract glyphs"
-   '(long-name "Adobe-Japan1-4 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-3
-	       registry "AdobeJapan1-4"))
+   '=>jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 abstract characters"
+   '(registry "jisx0213\\(\\.2004\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0213-1
+	      =>iso-ir 233
+              ;; final ?Q
+	      graphic 0
+              ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1@2004 '=>jis-x0213-1@2004)
   (make-charset
-   '=>>adobe-japan1-5
-   "Adobe-Japan1-5 abstract glyphs"
-   '(long-name "Adobe-Japan1-5 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-4
-	       registry "AdobeJapan1-5"))
+   '=+>jis-x0213-2
+   "JIS X 0213 Plain 2 based on usual unification."
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
+	      graphic 0))
+  (define-charset-alias '=>jis-x0213-2@usual '=+>jis-x0213-2)
   (make-charset
-   '=>>adobe-japan1-6
-   "Adobe-Japan1-6 abstract glyphs"
-   '(long-name "Adobe-Japan1-6 abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1-5
-	       registry "AdobeJapan1-6"))
-  (define-charset-alias '=>>adobe-japan1 '=>>adobe-japan1-6)
+   '=>jis-x0213-2
+   "JIS X 0213 Plain 2 abstract characters"
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =+>jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
+	      graphic 0))
 
   (make-charset
-   '=+>adobe-japan1
-   "Adobe-Japan1 unified abstract glyphs"
-   '(long-name "Adobe-Japan1 unified abstract glyphs"
-	       chars 256
-	       dimension 2
-	       columns 2
-	       graphic 2
-	       direction l2r
-	       mother =>>adobe-japan1
-	       registry "AdobeJapan1-6$"))
+   '=>>cns11643-4
+   "CNS 11643 Plane 4 abstract glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-4
+	      =>iso-ir 184
+	      graphic 0))
+
+  (make-charset
+   '=>cns11643-2
+   "CNS 11643 Plane 2 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-2
+	      =>iso-ir 172
+	      graphic 0))
+  (make-charset
+   '=>cns11643-7
+   "CNS 11643 Plane 7 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-7
+	      =>iso-ir 187
+	      graphic 0))
+
+  (make-charset '=big5-eten
+		"Big5 ETEN"
+		'(long-name	"Big5-ETEN"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	chinese-big5
+		  min-code	#x8140
+		  max-code	#xFEFE
+		  registry	"Big5\\.ETEN"))
+  (define-charset-alias 'chinese-big5-eten '=big5-eten)
+  (make-charset 'chinese-big5-eten-a
+		"Big5 ETEN (#xF9D6 .. #xF9FE)"
+		'(long-name	"Big5-ETEN-a"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	chinese-big5
+		  min-code	#xF9D6
+		  max-code	#xF9FE
+		  registry	"Big5\\.ETEN"))
+  (make-charset 'chinese-big5-eten-b
+		"Big5 ETEN (#xC6A1 .. #xC8FE)"
+		'(long-name	"Big5-ETEN-b"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	chinese-big5
+		  min-code	#xC6A1
+		  max-code	#xC8FE
+		  registry	"Big5\\.ETEN"))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"