Reformatted.

[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 5bd5ddb..e9d96f0 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -171,6 +171,8 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =>>>jis-x0208
+    =>>>jis-x0213-1
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
@@ -178,7 +180,9 @@
     =>>jis-x0213-2
     =>>jis-x0208@1978
     =>>hanyo-denshi/ft
+    =>>hanyo-denshi/ks
     =>>gt
+    =>>daikanwa
     =>jis-x0208@usual
     =>jis-x0208
     =>jis-x0208@1997
@@ -194,9 +198,12 @@
     =>ucs@JP
     =>ucs@cns
     =>ucs@ks
+    =>>ucs@iso
     =>>ucs@unicode
     =>>ucs@jis
     =>>ucs@cns
+    =>>>ucs@iso
+    =>>>ucs@unicode
     =ucs@iso
     =ucs@unicode
     =>>big5-cdp
@@ -206,6 +213,7 @@
     =>daikanwa
     =big5
     =big5-eten
+    =>gt-k
     =zinbun-oracle
     =>zinbun-oracle
     =ruimoku-v6
@@ -459,15 +467,15 @@
           "(%-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 =cbeta
-                           =zinbun-oracle =>zinbun-oracle))
+                           =gt =>>>gt =>>gt =>gt
+                           =gt-k =>>gt-k =>gt-k
+                           =cbeta =zinbun-oracle =>zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
           "(%-18s . %05d)\t; %c")
-         ((memq name '(=hanyo-denshi/ks mojikyo))
+         ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
           "(%-18s . %06d)\t; %c")
          ((>= (charset-dimension name) 2)
           "(%-18s . #x%04X)\t; %c")
@@ -1102,7 +1110,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))