Add code to convert `=>>adobe-japan1' to `=>>adobe-japan1-{0..6}'.

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 388b83e..f95a223 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -216,36 +216,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))