From: tomo <tomo>
Date: Thu, 13 Nov 2003 07:52:00 +0000 (+0000)
Subject: Prefer `=big5-cdp', `=gt' and `=gt-k' to `=daikanwa'.
X-Git-Tag: r21-4-14-chise-0_21-4^2~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=137b0f18796d11ca42104e3cc6d5efad3108f4a4;p=chise%2Fxemacs-chise.git-

Prefer `=big5-cdp', `=gt' and `=gt-k' to `=daikanwa'.
---

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 291dbb0..b473d0e 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -171,7 +171,86 @@
 (when (featurep 'utf-2000)
   (define-charset-alias 'ucs '=ucs)
   (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208-1990)
-  
+
+  (make-charset '=big5-cdp
+		"Big5-CDP"
+		`(long-name	"Big5 with CDP extension"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	chinese-big5
+		  min-code	#x8140
+		  max-code	#x8DFE))
+  (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
+
+  (make-charset '=gt
+		"GT"
+		`(long-name	"GT 2000"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	""
+		  min-code	,(lsh #x6100 16)
+		  max-code	,(+ (lsh #x6100 16) 67547)
+		  code-offset	,(lsh #x6100 16)))
+  (define-charset-alias 'ideograph-gt '=gt)
+  (make-charset '=gt-k
+		"GT parts"
+		`(long-name	"Ideographic parts of GT"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	""
+		  min-code	,(lsh #x6110 16)
+		  max-code	,(+ (lsh #x6110 16) 17090)
+		  code-offset	,(lsh #x6110 16)))
+  (define-charset-alias 'ideograph-gt-k '=gt-k)
+  (let ((i 1))
+    (while (<= i 11)
+      (make-charset
+       (intern (format "=gt-pj-%d" i))
+       (format "GT PJ %d" i)
+       `(long-name ,(format "GT 2000 (pseudo JIS encoding) part %d" i)
+		   chars 94
+		   dimension 2
+		   columns 2
+		   graphic 0
+		   direction l2r
+		   registry ,(format "\\(GTpj-%d\\|jisx0208\\.GT-%d\\)$" i i)))
+      (define-charset-alias
+	(intern (format "ideograph-gt-pj-%d" i))
+	(intern (format "=gt-pj-%d" i)))
+      (setq i (1+ i))))
+  (make-charset
+   '=gt-pj-k1
+   "GT K1"
+   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 1"
+	       chars 94
+	       dimension 2
+	       columns 2
+	       graphic 0
+	       direction l2r
+	       registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
+  (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
+  (make-charset
+   '=gt-pj-k2
+   "GT K2"
+   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 2"
+	       chars 94
+	       dimension 2
+	       columns 2
+	       graphic 0
+	       direction l2r
+	       registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
+  (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
+
   (make-charset '=daikanwa
 		"Daikanwa"
 		`(long-name	"Daikanwa dictionary (revised version 2)"
@@ -258,19 +337,7 @@
 		  min-code	#xC6A1
 		  max-code	#xC8FE
 		  registry	"Big5\\.ETEN"))
-  (make-charset '=big5-cdp
-		"Big5-CDP"
-		`(long-name	"Big5 with CDP extension"
-		  chars		256
-		  dimension	2
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  registry	"big5\\.cdp-0"
-		  mother	chinese-big5
-		  min-code	#x8140
-		  max-code	#x8DFE))
-  (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
+
   (let* ((i 1)
 	 (hzk-min (+ (lsh #x6200 16) 65536))
 	 (hzk-max (+ hzk-min 65535)))
@@ -295,70 +362,6 @@
 	    hzk-max (+ hzk-min 65535))
       (setq i (1+ i))))
 
-  (make-charset '=gt
-		"GT"
-		`(long-name	"GT 2000"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  registry	""
-		  min-code	,(lsh #x6100 16)
-		  max-code	,(+ (lsh #x6100 16) 67547)
-		  code-offset	,(lsh #x6100 16)))
-  (define-charset-alias 'ideograph-gt '=gt)
-  (make-charset '=gt-k
-		"GT parts"
-		`(long-name	"Ideographic parts of GT"
-		  chars		256
-		  dimension	2
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  registry	""
-		  min-code	,(lsh #x6110 16)
-		  max-code	,(+ (lsh #x6110 16) 17090)
-		  code-offset	,(lsh #x6110 16)))
-  (define-charset-alias 'ideograph-gt-k '=gt-k)
-  (let ((i 1))
-    (while (<= i 11)
-      (make-charset
-       (intern (format "=gt-pj-%d" i))
-       (format "GT PJ %d" i)
-       `(long-name ,(format "GT 2000 (pseudo JIS encoding) part %d" i)
-		   chars 94
-		   dimension 2
-		   columns 2
-		   graphic 0
-		   direction l2r
-		   registry ,(format "\\(GTpj-%d\\|jisx0208\\.GT-%d\\)$" i i)))
-      (define-charset-alias
-	(intern (format "ideograph-gt-pj-%d" i))
-	(intern (format "=gt-pj-%d" i)))
-      (setq i (1+ i))))
-  (make-charset
-   '=gt-pj-k1
-   "GT K1"
-   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 1"
-	       chars 94
-	       dimension 2
-	       columns 2
-	       graphic 0
-	       direction l2r
-	       registry "\\(GTKpj-1\\|jisx0208\\.GTK-1\\)$"))
-  (define-charset-alias 'ideograph-gt-pj-k1 '=gt-pj-k1)
-  (make-charset
-   '=gt-pj-k2
-   "GT K2"
-   `(long-name "Ideographic parts of GT (pseudo JIS encoding) part 2"
-	       chars 94
-	       dimension 2
-	       columns 2
-	       graphic 0
-	       direction l2r
-	       registry "\\(GTKpj-2\\|jisx0208\\.GTK-2\\)$"))
-  (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
   (make-charset '=cbeta "CBETA PUA"
 		'(long-name	"CBETA private characters"
 		  chars		256
@@ -371,6 +374,7 @@
 		  columns	2
 		  direction	l2r))
   (define-charset-alias 'ideograph-cbeta '=cbeta)
+
   (make-charset '=jef-china3
 		"JEF + CHINA3"
 		`(long-name	"JEF + CHINA3 private characters"