From: tomo <tomo>
Date: Thu, 12 Sep 2002 10:46:42 +0000 (+0000)
Subject: (mapping-table-read-file): Accept JC3-xxxx; don't check `->ucs'.
X-Git-Tag: r21-4-6-utf-2000-0_19-jc3-map~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=110e01aa5865fbcc7180466ef3a2b705a255ee8e;p=chise%2Fxemacs-chise.git

(mapping-table-read-file): Accept JC3-xxxx; don't check `->ucs'.
- Read etc/char-data/JC3-to-UCS.txt.
---

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index eb11b49..f9e7410 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -81,6 +81,13 @@
 		     ucs-ccs 'ucs-big5)
 	       (goto-char (match-end 0))
 	       )
+	      ((looking-at "^JC3-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)")
+	       (setq ccs 'china3-jef
+		     code (string-to-int (match-string 1) 16)
+		     ucs-pat nil
+		     ucs-ccs nil)
+	       (goto-char (match-end 0))
+	       )
 	      (t
 	       (setq ccs nil
 		     code nil
@@ -88,7 +95,8 @@
 		     ucs-ccs nil)
 	       ))
 	(setq ucs-code
-	      (if (looking-at ucs-pat)
+	      (if (and ucs-pat
+		       (looking-at ucs-pat))
 		  (prog1
 		      (string-to-int (match-string 1) 16)
 		    (goto-char (match-end 0)))))
@@ -102,24 +110,25 @@
 	  (when (and ucs-code
 		     (not (eq (or (get-char-attribute chr ucs-ccs)
 				  (get-char-attribute chr 'ucs)
-				  (get-char-attribute chr '=>ucs)
-				  (get-char-attribute chr '->ucs))
+				  (get-char-attribute chr '=>ucs))
 			      ucs-code)))
 	    (put-char-attribute chr ucs-ccs ucs-code))
 	  (when (and ucs
 		     (not (eq (or (get-char-attribute chr 'ucs)
-				  (get-char-attribute chr '=>ucs)
-				  (get-char-attribute chr '->ucs))
+				  (get-char-attribute chr '=>ucs))
 			      ucs)))
-	    (put-char-attribute chr (if ucs-code
-					'=>ucs
-				      ucs-ccs) ucs)))
+	    (put-char-attribute chr
+				(if ucs-code
+				    '=>ucs
+				  (or ucs-ccs
+				      '=>ucs))
+				ucs)))
 	(forward-line)))))
 
 (dolist (file '("J90-to-UCS.txt" "JSP-to-UCS.txt"
 		"JX1-to-UCS.txt" "JX2-to-UCS.txt"
 		;; "C3-to-UCS.txt" ; "C4-to-UCS.txt"
-		"B-to-UCS.txt"))
+		"B-to-UCS.txt" "JC3-to-UCS.txt"))
   (mapping-table-read-file (expand-file-name file "../etc/char-data/")))
 
 ;;; read-maps.el ends here