X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=d739f2ab6b7d6210bddf30b6d893d94e4882c47e;hb=250c5448c6dd6ac9289aded72ed66fb928979cb6;hp=e553d060e6b2605d18f9d5affa0f4c827c6313bc;hpb=45dc1ceaf9468fe260aef3a04b8ca43d0ac26015;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index e553d06..d739f2a 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -25,9 +25,11 @@
 
 ;;; Code:
 
-(define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208-1978)
+(define-charset-alias '=jis-x0208-1978		'=jis-x0208@1978)
+(define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208@1978)
 (define-charset-alias 'chinese-gb2312		'=gb2312)
-(define-charset-alias 'japanese-jisx0208	'=jis-x0208-1983)
+(define-charset-alias '=jis-x0208-1983		'=jis-x0208@1983)
+(define-charset-alias 'japanese-jisx0208	'=jis-x0208@1983)
 (define-charset-alias 'korean-ksc5601		'=ks-x1001)
 (define-charset-alias 'japanese-jisx0212	'=jis-x0212)
 (define-charset-alias 'chinese-cns11643-1	'=cns11643-1)
@@ -135,7 +137,7 @@
 		registry "jisx0213\\(\\.2000\\)-1"
 		dimension 2
 		chars 94
-		mother =jis-x0208-1990
+		mother =jis-x0208@1990
 		final ?O
 		graphic 0))
       (make-charset
@@ -170,11 +172,21 @@
 
 (when (featurep 'utf-2000)
   (define-charset-alias 'ucs '=ucs)
-  (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208-1990)
+  (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."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208
+	      ;; final ?B
+	      graphic 0))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"
-		`(long-name	"Big5-CDP"
+		'(long-name	"Big5-CDP"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -231,7 +243,7 @@
   (make-charset
    '=gt-pj-k1
    "Ideographic parts of GT (pseudo JIS encoding) part 1"
-   `(long-name "GT K1"
+   '(long-name "GT K1"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -242,7 +254,7 @@
   (make-charset
    '=gt-pj-k2
    "Ideographic parts of GT (pseudo JIS encoding) part 2"
-   `(long-name "GT K2"
+   '(long-name "GT K2"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -299,7 +311,7 @@
 
   (make-charset '=big5-pua
 		"Big5 with private used area"
-		`(long-name	"Big5-PUA"
+		'(long-name	"Big5-PUA"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -310,7 +322,7 @@
   (define-charset-alias 'chinese-big5-pua '=big5-pua)
   (make-charset '=big5-eten
 		"Big5 ETEN"
-		`(long-name	"Big5-ETEN"
+		'(long-name	"Big5-ETEN"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -323,7 +335,7 @@
   (define-charset-alias 'chinese-big5-eten '=big5-eten)
   (make-charset 'chinese-big5-eten-a
 		"Big5 ETEN (#xF9D6 .. #xF9FE)"
-		`(long-name	"Big5-ETEN-a"
+		'(long-name	"Big5-ETEN-a"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -335,7 +347,7 @@
 		  registry	"Big5\\.ETEN"))
   (make-charset 'chinese-big5-eten-b
 		"Big5 ETEN (#xC6A1 .. #xC8FE)"
-		`(long-name	"Big5-ETEN-b"
+		'(long-name	"Big5-ETEN-b"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -385,7 +397,7 @@
 
   (make-charset '=jef-china3
 		"JEF + CHINA3 private characters"
-		`(long-name	"JEF + CHINA3"
+		'(long-name	"JEF + CHINA3"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -413,7 +425,7 @@
 
   (make-charset '=ucs@iso
 		"ISO/IEC 10646 for its representative glyphs"
-		`(long-name	"UCS for ISO"
+		'(long-name	"UCS for ISO"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -422,7 +434,7 @@
 		  mother	=ucs))
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
-		`(long-name	"UCS for Unicode"
+		'(long-name	"UCS for Unicode"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -431,7 +443,7 @@
 		  mother	=ucs@iso))
   (make-charset '=ucs@gb
 		"ISO/IEC 10646 for GB"
-		`(long-name	"UCS for GB"
+		'(long-name	"UCS for GB"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -439,9 +451,18 @@
 		  direction	l2r
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-gb '=ucs@gb)
+  (make-charset '=ucs@gb/fw
+		"ISO/IEC 10646 for GB with fullwidth"
+		'(long-name	"UCS for GB-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@gb))
   (make-charset '=ucs@cns
 		"ISO/IEC 10646 for CNS 11643"
-		`(long-name	"UCS for CNS"
+		'(long-name	"UCS for CNS"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -449,9 +470,18 @@
 		  direction	l2r
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-cns '=ucs@cns)
+  (make-charset '=ucs@cns/fw
+		"ISO/IEC 10646 for CNS 11643 with fullwidth"
+		'(long-name	"UCS for CNS-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@cns))
   (make-charset '=ucs@jis
 		"ISO/IEC 10646 for JIS X0208/0212/0213"
-		`(long-name	"UCS for JIS"
+		'(long-name	"UCS for JIS"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -459,38 +489,50 @@
 		  direction	l2r
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-jis '=ucs@jis)
-  (make-charset '=ucs@jis-1990
+  (make-charset '=ucs@jis/fw
+		"ISO/IEC 10646 for JIS X0208/0212/0213 with fullwidth"
+		'(long-name	"UCS for JIS-fullwidth"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs@jis))
+  (make-charset '=ucs@jis/1990
 		"ISO/IEC 10646 for JIS X 0208/0212:1990"
-		`(long-name	"UCS for JIS:1990"
+		'(long-name	"UCS for JIS:1990"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  mother	ucs-jis))
-  (define-charset-alias '=ucs-jis-1990 '=ucs@jis-1990)
-  (make-charset '=ucs@jis-2000
+  (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
+  (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
+  (make-charset '=ucs@jis/2000
 		"ISO/IEC 10646 for JIS X 0213:2000"
-		`(long-name	"UCS for JIS:2000"
+		'(long-name	"UCS for JIS:2000"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  mother	ucs-jis))
-  (define-charset-alias '=ucs-jis-2000 '=ucs@jis-2000)
-  (make-charset '=ucs@jp
+  (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
+  (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
+  (make-charset '=ucs@JP
 		"UCS for common glyphs used in Japan"
-		`(long-name	"UCS for Japan"
+		'(long-name	"UCS for Japan"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs@jis-2000))
+		  mother	=ucs@jis/2000))
+  (define-charset-alias '=ucs@jp '=ucs@JP)
   (make-charset '=ucs@ks
 		"ISO/IEC 10646 for Korean Standards"
-		`(long-name	"UCS for KS"
+		'(long-name	"UCS for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -500,7 +542,7 @@
   (define-charset-alias 'ucs-ks '=ucs@ks)
   (make-charset '=ucs@big5
 		"ISO/IEC 10646 for Big5"
-		`(long-name	"UCS for Big5"
+		'(long-name	"UCS for Big5"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -508,11 +550,29 @@
 		  direction	l2r
 		  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"
+		'(long-name	"UCS for Big5@CNS11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  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"
-   `(long-name "UCS-Radicals"
+   '(long-name "UCS-Radicals"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -524,7 +584,7 @@
   (make-charset
    '=ucs-radicals@unicode
    "CJK Radicals of UCS"
-   `(long-name "UCS-Radicals"
+   '(long-name "UCS-Radicals"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -536,7 +596,7 @@
   (make-charset
    '=ucs-bmp-cjk
    "CJK Characters in BMP of UCS"
-   `(long-name "UCS-BMP-CJK"
+   '(long-name "UCS-BMP-CJK"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -548,7 +608,7 @@
   (make-charset
    '=ucs-bmp-cjk@unicode
    "CJK Characters in BMP of Unicode"
-   `(long-name "Unicode-BMP-CJK"
+   '(long-name "Unicode-BMP-CJK"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -560,7 +620,7 @@
   (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
-   `(long-name "UCS CJK Ext-B"
+   '(long-name "UCS CJK Ext-B"
 	       chars 256
 	       dimension 2
 	       columns 2
@@ -573,7 +633,7 @@
   (make-charset
    '=ucs-sip-ext-b@iso
    "CJK Ideographs Extension B (ISO/IEC 10646-2)"
-   `(long-name "UCS CJK Ext-B"
+   '(long-name "UCS CJK Ext-B"
 	       chars 256
 	       dimension 2
 	       columns 2