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

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index a9e60bc..e9d96f0 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -140,6 +140,21 @@
     ethiopic-ucs
     =big5-cdp
     =gt
+    =adobe-japan1-0
+    =adobe-japan1-1
+    =adobe-japan1-2
+    =adobe-japan1-3
+    =adobe-japan1-4
+    =adobe-japan1-5
+    =adobe-japan1-6
+    =hanyo-denshi/ja
+    =hanyo-denshi/jb
+    =hanyo-denshi/jc
+    =hanyo-denshi/jd
+    =hanyo-denshi/ft
+    =hanyo-denshi/ia
+    =hanyo-denshi/ib
+    =hanyo-denshi/hg
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
@@ -156,13 +171,18 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =>>>jis-x0208
+    =>>>jis-x0213-1
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
     =>>jis-x0213-1@2004
     =>>jis-x0213-2
     =>>jis-x0208@1978
+    =>>hanyo-denshi/ft
+    =>>hanyo-denshi/ks
     =>>gt
+    =>>daikanwa
     =>jis-x0208@usual
     =>jis-x0208
     =>jis-x0208@1997
@@ -178,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
@@ -190,6 +213,7 @@
     =>daikanwa
     =big5
     =big5-eten
+    =>gt-k
     =zinbun-oracle
     =>zinbun-oracle
     =ruimoku-v6
@@ -443,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")
-	  ((eq name 'mojikyo)
+	  ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
 	   "(%-18s . %06d)\t; %c")
 	  ((>= (charset-dimension name) 2)
 	   "(%-18s . #x%04X)\t; %c")
@@ -1086,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))