Reformatted.

[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 388b83e..7799620 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/")))
 
@@ -70,7 +71,8 @@
        #x5827 #x4C68 #x505B #x514A #x5D27
        #x5563 #x5D7A #x4575 #x5F7C #x3B38
        #x3237 #x3B51 #x596E #x5B5B #x6640
-       #x6D75 #x4D2C))
+       #x6D75 #x4D2C #x737B #x7379 #x5E7A
+       #x3E7A #x3865))
 
 (map-char-attribute
  (lambda (c v)
@@ -216,36 +218,37 @@
    nil)
  '=>jis-x0208)
 
-(map-char-attribute
- (lambda (c v)
-   (cond
-    ((<= v 8283)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-0 v)
-     )
-    ((<= v 8358)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-1 v)
-     )
-    ((<= v 8719)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-2 v)
-     )
-    ((<= v 9353)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-3 v)
-     )
-    ((<= v 15443)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-4 v)
-     )
-    ((<= v 20316)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-5 v)
-     )
-    ((<= v 23057)
-     (remove-char-attribute c '=>>>adobe-japan1)
-     (put-char-attribute c '=>>>adobe-japan1-6 v)
-     ))
-   nil)
- '=>>>adobe-japan1)
+(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))