X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fread-maps.el;h=fe02723da65441b3e735933cb1a1443a5a5b8c8d;hb=0a85ba06929106b0c2e8c2a167a85346d70386ce;hp=1584747482ee4cd2283242f861025402db9e969b;hpb=83cd166da4eb482d926971ed5a0822907c040b37;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 1584747..fe02723 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -1,6 +1,6 @@
 ;;; read-maps.el --- Read mapping-tables.
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2012, 2014
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2012, 2014, 2015, 2017
 ;;   MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
@@ -156,6 +156,10 @@ UCS-REGEXP is a regular expression to match against
 	(if (and ucs-ccs ucs (not ucs-code))
 	    (setq ucs-code ucs
 		  ucs nil))
+	(if (and (eq ccs '=jef-china3)
+		 (eq ucs #xFA66))
+	    (setq ucs-ccs '=ucs@JP
+		  drep-ucs-ccs '==ucs@JP))
 	(when (setq chr (decode-char ccs code))
 	  (unless (eq (encode-char chr ccs 'defined-only)
 		      code)
@@ -178,7 +182,9 @@ UCS-REGEXP is a regular expression to match against
                             ;; ((eq ucs-ccs '=ucs@ks)
                             ;;  (encode-char chr '=ucs@ks/fw 'defined-only))
                             (t
-			     (char-feature chr '=>ucs))))
+			     (or (char-feature chr '=ucs)
+				 (char-feature chr '=>ucs))
+			     )))
 			  ucs-code)))
 	    (put-char-attribute chr ucs-ccs ucs-code))
 	  (when (and ucs
@@ -191,10 +197,14 @@ UCS-REGEXP is a regular expression to match against
 							    =ucs@big5
 							    =ucs@ks
 							    )))
-				       (char-feature chr '=>ucs)))
+				       (or (char-feature chr '=ucs)
+					   (char-feature chr '=>ucs))
+				       ))
 			      ucs)))
 	    (if (or ucs-code (null ucs-ccs))
-		(unless (eq (char-feature chr '=>ucs) ucs)
+		(unless (eq (or (char-feature chr '=ucs)
+				(char-feature chr '=>ucs))
+			    ucs)
 		  (put-char-attribute chr '=>ucs ucs))
 	      (unless (eq (encode-char chr ucs-ccs 'defined-only)
 			  ucs)
@@ -218,10 +228,15 @@ UCS-REGEXP is a regular expression to match against
 							     ==ucs@gb
 							     ==ucs@cns
 							     ==ucs@ks)))
-				   (char-feature drep-chr '=>ucs))
-			      ucs)))
+				   (or (char-feature drep-chr '=ucs)
+				       (char-feature drep-chr '=>ucs))
+				   )
+			      ucs))
+		     (not (eq (char-feature drep-chr '=>ucs*) ucs)))
 	    (if (or ucs-code (null drep-ucs-ccs))
-		(unless (eq (char-feature drep-chr '=>ucs) ucs)
+		(unless (eq (or (char-feature drep-chr '=ucs)
+				(char-feature drep-chr '=>ucs))
+			    ucs)
 		  (put-char-attribute drep-chr '=>ucs ucs))
 	      (unless (eq (encode-char drep-chr drep-ucs-ccs 'defined-only)
 			  ucs)