(gt-pj-1-and-jis-x0208-1990-different-code-points): Add #x5759,

[chise/xemacs-chise.git.1] / lisp / utf-2000 / maps-conf.el

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 34c398a..77a353a 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -7,6 +7,7 @@
                "C2-to-UCS.txt"
                "C3-to-UCS.txt" "C4-to-UCS.txt"
                "C5-to-UCS.txt" "C6-to-UCS.txt"
+               "C7-to-UCS.txt"
                "B-to-UCS.txt" "JC3-to-UCS.txt"))
   (mapping-table-read-file (expand-file-name file "../etc/char-data/")))
 
@@ -67,7 +68,22 @@
        #x3951 #x6967 #x704B #x3C38 #x6B26
        #x4749 #x4428 #x3A47 #x6E4E #x4269
        #x4043 #x6E56 #x6132 #x5C54 #x3557
-       #x5827 #x4C68 #x505B #x514A #x5D27))
+       #x5827 #x4C68 #x505B #x514A #x5D27
+       #x5563 #x5D7A #x4575 #x5F7C #x3B38
+       #x3237 #x3B51 #x596E #x5B5B #x6640
+       #x6D75 #x4D2C #x737B #x7379 #x5E7A
+       #x3E7A #x3865 #x557B #x436B #x413B
+       #x562D #x4C28 #x562F #x5631 #x5632
+       #x5633 #x5635 #x463D #x362E #x3265
+       #x563B #x4A76 #x5638 #x5637 #x3A6A
+       #x5642 #x563D #x5647 #x5641 #x5644
+       #x5648 #x564A #x3A37 #x564F #x4568
+       #x5653 #x5652 #x5654 #x5655 #x5659
+       #x565C #x3474 #x562E #x5630 #x5639
+       #x3D54 #x5645 #x564E #x5651 #x564C
+       #x3460 #x565B #x5628 #x5726 #x5759
+       #x583E #x5833 #x5843 #x584E #x5860
+       #x585D))
 
 (map-char-attribute
  (lambda (c v)
@@ -101,25 +117,25 @@
        (put-char-attribute chr '=gt-k i)))
     (setq i (1+ i))))
 
-(let (gt)
-  (dolist (ccs '(=gt-pj-1
-                =gt-pj-2
-                =gt-pj-3
-                =gt-pj-4
-                =gt-pj-5
-                =gt-pj-6
-                =gt-pj-7
-                =gt-pj-8
-                =gt-pj-9
-                =gt-pj-10
-                =gt-pj-11))
-    (map-char-attribute
-     (lambda (c v)
-       (when (setq gt (encode-char c '=gt))
-        (put-char-attribute c '=gt gt)
-        (put-char-attribute (decode-char ccs v) '=gt gt))
-       nil)
-     ccs)))
+;; (let (gt ret)
+;;   (dolist (ccs '(=gt-pj-1
+;;                  =gt-pj-2
+;;                  =gt-pj-3
+;;                  =gt-pj-4
+;;                  =gt-pj-5
+;;                  =gt-pj-6
+;;                  =gt-pj-7
+;;                  =gt-pj-8
+;;                  =gt-pj-9
+;;                  =gt-pj-10
+;;                  =gt-pj-11))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (when (setq gt (encode-char c '=gt))
+;;          (put-char-attribute c '=gt gt)
+;;          (put-char-attribute (decode-char ccs v) '=gt gt))
+;;        nil)
+;;      ccs)))
 
 ;; (let (ret)
 ;;   (dolist (feature
@@ -200,8 +216,10 @@
          (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)))
+         (unless (eq (encode-char char '=>>jis-x0208) code)
+           (unless (eq (encode-char char '=+>jis-x0208) code)
+             (put-char-attribute char '=>jis-x0208 code)
+             (remove-char-attribute char '=>jis-x0208@1997)))))
       )))
 
 (map-char-attribute
@@ -210,3 +228,38 @@
      (put-char-attribute c '=>jis-x0213-1 v))
    nil)
  '=>jis-x0208)
+
+(dolist (aj1-f '(=>>>adobe-japan1 =>>adobe-japan1))
+  (map-char-attribute
+   (lambda (c v)
+     (cond
+      ((<= v 8283)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-0" aj1-f)) v)
+       )
+      ((<= v 8358)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-1" aj1-f)) v)
+       )
+      ((<= v 8719)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-2" aj1-f)) v)
+       )
+      ((<= v 9353)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-3" aj1-f)) v)
+       )
+      ((<= v 15443)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-4" aj1-f)) v)
+       )
+      ((<= v 20316)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-5" aj1-f)) v)
+       )
+      ((<= v 23057)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-6" aj1-f)) v)
+       ))
+     nil)
+   aj1-f))