X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=e2e6ec84f858b5ea8cfd2a36ea1a5f078330047c;hb=5f6f6071478ffdcd73a63c351828fce6044085d6;hp=97fb6edeb9491f62687ed14d7fffd498768bc3d9;hpb=28c7323d7dfa456dea73b5b13f0dd985c84c9309;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 97fb6ed..e2e6ec8 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997,1999,2000,2002,2003,2004,2005 MORIOKA Tomohiko
+;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
+;;   2009, 2010 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -25,6 +26,123 @@
 
 ;;; Code:
 
+(cond
+ ((featurep 'utf-2000)
+  (make-charset
+   '=jis-x0208@1978
+   "JIS X 0208:1978, unchanged part."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208
+	      =>iso-ir 42
+	      final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/-4pr
+   "JIS X 0208:1978, 1st - 3rd impressions."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+	      =>iso-ir 42
+	      final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/1pr
+   "JIS X 0208:1978, 1st impression."
+   '(iso-ir 42
+	    registry "jisx0208\\.1978"
+	    dimension 2
+	    chars 94
+	    mother =jis-x0208@1978/-4pr
+	    final ?@
+	    graphic 0))
+  (make-charset
+   '=jis-x0208@1978/-4X
+   "JIS X 0208:1978, index before the 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+	      =>iso-ir 42
+              ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/1er-pr
+   "JIS X 0208:1978, fixed by errata [Nov 1978]."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/2-pr
+   "JIS X 0208:1978, 2nd impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/1er-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/4er
+   "JIS X 0208:1978, replaced by errata of 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/4-pr
+   "JIS X 0208:1978, 4th impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/5pr
+   "JIS X 0208:1978, 5th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/4-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (define-charset-alias '=jis-x0208@1978/i1 '=jis-x0208@1978/1pr)
+  (define-charset-alias '=jis-x0208@1978/i-4 '=jis-x0208@1978/-4pr)
+  (define-charset-alias '=jis-x0208@1978/i4- '=jis-x0208@1978/4-pr)
+  )
+ (t
+  (make-charset
+   '=jis-x0208@1978
+   "JIS X0208:1978 Japanese Kanji (so called \"old JIS\")."
+   '(iso-ir 42
+	    registry "jisx0208\\.1978"
+	    dimension 2
+	    chars 94
+	    mother =jis-x0208
+	    final ?@
+	    graphic 0))
+  ))
+
 (define-charset-alias '=jis-x0208-1978		'=jis-x0208@1978)
 (define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208@1978)
 (define-charset-alias 'chinese-gb2312		'=gb2312)
@@ -128,30 +246,56 @@
   )
 
 ;; 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
+	      =>iso-ir 228
+	      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-2-2000 '=jis-x0213-2)
+  )
+ (t
   (make-charset
    'japanese-jisx0213-1
    "JIS X 0213:2000 Plain 1"
@@ -168,38 +312,153 @@
 	      chars 94
 	      final ?P
 	      graphic 0))
-  )
+  ))
 
 (when (featurep 'utf-2000)
   (define-charset-alias 'ucs '=ucs)
   (define-charset-alias '=jis-x0208-1990 '=jis-x0208@1990)
   (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208@1990)
+
   (make-charset
-   '=jis-x0208@1997
-   "JIS X 0208 based on the unification rule of 1997 edition."
+   '=>>jis-x0208
+   "JIS X 0208 abstract glyphs (unchanged part)."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
 	      mother =jis-x0208
+	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
   (make-charset
-   '=jis-x0208@1978/i1
-   "The first impression of JIS X 0208:1978."
+   '=>>jis-x0208@1978
+   "JIS X 0208:1978 abstract glyphs (unchanged part)."
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208@1978
+	      mother =>>jis-x0208
+	      =>iso-ir 42
 	      ;; final ?@
 	      graphic 0))
+
   (make-charset
-   '=jis-x0208@1978/i-4
-   "The second and third impressions of JIS X 0208:1978."
-   '(registry "jisx0208\\.1978"
+   '=>>jis-x0213-1
+   "JIS X 0213 Plain 1 abstract glyphs (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208@1978
-	      ;; final ?@
+	      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 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-x0213-2
+   "JIS X 0213 Plain 2 abstract glyphs"
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
+	      graphic 0))
+  (make-charset
+   '=>>jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 abstract glyphs"
+   '(registry "jisx0213\\(\\.2004\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 233
+              ;; final ?Q
+	      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 abstract characters"
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
 	      graphic 0))
 
   (make-charset '=big5-cdp
@@ -216,6 +475,28 @@
 		  max-code	#x8DFE))
   (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
 
+  (make-charset '=>>big5-cdp
+		"Abstract glyphs of Big5-CDP"
+		'(long-name	"Big5-CDP glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=big5-cdp))
+
+  (make-charset '=>big5-cdp
+		"Big5-CDP abstract characters"
+		'(long-name	"Big5-CDP abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>>big5-cdp))
+
   (make-charset '=gt
 		"GT 2000"
 		`(long-name	"GT"
@@ -229,6 +510,26 @@
 		  max-code	,(+ (lsh #x6100 16) 67547)
 		  code-offset	,(lsh #x6100 16)))
   (define-charset-alias 'ideograph-gt '=gt)
+  (make-charset '=>>gt
+		"GT 2000 abstract glyphs"
+		'(long-name	"GT abstract glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=gt))
+  (define-charset-alias '<=>gt '=>>gt)
+  (define-charset-alias '<==>gt '=>>gt)
+  (make-charset '=>gt
+		"GT 2000 abstract characters"
+		'(long-name	"abstract GT characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>>gt))
   (make-charset '=gt-k
 		"Ideographic components of GT"
 		`(long-name	"GT components"
@@ -242,6 +543,15 @@
 		  max-code	,(+ (lsh #x6110 16) 17090)
 		  code-offset	,(lsh #x6110 16)))
   (define-charset-alias 'ideograph-gt-k '=gt-k)
+  (make-charset '=>>gt-k
+		"abstract glyphs of GT-K"
+		'(long-name	"GT-K abstract glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=gt-k))
   (let ((i 1))
     (while (<= i 11)
       (make-charset
@@ -282,7 +592,7 @@
   (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
 
   (make-charset '=daikanwa
-		"Daikanwa dictionary (revised version 2)"
+		"Daikanwa dictionary (unchanged part)"
 		`(long-name	"Daikanwa"
 		  chars		256
 		  dimension	2
@@ -327,6 +637,70 @@
 		  ))
   (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
 
+  (make-charset '=>daikanwa
+		"Daikanwa abstract characters"
+		'(long-name	"abstract Daikanwa"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"Daikanwa\\(\\.[0-9]+\\)?-3"
+		  mother	=daikanwa))
+
+  (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"
@@ -426,6 +800,17 @@
 		  columns	2
 		  direction	l2r))
 
+  (make-charset '=>zinbun-oracle
+		"Abstract Oracle Bones"
+		'(long-name	"Abstract characters of Zinbun Oracle Bones."
+		  chars		256
+		  dimension	2
+		  mother	=zinbun-oracle
+		  registry	"zob1968-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
   (make-charset '=jef-china3
 		"JEF + CHINA3 private characters"
 		'(long-name	"JEF + CHINA3"
@@ -454,6 +839,109 @@
 		  max-code	#xE908FF ; #xE8FF
 		  code-offset	,(- #xE90000 #xE000)))
 
+  (make-charset '==>ucs@bucs
+		"Basic Subset of Coded Character Sets (BUCS)"
+		'(long-name	"BUCS abstract characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs))
+
+  (make-charset '=>ucs@iso
+		"Abstract characters of ISO/IEC 10646 representatives"
+		'(long-name	"UCS characters for ISO"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs@unicode
+		"Abstract characters of Unicode representatives"
+		'(long-name	"UCS characters for Unicode"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+
+  (make-charset '=>>ucs@iso
+		"Representative abstract glyphs of ISO/IEC 10646"
+		'(long-name	"UCS glyphs for UCS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+  (make-charset '=>>ucs@unicode
+		"Representative abstract glyphs of Unicode"
+		'(long-name	"Unicode abstract glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@iso))
+  (make-charset '=>>ucs@jis
+		"UCS Representative glyphs for JIS X0208/0212/0213"
+		'(long-name	"UCS glyphs for JIS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@unicode))
+  (make-charset '=>>ucs@jis/1990
+		"UCS Representative glyphs for JIS X 0208/0212:1990"
+		'(long-name	"UCS glyphs for JIS:1990"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2000
+		"UCS Representative glyphs for JIS X 0213:2000"
+		'(long-name	"UCS glyphs for JIS:2000"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2004
+		"UCS Representative glyphs for JIS X 0213:2004"
+		'(long-name	"UCS glyphs for JIS:2004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@cns
+		"UCS Representative glyphs for CNS 11643 sources"
+		'(long-name	"UCS glyphs for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@unicode))
+
   (make-charset '=ucs@iso
 		"ISO/IEC 10646 for its representative glyphs"
 		'(long-name	"UCS for ISO"
@@ -462,7 +950,8 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs))
+		  =>iso-ir	177
+		  mother	=>>ucs@iso))
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
 		'(long-name	"UCS for Unicode"
@@ -471,6 +960,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@iso))
   (make-charset '=ucs@gb
 		"ISO/IEC 10646 for GB"
@@ -480,6 +970,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-gb '=ucs@gb)
   (make-charset '=ucs@gb/fw
@@ -490,6 +981,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@gb))
   (make-charset '=ucs-bmp@gb
 		"ISO/IEC 10646 BMP for GB"
@@ -510,6 +1002,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-cns '=ucs@cns)
   (make-charset '=ucs@cns/fw
@@ -520,6 +1013,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@cns))
   (make-charset '=ucs-bmp@cns
 		"ISO/IEC 10646 BMP for CNS"
@@ -540,6 +1034,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-jis '=ucs@jis)
   (make-charset '=ucs@jis/fw
@@ -550,6 +1045,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@jis))
   (make-charset '=ucs-bmp@jis
 		"ISO/IEC 10646 BMP for JIS"
@@ -570,7 +1066,8 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	ucs-jis))
+		  =>iso-ir	177
+		  mother	=ucs@jis))
   (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
   (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
   (make-charset '=ucs@jis/2000
@@ -581,9 +1078,20 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	ucs-jis))
+		  =>iso-ir	177
+		  mother	=ucs@jis))
   (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
   (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
+  (make-charset '=ucs@jis/2004
+		"ISO/IEC 10646 for JIS X 0213:2004"
+		'(long-name	"UCS for JIS:2004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@jis))
   (make-charset '=ucs@JP
 		"UCS for common glyphs used in Japan"
 		'(long-name	"UCS for Japan"
@@ -592,7 +1100,8 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs@jis/2000))
+		  =>iso-ir	177
+		  mother	=ucs@jis/2004))
   (define-charset-alias '=ucs@jp '=ucs@JP)
   (make-charset '=ucs@ks
 		"ISO/IEC 10646 for Korean Standards"
@@ -602,6 +1111,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-ks '=ucs@ks)
   (make-charset '=ucs-bmp@ks
@@ -615,6 +1125,16 @@
 		  mother	=ucs@ks
 		  min-code	#x0000
 		  max-code	#xFFFF))
+  (make-charset '=ucs@cns11643
+		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
+		'(long-name	"UCS for CNS11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@cns))
   (make-charset '=ucs@big5
 		"ISO/IEC 10646 for Big5"
 		'(long-name	"UCS for Big5"
@@ -623,7 +1143,8 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs@unicode))
+		  =>iso-ir	177
+		  mother	=>>ucs@unicode))
   (define-charset-alias 'ucs-big5 '=ucs@big5)
   (make-charset '=ucs@big5/cns11643
 		"ISO/IEC 10646 for Big5 based on www.cns11643.gov.tw"
@@ -633,17 +1154,9 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@big5))
-  (make-charset '=ucs@cns11643
-		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
-		'(long-name	"UCS for CNS11643"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  mother	=ucs@cns))
-  
+
   (make-charset
    '=ucs-radicals
    "CJK Radicals of UCS"
@@ -711,6 +1224,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '==>ucs-bmp-cjk@bucs
+   "CJK Characters in BMP of BUCS"
+   '(long-name "BUCS-BMP-CJK"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother ==>ucs@bucs
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
    '(long-name "UCS CJK Ext-B"
@@ -738,6 +1266,19 @@
 	       code-offset #x20000))
 
   (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"
@@ -746,6 +1287,9 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
+	       mother =adobe-japan1-base
+	       min-code 0
+	       max-code 8283
 	       registry "AdobeJapan1-0$"))
   (make-charset
    '=adobe-japan1-1
@@ -757,6 +1301,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-0
+	       min-code 0
+	       max-code 8358
 	       registry "AdobeJapan1-1$"))
   (make-charset
    '=adobe-japan1-2
@@ -768,6 +1314,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-1
+	       min-code 0
+	       max-code 8719
 	       registry "AdobeJapan1-2$"))
   (make-charset
    '=adobe-japan1-3
@@ -779,6 +1327,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-2
+	       min-code 0
+	       max-code 9353
 	       registry "AdobeJapan1-3$"))
   (make-charset
    '=adobe-japan1-4
@@ -790,6 +1340,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-3
+	       min-code 0
+	       max-code 15443
 	       registry "AdobeJapan1-4$"))
   (make-charset
    '=adobe-japan1-5
@@ -801,6 +1353,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-4
+	       min-code 0
+	       max-code 20316
 	       registry "AdobeJapan1-5$"))
   (make-charset
    '=adobe-japan1-6
@@ -812,6 +1366,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-5
+	       min-code 0
+	       max-code 23057
 	       registry "AdobeJapan1-6$"))
   )