X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fread-maps.el;h=e01835de2c09ecf15dfc427c5da182c040ae9419;hb=2a0be3b5528ff398841ca9ab82be08e9425ba271;hp=99751af7e28be4c1aded3c963c68619e776faa8b;hpb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 99751af..e01835d 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -3,22 +3,22 @@
 ;; Copyright (C) 2002,2003 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: UTF-2000, UCS-4, character, CCS, multiscript, multilingual
+;; Keywords: mapping table, character, CCS, multiscript, multilingual
 
-;; This file is part of XEmacs UTF-2000.
+;; This file is part of XEmacs CHISE.
 
-;; XEmacs UTF-2000 is free software; you can redistribute it and/or
+;; XEmacs CHISE is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2, or (at
 ;; your option) any later version.
 
-;; XEmacs UTF-2000 is distributed in the hope that it will be useful,
+;; XEmacs CHISE is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs UTF-2000; see the file COPYING.  If not, write to
+;; along with XEmacs CHISE; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -59,7 +59,21 @@
 	       (setq ccs '=jis-x0213-2-2000
 		     code (string-to-int (match-string 1) 16)
 		     ucs-pat "\tJU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)"
-		     ucs-ccs 'ucs-jis)
+		     ucs-ccs '=ucs@jis-2000)
+	       (goto-char (match-end 0))
+	       )
+	      ((looking-at "^C1-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)")
+	       (setq ccs 'chinese-cns11643-1
+		     code (string-to-int (match-string 1) 16)
+		     ucs-pat "\tCU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)"
+		     ucs-ccs 'ucs-cns)
+	       (goto-char (match-end 0))
+	       )
+	      ((looking-at "^C2-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)")
+	       (setq ccs 'chinese-cns11643-2
+		     code (string-to-int (match-string 1) 16)
+		     ucs-pat "\tCU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)"
+		     ucs-ccs 'ucs-cns)
 	       (goto-char (match-end 0))
 	       )
 	      ((looking-at "^C3-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)")
@@ -117,7 +131,11 @@
 	    (put-char-attribute chr ucs-ccs ucs-code))
 	  (when (and ucs
 		     (not (eq (or (encode-char chr '=ucs 'defined-only)
-				  (and (not (eq ucs-ccs 'ucs-jis))
+				  (and (not (memq ucs-ccs '(ucs-jis
+							    =ucs-jis-1990
+                                                            =ucs-jis-2000
+							    ;; ucs-big5
+							    )))
 				       (get-char-attribute chr '=>ucs)))
 			      ucs)))
 	    (if (or ucs-code (null ucs-ccs))