X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=e9d96f072964d153ad52e75e083b8f83d8b5926a;hb=55035c76aa21d93bc5a941d566be3d871b9a3bc8;hp=b6b1b14bcc747e4a53cf261784417179ca0c90c1;hpb=1d8504140d6bc7b364655a481701d7ba01f11114;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index b6b1b14..e9d96f0 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -182,6 +182,7 @@
     =>>hanyo-denshi/ft
     =>>hanyo-denshi/ks
     =>>gt
+    =>>daikanwa
     =>jis-x0208@usual
     =>jis-x0208
     =>jis-x0208@1997
@@ -466,12 +467,12 @@
 	   "(%-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
-			    =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 =>>hanyo-denshi/ks mojikyo))
@@ -1109,8 +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))