X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=4b391731801da5b2b95326135f36ce904370a9bf;hb=7638b97067f4cbfe7704940d110d223394601946;hp=0c08586a5c604c4557a3f1406672aa0f47abff28;hpb=6413b63079eaa170b314cfd33546ecc9ebebd750;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 0c08586..4b39173 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -62,7 +62,10 @@
 		     #x3F5D #x6E49 #x4D6F #x3C72 #x3D37
 		     #x6E4C #x3B44 #x734E #x5567 #x545A
 		     #x3071 #x332A #x516A #x476D #x3675
-		     #x5734 #x552D #x565A #x564B))
+		     #x5734 #x552D #x565A #x564B #x5B79
+		     #x5C74 #x5C27 #x5B5E #x3564 #x3823
+		     #x6131 #x4A4D #x632E #x635E #x3729
+		     #x3951))
      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
 			 '=gt-pj-1 v))
    nil)
@@ -174,7 +177,7 @@
   (buffer-disable-undo)
   (insert-file-contents "../etc/char-data/JX3-JX1-rep-diff.txt")
   (goto-char (point-min))
-  (let (ku ten char code)
+  (let (ku ten char code ucs)
     (while (re-search-forward "^1-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+" nil t)
       (setq ku (string-to-number (match-string 1))
 	    ten (string-to-number (match-string 2)))
@@ -183,7 +186,12 @@
       (put-char-attribute char '=jis-x0213-1@2000 code)
       (remove-char-attribute char '=jis-x0213-1)
       (remove-char-attribute char '=jis-x0213-1@2004)
-
+      (setq ucs (encode-char char '=ucs@jis/2000))
+      (remove-char-attribute char '=ucs@jis)
+      (remove-char-attribute char '=ucs@jis/2004)
+      (when (setq char (decode-char '=jis-x0213-1@2004 code))
+	(unless (eq (encode-char char '=ucs@jis/2004) ucs)
+	  (put-char-attribute char '=ucs@jis/2004 ucs)))
       (when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
 	(put-char-attribute char '=>jis-x0208 code)
 	(remove-char-attribute char '=>jis-x0208@1997))
@@ -191,7 +199,7 @@
 
 (map-char-attribute
  (lambda (c v)
-   (unless (eq (encode-char c '<=>jis-x0213-1) v)
-     (put-char-attribute c '<=>jis-x0213-1 v))
+   (unless (eq (encode-char c '=>jis-x0213-1) v)
+     (put-char-attribute c '=>jis-x0213-1 v))
    nil)
- '<=>jis-x0208)
+ '=>jis-x0208)