X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=c636fd0787d8a86279a254cee1e03cecffac58c7;hb=49d8b5093fdf682097a72268e08450865dd0e6b8;hp=dd2f35c88c61c284c72f1f3629591ffad17488a2;hpb=5fe76312d1a36ec1b92bfccb0990e8844a479034;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 dd2f35c..c636fd0 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 MORIOKA Tomohiko.
+;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,
+;;   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.
@@ -102,6 +102,8 @@
    ?𠨍 ?辟 ?勹 ?包 ?茍 ?鬼 ?甶 ?厶 ?嵬 ?山 ; 350
    ?屾 ?屵 ?广 ?厂 ?丸 ?危 ?石 ?長 ?勿 ?冄 ; 360
    ?而 ?豕 ?㣇 ?彑 ?豚 ?豸 ?𤉡 ?易 ?象 ?馬 ; 370
+   ?𢊁 ?鹿 ?麤 ?㲋 ?兔 ?萈 ?犬 ?㹜 ?鼠 ?能 ; 380
+   ?熊 ?火 ?炎 ?黑 ?囪 ?焱 ?炙 ?赤 ?大 ?亦 ; 390
    ])
 
 (defun shuowen-radical (number)
@@ -166,6 +168,7 @@
     =hanyo-denshi/hg
     =hanyo-denshi/jt
     =hanyo-denshi/ks
+    =hanyo-denshi/tk
     ;; ==mj
     ;; ==adobe-japan1-0
     ;; ==adobe-japan1-1
@@ -177,6 +180,7 @@
     ==jis-x0208
     ==jis-x0213-1
     ==jis-x0213-2
+    ==jis-x0212
     ==hanyo-denshi/ja
     ==hanyo-denshi/jb
     ==hanyo-denshi/jc
@@ -190,6 +194,7 @@
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
+    =daikanwa/+p
     ==daikanwa
     =cbeta
     ideograph-hanziku-1
@@ -260,6 +265,7 @@
     =>jis-x0213-1@2004
     =>jis-x0213-2
     ==>ucs@bucs
+    =>iwds-1
     =>ucs@hanyo-denshi
     =>ucs@iso
     =>ucs@unicode
@@ -293,7 +299,7 @@
     ==gt
     ==jis-x0208@1990
     ;; ==jis-x0208@1983
-    ;; ==jis-x0208@1978
+    ==jis-x0208@1978
     ==gt-k
     =ucs@iso
     =ucs@unicode
@@ -304,9 +310,11 @@
     =>>gt-k
     =+>gt
     =>gt
+    =>mj
     =>big5-cdp
     =>daikanwa
     =>daikanwa/ho
+    =>cns11643-5
     =>cns11643-7
     =big5
     =big5-eten
@@ -317,9 +325,21 @@
     =>>ruimoku-v6
     ==ruimoku-v6
     =jef-china3
+    =>cbeta
     =shinjigen
+    =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-3
-    =big5-cdp-var-5))
+    =big5-cdp-var-5
+    =>ucs@iwds-1))
 
 
 ;;; @ char-db formatters
@@ -617,7 +637,10 @@
 		 (decode-builtin-char '=gt ret))
 		(t
 		 (decode-builtin-char ccs code-point))))
-    (cond ((and (<= 0 (char-int ret))
+    (cond ((null ret)
+	   (or (decode-char ccs code-point)
+	       (define-char (list (cons ccs code-point)))))
+	  ((and (<= 0 (char-int ret))
 		(<= (char-int ret) #x1F))
 	   (decode-char '=ucs (+ #x2400 (char-int ret))))
 	  ((= (char-int ret) #x7F)
@@ -632,7 +655,8 @@
     (insert
      (format
       (cond
-       ((memq name '(==shinjigen
+       ((memq name '(=>iwds-1
+		     ==shinjigen
 		     =shinjigen
 		     =shinjigen@1ed ==shinjigen@1ed
 		     =shinjigen@rev ==shinjigen@rev
@@ -642,42 +666,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
-			 =zinbun-oracle =>zinbun-oracle))
-            ;; (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
@@ -852,6 +894,12 @@
 				       line-breaking
 				       ccss readable)
       (setq attributes (delq '<-denotational attributes)))
+    (when (and (memq '<-denotational@component attributes)
+	       (setq value (get-char-attribute char '<-denotational@component)))
+      (char-db-insert-relation-feature char '<-denotational@component value
+				       line-breaking
+				       ccss readable)
+      (setq attributes (delq '<-denotational@component attributes)))
     (when (and (memq 'name attributes)
 	       (setq value (get-char-attribute char 'name)))
       (insert (format