X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=e05d55b6fbbab6e92900fabb55b49bdd4ba2dbbd;hb=348e63a08936312283028ff3702b0d15e8e3529d;hp=d84ea0b29e26c8c6399a2b1529c585697e62775a;hpb=bb40a70f700c9ccce133e3c6cd6aad9499f2090e;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index d84ea0b..e05d55b 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -63,7 +63,12 @@
 		     #x6E4C #x3B44 #x734E #x5567 #x545A
 		     #x3071 #x332A #x516A #x476D #x3675
 		     #x5734 #x552D #x565A #x564B #x5B79
-		     #x5C74 #x5C27 #x5B5E #x3564))
+		     #x5C74 #x5C27 #x5B5E #x3564 #x3823
+		     #x6131 #x4A4D #x632E #x635E #x3729
+		     #x3951 #x6967 #x704B #x3C38 #x6B26
+		     #x4749 #x4428 #x3A47 #x6E4E #x4269
+		     #x4043 #x6E56 #x6132 #x5C54 #x3557
+		     #x5827 #x4C68 #x505B))
      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
 			 '=gt-pj-1 v))
    nil)
@@ -175,7 +180,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)))
@@ -184,15 +189,21 @@
       (put-char-attribute char '=jis-x0213-1@2000 code)
       (remove-char-attribute char '=jis-x0213-1)
       (remove-char-attribute char '=jis-x0213-1@2004)
-
-      (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))
+      (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)))
+      (unless (eq code #x332A)
+	(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)))
       )))
 
 (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)