(JX2-755B): Unify AJ1-18448.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 4b9f502..b90ed3d 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -214,8 +214,14 @@
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
+    =+>adobe-japan1-0
+    =+>adobe-japan1-1
+    =+>adobe-japan1-2
+    =+>adobe-japan1-3
+    =+>adobe-japan1-4
+    =+>adobe-japan1-5
+    =+>adobe-japan1-6
     =+>jis-x0208@1978
-    =+>adobe-japan1
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
@@ -538,14 +544,20 @@
                         =daikanwa/+2p =>>daikanwa/+2p
                         =gt =>>>gt =>>gt =+>gt =>gt
                         =gt-k =>>gt-k =>gt-k
-                        =adobe-japan1-0 =>>>adobe-japan1-0 =>>adobe-japan1-0
-                        =adobe-japan1-1 =>>>adobe-japan1-1 =>>adobe-japan1-1
-                        =adobe-japan1-2 =>>>adobe-japan1-2 =>>adobe-japan1-2
-                        =adobe-japan1-3 =>>>adobe-japan1-3 =>>adobe-japan1-3
-                        =adobe-japan1-4 =>>>adobe-japan1-4 =>>adobe-japan1-4
-                        =adobe-japan1-5 =>>>adobe-japan1-5 =>>adobe-japan1-5
-                        =adobe-japan1-6 =>>>adobe-japan1-6 =>>adobe-japan1-6
-                        =+>adobe-japan1
+                        =adobe-japan1-0 =>>>adobe-japan1-0
+                        =adobe-japan1-1 =>>>adobe-japan1-1
+                        =adobe-japan1-2 =>>>adobe-japan1-2
+                        =adobe-japan1-3 =>>>adobe-japan1-3
+                        =adobe-japan1-4 =>>>adobe-japan1-4
+                        =adobe-japan1-5 =>>>adobe-japan1-5
+                        =adobe-japan1-6 =>>>adobe-japan1-6
+                        =>>adobe-japan1-0 =+>adobe-japan1-0
+                        =>>adobe-japan1-1 =+>adobe-japan1-1
+                        =>>adobe-japan1-2 =+>adobe-japan1-2
+                        =>>adobe-japan1-3 =+>adobe-japan1-3
+                        =>>adobe-japan1-4 =+>adobe-japan1-4
+                        =>>adobe-japan1-5 =+>adobe-japan1-5
+                        =>>adobe-japan1-6 =+>adobe-japan1-6
                         =cbeta =>>cbeta
                         =zinbun-oracle =>zinbun-oracle))
             ;; (string-match "^=adobe-" (symbol-name name))
@@ -626,7 +638,10 @@
                           =jis-x0212
                           =jis-x0208@1983
                           =jis-x0208@1978
-                          =shinjigen))))
+                          =shinjigen
+                          =shinjigen@1ed
+                          =shinjigen@rev
+                          =shinjigen/+p@rev))))
           ((eq source 'CN)
            (setq required-features
                  (union required-features
@@ -1012,17 +1027,17 @@
            (setq strokes value)))
       (setq attributes (delq 'cns-strokes attributes))
       )
-    (when (and (memq 'shinjigen-1-radical attributes)
-              (setq value (get-char-attribute char 'shinjigen-1-radical)))
-      (unless (eq value radical)
-       (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
-                       value
-                       (ideographic-radical value)
-                       line-breaking))
-       (or radical
-           (setq radical value)))
-      (setq attributes (delq 'shinjigen-1-radical attributes))
-      )
+    ;; (when (and (memq 'shinjigen-1-radical attributes)
+    ;;            (setq value (get-char-attribute char 'shinjigen-1-radical)))
+    ;;   (unless (eq value radical)
+    ;;     (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
+    ;;                     value
+    ;;                     (ideographic-radical value)
+    ;;                     line-breaking))
+    ;;     (or radical
+    ;;         (setq radical value)))
+    ;;   (setq attributes (delq 'shinjigen-1-radical attributes))
+    ;;   )
     (when (and (memq 'ideographic- attributes)
               (setq value (get-char-attribute char 'ideographic-)))
       (insert "(ideographic-       ")