(U+5C70): Unify AJ1-17543.

[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 3cdf841..b5df1e9 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -70,7 +70,7 @@
    ?正 ?是 ?辵 ?彳 ?廴 ?㢟 ?行 ?齒 ?牙 ?足 ; 040
    ?疋 ?品 ?龠 ?冊 ?㗊 ?舌 ?干 ?谷 ?只 ?㕯 ; 050
    ?句 ?丩 ?古 ?十 ?卅 ?言 ?誩 ?音 ?䇂 ?丵 ; 060
-   ?菐 ?𠬞 ?廾 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
+   ?菐 ?𠬞 ?𠬜 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
    ?鬲 ?䰜 ?爪 ?𠃨 ?鬥 ?又 ?𠂇 ?㕜 ?支 ?𦘒 ; 080
    ?聿 ?畫 ?隶 ?臤 ?臣 ?殳 ?殺 ?𠘧 ?寸 ?皮 ; 090
    ?㼱 ?攴 ?敎 ?卜 ?用 ?爻 ?㸚 ?𥄎 ?目 ?䀠 ; 100
@@ -79,7 +79,7 @@
    ?𠦒 ?冓 ?幺 ?𢆶 ?叀 ?玄 ?予 ?放 ?𠬪 ?𣦼 ; 130
    ?歺 ?死 ?冎 ?骨 ?肉 ?筋 ?刀 ?刃 ?㓞 ?丰 ; 140
    ?耒 ?𧢲 ?竹 ?箕 ?丌 ?左 ?工 ?㠭 ?巫 ?甘 ; 150
-   ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?旨 ?喜 ?壴 ; 160
+   ?旨 ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?喜 ?壴 ; 160
    ?鼓 ?豈 ?豆 ?豊 ?豐 ?䖒 ?虍 ?虎 ?虤 ?皿 ; 170
    ?𠙴 ?去 ?血 ?丶 ?丹 ?青 ?井 ?皀 ?鬯 ?食 ; 180
    ?亼 ?會 ?倉 ?入 ?缶 ?矢 ?高 ?冂 ?𩫏 ?京 ; 190
@@ -155,8 +155,10 @@
     =hanyo-denshi/ia
     =hanyo-denshi/ib
     =hanyo-denshi/hg
-    ideograph-daikanwa-2
-    ideograph-daikanwa
+    =hanyo-denshi/ks
+    =daikanwa
+    =daikanwa@rev2
+    =daikanwa@rev1
     =cbeta
     =gt-k
     ideograph-hanziku-1
@@ -171,6 +173,8 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =>>>jis-x0208
+    =>>>jis-x0213-1
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
@@ -180,6 +184,7 @@
     =>>hanyo-denshi/ft
     =>>hanyo-denshi/ks
     =>>gt
+    =>>daikanwa
     =>jis-x0208@usual
     =>jis-x0208
     =>jis-x0208@1997
@@ -299,7 +304,8 @@
     (insert-char-attributes char
                            readable
                             (union (mapcar #'car char-spec)
-                                  required-features))
+                                  required-features)
+                           nil 'for-sub-node)
     (when temp-char
       ;; undefine temporary character
       ;;   Current implementation is dirty.
@@ -340,7 +346,7 @@
                   (insert-char-attributes ret
                                           readable
                                           (or al 'none) ; cal
-                                          ))
+                                          nil 'for-sub-node))
               (insert (prin1-to-string value)))
             (insert ")")
             (insert line-breaking))
@@ -372,7 +378,7 @@
                     (insert-char-attributes ret
                                             readable
                                             al ; cal
-                                            )
+                                            nil 'for-sub-node)
                     (setq separator lbs))
                 (if separator
                     (insert separator))
@@ -464,11 +470,13 @@
           "(%-18s .  %04d)\t; %c")
          ((eq name '=shinjigen@1ed/24pr)
           "(%-18s . %04d)\t; %c")
-         ((or (memq name '(=daikanwa
+         ((or (memq name '(=daikanwa =>>daikanwa =>daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
                            =daikanwa/+p =daikanwa/+2p
-                           =>>daikanwa =>daikanwa
-                           =gt =>>gt =>gt =gt-k =>>gt-k =>gt-k =cbeta
+                           =gt =>>>gt =>>gt =>gt
+                           =gt-k =>>gt-k =>gt-k
+                           =>>adobe-japan1
+                           =cbeta =>>cbeta
                            =zinbun-oracle =>zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
           "(%-18s . %05d)\t; %c")
@@ -520,7 +528,7 @@
          (let ((char-db-ignored-attributes
                 (cons '<-subsumptive
                       char-db-ignored-attributes)))
-           (insert-char-attributes cell readable))
+           (insert-char-attributes cell readable nil nil 'for-sub-node))
          (setq separator lbs))
        )
        ((characterp cell)
@@ -596,7 +604,8 @@
     (insert ")")
     (insert line-breaking)))
 
-(defun insert-char-attributes (char &optional readable attributes column)
+(defun insert-char-attributes (char &optional readable attributes column
+                                   for-sub-node)
   (unless column
     (setq column (current-column)))
   (let (name value ; has-long-ccs-name
@@ -628,7 +637,7 @@
                  #'char-attribute-name<)))
     (insert "(")
     (when (memq '<-subsumptive attributes)
-      (when readable
+      (when (or readable (not for-sub-node))
        (when (setq value (get-char-attribute char '<-subsumptive))
          (char-db-insert-relation-feature char '<-subsumptive value
                                           line-breaking
@@ -1107,8 +1116,10 @@
                     (eq name 'ideographic-combination)
                     (eq name 'ideographic-)
                     (eq name '=decomposition)
-                    (string-match "^=>*decomposition\\(@[^*]+\\)?$"
-                                  (symbol-name name))
+                    (char-feature-base-name= '=decomposition name)
+                     (char-feature-base-name= '=>decomposition name)
+                     ;; (string-match "^=>*decomposition\\(@[^*]+\\)?$"
+                     ;;               (symbol-name name))
                     (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name name))
                     (string-match "^\\(->\\|<-\\)[^*]*\\*sources$"
                                   (symbol-name name))
@@ -1169,7 +1180,8 @@
                             (insert lbs))
                         (insert-char-attributes ret
                                                 readable
-                                                al cal)
+                                                al ; cal
+                                                nil 'for-sub-node)
                         (setq separator lbs))
                     (setq ret (prin1-to-string cell))
                     (if separator