(U+724C): Use `->denotational' instead of `->subsumptive'.

[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 5f8bbdd..d84ea0b 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -6,10 +6,12 @@
                "G0-to-UCS.txt"
                "C2-to-UCS.txt"
                "C3-to-UCS.txt" "C4-to-UCS.txt"
-               "C5-to-UCS.txt"
+               "C5-to-UCS.txt" "C6-to-UCS.txt"
                "B-to-UCS.txt" "JC3-to-UCS.txt"))
   (mapping-table-read-file (expand-file-name file "../etc/char-data/")))
 
+(ucs-compat-read-file "../etc/char-data/UCS-compat.txt")
+
 (jp-jouyou-read-file "../etc/char-data/jp-jouyou.txt")
 
 (let ((ucs #xE000)
@@ -54,7 +56,14 @@
                     #x5379 #x5879 #x3D5D #x3C21 #x4C60
                     #x5267 #x722F #x3C39 #x3848 #x5578
                     #x4742 #x6950 #x697C #x6A24 #x5350
-                    #x3326 #x5575 #x5A4B))
+                    #x3326 #x5575 #x5A4B #x3647 #x343F
+                    #x4337 #x492D #x3F6C #x6E4D #x4F3F
+                    #x353D #x4324 #x475B #x6E47 #x4371
+                    #x3F5D #x6E49 #x4D6F #x3C72 #x3D37
+                    #x6E4C #x3B44 #x734E #x5567 #x545A
+                    #x3071 #x332A #x516A #x476D #x3675
+                    #x5734 #x552D #x565A #x564B #x5B79
+                    #x5C74 #x5C27 #x5B5E #x3564))
      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
                         '=gt-pj-1 v))
    nil)
@@ -103,3 +112,87 @@
         (put-char-attribute (decode-char ccs v) '=gt gt))
        nil)
      ccs)))
+
+;; (let (ret)
+;;   (dolist (feature
+;;            (let (dest)
+;;              (dolist (feature (char-attribute-list))
+;;                (when (string-match "\\*sources\\($\\|@[^\\*]+$\\)"
+;;                                    (symbol-name feature))
+;;                  (setq dest (cons feature dest))))
+;;              dest))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (when (setq ret (memq 'shinjigen-1 v))
+;;          (setcar ret 'shinjigen@1ed))
+;;        (when (setq ret (memq 'shinjigen-2 v))
+;;          (setcar ret 'shinjigen@rev))
+;;        nil)
+;;      feature)))
+
+;; (map-char-attribute
+;;  (lambda (c v)
+;;    (when (eq (encode-char c '=shinjigen@rev) v)
+;;      (put-char-attribute c '=shinjigen v)
+;;      (remove-char-attribute c '=shinjigen@1ed)
+;;      (remove-char-attribute c '=shinjigen@rev)
+;;      )
+;;    nil)
+;;  '=shinjigen@1ed)
+
+;; (let (ret)
+;;   (dolist (feature
+;;            (let (dest)
+;;              (dolist (feature (char-attribute-list))
+;;                (when (string-match "\\*sources\\($\\|@[^\\*]+$\\)"
+;;                                    (symbol-name feature))
+;;                  (setq dest (cons feature dest))))
+;;              dest))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (cond ((setq ret (memq 'shinjigen@1ed v))
+;;               (when (memq 'shinjigen@rev ret)
+;;                 (setcar ret 'shinjigen)
+;;                 (delq 'shinjigen@rev ret)
+;;                 ))
+;;              ((setq ret (memq 'shinjigen@rev v))
+;;               (when (memq 'shinjigen@1ed ret)
+;;                 (setcar ret 'shinjigen)
+;;                 (delq 'shinjigen@1ed ret)
+;;                 )))
+;;        nil)
+;;      feature)))
+
+(dolist (ccs '(=jis-x0208 =jis-x0208@1990))
+  (map-char-attribute
+   (lambda (c v)
+     (unless (eq (encode-char c '=jis-x0213-1@2000) v)
+       (put-char-attribute c '=jis-x0213-1 v))
+     nil)
+   ccs))
+
+(with-temp-buffer
+  (buffer-disable-undo)
+  (insert-file-contents "../etc/char-data/JX3-JX1-rep-diff.txt")
+  (goto-char (point-min))
+  (let (ku ten char code)
+    (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)))
+      (setq char (make-char '=jis-x0213-1@2000 (+ ku 32)(+ ten 32)))
+      (setq code (encode-char char '=jis-x0213-1@2000))
+      (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))
+      )))
+
+(map-char-attribute
+ (lambda (c v)
+   (unless (eq (encode-char c '<=>jis-x0213-1) v)
+     (put-char-attribute c '<=>jis-x0213-1 v))
+   nil)
+ '<=>jis-x0208)