- Don't add `=gt-pj-1' for J90-4A4D.

- Remove `=ucs@jis' if JIS X0213:2000 and 2004 are different.
- Add `=ucs@jis/2004' to JIS X0213:2004 characters which are different
  from JIS X0213:2000.
- Use `=>jis-x0213-1' and `=>jis-x0208' instead of `<=>jis-x0213-1'
  and `<=>jis-x0208'.

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index fd9bef8..1d9f82e 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -64,7 +64,7 @@
                     #x3071 #x332A #x516A #x476D #x3675
                     #x5734 #x552D #x565A #x564B #x5B79
                     #x5C74 #x5C27 #x5B5E #x3564 #x3823
-                    #x6131))
+                    #x6131 #x4A4D))
      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
                         '=gt-pj-1 v))
    nil)
@@ -176,7 +176,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)))
@@ -185,7 +185,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))
@@ -193,7 +198,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)