X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=1627f79e6f5f5b020049c4f4e67dd294c3e36089;hb=d0e4227ad459f28951d0e7c67188c465d4654c30;hp=e9c6bb12e2b216a80fada1db3ffc59626dd75ecb;hpb=a9f4aa57b18dc2f078e9fa9f2cb7e3d6a7abe66e;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index e9c6bb1..1627f79 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,8 @@
 ;;; 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,2016,2017,2018,2019 MORIOKA Tomohiko.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+;;   2020 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -105,6 +106,20 @@
    ?𢊁 ?鹿 ?麤 ?㲋 ?兔 ?萈 ?犬 ?㹜 ?鼠 ?能 ; 380
    ?熊 ?火 ?炎 ?黑 ?囪 ?焱 ?炙 ?赤 ?大 ?亦 ; 390
    ?夨 ?夭 ?交 ?尣 ?壺 ?壹 ?㚔 ?奢 ?亢 ?夲 ; 400
+   ?夰 ?亣 ?夫 ?立 ?竝 ?囟 ?思 ?心 ?惢 ?水 ; 410
+   ?沝 ?瀕 ?𡿨 ?巜 ?川 ?泉 ?灥 ?永 ?𠂢 ?谷 ; 420
+   ?仌 ?雨 ?雲 ?魚 ?𩺰 ?燕 ?龍 ?飛 ?非 ?卂 ; 430
+   ?𠃉 ?不 ?至 ?西 ?鹵 ?鹽 ?戶 ?門 ?耳 ?𦣝 ; 440
+   ?手 ?𠦬 ?女 ?毋 ?民 ?丿 ?𠂆 ?乁 ?氏 ?氐 ; 450
+   ?戈 ?戉 ?我 ?亅 ?琴 ?𠃊 ?亡 ?匸 ?匚 ?曲 ; 460
+   ?甾 ?瓦 ?弓 ?弜 ?弦 ?系 ?糸 ?素 ?絲 ?率 ; 470
+   ?虫 ?䖵 ?蟲 ?風 ?它 ?龜 ?黽 ?卵 ?二 ?土 ; 480
+   ?垚 ?堇 ?里 ?田 ?畕 ?黃 ?男 ?力 ?劦 ?金 ; 490
+   ?幵 ?勺 ?几 ?且 ?斤 ?斗 ?矛 ?車 ?𠂤 ?𨸏 ; 500
+   ?𨺅 ?厽 ?四 ?宁 ?叕 ?亞 ?五 ?六 ?七 ?九 ; 510
+   ?禸 ?嘼 ?甲 ?乙 ?丙 ?丁 ?戊 ?己 ?巴 ?庚 ; 520
+   ?辛 ?辡 ?壬 ?癸 ?子 ?了 ?孨 ?𠫓 ?丑 ?寅 ; 530
+   ?卯 ?辰 ?巳 ?午 ?未 ?申 ?酉 ?酋 ?戌 ?亥 ; 540
    ])
 
 (defun shuowen-radical (number)
@@ -271,7 +286,6 @@
     =>jis-x0213-2
     ==>ucs@bucs
     ==>daijiten
-    =>iwds-1
     ;; =>ucs@hanyo-denshi
     =>ucs@iso
     =>ucs@unicode
@@ -316,30 +330,33 @@
     =>>gt-k
     =+>gt
     =+>big5-cdp
-    =>gt
-    =>mj
     =>big5-cdp
-    =>daikanwa
-    =>daikanwa/ho
-    =>cns11643-5
-    =>cns11643-7
+    =>big5-cdp@iwds-1
+    =>mj
+    =>iwds-1
     =big5
     =big5-eten
-    =>gt-k
     =zinbun-oracle
     =>zinbun-oracle
     =ruimoku-v6
     =>>ruimoku-v6
     ==ruimoku-v6
     =jef-china3
-    =>cbeta
     =shinjigen
+    =>cns11643-5
+    =>cns11643-7
+    =>gt
+    =>gt-k
+    =>daikanwa
+    =>daikanwa/ho
+    =>cbeta
     =ucs-var-001
     =ucs-var-002
     =ucs-var-003
     =ucs-var-004
     =ucs-var-005
     =ucs-var-006
+    =ucs-var-007
     =ucs-var-008
     =ucs-var-010
     =ucs-itaiji-001
@@ -354,6 +371,7 @@
     =ucs-itaiji-010
     =ucs-itaiji-011
     =ucs-itaiji-012
+    =+>ucs-var-003
     =>ucs-itaiji-001
     =>ucs-itaiji-002
     =>ucs-itaiji-003
@@ -361,22 +379,33 @@
     =>ucs-itaiji-005
     =>ucs-itaiji-006
     =>ucs-itaiji-007
+    =>ucs-itaiji-008
     =>ucs-itaiji-009
+    =>ucs-itaiji-010
+    =>ucs-itaiji-011
     =big5-cdp-var-001
     =big5-cdp-var-002
     =big5-cdp-var-003
     =big5-cdp-var-004
     =big5-cdp-var-005
+    =big5-cdp-var-007
     =big5-cdp-var-010
     =big5-cdp-itaiji-001
     =big5-cdp-itaiji-002
     =big5-cdp-itaiji-003
+    =big5-cdp-itaiji-004
+    =big5-cdp-itaiji-005
     =>big5-cdp-itaiji-001
+    =>big5-cdp-itaiji-002
+    =>big5-cdp-itaiji-003
+    =>big5-cdp-itaiji-004
+    =>big5-cdp-var-001
     =>ucs@iwds-1
     =>ucs@cognate
     =>ucs@component
+    =>ucs@iwds-1/normalized
     =>ucs-itaiji-001@iwds-1
-    =>big5-cdp@iwds-1
+    =>ucs-itaiji-002@iwds-1
     =>big5-cdp@component
     =>big5-cdp@cognate
     ==ucs@gb
@@ -752,8 +781,10 @@
 		 ===hng-skk ===hng-kyu ===hng-ksk ===hng-wan
 		 ===hng-okd ===hng-wad ===hng-kmi
 		 ===hng-zkd ===hng-doh ===hng-jyu ===hng-tzs
-		 ===hng-sai ===hng-kss ===hng-kyo ===hng-ykk
+		 ===hng-sai ===hng-kad ===hng-kss
+		 ===hng-kyo ===hng-ykk ===hng-saa
 		 ===hng-sab ===hng-wks ===hng-wke ===hng-smk
+		 ===hng-sgs ===hng-sts
 		 =shuowen-jiguge ===shuowen-jiguge4 ===shuowen-jiguge5))
 	 ;; (string-match "^=adobe-" (symbol-name name))
 	 )
@@ -1388,6 +1419,7 @@
 		    ))
 	       )
 	      ((or (eq name 'ideographic-structure)
+		   (eq name 'ideographic-structure@apparent)
 		   (eq name 'ideographic-combination)
                    ;; (eq name 'ideographic-)
 		   (eq name '=decomposition)