X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=85017af878ee469d22ea120525ca7f7cf685333c;hb=d611d274cfcfa74787453f6a254ec206e4cd04ed;hp=0daad0473c72e8da8f1dedddbaf43f5398719d1f;hpb=21738348200e1c832b1e739773369c609048f14b;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 0daad04..85017af 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,2012,2013,2014,2015 MORIOKA Tomohiko.
+;;   2008,2009,2010,2011,2012,2013,2014,2015,2016 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -168,6 +168,7 @@
     =hanyo-denshi/hg
     =hanyo-denshi/jt
     =hanyo-denshi/ks
+    =hanyo-denshi/tk
     ;; ==mj
     ;; ==adobe-japan1-0
     ;; ==adobe-japan1-1
@@ -179,6 +180,7 @@
     ==jis-x0208
     ==jis-x0213-1
     ==jis-x0213-2
+    ==jis-x0212
     ==hanyo-denshi/ja
     ==hanyo-denshi/jb
     ==hanyo-denshi/jc
@@ -308,9 +310,11 @@
     =>>gt-k
     =+>gt
     =>gt
+    =>mj
     =>big5-cdp
     =>daikanwa
     =>daikanwa/ho
+    =>cns11643-5
     =>cns11643-7
     =big5
     =big5-eten
@@ -323,8 +327,19 @@
     =jef-china3
     =>cbeta
     =shinjigen
-    =big5-cdp-var-3
-    =big5-cdp-var-5
+    =ucs-var-001
+    =ucs-var-002
+    =ucs-var-003
+    =ucs-itaiji-001
+    =ucs-itaiji-002
+    =ucs-itaiji-003
+    =ucs-itaiji-004
+    =ucs-itaiji-005
+    =ucs-itaiji-006
+    =ucs-itaiji-008
+    =big5-cdp-var-003
+    =big5-cdp-var-004
+    =big5-cdp-var-005
     =>ucs@iwds-1))
 
 
@@ -652,50 +667,60 @@
 	"(%-18s .  %04d)\t; %c")
        ((eq name '=shinjigen@1ed/24pr)
 	"(%-18s . %04d)\t; %c")
-       ((or (memq name '(===daikanwa
-			 ==daikanwa =daikanwa =>>daikanwa =>daikanwa
-			 =daikanwa@rev1 =daikanwa@rev2
-			 =daikanwa/+p ==daikanwa/+p ===daikanwa/+p
-			 =>>daikanwa/+p
-			 =daikanwa/+2p =>>daikanwa/+2p
-			 =gt ==gt ===gt
-			 =>>gt =+>gt =>gt
-			 =gt-k ==gt-k ===gt-k
-			 =>>gt-k =>gt-k
-			 =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-0 =+>adobe-japan1-0
-			 =>>adobe-japan1-1 =+>adobe-japan1-1
-			 =>>adobe-japan1-2 =+>adobe-japan1-2
-			 =>>adobe-japan1-3 =+>adobe-japan1-3
-			 =>>adobe-japan1-4 =+>adobe-japan1-4
-			 =>>adobe-japan1-5 =+>adobe-japan1-5
-			 =>>adobe-japan1-6 =+>adobe-japan1-6
-			 =>cbeta =cbeta =>>cbeta ==cbeta ===cbeta
-			 =zinbun-oracle =>zinbun-oracle
-			 ===hng-jou
-			 ===hng-khi ===hng-khm ===hng-kak
-			 ===hng-sys ===hng-tsu
-			 ===hng-hod ===hng-gok ===hng-k24
-			 ===hng-kcj ===hng-kbk ===hng-sik
-			 ===hng-skk ===hng-kyu ===hng-ksk ===hng-wan
-			 ===hng-kss ===hng-kyo
-			 ===hng-smk))
-            ;; (string-match "^=adobe-" (symbol-name name))
-	    )
+       ((or
+	 (memq name
+	       '(===daikanwa
+		 ==daikanwa =daikanwa =>>daikanwa =>daikanwa
+		 =daikanwa@rev1 =daikanwa@rev2
+		 =daikanwa/+p ==daikanwa/+p ===daikanwa/+p
+		 =>>daikanwa/+p
+		 =daikanwa/+2p =>>daikanwa/+2p
+		 =gt ==gt ===gt
+		 =>>gt =+>gt =>gt
+		 =gt-k ==gt-k ===gt-k
+		 =>>gt-k =>gt-k
+		 =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-0 =+>adobe-japan1-0
+		 =>>adobe-japan1-1 =+>adobe-japan1-1
+		 =>>adobe-japan1-2 =+>adobe-japan1-2
+		 =>>adobe-japan1-3 =+>adobe-japan1-3
+		 =>>adobe-japan1-4 =+>adobe-japan1-4
+		 =>>adobe-japan1-5 =+>adobe-japan1-5
+		 =>>adobe-japan1-6 =+>adobe-japan1-6
+		 =>cbeta =cbeta =>>cbeta ==cbeta ===cbeta
+		 =zinbun-oracle =>zinbun-oracle
+		 ===hng-jou ===hng-keg ===hng-dng ===hng-mam
+		 ===hng-drt ===hng-kgk ===hng-myz ===hng-kda
+		 ===hng-khi ===hng-khm ===hng-hok ===hng-kyd ===hng-sok
+		 ===hng-yhk ===hng-kak ===hng-kar ===hng-kae
+		 ===hng-sys ===hng-tsu ===hng-tzj
+		 ===hng-hos ===hng-nak ===hng-jhk
+		 ===hng-hod ===hng-gok ===hng-ink ===hng-nto
+		 ===hng-nkm ===hng-k24 ===hng-nkk
+		 ===hng-kcc ===hng-kcj ===hng-kbk ===hng-sik
+		 ===hng-skk ===hng-kyu ===hng-ksk ===hng-wan
+		 ===hng-okd ===hng-wad ===hng-kmi
+		 ===hng-zkd ===hng-doh ===hng-jyu
+		 ===hng-tzs ===hng-kss ===hng-kyo
+		 ===hng-smk))
+	 ;; (string-match "^=adobe-" (symbol-name name))
+	 )
 	"(%-18s . %05d)\t; %c")
        ((memq name '(=hanyo-denshi/ks
 		     ==hanyo-denshi/ks ===hanyo-denshi/ks
 		     =>>hanyo-denshi/ks
-		     =koseki
-		     =mj ==mj ===mj =>>mj
+		     =koseki ==koseki
+		     =mj ==mj ===mj =>>mj =>mj
 		     =zihai mojikyo))
 	"(%-18s . %06d)\t; %c")
+       ((memq name '(=hanyo-denshi/tk ==hanyo-denshi/tk))
+	"(%-18s . %08d)\t; %c")
        ((>= (charset-dimension name) 2)
 	"(%-18s . #x%04X)\t; %c")
        (t