X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=a79d3596f2a7b54972cbb7f255831f630d376121;hb=4b7bdc73cb23870ab5881a873ab3dc5d5d871c42;hp=02cd1f9e5fec3f66537fa9d3ff7b473034c16fb6;hpb=b760382a2279e522d16afac2e27377fdaeac66f8;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 02cd1f9..a79d359 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 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -100,6 +100,10 @@
    ?㱃 ?㳄 ?旡 ?頁 ?𦣻 ?面 ?丏 ?首 ?𥄉 ?須 ; 330
    ?彡 ?彣 ?文 ?髟 ?后 ?司 ?卮 ?卩 ?印 ?色 ; 340
    ?𠨍 ?辟 ?勹 ?包 ?茍 ?鬼 ?甶 ?厶 ?嵬 ?山 ; 350
+   ?屾 ?屵 ?广 ?厂 ?丸 ?危 ?石 ?長 ?勿 ?冄 ; 360
+   ?而 ?豕 ?㣇 ?彑 ?豚 ?豸 ?𤉡 ?易 ?象 ?馬 ; 370
+   ?𢊁 ?鹿 ?麤 ?㲋 ?兔 ?萈 ?犬 ?㹜 ?鼠 ?能 ; 380
+   ?熊 ?火 ?炎 ?黑 ?囪 ?焱 ?炙 ?赤 ?大 ?亦 ; 390
    ])
 
 (defun shuowen-radical (number)
@@ -188,6 +192,7 @@
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
+    =daikanwa/+p
     ==daikanwa
     =cbeta
     ideograph-hanziku-1
@@ -258,6 +263,7 @@
     =>jis-x0213-1@2004
     =>jis-x0213-2
     ==>ucs@bucs
+    =>iwds-1
     =>ucs@hanyo-denshi
     =>ucs@iso
     =>ucs@unicode
@@ -315,6 +321,7 @@
     =>>ruimoku-v6
     ==ruimoku-v6
     =jef-china3
+    =>cbeta
     =shinjigen
     =big5-cdp-var-3
     =big5-cdp-var-5))
@@ -615,7 +622,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)
@@ -630,7 +640,8 @@
     (insert
      (format
       (cond
-       ((memq name '(==shinjigen
+       ((memq name '(=>iwds-1
+		     ==shinjigen
 		     =shinjigen
 		     =shinjigen@1ed ==shinjigen@1ed
 		     =shinjigen@rev ==shinjigen@rev
@@ -664,7 +675,7 @@
 			 =>>adobe-japan1-4 =+>adobe-japan1-4
 			 =>>adobe-japan1-5 =+>adobe-japan1-5
 			 =>>adobe-japan1-6 =+>adobe-japan1-6
-			 =cbeta ==cbeta ===cbeta =>>cbeta
+			 =>cbeta =cbeta =>>cbeta ==cbeta ===cbeta
 			 =zinbun-oracle =>zinbun-oracle))
             ;; (string-match "^=adobe-" (symbol-name name))
 	    )
@@ -850,6 +861,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