From 594d90e3db89a981f931dc2467ce50e958e923ce Mon Sep 17 00:00:00 2001 From: tomo Date: Sun, 22 Jun 2003 19:05:44 +0000 Subject: [PATCH] Sync up with r21-2-44-utf-2000-m0_18-big5-r106. --- lisp/utf-2000/ChangeLog | 161 +++++++++++++++++++++ lisp/utf-2000/Ideograph-R004-Slash.el | 69 ++++++--- lisp/utf-2000/Ideograph-R008-Lid.el | 5 +- lisp/utf-2000/Ideograph-R017-Open-Box.el | 43 +++++- lisp/utf-2000/Ideograph-R029-Again.el | 16 +-- lisp/utf-2000/Ideograph-R036-Evening.el | 20 ++- lisp/utf-2000/Ideograph-R037-Big.el | 79 +++++++---- lisp/utf-2000/Ideograph-R038-Woman.el | 226 ++++++++++++++++++++++++++---- lisp/utf-2000/Ideograph-R039-Child.el | 86 ++++++++---- lisp/utf-2000/Ideograph-R040-Roof.el | 1 + lisp/utf-2000/Ideograph-R044-Corpse.el | 9 +- lisp/utf-2000/Ideograph-R079-Weapon.el | 7 + lisp/utf-2000/Ideograph-R092-Fang.el | 10 +- lisp/utf-2000/Ideograph-R096-Jade.el | 8 +- lisp/utf-2000/Ideograph-R106-White.el | 84 +++++++++-- lisp/utf-2000/Ideograph-R110-Spear.el | 11 +- lisp/utf-2000/Ideograph-R118-Bamboo.el | 2 +- lisp/utf-2000/Ideograph-R119-Rice.el | 73 ++++++++-- lisp/utf-2000/Ideograph-R120-Silk.el | 84 ++++++++++- lisp/utf-2000/Ideograph-R121-Jar.el | 27 +++- lisp/utf-2000/Ideograph-R122-Net.el | 1 + lisp/utf-2000/Ideograph-R123-Sheep.el | 3 + lisp/utf-2000/Ideograph-R124-Feather.el | 40 +++--- lisp/utf-2000/Ideograph-R125-Old.el | 1 + lisp/utf-2000/Ideograph-R128-Ear.el | 19 +++ lisp/utf-2000/Ideograph-R130-Meat.el | 18 ++- lisp/utf-2000/char-db-util.el | 48 ++++--- lisp/utf-2000/ideograph-util.el | 28 ++-- 28 files changed, 971 insertions(+), 208 deletions(-) diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index e6c871c..fc64db6 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,164 @@ +2003-06-21 MORIOKA Tomohiko + + * Ideograph-R106-White.el: Add mappings for Big5 code points. + +2003-06-20 MORIOKA Tomohiko + + * Ideograph-R004-Slash.el (U-00020086): Use `ideographic-radical', + `ideographic-strokes@{ucs|gt}', `total-strokes@{ucs|gt}' and + `ideographic-strokes@ucs*sources' instead of `ideographic-'. + (U+53CA): Use `ideographic-{radical|strokes}@{ucs|gt}', + `total-strokes@{ucs|gt}' and `ideographic-radical@ucs*sources' + instead of `ideographic-'. + (M-00129): Don't use char-ref format in `->same-ideograph'; use + `->same-ideograph*sources' instead. + (U+5C39): Copied from Ideograph-R044-Corpse.el; add + `ideographic-{radical|strokes}@cns'. + (U+738D): Copied from Ideograph-R096-Jade.el; add + `ideographic-{radical|strokes}@cns'. + +2003-06-19 MORIOKA Tomohiko + + * Ideograph-R130-Meat.el (C6-5675): Map to U-00026714. + (U-00026714): Unify M-29745'. + + * ideograph-util.el (char-ideographic-radical): Refer + `char-db-feature-domains'. + (char-ideographic-strokes): Likewise; refer `ideographic-radical' + as the default attribute. + (update-ideograph-radical-table): Refer `char-db-feature-domains'. + + * char-db-util.el (char-db-feature-domains): New variable. + (insert-char-attributes): Insert `ideographic-radical' before + `ideographic-radical@DOMAIN'; refer `char-db-feature-domains'; + support `total-strokes@DOMAIN'; support + `{ideographic-strokes|total-strokes}@DOMAIN*sources'. + +2003-06-19 MORIOKA Tomohiko + + * Ideograph-R029-Again.el (U+53CA): Use + `ideographic-{radical|strokes}@{ucs|gt}', `total-strokes@{ucs|gt}' + and `ideographic-radical@ucs*sources' instead of `ideographic-'. + +2003-06-18 MORIOKA Tomohiko + + * Ideograph-R039-Child.el (M-06947): New character. + (U-00021946): Relate to M-06947. + (C6-2676): Likewise. + (U-00024605): Unify M-19911; use + `ideographic-{radical|strokes}@cns' instead of + `ideographic-{radical|strokes}'; add + `ideographic-{radical|strokes}@ucs and + `ideographic-radical@ucs*sources'. + (U-0002194F): Use `ideographic-strokes@daikanwa' and + `total-strokes@daikanwa' instead of `ideographic-strokes' and + `total-strokes'; use `total-strokes@cns' instead of + `cns-total-strokes'; add `ideographic-strokes@cns'. + (M-07011): Unify C3-4072; map to U+5B76 instead of 5B73. + (U+5B76): Separate C3-4072; relate to M-07011. + + * Ideograph-R092-Fang.el (M-19911): Unify C5-2368 and U-00024605; + use `ideographic-{radical|strokes}@ucs' instead of + `ideographic-{radical|strokes}'; add + `ideographic-radical@ucs*sources' and + `ideographic-{radical|strokes}@cns'. + +2003-06-18 MORIOKA Tomohiko + + * Ideograph-R096-Jade.el (U+738D): Use + `ideographic-{radical|strokes}@ucs' instead of + `ideographic-{radical|strokes}'; add + `ideographic-{radical|strokes}@cns'. + + * Ideograph-R044-Corpse.el (U+5C39): Use + `ideographic-{radical|strokes}@ucs' instead of + `ideographic-{radical|strokes}'; add + `ideographic-radical@ucs*sources'; use `ideographic-radical@cns' + instead of `cns-radical'; add `ideographic-strokes@cns'. + + * Ideograph-R017-Open-Box.el (U+342B): Copied from + Ideograph-R008-Lid.el. + (M-01841): Move C5-5A75 to M-23906; add `->identical' for M-23906. + (U-00025390): Copied from Ideograph-R110-Spear.el; unify C5-5A75. + + * Ideograph-R008-Lid.el (U+342B): Use `ideographic-radical@ucs' + instead of `ideographic-radical'; add + `ideographic-radical@ucs*sources' and `ideographic-radical@cns'. + + * Ideograph-R110-Spear.el (U-00025390): Use + `ideographic-{radical|strokes}@ucs' instead of + `ideographic-{radical|strokes}'; add + `ideographic-radical@{ucs|cns}*sources' and + `ideographic-{radical|strokes}@cns'; unify C5-5A75. + + * Ideograph-R120-Silk.el: Add some missing mappings to JEF-CHINA3 + code points. + + * Ideograph-R128-Ear.el (GT-K04926): New character. + (BC-8C5B): New character. + + * Ideograph-R124-Feather.el, Ideograph-R121-Jar.el: Add some + missing mappings to JEF-CHINA3 code points. + +2003-06-17 MORIOKA Tomohiko + + * Ideograph-R119-Rice.el (U+7CE9): Separate C7-4857; unify + JC3-5EDB. + + * Ideograph-R079-Weapon.el (JC3-93C8): New character. + + * Ideograph-R123-Sheep.el (U+7FA1): Unify JC3-5FF7. + (M-28545): Unify JC3-98F3. + (B-F5EE): Unify JC3-5FFB. + + * Ideograph-R118-Bamboo.el (U+7B2F): Unify JC3-5DF1. + (C2-377C): Separate JC3-5DF1. + +2003-06-17 MORIOKA Tomohiko + + * Ideograph-R125-Old.el (U+800A): Unify JC3-60B6. + + * Ideograph-R122-Net.el (U+7F87): Unify JC3-64BC. + + * Ideograph-R040-Roof.el (M-07062): Unify JC3-4AA3. + +2003-06-17 MORIOKA Tomohiko + + * Ideograph-R038-Woman.el (U+36A8): Unify MH-0117. + (C3-2349): Relate to MH-0117. + (U-000216F8): New character. + (U-00021757): New character. + (MH-0120): New character. + (MH-0121): New character. + (U-000217D5): Relate to MH-0117. + (M-06569): Separate C3-4062 and U+3706. + (U+3706): Separate M-06569 and C3-4062; fix strokes. + (U-00021809): New character. + (MH-0123): New character. + (MH-0124): New character. + (C3-464B): Relate to MH-0124. + (U+3715): Relate to MH-0124. + (MH-0125): New character. + (MH-0126): New character. + (U-000218B1): Unify MH-0127. + (C5-537E): Relate to MH-0127. + (U-000218F6): New character. + (MH-0129): New character. + (U-00021909): New character. + + * Ideograph-R036-Evening.el (U-00021585): Unify MH-0111 and + CB07125; add strokes. + (U+3C54): Unify MH-0112. + (C3-2B7B): Relate to MH-0112. + + * Ideograph-R037-Big.el (MH-0113): New character. + (U-000215F1): Relate to MH-0113; add strokes. + (MH-0114): New character. + (U-0002161A): Relate to MH-0114; add strokes. + (U+7275): Add `total-strokes'. + (U-00021693): Unify MH-0115; add strokes. + (U-0002168D): Unify MH-0116; add strokes. + 2003-06-16 MORIOKA Tomohiko * u02E00-CJK-Radical-Supplement.el, Ideograph-R208-Rat.el, diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index e44aa2a..66dd9ea 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -30,14 +30,13 @@ (=ucs . #x4E40) ; 乀 )) (define-char - '((ideographic- (:radical 4 ; ⼃ - :strokes 0 - :total-strokes 1 - :sources (ucs cns-11643 morohashi-daikanwa)) - (:radical 4 ; ⼃ - :strokes 1 - :total-strokes 2 - :sources (gt))) + '((ideographic-radical . 4) ; ⼃ + (ideographic-strokes@ucs . 0) + (total-strokes@ucs . 1) + (ideographic-strokes@ucs*sources + daikanwa cns11643 ucs) + (ideographic-strokes@gt . 1) + (total-strokes@gt . 2) (hanyu-dazidian 1 67 17) (=cns11643-4 . #x2121) ; ø»— ¨ (=gt-pj-2 . #x3074) ; ý¡€€‚˜ @@ -375,14 +374,14 @@ )) (define-char '((morohashi-daikanwa 3118 1) - (ideographic- (:radical 29 ; ⼜ - :strokes 2 - :total-strokes 4 - :sources (morohashi-daikanwa jis-x0208 cns-11643 ucs)) - (:radical 4 ; ⼃ - :strokes 2 - :total-strokes 3 - :sources (gt))) + (ideographic-radical@ucs . 29) ; ⼜ + (ideographic-strokes@ucs . 2) + (total-strokes@ucs . 4) + (ideographic-radical@ucs*sources + daikanwa jis-x0208 cns11643 ucs) + (ideographic-radical@gt . 4) ; ⼃ + (ideographic-strokes@gt . 2) + (total-strokes@gt . 3) (hanyu-dazidian 1 35 1) (shinjigen-1 . 900) (shinjigen-2 . 900) @@ -534,16 +533,37 @@ (ideographic-strokes . 3) (total-strokes . 4) (->same-ideograph - (:sources (morohashi-daikanwa) - :char ((ideographic-radical . 20) ; ⼓ - (=daikanwa . 02502) ; ø¸€§† - ) + ((ideographic-radical . 20) ; ⼓ + (=daikanwa . 02502) ; ø¸€§† )) + (->same-ideograph*sources + daikanwa) (=gt-pj-11 . #x527B) ; ý¡€€‚° (=daikanwa . 00129) ; ø¸€‚ (=gt . 00176) ; ý¡€€‚° )) (define-char + '((ideographic-radical@ucs . 44) ; ⼫ + (ideographic-strokes@ucs . 1) + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 4) ; ⼃ + (ideographic-strokes@cns . 3) + (total-strokes . 4) + (shinjigen-2 . 1919) + (=gb2312 . #x527C) ; ø»… + (=jis-x0208 . #x557A) ; ø½‹ƒ­ + (=ks-x1001 . #x6B45) ; ø»Š‡œ + (=iso-ir165 . #x527C) ; ø»·­ + (=cns11643-1 . #x4467) ; ø»‘¶¼ + (=gt-pj-1 . #x557A) ; ý¡€‚– + (=big5 . #xA4A8) ; ý¢€Š’¨ + (=daikanwa . 07631) ; ø¸· + (=gt-k . 00525) ; ý¡„€ˆ + (=gt . 09616) ; ý¡€‚– + (=ucs . #x5C39) ; å°¹ + )) +(define-char '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 3) (total-strokes . 4) @@ -799,6 +819,15 @@ (=ucs . #x4E50) ; 乐 )) (define-char + '((ideographic-radical@ucs . 96) ; ⽟ + (ideographic-strokes@ucs . 1) + (ideographic-radical@cns . 4) ; ⼃ + (ideographic-strokes@cns . 4) + (total-strokes . 5) + (=cns11643-3 . #x216B) ; ø»•—® + (=ucs . #x738D) ; 玍 + )) +(define-char '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 4) (total-strokes . 5) diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el index 5caccd0..75bffd7 100644 --- a/lisp/utf-2000/Ideograph-R008-Lid.el +++ b/lisp/utf-2000/Ideograph-R008-Lid.el @@ -434,7 +434,10 @@ )) (define-char '((morohashi-daikanwa ho 8 0) - (ideographic-radical . 8) ; ⼇ + (ideographic-radical@ucs . 8) ; ⼇ + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 17) ; ⼐ (ideographic-strokes . 4) (total-strokes . 6) (hanyu-dazidian 1 283 2) diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el index 5b7b82f..0bea2db 100644 --- a/lisp/utf-2000/Ideograph-R017-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el @@ -393,6 +393,26 @@ (=ucs . #x26953) ; 𦥓 )) (define-char + '((morohashi-daikanwa ho 8 0) + (ideographic-radical@ucs . 8) ; ⼇ + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 17) ; ⼐ + (ideographic-strokes . 4) + (total-strokes . 6) + (hanyu-dazidian 1 283 2) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4EA0) ; 亠 + ) + ((=ucs . #x51F6) ; 凶 + )) + (=cns11643-3 . #x2323) ; ø»•™¢ + (=ucs . #x342B) ; 㐫 + )) +(define-char '((ideographic-radical . 17) ; ⼐ (ideographic-strokes . 4) (total-strokes . 6) @@ -693,10 +713,31 @@ (ideographic-radical . 17) ; ⼐ (ideographic-strokes . 15) (total-strokes . 17) - (=cns11643-5 . #x5A75) ; ø»š¿® + (->identical + ((=daikanwa . 23906) ; ø¸…µ¢ + )) (=daikanwa . 01841) ; ø¸€œ± )) (define-char + '((ideographic-radical@ucs . 110) ; â½­ + (ideographic-strokes@ucs . 12) + (ideographic-radical@ucs*sources + daikanwa@r110 ucs) + (ideographic-radical@cns . 17) ; ⼐ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa@r017 cns11643) + (total-strokes . 17) + (->identical + ((=daikanwa . 01841) ; ø¸€œ± + )) + (hanyu-dazidian 4 2768 16) + (=cns11643-5 . #x5A75) ; ø»š¿® + (=daikanwa . 23906) ; ø¸…µ¢ + (=hanziku-7 . #xE845) ; ý¢¾¡… + (=ucs . #x25390) ; 𥎐 + )) +(define-char '((ideographic-radical . 17) ; ⼐ (ideographic-strokes . 16) (total-strokes . 18) diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index fb667a5..fe305cd 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -99,14 +99,14 @@ )) (define-char '((morohashi-daikanwa 3118 1) - (ideographic- (:radical 29 ; ⼜ - :strokes 2 - :total-strokes 4 - :sources (morohashi-daikanwa jis-x0208 cns-11643 ucs)) - (:radical 4 ; ⼃ - :strokes 2 - :total-strokes 3 - :sources (gt))) + (ideographic-radical@ucs . 29) ; ⼜ + (ideographic-strokes@ucs . 2) + (total-strokes@ucs . 4) + (ideographic-radical@ucs*sources + daikanwa jis-x0208 cns11643 ucs) + (ideographic-radical@gt . 4) ; ⼃ + (ideographic-strokes@gt . 2) + (total-strokes@gt . 3) (hanyu-dazidian 1 35 1) (shinjigen-1 . 900) (shinjigen-2 . 900) diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el index b16dce4..8436245 100644 --- a/lisp/utf-2000/Ideograph-R036-Evening.el +++ b/lisp/utf-2000/Ideograph-R036-Evening.el @@ -101,6 +101,16 @@ (=ucs . #x21586) ; 𡖆 )) (define-char + '((morohashi-daikanwa ho 111) + (ideographic-radical . 36) ; â¼£ + (ideographic-strokes . 2) + (total-strokes . 5) + (hanyu-dazidian 2 861 2) + (=hanziku-3 . #xAD62) ; ý¢€ºµ¢ + (=cbeta . 07125) ; ø¸¡¯• + (=ucs . #x21585) ; 𡖅 + )) +(define-char '((ideographic-radical . 36) ; â¼£ (ideographic-strokes . 3) (total-strokes . 6) @@ -326,13 +336,15 @@ (=cbeta . 02776) ; ø¸ «˜ )) (define-char - '((ideographic-radical . 36) ; â¼£ + '((morohashi-daikanwa ho 112) + (ideographic-radical . 36) ; â¼£ (ideographic-strokes . 6) (total-strokes . 9) (=ucs . #x3C54) ; 㱔 )) (define-char '((=>ucs . #x3C54) ; 㱔 + (morohashi-daikanwa ho 112 0) (ideographic-radical . 36) ; â¼£ (ideographic-strokes . 6) (total-strokes . 9) @@ -1185,12 +1197,6 @@ )) (define-char '((ideographic-radical . 36) ; â¼£ - (hanyu-dazidian 2 861 2) - (=hanziku-3 . #xAD62) ; ý¢€ºµ¢ - (=ucs . #x21585) ; 𡖅 - )) -(define-char - '((ideographic-radical . 36) ; â¼£ (hanyu-dazidian 2 862 1) (=hanziku-3 . #xADA3) ; ý¢€º¶£ (=ucs . #x21587) ; 𡖇 diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el index 05b24e2..75325ae 100644 --- a/lisp/utf-2000/Ideograph-R037-Big.el +++ b/lisp/utf-2000/Ideograph-R037-Big.el @@ -640,6 +640,24 @@ (=ucs . #x215F0) ; 𡗰 )) (define-char + '((=>ucs . #x215F1) ; 𡗱 + (morohashi-daikanwa ho 113) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 4) + (total-strokes . 7) + (=gt-pj-11 . #x433F) ; ý¡€³± + (=gt . 07409) ; ý¡€³± + )) +(define-char + '((morohashi-daikanwa ho 113 0) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 4) + (total-strokes . 7) + (hanyu-dazidian 1 529 13) + (=hanziku-2 . #xBCD9) ; ý¢€«³™ + (=ucs . #x215F1) ; 𡗱 + )) +(define-char '((script C-Simplified Ideograph) (ideographic-radical . 37) ; ⼤ (ideographic-strokes . 4) @@ -1425,8 +1443,27 @@ (=daikanwa . 05925) ; ø¸œ¥ )) (define-char + '((=>ucs . #x2161A) ; 𡘚 + (morohashi-daikanwa ho 114) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 6) + (total-strokes . 9) + (=gt-pj-11 . #x435B) ; ý¡€´£ + (=gt . 07459) ; ý¡€´£ + )) +(define-char + '((morohashi-daikanwa ho 114 0) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 6) + (total-strokes . 9) + (hanyu-dazidian 1 540 4) + (=hanziku-2 . #xBEF6) ; ý¢€«»¶ + (=ucs . #x2161A) ; 𡘚 + )) +(define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 6) + (total-strokes . 9) (hanyu-dazidian 3 1806 15) (=gb2312 . #x4723) ; ø»„½º (=iso-ir165 . #x4723) ; ø»¦Š @@ -3057,6 +3094,24 @@ (=daikanwa . 49012) ; ø¸‹½´ )) (define-char + '((morohashi-daikanwa ho 115) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 13) + (total-strokes . 16) + (hanyu-dazidian 1 550 5) + (=hanziku-2 . #xC0FD) ; ý¢€¬ƒ½ + (=ucs . #x21693) ; 𡚓 + )) +(define-char + '((morohashi-daikanwa ho 116) + (ideographic-radical . 37) ; ⼤ + (ideographic-strokes . 13) + (total-strokes . 16) + (hanyu-dazidian 1 549 14) + (=hanziku-2 . #xC0E6) ; ý¢€¬ƒ¦ + (=ucs . #x2168D) ; 𡚍 + )) +(define-char '((=>ucs . #x2168A) ; 𡚊 (ideographic-radical . 37) ; ⼤ (ideographic-strokes . 14) @@ -3263,12 +3318,6 @@ )) (define-char '((ideographic-radical . 37) ; ⼤ - (hanyu-dazidian 1 529 13) - (=hanziku-2 . #xBCD9) ; ý¢€«³™ - (=ucs . #x215F1) ; 𡗱 - )) -(define-char - '((ideographic-radical . 37) ; ⼤ (hanyu-dazidian 1 529 16) (=hanziku-2 . #xBCDC) ; ý¢€«³œ (=ucs . #x215F2) ; 𡗲 @@ -3305,12 +3354,6 @@ )) (define-char '((ideographic-radical . 37) ; ⼤ - (hanyu-dazidian 1 540 4) - (=hanziku-2 . #xBEF6) ; ý¢€«»¶ - (=ucs . #x2161A) ; 𡘚 - )) -(define-char - '((ideographic-radical . 37) ; ⼤ (hanyu-dazidian 1 540 8) (=hanziku-2 . #xBEFA) ; ý¢€«»º (=ucs . #x2161B) ; 𡘛 @@ -3425,18 +3468,6 @@ )) (define-char '((ideographic-radical . 37) ; ⼤ - (hanyu-dazidian 1 549 14) - (=hanziku-2 . #xC0E6) ; ý¢€¬ƒ¦ - (=ucs . #x2168D) ; 𡚍 - )) -(define-char - '((ideographic-radical . 37) ; ⼤ - (hanyu-dazidian 1 550 5) - (=hanziku-2 . #xC0FD) ; ý¢€¬ƒ½ - (=ucs . #x21693) ; 𡚓 - )) -(define-char - '((ideographic-radical . 37) ; ⼤ (hanyu-dazidian 1 550 6) (=hanziku-2 . #xC0FE) ; ý¢€¬ƒ¾ (=ucs . #x21694) ; 𡚔 diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el index 7350c86..40af66d 100644 --- a/lisp/utf-2000/Ideograph-R038-Woman.el +++ b/lisp/utf-2000/Ideograph-R038-Woman.el @@ -530,13 +530,15 @@ (=cns11643-4 . #x2257) ; ø»—¢¼ )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((morohashi-daikanwa ho 117) + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 3) (total-strokes . 6) (=ucs . #x36A8) ; 㚨 )) (define-char '((=>ucs . #x36A8) ; 㚨 + (morohashi-daikanwa ho 117 0) (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 3) (total-strokes . 6) @@ -2440,11 +2442,25 @@ '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 5) (total-strokes . 8) - (=cns11643-3 . #x2839) ; ø»•¡Ž (=daikanwa . 06198) ; ø¸ ¶ (=ucs . #x36BF) ; 㚿 )) (define-char + '((=>ucs . #x36BF) ; 㚿 + (morohashi-daikanwa 6198 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 5) + (total-strokes . 8) + (=cns11643-3 . #x2839) ; ø»•¡Ž + )) +(define-char + '((morohashi-daikanwa ho 118) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 5) + (total-strokes . 8) + (=ucs . #x216F8) ; 𡛸 + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 5) (total-strokes . 8) @@ -4936,6 +4952,13 @@ (=ucs . #x2173D) ; 𡜽 )) (define-char + '((morohashi-daikanwa ho 119) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 7) + (total-strokes . 10) + (=ucs . #x21757) ; 𡝗 + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 7) (total-strokes . 10) @@ -6343,6 +6366,14 @@ (=ucs . #x5A72) ; 婲 )) (define-char + '((morohashi-daikanwa ho 120) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 8) + (total-strokes . 11) + (=gt-pj-9 . #x4136) ; ý¡€½ˆ + (=gt . 08008) ; ý¡€½ˆ + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 8) (total-strokes . 11) @@ -7988,11 +8019,35 @@ (total-strokes . 12) (=gb2312 . #x6641) ; ø»…«º (=iso-ir165 . #x6641) ; ø»Ž”Š - (=cns11643-3 . #x3A79) ; ø»•¼ª (=daikanwa . 06565) ; ø¸¦¥ (=ucs . #x5AAA) ; 媪 )) (define-char + '((=>ucs . #x5AAA) ; 媪 + (morohashi-daikanwa 6565 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 9) + (total-strokes . 12) + (=cns11643-3 . #x3A79) ; ø»•¼ª + )) +(define-char + '((=>ucs . #x217D5) ; 𡟕 + (morohashi-daikanwa ho 121) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 9) + (total-strokes . 12) + (=gt-pj-11 . #x4453) ; ý¡€¿ + (=gt . 08157) ; ý¡€¿ + )) +(define-char + '((morohashi-daikanwa ho 121 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 9) + (total-strokes . 12) + (=cns11643-5 . #x3758) ; ø»š‹· + (=ucs . #x217D5) ; 𡟕 + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 9) (total-strokes . 12) @@ -8052,34 +8107,49 @@ '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 9) (total-strokes . 12) - (=cns11643-5 . #x3758) ; ø»š‹· - (=ucs . #x217D5) ; 𡟕 - )) -(define-char - '((ideographic-radical . 38) ; â¼¥ - (ideographic-strokes . 9) - (total-strokes . 12) (=cns11643-6 . #x4761) ; ø»œ­¤ )) (define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=cns11643-2 . #x4241) ; ø»“½ž (=big5 . #xDCFA) ; ý¢€³º (=daikanwa . 06566) ; ø¸¦¦ (=ucs . #x5AB0) ; 媰 )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((=>ucs . #x5AB0) ; 媰 + (morohashi-daikanwa 6566 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-2 . #x4241) ; ø»“½ž + )) +(define-char + '((=>ucs . #x3705) ; 㜅 + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=cns11643-4 . #x3C5F) ; ø»˜‰ (=daikanwa . 06567) ; ø¸¦§ + )) +(define-char + '((morohashi-daikanwa 6567 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) (=ucs . #x3705) ; 㜅 )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((=>ucs . #x3705) ; 㜅 + (morohashi-daikanwa 6567 0 1) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-4 . #x3C5F) ; ø»˜‰ + )) +(define-char + '((=>ucs . #x5AB1) ; 媱 + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) (=jis-x0212 . #x3977) ; ø»‹ˆ¶ @@ -8087,53 +8157,94 @@ (=big5 . #xDCF8) ; ý¢€³¸ (=daikanwa . 06568) ; ø¸¦¨ (=jef-china3 . #x49D5) ; øº„§• - (=ucs . #x5AB1) ; 媱 )) (define-char '((=>ucs . #x5AB1) ; 媱 - (morohashi-daikanwa 6568 0 1) + (morohashi-daikanwa 6568 0 0) (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) (=cns11643-2 . #x423F) ; ø»“½œ )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((morohashi-daikanwa 6568 0 5) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=ucs . #x5AB1) ; 媱 + )) +(define-char + '((=>ucs . #x3706) ; 㜆 + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=cns11643-3 . #x4062) ; ø»–…‡ (=daikanwa . 06569) ; ø¸¦© + )) +(define-char + '((=>ucs . #x3706) ; 㜆 + (morohashi-daikanwa 6569 0 2) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-3 . #x4062) ; ø»–…‡ + )) +(define-char + '((morohashi-daikanwa 6569 0 3) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 9) + (total-strokes . 12) (=ucs . #x3706) ; 㜆 )) (define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=cns11643-4 . #x3C61) ; ø»˜‰’ (=daikanwa . 06570) ; ø¸¦ª (=ucs . #x3707) ; 㜇 )) (define-char + '((=>ucs . #x3707) ; 㜇 + (morohashi-daikanwa 6570 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-4 . #x3C61) ; ø»˜‰’ + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) (=gb2312 . #x6647) ; ø»…¬€ (=jis-x0212 . #x3978) ; ø»‹ˆ· (=iso-ir165 . #x6647) ; ø»Ž” - (=cns11643-1 . #x6368) ; ø»’¤Ÿ (=big5 . #xB742) ; ý¢€‹‚ (=daikanwa . 06571) ; ø¸¦« (=ucs . #x5AB2) ; 媲 )) (define-char + '((=>ucs . #x5AB2) ; 媲 + (morohashi-daikanwa 6571 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-1 . #x6368) ; ø»’¤Ÿ + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=cns11643-3 . #x406E) ; ø»–…“ (=daikanwa . 06572) ; ø¸¦¬ (=ucs . #x3708) ; 㜈 )) (define-char + '((=>ucs . #x3708) ; 㜈 + (morohashi-daikanwa 6572 0 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-3 . #x406E) ; ø»–…“ + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) @@ -9113,10 +9224,11 @@ (=ucs . #x217F7) ; 𡟷 )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((morohashi-daikanwa ho 122) + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 10) (total-strokes . 13) - (=ucs . #x3715) ; 㜕 + (=ucs . #x21809) ; 𡠉 )) (define-char '((ideographic-radical . 38) ; â¼¥ @@ -10056,13 +10168,38 @@ (=cns11643-4 . #x4272) ; ø»˜’— )) (define-char + '((morohashi-daikanwa ho 123) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 11) + (total-strokes . 14) + (=gt-pj-11 . #x4551) ; ý¡€‚‚¿ + (=gt . 08383) ; ý¡€‚‚¿ + )) +(define-char + '((=>ucs . #x3715) ; 㜕 + (morohashi-daikanwa ho 124) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 11) + (total-strokes . 14) + (=gt-pj-11 . #x4552) ; ý¡€‚ƒž + (=gt . 08414) ; ý¡€‚ƒž + )) +(define-char '((=>ucs . #x3715) ; 㜕 + (morohashi-daikanwa ho 124 2) (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 11) (total-strokes . 14) (=cns11643-3 . #x464B) ; ø»–¤ )) (define-char + '((morohashi-daikanwa ho 124 3) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 10) + (total-strokes . 13) + (=ucs . #x3715) ; 㜕 + )) +(define-char '((=>ucs . #x5626) ; 嘦 (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 11) @@ -11135,6 +11272,22 @@ (=cns11643-7 . #x2228) ; ø»ž€™ )) (define-char + '((morohashi-daikanwa ho 125) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 12) + (total-strokes . 15) + (=gt-pj-11 . #x4579) ; ý¡€‚ƒ± + (=gt . 08433) ; ý¡€‚ƒ± + )) +(define-char + '((morohashi-daikanwa ho 126) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 12) + (total-strokes . 15) + (=gt-pj-11 . #x457A) ; ý¡€‚ƒ¸ + (=gt . 08440) ; ý¡€‚ƒ¸ + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 12) (total-strokes . 15) @@ -11950,13 +12103,15 @@ (=cns11643-7 . #x2D27) ; ø»ž¢ )) (define-char - '((ideographic-radical . 38) ; â¼¥ + '((morohashi-daikanwa ho 127) + (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 13) (total-strokes . 16) (=ucs . #x218B1) ; ð¡¢± )) (define-char '((=>ucs . #x218B1) ; ð¡¢± + (morohashi-daikanwa ho 127 1) (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 13) (total-strokes . 16) @@ -12963,6 +13118,13 @@ (=cns11643-7 . #x3F41) ; ø»ž«˜ )) (define-char + '((morohashi-daikanwa ho 128) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 15) + (total-strokes . 18) + (=ucs . #x218F6) ; 𡣶 + )) +(define-char '((=>ucs . #x3732) ; 㜲 (ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 16) @@ -13281,6 +13443,22 @@ (=cns11643-5 . #x6760) ; ø»›’Ÿ )) (define-char + '((=>ucs . #x21909) ; 𡤉 + (morohashi-daikanwa ho 129) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 16) + (total-strokes . 19) + (=gt-pj-11 . #x4756) ; ý¡€‚‡ + (=gt . 08656) ; ý¡€‚‡ + )) +(define-char + '((morohashi-daikanwa ho 129 0) + (ideographic-radical . 38) ; â¼¥ + (ideographic-strokes . 16) + (total-strokes . 19) + (=ucs . #x21909) ; 𡤉 + )) +(define-char '((ideographic-radical . 38) ; â¼¥ (ideographic-strokes . 16) (total-strokes . 19) diff --git a/lisp/utf-2000/Ideograph-R039-Child.el b/lisp/utf-2000/Ideograph-R039-Child.el index 72e3617..36cfc0c 100644 --- a/lisp/utf-2000/Ideograph-R039-Child.el +++ b/lisp/utf-2000/Ideograph-R039-Child.el @@ -64,10 +64,16 @@ (=gb2312 . #x665E) ; ø»…¬— (=iso-ir165 . #x665E) ; ø»Ž”§ (=cns11643-1 . #x444F) ; ø»‘¶¤ - (=big5 . #xA46E) ; ý¢€Š‘® (=ucs . #x5B53) ; 孓 )) (define-char + '((=>ucs . #x5B53) ; 孓 + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 0) + (total-strokes . 3) + (=big5 . #xA46E) ; ý¢€Š‘® + )) +(define-char '((ideographic-radical . 39) ; ⼦ (ideographic-strokes . 1) (total-strokes . 4) @@ -227,6 +233,28 @@ (=ucs . #x5B59) ; 孙 )) (define-char + '((=>ucs . #x21946) ; 𡥆 + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 4) + (total-strokes . 7) + (=daikanwa . 06947) ; ø¸¬£ + )) +(define-char + '((morohashi-daikanwa 6947 0 0) + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 4) + (total-strokes . 7) + (=ucs . #x21946) ; 𡥆 + )) +(define-char + '((=>ucs . #x21946) ; 𡥆 + (morohashi-daikanwa 6947 0 4) + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 4) + (total-strokes . 7) + (=cns11643-6 . #x2676) ; ø»›½› + )) +(define-char '((=>ucs . #x5B5A) ; 孚 (ideographic-radical . 39) ; ⼦ (ideographic-strokes . 4) @@ -401,23 +429,15 @@ (=cns11643-3 . #x2558) ; ø»•“ )) (define-char - '((ideographic-radical . 39) ; ⼦ - (ideographic-strokes . 4) - (total-strokes . 7) - (=ucs . #x21946) ; 𡥆 - )) -(define-char - '((=>ucs . #x21946) ; 𡥆 - (ideographic-radical . 39) ; ⼦ - (ideographic-strokes . 4) - (total-strokes . 7) - (=cns11643-6 . #x2676) ; ø»›½› - )) -(define-char - '((ideographic-radical . 39) ; ⼦ - (ideographic-strokes . 4) + '((ideographic-radical@ucs . 92) ; ⽛ + (ideographic-strokes@ucs . 3) + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 39) ; ⼦ + (ideographic-strokes@cns . 4) (total-strokes . 7) (=cns11643-5 . #x2368) ; ø»™®¯ + (=daikanwa . 19911) ; ø¸„·‡ (=ucs . #x24605) ; 𤘅 )) (define-char @@ -539,9 +559,10 @@ )) (define-char '((ideographic-radical . 39) ; ⼦ - (ideographic-strokes . 5) - (total-strokes . 8) - (cns-total-strokes . 9) + (ideographic-strokes@daikanwa . 5) + (total-strokes@daikanwa . 8) + (ideographic-strokes@cns . 6) + (total-strokes@cns . 9) (=cns11643-6 . #x3024) ; ø»œŠµ (=daikanwa . 06968) ; ø¸¬¸ (=ucs . #x2194F) ; 𡥏 @@ -720,10 +741,16 @@ (total-strokes . 9) (=gb2312 . #x424F) ; ø»„· (=iso-ir165 . #x424F) ; ø»Ÿ  - (=cns11643-3 . #x2C2F) ; ø»•¦¼ (=ucs . #x5B6A) ; å­ª )) (define-char + '((=>ucs . #x5B6A) ; å­ª + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 6) + (total-strokes . 9) + (=cns11643-3 . #x2C2F) ; ø»•¦¼ + )) +(define-char '((ideographic-radical . 39) ; ⼦ (ideographic-strokes . 7) (total-strokes . 10) @@ -1092,14 +1119,23 @@ (=ucs . #x21985) ; 𡦅 )) (define-char - '((=>ucs . #x5B73) ; å­³ + '((=>ucs . #x5B76) ; å­¶ (ideographic-radical . 39) ; ⼦ (ideographic-strokes . 10) (total-strokes . 13) + (=cns11643-3 . #x4072) ; ø»–…— (=daikanwa . 07011) ; ø¸­£ (=jef-china3 . #x49F6) ; øº„§¶ )) (define-char + '((morohashi-daikanwa 7011 0 4) + (ideographic-radical . 39) ; ⼦ + (ideographic-strokes . 10) + (kangxi-strokes . 11) + (total-strokes . 13) + (=ucs . #x5B76) ; å­¶ + )) +(define-char '((morohashi-daikanwa 7011 0 5) (ideographic-radical . 39) ; ⼦ (ideographic-strokes . 9) @@ -1187,14 +1223,6 @@ (=ucs . #x2198C) ; 𡦌 )) (define-char - '((ideographic-radical . 39) ; ⼦ - (ideographic-strokes . 10) - (kangxi-strokes . 11) - (total-strokes . 13) - (=cns11643-3 . #x4072) ; ø»–…— - (=ucs . #x5B76) ; å­¶ - )) -(define-char '((=>ucs . #x5B75) ; å­µ (ideographic-radical . 39) ; ⼦ (ideographic-strokes . 11) diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index a5785f6..b5ce003 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -179,6 +179,7 @@ (ideographic-strokes . 2) (total-strokes . 5) (=daikanwa . 07062) ; ø¸®– + (=jef-china3 . #x4AA3) ; øº„ª£ )) (define-char '((morohashi-daikanwa 7062 0 0) diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el index 70b2f1e..273fae7 100644 --- a/lisp/utf-2000/Ideograph-R044-Corpse.el +++ b/lisp/utf-2000/Ideograph-R044-Corpse.el @@ -24,9 +24,12 @@ (=ucs . #x5C38) ; å°¸ )) (define-char - '((ideographic-radical . 44) ; ⼫ - (ideographic-strokes . 1) - (cns-radical . 4) ; ⼃ + '((ideographic-radical@ucs . 44) ; ⼫ + (ideographic-strokes@ucs . 1) + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 4) ; ⼃ + (ideographic-strokes@cns . 3) (total-strokes . 4) (shinjigen-2 . 1919) (=gb2312 . #x527C) ; ø»… diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el index f1c9641..f0f37a5 100644 --- a/lisp/utf-2000/Ideograph-R079-Weapon.el +++ b/lisp/utf-2000/Ideograph-R079-Weapon.el @@ -491,6 +491,13 @@ (=ucs . #x23A95) ; 𣪕 )) (define-char + '((=>ucs . #x23A95) ; 𣪕 + (ideographic-radical . 79) ; ⽎ + (ideographic-strokes . 7) + (total-strokes . 11) + (=jef-china3 . #x93C8) ; øº‰ˆ + )) +(define-char '((ideographic-radical . 79) ; ⽎ (ideographic-strokes . 7) (total-strokes . 11) diff --git a/lisp/utf-2000/Ideograph-R092-Fang.el b/lisp/utf-2000/Ideograph-R092-Fang.el index a0b26e7..d806548 100644 --- a/lisp/utf-2000/Ideograph-R092-Fang.el +++ b/lisp/utf-2000/Ideograph-R092-Fang.el @@ -47,10 +47,16 @@ (=ucs . #x3E26) ; 㸦 )) (define-char - '((ideographic-radical . 92) ; ⽛ - (ideographic-strokes . 3) + '((ideographic-radical@ucs . 92) ; ⽛ + (ideographic-strokes@ucs . 3) + (ideographic-radical@ucs*sources + daikanwa ucs) + (ideographic-radical@cns . 39) ; ⼦ + (ideographic-strokes@cns . 4) (total-strokes . 7) + (=cns11643-5 . #x2368) ; ø»™®¯ (=daikanwa . 19911) ; ø¸„·‡ + (=ucs . #x24605) ; 𤘅 )) (define-char '((ideographic-radical . 92) ; ⽛ diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el index 4caf3fd..750e452 100644 --- a/lisp/utf-2000/Ideograph-R096-Jade.el +++ b/lisp/utf-2000/Ideograph-R096-Jade.el @@ -88,10 +88,10 @@ (=ucs . #x248EB) ; 𤣫 )) (define-char - '((ideographic-radical . 96) ; ⽟ - (ideographic-strokes . 1) - (kangxi-radical . 4) ; ⼃ - (kangxi-strokes . 4) + '((ideographic-radical@ucs . 96) ; ⽟ + (ideographic-strokes@ucs . 1) + (ideographic-radical@cns . 4) ; ⼃ + (ideographic-strokes@cns . 4) (total-strokes . 5) (=cns11643-3 . #x216B) ; ø»•—® (=ucs . #x738D) ; 玍 diff --git a/lisp/utf-2000/Ideograph-R106-White.el b/lisp/utf-2000/Ideograph-R106-White.el index b75cd14..d560d8d 100644 --- a/lisp/utf-2000/Ideograph-R106-White.el +++ b/lisp/utf-2000/Ideograph-R106-White.el @@ -9,6 +9,7 @@ (=iso-ir165 . #x3057) ; ø»…Œ (=cns11643-1 . #x4675) ; ø»‘º† (=gt-pj-1 . #x4772) ; 白 + (=big5 . #xA5D5) ; ý¢€Š—• (=daikanwa . 22678) ; ø¸…¢– (=gt-k . 00985) ; ý¡„€™ (=ucs . #x767D) ; 白 @@ -24,6 +25,7 @@ (=iso-ir165 . #x3059) ; ø»…Ž (=cns11643-1 . #x484B) ; ø»‘¼˜ (=gt-pj-1 . #x4934) ; 百 + (=big5 . #xA6CA) ; ý¢€Š›Š (=daikanwa . 22679) ; ø¸…¢— (=gt-k . 01684) ; ý¡„€š” (=ucs . #x767E) ; 百 @@ -42,6 +44,7 @@ (total-strokes . 6) (=iso-ir165 . #x7D5A) ; ø»Ž¶• (=cns11643-2 . #x2267) ; ø»“„ + (=big5 . #xCA47) ; ý¢€Œ©‡ (=daikanwa . 22681) ; ø¸…¢™ (=ucs . #x767F) ; 癿 )) @@ -78,6 +81,7 @@ (=jis-x0212 . #x4E35) ; ø»‹¦ª (=cns11643-2 . #x2471) ; ø»“’Š (=jis-x0213-1-2000 . #x7860) ; ø»¤“­ + (=big5 . #xCB71) ; ý¢€Œ­± (=daikanwa . 22684) ; ø¸…¢œ (=ucs . #x7681) ; 皁 )) @@ -87,6 +91,7 @@ (total-strokes . 7) (=gb2312 . #x546D) ; ø»…’Š (=iso-ir165 . #x546D) ; ø»ºš + (=big5 . #xA86D) ; ý¢€Š¡­ (=daikanwa . 22685) ; ø¸…¢ (=jef-china3 . #x5AFE) ; øº…«¾ (=ucs . #x7682) ; 皂 @@ -158,6 +163,7 @@ (=iso-ir165 . #x3544) ; ø»Œ (=cns11643-1 . #x4E7B) ; ø»’…¼ (=gt-pj-1 . #x452A) ; 的 + (=big5 . #xAABA) ; ý¢€Šªº (=daikanwa . 22692) ; ø¸…¢¤ (=gt-k . 03780) ; ý¡„€»„ (=ucs . #x7684) ; 的 @@ -247,6 +253,7 @@ (=ks-x1001 . #x4B4B) ; ø»‰˜¢ (=iso-ir165 . #x3D54) ; ø»˜ (=gt-pj-1 . #x3327) ; 皆 + (=big5 . #xACD2) ; ý¢€Š³’ (=daikanwa . 22699) ; ø¸…¢« (=gt-k . 05036) ; ý¡„Ž¬ (=ucs . #x7686) ; 皆 @@ -286,6 +293,7 @@ (=iso-ir165 . #x3B4A) ; ø»•‰ (=cns11643-1 . #x5256) ; ø»’‹ (=gt-pj-1 . #x3944) ; 皇 + (=big5 . #xACD3) ; ý¢€Š³“ (=daikanwa . 22701) ; ø¸…¢­ (=gt-k . 05078) ; ý¡„– (=ucs . #x7687) ; 皇 @@ -321,6 +329,7 @@ (shinjigen-2 . 3962) (=jis-x0208 . #x6227) ; ø½‹•  (=cns11643-1 . #x5257) ; ø»’‹ + (=big5 . #xACD4) ; ý¢€Š³” (=daikanwa . 22705) ; ø¸…¢± (=ucs@jis . #x7688) ; ø½‹•  )) @@ -373,33 +382,42 @@ (=ucs . #x24F54) ; 𤽔 )) (define-char - '((=>ucs . #x7689) ; 皉 - (ideographic-radical . 106) ; ⽩ + '((ideographic-radical . 106) ; ⽩ (ideographic-strokes . 5) (total-strokes . 10) (=daikanwa . 22711) ; ø¸…¢· + (=ucs . #x7689) ; 皉 )) (define-char - '((morohashi-daikanwa 22711 0 0) + '((=>ucs . #x7689) ; 皉 + (morohashi-daikanwa 22711 0 0) (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 6) (total-strokes . 11) (=cns11643-2 . #x3749) ; ø»“­œ - (=ucs . #x7689) ; 皉 + (=big5 . #xD6A6) ; ý¢€š¦ )) (define-char '((=>ucs . #x768A) ; 皊 (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 5) (total-strokes . 10) + (=big5 . #xD2CB) ; ý¢€‹‹ (=daikanwa . 22712) ; ø¸…¢¸ )) (define-char - '((morohashi-daikanwa 22712 0 1) + '((=>ucs . #x768A) ; 皊 + (morohashi-daikanwa 22712 0 0) (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 5) (total-strokes . 10) (=cns11643-2 . #x312E) ; ø»“¤ + )) +(define-char + '((morohashi-daikanwa 22712 0 1) + (ideographic-radical . 106) ; ⽩ + (ideographic-strokes . 5) + (total-strokes . 10) (=ucs . #x768A) ; 皊 )) (define-char @@ -422,6 +440,7 @@ (=iso-ir165 . #x385E) ; ø»‘ƒ (=cns11643-1 . #x5672) ; ø»’‘£ (=gt-pj-1 . #x6228) ; 皋 + (=big5 . #xAF6F) ; ý¢€Š½¯ (=daikanwa . 22714) ; ø¸…¢º (=gt-k . 06613) ; ý¡„§• (=ucs . #x768B) ; 皋 @@ -501,6 +520,7 @@ (shinjigen-2 . 5207) (=jis-x0208 . #x6229) ; ø½‹•¢ (=ks-x1001 . #x4E6B) ; ø»‰œ + (=big5 . #xB2AE) ; ý¢€‹Š® (=daikanwa . 22724) ; ø¸…£„ (=ucs@jis . #x768E) ; ø½‹•¢ )) @@ -523,6 +543,14 @@ (=ucs . #x768F) ; 皏 )) (define-char + '((=>ucs . #x768F) ; 皏 + (morohashi-daikanwa 22725 0 1) + (ideographic-radical . 106) ; ⽩ + (ideographic-strokes . 8) + (total-strokes . 13) + (=big5 . #xD6A5) ; ý¢€š¥ + )) +(define-char '((ideographic-radical . 106) ; ⽩ (ideographic-strokes . 6) (total-strokes . 11) @@ -579,6 +607,7 @@ (ideographic-strokes . 7) (total-strokes . 12) (=cns11643-2 . #x3E3C) ; ø»“·¡ + (=big5 . #xDAB8) ; ý¢€ª¸ (=daikanwa . 22731) ; ø¸…£‹ (=ucs . #x7692) ; 皒 )) @@ -602,6 +631,7 @@ (=cns11643-1 . #x6077) ; ø»’ ” (=jis-x0208-1990 . #x622B) ; ø½‹•¤ (=gt-pj-1 . #x622B) ; 皓 + (=big5 . #xB571) ; ý¢€‹•± (=gt-k . 09217) ; ý¡„‚ (=jef-china3 . #x5BAC) ; øº…®¬ (=ucs . #x7693) ; 皓 @@ -636,20 +666,29 @@ (=jis-x0212 . #x4E39) ; ø»‹¦® (=cns11643-2 . #x3E3B) ; ø»“·  (=jis-x0213-2-2000 . #x716E) ; ø»¦“­ + (=big5 . #xDAB7) ; ý¢€ª· (=daikanwa . 22735) ; ø¸…£ (=jef-china3 . #x5AFC) ; øº…«¼ (=ucs . #x7695) ; 皕 )) (define-char - '((ideographic-radical . 106) ; ⽩ + '((=>ucs . #x7696) ; 皖 + (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 7) (total-strokes . 12) (shinjigen-2 . 5209) - (=gb2312 . #x4D6E) ; ø»…‡¹ (=jis-x0208 . #x622A) ; ø½‹•£ + (=big5 . #xB570) ; ý¢€‹•° + (=daikanwa . 22736) ; ø¸…£ + )) +(define-char + '((morohashi-daikanwa 22736 0 0) + (ideographic-radical . 106) ; ⽩ + (ideographic-strokes . 7) + (total-strokes . 12) + (=gb2312 . #x4D6E) ; ø»…‡¹ (=iso-ir165 . #x4D6E) ; ø»°‰ (=cns11643-1 . #x6076) ; ø»’ “ - (=daikanwa . 22736) ; ø¸…£ (=ucs . #x7696) ; 皖 )) (define-char @@ -752,6 +791,7 @@ (=jis-x0208 . #x622C) ; ø½‹•¥ (=iso-ir165 . #x702A) ; ø»Ž¢Ÿ (=cns11643-2 . #x453B) ; ø»”² + (=big5 . #xDED5) ; ý¢€»• (=daikanwa . 22748) ; ø¸…£œ (=ucs . #x7699) ; 皙 )) @@ -835,6 +875,7 @@ (=jis-x0208 . #x622D) ; ø½‹•¦ (=cns11643-1 . #x6D73) ; ø»’³– (=gb12345 . #x3028) ; 皚 + (=big5 . #xBD4A) ; ý¢€‹µŠ (=daikanwa . 22765) ; ø¸…£­ (=ucs . #x769A) ; 皚 )) @@ -845,6 +886,7 @@ (=jis-x0212 . #x4E3A) ; ø»‹¦¯ (=cns11643-2 . #x5243) ; ø»”•€ (=jis-x0213-1-2000 . #x7861) ; ø»¤“® + (=big5 . #xE6BB) ; ý¢€Žš» (=daikanwa . 22766) ; ø¸…£® (=jef-china3 . #x5AFD) ; øº…«½ (=ucs . #x769B) ; 皛 @@ -887,6 +929,7 @@ (total-strokes . 15) (=jis-x0212 . #x4E3B) ; ø»‹¦° (=jis-x0213-2-2000 . #x716F) ; ø»¦“® + (=big5 . #xE6B8) ; ý¢€Žš¸ (=daikanwa . 22769) ; ø¸…£± (=jef-china3 . #x5BA4) ; øº…®¤ (=ucs@jis . #x769C) ; ø»‹¦° @@ -906,6 +949,7 @@ (=jis-x0212 . #x4E3C) ; ø»‹¦± (=cns11643-2 . #x5241) ; ø»””¾ (=jis-x0213-1-2000 . #x7862) ; ø»¤“¯ + (=big5 . #xE6B9) ; ý¢€Žš¹ (=daikanwa . 22770) ; ø¸…£² (=ucs . #x769D) ; 皝 )) @@ -916,6 +960,7 @@ (=iso-ir165 . #x7D5B) ; ø»Ž¶– (=cns11643-2 . #x5242) ; ø»””¿ (=jis-x0213-1-2000 . #x7863) ; ø»¤“° + (=big5 . #xE6BA) ; ý¢€Žšº (=daikanwa . 22771) ; ø¸…£³ (=ucs . #x769E) ; 皞 )) @@ -1094,6 +1139,7 @@ (=jis-x0212 . #x4E41) ; ø»‹¦¶ (=iso-ir165 . #x702B) ; ø»Ž¢  (=cns11643-2 . #x5D64) ; ø»”¥« + (=big5 . #xED78) ; ý¢€Žµ¸ (=daikanwa . 22784) ; ø¸…¤€ (=ucs . #x76A4) ; 皤 )) @@ -1175,6 +1221,7 @@ (total-strokes . 18) (=jis-x0212 . #x4E43) ; ø»‹¦¸ (=jis-x0213-1-2000 . #x7864) ; ø»¤“± + (=big5 . #xF051) ; ý¢€‘ (=daikanwa . 22792) ; ø¸…¤ˆ (=jef-china3 . #x5BA9) ; øº…®© (=ucs@jis . #x76A6) ; ø»‹¦¸ @@ -1355,6 +1402,7 @@ (total-strokes . 20) (=jis-x0212 . #x4E46) ; ø»‹¦» (=jis-x0213-1-2000 . #x7865) ; ø»¤“² + (=big5 . #xF471) ; ý¢€‘± (=daikanwa . 22806) ; ø¸…¤– (=ucs . #x76AA) ; 皪 )) @@ -1367,14 +1415,29 @@ (=cns11643-2 . #x6940) ; ø»”¶¯ )) (define-char - '((ideographic-radical . 106) ; ⽩ + '((=>ucs . #x76AB) ; 皫 + (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 15) (total-strokes . 20) - (=cns11643-2 . #x693F) ; ø»”¶® + (=big5 . #xF470) ; ý¢€‘° (=daikanwa . 22807) ; ø¸…¤— + )) +(define-char + '((morohashi-daikanwa 22807 0 0) + (ideographic-radical . 106) ; ⽩ + (ideographic-strokes . 15) + (total-strokes . 20) (=ucs . #x76AB) ; 皫 )) (define-char + '((=>ucs . #x76AB) ; 皫 + (morohashi-daikanwa 22807 0 1) + (ideographic-radical . 106) ; ⽩ + (ideographic-strokes . 15) + (total-strokes . 20) + (=cns11643-2 . #x693F) ; ø»”¶® + )) +(define-char '((ideographic-radical . 106) ; ⽩ (ideographic-strokes . 15) (total-strokes . 20) @@ -1454,6 +1517,7 @@ (ideographic-strokes . 18) (total-strokes . 23) (=jis-x0212 . #x4E47) ; ø»‹¦¼ + (=big5 . #xF6F5) ; ý¢€›µ (=daikanwa . 22815) ; ø¸…¤Ÿ (=jef-china3 . #x5BAB) ; øº…®« (=ucs@jis . #x76AD) ; ø»‹¦¼ diff --git a/lisp/utf-2000/Ideograph-R110-Spear.el b/lisp/utf-2000/Ideograph-R110-Spear.el index f9a0937..0810634 100644 --- a/lisp/utf-2000/Ideograph-R110-Spear.el +++ b/lisp/utf-2000/Ideograph-R110-Spear.el @@ -713,13 +713,20 @@ (=ucs . #x2538F) ; 𥎏 )) (define-char - '((ideographic-radical . 110) ; â½­ - (ideographic-strokes . 12) + '((ideographic-radical@ucs . 110) ; â½­ + (ideographic-strokes@ucs . 12) + (ideographic-radical@ucs*sources + daikanwa@r110 ucs) + (ideographic-radical@cns . 17) ; ⼐ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa@r017 cns11643) (total-strokes . 17) (->identical ((=daikanwa . 01841) ; ø¸€œ± )) (hanyu-dazidian 4 2768 16) + (=cns11643-5 . #x5A75) ; ø»š¿® (=daikanwa . 23906) ; ø¸…µ¢ (=hanziku-7 . #xE845) ; ý¢¾¡… (=ucs . #x25390) ; 𥎐 diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index becbd96..b80e812 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -942,6 +942,7 @@ (=jis-x0212 . #x517D) ; ø»‹¬Œ (=jis-x0213-2-2000 . #x7345) ; ø»¦–€ (=daikanwa . 25946) ; ø¸†•š + (=jef-china3 . #x5DF1) ; øº…·± (=ucs . #x7B2F) ; 笯 )) (define-char @@ -951,7 +952,6 @@ (ideographic-strokes . 5) (total-strokes . 11) (=cns11643-2 . #x377C) ; ø»“® - (=jef-china3 . #x5DF1) ; øº…·± )) (define-char '((ideographic-radical . 118) ; â½µ diff --git a/lisp/utf-2000/Ideograph-R119-Rice.el b/lisp/utf-2000/Ideograph-R119-Rice.el index 08badd3..62253f4 100644 --- a/lisp/utf-2000/Ideograph-R119-Rice.el +++ b/lisp/utf-2000/Ideograph-R119-Rice.el @@ -3789,32 +3789,82 @@ (ideographic-strokes . 13) (total-strokes . 19) (=jis-x0212 . #x5348) ; ø»‹®“ - (=cns11643-7 . #x4857) ; ø»ž¸¼ (=daikanwa . 27150) ; ø¸†¨Ž + (=jef-china3 . #x5EDB) ; øº…»› (=ucs . #x7CE9) ; 糩 )) (define-char - '((ideographic-radical . 119) ; ⽶ + '((=>ucs . #x7CE9) ; 糩 + (morohashi-daikanwa 27150 0 0) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) + (=cns11643-7 . #x4857) ; ø»ž¸¼ + )) +(define-char + '((=>ucs . #x7CEA) ; 糪 + (ideographic-radical . 119) ; ⽶ (ideographic-strokes . 13) (total-strokes . 19) - (=cns11643-2 . #x6638) ; ø»”² (=daikanwa . 27151) ; ø¸†¨ + )) +(define-char + '((morohashi-daikanwa 27151 0 0) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) (=ucs . #x7CEA) ; 糪 )) (define-char - '((ideographic-radical . 119) ; ⽶ + '((=>ucs . #x7CEA) ; 糪 + (morohashi-daikanwa 27151 0 1) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) + (=cns11643-2 . #x6638) ; ø»”² + )) +(define-char + '((=>ucs . #x42AA) ; 䊪 + (ideographic-radical . 119) ; ⽶ (ideographic-strokes . 13) (total-strokes . 19) - (=cns11643-3 . #x5A70) ; ø»–«¡ (=daikanwa . 27152) ; ø¸†¨ + )) +(define-char + '((=>ucs . #x42AA) ; 䊪 + (morohashi-daikanwa 27152 0 0) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) + (=cns11643-3 . #x5A70) ; ø»–«¡ + )) +(define-char + '((morohashi-daikanwa 27152 0 1) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 12) + (total-strokes . 18) (=ucs . #x42AA) ; 䊪 )) (define-char - '((ideographic-radical . 119) ; ⽶ + '((=>ucs . #x42AB) ; 䊫 + (ideographic-radical . 119) ; ⽶ (ideographic-strokes . 13) (total-strokes . 19) - (=cns11643-4 . #x605B) ; ø»˜¾„ (=daikanwa . 27153) ; ø¸†¨‘ + )) +(define-char + '((=>ucs . #x42AB) ; 䊫 + (morohashi-daikanwa 27153 0 0) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) + (=cns11643-4 . #x605B) ; ø»˜¾„ + )) +(define-char + '((morohashi-daikanwa 27153 0 1) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) (=ucs . #x42AB) ; 䊫 )) (define-char @@ -3822,12 +3872,19 @@ (ideographic-strokes . 13) (total-strokes . 19) (=jis-x0212 . #x5349) ; ø»‹®” - (=cns11643-4 . #x605A) ; ø»˜¾ƒ (=jis-x0213-2-2000 . #x7426) ; ø»¦–¿ (=daikanwa . 27154) ; ø¸†¨’ (=ucs . #x7CEB) ; 糫 )) (define-char + '((=>ucs . #x7CEB) ; 糫 + (morohashi-daikanwa 27154 0 0) + (ideographic-radical . 119) ; ⽶ + (ideographic-strokes . 13) + (total-strokes . 19) + (=cns11643-4 . #x605A) ; ø»˜¾ƒ + )) +(define-char '((=>ucs . #x25F38) ; 𥼸 (ideographic-radical . 119) ; ⽶ (ideographic-strokes . 13) diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index 9391e89..fd24b89 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -2381,6 +2381,7 @@ (=jis-x0212 . #x535A) ; ø»‹®¥ (=jis-x0213-1-2000 . #x797E) ; ø»¤•© (=daikanwa . 27345) ; ø¸†«‘ + (=jef-china3 . #x5EF6) ; øº…»¶ (=ucs@jis . #x7D31) ; ø»‹®¥ )) (define-char @@ -2620,6 +2621,7 @@ (ideographic-strokes . 5) (total-strokes . 11) (=daikanwa . 27359) ; ø¸†«Ÿ + (=jef-china3 . #x5EF7) ; øº…»· )) (define-char '((=>ucs . #x7D37) ; ç´· @@ -5153,6 +5155,14 @@ (=ucs@jis . #x7D81) ; ø»‹®½ )) (define-char + '((=>ucs . #x7D81) ; 綁 + (morohashi-daikanwa 27483 0 0) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 7) + (total-strokes . 13) + (=jef-china3 . #x5FAF) ; øº…¾¯ + )) +(define-char '((morohashi-daikanwa 27483 0 1) (ideographic-radical . 120) ; â½· (ideographic-strokes . 7) @@ -5270,6 +5280,14 @@ (=ucs@jis . #x7D86) ; ø»‹¯ )) (define-char + '((=>ucs . #x7D86) ; 綆 + (morohashi-daikanwa 27489 0 0) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 7) + (total-strokes . 13) + (=jef-china3 . #x5FB0) ; øº…¾° + )) +(define-char '((morohashi-daikanwa 27489 0 1) (ideographic-radical . 120) ; â½· (ideographic-strokes . 7) @@ -6698,6 +6716,7 @@ (=cns11643-2 . #x4C7C) ; ø»”… (=jis-x0213-1-2000 . #x7A29) ; ø»¤•² (=daikanwa . 27555) ; ø¸†®£ + (=jef-china3 . #x5EE1) ; øº…»¡ (=ucs@jis . #x7DA6) ; ø»‹¯‹ )) (define-char @@ -7518,6 +7537,14 @@ (=daikanwa . 27601) ; ø¸†¯‘ )) (define-char + '((=>ucs . #x7DC8) ; 緈 + (morohashi-daikanwa 27601 0 0) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 8) + (total-strokes . 14) + (=jef-china3 . #x5FBD) ; øº…¾½ + )) +(define-char '((morohashi-daikanwa 27601 0 1) (ideographic-radical . 120) ; â½· (ideographic-strokes . 8) @@ -8812,6 +8839,7 @@ (=ks-x1001 . #x665E) ; ø»Š€Ÿ (=jis-x0213-1-2000 . #x7A2D) ; ø»¤•¶ (=daikanwa . 27656) ; ø¸†°ˆ + (=jef-china3 . #x5FC1) ; øº…¿ (=ucs@jis . #x7DE3) ; ø»Š€Ÿ )) (define-char @@ -9100,6 +9128,7 @@ (total-strokes . 15) (=jis-x0212 . #x5438) ; ø»‹¯¡ (=daikanwa . 27671) ; ø¸†°— + (=jef-china3 . #x5FC4) ; øº…¿„ (=ucs@jis . #x7DEB) ; ø»‹¯¡ )) (define-char @@ -9352,6 +9381,14 @@ (=daikanwa . 27683) ; ø¸†°£ )) (define-char + '((=>ucs . #x7DF0) ; ç·° + (morohashi-daikanwa 27683 0 1) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 9) + (total-strokes . 15) + (=jef-china3 . #x5FC6) ; øº…¿† + )) +(define-char '((morohashi-daikanwa 27683 0 3) (ideographic-radical . 120) ; â½· (ideographic-strokes . 9) @@ -11266,6 +11303,7 @@ (total-strokes . 16) (=ks-x1001 . #x5A5A) ; ø»‰®³ (=daikanwa . 27771) ; ø¸†±» + (=jef-china3 . #x5FCD) ; øº…¿ )) (define-char '((=>ucs . #x7E1B) ; 縛 @@ -12374,6 +12412,7 @@ (total-strokes . 17) (=jis-x0212 . #x544C) ; ø»‹¯µ (=daikanwa . 27823) ; ø¸†²¯ + (=jef-china3 . #x5FD2) ; øº…¿’ (=ucs@jis . #x7E33) ; ø»‹¯µ )) (define-char @@ -12855,6 +12894,7 @@ (total-strokes . 17) (=jis-x0212 . #x544E) ; ø»‹¯· (=daikanwa . 27847) ; ø¸†³‡ + (=jef-china3 . #x5FD3) ; øº…¿“ (=ucs@jis . #x7E3F) ; ø»‹¯· )) (define-char @@ -12890,6 +12930,7 @@ (=cns11643-1 . #x746D) ; ø»’½¢ (=jis-x0213-1-2000 . #x7A33) ; ø»¤•¼ (=daikanwa . 27849) ; ø¸†³‰ + (=jef-china3 . #x5EE3) ; øº…»£ (=ucs@cns . #x7E41) ; 繁 (=ucs@ks . #x7E41) ; 繁 (=ucs . #xFA59) ; 繁 @@ -12964,19 +13005,27 @@ (ideographic-radical . 120) ; â½· (ideographic-strokes . 11) (total-strokes . 17) - (=cns11643-2 . #x5E4C) ; ø»”¦± + (=jis-x0212 . #x544F) ; ø»‹¯¸ (=daikanwa . 27853) ; ø¸†³ + (=jef-china3 . #x5EE4) ; øº…»¤ )) (define-char - '((morohashi-daikanwa 27853 0 1) + '((morohashi-daikanwa 27853 0 0) (ideographic-radical . 120) ; â½· (ideographic-strokes . 11) (total-strokes . 17) - (=jis-x0212 . #x544F) ; ø»‹¯¸ (=iso-ir165 . #x2C6C) ; ø»Œ¿© (=ucs . #x7E44) ; 繄 )) (define-char + '((=>ucs . #x7E44) ; 繄 + (morohashi-daikanwa 27853 0 2) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 11) + (total-strokes . 17) + (=cns11643-2 . #x5E4C) ; ø»”¦± + )) +(define-char '((=>ucs . #x7E45) ; 繅 (ideographic-radical . 120) ; â½· (ideographic-strokes . 11) @@ -13656,16 +13705,24 @@ (ideographic-strokes . 12) (total-strokes . 18) (=daikanwa . 27883) ; ø¸†³« + (=jef-china3 . #x5FD5) ; øº…¿• )) (define-char '((morohashi-daikanwa 27883 0 1) (ideographic-radical . 120) ; â½· (ideographic-strokes . 12) (total-strokes . 18) - (=cns11643-4 . #x5C62) ; ø»˜¸“ (=ucs . #x4316) ; 䌖 )) (define-char + '((=>ucs . #x4316) ; 䌖 + (morohashi-daikanwa 27883 0 2) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 12) + (total-strokes . 18) + (=cns11643-4 . #x5C62) ; ø»˜¸“ + )) +(define-char '((=>ucs . #x2613F) ; 𦄿 (ideographic-radical . 120) ; â½· (ideographic-strokes . 12) @@ -14796,6 +14853,7 @@ (total-strokes . 19) (=jis-x0212 . #x545B) ; ø»‹°„ (=daikanwa . 27949) ; ø¸†´­ + (=jef-china3 . #x5FD8) ; øº…¿˜ (=ucs@jis . #x7E6E) ; ø»‹°„ )) (define-char @@ -14862,6 +14920,7 @@ (total-strokes . 19) (=jis-x0212 . #x545C) ; ø»‹°… (=daikanwa . 27952) ; ø¸†´° + (=jef-china3 . #x5FD9) ; øº…¿™ (=ucs@jis . #x7E6F) ; ø»‹°… )) (define-char @@ -15004,6 +15063,7 @@ (=jis-x0212 . #x545D) ; ø»‹°† (=jis-x0213-2-2000 . #x7458) ; ø»¦—± (=daikanwa . 27960) ; ø¸†´¸ + (=jef-china3 . #x5FDA) ; øº…¿š (=ucs@jis . #x7E73) ; ø»‹°† )) (define-char @@ -15887,6 +15947,7 @@ (=jis-x0212 . #x545F) ; ø»‹°ˆ (=jis-x0213-2-2000 . #x745A) ; ø»¦—³ (=daikanwa . 28006) ; ø¸†µ¦ + (=jef-china3 . #x5FDB) ; øº…¿› (=ucs@jis . #x7E7E) ; ø»‹°ˆ )) (define-char @@ -16376,6 +16437,7 @@ (=jis-x0212 . #x5463) ; ø»‹°Œ (=jis-x0213-1-2000 . #x7A37) ; ø»¤–€ (=daikanwa . 28033) ; ø¸†¶ + (=jef-china3 . #x5FDC) ; øº…¿œ (=ucs@jis . #x7E8A) ; ø»‹°Œ )) (define-char @@ -16478,11 +16540,18 @@ (=daikanwa . 28038) ; ø¸†¶† )) (define-char - '((morohashi-daikanwa 28038 0 1) + '((=>ucs . #x4329) ; 䌩 + (morohashi-daikanwa 28038 0 0) (ideographic-radical . 120) ; â½· (ideographic-strokes . 15) (total-strokes . 21) (=cns11643-3 . #x5E4E) ; ø»–°· + )) +(define-char + '((morohashi-daikanwa 28038 0 1) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 14) + (total-strokes . 20) (=ucs . #x4329) ; 䌩 )) (define-char @@ -16491,8 +16560,10 @@ (ideographic-strokes . 15) (total-strokes . 21) (=jis-x0212 . #x5464) ; ø»‹° + (=cns11643-2 . #x6B7A) ; ø»”º¥ (=jis-x0213-1-2000 . #x7A38) ; ø»¤– (=daikanwa . 28039) ; ø¸†¶‡ + (=jef-china3 . #x5EE5) ; øº…»¥ (=ucs@jis . #x7E8D) ; ø»‹° )) (define-char @@ -16500,7 +16571,6 @@ (ideographic-radical . 120) ; â½· (ideographic-strokes . 15) (total-strokes . 21) - (=cns11643-2 . #x6B7A) ; ø»”º¥ (=gb12345 . #x784D) ; 纍 (=ucs . #x7E8D) ; 纍 )) @@ -16820,6 +16890,7 @@ (=jis-x0212 . #x5465) ; ø»‹°Ž (=jis-x0213-2-2000 . #x745E) ; ø»¦—· (=daikanwa . 28054) ; ø¸†¶– + (=jef-china3 . #x5FDD) ; øº…¿ (=ucs@jis . #x7E91) ; ø»‹°Ž )) (define-char @@ -17613,6 +17684,7 @@ (=jis-x0212 . #x5467) ; ø»‹° (=jis-x0213-2-2000 . #x745F) ; ø»¦—¸ (=daikanwa . 28089) ; ø¸†¶¹ + (=jef-china3 . #x5FDE) ; øº…¿ž (=ucs@jis . #x7E98) ; ø»Š“Œ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R121-Jar.el b/lisp/utf-2000/Ideograph-R121-Jar.el index 4c40c87..e92091d 100644 --- a/lisp/utf-2000/Ideograph-R121-Jar.el +++ b/lisp/utf-2000/Ideograph-R121-Jar.el @@ -579,21 +579,36 @@ (ideographic-strokes . 10) (total-strokes . 16) (=jis-x0212 . #x5470) ; ø»‹°™ - (=cns11643-2 . #x594B) ; ø»”Ÿš (=jis-x0213-2-2000 . #x7465) ; ø»¦—¾ (=daikanwa . 28166) ; ø¸†¸† (=ucs . #x7F43) ; 罃 )) (define-char - '((ideographic-radical . 121) ; ⽸ + '((=>ucs . #x7F43) ; 罃 + (morohashi-daikanwa 28166 0 0) + (ideographic-radical . 121) ; ⽸ + (ideographic-strokes . 10) + (total-strokes . 16) + (=cns11643-2 . #x594B) ; ø»”Ÿš + )) +(define-char + '((=>ucs . #x7F44) ; 罄 + (ideographic-radical . 121) ; ⽸ (ideographic-strokes . 11) (total-strokes . 17) - (=gb2312 . #x7340) ; ø»…¾¿ (=jis-x0212 . #x5471) ; ø»‹°š - (=iso-ir165 . #x7340) ; ø»Ž§ - (=cns11643-1 . #x7474) ; ø»’½© (=jis-x0213-2-2000 . #x7466) ; ø»¦—¿ (=daikanwa . 28167) ; ø¸†¸‡ + (=jef-china3 . #x5FE6) ; øº…¿¦ + )) +(define-char + '((morohashi-daikanwa 28167 0 0) + (ideographic-radical . 121) ; ⽸ + (ideographic-strokes . 11) + (total-strokes . 17) + (=gb2312 . #x7340) ; ø»…¾¿ + (=iso-ir165 . #x7340) ; ø»Ž§ + (=cns11643-1 . #x7474) ; ø»’½© (=ucs . #x7F44) ; 罄 )) (define-char @@ -690,6 +705,7 @@ (=jis-x0212 . #x5472) ; ø»‹°› (=jis-x0213-1-2000 . #x7A39) ; ø»¤–‚ (=daikanwa . 28175) ; ø¸†¸ + (=jef-china3 . #x5FE8) ; øº…¿¨ (=ucs@jis . #x7F47) ; ø»‹°› )) (define-char @@ -863,6 +879,7 @@ (=jis-x0212 . #x5473) ; ø»‹°œ (=jis-x0213-2-2000 . #x7467) ; ø»¦˜€ (=daikanwa . 28190) ; ø¸†¸ž + (=jef-china3 . #x5FE9) ; øº…¿© (=ucs . #x7F4F) ; 罏 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el index 8c0546b..00b66cb 100644 --- a/lisp/utf-2000/Ideograph-R122-Net.el +++ b/lisp/utf-2000/Ideograph-R122-Net.el @@ -2603,6 +2603,7 @@ (=jis-x0208 . #x6634) ; ø½‹›¥ (=cns11643-2 . #x6D71) ; ø»”½˜ (=daikanwa . 28412) ; ø¸†»¼ + (=jef-china3 . #x64BC) ; øº†’¼ (=ucs . #x7F87) ; 羇 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R123-Sheep.el b/lisp/utf-2000/Ideograph-R123-Sheep.el index 72a247e..93def69 100644 --- a/lisp/utf-2000/Ideograph-R123-Sheep.el +++ b/lisp/utf-2000/Ideograph-R123-Sheep.el @@ -1096,6 +1096,7 @@ (=gb2312 . #x4F5B) ; ø»…Š¢ (=iso-ir165 . #x4F5B) ; ø»²² (=big5 . #xDB43) ; ý¢€­ƒ + (=jef-china3 . #x5FF7) ; øº…¿· (=ucs . #x7FA1) ; 羡 )) (define-char @@ -2027,6 +2028,7 @@ (total-strokes . 16) (=big5 . #xEAE3) ; ý¢€Ž«£ (=daikanwa . 28545) ; ø¸†¾ + (=jef-china3 . #x98F3) ; øº‰£³ )) (define-char '((morohashi-daikanwa 28545 0 0) @@ -2800,6 +2802,7 @@ (ideographic-strokes . 15) (total-strokes . 21) (=big5 . #xF5EE) ; ý¢€—® + (=jef-china3 . #x5FFB) ; øº…¿» )) (define-char '((morohashi-daikanwa 28593 0 2) diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el index 8d3761c..8abfbb4 100644 --- a/lisp/utf-2000/Ideograph-R124-Feather.el +++ b/lisp/utf-2000/Ideograph-R124-Feather.el @@ -1278,6 +1278,7 @@ (=jis-x0213-2-2000 . #x747B) ; ø»¦˜” (=big5 . #xD6FC) ; ý¢€›¼ (=daikanwa . 28665) ; ø¸†¿¹ + (=jef-china3 . #x60A4) ; øº†‚¤ (=ucs@jis . #x7FCF) ; ø»‹± )) (define-char @@ -3627,6 +3628,7 @@ (=jis-x0213-1-2000 . #x7A41) ; ø»¤–Š (=big5 . #xE6F8) ; ý¢€Ž›¸ (=daikanwa . 28769) ; ø¸‡¡ + (=jef-china3 . #x60A7) ; øº†‚§ (=ucs@jis . #x7FEC) ; ø»‹±‡ )) (define-char @@ -3761,6 +3763,7 @@ (=jis-x0213-1-2000 . #x7A42) ; ø»¤–‹ (=big5 . #xBFAD) ; ý¢€‹¾­ (=daikanwa . 28776) ; ø¸‡¨ + (=jef-china3 . #x60AD) ; øº†‚­ (=ucs@jis . #x7FEE) ; ø»‹±ˆ )) (define-char @@ -3805,15 +3808,17 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ks-x1001 . #x6962) ; ø»Š„½ - (=daikanwa . 28614) ; ø¸†¿† + ((=gt-k . 01762) ; ý¡„€›¢ ) - ((=ucs . #x9AD8) ; 高 + ((=jis-x0208 . #x3962) ; ø½Šš + (=ks-x1001 . #x4D54) ; ø»‰›§ + (=daikanwa . 45313) ; ø¸‹„ )) (=jis-x0212 . #x5542) ; ø»‹±‰ (=jis-x0213-2-2000 . #x747E) ; ø»¦˜— (=big5 . #xEAE4) ; ý¢€Ž«¤ (=daikanwa . 28778) ; ø¸‡ª + (=jef-china3 . #x60A8) ; øº†‚¨ (=ucs@jis . #x7FEF) ; ø»‹±‰ )) (define-char @@ -4163,6 +4168,7 @@ (=daikanwa . 28614) ; ø¸†¿† )) (=big5 . #xEDE6) ; ý¢€Ž·¦ + (=jef-china3 . #x60B0) ; øº†‚° )) (define-char '((=>ucs . #x7FF2) ; 翲 @@ -4657,14 +4663,22 @@ (=jis-x0212 . #x5544) ; ø»‹±‹ (=jis-x0213-1-2000 . #x7A43) ; ø»¤–Œ (=daikanwa . 28810) ; ø¸‡‚Š + (=jef-china3 . #x60AE) ; øº†‚® (=ucs@jis . #x7FFA) ; ø»‹±‹ )) (define-char - '((morohashi-daikanwa 28810 0 2) + '((=>ucs . #x7FFA) ; 翺 + (morohashi-daikanwa 28810 0 2) (ideographic-radical . 124) ; â½» (ideographic-strokes . 12) (total-strokes . 18) (=cns11643-3 . #x5861) ; ø»–¨– + )) +(define-char + '((morohashi-daikanwa 28810 0 3) + (ideographic-radical . 124) ; â½» + (ideographic-strokes . 12) + (total-strokes . 18) (=ucs . #x7FFA) ; 翺 )) (define-char @@ -4807,14 +4821,8 @@ (ideographic-strokes . 11) (total-strokes . 17) (=ks-x1001 . #x6C4F) ; ø»Š‰„ - )) -(define-char - '((=>ucs . #x7FFC) ; 翼 - (morohashi-daikanwa 28818 0 2) - (ideographic-radical . 124) ; â½» - (ideographic-strokes . 11) - (total-strokes . 17) (=big5 . #xC16C) ; ý¢€Œ…¬ + (=jef-china3 . #x60A9) ; øº†‚© )) (define-char '((=>ucs . #x26496) ; 𦒖 @@ -4900,6 +4908,7 @@ (=jis-x0212 . #x5545) ; ø»‹±Œ (=big5 . #xF2BE) ; ý¢€Š¾ (=daikanwa . 28823) ; ø¸‡‚— + (=jef-china3 . #x60AF) ; øº†‚¯ (=ucs@jis . #x7FFD) ; ø»‹±Œ )) (define-char @@ -5005,7 +5014,9 @@ (=daikanwa . 28614) ; ø¸†¿† )) (=jis-x0212 . #x5547) ; ø»‹±Ž + (=big5 . #xF4B1) ; ý¢€’± (=daikanwa . 28827) ; ø¸‡‚› + (=jef-china3 . #x60B1) ; øº†‚± (=ucs@jis . #x7FFF) ; ø»‹±Ž )) (define-char @@ -5014,17 +5025,14 @@ (ideographic-strokes . 14) (total-strokes . 20) (ideographic-structure - (:cdp-combinator 1 - :char ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° ) ((=ucs . #x58FD) ; 壽 ) ((=ucs . #x7FBD) ; ç¾½ )) (=cns11643-2 . #x695E) ; ø»”· - (=big5 . #xF4B1) ; ý¢€’± (=ucs . #x7FFF) ; ç¿¿ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R125-Old.el b/lisp/utf-2000/Ideograph-R125-Old.el index ede0f26..b79d2f4 100644 --- a/lisp/utf-2000/Ideograph-R125-Old.el +++ b/lisp/utf-2000/Ideograph-R125-Old.el @@ -309,6 +309,7 @@ (=cns11643-3 . #x3344) ; ø»•±£ (=jis-x0213-2-2000 . #x7523) ; ø»¦˜š (=daikanwa . 28860) ; ø¸‡‚¼ + (=jef-china3 . #x60B6) ; øº†‚¶ (=ucs . #x800A) ; 耊 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R128-Ear.el b/lisp/utf-2000/Ideograph-R128-Ear.el index 0ad3977..d62333d 100644 --- a/lisp/utf-2000/Ideograph-R128-Ear.el +++ b/lisp/utf-2000/Ideograph-R128-Ear.el @@ -123,6 +123,25 @@ (=daikanwa . 29007) ; ø¸‡… )) (define-char + '((ideographic-radical . 128) ; ⽿ + (ideographic-strokes . 2) + (total-strokes . 8) + (->same-ideograph + ((=big5-cdp . #x8C5B) ; ý¢€ˆ±› + )) + (=gt-pj-k1 . #x3432) ; ý¡„Œ¾ + (=gt-k . 04926) ; ý¡„Œ¾ + )) +(define-char + '((ideographic-radical . 128) ; ⽿ + (ideographic-strokes . 2) + (total-strokes . 8) + (->same-ideograph + ((=gt-k . 04926) ; ý¡„Œ¾ + )) + (=big5-cdp . #x8C5B) ; ý¢€ˆ±› + )) +(define-char '((=>ucs . #x8036) ; 耶 (ideographic-radical . 128) ; ⽿ (ideographic-strokes . 3) diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index 0d736f3..12ea9bd 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -8921,7 +8921,17 @@ (=cns11643-4 . #x402B) ; ø»˜Ž” )) (define-char - '((morohashi-daikanwa 29745 1 0) + '((morohashi-daikanwa 29745 1) + (ideographic-radical . 130) ; ⾁ + (ideographic-strokes . 9) + (total-strokes . 13) + (hanyu-dazidian 3 2093 16) + (=hanziku-6 . #xAEFE) ; ý¢ª»¾ + (=ucs . #x26714) ; 𦜔 + )) +(define-char + '((=>ucs . #x26714) ; 𦜔 + (morohashi-daikanwa 29745 1 0) (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 9) (total-strokes . 13) @@ -15263,12 +15273,6 @@ )) (define-char '((ideographic-radical . 130) ; ⾁ - (hanyu-dazidian 3 2093 16) - (=hanziku-6 . #xAEFE) ; ý¢ª»¾ - (=ucs . #x26714) ; 𦜔 - )) -(define-char - '((ideographic-radical . 130) ; ⾁ (hanyu-dazidian 3 2088 9) (=hanziku-6 . #xADF4) ; ý¢ª·´ (=ucs . #x26717) ; 𦜗 diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 1cf7476..a974983 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -69,6 +69,9 @@ (setq i (1+ i))) v)) +(defvar char-db-feature-domains + '(ucs daikanwa cns gt)) + (defvar char-db-ignored-attributes nil) (defun char-attribute-name< (ka kb) @@ -607,8 +610,17 @@ ) (setq radical nil strokes nil) + (when (and (memq 'ideographic-radical attributes) + (setq value (get-char-attribute char 'ideographic-radical))) + (setq radical value) + (insert (format "(ideographic-radical . %S)\t; %c%s" + radical + (aref ideographic-radicals radical) + line-breaking)) + (setq attributes (delq 'ideographic-radical attributes)) + ) (let (key) - (dolist (domain '(ucs daikanwa cns)) + (dolist (domain char-db-feature-domains) (setq key (intern (format "%s@%s" 'ideographic-radical domain))) (when (and (memq key attributes) (setq value (get-char-attribute char key))) @@ -630,27 +642,29 @@ line-breaking)) (setq attributes (delq key attributes)) ) - (setq key (intern (format "%s@%s*sources" - 'ideographic-radical domain))) + (setq key (intern (format "%s@%s" 'total-strokes domain))) (when (and (memq key attributes) (setq value (get-char-attribute char key))) - (insert (format "(%s%s" key line-breaking)) - (dolist (cell value) - (insert (format " %s" cell))) - (insert ")") - (insert line-breaking) + (insert (format "(%s . %S)%s" + key + value + line-breaking)) (setq attributes (delq key attributes)) ) + (dolist (feature '(ideographic-radical + ideographic-strokes + total-strokes)) + (setq key (intern (format "%s@%s*sources" feature domain))) + (when (and (memq key attributes) + (setq value (get-char-attribute char key))) + (insert (format "(%s%s" key line-breaking)) + (dolist (cell value) + (insert (format " %s" cell))) + (insert ")") + (insert line-breaking) + (setq attributes (delq key attributes)) + )) )) - (when (and (memq 'ideographic-radical attributes) - (setq value (get-char-attribute char 'ideographic-radical))) - (setq radical value) - (insert (format "(ideographic-radical . %S)\t; %c%s" - radical - (aref ideographic-radicals radical) - line-breaking)) - (setq attributes (delq 'ideographic-radical attributes)) - ) (when (and (memq 'ideographic-strokes attributes) (setq value (get-char-attribute char 'ideographic-strokes))) (setq strokes value) diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index adc7564..c56844a 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -32,7 +32,7 @@ (defun char-ideographic-radical (char &optional radical) (let (ret) (or (catch 'tag - (dolist (domain '(ucs daikanwa cns)) + (dolist (domain char-db-feature-domains) (if (and (setq ret (get-char-attribute char (intern @@ -88,20 +88,22 @@ (defun char-ideographic-strokes (char &optional radical) (let (ret) (or (catch 'tag - (dolist (domain '(ucs daikanwa cns)) - (if (and (setq ret (get-char-attribute + (dolist (domain char-db-feature-domains) + (if (and (setq ret (or (get-char-attribute + char + (intern + (format "%s@%s" + 'ideographic-radical domain))) + (get-char-attribute + char 'ideographic-radical))) + (or (eq ret radical) + (null radical)) + (setq ret (get-char-attribute char (intern (format "%s@%s" - 'ideographic-radical domain)))) - (or (eq ret radical) - (null radical))) - (throw 'tag - (get-char-attribute - char - (intern - (format "%s@%s" - 'ideographic-strokes domain))))))) + 'ideographic-strokes domain))))) + (throw 'tag ret)))) (catch 'tag (dolist (cell (get-char-attribute char 'ideographic-)) (if (and (setq ret (plist-get cell :radical)) @@ -127,7 +129,7 @@ (defun update-ideograph-radical-table () (interactive) (let (ret radical script) - (dolist (domain '(ucs daikanwa cns)) + (dolist (domain char-db-feature-domains) (map-char-attribute (lambda (char radical) (when (and radical -- 1.7.10.4