X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fchar-db-util.el;h=2a0f888579c9505847281964e14ea58a1ceab0b3;hb=HEAD;hp=dfd17977b9bdbeaef15030c8e652a5121271ce69;hpb=e5847c4c409aebe9a6bc68877f6365cd7d4d354d;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index dfd1797..87d11f6 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -2,7 +2,7 @@
 
 ;; 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.
+;;   2020, 2021, 2022, 2023, 2024 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -71,7 +71,7 @@
    ?正 ?是 ?辵 ?彳 ?廴 ?㢟 ?行 ?齒 ?牙 ?足 ; 040
    ?疋 ?品 ?龠 ?冊 ?㗊 ?舌 ?干 ?𧮫 ?只 ?㕯 ; 050
    ?句 ?丩 ?古 ?十 ?卅 ?言 ?誩 ?音 ?䇂 ?丵 ; 060
-   ?菐 ?廾 ?𠬜 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
+   ?菐 ?𠬞 ?𠬜 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
    ?鬲 ?䰜 ?爪 ?𠃨 ?鬥 ?又 ?𠂇 ?史 ?支 ?𦘒 ; 080
    ?聿 ?畫 ?隶 ?臤 ?臣 ?殳 ?殺 ?𠘧 ?寸 ?皮 ; 090
    ?㼱 ?攴 ?敎 ?卜 ?用 ?爻 ?㸚 ?𥄎 ?目 ?䀠 ; 100
@@ -90,7 +90,7 @@
    ?之 ?帀 ?出 ?𣎵 ?生 ?乇 ?𠂹 ?𠌶 ?華 ?𥝌 ; 220
    ?稽 ?巢 ?桼 ?束 ?㯻 ?囗 ?員 ?貝 ?邑 ?𨛜 ; 230
    ?日 ?旦 ?倝 ?㫃 ?冥 ?晶 ?月 ?有 ?明 ?囧 ; 240
-   ?夕 ?多 ?毌 ?𢎘 ?𣐺 ?𠧪 ?齊 ?朿 ?片 ?鼎 ; 250
+   ?夕 ?多 ?毌 ?𢎘 ?𣐺 ?卣 ?齊 ?朿 ?片 ?鼎 ; 250
    ?克 ?彔 ?禾 ?秝 ?黍 ?香 ?米 ?毇 ?臼 ?凶 ; 260
    ?𣎳 ?𣏟 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
    ?呂 ?穴 ?㝱 ?疒 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
@@ -106,6 +106,20 @@
    ?𢊁 ?鹿 ?麤 ?㲋 ?兔 ?萈 ?犬 ?㹜 ?鼠 ?能 ; 380
    ?熊 ?火 ?炎 ?黑 ?囪 ?焱 ?炙 ?赤 ?大 ?亦 ; 390
    ?夨 ?夭 ?交 ?尣 ?壺 ?壹 ?㚔 ?奢 ?亢 ?夲 ; 400
+   ?夰 ?亣 ?夫 ?立 ?竝 ?囟 ?思 ?心 ?惢 ?水 ; 410
+   ?沝 ?瀕 ?𡿨 ?巜 ?川 ?泉 ?灥 ?永 ?𠂢 ?谷 ; 420
+   ?仌 ?雨 ?雲 ?魚 ?𩺰 ?燕 ?龍 ?飛 ?非 ?卂 ; 430
+   ?𠃉 ?不 ?至 ?西 ?鹵 ?鹽 ?戶 ?門 ?耳 ?𦣝 ; 440
+   ?手 ?𠦬 ?女 ?毋 ?民 ?丿 ?𠂆 ?乁 ?氏 ?氐 ; 450
+   ?戈 ?戉 ?我 ?亅 ?琴 ?𠃊 ?亡 ?匸 ?匚 ?曲 ; 460
+   ?甾 ?瓦 ?弓 ?弜 ?弦 ?系 ?糸 ?素 ?絲 ?率 ; 470
+   ?虫 ?䖵 ?蟲 ?風 ?它 ?龜 ?黽 ?卵 ?二 ?土 ; 480
+   ?垚 ?堇 ?里 ?田 ?畕 ?黃 ?男 ?力 ?劦 ?金 ; 490
+   ?幵 ?勺 ?几 ?且 ?斤 ?斗 ?矛 ?車 ?𠂤 ?𨸏 ; 500
+   ?𨺅 ?厽 ?四 ?宁 ?叕 ?亞 ?五 ?六 ?七 ?九 ; 510
+   ?禸 ?嘼 ?甲 ?乙 ?丙 ?丁 ?戊 ?己 ?巴 ?庚 ; 520
+   ?辛 ?辡 ?壬 ?癸 ?子 ?了 ?孨 ?𠫓 ?丑 ?寅 ; 530
+   ?卯 ?辰 ?巳 ?午 ?未 ?申 ?酉 ?酋 ?戌 ?亥 ; 540
    ])
 
 (defun shuowen-radical (number)
@@ -168,6 +182,7 @@
     =hanyo-denshi/ia
     =hanyo-denshi/ib
     =hanyo-denshi/hg
+    =hanyo-denshi/ip
     =hanyo-denshi/jt
     =hanyo-denshi/ks
     =hanyo-denshi/tk
@@ -200,6 +215,7 @@
     =daikanwa@rev2
     =daikanwa@rev1
     =daikanwa/+p
+    =daikanwa/ho
     ==daikanwa
     ==daijiten
     =cbeta
@@ -234,6 +250,7 @@
     ;; =>>>hanyo-denshi/jt
     ;; =>>>hanyo-denshi/ks
     ;; =>>>gt
+    =>>mj
     =>>adobe-japan1-0
     =>>adobe-japan1-1
     =>>adobe-japan1-2
@@ -287,6 +304,7 @@
     =>>ucs@iso
     =>>ucs@unicode
     =>>ucs@jis
+    =>>ucs@JP
     =>>ucs@cns
     =>>>ucs@iso
     =>>>ucs@unicode
@@ -319,6 +337,7 @@
     =>big5-cdp
     =>big5-cdp@iwds-1
     =>mj
+    =>hanyo-denshi/tk
     =>iwds-1
     =big5
     =big5-eten
@@ -327,6 +346,7 @@
     =ruimoku-v6
     =>>ruimoku-v6
     ==ruimoku-v6
+    =>ruimoku-v6
     =jef-china3
     =shinjigen
     =>cns11643-5
@@ -357,6 +377,12 @@
     =ucs-itaiji-010
     =ucs-itaiji-011
     =ucs-itaiji-012
+    =ucs-itaiji-013
+    =ucs-itaiji-014
+    =ucs-itaiji-015
+    =ucs-itaiji-016
+    =ucs-itaiji-018
+    =+>ucs-var-003
     =>ucs-itaiji-001
     =>ucs-itaiji-002
     =>ucs-itaiji-003
@@ -368,18 +394,30 @@
     =>ucs-itaiji-009
     =>ucs-itaiji-010
     =>ucs-itaiji-011
+    =>ucs-itaiji-012
+    =>ucs-itaiji-014
+    =>ucs-itaiji-015
+    =>ucs-itaiji-016
+    =>ucs-var-001
     =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-008
     =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-itaiji-005
+    =>big5-cdp-itaiji-006
     =>big5-cdp-var-001
     =>ucs@iwds-1
     =>ucs@cognate
@@ -387,12 +425,21 @@
     =>ucs@iwds-1/normalized
     =>ucs-itaiji-001@iwds-1
     =>ucs-itaiji-002@iwds-1
+    =>ucs-itaiji-003@iwds-1
+    =>ucs-itaiji-006@iwds-1
     =>big5-cdp@component
     =>big5-cdp@cognate
     ==ucs@gb
     =ucs@gb
     ==ucs-var-002
-    =ucs@JP/hanazono))
+    ==ucs-itaiji-002
+    =ucs@JP/hanazono
+    =koseki
+    =shuowen-jiguge
+    =>shuowen-jiguge
+    ===shuowen-jiguge5
+    ===shuowen-jiguge4
+    ===chise-hdic-ktb-seal))
 
 
 ;;; @ char-db formatters
@@ -765,8 +812,9 @@
 		 ===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))
+		 ===hng-sgs ===hng-sts ===hng-kkd
+		 =>shuowen-jiguge =shuowen-jiguge
+		 ===shuowen-jiguge4 ===shuowen-jiguge5 ===shuowen-jiguge-A30))
 	 ;; (string-match "^=adobe-" (symbol-name name))
 	 )
 	"(%-18s . %05d)\t; %c")
@@ -777,7 +825,7 @@
 		     =mj ==mj ===mj =>>mj =>mj
 		     =zihai mojikyo))
 	"(%-18s . %06d)\t; %c")
-       ((memq name '(=hanyo-denshi/tk ==hanyo-denshi/tk))
+       ((memq name '(=hanyo-denshi/tk =>hanyo-denshi/tk ==hanyo-denshi/tk))
 	"(%-18s . %08d)\t; %c")
        ((>= (charset-dimension name) 2)
 	"(%-18s . #x%04X)\t; %c")
@@ -1400,6 +1448,9 @@
 		    ))
 	       )
 	      ((or (eq name 'ideographic-structure)
+		   (eq name 'ideographic-structure@apparent)
+		   (eq name 'ideographic-structure@apparent/leftmost)
+		   (eq name 'ideographic-structure@apparent/rightmost)
 		   (eq name 'ideographic-combination)
                    ;; (eq name 'ideographic-)
 		   (eq name '=decomposition)