X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=8ca50c0f37be9bcbbe956de9d1837a1e6610c542;hb=21f0a33fd75c8b8867b6e0b9837e0f37bbc9ca5c;hp=6670219982b0f851aae9b97133ec2de17c195923;hpb=fb97323d11cfd3b491d20ad2fa8a1f5037e7ecb6;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 6670219..8ca50c0 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -105,6 +105,13 @@
    nil)
  '=gt-pj-1)
 
+(let ((i 1)
+      chr)
+  (while (<= i 67547)
+    (when (setq chr (decode-char '=gt i))
+      (put-char-attribute chr '=gt i))
+    (setq i (1+ i))))
+
 (let ((default-coded-charset-priority-list
 	'(=gt-pj-1
 	  =gt-pj-2
@@ -232,7 +239,8 @@
 	    (put-char-attribute char '=ucs@jis/2004 ucs)))
 	)
        (rep-char
-	(unless (and (= ku 47)(= ten 64))
+	(unless (or (and (= ku 47)(= ten 64))
+		    (and (= ku 67)(= ten 14)))
 	  (put-char-attribute rep-char '==jis-x0213-1@2000 code)
 	  (remove-char-attribute rep-char '==jis-x0213-1)
 	  (remove-char-attribute rep-char '==jis-x0213-1@2004)
@@ -288,14 +296,23 @@
    (lambda (c v)
      (if (and (setq j-chr (decode-char '=ucs@JP v))
 	      (not (eq j-chr c))
-	      (null (encode-char c '=ucs)))
+	      (null (encode-char c '=ucs))
+	      (not (eq (encode-char c '=ucs@jis)
+		       (encode-char c '=ucs@JP/hanazono))))
 	 (put-char-attribute c '=ucs@JP/hanazono nil))
      nil)
    '=ucs@unicode)
   (map-char-attribute
    (lambda (c v)
      (if (and (setq j-chr (decode-char '==ucs@JP v))
-	      (not (eq j-chr c)))
+	      (not (eq j-chr c))
+	      (not (or (eq (encode-char c '==ucs@jis)
+			   (encode-char c '==ucs@JP/hanazono))
+		       (eq (encode-char c '==ucs@unicode)
+			   (encode-char c '==ucs@JP/hanazono))
+		       (eq (encode-char c '==ucs@cns)
+			   (encode-char c '==ucs@JP/hanazono))
+		       )))
 	 (put-char-attribute c '==ucs@JP/hanazono nil))
      nil)
    '==ucs@unicode)