From: tomo <tomo>
Date: Fri, 19 Nov 2004 17:34:31 +0000 (+0000)
Subject: (mapping-table-ccs-setting-alist): Add setting for G0-hhhh.
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fcbccb68570254a3a6cb43da0cf58c68444ddb4;p=chise%2Fxemacs-chise.git

(mapping-table-ccs-setting-alist): Add setting for G0-hhhh.
(mapping-table-read-file): Modify for `=ucs@gb'.
---

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 739818d..a2a1f85 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -41,6 +41,10 @@
      "^JX2-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
      =ucs@jis/2000
      "\tJU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
+    (=gb2312
+     "^G0-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
+     =ucs@gb
+     "\tGU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
     (=cns11643-1
      "^C1-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
      =ucs@cns
@@ -136,11 +140,13 @@ UCS-REGEXP is a regular expression to match against
 			      (if (memq ucs-ccs '(=ucs@jis
 						  =ucs@jis/1990
 						  =ucs@jis/2000
-						  ;; ucs-big5
 						  ))
 				  (encode-char chr '=ucs@jis/fw
 					       'defined-only)
-				(char-feature chr '=>ucs)))
+				(unless (memq ucs-ccs '(=ucs@gb
+							;; ucs-big5
+							))
+				  (char-feature chr '=>ucs))))
 			  ucs-code)))
 	    (put-char-attribute chr ucs-ccs ucs-code))
 	  (when (and ucs
@@ -148,6 +154,7 @@ UCS-REGEXP is a regular expression to match against
 				  (and (not (memq ucs-ccs '(=ucs@jis
 							    =ucs@jis/1990
                                                             =ucs@jis/2000
+							    =ucs@gb
 							    ;; ucs-big5
 							    )))
 				       (char-feature chr '=>ucs)))