X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b1b8cf4d1896cfa618603140841ba675e44c7515;hb=b402901df6a39bb05cae3772d44848e1629b91ea;hp=562ccce7974ce7365ca83746b067ad882ff9f9a2;hpb=94df3662eb5d927a3f2af775d1aa57ee1e47c7b7;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 562ccce..b1b8cf4 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 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -70,7 +70,9 @@
       (setq i (1+ i)))
     v))
 
+;;;###autoload
 (defun ideographic-radical (number)
+  "Return character corresponding with Kangxi-radical number."
   (aref ideographic-radicals number))
 
 (defconst shuowen-radicals
@@ -82,7 +84,7 @@
    ?句 ?丩 ?古 ?十 ?卅 ?言 ?誩 ?音 ?䇂 ?丵 ; 060
    ?菐 ?𠬞 ?廾 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
    ?鬲 ?䰜 ?爪 ?𠃨 ?鬥 ?又 ?𠂇 ?㕜 ?支 ?𦘒 ; 080
-   ?聿 ?畫 ?隶 ?堅 ?臣 ?殳 ?殺 ?𠘧 ?寸 ?皮 ; 090
+   ?聿 ?畫 ?隶 ?臤 ?臣 ?殳 ?殺 ?𠘧 ?寸 ?皮 ; 090
    ?㼱 ?攴 ?敎 ?卜 ?用 ?爻 ?㸚 ?𥄎 ?目 ?䀠 ; 100
    ?眉 ?盾 ?自 ?白 ?鼻 ?皕 ?習 ?羽 ?隹 ?奞 ; 110
    ?萑 ?𦫳 ?苜 ?羊 ?羴 ?瞿 ?雔 ?雥 ?鳥 ?烏 ; 120
@@ -93,8 +95,16 @@
    ?鼓 ?豈 ?豆 ?豊 ?豐 ?䖒 ?虍 ?虎 ?虤 ?皿 ; 170
    ?𠙴 ?去 ?血 ?丶 ?丹 ?青 ?井 ?皀 ?鬯 ?食 ; 180
    ?亼 ?會 ?倉 ?入 ?缶 ?矢 ?高 ?冂 ?𩫏 ?京 ; 190
-   ?亯 ?畗 ?𣆪 ?㐭 ?𠾂 ?來 ?麥 ?夊 ?舛 ?䑞 ; 200
-   ?韋 ?弟 ?夂 ?久 ?桀
+   ?亯 ?𣆪 ?畗 ?㐭 ?嗇 ?來 ?麥 ?夊 ?舛 ?䑞 ; 200
+   ?韋 ?弟 ?夂 ?久 ?桀 ?木 ?東 ?林 ?才 ?叒 ; 210
+   ?之 ?帀 ?出 ?𣎵 ?生 ?乇 ?𠂹 ?𠌶 ?華 ?𥝌 ; 220
+   ?稽 ?巢 ?桼 ?束 ?㯻 ?囗 ?員 ?貝 ?邑 ?𨛜 ; 230
+   ?日 ?旦 ?倝 ?㫃 ?冥 ?晶 ?月 ?有 ?明 ?囧 ; 240
+   ?夕 ?多 ?毌 ?𢎘 ?𣐺 ?卣 ?齊 ?朿 ?片 ?鼎 ; 250
+   ?克 ?彔 ?禾 ?秝 ?黍 ?香 ?米 ?毇 ?臼 ?凶 ; 260
+   ?𣎳 ?林 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
+   ?呂 ?穴 ?㝱 ?𤕫 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
+   ?巾 ?巿 ?帛 ?白 ?㡀 ?黹 ?人 ?𠤎 ?匕 ?从 ; 290
    ])
 
 (defun shuowen-radical (number)
@@ -147,23 +157,27 @@
     )
    ((find-charset ka)
     (if (find-charset kb)
-	(if (<= (charset-id ka) 1)
-	    (if (<= (charset-id kb) 1)
-		(cond
-		 ((= (charset-dimension ka)
-		     (charset-dimension kb))
-		  (> (charset-id ka)(charset-id kb)))
-		 (t
-		  (> (charset-dimension ka)
-		     (charset-dimension kb))
-		  ))
-	      t)
-	  (if (<= (charset-id kb) 1)
-	      nil
-	    (< (charset-id ka)(charset-id kb))))
-      nil))
-   ((find-charset kb)
-    t)
+	(let (a-ir b-ir)
+	  (if (setq a-ir (charset-property ka 'iso-ir))
+	      (if (setq b-ir (charset-property kb 'iso-ir))
+		  (cond
+		   ((= a-ir b-ir)
+		    (< (charset-id ka)(charset-id kb))
+		    )
+		   ((= a-ir 177)
+		    t)
+		   ((= b-ir 177)
+		    nil)
+		   ((< a-ir
+		       b-ir)
+		    ))
+		t)
+	    (if (charset-property kb 'iso-ir)
+		nil
+	      (< (charset-id ka)(charset-id kb)))))
+      nil)
+    )
+   ((find-charset kb))
    ((symbolp ka)
     (cond ((symbolp kb)
 	   (string< (symbol-name ka)
@@ -197,8 +211,10 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0213-1-2000
-    =jis-x0213-2-2000
+    =jis-x0213-1
+    =jis-x0213-1@2000
+    =jis-x0213-1@2004
+    =jis-x0213-2
     korean-ksc5601
     chinese-isoir165
     katakana-jisx0201
@@ -208,6 +224,8 @@
     ethiopic-ucs
     =big5-cdp
     =gt
+    =>>gt
+    =>gt
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
@@ -226,12 +244,25 @@
     =gt-k
     =ucs@iso
     =ucs@unicode
+    =>>jis-x0208
+    =>>jis-x0213-1
+    =>>jis-x0213-1@2000
+    =>>jis-x0213-1@2004
+    =>>jis-x0213-2
+    =>>jis-x0208@1978
+    =>jis-x0208
+    =>jis-x0208@1997
+    =>jis-x0213-1
+    =>jis-x0213-1@2000
+    =>jis-x0213-1@2004
+    =>jis-x0213-2
     =big5
     =big5-eten
-    =jis-x0208@1997
     =zinbun-oracle
+    =>zinbun-oracle
     =ruimoku-v6
-    =jef-china3))
+    =jef-china3
+    =shinjigen))
 
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
@@ -266,7 +297,8 @@
 					 =daikanwa@rev2
 					 ;; =gt-k
 					 =jis-x0208@1997
-					 )))
+					 ))
+				 (string-match "=ucs@" (symbol-name ccs)))
 			     (setq ccs (charset-name ccs))
 			     (null (assq ccs char-spec))
 			     (setq ret (encode-char char ccs 'defined-only)))
@@ -279,6 +311,12 @@
 			((setq ret (get-char-attribute char 'name*))
 			 (setq char-spec (cons (cons 'name* ret) char-spec))
 			 ))
+		  )
+		 ((setq ret (get-char-attribute
+			     char 'ideographic-combination))
+		  (setq char-spec
+			(cons (cons 'ideographic-combination ret)
+			      char-spec))
 		  ))
 	   char-spec)
 	  ((consp char)
@@ -461,9 +499,16 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((or (memq name '(=daikanwa
+    (cond ((memq name '(=shinjigen
+			=shinjigen@1ed
+			=shinjigen@rev =shinjigen/+p@rev))
+	   "(%-18s .  %04d)\t; %c")
+	  ((eq name '=shinjigen@1ed/24pr)
+	   "(%-18s . %04d)\t; %c")
+	  ((or (memq name '(=daikanwa
 			    =daikanwa@rev1 =daikanwa@rev2
-			    =gt =gt-k =cbeta =zinbun-oracle))
+			    =gt =>>gt =>gt =gt-k =cbeta
+			    =zinbun-oracle =>zinbun-oracle))
 	       (string-match "^=adobe-" (symbol-name name)))
 	   "(%-18s . %05d)\t; %c")
 	  ((eq name 'mojikyo)
@@ -524,7 +569,9 @@
 	(setq required-features nil)
 	(dolist (source sources)
 	  (cond
-	   ((memq source '(JP JP/Jouyou shinjigen-1))
+	   ((memq source '(JP
+			   JP/Jouyou
+			   shinjigen shinjigen@1ed shinjigen@rev))
 	    (setq required-features
 		  (union required-features
 			 '(=jis-x0208
@@ -533,7 +580,8 @@
 			   =jis-x0213-2-2000
 			   =jis-x0212
 			   =jis-x0208@1983
-			   =jis-x0208@1978))))
+			   =jis-x0208@1978
+			   =shinjigen))))
 	   ((eq source 'CN)
 	    (setq required-features
 		  (union required-features