From ab3f0b73c5b5933262b0c3d5e301e64ebab4d690 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 25 Jun 2004 15:45:09 +0000 Subject: [PATCH] Sync up with r21-4-14-chise-0_21-29-si-original. --- lisp/utf-2000/ChangeLog | 190 ++++++++++++++++++++++++++ lisp/utf-2000/Ideograph-R003-Dot.el | 39 ++++-- lisp/utf-2000/Ideograph-R004-Slash.el | 8 +- lisp/utf-2000/Ideograph-R007-Two.el | 6 +- lisp/utf-2000/Ideograph-R009-Man.el | 220 +++++++++++++++++------------- lisp/utf-2000/Ideograph-R013-Down-Box.el | 78 ++++++++++- lisp/utf-2000/Ideograph-R014-Cover.el | 78 ++++++++++- lisp/utf-2000/Ideograph-R015-Ice.el | 13 +- lisp/utf-2000/Ideograph-R016-Table.el | 26 +++- lisp/utf-2000/Ideograph-R018-Knife.el | 11 +- lisp/utf-2000/Ideograph-R024-Ten.el | 13 +- lisp/utf-2000/Ideograph-R028-Private.el | 83 ++++++----- lisp/utf-2000/Ideograph-R029-Again.el | 82 +++++++++++ lisp/utf-2000/Ideograph-R030-Mouth.el | 12 +- lisp/utf-2000/Ideograph-R032-Earth.el | 13 +- lisp/utf-2000/Ideograph-R040-Roof.el | 38 +++--- lisp/utf-2000/Ideograph-R045-Sprout.el | 8 +- lisp/utf-2000/Ideograph-R051-Dry.el | 25 ++-- lisp/utf-2000/Ideograph-R057-Bow.el | 13 +- lisp/utf-2000/Ideograph-R061-Heart.el | 22 +-- lisp/utf-2000/Ideograph-R063-Door.el | 99 +++++++------- lisp/utf-2000/Ideograph-R064-Hand.el | 6 +- lisp/utf-2000/Ideograph-R072-Sun.el | 71 +++++----- lisp/utf-2000/Ideograph-R073-Say.el | 98 ++++++++++--- lisp/utf-2000/Ideograph-R077-Stop.el | 34 ++--- lisp/utf-2000/Ideograph-R085-Water.el | 3 + lisp/utf-2000/Ideograph-R093-Cow.el | 70 ++++------ lisp/utf-2000/Ideograph-R109-Eye.el | 36 ++--- lisp/utf-2000/Ideograph-R111-Arrow.el | 24 ++-- lisp/utf-2000/Ideograph-R120-Silk.el | 8 +- lisp/utf-2000/Ideograph-R135-Tongue.el | 52 +++---- lisp/utf-2000/Ideograph-R140-Grass.el | 83 ++++++----- lisp/utf-2000/Ideograph-R145-Clothes.el | 74 ++++++---- lisp/utf-2000/Ideograph-R156-Run.el | 7 +- lisp/utf-2000/Ideograph-R158-Body.el | 35 +++-- lisp/utf-2000/Ideograph-R213-Turtle.el | 36 ++--- lisp/utf-2000/char-db-util.el | 3 +- src/ChangeLog | 23 +++- src/chartab.c | 2 + 39 files changed, 1174 insertions(+), 568 deletions(-) diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 6649f40..3fd7d6b 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,193 @@ +2004-06-24 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+8293): Use `->subsumptive'. + (JSP-5738): Add `->same' for U-0002F82C; put `daikanwa' into + `<-original*sources'. + (U+8295): Use `->subsumptive'. + +2004-06-23 MORIOKA Tomohiko + + * Ideograph-R072-Sun.el (M-14132): Add `->same' for U+6635; add + `->synonyms' for M-00279. + +2004-06-22 MORIOKA Tomohiko + + * Ideograph-R085-Water.el (U+6C37): Add `<-vulgar' for U+51B0. + + * Ideograph-R063-Door.el (U+39BE): Use `->subsumptive'; include + M-11705. + (U+623B): Use `->subsumptive'. + (U+623C): Add `zhengzi-tong' and `daikanwa' into + `<-original*sources'. + (U+623D): Use `->subsumptive'. + + * Ideograph-R051-Dry.el (U+5E78): Use `->subsumptive'. + + * Ideograph-R032-Earth.el (U-0002F855): Use `<-denotational' for + U+578B. + + * Ideograph-R015-Ice.el (U+51B0): Add `->vulgar' for U+6C37. + +2004-06-21 MORIOKA Tomohiko + + * Ideograph-R009-Man.el (U+4FA2): Use `->subsumptive'. + (U+4FAE): Define as an abstract character. + (U-0002F805): Use `<-denotational' for U+4FAE. + (U+FA30): Likewise. + (U+3457): Use `->subsumptive'. + (U-0002022D): Likewise. + (U+4FAF): Likewise. + +2004-06-21 MORIOKA Tomohiko + + * Ideograph-R158-Body.el (U+8EAB): Use `->subsumptive'. + + * Ideograph-R028-Private.el (C6-215D): Use `<-denotational' for + U-00020AD7; use `->subsumptive'. + (U-0002062F): Use `->subsumptive'; integrate C6-215C; use + `ideographic-{radical|strokes}@cns' instead of + `ideographic-{radical|strokes}@daikanwa' and add + `ideographic-radical@cns*sources'. + (M-03068): Unify U-00020AD8 and H1-F4EC. + (U-00020AD7): Define as an abstract character. + (H1-DEEF): Use `<-denotational' for U-00020AD7; map to MH-0045 + instead of M-03066; unify GT-02288; use + `ideographic-{radical|strokes}@{ucs|daikanwa}'. + + * Ideograph-R093-Cow.el (U+7262): Use `->subsumptive'. + (U+7263): Likewise. + +2004-06-20 MORIOKA Tomohiko + + * Ideograph-R016-Table.el (U-0002062F): Use `->subsumptive'; + integrate C6-215C; use `ideographic-{radical|strokes}@cns' instead + of `ideographic-{radical|strokes}@daikanwa' and add + `ideographic-radical@cns*sources'. + (GT-02288): Add `<-denotational' for U-00020AD7; unify H1-DEEF; + use `ideographic-{radical|strokes}@{ucs|daikanwa}'. + +2004-06-19 MORIOKA Tomohiko + + * Ideograph-R145-Clothes.el (U+88D7): Define as an abstract + character; unify B-DBC4. (C2-402A): Use `<-denotational' for + U+88D7; use `<-original*sources' instead of char-ref in + `<-original'; use `->subsumptive'; separate B-DBC4. + (M-34310): Use `<-denotational' for U+88D7; use `->subsumptive'. + + * Ideograph-R003-Dot.el (U+4E38): Define as an abstract character; + unify B-A459. + (J0-345D): Use `<-denotational' for U+4E38. + (C1-443A): Likewise; separate B-A459. + + * Ideograph-R064-Hand.el (U-00022A65): Delete `=>daikanwa'. + +2004-06-18 MORIOKA Tomohiko + + * char-db-util.el (insert-char-attributes): Don't display + `->original' when running with non-readable mode and it does not + have `->original*sources'. + +2004-06-17 MORIOKA Tomohiko + + * Ideograph-R014-Cover.el, Ideograph-R013-Down-Box.el (U+6700): + Copied from Ideograph-R073-Say.el. + (M-01597): Use `<-denotational' for U+6700; separate B-B3CC; add + S1-926. + (U-0002F8D4): New character. + + * Ideograph-R073-Say.el (U+6700): Define as an abstract character; + unify B-B3CC. + (M-01597): Copied from Ideograph-R014-Cover.el. + (U-0002F8D4): New character. + (J0-3A47): Moved into U-0002F8D4. + (G0-576E): Moved into U-0002F8D4. + + * Ideograph-R029-Again.el (U+6700): Copied from + Ideograph-R073-Say.el. + (M-01597): Copied from Ideograph-R014-Cover.el. + (U-0002F8D4): New character. + +2004-06-16 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+8294): Rename `<-original-ideograph' + to `<-original'; use `->subsumptive'. + + * Ideograph-R135-Tongue.el (U+820C): Use `->subsumptive'; use + `<-original' and `<-original*sources' instead of + `<-original-ideograph' with char-ref. + + * char-db-util.el (char-db-feature-domains): Add `shinjigen'. + + * Ideograph-R213-Turtle.el (U+9F9C): Use `->subsumptive'; rename + `<-original-ideograph' to `<-original'. + + * Ideograph-R145-Clothes.el: Rename `<-original-ideograph' to + `<-original'. + (U+461A): Use `->subsumptive'; use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref. + + * Ideograph-R111-Arrow.el (U+77E6): Use `->subsumptive'. + + * Ideograph-R109-Eye.el: Rename `<-original-ideograph' to + `<-original'. + (U+7714): Use `->subsumptive'. + +2004-06-15 MORIOKA Tomohiko + + * Ideograph-R072-Sun.el (U+66B1): Use `->subsumptive'; rename + `<-original-ideograph' to `<-original'. + +2004-06-15 MORIOKA Tomohiko + + * Ideograph-R156-Run.el, Ideograph-R120-Silk.el: Rename + `<-original-ideograph' to `<-original'. + + * Ideograph-R077-Stop.el (U+3C55): Use `->subsumptive'; rename + `<-original-ideograph' to `<-original'. + + * Ideograph-R061-Heart.el (U+39A4): Use `->same' and + `->same*sources' instead of `->synonyms' with char-ref for + M-11501; use `<-original' and `<-original*sources' instead of + `<-original-ideograph' with char-ref. + + * Ideograph-R063-Door.el: Rename `<-original-ideograph' to + `<-original'. + + * Ideograph-R057-Bow.el (U-000223A3): Use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref; use `hanyu-dazidian' instead of + `hanyu-dazidian-{vol|page|char}'. + + * Ideograph-R040-Roof.el (U+5B90): Use `->subsumptive'. + (JSP-3A4C): Moved into U+5B90; rename `<-original-ideograph' to + `<-original'. + (C4-225B): Add `<-denotational' for U+5B90. + + * Ideograph-R045-Sprout.el, Ideograph-R032-Earth.el: Rename + `<-original-ideograph' to `<-original'. + + * Ideograph-R030-Mouth.el (U+5412): Use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref. + + * Ideograph-R028-Private.el (U+53BA): Use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref. + + * Ideograph-R024-Ten.el (U-00020983): Use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref. + + * Ideograph-R018-Knife.el (U-000206F0): Use `<-original' and + `<-original*sources' instead of `<-original-ideograph' with + char-ref. + + * Ideograph-R009-Man.el, Ideograph-R003-Dot.el, + Ideograph-R015-Ice.el, Ideograph-R007-Two.el, + Ideograph-R004-Slash.el: Rename `<-original-ideograph' to + `<-original'. + 2004-06-13 MORIOKA Tomohiko * Ideograph-R010-Legs.el (U+514D): Unify B-A74B. diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index 9fd6be1..8ffcb90 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -81,12 +81,21 @@ '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 2) (total-strokes . 3) - (shinjigen-1 . 39) - (shinjigen-2 . 39) (sound@ja/kun "maru" "maru+i") (sound@ja/on/go "gan") (=ucs . #x4E38) ; 丸 - (=jis-x0208 . #x345D) ; &I-J90-345D; [20-61] + (=big5 . #xA459) ; &I-B-A459; + )) +(define-char + '((ideographic-radical . 3) ; ⼂ + (ideographic-strokes . 2) + (total-strokes . 3) + (<-denotational + ((=ucs . #x4E38) ; 丸 + )) + (shinjigen-1 . 39) + (shinjigen-2 . 39) + (=jis-x0208 . #x345D) ; >-00131; [20-61] (=gb2312 . #x4D68) ; &I-G0-4D68; [45-72] (=ks-x1001 . #x7C2F) ; &I-K0-7C2F; [92-15] (=cns11643-6 . #x2131) ; &I-C6-2131; [01-17] @@ -94,33 +103,39 @@ (=gt-k . 00161) ; &I-GT-K00161; (=gt-pj-1 . #x345D) ; &I-GT-00131; [20-61] (=daikanwa . 00094) ; &I-M-00094; + (=ucs@unicode . #x4E38) ; >-00131; (mojikyo . 000094) ; &MCS-6000005E; )) (define-char - '((=>ucs . #x4E38) ; 丸 - (ideographic-radical . 3) ; ⼂ + '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 2) (total-strokes . 3) + (<-denotational + ((=ucs . #x4E38) ; 丸 + )) (hanyu-dazidian 1 42 11) (=cns11643-1 . #x443A) ; >-00132; [36-26] - (=big5 . #xA459) ; &I-B-A459; (=gt . 00132) ; &I-GT-00132; (=gt-k . 00162) ; &I-GT-K00162; (=gt-pj-2 . #x306A) ; &I-GT-00132; [16-74] (=daikanwa . 00095) ; &I-M-00095; (=ucs@cns . #x4E38) ; >-00132; - (=ucs@big5 . #x4E38) ; >-00132; (mojikyo . 000095) ; &MCS-6000005F; )) (define-char '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 2) (total-strokes . 3) - (<-original-ideograph - (:char ((shinjigen-1 . 39) - (=daikanwa . 00094) ; &I-M-00094; - ) - :sources (chuuka-daijiten morohashi-daikanwa shinjigen-1))) + (<-original + ((shinjigen-1 . 39) + (=jis-x0208 . #x345D) ; >-00131; [20-61] + (=gb2312 . #x4D68) ; &I-G0-4D68; [45-72] + (=ks-x1001 . #x7C2F) ; &I-K0-7C2F; [92-15] + (=cns11643-6 . #x2131) ; &I-C6-2131; [01-17] + (=daikanwa . 00094) ; &I-M-00094; + )) + (<-original*sources + zhonghua-dazidian daikanwa shinjigen-1) (hanyu-dazidian 1 276 4) (shinjigen-1 . 40) (=ucs . #x2007D) ; 𠁽 diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index e2b6e2a..68e2d18 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -1658,10 +1658,12 @@ )) (define-char '((total-strokes . 10) - (<-original-ideograph - ((=daikanwa . 09176) ; &I-M-09176; + (<-original + ((=jis-x0208 . #x392C) ; >-11561; [25-12] + (=ks-x1001 . #x7A39) ; &I-K0-7A39; [90-25] + (=daikanwa . 09176) ; &I-M-09176; )) - (<-original-ideograph*sources + (<-original*sources zhengzi-tong zhonghua-dazidian daikanwa) (hanyu-dazidian 2 1022 17) (=ucs . #x21D18) ; 𡴘 diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el index d6e52e4..e0fb280 100644 --- a/lisp/utf-2000/Ideograph-R007-Two.el +++ b/lisp/utf-2000/Ideograph-R007-Two.el @@ -142,11 +142,13 @@ '((ideographic-radical . 7) ; ⼆ (ideographic-strokes . 1) (total-strokes . 3) - (<-original-ideograph + (<-original ((shinjigen-1 . 75) + (=ucs . #x4E8E) ; 于 + (=jis-x0208 . #x5032) ; &I-J90-5032; [48-18] (=daikanwa . 00252) ; &I-M-00252; )) - (<-original-ideograph*sources + (<-original*sources zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 5 1) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 39c309b..e4e0261 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -590,11 +590,11 @@ '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 2) (total-strokes . 4) - (<-original-ideograph - ((ideographic-radical . 15) ; ⼎ + (<-original + ((=ucs . #x51B0) ; 冰 (=daikanwa . 01612) ; &I-M-01612; )) - (<-original-ideograph*sources + (<-original*sources shuowen shuowen-tongxun-dingsheng daikanwa) (=ucs . #x4ECC) ; 仌 (->subsumptive @@ -8888,43 +8888,48 @@ (mojikyo . 050102) ; &MCS-6000C3B6; )) (define-char - '((=>ucs . #x4FA2) ; 侢 - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 6) (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 + (=ucs . #x4FA2) ; 侢 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=ucs . #x2F815) ; 再 + )) + (=cns11643-3 . #x274A) ; &M-00629; [07-42] + (=daikanwa . 00629) ; &I-M-00629; + (mojikyo . 000629) ; &MCS-60000275; ) - ((=ucs . #x2F815) ; 再 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=ucs . #x518D) ; 再 + )) + (=iso-ir165 . #x2E26) ; &EGB-2E26; [14-06] + (=ucs@unicode . #x4FA2) ; &EGB-2E26; )) - (=cns11643-3 . #x274A) ; &M-00629; [07-42] - (=daikanwa . 00629) ; &I-M-00629; - (mojikyo . 000629) ; &MCS-60000275; )) (define-char - '((morohashi-daikanwa 629 0 1) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 6) - (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 - ) - ((=ucs . #x518D) ; 再 - )) - (=ucs . #x4FA2) ; 侢 - (=iso-ir165 . #x2E26) ; &I-EGB-2E26; [14-06] + '((ideographic-radical . 9) ; ⼈ + (=ucs . #x4FAE) ; 侮 )) (define-char - '((morohashi-daikanwa 629 1) + '((=>ucs* . #x4FAE) ; 侮 + (morohashi-daikanwa 629 1) (ideographic-radical . 9) ; ⼈ (ideographic-strokes . 6) (total-strokes . 8) + (<-denotational + ((=ucs . #x4FAE) ; 侮 + )) (<-simplified@JP/Jouyou ((=ucs . #xFA30) ; 侮 (=jis-x0213-1-2000 . #x2E38) ; &I-JX1-2E38; [14-24] @@ -9200,6 +9205,9 @@ (ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) + (<-denotational + ((=ucs . #x4FAE) ; 侮 + )) (hanyu-dazidian 1 163 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -9226,93 +9234,121 @@ (mojikyo . 000630) ; &MCS-60000276; )) (define-char - '((=>ucs@jis . #xFA30) ; 侮 - (morohashi-daikanwa 630 0 0) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 7) - (total-strokes . 9) - (->identical - ((=ucs . #xFA30) ; 侮 - )) - (=ucs . #x4FAE) ; 侮 - )) -(define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 163 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 + (=ucs . #x3457) ; 㑗 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=jis-x0208 . #x3F48) ; >-50811; [31-40] + (=ks-x1001 . #x6373) ; &I-K0-6373; [67-83] + (=cns11643-1 . #x4B4E) ; &I-C1-4B4E; [43-46] + (=daikanwa . 38034) ; &I-M-38034; + )) + (=cns11643-3 . #x2B31) ; &M-00631; [11-17] + (=daikanwa . 00631) ; &I-M-00631; + (mojikyo . 000631) ; &MCS-60000277; ) - ((=ucs . #x8EAB) ; 身 + ((hanyu-dazidian 1 163 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=gb2312 . #x496D) ; &G0-496D; [41-77] + )) + (=hanziku-1 . #xC566) ; &HZK01-C566; + (=ucs@unicode . #x3457) ; &HZK01-C566; )) - (=ucs . #x3457) ; 㑗 - (=cns11643-3 . #x2B31) ; &I-C3-2B31; [11-17] - (=daikanwa . 00631) ; &I-M-00631; - (=hanziku-1 . #xC566) ; &I-HZK01-C566; - (mojikyo . 000631) ; &MCS-60000277; )) (define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 166 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 + (=ucs . #x2022D) ; 𠈭 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=jis-x0208 . #x4F34) ; >-25593; [47-20] + (=ks-x1001 . #x566F) ; &I-K0-566F; [54-79] + (=daikanwa . 19934) ; &I-M-19934; + )) + (=daikanwa . 00632) ; &M-00632; + (mojikyo . 000632) ; &MCS-60000278; ) - ((=ucs . #x7262) ; 牢 + ((hanyu-dazidian 1 166 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=gb2312 . #x404E) ; &C1-4B26; [32-46] + (=cns11643-1 . #x4B26) ; &I-C1-4B26; [43-06] + )) + (=cns11643-5 . #x277C) ; &HZK01-C5EC; [07-92] + (=hanziku-1 . #xC5EC) ; &I-HZK01-C5EC; + (=ucs@iso . #x2022D) ; &HZK01-C5EC; )) - (=ucs . #x2022D) ; 𠈭 - (=cns11643-5 . #x277C) ; &I-C5-277C; [07-92] - (=daikanwa . 00632) ; &I-M-00632; - (=hanziku-1 . #xC5EC) ; &I-HZK01-C5EC; - (mojikyo . 000632) ; &MCS-60000278; )) (define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 167 1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 + (=ucs . #x4FAF) ; 侯 + (->subsumptive + ((hanyu-dazidian 1 167 1) + (shinjigen-1 . 254) + (shinjigen-2 . 254) + (=jis-x0208 . #x3874) ; >-00835; [24-84] + (=gb2312 . #x3A6E) ; &I-G0-3A6E; [26-78] + (=ks-x1001 . #x7D25) ; &I-K0-7D25; [93-05] + (=big5 . #xAB4A) ; &I-B-AB4A; + (=gt . 00835) ; &I-GT-00835; + (=gt-k . 05072) ; &I-GT-K05072; + (=gt-pj-1 . #x3874) ; &I-GT-00835; [24-84] + (=daikanwa . 00633) ; &I-M-00633; + (=ucs@unicode . #x4FAF) ; >-00835; + (mojikyo . 000633) ; &MCS-60000279; ) - ((=big5-cdp . #x8BC7) ; &CDP-8BC7; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=big5-cdp . #x8BC7) ; &CDP-8BC7; + )) + (=cns11643-1 . #x4F6C) ; &C1-4F6C; [47-76] )) - (shinjigen-1 . 254) - (shinjigen-2 . 254) - (=ucs . #x4FAF) ; 侯 - (=jis-x0208 . #x3874) ; &I-J90-3874; [24-84] - (=gb2312 . #x3A6E) ; &I-G0-3A6E; [26-78] - (=ks-x1001 . #x7D25) ; &I-K0-7D25; [93-05] - (=cns11643-1 . #x4F6C) ; &I-C1-4F6C; [47-76] - (=big5 . #xAB4A) ; &I-B-AB4A; - (=gt . 00835) ; &I-GT-00835; - (=gt-k . 05072) ; &I-GT-K05072; - (=gt-pj-1 . #x3874) ; &I-GT-00835; [24-84] - (=daikanwa . 00633) ; &I-M-00633; - (mojikyo . 000633) ; &MCS-60000279; )) (define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) (<-denotational - ((=daikanwa . 23937) ; &I-M-23937; - )) - (<-original-ideograph - ((=daikanwa . 00633) ; &I-M-00633; - )) - (<-original-ideograph*sources - daikanwa) + ((=jis-x0212 . #x4F46) ; &M-23937; [47-38] + (=jis-x0213-2-2000 . #x7236) ; &I-JX2-7236; [82-22] + (=daikanwa . 23937) ; &I-M-23937; + )) + (<-original + ((=jis-x0208 . #x3874) ; >-00835; [24-84] + (=gb2312 . #x3A6E) ; &I-G0-3A6E; [26-78] + (=ks-x1001 . #x7D25) ; &I-K0-7D25; [93-05] + (=daikanwa . 00633) ; &I-M-00633; + )) + (<-original*sources + zihui daikanwa) (=daikanwa . 00634) ; &M-00634; )) (define-char @@ -17096,7 +17132,7 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=cns11643-3 . #x2E36) ; &CDP-8AC7; [14-22] + ((=cns11643-3 . #x2E36) ; &C3-2E36; [14-22] )) (=ucs . #x202B1) ; 𠊱 (=cns11643-6 . #x3D33) ; &I-C6-3D33; [29-19] diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el index 8424762..58f9bc9 100644 --- a/lisp/utf-2000/Ideograph-R013-Down-Box.el +++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el @@ -1176,22 +1176,86 @@ (=hanziku-4 . #xE2BF) ; &I-HZK04-E2BF; )) (define-char - '((=>ucs . #x6700) ; 最 + '((ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) (ideographic-radical@daikanwa . 14) ; ⼍ (ideographic-strokes@daikanwa . 10) + (ideographic-radical@daikanwa*sources + daikanwa=01597 jisx0208/d) (ideographic-radical@cns . 13) ; ⼌ (ideographic-strokes@cns . 10) + (ideographic-radical@cns*sources + cns11643-1) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) (total-strokes . 12) - (<-original-ideograph - ((=daikanwa . 14301) ; &I-M-14301; + (=ucs . #x6700) ; 最 + (=big5 . #xB3CC) ; &I-B-B3CC; + )) +(define-char + '((ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (<-original + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=daikanwa . 14301) ; &I-M-14301; )) - (<-original-ideograph*sources - zhengzi-tong daikanwa) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 2 1516 8) + (shinjigen-1 . 926) (=cns11643-1 . #x5E32) ; &M-01597; [62-18] - (=big5 . #xB3CC) ; &I-B-B3CC; (=daikanwa . 01597) ; &I-M-01597; - (=ucs@big5 . #x6700) ; &M-01597; + )) +(define-char + '((=>ucs* . #x6700) ; 最 + (=>ucs@gb . #x6700) ; &G0-576E; + (=>ucs@jis . #x6700) ; >-18101; + (=>ucs@ks . #x6700) ; &G0-576E; + (ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (=ucs . #x2F8D4) ; 最 + (->subsumptive + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=gt . 18101) ; &I-GT-18101; + (=gt-k . 09052) ; &I-GT-K09052; + (=gt-pj-1 . #x3A47) ; &I-GT-18101; [26-39] + (=daikanwa . 14301) ; &I-M-14301; + (=ucs@iso . #x2F8D4) ; >-18101; + (=ucs@jis . #x6700) ; >-18101; + ) + ((=gb2312 . #x576E) ; &G0-576E; [55-78] + (=ucs@unicode . #x6700) ; &G0-576E; + )) )) (define-char '((=>ucs . #x34BE) ; 㒾 diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el index 14cac88..3352ea0 100644 --- a/lisp/utf-2000/Ideograph-R014-Cover.el +++ b/lisp/utf-2000/Ideograph-R014-Cover.el @@ -788,22 +788,86 @@ (=hanziku-1 . #xE4DF) ; &I-HZK01-E4DF; )) (define-char - '((=>ucs . #x6700) ; 最 + '((ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) (ideographic-radical@daikanwa . 14) ; ⼍ (ideographic-strokes@daikanwa . 10) + (ideographic-radical@daikanwa*sources + daikanwa=01597 jisx0208/d) (ideographic-radical@cns . 13) ; ⼌ (ideographic-strokes@cns . 10) + (ideographic-radical@cns*sources + cns11643-1) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) (total-strokes . 12) - (<-original-ideograph - ((=daikanwa . 14301) ; &I-M-14301; + (=ucs . #x6700) ; 最 + (=big5 . #xB3CC) ; &I-B-B3CC; + )) +(define-char + '((ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (<-original + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=daikanwa . 14301) ; &I-M-14301; )) - (<-original-ideograph*sources - zhengzi-tong daikanwa) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 2 1516 8) + (shinjigen-1 . 926) (=cns11643-1 . #x5E32) ; &M-01597; [62-18] - (=big5 . #xB3CC) ; &I-B-B3CC; (=daikanwa . 01597) ; &I-M-01597; - (=ucs@big5 . #x6700) ; &M-01597; + )) +(define-char + '((=>ucs* . #x6700) ; 最 + (=>ucs@gb . #x6700) ; &G0-576E; + (=>ucs@jis . #x6700) ; >-18101; + (=>ucs@ks . #x6700) ; &G0-576E; + (ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (=ucs . #x2F8D4) ; 最 + (->subsumptive + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=gt . 18101) ; &I-GT-18101; + (=gt-k . 09052) ; &I-GT-K09052; + (=gt-pj-1 . #x3A47) ; &I-GT-18101; [26-39] + (=daikanwa . 14301) ; &I-M-14301; + (=ucs@iso . #x2F8D4) ; >-18101; + (=ucs@jis . #x6700) ; >-18101; + ) + ((=gb2312 . #x576E) ; &G0-576E; [55-78] + (=ucs@unicode . #x6700) ; &G0-576E; + )) )) (define-char '((ideographic-radical . 14) ; ⼍ diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index 797ee46..ce30094 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -145,11 +145,18 @@ )) (->same*sources shuowen kanjo ronkou jiyun daikanwa) - (<-original-ideograph - ((shinjigen-1 . 4051) + (->vulgar + ((=ucs . #x6C37) ; 氷 (=daikanwa . 17087) ; &I-M-17087; )) - (<-original-ideograph*sources + (->vulgar*sources + zhengzi-tong daikanwa) + (<-original + ((shinjigen-1 . 4051) + (=ucs . #x6C37) ; 氷 + (=jis-x0208 . #x4939) ; &I-J90-4939; [41-25] + )) + (<-original*sources shinjigen-1) (hanyu-dazidian 1 295 9) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el index 35a22b9..c989fa5 100644 --- a/lisp/utf-2000/Ideograph-R016-Table.el +++ b/lisp/utf-2000/Ideograph-R016-Table.el @@ -235,19 +235,35 @@ (define-char '((ideographic-radical@ucs . 16) ; ⼏ (ideographic-strokes@ucs . 2) - (ideographic-radical@daikanwa . 28) ; ⼛ - (ideographic-strokes@daikanwa . 2) + (ideographic-radical@cns . 28) ; ⼛ + (ideographic-strokes@cns . 2) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 4) (=ucs . #x2062F) ; 𠘯 - (=daikanwa . 03067) ; &I-M-03067; + (->subsumptive + ((=daikanwa . 03067) ; &M-03067; + (=ucs@iso . #x2062F) ; &M-03067; + ) + ((=cns11643-6 . #x215C) ; &CDP-87B8; [01-60] + (=big5-cdp . #x87B8) ; &I-CDP-87B8; + )) )) (define-char '((morohashi-daikanwa ho 45) - (ideographic-radical . 16) ; ⼏ - (ideographic-strokes . 2) + (ideographic-radical@ucs . 28) ; ⼛ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 16) ; ⼏ + (ideographic-strokes@daikanwa . 2) (total-strokes . 4) + (<-denotational + ((=ucs . #x20AD7) ; 𠫗 + )) + (hanyu-dazidian 1 276 8) (=gt . 02288) ; >-02288; (=gt-pj-11 . #x432A) ; >-02288; [35-10] + (=hanziku-1 . #xDEEF) ; &I-HZK01-DEEF; + (=ucs@iso . #x20AD7) ; >-02288; (mojikyo . 085200) ; &MCS-60014CD0; )) (define-char diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index 2eb7a81..78b7db9 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -2372,12 +2372,13 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 6) (total-strokes . 8) - (<-original-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 615) - (=ucs . #x5225) ; 別 - ) + (<-original + ((shinjigen-1 . 615) + (=ucs . #x5225) ; 別 + (=jis-x0208 . #x4A4C) ; &I-J90-4A4C; [42-44] )) + (<-original*sources + shinjigen-1) (shinjigen-1 . 616) (=ucs . #x206F0) ; 𠛰 (=cns11643-6 . #x2965) ; &I-C6-2965; [09-69] diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el index 479f2fb..f981509 100644 --- a/lisp/utf-2000/Ideograph-R024-Ten.el +++ b/lisp/utf-2000/Ideograph-R024-Ten.el @@ -501,11 +501,14 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 4) (total-strokes . 6) - (<-original-ideograph - (:char ((shinjigen-1 . 814) - (=daikanwa . 02700) ; &I-M-02700; - ) - :sources (seiji-tsuu morohashi-daikanwa shinjigen-1))) + (<-original + ((shinjigen-1 . 814) + (=ucs . #x5345) ; 卅 + (=jis-x0208 . #x5241) ; &I-J90-5241; [50-33] + (=daikanwa . 02700) ; &I-M-02700; + )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 60 8) (shinjigen-1 . 815) (=ucs . #x20983) ; 𠦃 diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el index 0c114cc..eef30ae 100644 --- a/lisp/utf-2000/Ideograph-R028-Private.el +++ b/lisp/utf-2000/Ideograph-R028-Private.el @@ -149,56 +149,79 @@ (=jef-china3 . #x8EAF) ; &I-JC3-8EAF; )) (define-char - '((=>ucs . #x20AD7) ; 𠫗 - (ideographic-radical . 28) ; ⼛ - (ideographic-strokes . 2) - (total-strokes . 4) - (=cns11643-6 . #x215D) ; &M-03066; [01-61] - (=daikanwa . 03066) ; &I-M-03066; - )) -(define-char - '((morohashi-daikanwa 3066 0 9) - (ideographic-radical . 28) ; ⼛ + '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 2) (total-strokes . 4) - (hanyu-dazidian 1 276 8) - (=ucs . #x20AD7) ; 𠫗 - (=hanziku-1 . #xDEEF) ; &I-HZK01-DEEF; + (<-denotational + ((=ucs . #x20AD7) ; 𠫗 + )) + (->subsumptive + ((=daikanwa . 03066) ; &M-03066; + ) + ((=cns11643-6 . #x215D) ; &C6-215D; [01-61] + )) )) (define-char '((ideographic-radical@ucs . 16) ; ⼏ (ideographic-strokes@ucs . 2) - (ideographic-radical@daikanwa . 28) ; ⼛ - (ideographic-strokes@daikanwa . 2) + (ideographic-radical@cns . 28) ; ⼛ + (ideographic-strokes@cns . 2) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 4) (=ucs . #x2062F) ; 𠘯 - (=daikanwa . 03067) ; &I-M-03067; + (->subsumptive + ((=daikanwa . 03067) ; &M-03067; + (=ucs@iso . #x2062F) ; &M-03067; + ) + ((=cns11643-6 . #x215C) ; &CDP-87B8; [01-60] + (=big5-cdp . #x87B8) ; &I-CDP-87B8; + )) )) (define-char - '((=>ucs . #x2062F) ; 𠘯 - (morohashi-daikanwa 3067 0 0) - (ideographic-radical . 28) ; ⼛ + '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 2) (total-strokes . 4) - (=cns11643-6 . #x215C) ; &CDP-87B8; [01-60] - (=big5-cdp . #x87B8) ; &I-CDP-87B8; + (hanyu-dazidian 1 384 3) + (=ucs . #x20AD8) ; 𠫘 + (=daikanwa . 03068) ; &I-M-03068; + (=hanziku-1 . #xF4EC) ; &I-HZK01-F4EC; )) (define-char '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 2) (total-strokes . 4) - (=daikanwa . 03068) ; &M-03068; + (=ucs . #x20AD7) ; 𠫗 + )) +(define-char + '((morohashi-daikanwa ho 45) + (ideographic-radical@ucs . 28) ; ⼛ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 16) ; ⼏ + (ideographic-strokes@daikanwa . 2) + (total-strokes . 4) + (<-denotational + ((=ucs . #x20AD7) ; 𠫗 + )) + (hanyu-dazidian 1 276 8) + (=gt . 02288) ; >-02288; + (=gt-pj-11 . #x432A) ; >-02288; [35-10] + (=hanziku-1 . #xDEEF) ; &I-HZK01-DEEF; + (=ucs@iso . #x20AD7) ; >-02288; + (mojikyo . 085200) ; &MCS-60014CD0; )) (define-char '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 3) (total-strokes . 5) - (<-original-ideograph - (:sources (seiji-tsuu morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 890) - (=daikanwa . 03070) ; &I-M-03070; - ) + (<-original + ((shinjigen-1 . 890) + (=ucs . #x53BB) ; 去 + (=jis-x0208 . #x356E) ; &I-J90-356E; [21-78] + (=daikanwa . 03070) ; &I-M-03070; )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 385 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1169,12 +1192,6 @@ )) (define-char '((ideographic-radical . 28) ; ⼛ - (hanyu-dazidian 1 384 3) - (=ucs . #x20AD8) ; 𠫘 - (=hanziku-1 . #xF4EC) ; &I-HZK01-F4EC; - )) -(define-char - '((ideographic-radical . 28) ; ⼛ (hanyu-dazidian 1 385 2) (=ucs . #x20ADB) ; 𠫛 (=hanziku-1 . #xF54C) ; &I-HZK01-F54C; diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index 9f3c320..20f925d 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -1823,6 +1823,54 @@ (=cns11643-6 . #x3D69) ; &I-C6-3D69; [29-73] )) (define-char + '((ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@daikanwa*sources + daikanwa=01597 jisx0208/d) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@cns*sources + cns11643-1) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (=ucs . #x6700) ; 最 + (=big5 . #xB3CC) ; &I-B-B3CC; + )) +(define-char + '((ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (<-original + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=daikanwa . 14301) ; &I-M-14301; + )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) + (hanyu-dazidian 2 1516 8) + (shinjigen-1 . 926) + (=cns11643-1 . #x5E32) ; &M-01597; [62-18] + (=daikanwa . 01597) ; &I-M-01597; + )) +(define-char '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 10) (total-strokes . 12) @@ -1894,6 +1942,40 @@ )) )) (define-char + '((=>ucs* . #x6700) ; 最 + (=>ucs@gb . #x6700) ; &G0-576E; + (=>ucs@jis . #x6700) ; >-18101; + (=>ucs@ks . #x6700) ; &G0-576E; + (ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (=ucs . #x2F8D4) ; 最 + (->subsumptive + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=gt . 18101) ; &I-GT-18101; + (=gt-k . 09052) ; &I-GT-K09052; + (=gt-pj-1 . #x3A47) ; &I-GT-18101; [26-39] + (=daikanwa . 14301) ; &I-M-14301; + (=ucs@iso . #x2F8D4) ; >-18101; + (=ucs@jis . #x6700) ; >-18101; + ) + ((=gb2312 . #x576E) ; &G0-576E; [55-78] + (=ucs@unicode . #x6700) ; &G0-576E; + )) + )) +(define-char '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 11) (total-strokes . 13) diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index aa11a78..86c3ec9 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -1569,12 +1569,14 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 3) (total-strokes . 6) - (<-original-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 1074) - (=daikanwa . 03533) ; &I-M-03533; - ) + (<-original + ((shinjigen-1 . 1074) + (=jis-x0208 . #x5323) ; >-04510; [51-03] + (=ks-x1001 . #x7663) ; &I-K0-7663; [86-67] + (=daikanwa . 03533) ; &I-M-03533; )) + (<-original*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index d256f91..8cf705a 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -5561,12 +5561,19 @@ (=daikanwa . 05233) ; &I-M-05233; )) (define-char - '((ideographic-radical . 32) ; ⼟ + '((=>ucs* . #x578B) ; 型 + (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 8) (total-strokes . 11) - (<-original-ideograph - ((=daikanwa . 05030) ; &I-M-05030; + (<-denotational + ((=ucs . #x578B) ; 型 + )) + (<-original + ((=ucs . #x578B) ; 型 + (=daikanwa . 05030) ; &I-M-05030; )) + (<-original*sources + zhengzi-tong daikanwa) (=ucs . #x2F855) ; 型 (=cns11643-3 . #x3470) ; &I-C3-3470; [20-80] (=daikanwa . 05234) ; &I-M-05234; diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index de9f4e9..83e815f 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -686,32 +686,32 @@ (=cns11643-4 . #x236E) ; &I-C4-236E; [03-78] )) (define-char - '((=>ucs . #x5B90) ; 宐 - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 4) - (total-strokes . 7) - (<-original-ideograph - ((=daikanwa . 07111) ; &I-M-07111; - )) - (<-original-ideograph*sources - daikanwa) - (=jis-x0212 . #x3A4C) ; &M-07089; [26-44] - (=daikanwa . 07089) ; &I-M-07089; - (=ucs@jis . #x5B90) ; &M-07089; - )) -(define-char - '((morohashi-daikanwa 7089 0 0) - (ideographic-radical . 40) ; ⼧ + '((ideographic-radical . 40) ; ⼧ (ideographic-strokes . 4) (total-strokes . 7) (=ucs . #x5B90) ; 宐 + (->subsumptive + ((<-original + ((=jis-x0208 . #x3539) ; >-08923; [21-25] + (=ks-x1001 . #x6B71) ; &I-K0-6B71; [75-81] + (=daikanwa . 07111) ; &I-M-07111; + )) + (<-original*sources + daikanwa) + (=jis-x0212 . #x3A4C) ; &M-07089; [26-44] + (=daikanwa . 07089) ; &I-M-07089; + (=ucs@jis . #x5B90) ; &M-07089; + ) + ((=ucs@unicode . #x5B90) ; &UU+5B90; + )) )) (define-char - '((=>ucs . #x5B90) ; 宐 - (morohashi-daikanwa 7089 0 9) - (ideographic-radical . 40) ; ⼧ + '((ideographic-radical . 40) ; ⼧ (ideographic-strokes . 3) (total-strokes . 6) + (<-denotational + ((=ucs . #x5B90) ; 宐 + )) (=cns11643-4 . #x225B) ; &C4-225B; [02-59] )) (define-char diff --git a/lisp/utf-2000/Ideograph-R045-Sprout.el b/lisp/utf-2000/Ideograph-R045-Sprout.el index 47e8afc..c5efca7 100644 --- a/lisp/utf-2000/Ideograph-R045-Sprout.el +++ b/lisp/utf-2000/Ideograph-R045-Sprout.el @@ -296,10 +296,12 @@ )) (define-char '((total-strokes . 10) - (<-original-ideograph - ((=daikanwa . 09176) ; &I-M-09176; + (<-original + ((=jis-x0208 . #x392C) ; >-11561; [25-12] + (=ks-x1001 . #x7A39) ; &I-K0-7A39; [90-25] + (=daikanwa . 09176) ; &I-M-09176; )) - (<-original-ideograph*sources + (<-original*sources zhengzi-tong zhonghua-dazidian daikanwa) (hanyu-dazidian 2 1022 17) (=ucs . #x21D18) ; 𡴘 diff --git a/lisp/utf-2000/Ideograph-R051-Dry.el b/lisp/utf-2000/Ideograph-R051-Dry.el index 5c825dc..463267a 100644 --- a/lisp/utf-2000/Ideograph-R051-Dry.el +++ b/lisp/utf-2000/Ideograph-R051-Dry.el @@ -198,17 +198,22 @@ '((ideographic-radical . 51) ; ⼲ (ideographic-strokes . 5) (total-strokes . 8) - (shinjigen-2 . 2154) (=ucs . #x5E78) ; 幸 - (=jis-x0208 . #x392C) ; &I-J90-392C; [25-12] - (=gb2312 . #x5052) ; &I-G0-5052; [48-50] - (=ks-x1001 . #x7A39) ; &I-K0-7A39; [90-25] - (=cns11643-1 . #x4D31) ; &I-C1-4D31; [45-17] - (=big5 . #xA9AF) ; &I-B-A9AF; - (=gt . 11561) ; &I-GT-11561; - (=gt-k . 03701) ; &I-GT-K03701; - (=gt-pj-1 . #x392C) ; &I-GT-11561; [25-12] - (=daikanwa . 09176) ; &I-M-09176; + (->subsumptive + ((shinjigen-2 . 2154) + (=jis-x0208 . #x392C) ; >-11561; [25-12] + (=ks-x1001 . #x7A39) ; &I-K0-7A39; [90-25] + (=gt . 11561) ; &I-GT-11561; + (=gt-k . 03701) ; &I-GT-K03701; + (=gt-pj-1 . #x392C) ; &I-GT-11561; [25-12] + (=daikanwa . 09176) ; &I-M-09176; + (=ucs@jis . #x5E78) ; >-11561; + ) + ((=gb2312 . #x5052) ; &C1-4D31; [48-50] + (=cns11643-1 . #x4D31) ; &I-C1-4D31; [45-17] + (=big5 . #xA9AF) ; &I-B-A9AF; + (=ucs@unicode . #x5E78) ; &C1-4D31; + )) )) (define-char '((ideographic-radical . 51) ; ⼲ diff --git a/lisp/utf-2000/Ideograph-R057-Bow.el b/lisp/utf-2000/Ideograph-R057-Bow.el index 710a28c..f8d1faa 100644 --- a/lisp/utf-2000/Ideograph-R057-Bow.el +++ b/lisp/utf-2000/Ideograph-R057-Bow.el @@ -202,14 +202,13 @@ '((ideographic-radical . 57) ; ⼸ (ideographic-strokes . 2) (total-strokes . 5) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 37) - (hanyu-dazidian-char . 4) - (<-original-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 09698) ; &I-M-09698; - ) + (<-original + ((=ucs . #x5F14) ; 弔 + (=daikanwa . 09698) ; &I-M-09698; )) + (<-original*sources + daikanwa) + (hanyu-dazidian 1 37 4) (=ucs . #x223A3) ; 𢎣 (=cns11643-6 . #x2322) ; &I-C6-2322; [03-02] (=big5-cdp . #x87DB) ; &I-CDP-87DB; diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el index 8a36069..ec1082c 100644 --- a/lisp/utf-2000/Ideograph-R061-Heart.el +++ b/lisp/utf-2000/Ideograph-R061-Heart.el @@ -16007,17 +16007,21 @@ '((ideographic-radical . 61) ; ⼼ (ideographic-strokes . 16) (total-strokes . 20) - (->synonyms - (:sources (seiji-tsuu morohashi-daikanwa) - :char ((=daikanwa . 11501) ; &I-M-11501; - ) + (->same + ((=jis-x0208 . #x5874) ; >-14505; [56-84] + (=ks-x1001 . #x6B73) ; &I-K0-6B73; [75-83] + (=daikanwa . 11501) ; &I-M-11501; )) - (<-original-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2743) - (=daikanwa . 11501) ; &I-M-11501; - ) + (->same*sources + zhengzi-tong daikanwa) + (<-original + ((shinjigen-1 . 2743) + (=jis-x0208 . #x5874) ; >-14505; [56-84] + (=ks-x1001 . #x6B73) ; &I-K0-6B73; [75-83] + (=daikanwa . 11501) ; &I-M-11501; )) + (<-original*sources + shinjigen-1) (shinjigen-1 . 2744) (=ucs . #x39A4) ; 㦤 (=cns11643-4 . #x6343) ; &I-C4-6343; [67-35] diff --git a/lisp/utf-2000/Ideograph-R063-Door.el b/lisp/utf-2000/Ideograph-R063-Door.el index a6f7bd9..8b0f6c4 100644 --- a/lisp/utf-2000/Ideograph-R063-Door.el +++ b/lisp/utf-2000/Ideograph-R063-Door.el @@ -117,50 +117,58 @@ (=daikanwa . 11704) ; &I-M-11704; )) (define-char - '((=>ucs . #x623B) ; 戻 - (ideographic-radical . 63) ; ⼾ - (ideographic-strokes . 3) - (total-strokes . 7) - (=cns11643-3 . #x2628) ; &M-11707; [06-08] - (=daikanwa . 11707) ; &I-M-11707; - )) -(define-char - '((=>ucs . #x623B) ; 戻 - (morohashi-daikanwa 11707 0 2) - (ideographic-radical . 63) ; ⼾ + '((ideographic-radical . 63) ; ⼾ (ideographic-strokes . 3) (total-strokes . 7) - (<-simplified@JP/Jouyou - ((=ks-x1001 . #x5568) ; &M-11712; [53-72] - (=cns11643-1 . #x4D53) ; &I-C1-4D53; [45-51] - (=jis-x0213-1-2000 . #x7463) ; &I-JX1-7463; [84-67] - (=daikanwa . 11712) ; &I-M-11712; + (=ucs . #x39BE) ; 㦾 + (->subsumptive + ((->subsumptive + ((=daikanwa . 11705) ; &M-11705; + ) + ((=cns11643-6 . #x276E) ; &C6-276E; [07-78] + )) + ) + ((=ucs@unicode . #x39BE) ; &UU+39BE; )) - (=jis-x0208 . #x4C61) ; >-14766; [44-65] - (=gt . 14766) ; &I-GT-14766; - (=gt-k . 02658) ; &I-GT-K02658; - (=gt-pj-1 . #x4C61) ; &I-GT-14766; [44-65] - (=ucs@jis . #x623B) ; >-14766; )) (define-char - '((morohashi-daikanwa 11707 0 4) - (ideographic-radical . 63) ; ⼾ + '((ideographic-radical . 63) ; ⼾ (ideographic-strokes . 3) (total-strokes . 7) - (hanyu-dazidian 3 2257 9) (=ucs . #x623B) ; 戻 - (=hanziku-6 . #xD2FB) ; &I-HZK06-D2FB; + (->subsumptive + ((=cns11643-3 . #x2628) ; &M-11707; [06-08] + (=daikanwa . 11707) ; &I-M-11707; + ) + ((<-simplified@JP/Jouyou + ((=ks-x1001 . #x5568) ; &M-11712; [53-72] + (=cns11643-1 . #x4D53) ; &I-C1-4D53; [45-51] + (=jis-x0213-1-2000 . #x7463) ; &I-JX1-7463; [84-67] + (=daikanwa . 11712) ; &I-M-11712; + )) + (=jis-x0208 . #x4C61) ; >-14766; [44-65] + (=gt . 14766) ; &I-GT-14766; + (=gt-k . 02658) ; &I-GT-K02658; + (=gt-pj-1 . #x4C61) ; &I-GT-14766; [44-65] + (=ucs@jis . #x623B) ; >-14766; + ) + ((hanyu-dazidian 3 2257 9) + (=hanziku-6 . #xD2FB) ; &HZK06-D2FB; + (=ucs@iso . #x623B) ; &HZK06-D2FB; + )) )) (define-char '((ideographic-radical . 63) ; ⼾ (ideographic-strokes . 3) (total-strokes . 7) - (<-original-ideograph + (<-original ((shinjigen-1 . 848) + (=ucs . #x536F) ; 卯 + (=jis-x0208 . #x312C) ; &I-J90-312C; [17-12] (=daikanwa . 02847) ; &I-M-02847; )) - (<-original-ideograph*sources - shinjigen-1) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 53 15) (shinjigen-1 . 849) (=ucs . #x623C) ; 戼 @@ -170,30 +178,23 @@ )) (define-char '((ideographic-radical . 63) ; ⼾ - (ideographic-strokes . 3) - (total-strokes . 7) - (=ucs . #x39BE) ; 㦾 - (=cns11643-6 . #x276E) ; &I-C6-276E; [07-78] - )) -(define-char - '((=>ucs . #x623D) ; 戽 - (ideographic-radical . 63) ; ⼾ - (ideographic-strokes . 4) - (total-strokes . 8) - (=jis-x0212 . #x3F32) ; &M-11711; [31-18] - (=cns11643-2 . #x2671) ; &I-C2-2671; [06-81] - (=big5 . #xCCB2) ; &I-B-CCB2; - (=daikanwa . 11711) ; &I-M-11711; - (=ucs@jis . #x623D) ; &M-11711; - (=ucs@big5 . #x623D) ; &M-11711; - )) -(define-char - '((morohashi-daikanwa 11711 0 4) - (ideographic-radical . 63) ; ⼾ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x623D) ; 戽 - (=gb2312 . #x6C66) ; &I-G0-6C66; [76-70] + (->subsumptive + ((->subsumptive + ((=jis-x0212 . #x3F32) ; &M-11711; [31-18] + (=big5 . #xCCB2) ; &I-B-CCB2; + (=daikanwa . 11711) ; &I-M-11711; + (=ucs@jis . #x623D) ; &M-11711; + (=ucs@big5 . #x623D) ; &M-11711; + ) + ((=cns11643-2 . #x2671) ; &C2-2671; [06-81] + )) + ) + ((=gb2312 . #x6C66) ; &G0-6C66; [76-70] + (=ucs@unicode . #x623D) ; &G0-6C66; + )) )) (define-char '((=>ucs . #x623E) ; 戾 diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index 39bcdda..24e805c 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -74,12 +74,12 @@ (=daikanwa . 11771) ; &I-M-11771; )) (define-char - '((=>daikanwa . 11772) ; >-14896; - (ideographic-radical . 64) ; ⼿ + '((ideographic-radical . 64) ; ⼿ (ideographic-strokes . 1) (total-strokes . 5) (<-original - ((=daikanwa . 05844) ; &I-M-05844; + ((=ucs . #x5931) ; 失 + (=daikanwa . 05844) ; &I-M-05844; )) (<-original*sources zhengzi-tong daikanwa) diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index c228bf9..6dda0b2 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -5303,39 +5303,46 @@ (=daikanwa . 14130) ; &I-M-14130; )) (define-char - '((=>ucs . #x66B1) ; 暱 - (ideographic-radical . 72) ; ⽇ - (ideographic-strokes . 11) - (total-strokes . 15) - (=daikanwa . 14132) ; &M-14132; - (=jef-china3 . #x51EA) ; &I-JC3-51EA; - )) -(define-char - '((morohashi-daikanwa 14132 0 1) - (ideographic-radical . 72) ; ⽇ - (ideographic-strokes . 11) - (total-strokes . 15) - (<-original-ideograph - ((shinjigen-1 . 3299) - (=jis-x0208 . #x5A63) ; &I-J90-5A63; [58-67] - (=daikanwa . 13866) ; &I-M-13866; - )) - (<-original-ideograph*sources - shinjigen-1) - (shinjigen-1 . 3300) - (shinjigen-2 . 3300) + '((ideographic-radical . 72) ; ⽇ (=ucs . #x66B1) ; 暱 - (=jis-x0212 . #x425A) ; &I-JSP-425A; [34-58] - (=jis-x0213-2-2000 . #x2E30) ; &I-JX2-2E30; [14-16] - (=big5 . #xBCCA) ; &I-B-BCCA; - )) -(define-char - '((=>ucs . #x66B1) ; 暱 - (morohashi-daikanwa 14132 0 2) - (ideographic-radical . 72) ; ⽇ - (ideographic-strokes . 11) - (total-strokes . 15) - (=cns11643-1 . #x6D34) ; &C1-6D34; [77-20] + (->subsumptive + ((ideographic-strokes . 11) + (total-strokes . 15) + (->same + ((=ucs . #x6635) ; 昵 + (=daikanwa . 13866) ; &I-M-13866; + )) + (->same*sources + shuowen daikanwa) + (->synonyms + ((=daikanwa . 00279) ; &I-M-00279; + )) + (->synonyms*sources + shuowen-tongxun-dingsheng daikanwa) + (=daikanwa . 14132) ; &M-14132; + (=jef-china3 . #x51EA) ; &I-JC3-51EA; + ) + ((ideographic-strokes . 10) + (total-strokes . 14) + (ideographic-strokes@jisx0213 . 11) + (=jis-x0212 . #x425A) ; &JX2-2E30; [34-58] + (=jis-x0213-2-2000 . #x2E30) ; &I-JX2-2E30; [14-16] + (=big5 . #xBCCA) ; &I-B-BCCA; + (=ucs@unicode . #x66B1) ; &JX2-2E30; + ) + ((ideographic-strokes . 11) + (total-strokes . 15) + (<-original + ((shinjigen-1 . 3299) + (=ucs . #x6635) ; 昵 + (=jis-x0208 . #x5A63) ; &I-J90-5A63; [58-67] + )) + (<-original*sources + shinjigen-1) + (shinjigen-1 . 3300) + (shinjigen-2 . 3300) + (=cns11643-1 . #x6D34) ; &C1-6D34; [77-20] + )) )) (define-char '((=>ucs . #x66B2) ; 暲 diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el index 2ae71c8..fbcfa93 100644 --- a/lisp/utf-2000/Ideograph-R073-Say.el +++ b/lisp/utf-2000/Ideograph-R073-Say.el @@ -315,6 +315,54 @@ (=cns11643-6 . #x4057) ; &C6-4057; [32-55] )) (define-char + '((ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@daikanwa*sources + daikanwa=01597 jisx0208/d) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@cns*sources + cns11643-1) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (=ucs . #x6700) ; 最 + (=big5 . #xB3CC) ; &I-B-B3CC; + )) +(define-char + '((ideographic-radical@daikanwa . 14) ; ⼍ + (ideographic-strokes@daikanwa . 10) + (ideographic-radical@cns . 13) ; ⼌ + (ideographic-strokes@cns . 10) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) + (total-strokes . 12) + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (<-original + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=daikanwa . 14301) ; &I-M-14301; + )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) + (hanyu-dazidian 2 1516 8) + (shinjigen-1 . 926) + (=cns11643-1 . #x5E32) ; &M-01597; [62-18] + (=daikanwa . 01597) ; &I-M-01597; + )) +(define-char '((=>ucs . #x66FE) ; 曾 (ideographic-radical . 73) ; ⽈ (ideographic-strokes . 8) @@ -375,26 +423,38 @@ (=cns11643-1 . #x5F65) ; &C1-5F65; [63-69] )) (define-char - '((=>ucs . #x6700) ; 最 - (ideographic-radical . 73) ; ⽈ - (ideographic-strokes . 8) - (total-strokes . 12) - (=jis-x0208 . #x3A47) ; >-18101; [26-39] - (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] - (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] - (=gt . 18101) ; &I-GT-18101; - (=gt-k . 09052) ; &I-GT-K09052; - (=gt-pj-1 . #x3A47) ; &I-GT-18101; [26-39] - (=daikanwa . 14301) ; &I-M-14301; - (=ucs@jis . #x6700) ; >-18101; - )) -(define-char - '((morohashi-daikanwa 14301 0 0) - (ideographic-radical . 73) ; ⽈ - (ideographic-strokes . 8) + '((=>ucs* . #x6700) ; 最 + (=>ucs@gb . #x6700) ; &G0-576E; + (=>ucs@jis . #x6700) ; >-18101; + (=>ucs@ks . #x6700) ; &G0-576E; + (ideographic-radical@ucs . 73) ; ⽈ + (ideographic-strokes@ucs . 8) + (ideographic-radical@ucs*sources + daikanwa=14301 jisx0208/c cns11643-6 ucs) + (ideographic-radical@shinjigen . 29) ; ⼜ + (ideographic-strokes@shinjigen . 10) + (ideographic-radical@shinjigen*sources + shinjigen-1 jisx0208/a jisx0208/b) (total-strokes . 12) - (=ucs . #x6700) ; 最 - (=gb2312 . #x576E) ; &I-G0-576E; [55-78] + (<-denotational + ((=ucs . #x6700) ; 最 + )) + (=ucs . #x2F8D4) ; 最 + (->subsumptive + ((shinjigen-1 . 925) + (=jis-x0208 . #x3A47) ; >-18101; [26-39] + (=ks-x1001 . #x754C) ; &I-K0-754C; [85-44] + (=cns11643-6 . #x4978) ; &I-C6-4978; [41-88] + (=gt . 18101) ; &I-GT-18101; + (=gt-k . 09052) ; &I-GT-K09052; + (=gt-pj-1 . #x3A47) ; &I-GT-18101; [26-39] + (=daikanwa . 14301) ; &I-M-14301; + (=ucs@iso . #x2F8D4) ; >-18101; + (=ucs@jis . #x6700) ; >-18101; + ) + ((=gb2312 . #x576E) ; &G0-576E; [55-78] + (=ucs@unicode . #x6700) ; &G0-576E; + )) )) (define-char '((=>ucs . #x6701) ; 朁 diff --git a/lisp/utf-2000/Ideograph-R077-Stop.el b/lisp/utf-2000/Ideograph-R077-Stop.el index ee28e22..c88c78a 100644 --- a/lisp/utf-2000/Ideograph-R077-Stop.el +++ b/lisp/utf-2000/Ideograph-R077-Stop.el @@ -788,26 +788,26 @@ (=hanziku-4 . #xD372) ; &I-HZK04-D372; )) (define-char - '((=>ucs . #x3C55) ; 㱕 - (ideographic-radical . 77) ; ⽌ - (ideographic-strokes . 8) - (total-strokes . 12) - (<-original-ideograph - ((shinjigen-1 . 3960) - (=daikanwa . 16349) ; &I-M-16349; - )) - (<-original-ideograph*sources - shinjigen-1) - (shinjigen-1 . 3961) - (=cns11643-3 . #x3C48) ; &M-16308; [28-40] - (=daikanwa . 16308) ; &I-M-16308; - )) -(define-char - '((morohashi-daikanwa 16308 0 1) - (ideographic-radical . 77) ; ⽌ + '((ideographic-radical . 77) ; ⽌ (ideographic-strokes . 8) (total-strokes . 12) (=ucs . #x3C55) ; 㱕 + (->subsumptive + ((<-original + ((shinjigen-1 . 3960) + (=jis-x0208 . #x5D45) ; >-20995; [61-37] + (=ks-x1001 . #x4F7D) ; &I-K0-4F7D; [47-93] + (=cns11643-1 . #x7657) ; &I-C1-7657; [86-55] + (=daikanwa . 16349) ; &I-M-16349; + )) + (<-original*sources + shinjigen-1) + (shinjigen-1 . 3961) + (=cns11643-3 . #x3C48) ; &M-16308; [28-40] + (=daikanwa . 16308) ; &I-M-16308; + ) + ((=ucs@unicode . #x3C55) ; &UU+3C55; + )) )) (define-char '((=>ucs . #x3C56) ; 㱖 diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index f2c1928..cbf0bd1 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -49,6 +49,9 @@ '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 1) (total-strokes . 5) + (<-vulgar + ((=ucs . #x51B0) ; 冰 + )) (shinjigen-1 . 4051) (shinjigen-2 . 4051) (=ucs . #x6C37) ; 氷 diff --git a/lisp/utf-2000/Ideograph-R093-Cow.el b/lisp/utf-2000/Ideograph-R093-Cow.el index 6951df4..84679b8 100644 --- a/lisp/utf-2000/Ideograph-R093-Cow.el +++ b/lisp/utf-2000/Ideograph-R093-Cow.el @@ -156,55 +156,43 @@ (=daikanwa . 19933) ; &I-M-19933; )) (define-char - '((=>ucs . #x7262) ; 牢 - (ideographic-radical . 93) ; ⽜ - (ideographic-strokes . 3) - (total-strokes . 7) - (shinjigen-2 . 4737) - (=jis-x0208 . #x4F34) ; >-25593; [47-20] - (=ks-x1001 . #x566F) ; &I-K0-566F; [54-79] - (=big5 . #xA863) ; &I-B-A863; - (=gt . 25593) ; &I-GT-25593; - (=gt-k . 02678) ; &I-GT-K02678; - (=gt-pj-1 . #x4F34) ; &I-GT-25593; [47-20] - (=daikanwa . 19934) ; &I-M-19934; - (=ucs@jis . #x7262) ; >-25593; - )) -(define-char - '((morohashi-daikanwa 19934 0 0) - (ideographic-radical . 93) ; ⽜ + '((ideographic-radical . 93) ; ⽜ (ideographic-strokes . 3) (total-strokes . 7) (=ucs . #x7262) ; 牢 - (=gb2312 . #x404E) ; &I-G0-404E; [32-46] - (=cns11643-1 . #x4B26) ; &I-C1-4B26; [43-06] - )) -(define-char - '((=>ucs . #x7263) ; 牣 - (ideographic-radical . 93) ; ⽜ - (ideographic-strokes . 3) - (total-strokes . 7) - (=daikanwa . 19935) ; &M-19935; - )) -(define-char - '((=>ucs . #x7263) ; 牣 - (morohashi-daikanwa 19935 0 0) - (ideographic-radical . 93) ; ⽜ - (ideographic-strokes . 3) - (total-strokes . 7) - (=cns11643-2 . #x2460) ; &C2-2460; [04-64] - (=big5 . #xCB60) ; &I-B-CB60; + (=big5 . #xA863) ; &I-B-A863; + (->subsumptive + ((shinjigen-2 . 4737) + (=jis-x0208 . #x4F34) ; >-25593; [47-20] + (=ks-x1001 . #x566F) ; &I-K0-566F; [54-79] + (=gt . 25593) ; &I-GT-25593; + (=gt-k . 02678) ; &I-GT-K02678; + (=gt-pj-1 . #x4F34) ; &I-GT-25593; [47-20] + (=daikanwa . 19934) ; &I-M-19934; + (=ucs@jis . #x7262) ; >-25593; + ) + ((=gb2312 . #x404E) ; &C1-4B26; [32-46] + (=cns11643-1 . #x4B26) ; &I-C1-4B26; [43-06] + (=ucs@unicode . #x7262) ; &C1-4B26; + )) )) (define-char - '((morohashi-daikanwa 19935 0 1) - (ideographic-radical . 93) ; ⽜ + '((ideographic-radical . 93) ; ⽜ (ideographic-strokes . 3) (total-strokes . 7) (=ucs . #x7263) ; 牣 - (=jis-x0212 . #x4A5B) ; &I-JSP-4A5B; [42-59] - (=iso-ir165 . #x7C44) ; &I-EGB-7C44; [92-36] - (=jis-x0213-2-2000 . #x7032) ; &I-JX2-7032; [80-18] - (=jef-china3 . #x58CC) ; &I-JC3-58CC; + (=big5 . #xCB60) ; &I-B-CB60; + (->subsumptive + ((=daikanwa . 19935) ; &M-19935; + ) + ((=cns11643-2 . #x2460) ; &C2-2460; [04-64] + ) + ((=jis-x0212 . #x4A5B) ; &JX2-7032; [42-59] + (=iso-ir165 . #x7C44) ; &I-EGB-7C44; [92-36] + (=jis-x0213-2-2000 . #x7032) ; &I-JX2-7032; [80-18] + (=jef-china3 . #x58CC) ; &I-JC3-58CC; + (=ucs@unicode . #x7263) ; &JX2-7032; + )) )) (define-char '((ideographic-radical . 93) ; ⽜ diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el index ba947ea..6932ed6 100644 --- a/lisp/utf-2000/Ideograph-R109-Eye.el +++ b/lisp/utf-2000/Ideograph-R109-Eye.el @@ -1320,10 +1320,11 @@ (ideographic-radical . 109) ; ⽬ (ideographic-strokes . 4) (total-strokes . 9) - (<-original-ideograph - ((=daikanwa . 01473) ; &I-M-01473; + (<-original + ((=ucs . #x2F811) ; 具 + (=daikanwa . 01473) ; &I-M-01473; )) - (<-original-ideograph*sources + (<-original*sources daikanwa) (=ucs . #x2F942) ; 𥃲 (=cns11643-6 . #x333D) ; &I-C6-333D; [19-29] @@ -2209,26 +2210,19 @@ '((ideographic-radical . 109) ; ⽬ (ideographic-strokes . 5) (total-strokes . 10) - (<-original-ideograph - ((=daikanwa . 23221) ; &I-M-23221; - )) - (<-original-ideograph*sources - daikanwa) (=ucs . #x7714) ; 眔 - (=daikanwa . 49364) ; &I-M-49364; - )) -(define-char - '((=>ucs . #x7714) ; 眔 - (morohashi-daikanwa 49364 0 0) - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 5) - (total-strokes . 10) - (<-original-ideograph - ((=daikanwa . 23221) ; &I-M-23221; + (->subsumptive + ((<-original + ((=jis-x0212 . #x4E5F) ; &M-23221; [46-63] + (=daikanwa . 23221) ; &I-M-23221; + )) + (<-original*sources + daikanwa) + (=daikanwa . 49364) ; &M-49364; + (=ucs@unicode . #x7714) ; &M-49364; + ) + ((=cns11643-4 . #x2E55) ; &C4-2E55; [14-53] )) - (<-original-ideograph*sources - daikanwa) - (=cns11643-4 . #x2E55) ; &C4-2E55; [14-53] )) (define-char '((ideographic-radical . 109) ; ⽬ diff --git a/lisp/utf-2000/Ideograph-R111-Arrow.el b/lisp/utf-2000/Ideograph-R111-Arrow.el index db809dd..fa18df7 100644 --- a/lisp/utf-2000/Ideograph-R111-Arrow.el +++ b/lisp/utf-2000/Ideograph-R111-Arrow.el @@ -115,19 +115,17 @@ (ideographic-strokes . 4) (total-strokes . 9) (=ucs . #x77E6) ; 矦 - (=jis-x0212 . #x4F46) ; &I-JSP-4F46; [47-38] - (=jis-x0213-2-2000 . #x7236) ; &I-JX2-7236; [82-22] - (=daikanwa . 23937) ; &I-M-23937; - (=jef-china3 . #x5BE9) ; &I-JC3-5BE9; - )) -(define-char - '((=>ucs . #x77E6) ; 矦 - (morohashi-daikanwa 23937 0 0) - (ideographic-radical . 111) ; ⽮ - (ideographic-strokes . 4) - (total-strokes . 9) - (=cns11643-3 . #x2E36) ; &CDP-8AC7; [14-22] - (=big5-cdp . #x8AC7) ; &I-CDP-8AC7; + (->subsumptive + ((=jis-x0212 . #x4F46) ; &M-23937; [47-38] + (=jis-x0213-2-2000 . #x7236) ; &I-JX2-7236; [82-22] + (=daikanwa . 23937) ; &I-M-23937; + (=jef-china3 . #x5BE9) ; &I-JC3-5BE9; + (=ucs@jis . #x77E6) ; &M-23937; + ) + ((=big5-cdp . #x8AC7) ; &CDP-8AC7; + ) + ((=cns11643-3 . #x2E36) ; &C3-2E36; [14-22] + )) )) (define-char '((ideographic-radical . 111) ; ⽮ diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index 3fe9fb6..317b704 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -13710,10 +13710,12 @@ )) (=ucs . #x2F970) ; 繅 (->subsumptive - ((<-original-ideograph - ((=daikanwa . 27854) ; &I-M-27854; + ((<-original + ((=jis-x0212 . #x5450) ; &M-27854; [52-48] + (=jis-x0213-2-2000 . #x7457) ; &I-JX2-7457; [84-55] + (=daikanwa . 27854) ; &I-M-27854; )) - (<-original-ideograph*sources + (<-original*sources zhengzi-tong daikanwa) (=daikanwa . 28007) ; &M-28007; ) diff --git a/lisp/utf-2000/Ideograph-R135-Tongue.el b/lisp/utf-2000/Ideograph-R135-Tongue.el index 945f9cc..5b87c30 100644 --- a/lisp/utf-2000/Ideograph-R135-Tongue.el +++ b/lisp/utf-2000/Ideograph-R135-Tongue.el @@ -3,34 +3,34 @@ '((ideographic-radical . 135) ; ⾆ (ideographic-strokes . 0) (total-strokes . 6) - (shinjigen-1 . 6628) - (shinjigen-2 . 6628) (=ucs . #x820C) ; 舌 - (=jis-x0208 . #x4065) ; &I-J90-4065; [32-69] - (=gb2312 . #x4960) ; &I-G0-4960; [41-64] - (=ks-x1001 . #x605F) ; &I-K0-605F; [64-63] - (=big5 . #xA6DE) ; &I-B-A6DE; - (=gt . 39171) ; &I-GT-39171; - (=gt-k . 01652) ; &I-GT-K01652; - (=gt-pj-1 . #x4065) ; &I-GT-39171; [32-69] - (=daikanwa . 30277) ; &I-M-30277; - (mojikyo . 030277) ; &MCS-60007645; - )) -(define-char - '((=>ucs . #x820C) ; 舌 - (morohashi-daikanwa 30277 0 1) - (ideographic-radical . 135) ; ⾆ - (ideographic-strokes . 0) - (total-strokes . 6) - (<-original-ideograph - (:sources (shinjigen-1) - :char ((=ucs . #x820C) ; 舌 - ) + (->subsumptive + ((shinjigen-1 . 6628) + (shinjigen-2 . 6628) + (=jis-x0208 . #x4065) ; >-39171; [32-69] + (=gb2312 . #x4960) ; &I-G0-4960; [41-64] + (=ks-x1001 . #x605F) ; &I-K0-605F; [64-63] + (=big5 . #xA6DE) ; &I-B-A6DE; + (=gt . 39171) ; &I-GT-39171; + (=gt-k . 01652) ; &I-GT-K01652; + (=gt-pj-1 . #x4065) ; &I-GT-39171; [32-69] + (=daikanwa . 30277) ; &I-M-30277; + (=ucs@unicode . #x820C) ; >-39171; + (mojikyo . 030277) ; &MCS-60007645; + ) + ((<-original + ((shinjigen-1 . 6628) + (=jis-x0208 . #x4065) ; >-39171; [32-69] + (=gb2312 . #x4960) ; &I-G0-4960; [41-64] + (=ks-x1001 . #x605F) ; &I-K0-605F; [64-63] + (=daikanwa . 30277) ; &I-M-30277; + )) + (<-original*sources + shinjigen-1) + (shinjigen-1 . 6629) + (=cns11643-1 . #x485F) ; &C1-485F; [40-63] + (mojikyo . 075115) ; &MCS-6001256B; )) - (ideograph-cdp . 31451) - (shinjigen-1 . 6629) - (=cns11643-1 . #x485F) ; &C1-485F; [40-63] - (mojikyo . 075115) ; &MCS-6001256B; )) (define-char '((ideographic-radical . 135) ; ⾆ diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 1ef282c..1feb777 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -979,56 +979,65 @@ (=daikanwa . 30683) ; &I-M-30683; )) (define-char - '((=>ucs . #x8293) ; 芓 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 3) - (total-strokes . 7) - (=cns11643-2 . #x247E) ; &M-30684; [04-94] - (=daikanwa . 30684) ; &I-M-30684; - )) -(define-char - '((morohashi-daikanwa 30684 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) - (total-strokes . 6) (=ucs . #x8293) ; 芓 - (=jis-x0213-2-2000 . #x757C) ; &I-JX2-757C; [85-92] - (=big5 . #xCB7E) ; &I-B-CB7E; + (->subsumptive + ((total-strokes . 7) + (=cns11643-2 . #x247E) ; &M-30684; [04-94] + (=daikanwa . 30684) ; &I-M-30684; + ) + ((total-strokes . 6) + (=jis-x0213-2-2000 . #x757C) ; &JX2-757C; [85-92] + (=big5 . #xCB7E) ; &I-B-CB7E; + (=ucs@unicode . #x8293) ; &JX2-757C; + )) )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 9) - (<-original-ideograph - ((shinjigen-1 . 816) - (=daikanwa . 02706) ; &I-M-02706; - )) - (<-original-ideograph*sources - shinjigen-1) - (shinjigen-1 . 817) (=ucs . #x8294) ; 芔 - (=jis-x0212 . #x5738) ; &I-JSP-5738; [55-24] - (=cns11643-2 . #x2D2D) ; &I-C2-2D2D; [13-13] (=big5 . #xD06A) ; &I-B-D06A; - (=daikanwa . 30685) ; &I-M-30685; - (=jef-china3 . #x45C1) ; &I-JC3-45C1; - )) -(define-char - '((=>ucs . #x8295) ; 芕 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 3) - (total-strokes . 7) - (hanyu-dazidian 5 3176 1) - (=cns11643-3 . #x272B) ; &M-30686; [07-11] - (=daikanwa . 30686) ; &I-M-30686; - (=hanziku-8 . #xE7F8) ; &I-HZK08-E7F8; + (->subsumptive + ((->same + ((=ucs . #x2F82C) ; 卉 + (=daikanwa . 02720) ; &I-M-02720; + )) + (->same*sources + shuowen zihui daikanwa) + (<-original + ((shinjigen-1 . 816) + (=ucs . #x5349) ; 卉 + (=jis-x0208 . #x5243) ; &I-J90-5243; [50-35] + (=daikanwa . 02706) ; &I-M-02706; + )) + (<-original*sources + daikanwa shinjigen-1) + (shinjigen-1 . 817) + (=jis-x0212 . #x5738) ; &M-30685; [55-24] + (=cns11643-2 . #x2D2D) ; &I-C2-2D2D; [13-13] + (=daikanwa . 30685) ; &I-M-30685; + (=jef-china3 . #x45C1) ; &I-JC3-45C1; + (=ucs@jis . #x8294) ; &M-30685; + ) + ((=ucs@unicode . #x8294) ; &UU+8294; + )) )) (define-char - '((morohashi-daikanwa 30686 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) - (total-strokes . 6) (=ucs . #x8295) ; 芕 + (->subsumptive + ((total-strokes . 7) + (hanyu-dazidian 5 3176 1) + (=cns11643-3 . #x272B) ; &M-30686; [07-11] + (=daikanwa . 30686) ; &I-M-30686; + (=hanziku-8 . #xE7F8) ; &I-HZK08-E7F8; + ) + ((total-strokes . 6) + (=ucs@unicode . #x8295) ; &UU+8295; + )) )) (define-char '((ideographic-radical . 140) ; ⾋ diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el index 198126e..8460e6b 100644 --- a/lisp/utf-2000/Ideograph-R145-Clothes.el +++ b/lisp/utf-2000/Ideograph-R145-Clothes.el @@ -65,27 +65,25 @@ (=cns11643-5 . #x2766) ; &I-C5-2766; [07-70] )) (define-char - '((=>ucs . #x461A) ; 䘚 - (ideographic-radical . 145) ; ⾐ - (ideographic-strokes . 2) - (total-strokes . 8) - (<-original-ideograph - (:sources (seiji-tsuu morohashi-daikanwa shinjigen-1) - :char ((ideographic-radical . 24) ; ⼗ - (shinjigen-1 . 823) - (=daikanwa . 02740) ; &I-M-02740; - ) - )) - (shinjigen-1 . 823) - (=daikanwa . 34094) ; &M-34094; - )) -(define-char - '((morohashi-daikanwa 34094 0 0) - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 2) (total-strokes . 8) (=ucs . #x461A) ; 䘚 - (=cns11643-3 . #x2A6E) ; &I-C3-2A6E; [10-78] + (->subsumptive + ((<-original + ((shinjigen-1 . 823) + (=jis-x0208 . #x4234) ; >-03504; [34-20] + (=ks-x1001 . #x706F) ; &I-K0-706F; [80-79] + (=daikanwa . 02740) ; &I-M-02740; + )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) + (shinjigen-1 . 823) + (=daikanwa . 34094) ; &M-34094; + ) + ((=cns11643-3 . #x2A6E) ; &C3-2A6E; [10-78] + (=ucs@unicode . #x461A) ; &C3-2A6E; + )) )) (define-char '((ideographic-radical . 145) ; ⾐ @@ -2568,18 +2566,27 @@ (=cns11643-4 . #x3530) ; &C4-3530; [21-16] )) (define-char - '((=>ucs . #x88D7) ; 裗 - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ + (=ucs . #x88D7) ; 裗 + (=big5 . #xDBC4) ; &I-B-DBC4; + )) +(define-char + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 6) (total-strokes . 12) - (<-original-ideograph - (:sources (seiji-tsuu morohashi-daikanwa) - :char ((=daikanwa . 34310) ; &I-M-34310; - ) + (<-denotational + ((=ucs . #x88D7) ; 裗 + )) + (<-original + ((=daikanwa . 34310) ; &M-34310; + )) + (<-original*sources + zhengzi-tong daikanwa) + (->subsumptive + ((=daikanwa . 34265) ; &M-34265; + ) + ((=cns11643-2 . #x402A) ; &C2-402A; [32-10] )) - (=cns11643-2 . #x402A) ; &M-34265; [32-10] - (=big5 . #xDBC4) ; &I-B-DBC4; - (=daikanwa . 34265) ; &I-M-34265; )) (define-char '((ideographic-radical . 145) ; ⾐ @@ -3371,9 +3378,16 @@ '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 7) (total-strokes . 13) - (=ucs . #x88D7) ; 裗 - (=cns11643-6 . #x582E) ; &I-C6-582E; [56-14] - (=daikanwa . 34310) ; &I-M-34310; + (<-denotational + ((=ucs . #x88D7) ; 裗 + )) + (->subsumptive + ((=daikanwa . 34310) ; &M-34310; + ) + ((=ucs@unicode . #x88D7) ; &UU+88D7; + ) + ((=cns11643-6 . #x582E) ; &C6-582E; [56-14] + )) )) (define-char '((=>ucs . #x27689) ; 𧚉 diff --git a/lisp/utf-2000/Ideograph-R156-Run.el b/lisp/utf-2000/Ideograph-R156-Run.el index c9d8639..fc9acf3 100644 --- a/lisp/utf-2000/Ideograph-R156-Run.el +++ b/lisp/utf-2000/Ideograph-R156-Run.el @@ -36,10 +36,11 @@ '((ideographic-radical . 156) ; ⾛ (ideographic-strokes . 0) (total-strokes . 8) - (<-original-ideograph - ((=daikanwa . 37034) ; &I-M-37034; + (<-original + ((=ucs . #x8D70) ; 走 + (=daikanwa . 37034) ; &I-M-37034; )) - (<-original-ideograph*sources + (<-original*sources kangxi daikanwa) (=cns11643-6 . #x2E32) ; &M-37035; [14-18] (=daikanwa . 37035) ; &I-M-37035; diff --git a/lisp/utf-2000/Ideograph-R158-Body.el b/lisp/utf-2000/Ideograph-R158-Body.el index ef8ff79..a3e5474 100644 --- a/lisp/utf-2000/Ideograph-R158-Body.el +++ b/lisp/utf-2000/Ideograph-R158-Body.el @@ -1,27 +1,24 @@ ;; -*- coding: utf-8-mcs-er -*- (define-char - '((=>ucs . #x8EAB) ; 身 - (ideographic-radical . 158) ; ⾝ - (ideographic-strokes . 0) - (total-strokes . 7) - (shinjigen-2 . 8101) - (=jis-x0208 . #x3F48) ; >-50811; [31-40] - (=ks-x1001 . #x6373) ; &I-K0-6373; [67-83] - (=cns11643-1 . #x4B4E) ; &I-C1-4B4E; [43-46] - (=big5 . #xA8AD) ; &I-B-A8AD; - (=gt . 50811) ; &I-GT-50811; - (=gt-k . 02583) ; &I-GT-K02583; - (=gt-pj-1 . #x3F48) ; &I-GT-50811; [31-40] - (=daikanwa . 38034) ; &I-M-38034; - (=ucs@jis . #x8EAB) ; >-50811; - )) -(define-char - '((morohashi-daikanwa 38034 0 0) - (ideographic-radical . 158) ; ⾝ + '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 0) (total-strokes . 7) (=ucs . #x8EAB) ; 身 - (=gb2312 . #x496D) ; &I-G0-496D; [41-77] + (->subsumptive + ((shinjigen-2 . 8101) + (=jis-x0208 . #x3F48) ; >-50811; [31-40] + (=ks-x1001 . #x6373) ; &I-K0-6373; [67-83] + (=cns11643-1 . #x4B4E) ; &I-C1-4B4E; [43-46] + (=big5 . #xA8AD) ; &I-B-A8AD; + (=gt . 50811) ; &I-GT-50811; + (=gt-k . 02583) ; &I-GT-K02583; + (=gt-pj-1 . #x3F48) ; &I-GT-50811; [31-40] + (=daikanwa . 38034) ; &I-M-38034; + (=ucs@jis . #x8EAB) ; >-50811; + ) + ((=gb2312 . #x496D) ; &G0-496D; [41-77] + (=ucs@unicode . #x8EAB) ; &G0-496D; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ diff --git a/lisp/utf-2000/Ideograph-R213-Turtle.el b/lisp/utf-2000/Ideograph-R213-Turtle.el index 5d921c1..725e368 100644 --- a/lisp/utf-2000/Ideograph-R213-Turtle.el +++ b/lisp/utf-2000/Ideograph-R213-Turtle.el @@ -71,27 +71,27 @@ (=jis-x0208-1978 . #x737D) ; &J78-737D; [83-93] )) (define-char - '((=>ucs . #x9F9C) ; 龜 - (ideographic-radical . 213) ; ⿔ - (ideographic-strokes . 0) - (total-strokes . 15) - (<-original-ideograph - ((shinjigen-1 . 9918) - (=daikanwa . 48847) ; &I-M-48847; - )) - (<-original-ideograph*sources - zhengzi-tong daikanwa shinjigen-1) - (shinjigen-1 . 9919) - (=cns11643-7 . #x2C3A) ; &M-48848; [12-26] - (=daikanwa . 48848) ; &I-M-48848; - )) -(define-char - '((morohashi-daikanwa 48848 0 1) - (ideographic-radical . 213) ; ⿔ + '((ideographic-radical . 213) ; ⿔ (ideographic-strokes . 0) (total-strokes . 15) (=ucs . #x9F9C) ; 龜 - (=gb12345 . #x396A) ; 龜 [25-74] + (->subsumptive + ((<-original + ((shinjigen-1 . 9918) + (=jis-x0208-1983 . #x737D) ; >-66712; [83-93] + (=ks-x1001 . #x4F4F) ; &I-K0-4F4F; [47-47] + (=jis-x0208-1990 . #x737D) ; &I-J90-737D; [83-93] + (=daikanwa . 48847) ; &I-M-48847; + )) + (<-original*sources + zhengzi-tong daikanwa shinjigen-1) + (shinjigen-1 . 9919) + (=cns11643-7 . #x2C3A) ; &M-48848; [12-26] + (=daikanwa . 48848) ; &I-M-48848; + ) + ((=gb12345 . #x396A) ; &UU+9F9C; [25-74] + (=ucs@unicode . #x9F9C) ; &UU+9F9C; + )) )) (define-char '((ideographic-radical . 213) ; ⿔ diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 14dbb65..d0e521a 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -73,7 +73,7 @@ (defvar char-db-feature-domains '(ucs daikanwa cns gt jis jis/alt jis/a jis/b - jis-x0213 cdp misc unknown)) + jis-x0213 cdp shinjigen misc unknown)) (defvar char-db-ignored-attributes nil) @@ -952,6 +952,7 @@ (string-match "^<-same" (symbol-name name)) (string-match "^->vulgar" (symbol-name name)) (string-match "^->wrong" (symbol-name name)) + (string-match "^->original" (symbol-name name)) )) ) ((or (eq name 'ideographic-structure) diff --git a/src/ChangeLog b/src/ChangeLog index d34843f..b3605ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2004-06-19 MORIOKA Tomohiko + + * chartab.c (Fput_char_attribute): Convert char-specs in value of + `{<-|->}original[^*]*' to characters and put reverse links. + (Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' + for `{<-|->}original[^*]*'. + +2004-06-14 MORIOKA Tomohiko + + * mule-canna.c (m2c): Fix problem with XEmacs CHISE. + 2004-06-04 MORIOKA Tomohiko * mule-charset.c (Qsystem_char_id): New variable. @@ -31,7 +42,7 @@ 2004-04-26 MORIOKA Tomohiko - * chartab.c (Fput_char_attribute): Convert char-refs in value of + * chartab.c (Fput_char_attribute): Convert char-specs in value of `{<-|->}wrong[^*]*' to characters and put reverse links. (Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' for `{<-|->}wrong[^*]*'. @@ -40,7 +51,7 @@ * chartab.c (Q_vulgar): New variable. (Q_vulgar_of): New variable. - (Fput_char_attribute): Convert char-refs in value of + (Fput_char_attribute): Convert char-specs in value of `{->|<-}vulgar' to characters and put reverse links. (Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' for `{->|<-}vulgar'. @@ -100,8 +111,8 @@ * chartab.c (Q_same): New variable. (Q_same_of): New variable. - (Fput_char_attribute): Convert char-refs in value of `{->|<-}same' - to characters and put reverse links. + (Fput_char_attribute): Convert char-specs in value of + `{->|<-}same' to characters and put reverse links. (Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' for `{->|<-}same'. (syms_of_chartab): Add new symbols `{->|<-}same'. @@ -110,7 +121,7 @@ * chartab.c (Q_component): New variable. (Q_component_of): Likewise. - (Fput_char_attribute): Convert char-refs in value of + (Fput_char_attribute): Convert char-specs in value of `{->|<-}ideographic-component-forms' to characters and put reverse links. (syms_of_chartab): Add new symbols @@ -147,7 +158,7 @@ 2004-02-08 MORIOKA Tomohiko - * chartab.c (Fput_char_attribute): Convert char-refs in value of + * chartab.c (Fput_char_attribute): Convert char-specs in value of `<-simplified[^*]*' to characters and put reverse links. 2004-02-05 MORIOKA Tomohiko diff --git a/src/chartab.c b/src/chartab.c index 6fa3be2..7746288 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -3511,6 +3511,7 @@ Store CHARACTER's ATTRIBUTE with VALUE. !NILP (Fstring_match (build_string ("^\\(<-\\|->\\)\\(simplified" "\\|same\\|vulgar\\|wrong" + "\\|original" "\\)[^*]*$"), Fsymbol_name (attribute), Qnil, Qnil)) ) @@ -3834,6 +3835,7 @@ Save values of ATTRIBUTE into database file. || !NILP (Fstring_match (build_string ("^\\(<-\\|->\\)\\(simplified" "\\|same\\|vulgar\\|wrong" + "\\|original" "\\)[^*]*$"), Fsymbol_name (attribute), Qnil, Qnil)) ) -- 1.7.10.4