X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=c60571c330379c74165d1bbf254af97ef864e452;hb=3f720ab4f094518977d1ee19a4bb3b43dee5972f;hp=7647adc3a5847becc4e2349f650027a90284e5df;hpb=7b7a958a49c03f32a1422fa7b799d009b5af0f7a;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 7647adc..c60571c 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,2006,2008 MORIOKA Tomohiko
+;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
+;;   2009 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -25,6 +26,79 @@
 
 ;;; 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/4-pr
+   "JIS X 0208:1978, 4th impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+              =>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 +202,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 +268,143 @@
 	      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."
-   '(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-x0208@1978/i-4
-   "The second and third impressions of JIS X 0208:1978."
-   '(registry "jisx0208\\.1978"
+   '=>>jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 abstract glyphs"
+   '(registry "jisx0213\\(\\.2004\\)-1"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208@1978
-	      ;; final ?@
+	      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
@@ -229,6 +434,17 @@
 		  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	"abstract GT"
+		  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-k
 		"Ideographic components of GT"
 		`(long-name	"GT components"
@@ -327,7 +543,17 @@
 		  ))
   (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
 
-  (make-charset 'shinjigen-1
+  (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
@@ -335,17 +561,32 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  mother	=shinjigen
 		  registry	"Shinjigen\\(\\.[0-9]+\\)?-1"))
-  (make-charset 'shinjigen-2
-		"Kadokawa ShinJigen dictionary (the second edition)"
+  (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"))
-  (make-charset 'shinjigen-2-p
+  (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
@@ -353,6 +594,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r))
+  (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
 
   (make-charset '=big5-pua
 		"Big5 with private used area"
@@ -489,6 +731,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs))
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
@@ -498,6 +741,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@iso))
   (make-charset '=ucs@gb
 		"ISO/IEC 10646 for GB"
@@ -507,6 +751,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
@@ -517,6 +762,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@gb))
   (make-charset '=ucs-bmp@gb
 		"ISO/IEC 10646 BMP for GB"
@@ -537,6 +783,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
@@ -547,6 +794,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@cns))
   (make-charset '=ucs-bmp@cns
 		"ISO/IEC 10646 BMP for CNS"
@@ -567,6 +815,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
@@ -577,6 +826,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@jis))
   (make-charset '=ucs-bmp@jis
 		"ISO/IEC 10646 BMP for JIS"
@@ -597,6 +847,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	ucs-jis))
   (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
   (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
@@ -608,9 +859,20 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>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"
@@ -619,7 +881,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"
@@ -629,6 +892,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
@@ -650,6 +914,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-big5 '=ucs@big5)
   (make-charset '=ucs@big5/cns11643
@@ -660,6 +925,7 @@
 		  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"
@@ -669,6 +935,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
+		  =>iso-ir	177
 		  mother	=ucs@cns))
   
   (make-charset