X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=8b5dd7472f6a4f0fa2f5a3124ae6f4ddd3dffb7f;hb=91dc744e2a5fa146b35cec6c76d513433b787097;hp=deeb5f0c80fb7c5cea45c4eee0de7b3e547b38e6;hpb=ff46bf5b55b3ee2f9ee8d4eff89095033c8b5dfe;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index deeb5f0..8b5dd74 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010, 2011, 2012 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -138,8 +138,6 @@
     chinese-gb12345
     latin-viscii
     ethiopic-ucs
-    =big5-cdp
-    =gt
     =adobe-japan1-0
     =adobe-japan1-1
     =adobe-japan1-2
@@ -147,6 +145,7 @@
     =adobe-japan1-4
     =adobe-japan1-5
     =adobe-japan1-6
+    =big5-cdp
     =hanyo-denshi/ja
     =hanyo-denshi/jb
     =hanyo-denshi/jc
@@ -157,11 +156,12 @@
     =hanyo-denshi/hg
     =hanyo-denshi/jt
     =hanyo-denshi/ks
+    =gt
+    =gt-k
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
     =cbeta
-    =gt-k
     ideograph-hanziku-1
     ideograph-hanziku-2
     ideograph-hanziku-3
@@ -177,6 +177,8 @@
     =>>>jis-x0208
     =>>>jis-x0213-1
     =>>>jis-x0213-2
+    =>>>gt
+    =>>>adobe-japan1
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
@@ -184,13 +186,16 @@
     =>>jis-x0213-2
     =>>jis-x0208@1978
     =>>hanyo-denshi/ft
+    =>>hanyo-denshi/jt
     =>>hanyo-denshi/ks
     =>>gt
     =>>daikanwa
+    =>>adobe-japan1
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
     =+>jis-x0208@1978
+    =+>adobe-japan1
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
@@ -203,6 +208,7 @@
     =>ucs@jis
     =>ucs@cns
     =>ucs@ks
+    =+>ucs@iso
     =+>ucs@unicode
     =+>ucs@jis
     =+>ucs@jis/1990
@@ -218,9 +224,12 @@
     =ucs@unicode
     =>>big5-cdp
     =>>gt-k
+    =+>gt
     =>gt
     =>big5-cdp
     =>daikanwa
+    =>daikanwa/ho
+    =>cns11643-7
     =big5
     =big5-eten
     =>gt-k
@@ -477,21 +486,30 @@
        ((memq name '(=shinjigen
 		     =shinjigen@1ed
 		     =shinjigen@rev =shinjigen/+p@rev
-		     =daikanwa/ho))
+		     =daikanwa/ho =>>daikanwa/ho =>daikanwa/ho))
 	"(%-18s .  %04d)\t; %c")
        ((eq name '=shinjigen@1ed/24pr)
 	"(%-18s . %04d)\t; %c")
        ((or (memq name '(=daikanwa =>>daikanwa =>daikanwa
 			 =daikanwa@rev1 =daikanwa@rev2
-			 =daikanwa/+p =daikanwa/+2p
-			 =gt =>>>gt =>>gt =>gt
+			 =daikanwa/+p =>>daikanwa/+p
+			 =daikanwa/+2p =>>daikanwa/+2p
+			 =gt =>>>gt =>>gt =+>gt =>gt
 			 =gt-k =>>gt-k =>gt-k
-			 =>>adobe-japan1
+			 =adobe-japan1-0 =>>>adobe-japan1-0 =>>adobe-japan1-0
+			 =adobe-japan1-1 =>>>adobe-japan1-1 =>>adobe-japan1-1
+			 =adobe-japan1-2 =>>>adobe-japan1-2 =>>adobe-japan1-2
+			 =adobe-japan1-3 =>>>adobe-japan1-3 =>>adobe-japan1-3
+			 =adobe-japan1-4 =>>>adobe-japan1-4 =>>adobe-japan1-4
+			 =adobe-japan1-5 =>>>adobe-japan1-5 =>>adobe-japan1-5
+			 =adobe-japan1-6 =>>>adobe-japan1-6 =>>adobe-japan1-6
+			 =+>adobe-japan1
 			 =cbeta =>>cbeta
 			 =zinbun-oracle =>zinbun-oracle))
-	    (string-match "^=adobe-" (symbol-name name)))
+            ;; (string-match "^=adobe-" (symbol-name name))
+	    )
 	"(%-18s . %05d)\t; %c")
-       ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
+       ((memq name '(=hanyo-denshi/ks =>>>hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
 	"(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)
 	"(%-18s . #x%04X)\t; %c")