X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=3cdf8414fea40af6653e5d7aae91a0f92dca78d6;hb=981353d3432789c18191debde8215dc4443ee581;hp=1b30ec1a1f143944eeb6e90e937675b42d5741a0;hpb=c4226f5c95c6cc7b73970a6574d8fbcd2c8b2c5d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 1b30ec1..3cdf841 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
@@ -162,6 +177,8 @@
     =>>jis-x0213-1@2004
     =>>jis-x0213-2
     =>>jis-x0208@1978
+    =>>hanyo-denshi/ft
+    =>>hanyo-denshi/ks
     =>>gt
     =>jis-x0208@usual
     =>jis-x0208
@@ -178,9 +195,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 +210,7 @@
     =>daikanwa
     =big5
     =big5-eten
+    =>gt-k
     =zinbun-oracle
     =>zinbun-oracle
     =ruimoku-v6
@@ -438,18 +459,20 @@
    (format
     (cond ((memq name '(=shinjigen
 			=shinjigen@1ed
-			=shinjigen@rev =shinjigen/+p@rev))
+			=shinjigen@rev =shinjigen/+p@rev
+			=daikanwa/ho))
 	   "(%-18s .  %04d)\t; %c")
 	  ((eq name '=shinjigen@1ed/24pr)
 	   "(%-18s . %04d)\t; %c")
 	  ((or (memq name '(=daikanwa
 			    =daikanwa@rev1 =daikanwa@rev2
+			    =daikanwa/+p =daikanwa/+2p
 			    =>>daikanwa =>daikanwa
-			    =gt =>>gt =>gt =gt-k =>>gt-k =cbeta
+			    =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")
@@ -1084,7 +1107,8 @@
 		     (eq name 'ideographic-combination)
 		     (eq name 'ideographic-)
 		     (eq name '=decomposition)
-		     (string-match "^=>decomposition" (symbol-name name))
+		     (string-match "^=>*decomposition\\(@[^*]+\\)?$"
+				   (symbol-name name))
 		     (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name name))
 		     (string-match "^\\(->\\|<-\\)[^*]*\\*sources$"
 				   (symbol-name name))