From 76f7ff332eb82f971dd4f5b06075db3998635496 Mon Sep 17 00:00:00 2001 From: tomo Date: Sat, 27 Dec 2003 06:06:13 +0000 Subject: [PATCH] Sync up with r21-4-14-chise-0_21-16. --- lisp/utf-2000/ChangeLog | 131 +++++++++++ lisp/utf-2000/Ideograph-R001-One.el | 24 +- lisp/utf-2000/Ideograph-R005-Second.el | 95 ++++---- lisp/utf-2000/Ideograph-R007-Two.el | 9 +- lisp/utf-2000/Ideograph-R009-Man.el | 12 +- lisp/utf-2000/Ideograph-R014-Cover.el | 2 + lisp/utf-2000/Ideograph-R016-Table.el | 4 +- lisp/utf-2000/Ideograph-R025-Divination.el | 11 + lisp/utf-2000/Ideograph-R027-Cliff.el | 28 ++- lisp/utf-2000/Ideograph-R028-Private.el | 1 + lisp/utf-2000/Ideograph-R030-Mouth.el | 286 ++++++++++++++---------- lisp/utf-2000/Ideograph-R033-Scholar.el | 3 + lisp/utf-2000/Ideograph-R036-Evening.el | 9 +- lisp/utf-2000/Ideograph-R039-Child.el | 1 + lisp/utf-2000/Ideograph-R040-Roof.el | 45 ++-- lisp/utf-2000/Ideograph-R042-Small.el | 40 +++- lisp/utf-2000/Ideograph-R056-Shoot.el | 8 +- lisp/utf-2000/Ideograph-R059-Bristle.el | 1 + lisp/utf-2000/Ideograph-R060-Step.el | 68 ++++-- lisp/utf-2000/Ideograph-R089-Double-X.el | 26 ++- lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el | 8 + lisp/utf-2000/Ideograph-R154-Shell.el | 8 + lisp/utf-2000/Ideograph-R159-Cart.el | 12 + lisp/utf-2000/Ideograph-R205-Frog.el | 17 +- lisp/utf-2000/u0AC00-Hangul-Syllables.el | 1 + 25 files changed, 560 insertions(+), 290 deletions(-) diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 806e3d8..e8dad51 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,134 @@ +2003-12-26 MORIOKA Tomohiko + + * u0AC00-Hangul-Syllables.el (U+C5EC): Unify JC3-94B6. + +2003-12-25 MORIOKA Tomohiko + + * Ideograph-R025-Divination.el (U+5361): Separate JC3-82B5; unify + JC3-45CB. + + * Ideograph-R030-Mouth.el (U+53FE): Add `total-strokes'. + (U+549E): Use `->identical' instead of `->same-ideograph' for + U-0002F83C. + (U+9EFE): Use `ideographic-{radical|strokes}@{ucs|cns}' instead of + `ideographic-'. + (U+35A2): Separate C5-3670; modify strokes. + (M-03919): Unify U+35BC. + (C4-3659): Separate U+35BC. + (U+5577): Separate B-D86A. + (B-DCD8): Modify strokes. + (C2-417B): Unify JC3-46F1. + (U+55D2): Separate JC3-46F1. + (M-04143): Modify `ideographic-structure'. + (C3-462E): Likewise. + (U+5620): Modify `strokes'. + (U+35FB): Modify `strokes'. + (U+56BA): Fix strokes. + (U-00021109): Unify C7-476E instead of using `->identical'; use + `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead. + (U+56B0): Add `total-strokes'. + (U+56B9): Add strokes. + (CB00772): Fix `ideographic-strokes'. + (U+56D5): Fix `total-strokes'. + + * Ideograph-R205-Frog.el (U-0002FA18): Use + `<-vulgar-ideograph*sources' instead of char-ref in + `<-vulgar-ideograph'. + (U+9EFE): Use `ideographic-{radical|strokes}@{ucs|cns}' instead of + `ideographic-'. + + * Ideograph-R089-Double-X.el (C7-476E): Unify U-00021109 and + H2-E2D9 instead of using `->identical'; use + `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead. + (U-00020442): Use `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead of `ideographic-'. + + * Ideograph-R060-Step.el (JC3-4DB3): Use + `->same-ideograph*sources' instead of char-ref in `->synonyms'. + (U+5F94): Modify strokes. + (U+8854): Moved to Ideograph-R144-Walk-Enclosure.el. + (U+5F9A): Add `total-strokes'. + (J0-4530): Separate U+5FB9 and G1-3339; fix `total-strokes'. + (U+5FB9): Likewise. + (U+5FBA): Add `total-strokes'. + + * Ideograph-R009-Man.el (U-00020442): Use + `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead of `ideographic-'. + + * Ideograph-R001-One.el (U+4E0E): Use + `ideographic-strokes@{ucs|gt}', `total-strokes@{ucs|gt}' and + `{ideographic|total}-strokes@ucs*sources' instead of + `ideographic-'; use `->synonyms*sources' instead of char-ref in + `->synonyms'. + +2003-12-25 MORIOKA Tomohiko + + * Ideograph-R154-Shell.el (U+8D30): Moved from + Ideograph-R056-Shoot.el. + + * Ideograph-R144-Walk-Enclosure.el (U+8850): Add `total-strokes'. + (U+8854): Moved from Ideograph-R060-Step.el. + + * Ideograph-R056-Shoot.el (U+7519): Add `total-strokes'. + (U+8D30): Moved to Ideograph-R154-Shell.el. + + * Ideograph-R042-Small.el (M-07511): Separate all. + (U+3779): Modify strokes. + (M-07512): Separate all. + (U-00021B7F): Modify strokes. + (U+8F89): Moved to Ideograph-R159-Cart.el. + + * Ideograph-R040-Roof.el (U+374D): Modify strokes. + (M-07151): Likewise. + (U+5BAC): Likewise. + (U+8D5B): Add `total-strokes'. + + * Ideograph-R036-Evening.el (U+5922): Use + `<-simplified-ideograph*sources' instead of char-ref in + `<-simplified-ideograph'. + + * Ideograph-R027-Cliff.el (U+539B): Add `total-strokes'. + (GT-03811): Use `<-vulgar-ideograph*sources' instead of char-ref + in `<-vulgar-ideograph'. + (U+53A9): Modify strokes. + (C3-4048): Unify H1-B3D0. + (U+53AB): Separate H1-B3D0. + (M-03024): Unify U+3550. + (C5-4C31): Separate U+3550. + + * Ideograph-R005-Second.el (U+4E67): Add `total-strokes'. + (U+4E7A): Fix strokes. + (U+4E7B): Likewise. + (U+4E7C): Likewise. + (U+F91B): Add `total-strokes'. + + * Ideograph-R159-Cart.el (U+8F89): Moved from + Ideograph-R042-Small.el. + (U+8F8B): Add `total-strokes'. + (U+8F8C): Add `total-strokes'. + (U+8F8D): Add `total-strokes'. + (U+8F8E): Add `total-strokes'. + + * Ideograph-R059-Bristle.el (U+987B): Add `total-strokes'. + + * Ideograph-R039-Child.el (U+5B67): Add `total-strokes'. + + * Ideograph-R033-Scholar.el (U+58F6): Add `total-strokes'. + (U+58F8): Add `total-strokes'. + (U+5900): Add `total-strokes'. + + * Ideograph-R028-Private.el (U+517F): Add `total-strokes'. + + * Ideograph-R016-Table.el (U+34D8): Modify strokes. + + * Ideograph-R014-Cover.el (U+519A): Add `total-strokes'. + (U+51A7): Add `total-strokes'. + + * Ideograph-R007-Two.el (U+4E9F): Modify strokes. + 2003-12-24 MORIOKA Tomohiko * Ideograph-R079-Weapon.el (U-00023A98): New character. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 9af5d01..e3218b6 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -488,18 +488,20 @@ (=ks-x1001 . #x5D55) ; ø»‰³ˆ )) (define-char - '((ideographic- (:radical 1 ; ⼀ - :strokes 3 - :total-strokes 4 - :sources (ucs cns-11643 morohashi-daikanwa)) - (:radical 1 ; ⼀ - :strokes 2 - :total-strokes 3 - :sources (gt))) + '((ideographic-radical . 1) ; ⼀ + (ideographic-strokes@ucs . 3) + (total-strokes@ucs . 4) + (ideographic-strokes@ucs*sources + daikanwa ucs) + (total-strokes@ucs*sources + cns11643) + (ideographic-strokes@gt . 2) + (total-strokes@gt . 3) (->synonyms - (:char ((=daikanwa . 30212) ; ø¸‡˜„ - ) - :sources (morohashi-daikanwa))) + ((=daikanwa . 30212) ; ø¸‡˜„ + )) + (->synonyms*sources + shuowen guangyun daikanwa) (hanyu-dazidian 1 5 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index c0f72ce..a109156 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -632,6 +632,7 @@ (define-char '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 4) + (total-strokes . 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ @@ -1470,6 +1471,51 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 8) (total-strokes . 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x6240) ; 所 + ) + ((=ucs . #x4E59) ; 乙 + )) + (=ucs . #x4E7A) ; 乺 + (=gb12345 . #x7D4F) ; 乺 + )) +(define-char + '((ideographic-radical . 5) ; ⼄ + (ideographic-strokes . 8) + (total-strokes . 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x65BC) ; 於 + ) + ((=ucs . #x4E59) ; 乙 + )) + (=ucs . #x4E7B) ; ä¹» + (=gb12345 . #x7D74) ; ä¹» + )) +(define-char + '((ideographic-radical . 5) ; ⼄ + (ideographic-strokes . 8) + (total-strokes . 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x6CE8) ; 注 + ) + ((=ucs . #x4E59) ; 乙 + )) + (=ucs . #x4E7C) ; ä¹¼ + (=gb12345 . #x7D5B) ; ä¹¼ + )) +(define-char + '((ideographic-radical . 5) ; ⼄ + (ideographic-strokes . 8) + (total-strokes . 9) (hanyu-dazidian 1 56 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -1524,54 +1570,6 @@ (define-char '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 9) - (kangxi-strokes . 8) - (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x6240) ; 所 - ) - ((=ucs . #x4E59) ; 乙 - )) - (=ucs . #x4E7A) ; 乺 - (=gb12345 . #x7D4F) ; 乺 - )) -(define-char - '((ideographic-radical . 5) ; ⼄ - (ideographic-strokes . 9) - (kangxi-strokes . 8) - (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x65BC) ; 於 - ) - ((=ucs . #x4E59) ; 乙 - )) - (=ucs . #x4E7B) ; ä¹» - (=gb12345 . #x7D74) ; ä¹» - )) -(define-char - '((ideographic-radical . 5) ; ⼄ - (ideographic-strokes . 9) - (kangxi-strokes . 8) - (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x6CE8) ; 注 - ) - ((=ucs . #x4E59) ; 乙 - )) - (=ucs . #x4E7C) ; ä¹¼ - (=gb12345 . #x7D5B) ; ä¹¼ - )) -(define-char - '((ideographic-radical . 5) ; ⼄ - (ideographic-strokes . 9) (total-strokes . 10) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -2114,6 +2112,7 @@ '((morohashi-daikanwa 214 0 0) (ideographic-radical . 5) ; ⼄ (ideographic-strokes . 12) + (total-strokes . 13) (=ucs . #xF91B) ; 亂 (=ks-x1001 . #x516A) ; ø»‰¡µ )) diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el index 231505a..0372ca6 100644 --- a/lisp/utf-2000/Ideograph-R007-Two.el +++ b/lisp/utf-2000/Ideograph-R007-Two.el @@ -721,7 +721,6 @@ (ideographic-radical . 7) ; ⼆ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 55 7) (shinjigen-1 . 88) (shinjigen-2 . 88) (=jis-x0208 . #x5034) ; ø½Š»‘ @@ -738,11 +737,9 @@ (define-char '((morohashi-daikanwa 279 0 1) (ideographic-radical . 7) ; ⼆ - (ideographic-strokes . 5) - (total-strokes . 7) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 55) - (hanyu-dazidian-char . 7) + (ideographic-strokes . 6) + (total-strokes . 8) + (hanyu-dazidian 1 55 7) (=ucs . #x4E9F) ; 亟 (=gb2312 . #x583D) ; ø»…—’ )) diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 94421d3..a366536 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -31236,12 +31236,12 @@ (mojikyo . 001301) ; ý €€”• )) (define-char - '((ideographic- (:radical 89 ; ⽘ - :strokes 15 - :sources (morohashi-daikanwa cns-11643)) - (:radical 9 ; ⼈ - :strokes 17 - :sources (ucs))) + '((ideographic-radical@ucs . 9) ; ⼈ + (ideographic-strokes@ucs . 17) + (ideographic-radical@cns . 89) ; ⽘ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 19) (hanyu-dazidian 1 237 5) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el index 4ac483c..a1b24df 100644 --- a/lisp/utf-2000/Ideograph-R014-Cover.el +++ b/lisp/utf-2000/Ideograph-R014-Cover.el @@ -147,6 +147,7 @@ (define-char '((ideographic-radical . 14) ; ⼍ (ideographic-strokes . 3) + (total-strokes . 5) (hanyu-dazidian 1 303 2) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -642,6 +643,7 @@ (define-char '((ideographic-radical . 14) ; ⼍ (ideographic-strokes . 8) + (total-strokes . 10) (hanyu-dazidian 8 10 7) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el index 244c2b6..60a442b 100644 --- a/lisp/utf-2000/Ideograph-R016-Table.el +++ b/lisp/utf-2000/Ideograph-R016-Table.el @@ -873,8 +873,8 @@ (define-char '((morohashi-daikanwa 1786 0 5) (ideographic-radical . 16) ; ⼏ - (ideographic-strokes . 10) - (total-strokes . 13) + (ideographic-strokes . 9) + (total-strokes . 11) (hanyu-dazidian 1 278 9) (=ucs . #x34D8) ; 㓘 (=hanziku-1 . #xDF71) ; ý¢€½± diff --git a/lisp/utf-2000/Ideograph-R025-Divination.el b/lisp/utf-2000/Ideograph-R025-Divination.el index 19f54dc..67f4f90 100644 --- a/lisp/utf-2000/Ideograph-R025-Divination.el +++ b/lisp/utf-2000/Ideograph-R025-Divination.el @@ -176,6 +176,17 @@ (=jis-x0213-1-2000 . #x2E6F) ; ø»¢§ (=big5 . #xA564) ; ý¢€Š•¤ (=daikanwa . 02781) ; ø¸€« + (=jef-china3 . #x45CB) ; øº„—‹ + )) +(define-char + '((=>ucs . #x5361) ; 卡 + (morohashi-daikanwa 2781 0 0) + (ideographic-radical . 25) ; ⼘ + (ideographic-strokes . 3) + (total-strokes . 5) + (->identical + ((=jef-china3 . #x45CB) ; øº„—‹ + )) (=jef-china3 . #x82B5) ; øºˆŠµ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el index bc5dbca..0f28166 100644 --- a/lisp/utf-2000/Ideograph-R027-Cliff.el +++ b/lisp/utf-2000/Ideograph-R027-Cliff.el @@ -1227,6 +1227,7 @@ (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 7) + (total-strokes . 9) (hanyu-dazidian 8 7 16) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -2191,11 +2192,11 @@ (ideographic-strokes . 11) (total-strokes . 13) (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2207) - (=gt . 11902) ; ý¡€‚¹¾ - ) + ((shinjigen-1 . 2207) + (=gt . 11902) ; ý¡€‚¹¾ )) + (<-vulgar-ideograph*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") (=ucs . #x2FF8) ; ⿸ @@ -2212,8 +2213,8 @@ (define-char '((morohashi-daikanwa 3006 0 3) (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 10) - (total-strokes . 12) + (ideographic-strokes . 9) + (total-strokes . 11) (hanyu-dazidian 1 75 21) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -2294,6 +2295,7 @@ (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 11) (total-strokes . 13) + (hanyu-dazidian 1 77 2) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") (=ucs . #x2FF8) ; ⿸ @@ -2303,13 +2305,13 @@ ((=cns11643-1 . #x5A72) ; ø»’—› )) (=cns11643-3 . #x4048) ; ø»–„­ + (=hanziku-1 . #xB3D0) ; ý¢€› )) (define-char '((morohashi-daikanwa 3008 0 1) (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 77 2) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") (=ucs . #x2FF8) ; ⿸ @@ -2319,7 +2321,6 @@ ((=ucs . #x6556) ; 敖 )) (=ucs . #x53AB) ; 厫 - (=hanziku-1 . #xB3D0) ; ý¢€› )) (define-char '((=>ucs . #x20A91) ; 𠪑 @@ -2432,8 +2433,6 @@ (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 11) - (kangxi-radical . 61) ; â¼¼ - (kangxi-strokes . 10) (total-strokes . 13) (=ucs . #x53AF) ; 厯 (=jis-x0212 . #x344F) ; ø»‹€¸ @@ -2582,18 +2581,18 @@ (=hanziku-1 . #xB3DD) ; ý¢€› )) (define-char - '((=>ucs . #x3550) ; 㕐 - (ideographic-radical . 27) ; ⼚ + '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 12) (total-strokes . 14) + (=ucs . #x3550) ; 㕐 (=daikanwa . 03024) ; ø¸€¯ )) (define-char - '((morohashi-daikanwa 3024 0 3) + '((=>ucs . #x3550) ; 㕐 + (morohashi-daikanwa 3024 0 3) (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 13) (total-strokes . 15) - (=ucs . #x3550) ; 㕐 (=cns11643-5 . #x4C31) ; ø»šª† )) (define-char @@ -2948,7 +2947,6 @@ '((morohashi-daikanwa 3041 0 2) (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 12) - (kangxi-strokes . 13) (total-strokes . 14) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el index bbfc0dc..3182858 100644 --- a/lisp/utf-2000/Ideograph-R028-Private.el +++ b/lisp/utf-2000/Ideograph-R028-Private.el @@ -971,6 +971,7 @@ (define-char '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 11) + (total-strokes . 13) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") (=ucs . #x2FF3) ; ⿳ diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 07112be..df41f59 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -915,6 +915,7 @@ (define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 2) + (total-strokes . 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ @@ -3467,7 +3468,7 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (->same-ideograph + (->identical ((=ucs . #x2F83C) ; 咞 )) (=ucs . #x549E) ; 咞 @@ -6257,12 +6258,10 @@ )) (define-char '((morohashi-daikanwa 48258 0 2) - (ideographic- (:radical 205 ; ⿌ - :strokes 0 - :sources (ucs)) - (:radical 30 ; ⼝ - :strokes 5 - :sources (cns-11643))) + (ideographic-radical@ucs . 205) ; ⿌ + (ideographic-strokes@ucs . 0) + (ideographic-radical@cns . 30) ; ⼝ + (ideographic-strokes@cns . 5) (total-strokes . 8) (=ucs . #x9EFE) ; 黾 (=gb2312 . #x763C) ; ø»†ƒ• @@ -12196,11 +12195,18 @@ (=daikanwa . 03776) ; ø¸€»€ )) (define-char - '((morohashi-daikanwa 3776 0 1) + '((morohashi-daikanwa 3776 0 0) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 8) + (total-strokes . 11) + (=ucs . #x35A2) ; 㖢 + )) +(define-char + '((=>ucs . #x35A2) ; 㖢 + (morohashi-daikanwa 3776 0 1) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x35A2) ; 㖢 (=cns11643-5 . #x3670) ; ø»šŠ± )) (define-char @@ -15697,18 +15703,18 @@ (=cns11643-2 . #x3A5A) ; ø»“²‡ )) (define-char - '((=>ucs . #x35BC) ; 㖼 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) (total-strokes . 12) + (=ucs . #x35BC) ; 㖼 (=daikanwa . 03919) ; ø¸€½ )) (define-char - '((morohashi-daikanwa 3919 0 1) + '((=>ucs . #x35BC) ; 㖼 + (morohashi-daikanwa 3919 0 1) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x35BC) ; 㖼 (=cns11643-4 . #x3659) ; ø»˜€– )) (define-char @@ -18101,6 +18107,20 @@ (=ucs . #x5577) ; 啷 (=gb2312 . #x6025) ; ø»…¢ª (=cns11643-2 . #x3A4E) ; ø»“±» + )) +(define-char + '((=>ucs . #x5577) ; 啷 + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 9) + (total-strokes . 12) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((=jis-x0208 . #x4F3A) ; ø½Š¹¹ + )) (=big5 . #xD86A) ; ý¢€¡ª (mojikyo . 053244) ; ý €Œ¿¼ )) @@ -19163,8 +19183,8 @@ '((=>ucs . #x55CF) ; 嗏 (morohashi-daikanwa 4066 0 1) (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 10) - (total-strokes . 13) + (ideographic-strokes . 9) + (total-strokes . 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; â¿° @@ -19247,12 +19267,12 @@ )) (=cns11643-2 . #x417B) ; ø»“¼º (=daikanwa . 04069) ; ø¸€¿¥ + (=jef-china3 . #x46F1) ; øº„›± )) (define-char '((morohashi-daikanwa 4069 0 2) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) - (kangxi-strokes . 10) (total-strokes . 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -19267,7 +19287,6 @@ (=jis-x0212 . #x357E) ; ø»‹ƒ… (=jis-x0213-2-2000 . #x2430) ; ø»¤¡© (=big5 . #xDCD6) ; ý¢€³– - (=jef-china3 . #x46F1) ; øº„›± )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -21206,7 +21225,9 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x6556) ; 敖 + ((=jis-x0208 . #x5A44) ; ø½‹Š + (=ks-x1001 . #x6779) ; ø»Š‚˜ + (=daikanwa . 13226) ; ø¸ƒŽª ) ((=ucs . #x53E3) ; 口 )) @@ -21222,7 +21243,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x6556) ; 敖 + ((=cns11643-1 . #x5A72) ; ø»’—› ) ((=ucs . #x53E3) ; 口 )) @@ -23106,30 +23127,6 @@ (define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 11) - (kangxi-strokes . 12) - (total-strokes . 14) - (hanyu-dazidian 8 14 26) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) - ((=ucs . #x53E3) ; 口 - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=big5-cdp . #x8CD4) ; ý¢€ˆ³” - ) - ((=ucs . #x6208) ; 戈 - )) - )) - (=ucs . #x5620) ; 嘠 - (=hanziku-12 . #xEC69) ; ý¢ƒŽ±© - )) -(define-char - '((ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 11) (total-strokes . 14) (hanyu-dazidian 1 676 3) (ideographic-structure @@ -23273,11 +23270,25 @@ ((=ucs . #x7C9B) ; 粛 )) (=ucs . #x5628) ; 嘨 - (=cns11643-3 . #x4630) ; ø»–‰ (=jis-x0213-2-2000 . #x243C) ; ø»¤¡µ (mojikyo . 054519) ; ý €“· )) (define-char + '((=>ucs . #x5628) ; 嘨 + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 11) + (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((=cns11643-3 . #x383E) ; ø»•¸³ + )) + (=cns11643-3 . #x4630) ; ø»–‰ + )) +(define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 11) (total-strokes . 14) @@ -23388,7 +23399,6 @@ '((morohashi-daikanwa 4235 0 3) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 10) - (kangxi-strokes . 12) (total-strokes . 13) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -25831,6 +25841,29 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 12) (total-strokes . 15) + (hanyu-dazidian 8 14 26) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=big5-cdp . #x8CD4) ; ý¢€ˆ³” + ) + ((=ucs . #x6208) ; 戈 + )) + )) + (=ucs . #x5620) ; 嘠 + (=hanziku-12 . #xEC69) ; ý¢ƒŽ±© + )) +(define-char + '((ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 12) + (total-strokes . 15) (hanyu-dazidian 1 685 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -26119,8 +26152,8 @@ (define-char '((morohashi-daikanwa 4356 0 4) (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 12) - (total-strokes . 15) + (ideographic-strokes . 11) + (total-strokes . 14) (=ucs . #x35FB) ; 㗻 )) (define-char @@ -26400,18 +26433,18 @@ (=cns11643-4 . #x4F6C) ; ø»˜¥— )) (define-char - '((=>ucs . #x35FD) ; 㗽 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 13) (total-strokes . 16) + (=ucs . #x35FD) ; 㗽 (=daikanwa . 04371) ; ø¸„“ )) (define-char - '((morohashi-daikanwa 4371 0 3) + '((=>ucs . #x35FD) ; 㗽 + (morohashi-daikanwa 4371 0 3) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 12) (total-strokes . 15) - (=ucs . #x35FD) ; 㗽 (=cns11643-3 . #x5041) ; ø»–œ† )) (define-char @@ -28929,26 +28962,6 @@ (define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 14) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) - ((=ucs . #x53E3) ; 口 - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") - (=ucs . #x2FFA) ; ⿺ - ) - ((=ucs . #x9042) ; 遂 - ) - ((=ucs . #x7F52) ; 罒 - )) - )) - (=ucs . #x56BA) ; 嚺 - )) -(define-char - '((ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 14) (total-strokes . 17) (hanyu-dazidian 1 692 9) (=ucs . #x2104E) ; 𡁎 @@ -30828,8 +30841,24 @@ (=hanziku-2 . #xE2A4) ; ý¢€®Š¤ )) (define-char + '((=>ucs . #x21109) ; 𡄉 + (morohashi-daikanwa 19756 0 0) + (ideographic-radical@ucs . 30) ; ⼝ + (ideographic-strokes@ucs . 16) + (ideographic-radical@cns . 89) ; ⽘ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa cns11643) + (total-strokes . 19) + (hanyu-dazidian 1 703 3) + (=ucs . #x21109) ; 𡄉 + (=cns11643-7 . #x476E) ; ø»ž·µ + (=hanziku-2 . #xE2D9) ; ý¢€®‹™ + )) +(define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 16) + (total-strokes . 19) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; â¿° @@ -30842,20 +30871,6 @@ )) (define-char '((ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 16) - (total-strokes . 19) - (->identical - ((=cns11643-7 . #x476E) ; ø»ž·µ - )) - (->same-ideograph - ((=daikanwa . 19756) ; ø¸„´¬ - )) - (hanyu-dazidian 1 703 3) - (=ucs . #x21109) ; 𡄉 - (=hanziku-2 . #xE2D9) ; ý¢€®‹™ - )) -(define-char - '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 17) (total-strokes . 20) (hanyu-dazidian 1 703 26) @@ -31341,7 +31356,28 @@ (=cbeta . 03537) ; ø¸ ·‘ )) (define-char - '((ideographic-radical . 30) ; ⼝ + '((=>ucs . #x56B7) ; 嚷 + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 17) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((=jis-x0208 . #x6A77) ; ø½‹¢  + (=ks-x1001 . #x6551) ; ø»‰¾´ + (=daikanwa . 34556) ; ø¸ˆ›¼ + )) + (=jis-x0212 . #x3668) ; ø»‹„ + (=big5 . #xC457) ; ý¢€Œ‘— + (=daikanwa . 04600) ; ø¸‡¸ + (=ucs@jis . #x56B7) ; ø»‹„ + )) +(define-char + '((morohashi-daikanwa 4600 0 0) + (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 17) (total-strokes . 20) (ideographic-structure @@ -31354,10 +31390,7 @@ )) (=ucs . #x56B7) ; 嚷 (=gb2312 . #x4842) ; ø»„¿· - (=jis-x0212 . #x3668) ; ø»‹„ (=cns11643-1 . #x7962) ; ø»“„­ - (=big5 . #xC457) ; ý¢€Œ‘— - (=daikanwa . 04600) ; ø¸‡¸ )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -31368,6 +31401,36 @@ (mojikyo . 083485) ; ý €”˜ )) (define-char + '((ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 17) + (total-strokes . 20) + (hanyu-dazidian 1 704 3) + (=ucs . #x56B9) ; 嚹 + (=gb12345 . #x7C37) ; 嚹 + (=hanziku-2 . #xE2F9) ; ý¢€®‹¹ + )) +(define-char + '((ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 17) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") + (=ucs . #x2FFA) ; ⿺ + ) + ((=ucs . #x9042) ; 遂 + ) + ((=ucs . #x7F52) ; 罒 + )) + )) + (=ucs . #x56BA) ; 嚺 + )) +(define-char '((=>ucs . #x21131) ; 𡄱 (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 18) @@ -33098,6 +33161,24 @@ (=ks-x1001 . #x7D6E) ; ø»Š¢¡ )) (define-char + '((=>ucs . #x56D5) ; 囕 + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 21) + (total-strokes . 24) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x53E3) ; 口 + ) + ((=jis-x0208 . #x6B35) ; ø½‹¢¼ + (=ks-x1001 . #x5542) ; ø»‰§… + (=cns11643-1 . #x7B2A) ; ø»“†± + (=daikanwa . 34977) ; ø¸ˆ¢¡ + )) + (=cbeta . 00772) ; ø¸ Œ„ + )) +(define-char '((=>ucs . #x21186) ; 𡆆 (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 22) @@ -33185,7 +33266,7 @@ (define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 22) - (total-strokes . 24) + (total-strokes . 25) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; â¿° @@ -33199,24 +33280,6 @@ (mojikyo . 059286) ; ý €Žž– )) (define-char - '((=>ucs . #x56D5) ; 囕 - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 22) - (total-strokes . 24) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) - ((=ucs . #x53E3) ; 口 - ) - ((=jis-x0208 . #x6B35) ; ø½‹¢¼ - (=ks-x1001 . #x5542) ; ø»‰§… - (=cns11643-1 . #x7B2A) ; ø»“†± - (=daikanwa . 34977) ; ø¸ˆ¢¡ - )) - (=cbeta . 00772) ; ø¸ Œ„ - )) -(define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 22) (total-strokes . 25) @@ -33362,13 +33425,6 @@ )) (define-char '((ideographic-radical . 30) ; ⼝ - (hanyu-dazidian 1 704 3) - (=ucs . #x56B9) ; 嚹 - (=gb12345 . #x7C37) ; 嚹 - (=hanziku-2 . #xE2F9) ; ý¢€®‹¹ - )) -(define-char - '((ideographic-radical . 30) ; ⼝ (hanyu-dazidian 8 13 2) (=ucs . #x20BA8) ; 𠮨 (=hanziku-12 . #xEBF8) ; ý¢ƒŽ¯¸ diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el index 64a6fb1..8d1bf75 100644 --- a/lisp/utf-2000/Ideograph-R033-Scholar.el +++ b/lisp/utf-2000/Ideograph-R033-Scholar.el @@ -375,6 +375,7 @@ (define-char '((ideographic-radical . 33) ; â¼  (ideographic-strokes . 7) + (total-strokes . 10) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") (=ucs . #x2FF3) ; ⿳ @@ -613,6 +614,7 @@ (define-char '((ideographic-radical . 33) ; â¼  (ideographic-strokes . 10) + (total-strokes . 11) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") (=ucs . #x2FF3) ; ⿳ @@ -746,6 +748,7 @@ (define-char '((ideographic-radical . 33) ; â¼  (ideographic-strokes . 12) + (total-strokes . 15) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el index 6b22a8f..3cc5df2 100644 --- a/lisp/utf-2000/Ideograph-R036-Evening.el +++ b/lisp/utf-2000/Ideograph-R036-Evening.el @@ -799,10 +799,11 @@ (ideographic-strokes . 10) (total-strokes . 13) (<-simplified-ideograph - (:char ((shinjigen-1 . 1550) - (=daikanwa . 05802) ; ø¸šª - ) - :sources (shinjigen-1))) + ((shinjigen-1 . 1550) + (=daikanwa . 05802) ; ø¸šª + )) + (<-simplified-ideograph*sources + shinjigen-1) (shinjigen-1 . 1549) (=ucs . #x5922) ; 夢 (=jis-x0208 . #x4C34) ; ø½Šµ™ diff --git a/lisp/utf-2000/Ideograph-R039-Child.el b/lisp/utf-2000/Ideograph-R039-Child.el index d19ac4f..1f4fb3e 100644 --- a/lisp/utf-2000/Ideograph-R039-Child.el +++ b/lisp/utf-2000/Ideograph-R039-Child.el @@ -629,6 +629,7 @@ (define-char '((ideographic-radical . 39) ; ⼦ (ideographic-strokes . 5) + (total-strokes . 8) (=ucs . #x5B67) ; å­§ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index 2643197..508bf51 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -449,8 +449,8 @@ (define-char '((morohashi-daikanwa 7076 0 3) (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 4) - (total-strokes . 7) + (ideographic-strokes . 3) + (total-strokes . 6) (=ucs . #x374D) ; 㝍 )) (define-char @@ -1623,10 +1623,24 @@ (=cns11643-6 . #x302C) ; ø»œŠ½ )) (define-char + '((ideographic-radical . 40) ; ⼧ + (ideographic-strokes . 6) + (total-strokes . 9) + (=ucs . #x5BAB) ; 宫 + (=gb2312 . #x392C) ; ø»„©Ÿ + (=cns11643-3 . #x2C32) ; ø»•¦¿ + )) +(define-char + '((ideographic-radical . 40) ; ⼧ + (ideographic-strokes . 6) + (total-strokes . 9) + (=ucs . #x219F4) ; 𡧴 + (=cns11643-6 . #x3029) ; ø»œŠº + )) +(define-char '((=>ucs . #x5BAC) ; 宬 (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 6) - (japanese-strokes . 7) + (ideographic-strokes . 7) (total-strokes . 10) (=ks-x1001 . #x6074) ; ø»‰¸ (=jis-x0212 . #x3A53) ; ø»‹‰° @@ -1639,29 +1653,16 @@ (define-char '((morohashi-daikanwa 7151 0 0) (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 6) - (total-strokes . 9) + (ideographic-strokes@cns . 6) + (total-strokes@cns . 9) + (ideographic-strokes . 7) + (total-strokes . 10) (=ucs . #x5BAC) ; 宬 (=iso-ir165 . #x7B32) ; ø»Ž²± (=cns11643-2 . #x2E6A) ; ø»“ ¯ (=jef-china3 . #x97E8) ; øº‰Ÿ¨ )) (define-char - '((ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 6) - (total-strokes . 9) - (=ucs . #x5BAB) ; 宫 - (=gb2312 . #x392C) ; ø»„©Ÿ - (=cns11643-3 . #x2C32) ; ø»•¦¿ - )) -(define-char - '((ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 6) - (total-strokes . 9) - (=ucs . #x219F4) ; 𡧴 - (=cns11643-6 . #x3029) ; ø»œŠº - )) -(define-char '((=>ucs . #x21A00) ; 𡨀 (ideographic-radical . 40) ; ⼧ (ideographic-strokes . 7) @@ -4563,6 +4564,7 @@ (define-char '((ideographic-radical . 40) ; ⼧ (ideographic-strokes . 11) + (total-strokes . 14) (=ucs . #x8D5B) ; 赛 (=gb2312 . #x487C) ; ø»…€± )) @@ -4694,7 +4696,6 @@ '((morohashi-daikanwa 7319 0 2) (ideographic-radical . 40) ; ⼧ (ideographic-strokes . 12) - (kangxi-strokes . 9) (total-strokes . 15) (=ucs . #x5BEA) ; 寪 )) diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el index c558411..af8bbb0 100644 --- a/lisp/utf-2000/Ideograph-R042-Small.el +++ b/lisp/utf-2000/Ideograph-R042-Small.el @@ -471,22 +471,44 @@ (=cns11643-5 . #x3171) ; ø»šƒœ )) (define-char - '((ideographic-radical . 42) ; ⼩ + '((=>ucs . #x3779) ; 㝹 + (ideographic-radical . 42) ; ⼩ (ideographic-strokes . 8) (total-strokes . 11) - (=ucs . #x3779) ; 㝹 - (=cns11643-6 . #x3E64) ; ø»œ ™ (=daikanwa . 07511) ; ø¸µ— + )) +(define-char + '((=>ucs . #x3779) ; 㝹 + (morohashi-daikanwa 7511 0 0) + (ideographic-radical . 42) ; ⼩ + (ideographic-strokes . 8) + (total-strokes . 11) + (=cns11643-6 . #x3E64) ; ø»œ ™ (=cbeta . 00144) ; ø¸ ‚ )) (define-char - '((ideographic-radical . 42) ; ⼩ + '((morohashi-daikanwa 7511 0 2) + (ideographic-radical . 42) ; ⼩ + (ideographic-strokes . 9) + (total-strokes . 12) + (=ucs . #x3779) ; 㝹 + )) +(define-char + '((=>ucs . #x21B7F) ; ð¡­¿ + (ideographic-radical . 42) ; ⼩ + (ideographic-strokes . 8) + (total-strokes . 11) + (=daikanwa . 07512) ; ø¸µ˜ + )) +(define-char + '((morohashi-daikanwa 7512 0 0) + (ideographic-radical . 42) ; ⼩ + (ideographic-strokes@cns . 9) + (total-strokes@cns . 12) (ideographic-strokes . 8) (total-strokes . 11) - (cns-total-strokes . 12) (=ucs . #x21B7F) ; ð¡­¿ (=cns11643-5 . #x3763) ; ø»šŒ‚ - (=daikanwa . 07512) ; ø¸µ˜ )) (define-char '((=>ucs . #x21B80) ; 𡮀 @@ -607,12 +629,6 @@ )) (define-char '((ideographic-radical . 42) ; ⼩ - (ideographic-strokes . 9) - (=ucs . #x8F89) ; 辉 - (=gb2312 . #x3B54) ; ø»„­ƒ - )) -(define-char - '((ideographic-radical . 42) ; ⼩ (ideographic-strokes . 10) (total-strokes . 13) (=ucs . #x5C1F) ; 尟 diff --git a/lisp/utf-2000/Ideograph-R056-Shoot.el b/lisp/utf-2000/Ideograph-R056-Shoot.el index ad0c58d..e519e68 100644 --- a/lisp/utf-2000/Ideograph-R056-Shoot.el +++ b/lisp/utf-2000/Ideograph-R056-Shoot.el @@ -191,6 +191,7 @@ (define-char '((ideographic-radical . 56) ; â¼· (ideographic-strokes . 5) + (total-strokes . 8) (=ucs . #x7519) ; 甙 (=gb2312 . #x5F30) ; ø»…¡— )) @@ -246,13 +247,6 @@ (=daikanwa . 09677) ; ø¸‚— )) (define-char - '((script Chinese Simplified Ideograph) - (ideographic-radical . 56) ; â¼· - (ideographic-strokes . 6) - (=ucs . #x8D30) ; è´° - (=gb2312 . #x3721) ; ø»„¦˜ - )) -(define-char '((ideographic-radical . 56) ; â¼· (ideographic-strokes . 7) (total-strokes . 10) diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el index 8f25f5e..2ae30a1 100644 --- a/lisp/utf-2000/Ideograph-R059-Bristle.el +++ b/lisp/utf-2000/Ideograph-R059-Bristle.el @@ -268,6 +268,7 @@ (define-char '((ideographic-radical . 59) ; ⼺ (ideographic-strokes . 6) + (total-strokes . 9) (=ucs . #x987B) ; é¡» (=gb2312 . #x506B) ; ø»…Œ )) diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el index a967700..8471817 100644 --- a/lisp/utf-2000/Ideograph-R060-Step.el +++ b/lisp/utf-2000/Ideograph-R060-Step.el @@ -843,11 +843,11 @@ (ideographic-radical . 60) ; â¼» (ideographic-strokes . 6) (total-strokes . 9) - (->synonyms - (:sources (senhen morohashi-daikanwa) - :char ((=daikanwa . 00522) ; ø¸€ˆŠ - ) + (->same-ideograph + ((=daikanwa . 00522) ; ø¸€ˆŠ )) + (->same-ideograph*sources + chuanpian daikanwa) (=daikanwa . 10104) ; ø¸‚¸ (=jef-china3 . #x4DB3) ; øº„¶³ )) @@ -863,18 +863,31 @@ '((ideographic-radical . 60) ; â¼» (ideographic-strokes . 6) (total-strokes . 9) + (=ucs . #x5F94) ; 徔 + )) +(define-char + '((ideographic-radical . 60) ; â¼» + (ideographic-strokes . 6) + (total-strokes . 9) (=ucs . #x224E3) ; 𢓣 (=cns11643-5 . #x2931) ; ø»™¶¬ )) (define-char - '((ideographic-radical . 60) ; â¼» + '((=>ucs . #x5F8E) ; 徎 + (ideographic-radical . 60) ; â¼» (ideographic-strokes . 7) (total-strokes . 10) - (=ucs . #x5F8E) ; 徎 (=cns11643-3 . #x3070) ; ø»•­µ (=daikanwa . 10105) ; ø¸‚¹ )) (define-char + '((morohashi-daikanwa 10105 0 2) + (ideographic-radical . 60) ; â¼» + (ideographic-strokes . 7) + (total-strokes . 10) + (=ucs . #x5F8E) ; 徎 + )) +(define-char '((ideographic-radical . 60) ; â¼» (ideographic-strokes . 7) (total-strokes . 10) @@ -1205,11 +1218,10 @@ (=daikanwa . 10133) ; ø¸‚ž• )) (define-char - '((ideographic-radical . 60) ; â¼» + '((=>ucs . #x5F94) ; 徔 + (ideographic-radical . 60) ; â¼» (ideographic-strokes . 7) - (kangxi-strokes . 6) (total-strokes . 10) - (=ucs . #x5F94) ; 徔 (mojikyo . 059591) ; ý €Ž£‡ )) (define-char @@ -1725,12 +1737,6 @@ )) (define-char '((ideographic-radical . 60) ; â¼» - (ideographic-strokes . 8) - (=ucs . #x8854) ; 衔 - (=gb2312 . #x4F4E) ; ø»…Š• - )) -(define-char - '((ideographic-radical . 60) ; â¼» (ideographic-strokes . 9) (total-strokes . 12) (=ucs . #x5FA5) ; å¾¥ @@ -2119,6 +2125,7 @@ (define-char '((ideographic-radical . 60) ; â¼» (ideographic-strokes . 9) + (total-strokes . 12) (=ucs . #x5F9A) ; 徚 (mojikyo . 059592) ; ý €Ž£ˆ )) @@ -2784,29 +2791,45 @@ (=jef-china3 . #x4DC0) ; øº„·€ )) (define-char - '((ideographic-radical . 60) ; â¼» + '((=>ucs . #x5FB8) ; 徸 + (ideographic-radical . 60) ; â¼» (ideographic-strokes . 12) (total-strokes . 15) - (=ucs . #x5FB8) ; 徸 (=jis-x0212 . #x3D37) ; ø»‹® - (=cns11643-3 . #x4B72) ; ø»–•¡ (=jis-x0213-2-2000 . #x2C39) ; ø»¤­¢ (=daikanwa . 10244) ; ø¸‚ „ + (=ucs@jis . #x5FB8) ; ø»‹® )) (define-char - '((ideographic-radical . 60) ; â¼» + '((morohashi-daikanwa 10244 0 0) + (ideographic-radical . 60) ; â¼» (ideographic-strokes . 12) - (total-strokes . 14) + (total-strokes . 15) + (=ucs . #x5FB8) ; 徸 + (=cns11643-3 . #x4B72) ; ø»–•¡ + )) +(define-char + '((=>ucs . #x5FB9) ; å¾¹ + (ideographic-radical . 60) ; â¼» + (ideographic-strokes . 12) + (total-strokes . 15) (shinjigen-2 . 2387) - (=ucs . #x5FB9) ; å¾¹ (=jis-x0208 . #x4530) ; ø½Š«ƒ (=ks-x1001 . #x744B) ; ø»Š”° - (=gb12345 . #x3339) ; å¾¹ (=big5 . #xB9FD) ; ý¢€‹§½ (=gt . 12920) ; ý¡€ƒ‰¸ (=gt-k . 11929) ; ý¡„‚º™ (=gt-pj-1 . #x4530) ; ý¡€ƒ‰¸ (=daikanwa . 10245) ; ø¸‚ … + (=ucs@jis . #x5FB9) ; ø½Š«ƒ + )) +(define-char + '((morohashi-daikanwa 10245 0 0) + (ideographic-radical . 60) ; â¼» + (ideographic-strokes . 12) + (total-strokes . 15) + (=ucs . #x5FB9) ; å¾¹ + (=gb12345 . #x3339) ; å¾¹ )) (define-char '((=>ucs . #x5FB9) ; å¾¹ @@ -2914,6 +2937,7 @@ (define-char '((ideographic-radical . 60) ; â¼» (ideographic-strokes . 12) + (total-strokes . 15) (=ucs . #x5FBA) ; 徺 (mojikyo . 059595) ; ý €Ž£‹ )) diff --git a/lisp/utf-2000/Ideograph-R089-Double-X.el b/lisp/utf-2000/Ideograph-R089-Double-X.el index 509ff6d..1758068 100644 --- a/lisp/utf-2000/Ideograph-R089-Double-X.el +++ b/lisp/utf-2000/Ideograph-R089-Double-X.el @@ -325,21 +325,25 @@ (define-char '((=>ucs . #x21109) ; 𡄉 (morohashi-daikanwa 19756 0 0) - (ideographic-radical . 89) ; ⽘ - (ideographic-strokes . 15) + (ideographic-radical@ucs . 30) ; ⼝ + (ideographic-strokes@ucs . 16) + (ideographic-radical@cns . 89) ; ⽘ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 19) - (->identical - ((=ucs . #x21109) ; 𡄉 - )) + (hanyu-dazidian 1 703 3) + (=ucs . #x21109) ; 𡄉 (=cns11643-7 . #x476E) ; ø»ž·µ + (=hanziku-2 . #xE2D9) ; ý¢€®‹™ )) (define-char - '((ideographic- (:radical 89 ; ⽘ - :strokes 15 - :sources (morohashi-daikanwa cns-11643)) - (:radical 9 ; ⼈ - :strokes 17 - :sources (ucs))) + '((ideographic-radical@ucs . 9) ; ⼈ + (ideographic-strokes@ucs . 17) + (ideographic-radical@cns . 89) ; ⽘ + (ideographic-strokes@cns . 15) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 19) (hanyu-dazidian 1 237 5) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el index cb03dfa..3af6ef2 100644 --- a/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R144-Walk-Enclosure.el @@ -242,11 +242,19 @@ (define-char '((ideographic-radical . 144) ; ⾏ (ideographic-strokes . 5) + (total-strokes . 11) (=ucs . #x8850) ; 衐 (mojikyo . 059923) ; ý €Ž¨“ )) (define-char '((ideographic-radical . 144) ; ⾏ + (ideographic-strokes . 5) + (total-strokes . 11) + (=ucs . #x8854) ; 衔 + (=gb2312 . #x4F4E) ; ø»…Š• + )) +(define-char + '((ideographic-radical . 144) ; ⾏ (ideographic-strokes . 6) (total-strokes . 12) (=ucs . #x8855) ; 衕 diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el index 8f42316..8a25d1a 100644 --- a/lisp/utf-2000/Ideograph-R154-Shell.el +++ b/lisp/utf-2000/Ideograph-R154-Shell.el @@ -1138,6 +1138,14 @@ (=hanziku-9 . #xF0F9) ; ý¢‚Ÿƒ¹ )) (define-char + '((script Chinese Simplified Ideograph) + (ideographic-radical . 154) ; ⾙ + (ideographic-strokes . 5) + (total-strokes . 9) + (=ucs . #x8D30) ; è´° + (=gb2312 . #x3721) ; ø»„¦˜ + )) +(define-char '((ideographic-radical . 154) ; ⾙ (ideographic-strokes . 5) (total-strokes . 9) diff --git a/lisp/utf-2000/Ideograph-R159-Cart.el b/lisp/utf-2000/Ideograph-R159-Cart.el index 881d5fd..dfd0003 100644 --- a/lisp/utf-2000/Ideograph-R159-Cart.el +++ b/lisp/utf-2000/Ideograph-R159-Cart.el @@ -2697,29 +2697,41 @@ (define-char '((ideographic-radical . 159) ; ⾞ (ideographic-strokes . 8) + (total-strokes . 12) + (=ucs . #x8F89) ; 辉 + (=gb2312 . #x3B54) ; ø»„­ƒ + )) +(define-char + '((ideographic-radical . 159) ; ⾞ + (ideographic-strokes . 8) + (total-strokes . 12) (=ucs . #x8F8A) ; 辊 (=gb2312 . #x3975) ; ø»„ª¨ )) (define-char '((ideographic-radical . 159) ; ⾞ (ideographic-strokes . 8) + (total-strokes . 12) (=ucs . #x8F8B) ; 辋 (=gb2312 . #x697E) ; ø»…±‘ )) (define-char '((ideographic-radical . 159) ; ⾞ (ideographic-strokes . 8) + (total-strokes . 12) (=ucs . #x8F8C) ; 辌 )) (define-char '((ideographic-radical . 159) ; ⾞ (ideographic-strokes . 8) + (total-strokes . 12) (=ucs . #x8F8D) ; 辍 (=gb2312 . #x6A21) ; ø»…±’ )) (define-char '((ideographic-radical . 159) ; ⾞ (ideographic-strokes . 8) + (total-strokes . 12) (=ucs . #x8F8E) ; 辎 (=gb2312 . #x6A22) ; ø»…±“ )) diff --git a/lisp/utf-2000/Ideograph-R205-Frog.el b/lisp/utf-2000/Ideograph-R205-Frog.el index 6411fc2..534428e 100644 --- a/lisp/utf-2000/Ideograph-R205-Frog.el +++ b/lisp/utf-2000/Ideograph-R205-Frog.el @@ -34,21 +34,20 @@ (ideographic-strokes . 0) (total-strokes . 8) (<-vulgar-ideograph - (:char ((=daikanwa . 48257) ; ø¸‹² - ) - :sources (seiji-tsuu morohashi-daikanwa))) + ((=daikanwa . 48257) ; ø¸‹² + )) + (<-vulgar-ideograph*sources + zhengzi-tong daikanwa) (=ucs . #x2FA18) ; 黾 (=cns11643-4 . #x2834) ; ø»—« (=daikanwa . 48258) ; ø¸‹²‚ )) (define-char '((morohashi-daikanwa 48258 0 2) - (ideographic- (:radical 205 ; ⿌ - :strokes 0 - :sources (ucs)) - (:radical 30 ; ⼝ - :strokes 5 - :sources (cns-11643))) + (ideographic-radical@ucs . 205) ; ⿌ + (ideographic-strokes@ucs . 0) + (ideographic-radical@cns . 30) ; ⼝ + (ideographic-strokes@cns . 5) (total-strokes . 8) (=ucs . #x9EFE) ; 黾 (=gb2312 . #x763C) ; ø»†ƒ• diff --git a/lisp/utf-2000/u0AC00-Hangul-Syllables.el b/lisp/utf-2000/u0AC00-Hangul-Syllables.el index 9705935..d7a92ae 100644 --- a/lisp/utf-2000/u0AC00-Hangul-Syllables.el +++ b/lisp/utf-2000/u0AC00-Hangul-Syllables.el @@ -5720,6 +5720,7 @@ (define-char '((=ucs . #xC5EC) ; 여 (=ks-x1001 . #x3F29) ; ø»‰†˜ + (=jef-china3 . #x94B6) ; øº‰’¶ )) (define-char '((=ucs . #xC5ED) ; 역 -- 1.7.10.4