From: tomo Date: Sat, 5 Jun 2004 07:11:08 +0000 (+0000) Subject: Sync up with r21-4-14-chise-0_21-26-si-vulgar. X-Git-Tag: r21-4-14-u2km-0_21-26-si-vulgar X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e41915e709e6fdac3b4c3bb2fb7a825795617592;p=chise%2Fxemacs-chise.git- Sync up with r21-4-14-chise-0_21-26-si-vulgar. --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 2f364cb..9b29a51 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,355 @@ +2004-04-26 MORIOKA Tomohiko + + * Ideograph-R160-Bitter.el (U+8F9E): Changed to abstract + character. + (M-38638): Add `<-denotational' for U+8F9E; use + `<-vulgar@{jiyun|zhengzi-tong}' instead of + `<-vulgar-ideograph@{jiyun|zhengzi-tong}'; use `->subsumptive' to + integrate G0-3447. + + * Ideograph-R135-Tongue.el (M-30307): Moved into U-0002F98D; use + `->identical' instead of `->same' for M-38638; use + `<-vulgar@{jiyun|zhengzi-tong}' instead of `<-vulgar'. + (U-0002F98D): Use `->subsumptive'; use `<-denotational' for + U+8F9E. + + * Ideograph-R086-Fire.el (U-00024183): Use `->subsumptive'. + (U+3DA1): Likewise. + (G0-3B52): Use `<-denotational' for U+7070; use `->subsumptive' to + integrate C1-4848. + (U+7070): Define as an abstract character. + (J0-3325): Use `<-denotational' for U+7070; moved into U-0002F835; + use `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U-0002F835): Use `->subsumptive'; use `<-denotational' for + U+7070. + (U-000241BD): Use `->subsumptive'. + (U-000241BE): Likewise. + (U+3DAD): Likewise. + (J0-433A): Use `<-denotational' for U+70AD; use `->subsumptive' to + integrate C1-5237. + (U+70AD): Define as an abstract character. + (G0-4C3F): Use `<-denotational' for U+70AD; use `->subsumptive' to + integrate U-0002F91A. + +2004-04-25 MORIOKA Tomohiko + + * Ideograph-R177-Leather.el (J90-7057): Moved into U+9771; use + `<-vulgar@{ruijumyougishou|tongwen-tongkao}' instead of + `<-vulgar'. + (U+9771): Use `->subsumptive'. + (J78-3F59): Moved into U+9771. + + * Ideograph-R140-Grass.el (C1-6637): Moved into U+843C. + (U+843C): Use `->subsumptive'. + (C3-5258): Moved into U+855A. + (U+855A): Use `->subsumptive'. + +2004-04-24 MORIOKA Tomohiko + + * Ideograph-R205-Frog.el (U+9EFE): Use `=>daikanwa' instead of + `morohashi-daikanwa'. + + * Ideograph-R189-Tall.el (M-45314): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'; moved into U+9AD9. + (U+9AD9): Use `->subsumptive'. + + * Ideograph-R030-Mouth.el (U+9EFE): Use `=>daikanwa' instead of + `morohashi-daikanwa'. + + * Ideograph-R096-Jade.el (U+73CE): Use `->subsumptive'; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (J90-605F): Moved into U+73CE. + +2004-04-24 MORIOKA Tomohiko + + * Ideograph-R102-Field.el (U-000200BD): Use + `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead of `ideographic-'; use + `->vulgar' and `->vulgar*sources' instead of `->vulgar-ideograph'. + + * read-maps.el (mapping-table-read-file): Don't add `=>ucs' if a + character's ancestors have `=>ucs'. + +2004-04-23 MORIOKA Tomohiko + + * Ideograph-R004-Slash.el (U+4E46): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'; add `<-wrong' for U+4E45. + (U-000200BD): Use `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead of `ideographic-'; use + `->vulgar' and `->vulgar*sources' instead of `->vulgar-ideograph'. + + * Ideograph-R079-Weapon.el (J0-3B26): Use `<-denotational' for + U+6BBA; use `->subsumptive' to integrate B-B1FE. + (G1-4931): Separate U+6BBA; use `<-denotational' for U+6BBA; use + `=>daikanwa' instead of `morohashi-daikanwa'. + (U-0002F8F5): use `<-denotational' for U+6BBA; use `=>daikanwa' + instead of `morohashi-daikanwa'. + (U+6BBA): Define as an abstract character. + (K0-5F2F): Use `<-denotational' for U+6BBA; use `->subsumptive' to + integrate U+F970 and C1-5B44. + + * Ideograph-R085-Water.el (M-18520): Use `<-denotational' for + U+701E; use `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (J90-4654): Separate U+701E; use `<-denotational' for U+701E; use + `->subsumptive' to integrate U-0002F914; use `=>daikanwa' instead + of `morohashi-daikanwa'. + (U+701E): Define as an abstract character. + (J78-4654): Use `<-denotational' for U+701E; use `->subsumptive' + to integrate C3-5A52. + + * Ideograph-R053-Dotted-Cliff.el (JSP-3C4A): Moved into U+5EAC; + use `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U+5EAC): Use `->subsumptive'. + (U-00022220): Use `->subsumptive'. + (U+5ED0): Define as an abstract character. + (J0-567D): Use `<-denotational' for U+5ED0; use `<-vulgar*sources' + instead of char-ref in `<-vulgar'; use `->subsumptive' to + integrate with C3-4660 and K0-4F2A. + (GT-11901): Use `<-denotational' for U+5ED0; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'; use + `->subsumptive' to integrate with CB00636. + (U+3893): Use `->subsumptive'. + + * char-db-util.el (insert-char-attributes): Insert `->simplified' + and `->vulgar' if they have their meta-data `*sources' even if + non-printable mode. + +2004-04-22 MORIOKA Tomohiko + + * Ideograph-R018-Knife.el (U+5226): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + (U+5227): Likewise. + (U+5231): Use `->subsumptive'. + (C2-2554): Moved into U+5231. + (JSP-333A): Likewise. + (C3-2B43): Moved into U+524F; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (J0-516C): Likewise. + (U+524F): Use `->subsumptive'. + (U+5259): Use `->subsumptive'; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (C3-2F62): Moved into U+5259. + (U+5265): Add `->same' for U+525D; use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + (J0-5179): Moved into U+5294; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (U+5294): Use `->subsumptive'. + +2004-04-21 MORIOKA Tomohiko + + * Ideograph-R058-Snout.el (C3-224A): Moved into U+5F52; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U+5F52): Use `->subsumptive'. + + * Ideograph-R036-Evening.el (U+5918): Add `->mistakable' for + M-02843 and M-02847; add `->same' for U+5917; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (JSP-3869): Moved into U+5923; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (U+5923): Use `->subsumptive'. + (C3-405F): Moved into U+5923. + + * Ideograph-R040-Roof.el (U+5BC3): Separate C3-3541; define as an + abstract character. + (J83-5563): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'; use `<-denotational' for U+5BC3; use `->subsumptive' + to integrate with C3-3541. + (J78-5563): Use `<-denotational' for U+5BC3. + (K0-6A32): Likewise. + (JC3-4AB8): Moved into U-0002F86D. + (U-0002F86D): Use `<-denotational' for U+5BC3; use + `->subsumptive'. + (U+5BC4): Use `->subsumptive'. + + * Ideograph-R015-Ice.el (U-000205B1): Use `<-vulgar*sources' + instead of char-ref in `<-vulgar'. + (U+51B2): Likewise. + (U+51B3): Likewise; use `->subsumptive'. + (C3-227D): Moved into U+51B3. + (U+51B5): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'. + (J0-515A): Likewise; moved into U+51C9. + (U+51C9): Use `->subsumptive'. + (J0-5245): Moved into U+51D6; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (U+51D6): Use `->subsumptive'. + (U+34D5): Use `->subsumptive'. + (J83-515B): Moved into U+51DB. + (C3-4B30): Likewise. + (J90-515B): Likewise. + (U+51DB): Use `->subsumptive'. + +2004-04-20 MORIOKA Tomohiko + + * Ideograph-R024-Ten.el (U+5346): Use `<-vulgar*sources' and + `<-wrong-ideograph*sources' instead of char-refs in `<-vulgar' and + `<-wrong-ideograph'. + (U-00020991): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'. + (U+5351): Define as an abstract character. + (U+FA35): Use `<-denotational' for U+5351. + (J0-485C): Likewise. + (U-000209A4): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'; add `<-simplified@misc' for U+55AE. + + * Ideograph-R019-Power.el (J0-387A): Moved into U+52B9. + (U+52B9): Use `->subsumptive'. + (G0-5342): Separate U+52C7; use `<-denotational' for U+52C7; use + `->subsumptive'. + (C1-502D): Integrate with G0-5342. + (U+52C7): Separate all CCS features. + (J0-4D26): Use `<-denotational' for U+52C7. + (U+52D6): Use `->subsumptive'. + (JC3-44EC): Moved into U+52D6. + (M-02392): Moved into U+52D7. + (U+52D7): Use `->subsumptive'. + (K0-632D): Moved into U+52DD; modify `ideographic-structure'. + (U+52DD): Use `->subsumptive'. + (U-0002F827): Add `<-denotational' for U+52E4. + (U+52E4): Define as an abstract character. + (U+FA34): Add `<-denotational' for U+52E4. + (J0-342B): Moved into U+52E7. + (U+52E7): Use `->subsumptive'. + + * Ideograph-R028-Private.el (U+53C5): Use `<-vulgar*sources' + instead of char-ref in `<-vulgar'. + + * Ideograph-R017-Open-Box.el (U+51FD): Use `->subsumptive'. + (U+51FE): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'; unify C3-275A. + + * Ideograph-R014-Cover.el (U-0002F817): Use `=>daikanwa' instead + of `morohashi-daikanwa'; add `=>ucs*' for U+5197; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U+51A8): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'. + +2004-04-19 MORIOKA Tomohiko + + * Ideograph-R050-Turban.el (J0-3B54): Moved into U+5E02. + (U+5E02): Use `->subsumptive'. + + * Ideograph-R038-Woman.el (U+5973): Use `->subsumptive'. + (C1-444C): Moved into U+5973. + (U+59C9): Use `->subsumptive'; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (K0-6D2B): Moved into U+59C9. + (C3-283F): Likewise. + + * Ideograph-R075-Tree.el (U+681F): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + + * Ideograph-R073-Say.el (U+52D7): Use `->subsumptive'; moved into + Ideograph-R019-Power.el. + + * Ideograph-R030-Mouth.el (U+5451): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + (J78-4A2E): Moved into U+5674. + (U+5674): Use `->subsumptive'. + + * Ideograph-R026-Seal.el (U-0002007E): Use + `ideographic-{radical|strokes}@{ucs|daikanwa}' instead of + `ideographic-'; use `hanyu-dazidian' instead of + `hanyu-dazidian-{vol|page|char}'. + (C6-3D59): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'; moved into U-0002F831; add `<-denotational' for + U+537F. + (U+537F): Separate all CCS features. + (G0-4764): Separate U+537F; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'; add `<-denotational' for U+537F. + (C6-3D5A): Unify U-0002F832; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'; add `<-denotational' for U+537F. + (U-0002F833): Add `<-denotational' for U+537F. + (J78-362A): Likewise. + + * Ideograph-R037-Big.el (U-00021641): Use `<-vulgar*sources' + instead of char-ref in `<-vulgar'. + + * Ideograph-R027-Cliff.el (U+53A0): Use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + (M-02993): Moved into U+53A6. + (C3-3A28): Likewise. + (U+53A6): Use `->subsumptive'; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (U+53A8): Use `<-vulgar*sources' instead of char-ref in + `<-vulgar'. + (U+53AE): Likewise. + (M-03033): Likewise; moved into U+3551. + (U+3551): Use `->subsumptive'. + (J0-5252): Moved into U+53B0; use `<-vulgar*sources' instead of + char-ref in `<-vulgar'. + (U+53B0): Use `->subsumptive'. + +2004-04-18 MORIOKA Tomohiko + + * Ideograph-R029-Again.el (U+53CE): Delete `=>daikanwa'. + + * Ideograph-R016-Table.el (U+51E1): Use `->subsumptive'. + (GT-K00368): Use `=>daikanwa' instead of `morohashi-daikanwa'. + (GT-K00369): Likewise. + + * Ideograph-R009-Man.el (U+4EEE): Separate all CCS features. + (J0-323E): Use `<-denotational' for U+4EEE. + (H1-BD6F): Likewise. + (M-00703): Moved into U+4FDE. + (U+4FDE): Use `->subsumptive'. + (C1-4F7E): Moved into U+4FDE. + (B-AB5C): Likewise. + + * Ideograph-R020-Wrap.el (JSP-337B): Moved into U+5300; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U+5300): Use `->subsumptive'. + + * Ideograph-R022-Right-Open-Box.el (U+531D): Use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + + * Ideograph-R008-Lid.el (M-00316): Moved into U-00020158; use + `<-vulgar*sources' instead of char-ref in `<-vulgar'. + (U-00020158): Use `->subsumptive'. + (M-00317): Moved into U-00020159; use `<-vulgar*sources' instead + of char-ref in `<-vulgar'. + (U-00020159): Use `->subsumptive'. + + * Ideograph-R001-One.el (G0-3373): Add `<-vulgar*sources'. + + * char-db-util.el (insert-char-attributes): Don't display + `->vulgar' when running with non-readable mode; Add some CCSs + corresponding with shinjigen-1 specified in {<-|->}FOO*sources + into required-features. + + * Ideograph-R003-Dot.el (U+51E1): Moved to + Ideograph-R016-Table.el. + (U-0002007E): Use `ideographic-{radical|strokes}@{ucs|daikanwa}' + instead of `ideographic-'; use `hanyu-dazidian' instead of + `hanyu-dazidian-{vol|page|char}'. + +2004-04-16 MORIOKA Tomohiko + + * Ideograph-R213-Turtle.el, Ideograph-R189-Tall.el, + Ideograph-R205-Frog.el, Ideograph-R177-Leather.el, + Ideograph-R165-Distinguish.el, Ideograph-R140-Grass.el, + Ideograph-R135-Tongue.el, Ideograph-R118-Bamboo.el, + Ideograph-R113-Spirit.el, Ideograph-R112-Stone.el, + Ideograph-R106-White.el, Ideograph-R096-Jade.el, + Ideograph-R086-Fire.el, Ideograph-R085-Water.el, + Ideograph-R079-Weapon.el, Ideograph-R075-Tree.el, + Ideograph-R072-Sun.el, Ideograph-R061-Heart.el, + Ideograph-R058-Snout.el, Ideograph-R053-Dotted-Cliff.el, + Ideograph-R044-Corpse.el, Ideograph-R040-Roof.el, + Ideograph-R038-Woman.el, Ideograph-R037-Big.el, + Ideograph-R036-Evening.el, Ideograph-R030-Mouth.el, + Ideograph-R029-Again.el, Ideograph-R028-Private.el, + Ideograph-R027-Cliff.el, Ideograph-R026-Seal.el, + Ideograph-R022-Right-Open-Box.el, Ideograph-R024-Ten.el, + Ideograph-R020-Wrap.el, Ideograph-R019-Power.el, + Ideograph-R018-Knife.el, Ideograph-R017-Open-Box.el, + Ideograph-R016-Table.el, Ideograph-R015-Ice.el, + Ideograph-R014-Cover.el, Ideograph-R013-Down-Box.el, + Ideograph-R012-Eight.el, Ideograph-R009-Man.el, + Ideograph-R006-Hook.el, Ideograph-R008-Lid.el, + Ideograph-R005-Second.el, Ideograph-R004-Slash.el, + Ideograph-R001-One.el: Rename `<-vulgar-ideograph' to `<-vulgar'. + 2004-04-16 MORIOKA Tomohiko * Ideograph-R164-Wine.el (J0-3D39): Moved into U+919C. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 85ab6b1..e0f2cd8 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -652,9 +652,15 @@ ((<-simplified@CN ((=gb12345 . #x3373) ; &UU+919C; )) - (<-vulgar-ideograph - ((=daikanwa . 00023) ; &I-M-00023; + (<-vulgar + ((shinjigen-1 . 16) + (=jis-x0208 . #x312F) ; >-00033; + (=ks-x1001 . #x7564) ; &I-K0-7564; + (=cns11643-1 . #x4460) ; &I-C1-4460; + (=daikanwa . 00023) ; &I-M-00023; )) + (<-vulgar*sources + shinjigen-1) (shinjigen-1 . 17) (=gb2312 . #x3373) ; >-00035; (=gt . 00035) ; &I-GT-00035; @@ -693,15 +699,18 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 3) (total-strokes . 4) - (<-vulgar-ideograph + (<-vulgar ((=ucs . #x4E08) ; 丈 )) (=ucs . #x2000B) ; 𠀋 (->subsumptive - ((<-vulgar-ideograph - ((=daikanwa . 00011) ; &I-M-00011; + ((<-vulgar + ((=jis-x0208-1978 . #x3E66) ; >-00018; + (=jis-x0208-1983 . #x3E66) ; &I-J83-3E66; + (=ks-x1001 . #x6D5B) ; &I-K0-6D5B; + (=daikanwa . 00011) ; &I-M-00011; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") @@ -722,11 +731,13 @@ ) ((mojikyo . 000026) ; &MCS-6000001A; ) - ((<-vulgar-ideograph + ((<-vulgar ((shinjigen-1 . 9) + (=gb2312 . #x5549) ; >-00020; (=jis-x0208-1990 . #x3E66) ; &I-J90-3E66; + (=cns11643-1 . #x4437) ; &I-C1-4437; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (hanyu-dazidian 1 12 5) (ideographic-structure @@ -789,11 +800,13 @@ (ideographic-radical@daikanwa . 1) ; ⼀ (ideographic-strokes@daikanwa . 3) (total-strokes . 4) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 491) + (=jis-x0208 . #x5142) ; >-01891; + (=ks-x1001 . #x7B31) ; &I-K0-7B31; (=daikanwa . 01455) ; &I-M-01455; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa shinjigen-1) (hanyu-dazidian 1 241 5) (shinjigen-1 . 492) diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index 17067b1..913df87 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -167,49 +167,12 @@ (=gt-pj-2 . #x306D) ; >-00142; )) (define-char - '((ideographic-radical@ucs . 16) ; ⼏ - (ideographic-strokes@ucs . 1) - (ideographic-radical@ucs*sources - daikanwa ucs) - (ideographic-radical@cns . 3) ; ⼂ - (ideographic-strokes@cns . 2) - (ideographic-radical@cns*sources - shinjigen-1 cns11643) - (total-strokes . 3) - (hanyu-dazidian 1 276 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") - (=ucs . #x2FF5) ; ⿵ - ) - ((=ucs . #x51E0) ; 几 - ) - ((=ucs . #x4E36) ; 丶 - )) - (shinjigen-1 . 566) - (shinjigen-2 . 566) - (sound@ja/kun "oyo-so" "arayu-ru") - (sound@ja/on/go "bon") - (sound@ja/on/kan "han") - (=ucs . #x51E1) ; 凡 - (=jis-x0208 . #x4B5E) ; &I-J90-4B5E; - (=gb2312 . #x3732) ; &I-G0-3732; - (=ks-x1001 . #x5B6D) ; &I-K0-5B6D; - (=cns11643-1 . #x443B) ; &I-C1-443B; - (=big5 . #xA45A) ; &I-B-A45A; - (=gt . 02286) ; &I-GT-02286; - (=gt-k . 00203) ; &I-GT-K00203; - (=gt-pj-1 . #x4B5E) ; &I-GT-02286; - (=daikanwa . 01739) ; &I-M-01739; - )) -(define-char - '((ideographic- (:radical 26 ; ⼙ - :strokes 1) - (:radical 3 ; ⼂ - :strokes 2)) + '((ideographic-radical@ucs . 3) ; ⼂ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 26) ; ⼙ + (ideographic-strokes@daikanwa . 1) (total-strokes . 3) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 52) - (hanyu-dazidian-char . 1) + (hanyu-dazidian 1 52 1) (=ucs . #x2007E) ; 𠁾 (=cns11643-5 . #x212D) ; &I-C5-212D; (=daikanwa . 02840) ; &I-M-02840; diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index c4fa2b3..2cd7ae3 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -299,11 +299,21 @@ '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 2) (total-strokes . 3) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 47) - (=daikanwa . 00118) ; &I-M-00118; - ) - :sources (shinjigen-1))) + (<-vulgar + ((shinjigen-1 . 47) + (=ucs . #x4E45) ; 久 + (=jis-x0208 . #x3557) ; &I-J90-3557; + )) + (<-vulgar*sources + shinjigen-1) + (<-wrong + ((shinjigen-1 . 47) + (=ucs . #x4E45) ; 久 + (=jis-x0208 . #x3557) ; &I-J90-3557; + (=daikanwa . 00118) ; &I-M-00118; + )) + (<-wrong*sources + zhengzi-tong daikanwa) (hanyu-dazidian 1 51 2) (shinjigen-1 . 48) (=ucs . #x4E46) ; 乆 @@ -388,10 +398,14 @@ )) (define-char '((total-strokes . 3) - (<-vulgar-ideograph - ((=daikanwa . 01739) ; &I-M-01739; + (<-vulgar + ((=jis-x0208 . #x4B5E) ; >-02286; + (=gb2312 . #x3732) ; &I-G0-3732; + (=ks-x1001 . #x5B6D) ; &I-K0-5B6D; + (=cns11643-1 . #x443B) ; &I-C1-443B; + (=daikanwa . 01739) ; &I-M-01739; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1722,17 +1736,19 @@ (=hanziku-1 . #xAC7C) ; &I-HZK01-AC7C; )) (define-char - '((ideographic- (:radical 102 ; ⽥ - :strokes 5 - :sources (cns-11643 morohashi-daikanwa)) - (:radical 4 ; ⼃ - :strokes 9 - :sources (ucs))) + '((ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 9) + (ideographic-radical@cns . 102) ; ⽥ + (ideographic-strokes@cns . 5) + (ideographic-radical@cns*sources + cns11643 daikanwa) (total-strokes . 10) - (->vulgar-ideograph - (:char ((=daikanwa . 21778) ; &I-M-21778; - ) - :sources (morohashi-daikanwa))) + (->vulgar + ((=ucs . #x754F) ; 畏 + (=daikanwa . 21778) ; &I-M-21778; + )) + (->vulgar*sources + daikanwa) (hanyu-dazidian 1 41 4) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index e0c12c2..89ed834 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -1962,11 +1962,12 @@ (ideographic-radical@cns*sources shinjigen-1 cns11643 gt) (total-strokes . 11) - (<-vulgar-ideograph - ((ideographic-radical . 213) ; ⿔ + (<-vulgar + ((=jis-x0208-1983 . #x737D) ; >-66712; + (=ks-x1001 . #x4F4F) ; &I-K0-4F4F; (=daikanwa . 48847) ; &I-M-48847; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (hanyu-dazidian 8 10 19) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el index d678354..af19dc8 100644 --- a/lisp/utf-2000/Ideograph-R006-Hook.el +++ b/lisp/utf-2000/Ideograph-R006-Hook.el @@ -388,11 +388,11 @@ (ideographic-radical . 6) ; ⼅ (ideographic-strokes . 6) (total-strokes . 7) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 69) (=daikanwa . 00241) ; &I-M-00241; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 71) (shinjigen-2 . 71) diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el index ada3fb1..ff5feee 100644 --- a/lisp/utf-2000/Ideograph-R008-Lid.el +++ b/lisp/utf-2000/Ideograph-R008-Lid.el @@ -1106,11 +1106,13 @@ (sound@ja/on/go "kyAu") (=ucs . #x4EB0) ; 亰 (->subsumptive - ((<-vulgar-ideograph + ((<-vulgar ((shinjigen-1 . 102) + (=jis-x0208 . #x357E) ; >-00397; + (=ks-x1001 . #x4C48) ; &I-K0-4C48; (=daikanwa . 00299) ; &I-M-00299; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1433,124 +1435,122 @@ (mojikyo . 000315) ; &MCS-6000013B; )) (define-char - '((=>ucs . #x20158) ; 𠅘 - (ideographic-radical . 8) ; ⼇ + '((ideographic-radical . 8) ; ⼇ (ideographic-strokes . 8) (total-strokes . 10) - (<-vulgar-ideograph - (:sources (seiji-tsuu morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 104) - (=daikanwa . 00303) ; &I-M-00303; - ) - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((=jis-x0208 . #x5035) ; >-00376; + (=ucs . #x20158) ; 𠅘 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 104) + (=jis-x0208 . #x4462) ; >-00406; + (=ks-x1001 . #x6F4D) ; &I-K0-6F4D; + (=daikanwa . 00303) ; &I-M-00303; + )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x89CC) ; &CDP-89CC; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=jis-x0208 . #x5035) ; >-00376; + ) + ((=big5-cdp . #x89CC) ; &CDP-89CC; + ) + ((=ucs . #x5196) ; 冖 + )) ) - ((=ucs . #x5196) ; 冖 + ((=ucs . #x4E01) ; 丁 )) + (shinjigen-1 . 105) + (shinjigen-2 . 105) + (=daikanwa . 00316) ; &M-00316; + (mojikyo . 000316) ; &MCS-6000013C; ) - ((=ucs . #x4E01) ; 丁 - )) - (shinjigen-1 . 105) - (shinjigen-2 . 105) - (=daikanwa . 00316) ; &M-00316; - (mojikyo . 000316) ; &MCS-6000013C; - )) -(define-char - '((morohashi-daikanwa 316 0 0) - (ideographic-radical . 8) ; ⼇ - (ideographic-strokes . 8) - (total-strokes . 10) - (hanyu-dazidian 1 287 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((=ucs . #x4EA0) ; 亠 + ((hanyu-dazidian 1 287 6) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x89CC) ; &CDP-89CC; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=ucs . #x4EA0) ; 亠 + ) + ((=big5-cdp . #x89CC) ; &CDP-89CC; + ) + ((=ucs . #x5196) ; 冖 + )) ) - ((=ucs . #x5196) ; 冖 + ((=ucs . #x4E01) ; 丁 )) - ) - ((=ucs . #x4E01) ; 丁 + (=cns11643-4 . #x2B5F) ; &HZK01-E154; + (=hanziku-1 . #xE154) ; &I-HZK01-E154; + (=ucs@unicode . #x20158) ; &HZK01-E154; )) - (=ucs . #x20158) ; 𠅘 - (=cns11643-4 . #x2B5F) ; &I-C4-2B5F; - (=hanziku-1 . #xE154) ; &I-HZK01-E154; )) (define-char - '((=>ucs . #x20159) ; 𠅙 - (ideographic-radical . 8) ; ⼇ + '((ideographic-radical . 8) ; ⼇ (ideographic-strokes . 8) (total-strokes . 10) - (<-vulgar-ideograph - (:sources (morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 106) - (=daikanwa . 00304) ; &I-M-00304; - ) - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((=jis-x0208 . #x5035) ; >-00376; + (=ucs . #x20159) ; 𠅙 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 106) + (=jis-x0208 . #x4E3C) ; >-00408; + (=ks-x1001 . #x5555) ; &I-K0-5555; + (=daikanwa . 00304) ; &I-M-00304; + )) + (<-vulgar*sources + daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x89CC) ; &CDP-89CC; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=jis-x0208 . #x5035) ; >-00376; + ) + ((=big5-cdp . #x89CC) ; &CDP-89CC; + ) + ((=ucs . #x5196) ; 冖 + )) ) - ((=ucs . #x5196) ; 冖 + ((=ucs . #x513F) ; 儿 )) + (shinjigen-1 . 108) + (shinjigen-2 . 108) + (=daikanwa . 00317) ; &M-00317; + (mojikyo . 000317) ; &MCS-6000013D; ) - ((=ucs . #x513F) ; 儿 - )) - (shinjigen-1 . 108) - (shinjigen-2 . 108) - (=daikanwa . 00317) ; &M-00317; - (mojikyo . 000317) ; &MCS-6000013D; - )) -(define-char - '((morohashi-daikanwa 317 0 0) - (ideographic-radical . 8) ; ⼇ - (ideographic-strokes . 8) - (total-strokes . 10) - (hanyu-dazidian 1 287 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((=ucs . #x4EA0) ; 亠 + ((hanyu-dazidian 1 287 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x89CC) ; &CDP-89CC; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=ucs . #x4EA0) ; 亠 + ) + ((=big5-cdp . #x89CC) ; &CDP-89CC; + ) + ((=ucs . #x5196) ; 冖 + )) ) - ((=ucs . #x5196) ; 冖 + ((=ucs . #x513F) ; 儿 )) - ) - ((=ucs . #x513F) ; 儿 + (=cns11643-6 . #x3530) ; &HZK01-E155; + (=hanziku-1 . #xE155) ; &I-HZK01-E155; + (=ucs@unicode . #x20159) ; &HZK01-E155; )) - (=ucs . #x20159) ; 𠅙 - (=cns11643-6 . #x3530) ; &I-C6-3530; - (=hanziku-1 . #xE155) ; &I-HZK01-E155; )) (define-char '((morohashi-daikanwa 5775 0 2) diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index e010d66..9dd0948 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -800,7 +800,7 @@ (ideographic-radical@cns*sources cns11643-3 daikanwa) (total-strokes . 4) - (<-vulgar-ideograph + (<-vulgar ((=ucs . #x5167) ; 內 )) (=ucs . #x5185) ; 内 @@ -1908,10 +1908,15 @@ (mojikyo . 070403) ; &MCS-60011303; )) (define-char - '((=>ucs . #x4EEE) ; 仮 - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 4) (total-strokes . 6) + (=ucs . #x4EEE) ; 仮 + )) +(define-char + '((<-denotational + ((=ucs . #x4EEE) ; 仮 + )) (<-simplified@JP/Jouyou ((=ucs . #x5047) ; 假 (=jis-x0208 . #x5071) ; &I-J90-5071; @@ -1938,15 +1943,16 @@ (mojikyo . 000398) ; &MCS-6000018E; )) (define-char - '((morohashi-daikanwa 398 0 1) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 4) - (total-strokes . 6) - (<-vulgar-ideograph + '((<-denotational + ((=ucs . #x4EEE) ; 仮 + )) + (<-vulgar ((shinjigen-1 . 144) + (=jis-x0208 . #x323E) ; >-00526; + (=cns11643-3 . #x226F) ; &I-C3-226F; (=daikanwa . 00398) ; &I-M-00398; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (hanyu-dazidian 1 124 5) (ideographic-structure @@ -1958,8 +1964,8 @@ ((=ucs . #x53CD) ; 反 )) (shinjigen-1 . 146) - (=ucs . #x4EEE) ; 仮 - (=hanziku-1 . #xBD6F) ; &I-HZK01-BD6F; + (=hanziku-1 . #xBD6F) ; &HZK01-BD6F; + (=ucs@unicode . #x4EEE) ; &HZK01-BD6F; )) (define-char '((=>ucs . #x4EEF) ; 仯 @@ -11265,55 +11271,40 @@ (=cns11643-1 . #x4F71) ; &C1-4F71; )) (define-char - '((=>ucs . #x4FDE) ; 俞 - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 7) - (total-strokes . 9) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 487) - (=daikanwa . 01437) ; &I-M-01437; - ) - :sources (shinjigen-1))) - (shinjigen-1 . 488) - (=daikanwa . 00703) ; &M-00703; - (mojikyo . 000703) ; &MCS-600002BF; - )) -(define-char - '((morohashi-daikanwa 703 0 0) - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 155 3) (=ucs . #x4FDE) ; 俞 - (=gb2312 . #x5361) ; &I-G0-5361; - (=jef-china3 . #x43E0) ; &I-JC3-43E0; - (mojikyo . 054769) ; &MCS-6000D5F1; - )) -(define-char - '((=>ucs . #x4FDE) ; 俞 - (morohashi-daikanwa 703 0 1) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 7) - (total-strokes . 9) - (->mojikyo . 054769) ; 俞 - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 487) + (=daikanwa . 01437) ; &I-M-01437; + )) + (<-vulgar*sources + shinjigen-1) + (shinjigen-1 . 488) + (=daikanwa . 00703) ; &M-00703; + (mojikyo . 000703) ; &MCS-600002BF; + ) + ((hanyu-dazidian 1 155 3) + (=gb2312 . #x5361) ; &G0-5361; + (=jef-china3 . #x43E0) ; &I-JC3-43E0; + (=ucs@unicode . #x4FDE) ; &G0-5361; + (mojikyo . 054769) ; &MCS-6000D5F1; ) - ((=big5-cdp . #x8AFC) ; &CDP-8AFC; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=big5-cdp . #x8AFC) ; &CDP-8AFC; + ) + ((=ucs . #x5216) ; 刖 + )) + (=cns11643-1 . #x4F7E) ; &C1-4F7E; ) - ((=ucs . #x5216) ; 刖 + ((=big5 . #xAB5C) ; &B-AB5C; + (=ucs@big5 . #x4FDE) ; &B-AB5C; )) - (=cns11643-1 . #x4F7E) ; &C1-4F7E; - )) -(define-char - '((=>ucs . #x4FDE) ; 俞 - (morohashi-daikanwa 703 0 2) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 7) - (total-strokes . 9) - (=big5 . #xAB5C) ; &B-AB5C; - (=ucs@big5 . #x4FDE) ; &B-AB5C; )) (define-char '((ideographic-radical . 9) ; ⼈ diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el index 3ed3bba..855278a 100644 --- a/lisp/utf-2000/Ideograph-R012-Eight.el +++ b/lisp/utf-2000/Ideograph-R012-Eight.el @@ -265,11 +265,13 @@ (ideographic-radical@daikanwa . 1) ; ⼀ (ideographic-strokes@daikanwa . 3) (total-strokes . 4) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 491) + (=jis-x0208 . #x5142) ; >-01891; + (=ks-x1001 . #x7B31) ; &I-K0-7B31; (=daikanwa . 01455) ; &I-M-01455; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa shinjigen-1) (hanyu-dazidian 1 241 5) (shinjigen-1 . 492) diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el index aa36d04..7209d83 100644 --- a/lisp/utf-2000/Ideograph-R013-Down-Box.el +++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el @@ -118,7 +118,7 @@ (ideographic-radical@cns*sources cns11643-3 daikanwa) (total-strokes . 4) - (<-vulgar-ideograph + (<-vulgar ((=ucs . #x5167) ; 內 )) (=ucs . #x5185) ; 内 @@ -130,10 +130,10 @@ (<-denotational ((=ucs . #x5185) ; 内 )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 01418) ; &I-M-01418; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (=cns11643-6 . #x2150) ; &M-01512; (=daikanwa . 01512) ; &I-M-01512; diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el index bee83be..7ceff95 100644 --- a/lisp/utf-2000/Ideograph-R014-Cover.el +++ b/lisp/utf-2000/Ideograph-R014-Cover.el @@ -41,15 +41,18 @@ (=daikanwa . 01566) ; &I-M-01566; )) (define-char - '((morohashi-daikanwa 1566 0 5) + '((=>ucs* . #x5197) ; 冗 + (=>daikanwa . 01566) ; 冗 (ideographic-radical . 14) ; ⼍ (ideographic-strokes . 2) (total-strokes . 4) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 525) - (=daikanwa . 01566) ; &I-M-01566; - ) - :sources (shinjigen-1))) + (<-vulgar + ((shinjigen-1 . 525) + (=ucs . #x5197) ; 冗 + (=jis-x0208 . #x3E69) ; &I-J90-3E69; + )) + (<-vulgar*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ @@ -678,12 +681,12 @@ '((ideographic-radical . 14) ; ⼍ (ideographic-strokes . 9) (total-strokes . 11) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 1852) - (=daikanwa . 07230) ; &I-M-07230; - ) + (<-vulgar + ((shinjigen-1 . 1852) + (=daikanwa . 07230) ; &I-M-07230; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 305 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index 60653fd..954062f 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -200,12 +200,14 @@ '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 4) (total-strokes . 6) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 542) - (=daikanwa . 01613) ; &I-M-01613; - ) - )) + (<-vulgar + ((shinjigen-1 . 542) + (=ucs . #x51B1) ; 冱 + (=jis-x0208 . #x5154) ; &I-J90-5154; + (=daikanwa . 01613) ; &I-M-01613; + )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 295 6) (shinjigen-1 . 543) (=ucs . #x205B1) ; 𠖱 @@ -271,12 +273,12 @@ '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 4) (total-strokes . 6) - (<-vulgar-ideograph - (:sources (gyokuhen morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 4092) - (=daikanwa . 17209) ; &I-M-17209; - ) + (<-vulgar + ((shinjigen-1 . 4092) + (=daikanwa . 17209) ; &I-M-17209; )) + (<-vulgar*sources + yupian daikanwa shinjigen-1) (hanyu-dazidian 1 295 8) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -303,49 +305,46 @@ '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 4) (total-strokes . 6) - (<-vulgar-ideograph - (:sources (gyokuhen morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 4080) - (=daikanwa . 17174) ; &I-M-17174; - ) - )) - (hanyu-dazidian 1 295 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 - ) - ((=ucs . #x592C) ; 夬 - )) - (shinjigen-1 . 4081) - (shinjigen-2 . 4081) (=ucs . #x51B3) ; 决 - (=jis-x0208 . #x5153) ; &I-J90-5153; - (=gb2312 . #x3E76) ; &I-G0-3E76; - (=gt . 02132) ; &I-GT-02132; - (=gt-k . 01712) ; &I-GT-K01712; - (=gt-pj-1 . #x5153) ; &I-GT-02132; - (=daikanwa . 01617) ; &I-M-01617; - (=hanziku-1 . #xE2DF) ; &I-HZK01-E2DF; - (=cbeta . 00804) ; &I-CB00804; - (mojikyo . 001617) ; &MCS-60000651; - )) -(define-char - '((=>ucs . #x51B3) ; 决 - (morohashi-daikanwa 1617 0 0) - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 4) - (total-strokes . 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 4080) + (=daikanwa . 17174) ; &I-M-17174; + )) + (<-vulgar*sources + yupian daikanwa shinjigen-1) + (hanyu-dazidian 1 295 12) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=ucs . #x592C) ; 夬 + )) + (shinjigen-1 . 4081) + (shinjigen-2 . 4081) + (=jis-x0208 . #x5153) ; >-02132; + (=gb2312 . #x3E76) ; &I-G0-3E76; + (=gt . 02132) ; &I-GT-02132; + (=gt-k . 01712) ; &I-GT-K01712; + (=gt-pj-1 . #x5153) ; &I-GT-02132; + (=daikanwa . 01617) ; &I-M-01617; + (=hanziku-1 . #xE2DF) ; &I-HZK01-E2DF; + (=cbeta . 00804) ; &I-CB00804; + (=ucs@unicode . #x51B3) ; >-02132; + (mojikyo . 001617) ; &MCS-60000651; ) - ((=cns11643-2 . #x213B) ; &C2-213B; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=cns11643-2 . #x213B) ; &C2-213B; + )) + (=cns11643-3 . #x227D) ; &C3-227D; )) - (=cns11643-3 . #x227D) ; &C3-227D; )) (define-char '((ideographic-radical . 15) ; ⼎ @@ -376,12 +375,12 @@ '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 5) (total-strokes . 7) - (<-vulgar-ideograph - (:sources (gyokuhen kangxi morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 4122) - (=daikanwa . 17264) ; &I-M-17264; - ) + (<-vulgar + ((shinjigen-1 . 4122) + (=daikanwa . 17264) ; &I-M-17264; )) + (<-vulgar*sources + yupian kangxi daikanwa shinjigen-1) (hanyu-dazidian 1 295 17) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -1232,56 +1231,52 @@ (=gb12345 . #x3E3B) ; 凈 )) (define-char - '((=>ucs . #x51C9) ; 凉 - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 8) - (total-strokes . 10) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((ideographic-radical . 85) ; ⽔ - (shinjigen-1 . 4308) - (=daikanwa . 17606) ; &I-M-17606; - ) - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 - ) - ((=jis-x0208 . #x357E) ; >-00397; - (=ks-x1001 . #x4C48) ; &I-K0-4C48; - (=daikanwa . 00299) ; &I-M-00299; - )) - (shinjigen-1 . 4309) - (shinjigen-2 . 4310) - (=jis-x0208 . #x515A) ; >-02201; - (=ks-x1001 . #x5558) ; &I-K0-5558; - (=gt . 02201) ; &I-GT-02201; - (=gt-pj-1 . #x515A) ; &I-GT-02201; - (=daikanwa . 01665) ; &I-M-01665; - (=cbeta . 00289) ; &I-CB00289; - (=ucs@jis . #x51C9) ; >-02201; - (mojikyo . 001665) ; &MCS-60000681; - )) -(define-char - '((morohashi-daikanwa 1665 0 0) - (ideographic-radical . 15) ; ⼎ + '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 8) (total-strokes . 10) - (hanyu-dazidian 1 299 9) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 - ) - ((=ucs . #x4EAC) ; 京 - )) (=ucs . #x51C9) ; 凉 - (=gb2312 . #x4139) ; &I-G0-4139; - (=cns11643-3 . #x2F5F) ; &I-C3-2F5F; - (=hanziku-1 . #xE3BF) ; &I-HZK01-E3BF; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 4308) + (=daikanwa . 17606) ; &I-M-17606; + )) + (<-vulgar*sources + shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=jis-x0208 . #x357E) ; >-00397; + (=ks-x1001 . #x4C48) ; &I-K0-4C48; + (=daikanwa . 00299) ; &I-M-00299; + )) + (shinjigen-1 . 4309) + (shinjigen-2 . 4310) + (=jis-x0208 . #x515A) ; >-02201; + (=ks-x1001 . #x5558) ; &I-K0-5558; + (=gt . 02201) ; &I-GT-02201; + (=gt-pj-1 . #x515A) ; &I-GT-02201; + (=daikanwa . 01665) ; &I-M-01665; + (=cbeta . 00289) ; &I-CB00289; + (=ucs@jis . #x51C9) ; >-02201; + (mojikyo . 001665) ; &MCS-60000681; + ) + ((hanyu-dazidian 1 299 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=ucs . #x4EAC) ; 京 + )) + (=gb2312 . #x4139) ; &HZK01-E3BF; + (=cns11643-3 . #x2F5F) ; &I-C3-2F5F; + (=hanziku-1 . #xE3BF) ; &I-HZK01-E3BF; + (=ucs@unicode . #x51C9) ; &HZK01-E3BF; + )) )) (define-char '((=>ucs . #x51CA) ; 凊 @@ -1927,58 +1922,60 @@ (=hanziku-1 . #xE3DE) ; &I-HZK01-E3DE; )) (define-char - '((=>ucs . #x51D6) ; 凖 - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 10) - (total-strokes . 12) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 4378) - (=daikanwa . 17934) ; &I-M-17934; - ) - :sources (seiji-tsuu morohashi-daikanwa shinjigen-1))) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=jis-x0208 . #x3D5A) ; >-02187; - (=ks-x1001 . #x7157) ; &I-K0-7157; - (=daikanwa . 01661) ; &I-M-01661; - ) - ((=ucs . #x5341) ; 十 - )) - (shinjigen-1 . 4379) - (shinjigen-2 . 4379) - (=jis-x0208 . #x5245) ; >-02216; - (=gt . 02216) ; &I-GT-02216; - (=gt-pj-1 . #x5245) ; &I-GT-02216; - (=daikanwa . 01695) ; &I-M-01695; - (=ucs@jis . #x51D6) ; >-02216; - )) -(define-char - '((morohashi-daikanwa 1695 0 1) - (ideographic-radical . 15) ; ⼎ + '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 300 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x51C6) ; 准 - ) - ((=ucs . #x5341) ; 十 - )) (=ucs . #x51D6) ; 凖 - (=cns11643-3 . #x397E) ; &I-C3-397E; - (=hanziku-1 . #xE3DA) ; &I-HZK01-E3DA; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 4378) + (=daikanwa . 17934) ; &I-M-17934; + )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=jis-x0208 . #x3D5A) ; >-02187; + (=ks-x1001 . #x7157) ; &I-K0-7157; + (=daikanwa . 01661) ; &I-M-01661; + ) + ((=ucs . #x5341) ; 十 + )) + (shinjigen-1 . 4379) + (shinjigen-2 . 4379) + (=jis-x0208 . #x5245) ; >-02216; + (=gt . 02216) ; &I-GT-02216; + (=gt-pj-1 . #x5245) ; &I-GT-02216; + (=daikanwa . 01695) ; &I-M-01695; + (=ucs@jis . #x51D6) ; >-02216; + ) + ((hanyu-dazidian 1 300 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x51C6) ; 准 + ) + ((=ucs . #x5341) ; 十 + )) + (=cns11643-3 . #x397E) ; &HZK01-E3DA; + (=hanziku-1 . #xE3DA) ; &I-HZK01-E3DA; + (=ucs@unicode . #x51D6) ; &HZK01-E3DA; + )) )) (define-char '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 10) (total-strokes . 12) (=ucs . #x34D5) ; 㓕 - (=cns11643-3 . #x397C) ; &I-C3-397C; - (mojikyo . 083441) ; &MCS-600145F1; + (->subsumptive + ((=ucs@unicode . #x34D5) ; &UU+34D5; + (mojikyo . 083441) ; &UU+34D5; + ) + ((=cns11643-3 . #x397C) ; &C3-397C; + )) )) (define-char '((ideographic-radical . 15) ; ⼎ @@ -2397,82 +2394,69 @@ (=cns11643-1 . #x6C29) ; &C1-6C29; )) (define-char - '((=>ucs . #x51DB) ; 凛 - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 13) - (total-strokes . 15) - (<-vulgar-ideograph - ((shinjigen-1 . 561) - (=daikanwa . 01717) ; &I-M-01717; - )) - (<-vulgar-ideograph*sources - pianhai daikanwa shinjigen-1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 - ) - ((=daikanwa . 24742) ; &M-24742; - )) - (shinjigen-1 . 563) - (shinjigen-2 . 563) - (=jis-x0208-1978 . #x515B) ; &M-01718; - (=jis-x0208-1983 . #x515B) ; &I-J83-515B; - (=daikanwa . 01718) ; &I-M-01718; - )) -(define-char - '((=>ucs . #x51DB) ; 凛 - (morohashi-daikanwa 1718 0 0) - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 13) - (total-strokes . 15) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 - ) - ((=cns11643-3 . #x433D) ; &C3-433D; - )) - (=cns11643-3 . #x4B30) ; &C3-4B30; - )) -(define-char - '((=>ucs . #x51DB) ; 凛 - (morohashi-daikanwa 1718 0 1) - (ideographic-radical . 15) ; ⼎ + '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 13) (total-strokes . 15) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x51AB) ; 冫 + (=ucs . #x51DB) ; 凛 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 561) + (=ks-x1001 . #x574F) ; >-02256; + (=jis-x0208-1990 . #x7425) ; &I-J90-7425; + (=daikanwa . 01717) ; &I-M-01717; + )) + (<-vulgar*sources + pianhai daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=daikanwa . 24742) ; &M-24742; + )) + (shinjigen-1 . 563) + (shinjigen-2 . 563) + (=jis-x0208-1978 . #x515B) ; &M-01718; + (=jis-x0208-1983 . #x515B) ; &I-J83-515B; + (=daikanwa . 01718) ; &I-M-01718; ) - ((=jis-x0208 . #x6349) ; >-31833; - )) - (=jis-x0208-1990 . #x515B) ; >-02257; - (=gt . 02257) ; &I-GT-02257; - (=gt-pj-1 . #x515B) ; &I-GT-02257; - (=ucs@jis . #x51DB) ; >-02257; - )) -(define-char - '((morohashi-daikanwa 1718 0 2) - (ideographic-radical . 15) ; ⼎ - (ideographic-strokes . 13) - (total-strokes . 15) - (hanyu-dazidian 1 301 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=cns11643-3 . #x433D) ; &C3-433D; + )) + (=cns11643-3 . #x4B30) ; &C3-4B30; ) - ((=ucs . #x51AB) ; 冫 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=jis-x0208 . #x6349) ; >-31833; + )) + (=jis-x0208-1990 . #x515B) ; >-02257; + (=gt . 02257) ; &I-GT-02257; + (=gt-pj-1 . #x515B) ; &I-GT-02257; + (=ucs@jis . #x51DB) ; >-02257; ) - ((=ucs . #x7980) ; 禀 + ((hanyu-dazidian 1 301 12) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x51AB) ; 冫 + ) + ((=ucs . #x7980) ; 禀 + )) + (=gb2312 . #x415D) ; &HZK01-E443; + (=hanziku-1 . #xE443) ; &I-HZK01-E443; + (=ucs@unicode . #x51DB) ; &HZK01-E443; )) - (=ucs . #x51DB) ; 凛 - (=gb2312 . #x415D) ; &I-G0-415D; - (=hanziku-1 . #xE443) ; &I-HZK01-E443; )) (define-char '((=>ucs . #x2060D) ; 𠘍 diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el index 179b813..4edded9 100644 --- a/lisp/utf-2000/Ideograph-R016-Table.el +++ b/lisp/utf-2000/Ideograph-R016-Table.el @@ -33,43 +33,54 @@ (=big5-cdp . #x8AAE) ; &I-CDP-8AAE; )) (define-char - '((ideographic-radical@ucs . 16) ; ⼏ - (ideographic-strokes@ucs . 1) - (ideographic-radical@ucs*sources - daikanwa ucs) - (ideographic-radical@cns . 3) ; ⼂ - (ideographic-strokes@cns . 2) - (ideographic-radical@cns*sources - shinjigen-1 cns11643) + '((ideographic-radical . 16) ; ⼏ + (ideographic-strokes . 1) (total-strokes . 3) - (hanyu-dazidian 1 276 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") - (=ucs . #x2FF5) ; ⿵ - ) - ((=ucs . #x51E0) ; 几 - ) - ((=ucs . #x4E36) ; 丶 - )) - (shinjigen-1 . 566) - (shinjigen-2 . 566) + (ideographic-radical*sources daikanwa shinjigen-1 ucs) (sound@ja/kun "oyo-so" "arayu-ru") (sound@ja/on/go "bon") (sound@ja/on/kan "han") (=ucs . #x51E1) ; 凡 - (=jis-x0208 . #x4B5E) ; &I-J90-4B5E; - (=gb2312 . #x3732) ; &I-G0-3732; - (=ks-x1001 . #x5B6D) ; &I-K0-5B6D; - (=cns11643-1 . #x443B) ; &I-C1-443B; - (=big5 . #xA45A) ; &I-B-A45A; - (=gt . 02286) ; &I-GT-02286; - (=gt-k . 00203) ; &I-GT-K00203; - (=gt-pj-1 . #x4B5E) ; &I-GT-02286; - (=daikanwa . 01739) ; &I-M-01739; + (->subsumptive + ((ideographic-radical@cns . 3) ; ⼂ + (ideographic-strokes@cns . 2) + (hanyu-dazidian 1 276 3) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") + (=ucs . #x2FF5) ; ⿵ + ) + ((=ucs . #x51E0) ; 几 + ) + ((=ucs . #x4E36) ; 丶 + )) + (shinjigen-1 . 566) + (shinjigen-2 . 566) + (=jis-x0208 . #x4B5E) ; >-02286; + (=gb2312 . #x3732) ; &I-G0-3732; + (=ks-x1001 . #x5B6D) ; &I-K0-5B6D; + (=cns11643-1 . #x443B) ; &I-C1-443B; + (=big5 . #xA45A) ; &I-B-A45A; + (=gt . 02286) ; &I-GT-02286; + (=gt-k . 00203) ; &I-GT-K00203; + (=gt-pj-1 . #x4B5E) ; &I-GT-02286; + (=daikanwa . 01739) ; &I-M-01739; + (=ucs@unicode . #x51E1) ; >-02286; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") + (=ucs . #x2FF5) ; ⿵ + ) + ((=ucs . #x51E0) ; 几 + ) + ((=ucs . #x4E00) ; 一 + )) + (shinjigen-1 . 567) + (shinjigen-2 . 567) + )) )) (define-char '((=>ucs . #x51E1) ; 凡 - (morohashi-daikanwa 1739 0 0) + (=>daikanwa . 01739) ; >-02286; (ideographic-radical . 16) ; ⼏ (ideographic-strokes . 1) (total-strokes . 3) @@ -87,24 +98,7 @@ )) (define-char '((=>ucs . #x51E1) ; 凡 - (morohashi-daikanwa 1739 0 2) - (ideographic-radical . 16) ; ⼏ - (ideographic-strokes . 1) - (total-strokes . 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") - (=ucs . #x2FF5) ; ⿵ - ) - ((=ucs . #x51E0) ; 几 - ) - ((=ucs . #x4E00) ; 一 - )) - (shinjigen-1 . 567) - (shinjigen-2 . 567) - )) -(define-char - '((=>ucs . #x51E1) ; 凡 - (morohashi-daikanwa 1739 0 3) + (=>daikanwa . 01739) ; >-02286; (ideographic-radical . 16) ; ⼏ (ideographic-strokes . 1) (total-strokes . 3) @@ -122,10 +116,14 @@ )) (define-char '((total-strokes . 3) - (<-vulgar-ideograph - ((=daikanwa . 01739) ; &I-M-01739; + (<-vulgar + ((=jis-x0208 . #x4B5E) ; >-02286; + (=gb2312 . #x3732) ; &I-G0-3732; + (=ks-x1001 . #x5B6D) ; &I-K0-5B6D; + (=cns11643-1 . #x443B) ; &I-C1-443B; + (=daikanwa . 01739) ; &I-M-01739; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el index c2814bd..40041d9 100644 --- a/lisp/utf-2000/Ideograph-R017-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el @@ -454,19 +454,24 @@ '((ideographic-radical . 17) ; ⼐ (ideographic-strokes . 6) (total-strokes . 8) - (hanyu-dazidian 1 309 9) - (shinjigen-1 . 584) - (shinjigen-2 . 584) (=ucs . #x51FD) ; 函 - (=jis-x0208 . #x4821) ; &I-J90-4821; - (=gb2312 . #x3A2F) ; &I-G0-3A2F; - (=ks-x1001 . #x795E) ; &I-K0-795E; - (=cns11643-1 . #x4C2A) ; &I-C1-4C2A; - (=big5 . #xA8E7) ; &I-B-A8E7; - (=gt . 02383) ; &I-GT-02383; - (=gt-k . 03799) ; &I-GT-K03799; - (=gt-pj-1 . #x4821) ; &I-GT-02383; - (=daikanwa . 01826) ; &I-M-01826; + (->subsumptive + ((hanyu-dazidian 1 309 9) + (shinjigen-1 . 584) + (shinjigen-2 . 584) + (=jis-x0208 . #x4821) ; >-02383; + (=ks-x1001 . #x795E) ; &I-K0-795E; + (=big5 . #xA8E7) ; &I-B-A8E7; + (=gt . 02383) ; &I-GT-02383; + (=gt-k . 03799) ; &I-GT-K03799; + (=gt-pj-1 . #x4821) ; &I-GT-02383; + (=daikanwa . 01826) ; &I-M-01826; + (=ucs@jis . #x51FD) ; >-02383; + ) + ((=gb2312 . #x3A2F) ; &C1-4C2A; + (=cns11643-1 . #x4C2A) ; &I-C1-4C2A; + (=ucs@unicode . #x51FD) ; &C1-4C2A; + )) )) (define-char '((ideographic-radical . 17) ; ⼐ @@ -501,14 +506,20 @@ )) (define-char '((ideographic-radical . 17) ; ⼐ - (ideographic-strokes . 7) - (total-strokes . 9) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 584) - (=daikanwa . 01826) ; &I-M-01826; - ) + (ideographic-strokes@cns . 6) + (total-strokes@cns . 8) + (ideographic-strokes@jis . 7) + (total-strokes@jis . 9) + (ideographic-strokes@jis*sources + daikanwa jis gt) + (<-vulgar + ((shinjigen-1 . 584) + (=jis-x0208 . #x4821) ; >-02383; + (=ks-x1001 . #x795E) ; &I-K0-795E; + (=daikanwa . 01826) ; &I-M-01826; )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 309 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") @@ -522,6 +533,7 @@ (shinjigen-2 . 586) (=ucs . #x51FE) ; 凾 (=jis-x0208 . #x5162) ; &I-J90-5162; + (=cns11643-3 . #x275A) ; &I-C3-275A; (=gt . 02387) ; &I-GT-02387; (=gt-k . 05211) ; &I-GT-K05211; (=gt-pj-1 . #x5162) ; &I-GT-02387; @@ -530,22 +542,6 @@ (=cbeta . 00630) ; &I-CB00630; )) (define-char - '((=>ucs . #x51FE) ; 凾 - (morohashi-daikanwa 1830 0 1) - (ideographic-radical . 17) ; ⼐ - (ideographic-strokes . 6) - (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") - (=ucs . #x2FF6) ; ⿶ - ) - ((=ucs . #x51F5) ; 凵 - ) - ((=ucs . #x4E9F) ; 亟 - )) - (=cns11643-3 . #x275A) ; &C3-275A; - )) -(define-char '((=>ucs . #x2068E) ; 𠚎 (ideographic-radical . 17) ; ⼐ (ideographic-strokes . 7) diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index 4cbf928..3ca0335 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -1672,12 +1672,12 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 5) (total-strokes . 7) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 709) - (=daikanwa . 02316) ; &I-M-02316; - ) + (<-vulgar + ((shinjigen-1 . 709) + (=daikanwa . 02316) ; &I-M-02316; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 328 4) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -1699,12 +1699,12 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 5) (total-strokes . 7) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 709) - (=daikanwa . 02316) ; &I-M-02316; - ) + (<-vulgar + ((shinjigen-1 . 709) + (=daikanwa . 02316) ; &I-M-02316; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 327 20) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -2126,45 +2126,36 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 6) (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4E95) ; 井 - ) - ((=ucs . #x5205) ; 刅 - )) (=ucs . #x5231) ; 刱 - (=daikanwa . 01953) ; &I-M-01953; - )) -(define-char - '((=>ucs . #x5231) ; 刱 - (morohashi-daikanwa 1953 0 1) - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 6) - (total-strokes . 8) - (hanyu-dazidian 1 332 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4E95) ; 井 + ) + ((=ucs . #x5205) ; 刅 + )) + (=daikanwa . 01953) ; &M-01953; + (=ucs@unicode . #x5231) ; &M-01953; ) - ((=ucs . #x4E95) ; 井 + ((hanyu-dazidian 1 332 6) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4E95) ; 井 + ) + ((=cns11643-3 . #x2152) ; &C3-2152; + )) + (=cns11643-2 . #x2554) ; &C2-2554; + (=big5 . #xCBD4) ; &I-B-CBD4; + (=ucs@big5 . #x5231) ; &C2-2554; ) - ((=cns11643-3 . #x2152) ; &C3-2152; + ((shinjigen-1 . 634) + (=jis-x0212 . #x333A) ; &JSP-333A; + (=ucs@jis . #x5231) ; &JSP-333A; )) - (=cns11643-2 . #x2554) ; &C2-2554; - (=big5 . #xCBD4) ; &I-B-CBD4; - (=ucs@big5 . #x5231) ; &C2-2554; - )) -(define-char - '((=>ucs . #x5231) ; 刱 - (morohashi-daikanwa 1953 0 2) - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 6) - (total-strokes . 8) - (shinjigen-1 . 634) - (=jis-x0212 . #x333A) ; &JSP-333A; - (=ucs@jis . #x5231) ; &JSP-333A; )) (define-char '((ideographic-radical . 18) ; ⼑ @@ -3651,63 +3642,53 @@ (=cns11643-6 . #x3549) ; &I-C6-3549; )) (define-char - '((=>ucs . #x524F) ; 剏 - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 7) - (total-strokes . 9) - (<-vulgar-ideograph - (:sources (seiji-tsuu morohashi-daikanwa) - :char ((=daikanwa . 01953) ; &I-M-01953; - ) - )) - (hanyu-dazidian 1 338 14) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5E76) ; 并 - ) - ((=ucs . #x5204) ; 刄 - )) - (=cns11643-3 . #x2B43) ; &M-02024; - (=daikanwa . 02024) ; &I-M-02024; - (=hanziku-1 . #xEBBC) ; &I-HZK01-EBBC; - (=cbeta . 01772) ; &I-CB01772; - )) -(define-char - '((=>ucs . #x524F) ; 剏 - (morohashi-daikanwa 2024 0 0) - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 7) - (total-strokes . 9) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 634) - (=jis-x0212 . #x333A) ; &JSP-333A; - (=ucs@jis . #x5231) ; &JSP-333A; - ) - )) - (shinjigen-1 . 635) - (shinjigen-2 . 635) - (=jis-x0208 . #x516C) ; >-02591; - (=gt . 02591) ; &I-GT-02591; - (=gt-pj-1 . #x516C) ; &I-GT-02591; - (=ucs@jis . #x524F) ; >-02591; - )) -(define-char - '((morohashi-daikanwa 2024 0 3) - (ideographic-radical . 18) ; ⼑ + '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 7) (total-strokes . 9) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5E76) ; 并 + (=ucs . #x524F) ; 剏 + (->subsumptive + ((<-vulgar + ((=daikanwa . 01953) ; &M-01953; + )) + (<-vulgar*sources + zhengzi-tong daikanwa) + (hanyu-dazidian 1 338 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5E76) ; 并 + ) + ((=ucs . #x5204) ; 刄 + )) + (=cns11643-3 . #x2B43) ; &M-02024; + (=daikanwa . 02024) ; &I-M-02024; + (=hanziku-1 . #xEBBC) ; &I-HZK01-EBBC; + (=cbeta . 01772) ; &I-CB01772; + ) + ((<-vulgar + ((shinjigen-1 . 634) + (=jis-x0212 . #x333A) ; &JSP-333A; + )) + (<-vulgar*sources + shinjigen-1) + (shinjigen-1 . 635) + (shinjigen-2 . 635) + (=jis-x0208 . #x516C) ; >-02591; + (=gt . 02591) ; &I-GT-02591; + (=gt-pj-1 . #x516C) ; &I-GT-02591; + (=ucs@jis . #x524F) ; >-02591; ) - ((=ucs . #x5203) ; 刃 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5E76) ; 并 + ) + ((=ucs . #x5203) ; 刃 + )) + (=ucs@unicode . #x524F) ; &UU+524F; )) - (=ucs . #x524F) ; 剏 )) (define-char '((=>ucs . #x20728) ; 𠜨 @@ -4048,43 +4029,39 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 8) (total-strokes . 10) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 634) - (=jis-x0212 . #x333A) ; &JSP-333A; - (=ucs@jis . #x5231) ; &JSP-333A; - ) - )) - (hanyu-dazidian 1 343 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5E76) ; 并 - ) - ((=ucs . #x5205) ; 刅 - )) - (shinjigen-1 . 636) (=ucs . #x5259) ; 剙 - (=daikanwa . 02040) ; &I-M-02040; - (=hanziku-1 . #xECB5) ; &I-HZK01-ECB5; - (=cbeta . 04485) ; &I-CB04485; - )) -(define-char - '((=>ucs . #x5259) ; 剙 - (morohashi-daikanwa 2040 0 1) - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 8) - (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5E76) ; 并 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 634) + (=jis-x0212 . #x333A) ; &JSP-333A; + )) + (<-vulgar*sources + shinjigen-1) + (hanyu-dazidian 1 343 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5E76) ; 并 + ) + ((=ucs . #x5205) ; 刅 + )) + (shinjigen-1 . 636) + (=daikanwa . 02040) ; &M-02040; + (=hanziku-1 . #xECB5) ; &I-HZK01-ECB5; + (=cbeta . 04485) ; &I-CB04485; + (=ucs@unicode . #x5259) ; &M-02040; ) - ((=cns11643-3 . #x2152) ; &C3-2152; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5E76) ; 并 + ) + ((=cns11643-3 . #x2152) ; &C3-2152; + )) + (=cns11643-3 . #x2F62) ; &C3-2F62; )) - (=cns11643-3 . #x2F62) ; &C3-2F62; )) (define-char '((ideographic-radical . 18) ; ⼑ @@ -4721,12 +4698,19 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 8) (total-strokes . 10) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 666) - (=daikanwa . 02049) ; &I-M-02049; - ) + (->same + ((=ucs . #x525D) ; 剝 + (=daikanwa . 02049) ; &I-M-02049; + )) + (->same*sources + daikanwa) + (<-vulgar + ((shinjigen-1 . 666) + (=ucs . #x525D) ; 剝 + (=jis-x0208-1978 . #x476D) ; &I-J78-476D; )) + (<-vulgar*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ @@ -8063,51 +8047,51 @@ (=daikanwa . 02244) ; &I-M-02244; )) (define-char - '((=>ucs . #x5294) ; 劔 - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 14) - (total-strokes . 16) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 653) - (=daikanwa . 02228) ; &I-M-02228; - ) - :sources (morohashi-daikanwa shinjigen-1))) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x50C9) ; 僉 - ) - ((=jis-x0208 . #x5163) ; >-02408; - (=daikanwa . 01849) ; &I-M-01849; - )) - (shinjigen-1 . 655) - (shinjigen-2 . 655) - (=jis-x0208 . #x5179) ; >-02886; - (=gt . 02886) ; &I-GT-02886; - (=gt-pj-1 . #x5179) ; &I-GT-02886; - (=daikanwa . 02245) ; &I-M-02245; - (=ucs@jis . #x5294) ; >-02886; - )) -(define-char - '((morohashi-daikanwa 2245 0 0) - (ideographic-radical . 18) ; ⼑ + '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 14) (total-strokes . 16) - (hanyu-dazidian 1 360 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x50C9) ; 僉 + (=ucs . #x5294) ; 劔 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 653) + (=ucs . #x528D) ; 劍 + (=jis-x0208 . #x5178) ; &I-J90-5178; + (=daikanwa . 02228) ; &I-M-02228; + )) + (<-vulgar*sources + daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x50C9) ; 僉 + ) + ((=jis-x0208 . #x5163) ; >-02408; + (=daikanwa . 01849) ; &I-M-01849; + )) + (shinjigen-1 . 655) + (shinjigen-2 . 655) + (=jis-x0208 . #x5179) ; >-02886; + (=gt . 02886) ; &I-GT-02886; + (=gt-pj-1 . #x5179) ; &I-GT-02886; + (=daikanwa . 02245) ; &I-M-02245; + (=ucs@jis . #x5294) ; >-02886; ) - ((=ucs . #x5204) ; 刄 + ((hanyu-dazidian 1 360 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x50C9) ; 僉 + ) + ((=ucs . #x5204) ; 刄 + )) + (=cns11643-3 . #x5037) ; &CB00669; + (=hanziku-1 . #xF042) ; &I-HZK01-F042; + (=cbeta . 00669) ; &I-CB00669; + (=ucs@unicode . #x5294) ; &CB00669; + (mojikyo . 002245) ; &MCS-600008C5; )) - (=ucs . #x5294) ; 劔 - (=cns11643-3 . #x5037) ; &I-C3-5037; - (=hanziku-1 . #xF042) ; &I-HZK01-F042; - (=cbeta . 00669) ; &I-CB00669; - (mojikyo . 002245) ; &MCS-600008C5; )) (define-char '((=>ucs . #x207FD) ; 𠟽 diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index 3ef5fba..b523f3e 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -991,59 +991,57 @@ (=jef-china3 . #x44E0) ; &I-JC3-44E0; )) (define-char - '((script JP-Jouyou Ideograph) - (=>ucs . #x52B9) ; 効 - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 6) - (total-strokes . 8) - (<-simplified@JP/Jouyou - ((=jis-x0208 . #x5A43) ; >-16660; - (=ks-x1001 . #x7C79) ; &I-K0-7C79; - (=daikanwa . 13186) ; &I-M-13186; - )) - (<-vulgar-ideograph - ((ideographic-radical . 66) ; ⽁ - (shinjigen-1 . 725) - (=daikanwa . 13186) ; &I-M-13186; - )) - (<-vulgar-ideograph*sources - yupian zhengyun zhengzi-tong daikanwa shinjigen-1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=jis-x0208-1990 . #x3872) ; >-00390; - ) - ((=ucs . #x529B) ; 力 - )) - (shinjigen-1 . 724) - (shinjigen-2 . 724) - (=jis-x0208 . #x387A) ; >-02999; - (=gt . 02999) ; &I-GT-02999; - (=gt-k . 03699) ; &I-GT-K03699; - (=gt-pj-1 . #x387A) ; &I-GT-02999; - (=daikanwa . 02334) ; &I-M-02334; - (=cbeta . 00283) ; &I-CB00283; - (=ucs@jis . #x52B9) ; >-02999; - )) -(define-char - '((morohashi-daikanwa 2334 0 0) - (ideographic-radical . 19) ; ⼒ + '((ideographic-radical . 19) ; ⼒ (ideographic-strokes . 6) (total-strokes . 8) - (hanyu-dazidian 1 370 1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EA4) ; 交 - ) - ((=ucs . #x529B) ; 力 - )) (=ucs . #x52B9) ; 効 - (=iso-ir165 . #x2C7B) ; &I-EGB-2C7B; - (=cns11643-3 . #x2760) ; &I-C3-2760; - (=hanziku-1 . #xF242) ; &I-HZK01-F242; + (->subsumptive + ((script JP Jouyou Ideograph) + (<-simplified@JP/Jouyou + ((=jis-x0208 . #x5A43) ; >-16660; + (=ks-x1001 . #x7C79) ; &I-K0-7C79; + (=daikanwa . 13186) ; &I-M-13186; + )) + (<-vulgar + ((shinjigen-1 . 725) + (=jis-x0208 . #x5A43) ; >-16660; + (=ks-x1001 . #x7C79) ; &I-K0-7C79; + (=daikanwa . 13186) ; &I-M-13186; + )) + (<-vulgar*sources + yupian zhengyun zhengzi-tong daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=jis-x0208-1990 . #x3872) ; >-00390; + ) + ((=ucs . #x529B) ; 力 + )) + (shinjigen-1 . 724) + (shinjigen-2 . 724) + (=jis-x0208 . #x387A) ; >-02999; + (=gt . 02999) ; &I-GT-02999; + (=gt-k . 03699) ; &I-GT-K03699; + (=gt-pj-1 . #x387A) ; &I-GT-02999; + (=daikanwa . 02334) ; &I-M-02334; + (=cbeta . 00283) ; &I-CB00283; + (=ucs@jis . #x52B9) ; >-02999; + ) + ((hanyu-dazidian 1 370 1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EA4) ; 交 + ) + ((=ucs . #x529B) ; 力 + )) + (=iso-ir165 . #x2C7B) ; &HZK01-F242; + (=cns11643-3 . #x2760) ; &I-C3-2760; + (=hanziku-1 . #xF242) ; &I-HZK01-F242; + (=ucs@unicode . #x52B9) ; &HZK01-F242; + )) )) (define-char '((ideographic-radical . 19) ; ⼒ @@ -1471,10 +1469,10 @@ ((=ucs . #x6555) ; 敕 (=jis-x0208 . #x5A45) ; &I-J90-5A45; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 02380) ; &I-M-02380; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa) (hanyu-dazidian 1 371 2) (ideographic-structure @@ -1581,53 +1579,47 @@ (=ucs . #x52C6) ; 勆 )) (define-char - '((ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 7) - (total-strokes . 9) - (hanyu-dazidian 1 372 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x752C) ; 甬 + '((<-denotational + ((=ucs . #x52C7) ; 勇 + )) + (->subsumptive + ((hanyu-dazidian 1 372 7) + (shinjigen-1 . 731) + (shinjigen-2 . 731) + (=gb2312 . #x5342) ; &M-02360; + (=big5 . #xAB69) ; &I-B-AB69; + (=daikanwa . 02360) ; &I-M-02360; + (=ucs@unicode . #x52C7) ; &M-02360; ) - ((=ucs . #x529B) ; 力 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x752C) ; 甬 + ) + ((=ucs . #x529B) ; 力 + )) + (=cns11643-1 . #x502D) ; &C1-502D; )) - (shinjigen-1 . 731) - (shinjigen-2 . 731) - (=ucs . #x52C7) ; 勇 - (=gb2312 . #x5342) ; &I-G0-5342; - (=big5 . #xAB69) ; &I-B-AB69; - (=daikanwa . 02360) ; &I-M-02360; )) (define-char - '((=>ucs . #x52C7) ; 勇 - (morohashi-daikanwa 2360 0 1) - (ideographic-radical . 19) ; ⼒ + '((ideographic-radical . 19) ; ⼒ (ideographic-strokes . 7) (total-strokes . 9) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x752C) ; 甬 - ) - ((=ucs . #x529B) ; 力 - )) - (=cns11643-1 . #x502D) ; &C1-502D; + (=ucs . #x52C7) ; 勇 )) (define-char - '((script JP-Jouyou Ideograph) - (=>ucs . #x52C7) ; 勇 + '((script JP Jouyou Ideograph) (morohashi-daikanwa 2360 1) - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 7) - (total-strokes . 9) - (<-vulgar-ideograph + (<-denotational + ((=ucs . #x52C7) ; 勇 + )) + (<-vulgar ((shinjigen-1 . 731) + (=gb2312 . #x5342) ; &M-02360; (=daikanwa . 02360) ; &I-M-02360; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa shinjigen-1) (shinjigen-1 . 730) (shinjigen-2 . 730) @@ -2263,91 +2255,89 @@ '((ideographic-radical . 19) ; ⼒ (ideographic-strokes . 9) (total-strokes . 11) - (hanyu-dazidian 1 375 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5192) ; 冒 - ) - ((=ucs . #x529B) ; 力 - )) - (shinjigen-1 . 740) - (shinjigen-2 . 740) (=ucs . #x52D6) ; 勖 - (=gb2312 . #x5B43) ; &I-G0-5B43; - (=ks-x1001 . #x696D) ; &I-K0-696D; - (=jis-x0212 . #x336D) ; &I-JSP-336D; - (=cns11643-2 . #x3370) ; &I-C2-3370; - (=jis-x0213-1-2000 . #x2E66) ; &I-JX1-2E66; - (=big5 . #xD46D) ; &I-B-D46D; - (=daikanwa . 02391) ; &I-M-02391; - )) -(define-char - '((=>ucs . #x52D6) ; 勖 - (morohashi-daikanwa 2391 0 0) - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 9) - (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=jis-x0208 . #x4B41) ; >-29718; - (=cns11643-6 . #x316D) ; &I-C6-316D; - ) - ((=ucs . #x529B) ; 力 - )) - (=jef-china3 . #x44EC) ; &JC3-44EC; - )) -(define-char - '((=>ucs . #x52D7) ; 勗 - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 9) - (total-strokes . 11) - (<-vulgar-ideograph - ((shinjigen-1 . 740) + (->subsumptive + ((hanyu-dazidian 1 375 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5192) ; 冒 + ) + ((=ucs . #x529B) ; 力 + )) + (shinjigen-1 . 740) + (shinjigen-2 . 740) + (=gb2312 . #x5B43) ; &M-02391; + (=ks-x1001 . #x696D) ; &I-K0-696D; + (=jis-x0212 . #x336D) ; &I-JSP-336D; + (=cns11643-2 . #x3370) ; &I-C2-3370; + (=jis-x0213-1-2000 . #x2E66) ; &I-JX1-2E66; + (=big5 . #xD46D) ; &I-B-D46D; (=daikanwa . 02391) ; &I-M-02391; - )) - (<-vulgar-ideograph*sources - daikanwa shinjigen-1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((name* . "ideographic component hood") - (=big5-cdp . #x8A78) ; &CDP-8A78; + (=ucs@unicode . #x52D6) ; &M-02391; ) - ((=ucs . #x52A9) ; 助 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=jis-x0208 . #x4B41) ; >-29718; + (=cns11643-6 . #x316D) ; &I-C6-316D; + ) + ((=ucs . #x529B) ; 力 + )) + (=jef-china3 . #x44EC) ; &JC3-44EC; )) - (shinjigen-1 . 741) - (shinjigen-2 . 741) - (=daikanwa . 02392) ; &M-02392; )) (define-char - '((morohashi-daikanwa 2392 0 1) - (ideographic-radical@ucs . 19) ; ⼒ - (ideographic-strokes@ucs . 9) - (ideographic-radical@ucs*sources - daikanwa ucs) - (ideographic-radical@cns . 73) ; ⽈ - (ideographic-strokes@cns . 7) + '((ideographic-radical . 19) ; ⼒ + (ideographic-strokes . 9) (total-strokes . 11) - (hanyu-dazidian 2 1512 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=cns11643-1 . #x454B) ; &C1-454B; - ) - ((=ucs . #x52A9) ; 助 - )) + (ideographic-radical*sources daikanwa ucs) (=ucs . #x52D7) ; 勗 - (=jis-x0208 . #x5228) ; &I-J90-5228; - (=cns11643-1 . #x5B2B) ; &I-C1-5B2B; - (=big5 . #xB1E5) ; &I-B-B1E5; - (=gt . 03066) ; &I-GT-03066; - (=gt-pj-1 . #x5228) ; &I-GT-03066; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 740) + (=gb2312 . #x5B43) ; &M-02391; + (=ks-x1001 . #x696D) ; &I-K0-696D; + (=jis-x0212 . #x336D) ; &I-JSP-336D; + (=cns11643-2 . #x3370) ; &I-C2-3370; + (=jis-x0213-1-2000 . #x2E66) ; &I-JX1-2E66; + (=daikanwa . 02391) ; &I-M-02391; + )) + (<-vulgar*sources + daikanwa shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((name* . "ideographic component hood") + (=big5-cdp . #x8A78) ; &CDP-8A78; + ) + ((=ucs . #x52A9) ; 助 + )) + (shinjigen-1 . 741) + (shinjigen-2 . 741) + (=daikanwa . 02392) ; &M-02392; + ) + ((ideographic-radical@cns . 73) ; ⽈ + (ideographic-strokes@cns . 7) + (hanyu-dazidian 2 1512 12) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=cns11643-1 . #x454B) ; &C1-454B; + ) + ((=ucs . #x52A9) ; 助 + )) + (=jis-x0208 . #x5228) ; >-03066; + (=cns11643-1 . #x5B2B) ; &I-C1-5B2B; + (=big5 . #xB1E5) ; &I-B-B1E5; + (=gt . 03066) ; &I-GT-03066; + (=gt-pj-1 . #x5228) ; &I-GT-03066; + (=ucs@unicode . #x52D7) ; >-03066; + )) )) (define-char '((=>ucs . #x52D8) ; 勘 @@ -2676,52 +2666,59 @@ (=cns11643-5 . #x366A) ; &I-C5-366A; )) (define-char - '((=>ucs . #x52DD) ; 勝 - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 10) - (total-strokes . 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x6708) ; 月 - ) - ((=jis-x0208 . #x5225) ; >-02996; - (=daikanwa . 02330) ; &I-M-02330; - )) - (shinjigen-1 . 746) - (shinjigen-2 . 746) - (=ks-x1001 . #x632D) ; &M-02409; - (=daikanwa . 02409) ; &I-M-02409; - (=jef-china3 . #x44F9) ; &I-JC3-44F9; - (mojikyo . 002409) ; &MCS-60000969; - )) -(define-char - '((script JP-Jouyou Ideograph) - (morohashi-daikanwa 2409 0 1) - (ideographic-radical . 19) ; ⼒ + '((ideographic-radical . 19) ; ⼒ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 3 2090 13) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + (=ucs . #x52DD) ; 勝 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00606) ; >-K00606; + ) + ((=jis-x0208 . #x5225) ; >-02996; + (=daikanwa . 02330) ; &I-M-02330; + )) + (shinjigen-1 . 746) + (shinjigen-2 . 746) + (=ks-x1001 . #x632D) ; &M-02409; + (=daikanwa . 02409) ; &I-M-02409; + (=jef-china3 . #x44F9) ; &I-JC3-44F9; + (mojikyo . 002409) ; &MCS-60000969; ) - ((=ucs . #x6708) ; 月 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x6708) ; 月 + ) + ((=jis-x0208 . #x5225) ; >-02996; + (=daikanwa . 02330) ; &I-M-02330; + )) + (=big5 . #xB3D3) ; &B-B3D3; ) - ((=ucs . #x52B5) ; 劵 + ((script JP Jouyou Ideograph) + (hanyu-dazidian 3 2090 13) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x6708) ; 月 + ) + ((=ucs . #x52B5) ; 劵 + )) + (shinjigen-1 . 745) + (shinjigen-2 . 745) + (=jis-x0208 . #x3E21) ; >-03095; + (=cns11643-1 . #x5E39) ; &I-C1-5E39; + (=gb12345 . #x4A24) ; >-03095; + (=gt . 03095) ; &I-GT-03095; + (=gt-k . 09249) ; &I-GT-K09249; + (=gt-pj-1 . #x3E21) ; &I-GT-03095; + (=ucs@unicode . #x52DD) ; >-03095; + (mojikyo . 054161) ; &MCS-6000D391; )) - (shinjigen-1 . 745) - (shinjigen-2 . 745) - (=ucs . #x52DD) ; 勝 - (=jis-x0208 . #x3E21) ; &I-J90-3E21; - (=cns11643-1 . #x5E39) ; &I-C1-5E39; - (=gb12345 . #x4A24) ; 勝 - (=big5 . #xB3D3) ; &I-B-B3D3; - (=gt . 03095) ; &I-GT-03095; - (=gt-k . 09249) ; &I-GT-K09249; - (=gt-pj-1 . #x3E21) ; &I-GT-03095; - (mojikyo . 054161) ; &MCS-6000D391; )) (define-char '((ideographic-radical . 19) ; ⼒ @@ -2802,12 +2799,15 @@ (=daikanwa . 02415) ; &I-M-02415; )) (define-char - '((script JP-Jouyou Ideograph) + '((script JP Jouyou Ideograph) (=>ucs* . #x52E4) ; 勤 (morohashi-daikanwa 2415 1) (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 10) (total-strokes . 12) + (<-denotational + ((=ucs . #x52E4) ; 勤 + )) (<-simplified@JP/Jouyou ((=ucs . #xFA34) ; 勤 (=jis-x0213-1-2000 . #x2E68) ; &I-JX1-2E68; @@ -2815,11 +2815,12 @@ )) (<-simplified@JP/Jouyou*sources daikanwa JP/Jouyou) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 744) - (=daikanwa . 02424) ; &I-M-02424; + (=ucs . #xFA34) ; 勤 + (=jis-x0213-1-2000 . #x2E68) ; &I-JX1-2E68; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 743) (shinjigen-2 . 743) @@ -3065,10 +3066,17 @@ (=daikanwa . 02423) ; &I-M-02423; )) (define-char + '((ideographic-radical . 19) ; ⼒ + (=ucs . #x52E4) ; 勤 + )) +(define-char '((=>ucs* . #x52E4) ; 勤 (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 11) (total-strokes . 13) + (<-denotational + ((=ucs . #x52E4) ; 勤 + )) (hanyu-dazidian 1 378 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -3094,17 +3102,6 @@ (=ucs@big5 . #x52E4) ; 勤 )) (define-char - '((=>ucs@jis . #xFA34) ; 勤 - (morohashi-daikanwa 2424 0 0) - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 11) - (total-strokes . 13) - (->identical - ((=ucs . #xFA34) ; 勤 - )) - (=ucs . #x52E4) ; 勤 - )) -(define-char '((=>ucs . #x52E5) ; 勥 (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 11) @@ -3220,69 +3217,66 @@ (=daikanwa . 02432) ; &M-02432; )) (define-char - '((script JP-Jouyou Ideograph) - (=>ucs . #x52E7) ; 勧 - (ideographic-radical . 19) ; ⼒ - (ideographic-strokes . 11) - (total-strokes . 13) - (<-simplified - ((shinjigen-1 . 751) - (=daikanwa . 02486) ; &M-02486; - )) - (<-simplified*sources - songyuan-yilai-suzipu daikanwa shinjigen-1) - (<-simplified@JP/Jouyou - ((=jis-x0208 . #x5230) ; >-03191; - (=ks-x1001 . #x4F68) ; &I-K0-4F68; - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=gt . 56364) ; >-56364; - ) - ((=ucs . #x529B) ; 力 - )) - (shinjigen-1 . 750) - (shinjigen-2 . 750) - (=jis-x0208 . #x342B) ; >-03106; - (=gt . 03106) ; &I-GT-03106; - (=gt-pj-1 . #x342B) ; &I-GT-03106; - (=daikanwa . 02433) ; &I-M-02433; - (=ucs@jis . #x52E7) ; >-03106; - )) -(define-char - '((morohashi-daikanwa 2433 0 1) - (ideographic-radical . 19) ; ⼒ + '((ideographic-radical . 19) ; ⼒ (ideographic-strokes . 11) (total-strokes . 13) - (hanyu-dazidian 1 379 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID") - (=ucs . #x2FFB) ; ⿻ + (=ucs . #x52E7) ; 勧 + (->subsumptive + ((script JP Jouyou Ideograph) + (<-simplified + ((shinjigen-1 . 751) + (=daikanwa . 02486) ; &M-02486; + )) + (<-simplified*sources + songyuan-yilai-suzipu daikanwa shinjigen-1) + (<-simplified@JP/Jouyou + ((=jis-x0208 . #x5230) ; >-03191; + (=ks-x1001 . #x4F68) ; &I-K0-4F68; + )) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt . 56364) ; >-56364; + ) + ((=ucs . #x529B) ; 力 + )) + (shinjigen-1 . 750) + (shinjigen-2 . 750) + (=jis-x0208 . #x342B) ; >-03106; + (=gt . 03106) ; &I-GT-03106; + (=gt-pj-1 . #x342B) ; &I-GT-03106; + (=daikanwa . 02433) ; &I-M-02433; + (=ucs@jis . #x52E7) ; >-03106; + ) + ((hanyu-dazidian 1 379 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID") + (=ucs . #x2FFB) ; ⿻ ) - ((name* . "ideographic component person for top") - (=ucs . #x20089) ; 𠂉 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((name* . "ideographic component person for top") + (=ucs . #x20089) ; 𠂉 + ) + ((=ucs . #x4E00) ; 一 + )) ) - ((=ucs . #x4E00) ; 一 + ((=ucs . #x96B9) ; 隹 )) ) - ((=ucs . #x96B9) ; 隹 + ((=ucs . #x529B) ; 力 )) - ) - ((=ucs . #x529B) ; 力 + (=cns11643-3 . #x4046) ; &HZK01-F3EA; + (=hanziku-1 . #xF3EA) ; &I-HZK01-F3EA; + (=ucs@unicode . #x52E7) ; &HZK01-F3EA; )) - (=ucs . #x52E7) ; 勧 - (=cns11643-3 . #x4046) ; &I-C3-4046; - (=hanziku-1 . #xF3EA) ; &I-HZK01-F3EA; )) (define-char '((ideographic-radical . 19) ; ⼒ diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el index 16b4945..c26dc8a 100644 --- a/lisp/utf-2000/Ideograph-R020-Wrap.el +++ b/lisp/utf-2000/Ideograph-R020-Wrap.el @@ -90,40 +90,39 @@ (=jef-china3 . #x45A2) ; &I-JC3-45A2; )) (define-char - '((=>ucs . #x5300) ; 匀 - (ideographic-radical . 20) ; ⼓ - (ideographic-strokes . 2) - (total-strokes . 4) - (<-vulgar-ideograph - (:sources (seiji-tsuu morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 764) - (=daikanwa . 02496) ; &I-M-02496; - ) - )) - (shinjigen-1 . 764) - (shinjigen-2 . 765) - (=jis-x0212 . #x337B) ; &M-02497; - (=jis-x0213-1-2000 . #x2E6B) ; &I-JX1-2E6B; - (=daikanwa . 02497) ; &I-M-02497; - (=jef-china3 . #x45A3) ; &I-JC3-45A3; - (=ucs@jis . #x5300) ; &M-02497; - )) -(define-char - '((morohashi-daikanwa 2497 0 1) - (ideographic-radical . 20) ; ⼓ + '((ideographic-radical . 20) ; ⼓ (ideographic-strokes . 2) (total-strokes . 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") - (=ucs . #x2FF9) ; ⿹ - ) - ((=ucs . #x52F9) ; 勹 - ) - ((=ucs . #x51AB) ; 冫 - )) (=ucs . #x5300) ; 匀 - (=gb2312 . #x5448) ; &I-G0-5448; - (=cns11643-3 . #x2156) ; &I-C3-2156; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 764) + (=ucs . #x52FB) ; 勻 + (=jis-x0213-1-2000 . #x2E6A) ; &I-JX1-2E6A; + (=daikanwa . 02496) ; &I-M-02496; + )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) + (shinjigen-1 . 764) + (shinjigen-2 . 765) + (=jis-x0212 . #x337B) ; &M-02497; + (=jis-x0213-1-2000 . #x2E6B) ; &I-JX1-2E6B; + (=daikanwa . 02497) ; &I-M-02497; + (=jef-china3 . #x45A3) ; &I-JC3-45A3; + (=ucs@jis . #x5300) ; &M-02497; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") + (=ucs . #x2FF9) ; ⿹ + ) + ((=ucs . #x52F9) ; 勹 + ) + ((=ucs . #x51AB) ; 冫 + )) + (=gb2312 . #x5448) ; &C3-2156; + (=cns11643-3 . #x2156) ; &I-C3-2156; + (=ucs@unicode . #x5300) ; &C3-2156; + )) )) (define-char '((ideographic-radical . 20) ; ⼓ diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el index ae66502..9ab1e29 100644 --- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el @@ -97,13 +97,14 @@ '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 3) (total-strokes . 5) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((ideographic-radical . 50) ; ⼱ - (shinjigen-1 . 2079) - (=ucs . #x5E00) ; 帀 - ) + (<-vulgar + ((shinjigen-1 . 2079) + (=ucs . #x5E00) ; 帀 + (=jis-x0212 . #x3C24) ; &I-JSP-3C24; + (=jis-x0213-2-2000 . #x2870) ; &I-JX2-2870; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 82 4) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") @@ -1222,11 +1223,11 @@ '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 12) (total-strokes . 14) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 796) (=daikanwa . 02655) ; &I-M-02655; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (hanyu-dazidian 1 89 13) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el index dcfc706..2352eee 100644 --- a/lisp/utf-2000/Ideograph-R024-Ten.el +++ b/lisp/utf-2000/Ideograph-R024-Ten.el @@ -151,17 +151,17 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 2) (total-strokes . 4) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 823) - (=daikanwa . 02740) ; &I-M-02740; - ) + (<-vulgar + ((shinjigen-1 . 823) + (=daikanwa . 02740) ; &I-M-02740; )) + (<-vulgar*sources + shinjigen-1) (<-wrong-ideograph - (:sources (henkai morohashi-daikanwa) - :char ((=daikanwa . 02740) ; &I-M-02740; - ) + ((=daikanwa . 02740) ; &I-M-02740; )) + (<-wrong-ideograph*sources + pianhai daikanwa) (hanyu-dazidian 1 59 4) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -688,11 +688,12 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 5) (total-strokes . 7) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 910) - (=daikanwa . 03154) ; &I-M-03154; - ) - :sources (gyokuhen morohashi-daikanwa shinjigen-1))) + (<-vulgar + ((shinjigen-1 . 910) + (=daikanwa . 03154) ; &I-M-03154; + )) + (<-vulgar*sources + yupian daikanwa shinjigen-1) (hanyu-dazidian 1 515 9) (shinjigen-1 . 911) (=ucs . #x20991) ; 𠦑 @@ -774,10 +775,17 @@ (=cns11643-5 . #x2540) ; &I-C5-2540; )) (define-char + '((ideographic-radical . 24) ; ⼗ + (=ucs . #x5351) ; 卑 + )) +(define-char '((=>ucs* . #x5351) ; 卑 (ideographic-radical . 24) ; ⼗ (ideographic-strokes . 6) (total-strokes . 8) + (<-denotational + ((=ucs . #x5351) ; 卑 + )) (hanyu-dazidian 1 63 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -803,32 +811,23 @@ (=ucs@big5 . #x5351) ; 卑 )) (define-char - '((=>ucs@jis . #xFA35) ; 卑 - (morohashi-daikanwa 2738 0 0) - (ideographic-radical . 24) ; ⼗ - (ideographic-strokes . 6) - (total-strokes . 8) - (->identical - ((=ucs . #xFA35) ; 卑 - )) - (=ucs . #x5351) ; 卑 - )) -(define-char '((script JP Jouyou Ideograph) - (=>ucs . #x5351) ; 卑 - (morohashi-daikanwa 2738 0 1) (ideographic-radical . 24) ; ⼗ (ideographic-strokes . 7) (total-strokes . 9) + (<-denotational + ((=ucs . #x5351) ; 卑 + )) (<-simplified@JP/Jouyou ((=ucs . #xFA35) ; 卑 (=jis-x0213-1-2000 . #x2E6E) ; &I-JX1-2E6E; )) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 830) - (=daikanwa . 02738) ; &I-M-02738; + (=ucs . #xFA35) ; 卑 + (=jis-x0213-1-2000 . #x2E6E) ; &I-JX1-2E6E; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 829) (shinjigen-2 . 829) @@ -844,11 +843,13 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 6) (total-strokes . 8) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 830) + (=ucs . #xFA35) ; 卑 + (=jis-x0213-1-2000 . #x2E6E) ; &I-JX1-2E6E; (=daikanwa . 02738) ; &I-M-02738; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa shinjigen-1) (shinjigen-1 . 831) (shinjigen-2 . 831) @@ -1206,11 +1207,19 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 8) (total-strokes . 10) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 1170) - (=daikanwa . 03993) ; &I-M-03993; - ) - :sources (shinjigen-1))) + (<-simplified@misc + ((=ucs . #x55AE) ; 單 + (=daikanwa . 03993) ; &I-M-03993; + )) + (<-simplified@misc*sources + daikanwa) + (<-vulgar + ((shinjigen-1 . 1170) + (=ucs . #x55AE) ; 單 + (=jis-x0208 . #x5345) ; &I-J90-5345; + )) + (<-vulgar*sources + shinjigen-1) (shinjigen-1 . 1171) (=ucs . #x209A4) ; 𠦤 (=cns11643-6 . #x3566) ; &I-C6-3566; diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el index c595f98..62fce5c 100644 --- a/lisp/utf-2000/Ideograph-R026-Seal.el +++ b/lisp/utf-2000/Ideograph-R026-Seal.el @@ -65,14 +65,12 @@ (=daikanwa . 02839) ; &I-M-02839; )) (define-char - '((ideographic- (:radical 26 ; ⼙ - :strokes 1) - (:radical 3 ; ⼂ - :strokes 2)) + '((ideographic-radical@ucs . 3) ; ⼂ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 26) ; ⼙ + (ideographic-strokes@daikanwa . 1) (total-strokes . 3) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 52) - (hanyu-dazidian-char . 1) + (hanyu-dazidian 1 52 1) (=ucs . #x2007E) ; 𠁾 (=cns11643-5 . #x212D) ; &I-C5-212D; (=daikanwa . 02840) ; &I-M-02840; @@ -412,10 +410,10 @@ ((=ucs . #x537D) ; 卽 (=jis-x0213-1-2000 . #x2E71) ; &I-JX1-2E71; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 02873) ; &M-02873; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (hanyu-dazidian 1 314 2) (ideographic-structure @@ -878,32 +876,43 @@ (=hanziku-1 . #xE7C4) ; &I-HZK01-E7C4; )) (define-char - '((=>ucs . #x537F) ; 卿 + '((=>ucs* . #x537F) ; 卿 (ideographic-radical . 26) ; ⼙ (ideographic-strokes . 9) (total-strokes . 11) - (<-vulgar-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 02879) ; &I-M-02879; - ) + (<-denotational + ((=ucs . #x537F) ; 卿 + )) + (=ucs . #x2F831) ; 卿 + (->subsumptive + ((<-vulgar + ((=ucs . #x2F833) ; 卿 + (=daikanwa . 02879) ; &I-M-02879; + )) + (<-vulgar*sources + daikanwa) + (=daikanwa . 02877) ; &M-02877; + ) + ((=cns11643-6 . #x3D59) ; &C6-3D59; + (=ucs@iso . #x2F831) ; &C6-3D59; )) - (=cns11643-6 . #x3D59) ; &M-02877; - (=daikanwa . 02877) ; &I-M-02877; )) (define-char - '((morohashi-daikanwa 2877 0 2) + '((=>daikanwa . 02877) ; &M-02877; (ideographic-radical . 26) ; ⼙ (ideographic-strokes . 8) (total-strokes . 10) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 318) - (hanyu-dazidian-char . 3) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 868) - (=daikanwa . 02880) ; &I-M-02880; - ) + (<-denotational + ((=ucs . #x537F) ; 卿 + )) + (<-vulgar + ((shinjigen-1 . 868) + (=jis-x0208-1978 . #x362A) ; &M-02880; + (=ks-x1001 . #x4C4F) ; &I-K0-4C4F; + (=daikanwa . 02880) ; &I-M-02880; )) + (<-vulgar*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ @@ -914,30 +923,37 @@ )) (shinjigen-1 . 870) (shinjigen-2 . 870) - (=ucs . #x537F) ; 卿 - (=gb2312 . #x4764) ; &I-G0-4764; + (=gb2312 . #x4764) ; >-03656; (=jis-x0208-1983 . #x362A) ; &I-J83-362A; (=jis-x0208-1990 . #x362A) ; &I-J90-362A; (=cns11643-1 . #x544E) ; &I-C1-544E; (=gt . 03656) ; &I-GT-03656; (=gt-pj-1 . #x362A) ; &I-GT-03656; (=jef-china3 . #x45D5) ; &I-JC3-45D5; + (=ucs@unicode . #x537F) ; >-03656; (mojikyo . 054486) ; &MCS-6000D4D6; )) (define-char - '((ideographic-radical . 26) ; ⼙ + '((=>ucs* . #x537F) ; 卿 + (ideographic-radical . 26) ; ⼙ (ideographic-strokes . 9) (total-strokes . 11) - (<-vulgar-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 02879) ; &I-M-02879; - ) + (<-denotational + ((=ucs . #x537F) ; 卿 )) - (=cns11643-6 . #x3D5A) ; &M-02878; + (<-vulgar + ((=ucs . #x2F833) ; 卿 + (=daikanwa . 02879) ; &I-M-02879; + )) + (<-vulgar*sources + daikanwa) + (=ucs . #x2F832) ; 卿 + (=cns11643-6 . #x3D5A) ; &I-C6-3D5A; (=daikanwa . 02878) ; &I-M-02878; )) (define-char - '((ideographic-radical . 26) ; ⼙ + '((=>ucs* . #x537F) ; 卿 + (ideographic-radical . 26) ; ⼙ (ideographic-strokes . 10) (total-strokes . 12) (->ideographic-variants @@ -945,6 +961,9 @@ (=daikanwa . 02880) ; &I-M-02880; ) :sources (shinjigen-1))) + (<-denotational + ((=ucs . #x537F) ; 卿 + )) (shinjigen-1 . 869) (shinjigen-2 . 869) (=ucs . #x2F833) ; 卿 @@ -952,11 +971,17 @@ (=daikanwa . 02879) ; &I-M-02879; )) (define-char - '((=>ucs . #x537F) ; 卿 - (ideographic-radical . 26) ; ⼙ + '((ideographic-radical . 26) ; ⼙ + (hanyu-dazidian 1 318 3) + (=ucs . #x537F) ; 卿 + )) +(define-char + '((ideographic-radical . 26) ; ⼙ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 318 3) + (<-denotational + ((=ucs . #x537F) ; 卿 + )) (shinjigen-1 . 868) (shinjigen-2 . 868) (=jis-x0208-1978 . #x362A) ; &M-02880; diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el index fe1831d..a7928fa 100644 --- a/lisp/utf-2000/Ideograph-R027-Cliff.el +++ b/lisp/utf-2000/Ideograph-R027-Cliff.el @@ -1601,11 +1601,12 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 9) (total-strokes . 11) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 2191) - (=daikanwa . 09410) ; &I-M-09410; - ) - :sources (shinjigen-1))) + (<-vulgar + ((shinjigen-1 . 2191) + (=daikanwa . 09410) ; &I-M-09410; + )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 75 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -1866,66 +1867,58 @@ (=daikanwa . 02992) ; &I-M-02992; )) (define-char - '((=>ucs . #x53A6) ; 厦 - (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 10) - (total-strokes . 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 - ) - ((=daikanwa . 05720) ; &M-05720; - )) - (=daikanwa . 02993) ; &M-02993; - )) -(define-char - '((=>ucs . #x53A6) ; 厦 - (morohashi-daikanwa 2993 0 0) - (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 10) - (total-strokes . 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 - ) - ((=cns11643-1 . #x546E) ; &C1-546E; - )) - (=cns11643-3 . #x3A28) ; &C3-3A28; - )) -(define-char - '((morohashi-daikanwa 2993 0 1) - (ideographic-radical . 27) ; ⼚ + '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 10) (total-strokes . 12) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2199) - (=jis-x0208 . #x567C) ; >-11869; - ) - )) - (hanyu-dazidian 1 75 25) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ + (=ucs . #x53A6) ; 厦 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=daikanwa . 05720) ; &M-05720; + )) + (=daikanwa . 02993) ; &M-02993; ) - ((=ucs . #x5382) ; 厂 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=cns11643-1 . #x546E) ; &C1-546E; + )) + (=cns11643-3 . #x3A28) ; &C3-3A28; ) - ((=ucs . #x590F) ; 夏 + ((<-vulgar + ((shinjigen-1 . 2199) + (=jis-x0208 . #x567C) ; >-11869; + (=ks-x1001 . #x793F) ; &I-K0-793F; + )) + (<-vulgar*sources + shinjigen-1) + (hanyu-dazidian 1 75 25) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=ucs . #x590F) ; 夏 + )) + (shinjigen-1 . 2200) + (shinjigen-2 . 2200) + (=jis-x0208 . #x524F) ; >-03789; + (=gb2312 . #x4F43) ; &I-G0-4F43; + (=ks-x1001 . #x793D) ; &I-K0-793D; + (=gt . 03789) ; &I-GT-03789; + (=gt-k . 09168) ; &I-GT-K09168; + (=gt-pj-1 . #x524F) ; &I-GT-03789; + (=hanziku-1 . #xB3A7) ; &I-HZK01-B3A7; + (=ucs@unicode . #x53A6) ; >-03789; )) - (shinjigen-1 . 2200) - (shinjigen-2 . 2200) - (=ucs . #x53A6) ; 厦 - (=jis-x0208 . #x524F) ; &I-J90-524F; - (=gb2312 . #x4F43) ; &I-G0-4F43; - (=ks-x1001 . #x793D) ; &I-K0-793D; - (=gt . 03789) ; &I-GT-03789; - (=gt-k . 09168) ; &I-GT-K09168; - (=gt-pj-1 . #x524F) ; &I-GT-03789; - (=hanziku-1 . #xB3A7) ; &I-HZK01-B3A7; )) (define-char '((=>ucs . #x20A87) ; 𠪇 @@ -2109,12 +2102,12 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 10) (total-strokes . 12) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2216) - (=daikanwa . 09479) ; &I-M-09479; - ) + (<-vulgar + ((shinjigen-1 . 2216) + (=daikanwa . 09479) ; &I-M-09479; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 75 24) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -2198,11 +2191,11 @@ (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 11) (total-strokes . 13) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 2207) (=gt . 11902) ; >-11902; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -2647,12 +2640,12 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 12) (total-strokes . 14) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2212) - (=daikanwa . 09487) ; &I-M-09487; - ) + (<-vulgar + ((shinjigen-1 . 2212) + (=daikanwa . 09487) ; &I-M-09487; )) + (<-vulgar*sources + shinjigen-1) (hanyu-dazidian 1 77 13) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") @@ -2756,73 +2749,68 @@ (=daikanwa . 03032) ; &M-03032; )) (define-char - '((=>ucs . #x3551) ; 㕑 - (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 12) - (total-strokes . 14) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 2216) - (=daikanwa . 09479) ; &I-M-09479; - ) - )) - (shinjigen-1 . 2218) - (=daikanwa . 03033) ; &M-03033; - )) -(define-char - '((morohashi-daikanwa 3033 0 2) - (ideographic-radical . 27) ; ⼚ + '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 12) (total-strokes . 14) (=ucs . #x3551) ; 㕑 - (=cns11643-3 . #x4624) ; &I-C3-4624; - )) -(define-char - '((=>ucs . #x53B0) ; 厰 - (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 12) - (total-strokes . 14) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 2214) - (=daikanwa . 09490) ; &I-M-09490; - ) - :sources (shinjigen-1))) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 2216) + (=daikanwa . 09479) ; &I-M-09479; + )) + (<-vulgar*sources + shinjigen-1) + (shinjigen-1 . 2218) + (=daikanwa . 03033) ; &M-03033; ) - ((=jis-x0208 . #x5A48) ; >-16763; - (=ks-x1001 . #x7362) ; &I-K0-7362; - (=daikanwa . 13246) ; &I-M-13246; + ((=cns11643-3 . #x4624) ; &C3-4624; + (=ucs@unicode . #x3551) ; &C3-4624; )) - (shinjigen-1 . 2215) - (shinjigen-2 . 2215) - (=jis-x0208 . #x5252) ; >-03839; - (=gt . 03839) ; &I-GT-03839; - (=gt-pj-1 . #x5252) ; &I-GT-03839; - (=daikanwa . 03034) ; &I-M-03034; - (=cbeta . 01927) ; &I-CB01927; - (=ucs@jis . #x53B0) ; >-03839; )) (define-char - '((morohashi-daikanwa 3034 0 2) - (ideographic-radical . 27) ; ⼚ + '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 12) (total-strokes . 14) - (hanyu-dazidian 1 78 2) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 - ) - ((=ucs . #x655E) ; 敞 - )) (=ucs . #x53B0) ; 厰 - (=cns11643-3 . #x4626) ; &I-C3-4626; - (=hanziku-1 . #xB3F0) ; &I-HZK01-B3F0; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 2214) + (=daikanwa . 09490) ; &I-M-09490; + )) + (<-vulgar*sources + shinjigen-1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=jis-x0208 . #x5A48) ; >-16763; + (=ks-x1001 . #x7362) ; &I-K0-7362; + (=daikanwa . 13246) ; &I-M-13246; + )) + (shinjigen-1 . 2215) + (shinjigen-2 . 2215) + (=jis-x0208 . #x5252) ; >-03839; + (=gt . 03839) ; &I-GT-03839; + (=gt-pj-1 . #x5252) ; &I-GT-03839; + (=daikanwa . 03034) ; &I-M-03034; + (=cbeta . 01927) ; &I-CB01927; + (=ucs@jis . #x53B0) ; >-03839; + ) + ((hanyu-dazidian 1 78 2) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=ucs . #x655E) ; 敞 + )) + (=cns11643-3 . #x4626) ; &HZK01-B3F0; + (=hanziku-1 . #xB3F0) ; &I-HZK01-B3F0; + (=ucs@unicode . #x53B0) ; &HZK01-B3F0; + )) )) (define-char '((ideographic-radical . 27) ; ⼚ diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el index a91d72d..84fce02 100644 --- a/lisp/utf-2000/Ideograph-R028-Private.el +++ b/lisp/utf-2000/Ideograph-R028-Private.el @@ -814,12 +814,14 @@ '((ideographic-radical . 28) ; ⼛ (ideographic-strokes . 10) (total-strokes . 12) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((shinjigen-1 . 893) - (=daikanwa . 03098) ; &I-M-03098; - ) + (<-vulgar + ((shinjigen-1 . 893) + (=ucs . #x53C3) ; 參 + (=jis-x0208 . #x5254) ; &I-J90-5254; + (=daikanwa . 03098) ; &I-M-03098; )) + (<-vulgar*sources + guangyun daikanwa shinjigen-1) (hanyu-dazidian 1 389 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index d69d22a..f3c2541 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -302,12 +302,11 @@ (<-simplified@JP/Jouyou ((=jis-x0208-1990 . #x5256) ; >-56567; )) - (<-vulgar-ideograph - ((ideographic-radical . 172) ; ⾫ - (shinjigen-1 . 903) + (<-vulgar + ((shinjigen-1 . 903) (=daikanwa . 42116) ; &I-M-42116; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources yunhai shinjigen-1) (hanyu-dazidian 1 393 9) (ideographic-structure @@ -415,7 +414,6 @@ )) (define-char '((script JP Jouyou Ideograph) - (=>daikanwa . 03128) ; >-03952; (ideographic-radical . 29) ; ⼜ (ideographic-strokes . 2) (total-strokes . 4) @@ -423,12 +421,11 @@ ((=ucs . #x6536) ; 收 (=jis-x0208 . #x5A40) ; &I-J90-5A40; )) - (<-vulgar-ideograph - ((ideographic-radical . 66) ; ⽁ - (shinjigen-1 . 907) + (<-vulgar + ((shinjigen-1 . 907) (=daikanwa . 13110) ; &I-M-13110; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa shinjigen-1) (=ucs . #x53CE) ; 収 (->subsumptive @@ -1316,11 +1313,11 @@ ((=ucs . #x654D) ; 敍 (=jis-x0208 . #x5A46) ; &I-J90-5A46; )) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 915) (=daikanwa . 13205) ; &I-M-13205; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa shinjigen-1) (hanyu-dazidian 1 397 15) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index ec2d0a8..7bd08b0 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -4058,11 +4058,12 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (<-vulgar-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 03329) ; &I-M-03329; - ) + (<-vulgar + ((=ucs . #x541E) ; 吞 + (=daikanwa . 03329) ; &I-M-03329; )) + (<-vulgar*sources + daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ @@ -6268,7 +6269,7 @@ (=hanziku-2 . #xCDFE) ; &I-HZK02-CDFE; )) (define-char - '((morohashi-daikanwa 48258 0 2) + '((=>daikanwa . 48258) ; 黾 (ideographic-radical@ucs . 205) ; ⿌ (ideographic-strokes@ucs . 0) (ideographic-radical@cns . 30) ; ⼝ @@ -25730,51 +25731,48 @@ (=hanziku-2 . #xDE4F) ; &I-HZK02-DE4F; )) (define-char - '((=>ucs . #x5674) ; 噴 - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 12) - (total-strokes . 15) - (<-vulgar-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 04409) ; &I-M-04409; - ) - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=ucs . #x8CC1) ; 賁 - )) - (shinjigen-1 . 1247) - (shinjigen-2 . 1247) - (=jis-x0208-1978 . #x4A2E) ; &M-04345; - (=jis-x0208-1983 . #x4A2E) ; &I-J83-4A2E; - (=ks-x1001 . #x5D44) ; &I-K0-5D44; - (=daikanwa . 04345) ; &I-M-04345; - )) -(define-char - '((morohashi-daikanwa 4345 0 0) - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 12) (total-strokes . 15) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 + (=ucs . #x5674) ; 噴 + (->subsumptive + ((<-vulgar + ((=daikanwa . 04409) ; &I-M-04409; + )) + (<-vulgar*sources + daikanwa) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x8CC1) ; 賁 + )) + (shinjigen-1 . 1247) + (shinjigen-2 . 1247) + (=jis-x0208-1978 . #x4A2E) ; &M-04345; + (=jis-x0208-1983 . #x4A2E) ; &I-J83-4A2E; + (=ks-x1001 . #x5D44) ; &I-K0-5D44; + (=daikanwa . 04345) ; &I-M-04345; ) - ((=ucs . #x8CC1) ; 賁 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x8CC1) ; 賁 + )) + (=jis-x0208-1990 . #x4A2E) ; >-05461; + (=cns11643-1 . #x6C3B) ; &I-C1-6C3B; + (=gb12345 . #x4567) ; >-05461; + (=big5 . #xBC51) ; &I-B-BC51; + (=gt . 05461) ; &I-GT-05461; + (=gt-pj-1 . #x4A2E) ; &I-GT-05461; + (=ucs@unicode . #x5674) ; >-05461; + (mojikyo . 004345) ; &MCS-600010F9; )) - (=ucs . #x5674) ; 噴 - (=jis-x0208-1990 . #x4A2E) ; &I-J90-4A2E; - (=cns11643-1 . #x6C3B) ; &I-C1-6C3B; - (=gb12345 . #x4567) ; 噴 - (=big5 . #xBC51) ; &I-B-BC51; - (=gt . 05461) ; &I-GT-05461; - (=gt-pj-1 . #x4A2E) ; &I-GT-05461; - (mojikyo . 004345) ; &MCS-600010F9; )) (define-char '((ideographic-radical . 30) ; ⼝ diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el index 87dd430..52901a4 100644 --- a/lisp/utf-2000/Ideograph-R036-Evening.el +++ b/lisp/utf-2000/Ideograph-R036-Evening.el @@ -63,13 +63,26 @@ '((ideographic-radical . 36) ; ⼣ (ideographic-strokes . 2) (total-strokes . 5) - (<-vulgar-ideograph - (:sources (shinjigen-1) - :char ((ideographic-radical . 26) ; ⼙ - (shinjigen-1 . 848) - (=daikanwa . 02847) ; &I-M-02847; - ) + (->mistakable + ((=daikanwa . 02843) ; &I-M-02843; + ) + ((=daikanwa . 02847) ; &I-M-02847; + )) + (->mistakable*sources + kangxi daikanwa) + (->same + ((=ucs . #x5917) ; 夗 + (=daikanwa . 05752) ; &I-M-05752; + )) + (->same*sources + zihui daikanwa) + (<-vulgar + ((shinjigen-1 . 848) + (=ucs . #x536F) ; 卯 + (=jis-x0208 . #x312C) ; &I-J90-312C; )) + (<-vulgar*sources + shinjigen-1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ @@ -608,10 +621,12 @@ )) (define-char '((total-strokes . 11) - (<-vulgar-ideograph - ((=daikanwa . 05802) ; &I-M-05802; + (<-vulgar + ((shinjigen-1 . 1550) + (=cns11643-1 . #x6842) ; &M-05802; + (=daikanwa . 05802) ; &I-M-05802; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources songyuan-yilai-suzipu zihui daikanwa shinjigen-1) (hanyu-dazidian 2 863 18) (shinjigen-1 . 1552) @@ -844,37 +859,36 @@ (=ucs@big5 . #x5922) ; &M-05802; )) (define-char - '((=>ucs . #x5923) ; 夣 - (ideographic-radical . 36) ; ⼣ - (ideographic-strokes . 11) - (total-strokes . 14) - (<-vulgar-ideograph - ((shinjigen-1 . 1550) - (=daikanwa . 05802) ; &I-M-05802; - )) - (<-vulgar-ideograph*sources - shinjigen-1) - (shinjigen-1 . 1553) - (=jis-x0212 . #x3869) ; &M-05803; - (=daikanwa . 05803) ; &I-M-05803; - (=ucs@jis . #x5923) ; &M-05803; - )) -(define-char - '((morohashi-daikanwa 5803 0 0) - (ideographic-radical . 36) ; ⼣ - (ideographic-strokes . 11) - (total-strokes . 14) + '((ideographic-radical . 36) ; ⼣ (=ucs . #x5923) ; 夣 - (mojikyo . 005803) ; &MCS-600016AB; - )) -(define-char - '((=>ucs . #x5923) ; 夣 - (morohashi-daikanwa 5803 0 1) - (ideographic-radical . 36) ; ⼣ - (ideographic-strokes . 10) - (total-strokes . 13) - (=cns11643-3 . #x405F) ; &C3-405F; - (mojikyo . 059363) ; &MCS-6000E7E3; + (->subsumptive + ((ideographic-strokes . 11) + (total-strokes . 14) + (<-vulgar + ((shinjigen-1 . 1550) + (=cns11643-1 . #x6842) ; &M-05802; + (=daikanwa . 05802) ; &I-M-05802; + )) + (<-vulgar*sources + shinjigen-1) + (shinjigen-1 . 1553) + (=jis-x0212 . #x3869) ; &M-05803; + (=daikanwa . 05803) ; &I-M-05803; + (=ucs@jis . #x5923) ; &M-05803; + ) + ((ideographic-strokes . 11) + (total-strokes . 14) + (mojikyo . 005803) ; &MCS-600016AB; + ) + ((ideographic-strokes . 11) + (total-strokes . 14) + (=ucs@unicode . #x5923) ; &UU+5923; + ) + ((ideographic-strokes . 10) + (total-strokes . 13) + (=cns11643-3 . #x405F) ; &C3-405F; + (mojikyo . 059363) ; &MCS-6000E7E3; + )) )) (define-char '((ideographic-radical . 36) ; ⼣ diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el index f94388f..d02d4c9 100644 --- a/lisp/utf-2000/Ideograph-R037-Big.el +++ b/lisp/utf-2000/Ideograph-R037-Big.el @@ -1977,11 +1977,11 @@ '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 8) (total-strokes . 11) - (<-vulgar-ideograph - (:sources (sougen-irai-zokujifu morohashi-daikanwa) - :char ((=daikanwa . 19746) ; &I-M-19746; - ) + (<-vulgar + ((=daikanwa . 19746) ; &I-M-19746; )) + (<-vulgar*sources + songyuan-yilai-suzipu daikanwa) (=ucs . #x21641) ; 𡙁 (=cns11643-4 . #x3127) ; &I-C4-3127; (=big5-cdp . #x856E) ; &I-CDP-856E; @@ -2552,11 +2552,12 @@ (total-strokes . 14) (=ucs . #x5969) ; 奩 (->subsumptive - ((<-vulgar-ideograph + ((<-vulgar ((shinjigen-1 . 796) (=ucs . #x5333) ; 匳 + (=jis-x0208 . #x523D) ; &I-J90-523D; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 799) (shinjigen-2 . 799) diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el index 557ff73..bb0298b 100644 --- a/lisp/utf-2000/Ideograph-R038-Woman.el +++ b/lisp/utf-2000/Ideograph-R038-Woman.el @@ -3,24 +3,21 @@ '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 0) (total-strokes . 3) - (shinjigen-2 . 1599) (=ucs . #x5973) ; 女 - (=jis-x0208 . #x3D77) ; &I-J90-3D77; - (=gb2312 . #x452E) ; &I-G0-452E; - (=ks-x1001 . #x5233) ; &I-K0-5233; - (=big5 . #xA46B) ; &I-B-A46B; - (=gt . 07623) ; &I-GT-07623; - (=gt-k . 00185) ; &I-GT-K00185; - (=gt-pj-1 . #x3D77) ; &I-GT-07623; - (=daikanwa . 06036) ; &I-M-06036; - )) -(define-char - '((=>ucs . #x5973) ; 女 - (morohashi-daikanwa 6036 0 1) - (ideographic-radical . 38) ; ⼥ - (ideographic-strokes . 0) - (total-strokes . 3) - (=cns11643-1 . #x444C) ; &C1-444C; + (->subsumptive + ((shinjigen-2 . 1599) + (=jis-x0208 . #x3D77) ; >-07623; + (=gb2312 . #x452E) ; &I-G0-452E; + (=ks-x1001 . #x5233) ; &I-K0-5233; + (=big5 . #xA46B) ; &I-B-A46B; + (=gt . 07623) ; &I-GT-07623; + (=gt-k . 00185) ; &I-GT-K00185; + (=gt-pj-1 . #x3D77) ; &I-GT-07623; + (=daikanwa . 06036) ; &I-M-06036; + (=ucs@unicode . #x5973) ; >-07623; + ) + ((=cns11643-1 . #x444C) ; &C1-444C; + )) )) (define-char '((ideographic-radical . 38) ; ⼥ @@ -1929,65 +1926,69 @@ '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 5) (total-strokes . 8) - (<-vulgar-ideograph - (:char ((=daikanwa . 06164) ; &I-M-06164; - ) - :sources (morohashi-daikanwa))) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5973) ; 女 - ) - ((=jis-x0208 . #x3B54) ; >-11066; - (=ks-x1001 . #x633C) ; &I-K0-633C; - (=daikanwa . 08775) ; &I-M-08775; - )) - (shinjigen-2 . 1628) (=ucs . #x59C9) ; 姉 - (=jis-x0208-1978 . #x3B50) ; &I-J78-3B50; - (=jis-x0208-1983 . #x3B50) ; &I-J83-3B50; - (=daikanwa . 06165) ; &I-M-06165; - (=cbeta . 00106) ; &I-CB00106; - )) -(define-char - '((=>ucs . #x59C9) ; 姉 - (morohashi-daikanwa 6165 0 0) - (ideographic-radical . 38) ; ⼥ - (ideographic-strokes . 5) - (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x5973) ; 女 + (->subsumptive + ((<-vulgar + ((=ucs . #x59CA) ; 姊 + (=daikanwa . 06164) ; &I-M-06164; + )) + (<-vulgar*sources + daikanwa) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5973) ; 女 + ) + ((=jis-x0208 . #x3B54) ; >-11066; + (=ks-x1001 . #x633C) ; &I-K0-633C; + (=daikanwa . 08775) ; &I-M-08775; + )) + (shinjigen-2 . 1628) + (=jis-x0208-1978 . #x3B50) ; &M-06165; + (=jis-x0208-1983 . #x3B50) ; &I-J83-3B50; + (=daikanwa . 06165) ; &I-M-06165; + (=cbeta . 00106) ; &I-CB00106; + (=ucs@unicode . #x59C9) ; &M-06165; ) - ((=jis-x0208 . #x3B54) ; >-11066; - (=ks-x1001 . #x633C) ; &I-K0-633C; - (=daikanwa . 08775) ; &I-M-08775; - )) - (=ks-x1001 . #x6D2B) ; >-07747; - (=jis-x0208-1990 . #x3B50) ; &I-J90-3B50; - (=gt . 07747) ; &I-GT-07747; - (=gt-pj-1 . #x3B50) ; &I-GT-07747; - (=ucs@jis . #x59C9) ; >-07747; - (mojikyo . 006165) ; &MCS-60001815; - )) -(define-char - '((=>ucs . #x59C9) ; 姉 - (morohashi-daikanwa 6165 0 1) - (ideographic-radical . 38) ; ⼥ - (ideographic-strokes . 5) - (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5973) ; 女 + ) + ((=jis-x0208 . #x3B54) ; >-11066; + (=ks-x1001 . #x633C) ; &I-K0-633C; + (=daikanwa . 08775) ; &I-M-08775; + )) + (=ks-x1001 . #x6D2B) ; >-07747; + (=jis-x0208-1990 . #x3B50) ; &I-J90-3B50; + (=gt . 07747) ; &I-GT-07747; + (=gt-pj-1 . #x3B50) ; &I-GT-07747; + (=ucs@jis . #x59C9) ; >-07747; ) - ((=ucs . #x5973) ; 女 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=cns11643-1 . #x444C) ; &C1-444C; + ) + ((=jis-x0208 . #x3B54) ; >-11066; + (=ks-x1001 . #x633C) ; &I-K0-633C; + (=daikanwa . 08775) ; &I-M-08775; + )) + (mojikyo . 006165) ; &MCS-60001815; ) - ((=ucs . #x5E02) ; 市 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=cns11643-1 . #x444C) ; &C1-444C; + ) + ((=ucs . #x5E02) ; 市 + )) + (=cns11643-3 . #x283F) ; &C3-283F; )) - (=cns11643-3 . #x283F) ; &C3-283F; )) (define-char '((ideographic-radical . 38) ; ⼥ diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index 9ec4d1b..c74e3de 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -2596,82 +2596,89 @@ (=cns11643-6 . #x3E57) ; &I-C6-3E57; )) (define-char - '((=>ucs . #x5BC3) ; 寃 - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 8) - (total-strokes . 11) - (<-vulgar-ideograph - (:char ((=daikanwa . 01587) ; &I-M-01587; - ) - :sources (seiji-tsuu morohashi-daikanwa))) - (=jis-x0208-1983 . #x5563) ; >-09035; - (=jis-x0208-1990 . #x5563) ; &I-J90-5563; - (=gt . 09035) ; &I-GT-09035; - (=gt-k . 07924) ; &I-GT-K07924; - (=gt-pj-1 . #x5563) ; &I-GT-09035; - (=daikanwa . 07202) ; &I-M-07202; - (=jef-china3 . #x4AC8) ; &I-JC3-4AC8; - (=ucs@jis . #x5BC3) ; >-09035; - (mojikyo . 007202) ; &MCS-60001C22; - )) -(define-char - '((morohashi-daikanwa 7202 0 0) - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 8) - (total-strokes . 11) + '((ideographic-radical . 40) ; ⼧ (=ucs . #x5BC3) ; 寃 - (=cns11643-3 . #x3541) ; &I-C3-3541; )) (define-char - '((=>ucs . #x5BC3) ; 寃 - (morohashi-daikanwa 7202 0 1) - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 7) + '((ideographic-strokes . 8) + (total-strokes . 11) + (<-denotational + ((=ucs . #x5BC3) ; 寃 + )) + (->subsumptive + ((<-vulgar + ((=jis-x0208-1978 . #x514D) ; &M-01587; + (=cns11643-6 . #x3544) ; &I-C6-3544; + (=daikanwa . 01587) ; &I-M-01587; + )) + (<-vulgar*sources + zhengzi-tong daikanwa) + (=jis-x0208-1983 . #x5563) ; >-09035; + (=jis-x0208-1990 . #x5563) ; &I-J90-5563; + (=gt . 09035) ; &I-GT-09035; + (=gt-k . 07924) ; &I-GT-K07924; + (=gt-pj-1 . #x5563) ; &I-GT-09035; + (=daikanwa . 07202) ; &I-M-07202; + (=jef-china3 . #x4AC8) ; &I-JC3-4AC8; + (=ucs@jis . #x5BC3) ; >-09035; + (mojikyo . 007202) ; &MCS-60001C22; + ) + ((=cns11643-3 . #x3541) ; &C3-3541; + (=ucs@unicode . #x5BC3) ; &C3-3541; + )) + )) +(define-char + '((ideographic-strokes . 7) (total-strokes . 10) + (<-denotational + ((=ucs . #x5BC3) ; 寃 + )) (=jis-x0208-1978 . #x5563) ; &J78-5563; (mojikyo . 055204) ; &MCS-6000D7A4; )) (define-char - '((=>ucs . #x5BC3) ; 寃 - (morohashi-daikanwa 7202 0 3) - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 8) + '((ideographic-strokes . 8) (total-strokes . 11) + (<-denotational + ((=ucs . #x5BC3) ; 寃 + )) (=ks-x1001 . #x6A32) ; &K0-6A32; )) (define-char - '((=>ucs . #x2F86D) ; 寃 - (=>ucs* . #x5BC3) ; 寃 - (morohashi-daikanwa 7202 0 4) - (ideographic-radical . 40) ; ⼧ - (ideographic-strokes . 8) - (total-strokes . 11) - (=jef-china3 . #x4AB8) ; &JC3-4AB8; - )) -(define-char '((=>ucs* . #x5BC3) ; 寃 - (morohashi-daikanwa 7202 0 5) - (ideographic-radical . 40) ; ⼧ (ideographic-strokes . 8) (total-strokes . 11) + (<-denotational + ((=ucs . #x5BC3) ; 寃 + )) (=ucs . #x2F86D) ; 寃 - (=cns11643-4 . #x3130) ; &I-C4-3130; + (->subsumptive + ((=jef-china3 . #x4AB8) ; &JC3-4AB8; + ) + ((=cns11643-4 . #x3130) ; &C4-3130; + (=ucs@iso . #x2F86D) ; &C4-3130; + )) )) (define-char '((ideographic-radical . 40) ; ⼧ (ideographic-strokes . 8) (total-strokes . 11) - (shinjigen-2 . 1844) (=ucs . #x5BC4) ; 寄 - (=jis-x0208 . #x3473) ; &I-J90-3473; - (=gb2312 . #x3C44) ; &I-G0-3C44; - (=ks-x1001 . #x5076) ; &I-K0-5076; - (=cns11643-1 . #x596C) ; &I-C1-596C; - (=big5 . #xB148) ; &I-B-B148; - (=gt . 09039) ; &I-GT-09039; - (=gt-k . 07740) ; &I-GT-K07740; - (=gt-pj-1 . #x3473) ; &I-GT-09039; - (=daikanwa . 07203) ; &I-M-07203; + (->subsumptive + ((shinjigen-2 . 1844) + (=jis-x0208 . #x3473) ; >-09039; + (=ks-x1001 . #x5076) ; &I-K0-5076; + (=big5 . #xB148) ; &I-B-B148; + (=gt . 09039) ; &I-GT-09039; + (=gt-k . 07740) ; &I-GT-K07740; + (=gt-pj-1 . #x3473) ; &I-GT-09039; + (=daikanwa . 07203) ; &I-M-07203; + (=ucs@jis . #x5BC4) ; >-09039; + ) + ((=gb2312 . #x3C44) ; &C1-596C; + (=cns11643-1 . #x596C) ; &I-C1-596C; + (=ucs@unicode . #x5BC4) ; &C1-596C; + )) )) (define-char '((=>ucs . #x5BC5) ; 寅 diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el index bff53a2..5a61ee4 100644 --- a/lisp/utf-2000/Ideograph-R044-Corpse.el +++ b/lisp/utf-2000/Ideograph-R044-Corpse.el @@ -821,10 +821,10 @@ ((=ucs . #x665D) ; 晝 (=jis-x0208 . #x5A6C) ; &I-J90-5A6C; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 13948) ; &I-M-13948; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources songyuan-yilai-suzipu daikanwa) (shinjigen-2 . 3309) (=ucs . #x663C) ; 昼 diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el index 609753a..a3fb624 100644 --- a/lisp/utf-2000/Ideograph-R050-Turban.el +++ b/lisp/utf-2000/Ideograph-R050-Turban.el @@ -60,47 +60,45 @@ (=hanziku-2 . #xE7E8) ; &I-HZK02-E7E8; )) (define-char - '((=>ucs . #x5E02) ; 市 - (ideographic-radical . 50) ; ⼱ + '((ideographic-radical . 50) ; ⼱ (ideographic-strokes . 2) (total-strokes . 5) (comment . "(market)") - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=jis-x0208 . #x5035) ; >-00376; - ) - ((=ucs . #x5DFE) ; 巾 - )) - (shinjigen-2 . 2082) - (=jis-x0208 . #x3B54) ; >-11066; - (=ks-x1001 . #x633C) ; &I-K0-633C; - (=big5 . #xA5AB) ; &I-B-A5AB; - (=gt . 11066) ; &I-GT-11066; - (=gt-k . 00943) ; &I-GT-K00943; - (=gt-pj-1 . #x3B54) ; &I-GT-11066; - (=daikanwa . 08775) ; &I-M-08775; - (=ucs@jis . #x5E02) ; >-11066; - (=ucs@big5 . #x5E02) ; >-11066; - )) -(define-char - '((morohashi-daikanwa 8775 0 0) - (ideographic-radical . 50) ; ⼱ - (ideographic-strokes . 2) - (total-strokes . 5) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4EA0) ; 亠 - ) - ((=ucs . #x5DFE) ; 巾 - )) - (shinjigen-2 . 2082) (=ucs . #x5E02) ; 市 - (=gb2312 . #x4A50) ; &I-G0-4A50; - (=cns11643-1 . #x464B) ; &I-C1-464B; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=jis-x0208 . #x5035) ; >-00376; + ) + ((=ucs . #x5DFE) ; 巾 + )) + (shinjigen-2 . 2082) + (=jis-x0208 . #x3B54) ; >-11066; + (=ks-x1001 . #x633C) ; &I-K0-633C; + (=big5 . #xA5AB) ; &I-B-A5AB; + (=gt . 11066) ; &I-GT-11066; + (=gt-k . 00943) ; &I-GT-K00943; + (=gt-pj-1 . #x3B54) ; &I-GT-11066; + (=daikanwa . 08775) ; &I-M-08775; + (=ucs@jis . #x5E02) ; >-11066; + (=ucs@big5 . #x5E02) ; >-11066; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=gb2312 . #x596F) ; >-00375; + (=daikanwa . 00286) ; &I-M-00286; + ) + ((=ucs . #x5DFE) ; 巾 + )) + (shinjigen-2 . 2082) + (=gb2312 . #x4A50) ; &C1-464B; + (=cns11643-1 . #x464B) ; &I-C1-464B; + (=ucs@unicode . #x5E02) ; &C1-464B; + )) )) (define-char '((ideographic-radical . 50) ; ⼱ diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el index 1567d65..4e3e7d3 100644 --- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el +++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el @@ -1707,39 +1707,42 @@ (=cns11643-6 . #x373B) ; &C6-373B; )) (define-char - '((=>ucs . #x5EAC) ; 庬 - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 7) - (total-strokes . 10) - (<-vulgar-ideograph - (:sources (seiji-tsuu morohashi-daikanwa shinjigen-1) - :char ((shinjigen-1 . 879) - (=daikanwa . 02942) ; &I-M-02942; - ) - )) - (shinjigen-1 . 880) - (=jis-x0212 . #x3C4A) ; &M-09333; - (=jis-x0213-2-2000 . #x2C25) ; &I-JX2-2C25; - (=daikanwa . 09333) ; &I-M-09333; - (=jef-china3 . #x4CC2) ; &I-JC3-4CC2; - (=ucs@jis . #x5EAC) ; &M-09333; - )) -(define-char - '((morohashi-daikanwa 9333 0 0) - (ideographic-radical . 53) ; ⼴ + '((ideographic-radical . 53) ; ⼴ (ideographic-strokes . 7) (total-strokes . 10) (=ucs . #x5EAC) ; 庬 - (=cns11643-2 . #x2E7A) ; &I-C2-2E7A; - (=big5 . #xD178) ; &I-B-D178; + (->subsumptive + ((<-vulgar + ((shinjigen-1 . 879) + (=ucs . #x5396) ; 厖 + (=jis-x0208 . #x524D) ; &I-J90-524D; + (=daikanwa . 02942) ; &I-M-02942; + )) + (<-vulgar*sources + zhengzi-tong daikanwa shinjigen-1) + (shinjigen-1 . 880) + (=jis-x0212 . #x3C4A) ; &M-09333; + (=jis-x0213-2-2000 . #x2C25) ; &I-JX2-2C25; + (=daikanwa . 09333) ; &I-M-09333; + (=jef-china3 . #x4CC2) ; &I-JC3-4CC2; + (=ucs@jis . #x5EAC) ; &M-09333; + ) + ((=cns11643-2 . #x2E7A) ; &C2-2E7A; + (=big5 . #xD178) ; &I-B-D178; + (=ucs@unicode . #x5EAC) ; &C2-2E7A; + )) )) (define-char '((ideographic-radical . 53) ; ⼴ (ideographic-strokes . 7) (total-strokes . 10) (=ucs . #x22220) ; 𢈠 - (=cns11643-4 . #x2C6E) ; &I-C4-2C6E; - (=daikanwa . 09334) ; &I-M-09334; + (->subsumptive + ((=daikanwa . 09334) ; &M-09334; + ) + ((=cns11643-4 . #x2C6E) ; &C4-2C6E; + (=ucs@iso . #x22220) ; &C4-2C6E; + )) )) (define-char '((=>ucs . #x22221) ; 𢈡 @@ -3505,74 +3508,78 @@ (mojikyo . 050989) ; &MCS-6000C72D; )) (define-char - '((=>ucs . #x5ED0) ; 廐 - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 11) - (total-strokes . 14) - (<-vulgar-ideograph - (:sources (jiyun morohashi-daikanwa) - :char ((=daikanwa . 09453) ; &I-M-09453; - ) - )) - (=jis-x0208 . #x567D) ; >-11900; - (=gt . 11900) ; &I-GT-11900; - (=gt-pj-1 . #x567D) ; &I-GT-11900; - (=daikanwa . 09454) ; &I-M-09454; - (=ucs@jis . #x5ED0) ; >-11900; - )) -(define-char - '((=>ucs . #x5ED0) ; 廐 - (morohashi-daikanwa 9454 0 0) - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 11) - (total-strokes . 14) - (=cns11643-3 . #x4660) ; &C3-4660; + '((ideographic-radical . 53) ; ⼴ + (=ucs . #x5ED0) ; 廐 )) (define-char - '((=>ucs . #x5ED0) ; 廐 - (morohashi-daikanwa 9454 0 1) - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 12) - (total-strokes . 14) - (=ks-x1001 . #x4F2A) ; &K0-4F2A; + '((<-denotational + ((=ucs . #x5ED0) ; 廐 + )) + (->subsumptive + ((ideographic-strokes . 11) + (total-strokes . 14) + (<-vulgar + ((=jis-x0208 . #x567E) ; >-11899; + (=daikanwa . 09453) ; &I-M-09453; + )) + (<-vulgar*sources + jiyun daikanwa) + (=jis-x0208 . #x567D) ; >-11900; + (=gt . 11900) ; &I-GT-11900; + (=gt-pj-1 . #x567D) ; &I-GT-11900; + (=daikanwa . 09454) ; &I-M-09454; + (=ucs@jis . #x5ED0) ; >-11900; + ) + ((ideographic-strokes . 11) + (total-strokes . 14) + (=cns11643-3 . #x4660) ; &C3-4660; + ) + ((ideographic-strokes . 12) + (total-strokes . 14) + (=ks-x1001 . #x4F2A) ; &K0-4F2A; + )) )) (define-char - '((=>ucs . #x5ED0) ; 廐 - (morohashi-daikanwa 9454 0 3) - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 11) + '((ideographic-strokes . 9) (total-strokes . 14) - (<-vulgar-ideograph - (:char ((shinjigen-1 . 2207) - (=gt . 11902) ; >-11902; - ) - :sources (shinjigen-1))) - (shinjigen-1 . 2209) - (=gt . 11901) ; >-11901; - (=gt-pj-9 . #x4C55) ; >-11901; - )) -(define-char - '((=>ucs . #x5ED0) ; 廐 - (morohashi-daikanwa 9454 0 4) - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 10) - (total-strokes . 13) - (=cbeta . 00636) ; &CB00636; + (<-denotational + ((=ucs . #x5ED0) ; 廐 + )) + (=ucs@unicode . #x5ED0) ; &UU+5ED0; )) (define-char - '((morohashi-daikanwa 9454 0 5) - (ideographic-radical . 53) ; ⼴ - (ideographic-strokes . 9) - (total-strokes . 14) - (=ucs . #x5ED0) ; 廐 + '((<-denotational + ((=ucs . #x5ED0) ; 廐 + )) + (->subsumptive + ((ideographic-strokes . 11) + (total-strokes . 14) + (<-vulgar + ((shinjigen-1 . 2207) + (=gt . 11902) ; >-11902; + )) + (<-vulgar*sources + shinjigen-1) + (shinjigen-1 . 2209) + (=gt . 11901) ; >-11901; + (=gt-pj-9 . #x4C55) ; >-11901; + ) + ((ideographic-strokes . 10) + (total-strokes . 13) + (=cbeta . 00636) ; &CB00636; + )) )) (define-char '((ideographic-radical . 53) ; ⼴ (ideographic-strokes . 11) (total-strokes . 14) (=ucs . #x3893) ; 㢓 - (=cns11643-3 . #x465F) ; &I-C3-465F; - (=daikanwa . 09455) ; &I-M-09455; + (->subsumptive + ((=daikanwa . 09455) ; &M-09455; + ) + ((=cns11643-3 . #x465F) ; &C3-465F; + (=ucs@unicode . #x3893) ; &C3-465F; + )) )) (define-char '((=>ucs . #x5ED1) ; 廑 diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el index e152804..8921982 100644 --- a/lisp/utf-2000/Ideograph-R058-Snout.el +++ b/lisp/utf-2000/Ideograph-R058-Snout.el @@ -63,25 +63,26 @@ (=daikanwa . 09909) ; &I-M-09909; )) (define-char - '((=>ucs . #x5F52) ; 归 - (morohashi-daikanwa 9909 1) - (ideographic-radical . 58) ; ⼹ - (ideographic-strokes . 2) - (total-strokes . 5) - (<-vulgar-ideograph - (:char ((=daikanwa . 16349) ; &I-M-16349; - ) - :sources (morohashi-daikanwa))) - (=cns11643-3 . #x224A) ; &C3-224A; - )) -(define-char - '((morohashi-daikanwa 9909 1 1) - (ideographic-radical . 58) ; ⼹ + '((ideographic-radical . 58) ; ⼹ (ideographic-strokes . 2) (total-strokes . 5) (=ucs . #x5F52) ; 归 - (=gb2312 . #x3969) ; &I-G0-3969; - (mojikyo . 050167) ; &MCS-6000C3F7; + (->subsumptive + ((morohashi-daikanwa 9909 1) + (<-vulgar + ((=jis-x0208 . #x5D45) ; >-20995; + (=ks-x1001 . #x4F7D) ; &I-K0-4F7D; + (=cns11643-1 . #x7657) ; &I-C1-7657; + (=daikanwa . 16349) ; &I-M-16349; + )) + (<-vulgar*sources + daikanwa) + (=cns11643-3 . #x224A) ; &C3-224A; + ) + ((=gb2312 . #x3969) ; &G0-3969; + (=ucs@unicode . #x5F52) ; &G0-3969; + (mojikyo . 050167) ; &MCS-6000C3F7; + )) )) (define-char '((=>ucs . #x22452) ; 𢑒 @@ -110,10 +111,10 @@ '((ideographic-radical . 58) ; ⼹ (ideographic-strokes . 3) (total-strokes . 6) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 21890) ; &I-M-21890; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (=ucs . #x22450) ; 𢑐 (=cns11643-6 . #x246E) ; &I-C6-246E; diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el index f49f992..2c733c8 100644 --- a/lisp/utf-2000/Ideograph-R061-Heart.el +++ b/lisp/utf-2000/Ideograph-R061-Heart.el @@ -7276,14 +7276,11 @@ ((=jis-x0208 . #x584E) ; >-13968; (=daikanwa . 11094) ; &I-M-11094; )) - (<-vulgar-ideograph - ((ideographic-radical . 61) ; ⼼ - (ideographic-strokes . 11) - (total-strokes . 14) - (shinjigen-2 . 2544) + (<-vulgar + ((=jis-x0208 . #x584E) ; >-13968; (=daikanwa . 11094) ; &I-M-11094; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (shinjigen-2 . 2543) (=ucs . #x60E8) ; 惨 diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index 79c80c2..ec8e057 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -388,12 +388,12 @@ '((ideographic-radical . 72) ; ⽇ (ideographic-strokes . 3) (total-strokes . 7) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 3267) + (=ucs . #x65E8) ; 旨 (=jis-x0208 . #x3B5D) ; &I-J90-3B5D; - (=daikanwa . 13738) ; &I-M-13738; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 3269) (shinjigen-2 . 3269) @@ -1832,10 +1832,10 @@ ((=ucs . #x665D) ; 晝 (=jis-x0208 . #x5A6C) ; &I-J90-5A6C; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 13948) ; &I-M-13948; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources songyuan-yilai-suzipu daikanwa) (shinjigen-2 . 3309) (=ucs . #x663C) ; 昼 diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el index 983da3d..4de1cb7 100644 --- a/lisp/utf-2000/Ideograph-R073-Say.el +++ b/lisp/utf-2000/Ideograph-R073-Say.el @@ -270,31 +270,6 @@ (=jef-china3 . #x52A2) ; &I-JC3-52A2; )) (define-char - '((morohashi-daikanwa 2392 0 1) - (ideographic-radical@ucs . 19) ; ⼒ - (ideographic-strokes@ucs . 9) - (ideographic-radical@ucs*sources - daikanwa ucs) - (ideographic-radical@cns . 73) ; ⽈ - (ideographic-strokes@cns . 7) - (total-strokes . 11) - (hanyu-dazidian 2 1512 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=cns11643-1 . #x454B) ; &C1-454B; - ) - ((=ucs . #x52A9) ; 助 - )) - (=ucs . #x52D7) ; 勗 - (=jis-x0208 . #x5228) ; &I-J90-5228; - (=cns11643-1 . #x5B2B) ; &I-C1-5B2B; - (=big5 . #xB1E5) ; &I-B-B1E5; - (=gt . 03066) ; &I-GT-03066; - (=gt-pj-1 . #x5228) ; &I-GT-03066; - )) -(define-char '((ideographic-radical . 73) ; ⽈ (ideographic-strokes . 7) (total-strokes . 11) diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index 925bcb4..e395774 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -5206,10 +5206,11 @@ '((ideographic-radical . 75) ; ⽊ (ideographic-strokes . 6) (total-strokes . 12) - (<-vulgar-ideograph - (:char ((=daikanwa . 15010) ; &I-M-15010; - ) - :sources (seiji-tsuu morohashi-daikanwa))) + (<-vulgar + ((=daikanwa . 15010) ; &I-M-15010; + )) + (<-vulgar*sources + zhengzi-tong daikanwa) (=ucs . #x681F) ; 栟 (=jis-x0212 . #x434D) ; &I-JSP-434D; (=iso-ir165 . #x7B6B) ; &I-EGB-7B6B; @@ -7791,10 +7792,12 @@ )) (define-char '((total-strokes . 11) - (<-vulgar-ideograph - ((=daikanwa . 05802) ; &I-M-05802; + (<-vulgar + ((shinjigen-1 . 1550) + (=cns11643-1 . #x6842) ; &M-05802; + (=daikanwa . 05802) ; &I-M-05802; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources songyuan-yilai-suzipu zihui daikanwa shinjigen-1) (hanyu-dazidian 2 863 18) (shinjigen-1 . 1552) @@ -18336,11 +18339,14 @@ )) (->synonyms@seiji-tsuu*sources seiji-tsuu jiyun daikanwa) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 932) + (=jis-x0208 . #x4151) ; >-04083; + (=ks-x1001 . #x753F) ; &I-K0-753F; + (=cns11643-1 . #x763B) ; &I-C1-763B; (=daikanwa . 03220) ; &I-M-03220; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (hanyu-dazidian 2 1288 18) (shinjigen-1 . 933) diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el index e480004..b0090dd 100644 --- a/lisp/utf-2000/Ideograph-R079-Weapon.el +++ b/lisp/utf-2000/Ideograph-R079-Weapon.el @@ -314,75 +314,90 @@ (=daikanwa . 16628) ; &M-16628; )) (define-char - '((=>ucs . #x6BBA) ; 殺 - (=>ucs@cns . #x2F8F5) ; 殺 + '((=>ucs@cns . #x2F8F5) ; 殺 (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) - (<-simplified@JP/Jouyou - ((=ks-x1001 . #x5F2F) ; &M-16638; - (=jis-x0213-1-2000 . #x7649) ; &I-JX1-7649; - (=daikanwa . 16638) ; &I-M-16638; + (<-denotational + ((=ucs . #x6BBA) ; 殺 )) - (<-vulgar-ideograph - ((=daikanwa . 16638) ; &I-M-16638; + (->subsumptive + ((<-simplified@JP/Jouyou + ((=ks-x1001 . #x5F2F) ; &M-16638; + (=jis-x0213-1-2000 . #x7649) ; &I-JX1-7649; + (=daikanwa . 16638) ; &I-M-16638; + )) + (<-vulgar + ((=ks-x1001 . #x5F2F) ; &M-16638; + (=jis-x0213-1-2000 . #x7649) ; &I-JX1-7649; + (=daikanwa . 16638) ; &I-M-16638; + )) + (<-vulgar*sources + daikanwa) + (shinjigen-1 . 3996) + (shinjigen-2 . 3996) + (=jis-x0208 . #x3B26) ; >-21319; + (=gt . 21319) ; &I-GT-21319; + (=gt-k . 06440) ; &I-GT-K06440; + (=gt-pj-1 . #x3B26) ; &I-GT-21319; + (=daikanwa . 16629) ; &I-M-16629; + (=ucs@jis . #x6BBA) ; >-21319; + ) + ((=big5 . #xB1FE) ; &B-B1FE; + (=ucs@big5 . #x6BBA) ; &B-B1FE; )) - (<-vulgar-ideograph*sources - daikanwa) - (shinjigen-1 . 3996) - (shinjigen-2 . 3996) - (=jis-x0208 . #x3B26) ; >-21319; - (=gt . 21319) ; &I-GT-21319; - (=gt-k . 06440) ; &I-GT-K06440; - (=gt-pj-1 . #x3B26) ; &I-GT-21319; - (=daikanwa . 16629) ; &I-M-16629; - (=ucs@jis . #x6BBA) ; >-21319; - )) -(define-char - '((=>ucs . #x6BBA) ; 殺 - (=>ucs@cns . #x2F8F5) ; 殺 - (morohashi-daikanwa 16629 0 0) + )) +(define-char + '((=>ucs@cns . #x2F8F5) ; 殺 + (=>daikanwa . 16629) ; >-21319; (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) - (=big5 . #xB1FE) ; &B-B1FE; - (=ucs@big5 . #x6BBA) ; &B-B1FE; + (<-denotational + ((=ucs . #x6BBA) ; 殺 + )) + (=gb12345 . #x4931) ; &UU+6BBA; + (=ucs@unicode . #x6BBA) ; &UU+6BBA; )) (define-char - '((=>ucs . #x6BBA) ; 殺 - (morohashi-daikanwa 16629 0 1) + '((=>daikanwa . 16629) ; >-21319; (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) + (<-denotational + ((=ucs . #x6BBA) ; 殺 + )) (mojikyo . 016629) ; &MCS-600040F5; )) (define-char '((=>ucs* . #x6BBA) ; 殺 - (=>ucs@gb . #x6BBA) ; 殺 + (=>ucs@gb . #x6BBA) ; &UU+6BBA; (=>ucs@jis . #x6BBA) ; >-21319; - (morohashi-daikanwa 16629 0 1) + (=>daikanwa . 16629) ; >-21319; (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) + (<-denotational + ((=ucs . #x6BBA) ; 殺 + )) (=ucs . #x2F8F5) ; 殺 (=cns11643-4 . #x2D65) ; &I-C4-2D65; )) (define-char - '((=>ucs . #x6BBA) ; 殺 - (morohashi-daikanwa 16629 0 2) + '((=>daikanwa . 16629) ; >-21319; (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) + (<-denotational + ((=ucs . #x2F8F5) ; 殺 + )) (mojikyo . 073347) ; &MCS-60011E83; )) (define-char - '((=>ucs@cns . #x2F8F5) ; 殺 - (morohashi-daikanwa 16629 0 3) - (ideographic-radical . 79) ; ⽎ + '((ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) (=ucs . #x6BBA) ; 殺 - (=gb12345 . #x4931) ; 殺 )) (define-char '((ideographic-radical . 79) ; ⽎ @@ -581,34 +596,28 @@ (=cns11643-6 . #x4076) ; &C6-4076; )) (define-char - '((=>ucs . #x6BBA) ; 殺 - (ideographic-radical . 79) ; ⽎ - (ideographic-strokes . 7) - (total-strokes . 11) - (shinjigen-1 . 3997) - (=ks-x1001 . #x5F2F) ; &M-16638; - (=jis-x0213-1-2000 . #x7649) ; &I-JX1-7649; - (=daikanwa . 16638) ; &I-M-16638; - (=jef-china3 . #x54ED) ; &I-JC3-54ED; - (=ucs@jis . #xF970) ; &M-16638; - )) -(define-char - '((=>ucs* . #x6BBA) ; 殺 - (morohashi-daikanwa 16638 0 0) - (ideographic-radical . 79) ; ⽎ - (ideographic-strokes . 7) - (total-strokes . 11) - (=ucs . #xF970) ; 殺 - (=ks-x1001 . #x616D) ; &I-K0-616D; - )) -(define-char - '((=>ucs . #x6BBA) ; 殺 - (morohashi-daikanwa 16638 0 1) - (ideographic-radical . 79) ; ⽎ + '((ideographic-radical . 79) ; ⽎ (ideographic-strokes . 7) (total-strokes . 11) - (=cns11643-1 . #x5B44) ; &C1-5B44; - (=ucs@cns . #x6BBA) ; &C1-5B44; + (<-denotational + ((=ucs . #x6BBA) ; 殺 + )) + (->subsumptive + ((shinjigen-1 . 3997) + (=ks-x1001 . #x5F2F) ; &M-16638; + (=jis-x0213-1-2000 . #x7649) ; &I-JX1-7649; + (=daikanwa . 16638) ; &I-M-16638; + (=jef-china3 . #x54ED) ; &I-JC3-54ED; + (=ucs@jis . #xF970) ; &M-16638; + (=ucs@ks . #x6BBA) ; &M-16638; + ) + ((=>ucs* . #x6BBA) ; 殺 + (=ucs . #xF970) ; 殺 + (=ks-x1001 . #x616D) ; &I-K0-616D; + ) + ((=cns11643-1 . #x5B44) ; &C1-5B44; + (=ucs@cns . #x6BBA) ; &C1-5B44; + )) )) (define-char '((ideographic-radical . 79) ; ⽎ diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index f9d7435..72a560a 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -9963,10 +9963,10 @@ ((=ucs . #x6EAB) ; 溫 (=jis-x0213-1-2000 . #x767C) ; &I-JX1-767C; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 17968) ; &I-M-17968; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zihui daikanwa) (shinjigen-2 . 4319) (=ucs . #x6E29) ; 温 @@ -20922,41 +20922,44 @@ (=cns11643-7 . #x386E) ; &C7-386E; )) (define-char - '((=>ucs . #x701E) ; 瀞 - (=>ucs@cns . #x2F914) ; 瀞 + '((=>ucs@cns . #x2F914) ; 瀞 (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 14) (total-strokes . 17) - (<-vulgar-ideograph - (:char ((=daikanwa . 18659) ; &I-M-18659; - ) - :sources (seiji-tsuu morohashi-daikanwa))) + (<-denotational + ((=ucs . #x701E) ; 瀞 + )) + (<-vulgar + ((=daikanwa . 18659) ; &I-M-18659; + )) + (<-vulgar*sources + zhengzi-tong daikanwa) (=daikanwa . 18520) ; &M-18520; (=jef-china3 . #x57B6) ; &I-JC3-57B6; )) (define-char '((=>ucs@cns . #x2F914) ; 瀞 - (morohashi-daikanwa 18520 0 5) + (=>daikanwa . 18520) ; &M-18520; (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 14) (total-strokes . 17) - (=ucs . #x701E) ; 瀞 - (=jis-x0208-1983 . #x4654) ; &I-J83-4654; - (=jis-x0208-1990 . #x4654) ; &I-J90-4654; - (=gt . 23701) ; &I-GT-23701; - (=gt-pj-1 . #x4654) ; &I-GT-23701; - (=jef-china3 . #x70D8) ; &I-JC3-70D8; - )) -(define-char - '((=>ucs* . #x701E) ; 瀞 - (=>ucs@gb . #x701E) ; 瀞 - (=>ucs@jis . #x701E) ; 瀞 - (morohashi-daikanwa 18520 0 5 0) - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 14) - (total-strokes . 17) - (=ucs . #x2F914) ; 瀞 - (=cns11643-4 . #x565D) ; &I-C4-565D; + (<-denotational + ((=ucs . #x701E) ; 瀞 + )) + (->subsumptive + ((=jis-x0208-1983 . #x4654) ; >-23701; + (=jis-x0208-1990 . #x4654) ; &I-J90-4654; + (=gt . 23701) ; &I-GT-23701; + (=gt-pj-1 . #x4654) ; &I-GT-23701; + (=jef-china3 . #x70D8) ; &I-JC3-70D8; + (=ucs@unicode . #x701E) ; >-23701; + ) + ((=>ucs* . #x701E) ; 瀞 + (=>ucs@gb . #x701E) ; >-23701; + (=>ucs@jis . #x701E) ; >-23701; + (=ucs . #x2F914) ; 瀞 + (=cns11643-4 . #x565D) ; &I-C4-565D; + )) )) (define-char '((=>ucs . #x6FEB) ; 濫 @@ -21275,6 +21278,10 @@ )) (define-char '((ideographic-radical . 85) ; ⽔ + (=ucs . #x701E) ; 瀞 + )) +(define-char + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 14) (total-strokes . 17) (=ucs . #x3D68) ; 㵨 @@ -22556,22 +22563,20 @@ (=daikanwa . 18658) ; &I-M-18658; )) (define-char - '((=>ucs . #x701E) ; 瀞 - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 16) - (total-strokes . 19) - (=jis-x0208-1978 . #x4654) ; &M-18659; - (=ks-x1001 . #x6F67) ; &I-K0-6F67; - (=daikanwa . 18659) ; &I-M-18659; - (=cbeta . 01336) ; &I-CB01336; - )) -(define-char - '((=>ucs . #x701E) ; 瀞 - (morohashi-daikanwa 18659 0 2) - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 16) (total-strokes . 19) - (=cns11643-3 . #x5A52) ; &C3-5A52; + (<-denotational + ((=ucs . #x701E) ; 瀞 + )) + (->subsumptive + ((=jis-x0208-1978 . #x4654) ; &M-18659; + (=ks-x1001 . #x6F67) ; &I-K0-6F67; + (=daikanwa . 18659) ; &I-M-18659; + (=cbeta . 01336) ; &I-CB01336; + ) + ((=cns11643-3 . #x5A52) ; &C3-5A52; + )) )) (define-char '((=>ucs . #x701F) ; 瀟 diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index e5b7ad6..fd1c03c 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -133,87 +133,92 @@ '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 2) (total-strokes . 6) - (hanyu-dazidian 3 2188 13) (=ucs . #x24183) ; 𤆃 - (=cns11643-6 . #x2533) ; &I-C6-2533; - (=daikanwa . 18856) ; &I-M-18856; - (=hanziku-6 . #xC275) ; &I-HZK06-C275; + (->subsumptive + ((hanyu-dazidian 3 2188 13) + (=daikanwa . 18856) ; &M-18856; + (=hanziku-6 . #xC275) ; &I-HZK06-C275; + (=ucs@iso . #x24183) ; &M-18856; + ) + ((=cns11643-6 . #x2533) ; &C6-2533; + )) )) (define-char '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 2) (total-strokes . 6) (=ucs . #x3DA1) ; 㶡 - (=cns11643-3 . #x242A) ; &I-C3-242A; - (=daikanwa . 18857) ; &I-M-18857; - )) -(define-char - '((ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 2) - (total-strokes . 6) - (=ucs . #x7070) ; 灰 - (=gb2312 . #x3B52) ; &I-G0-3B52; - (=ks-x1001 . #x7C69) ; &I-K0-7C69; - (=big5 . #xA6C7) ; &I-B-A6C7; - (=gt-k . 01577) ; &I-GT-K01577; - (=gt-pj-k1 . #x3B6A) ; 灰 - (=daikanwa . 18858) ; &I-M-18858; + (->subsumptive + ((=daikanwa . 18857) ; &M-18857; + (=ucs@unicode . #x3DA1) ; &M-18857; + ) + ((=cns11643-3 . #x242A) ; &C3-242A; + )) )) (define-char - '((=>ucs . #x7070) ; 灰 - (morohashi-daikanwa 18858 0 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 2) - (total-strokes . 6) - (=cns11643-1 . #x4848) ; &C1-4848; + '((<-denotational + ((=ucs . #x7070) ; 灰 + )) + (->subsumptive + ((=gb2312 . #x3B52) ; &M-18858; + (=ks-x1001 . #x7C69) ; &I-K0-7C69; + (=big5 . #xA6C7) ; &I-B-A6C7; + (=gt-k . 01577) ; &I-GT-K01577; + (=gt-pj-k1 . #x3B6A) ; &M-18858; + (=daikanwa . 18858) ; &I-M-18858; + (=ucs@unicode . #x7070) ; &M-18858; + ) + ((=cns11643-1 . #x4848) ; &C1-4848; + )) )) (define-char - '((=>ucs . #x2F835) ; 灰 - (ideographic-radical . 86) ; ⽕ + '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 2) (total-strokes . 6) - (<-vulgar-ideograph - (:char ((=daikanwa . 18858) ; &I-M-18858; - ) - :sources (chuuka-daijiten morohashi-daikanwa))) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 - ) - ((=ucs . #x706B) ; 火 - )) - (shinjigen-2 . 4551) - (=jis-x0208 . #x3325) ; >-24159; - (=gt . 24159) ; &I-GT-24159; - (=gt-k . 01576) ; &I-GT-K01576; - (=gt-pj-1 . #x3325) ; &I-GT-24159; - (=daikanwa . 18859) ; &I-M-18859; - (=cbeta . 01926) ; &I-CB01926; - (=ucs@jis . #x7070) ; >-24159; + (=ucs . #x7070) ; 灰 )) (define-char '((=>ucs* . #x7070) ; 灰 - (morohashi-daikanwa 18859 0 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 2) - (total-strokes . 6) - (<-vulgar-ideograph - ((=daikanwa . 18858) ; &I-M-18858; + (<-denotational + ((=ucs . #x7070) ; 灰 )) - (<-vulgar-ideograph*sources - zhonghua-dazidian daikanwa) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((=ucs . #x5382) ; 厂 + (=ucs . #x2F835) ; 灰 + (->subsumptive + ((<-vulgar + ((=gb2312 . #x3B52) ; &M-18858; + (=ks-x1001 . #x7C69) ; &I-K0-7C69; + (=daikanwa . 18858) ; &I-M-18858; + )) + (<-vulgar*sources + zhonghua-dazidian daikanwa) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=ucs . #x706B) ; 火 + )) + (shinjigen-2 . 4551) + (=jis-x0208 . #x3325) ; >-24159; + (=gt . 24159) ; &I-GT-24159; + (=gt-k . 01576) ; &I-GT-K01576; + (=gt-pj-1 . #x3325) ; &I-GT-24159; + (=daikanwa . 18859) ; &I-M-18859; + (=cbeta . 01926) ; &I-CB01926; + (=ucs@jis . #x7070) ; >-24159; ) - ((=cns11643-1 . #x4556) ; &C1-4556; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=cns11643-1 . #x4556) ; &C1-4556; + )) + (=cns11643-3 . #x2429) ; &C3-2429; + (=ucs@iso . #x2F835) ; &C3-2429; )) - (=ucs . #x2F835) ; 灰 - (=cns11643-3 . #x2429) ; &I-C3-2429; )) (define-char '((=>ucs . #x24186) ; 𤆆 @@ -1748,73 +1753,87 @@ '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 5) (total-strokes . 9) - (hanyu-dazidian 3 2196 8) (=ucs . #x241BD) ; 𤆽 - (=cns11643-6 . #x324C) ; &I-C6-324C; - (=daikanwa . 18950) ; &I-M-18950; - (=hanziku-6 . #xC3F5) ; &I-HZK06-C3F5; + (->subsumptive + ((hanyu-dazidian 3 2196 8) + (=daikanwa . 18950) ; &M-18950; + (=hanziku-6 . #xC3F5) ; &I-HZK06-C3F5; + (=ucs@iso . #x241BD) ; &M-18950; + ) + ((=cns11643-6 . #x324C) ; &C6-324C; + )) )) (define-char '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 5) (total-strokes . 9) - (hanyu-dazidian 3 2197 8) (=ucs . #x241BE) ; 𤆾 - (=cns11643-5 . #x2A26) ; &I-C5-2A26; - (=daikanwa . 18951) ; &I-M-18951; - (=hanziku-6 . #xC456) ; &I-HZK06-C456; + (->subsumptive + ((hanyu-dazidian 3 2197 8) + (=daikanwa . 18951) ; &M-18951; + (=hanziku-6 . #xC456) ; &I-HZK06-C456; + (=ucs@iso . #x241BE) ; &M-18951; + ) + ((=cns11643-5 . #x2A26) ; &C5-2A26; + )) )) (define-char '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x3DAD) ; 㶭 - (=cns11643-3 . #x2D66) ; &I-C3-2D66; - (=daikanwa . 18952) ; &I-M-18952; - )) -(define-char - '((=>ucs . #x70AD) ; 炭 - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 5) - (total-strokes . 9) - (shinjigen-2 . 4581) - (=jis-x0208 . #x433A) ; >-24283; - (=ks-x1001 . #x7729) ; &I-K0-7729; - (=big5 . #xACB4) ; &I-B-ACB4; - (=gt . 24283) ; &I-GT-24283; - (=gt-k . 05138) ; &I-GT-K05138; - (=gt-pj-1 . #x433A) ; &I-GT-24283; - (=daikanwa . 18953) ; &I-M-18953; - (=ucs@jis . #x70AD) ; >-24283; + (->subsumptive + ((=daikanwa . 18952) ; &M-18952; + (=ucs@unicode . #x3DAD) ; &M-18952; + ) + ((=cns11643-3 . #x2D66) ; &C3-2D66; + )) )) (define-char - '((=>ucs . #x70AD) ; 炭 - (morohashi-daikanwa 18953 0 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 5) - (total-strokes . 9) - (=cns11643-1 . #x5237) ; &C1-5237; + '((<-denotational + ((=ucs . #x70AD) ; 炭 + )) + (->subsumptive + ((shinjigen-2 . 4581) + (=jis-x0208 . #x433A) ; >-24283; + (=ks-x1001 . #x7729) ; &I-K0-7729; + (=big5 . #xACB4) ; &I-B-ACB4; + (=gt . 24283) ; &I-GT-24283; + (=gt-k . 05138) ; &I-GT-K05138; + (=gt-pj-1 . #x433A) ; &I-GT-24283; + (=daikanwa . 18953) ; &I-M-18953; + (=ucs@jis . #x70AD) ; >-24283; + ) + ((=cns11643-1 . #x5237) ; &C1-5237; + )) )) (define-char - '((morohashi-daikanwa 18953 1) - (ideographic-radical . 86) ; ⽕ + '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 5) (total-strokes . 9) - (<-vulgar-ideograph - (:char ((=daikanwa . 18953) ; &I-M-18953; - ) - :sources (morohashi-daikanwa))) (=ucs . #x70AD) ; 炭 - (=gb2312 . #x4C3F) ; &I-G0-4C3F; - (mojikyo . 050263) ; &MCS-6000C457; )) (define-char - '((=>ucs . #x70AD) ; 炭 - (morohashi-daikanwa 18953 1 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 5) - (total-strokes . 9) - (=cns11643-6 . #x3248) ; &C6-3248; + '((<-denotational + ((=ucs . #x70AD) ; 炭 + )) + (->subsumptive + ((morohashi-daikanwa 18953 1) + (<-vulgar + ((=jis-x0208 . #x433A) ; >-24283; + (=ks-x1001 . #x7729) ; &I-K0-7729; + (=daikanwa . 18953) ; &I-M-18953; + )) + (<-vulgar*sources + daikanwa) + (=gb2312 . #x4C3F) ; &G0-4C3F; + (=ucs@unicode . #x70AD) ; &G0-4C3F; + (mojikyo . 050263) ; &MCS-6000C457; + ) + ((=>ucs* . #x70AD) ; 炭 + (=ucs . #x2F91A) ; 炭 + (=cns11643-6 . #x3248) ; &I-C6-3248; + )) )) (define-char '((ideographic-radical . 86) ; ⽕ diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el index ce701e4..8b69af3 100644 --- a/lisp/utf-2000/Ideograph-R096-Jade.el +++ b/lisp/utf-2000/Ideograph-R096-Jade.el @@ -1281,28 +1281,26 @@ '((ideographic-radical . 96) ; ⽟ (ideographic-strokes . 5) (total-strokes . 9) - (<-vulgar-ideograph - (:sources (jiyun morohashi-daikanwa) - :char ((=daikanwa . 20920) ; &I-M-20920; - ) - )) (=ucs . #x73CE) ; 珎 - (=jis-x0208-1978 . #x605F) ; &I-J78-605F; - (=daikanwa . 20921) ; &I-M-20921; - )) -(define-char - '((=>ucs . #x73CE) ; 珎 - (morohashi-daikanwa 20921 0 0) - (ideographic-radical . 96) ; ⽟ - (ideographic-strokes . 5) - (total-strokes . 9) - (=jis-x0208-1983 . #x605F) ; >-26769; - (=jis-x0208-1990 . #x605F) ; &I-J90-605F; - (=cns11643-3 . #x2D7E) ; &I-C3-2D7E; - (=gt . 26769) ; &I-GT-26769; - (=gt-pj-1 . #x605F) ; &I-GT-26769; - (=jef-china3 . #x5AAB) ; &I-JC3-5AAB; - (=ucs@jis . #x73CE) ; >-26769; + (->subsumptive + ((<-vulgar + ((=ucs . #x73CD) ; 珍 + (=daikanwa . 20920) ; &I-M-20920; + )) + (<-vulgar*sources + jiyun daikanwa) + (=jis-x0208-1978 . #x605F) ; &M-20921; + (=daikanwa . 20921) ; &I-M-20921; + (=ucs@unicode . #x73CE) ; &M-20921; + ) + ((=jis-x0208-1983 . #x605F) ; >-26769; + (=jis-x0208-1990 . #x605F) ; &I-J90-605F; + (=cns11643-3 . #x2D7E) ; &I-C3-2D7E; + (=gt . 26769) ; &I-GT-26769; + (=gt-pj-1 . #x605F) ; &I-GT-26769; + (=jef-china3 . #x5AAB) ; &I-JC3-5AAB; + (=ucs@jis . #x73CE) ; >-26769; + )) )) (define-char '((ideographic-radical . 96) ; ⽟ diff --git a/lisp/utf-2000/Ideograph-R102-Field.el b/lisp/utf-2000/Ideograph-R102-Field.el index 3603bd1..5d04059 100644 --- a/lisp/utf-2000/Ideograph-R102-Field.el +++ b/lisp/utf-2000/Ideograph-R102-Field.el @@ -646,6 +646,9 @@ '((ideographic-radical . 102) ; ⽥ (ideographic-strokes . 4) (total-strokes . 9) + (<-vulgar + ((=ucs . #x200BD) ; 𠂽 + )) (shinjigen-1 . 5030) (shinjigen-2 . 5030) (=ucs . #x754F) ; 畏 @@ -1205,17 +1208,19 @@ (=daikanwa . 21827) ; &I-M-21827; )) (define-char - '((ideographic- (:radical 102 ; ⽥ - :strokes 5 - :sources (cns-11643 morohashi-daikanwa)) - (:radical 4 ; ⼃ - :strokes 9 - :sources (ucs))) + '((ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 9) + (ideographic-radical@cns . 102) ; ⽥ + (ideographic-strokes@cns . 5) + (ideographic-radical@cns*sources + cns11643 daikanwa) (total-strokes . 10) - (->vulgar-ideograph - (:char ((=daikanwa . 21778) ; &I-M-21778; - ) - :sources (morohashi-daikanwa))) + (->vulgar + ((=ucs . #x754F) ; 畏 + (=daikanwa . 21778) ; &I-M-21778; + )) + (->vulgar*sources + daikanwa) (hanyu-dazidian 1 41 4) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R106-White.el b/lisp/utf-2000/Ideograph-R106-White.el index 0ee3c30..165bb56 100644 --- a/lisp/utf-2000/Ideograph-R106-White.el +++ b/lisp/utf-2000/Ideograph-R106-White.el @@ -328,11 +328,12 @@ (ideographic-radical . 106) ; ⽩ (ideographic-strokes . 4) (total-strokes . 9) - (<-vulgar-ideograph + (<-vulgar ((shinjigen-1 . 3961) + (=cns11643-3 . #x3C48) ; &M-16308; (=daikanwa . 16308) ; &I-M-16308; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources shinjigen-1) (shinjigen-1 . 3962) (shinjigen-2 . 3962) diff --git a/lisp/utf-2000/Ideograph-R112-Stone.el b/lisp/utf-2000/Ideograph-R112-Stone.el index 848153b..a0f1a16 100644 --- a/lisp/utf-2000/Ideograph-R112-Stone.el +++ b/lisp/utf-2000/Ideograph-R112-Stone.el @@ -619,10 +619,12 @@ (=jis-x0213-1-2000 . #x7923) ; &I-JX1-7923; (=daikanwa . 24177) ; &I-M-24177; )) - (<-vulgar-ideograph - ((=daikanwa . 24177) ; &I-M-24177; + (<-vulgar + ((=ks-x1001 . #x665A) ; >-30890; + (=jis-x0213-1-2000 . #x7923) ; &I-JX1-7923; + (=daikanwa . 24177) ; &I-M-24177; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (shinjigen-2 . 5407) (=ucs . #x7814) ; 研 diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el index 6872725..f00c5b2 100644 --- a/lisp/utf-2000/Ideograph-R113-Spirit.el +++ b/lisp/utf-2000/Ideograph-R113-Spirit.el @@ -2800,10 +2800,10 @@ (ideographic-radical . 113) ; ⽰ (ideographic-strokes . 8) (total-strokes . 13) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 24835) ; &I-M-24835; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources sougen-irai-zokujifu daikanwa) (=daikanwa . 24754) ; &M-24754; )) @@ -3833,10 +3833,10 @@ (ideographic-radical . 113) ; ⽰ (ideographic-strokes . 11) (total-strokes . 16) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 25267) ; &I-M-25267; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources seiji-tsuu daikanwa) (=daikanwa . 24824) ; &M-24824; )) diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index e5a27d5..3c0eaa5 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -2407,10 +2407,10 @@ ((=ucs . #xFA56) ; 節 (=jis-x0213-1-2000 . #x7964) ; &I-JX1-7964; )) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 26243) ; &M-26243; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources cihai daikanwa) (shinjigen-2 . 5805) (=ucs . #x7BC0) ; 節 diff --git a/lisp/utf-2000/Ideograph-R135-Tongue.el b/lisp/utf-2000/Ideograph-R135-Tongue.el index c81e00d..d303bdb 100644 --- a/lisp/utf-2000/Ideograph-R135-Tongue.el +++ b/lisp/utf-2000/Ideograph-R135-Tongue.el @@ -445,33 +445,36 @@ (=cns11643-5 . #x4929) ; &I-C5-4929; )) (define-char - '((=>ucs . #x8F9E) ; 辞 - (ideographic-radical . 135) ; ⾆ - (ideographic-strokes . 7) - (total-strokes . 13) - (->same - ((=jis-x0208 . #x3C2D) ; >-51568; - (=daikanwa . 38638) ; &I-M-38638; - )) - (->same*sources - daikanwa) - (<-vulgar-ideograph - (:char ((=daikanwa . 38671) ; &I-M-38671; - ) - :sources (daikanwa)) - (:char ((=daikanwa . 38649) ; &I-M-38649; - ) - :sources (daikanwa))) - (=daikanwa . 30307) ; &M-30307; - )) -(define-char '((=>ucs* . #x8F9E) ; 辞 - (morohashi-daikanwa 30307 0 1) (ideographic-radical . 135) ; ⾆ (ideographic-strokes . 7) (total-strokes . 13) + (<-denotational + ((=ucs . #x8F9E) ; 辞 + )) (=ucs . #x2F98D) ; 辞 - (=cns11643-3 . #x4425) ; &I-C3-4425; + (->subsumptive + ((->identical + ((=jis-x0208 . #x3C2D) ; >-51568; + (=daikanwa . 38638) ; &I-M-38638; + )) + (->same*sources + daikanwa) + (<-vulgar@jiyun + ((=daikanwa . 38649) ; &I-M-38649; + )) + (<-vulgar@jiyun*sources + daikanwa) + (<-vulgar@zhengzi-tong + ((=daikanwa . 38671) ; &I-M-38671; + )) + (<-vulgar@zhengzi-tong*sources + daikanwa) + (=daikanwa . 30307) ; &M-30307; + ) + ((=cns11643-3 . #x4425) ; &C3-4425; + (=ucs@iso . #x2F98D) ; &C3-4425; + )) )) (define-char '((=>ucs . #x269DF) ; 𦧟 diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index dcb05bd..61d0e07 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -14052,26 +14052,24 @@ (=ucs . #x843B) ; 萻 )) (define-char - '((=>ucs . #x843C) ; 萼 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-1 . #x6637) ; &M-31361; - (=daikanwa . 31361) ; &I-M-31361; - )) -(define-char - '((morohashi-daikanwa 31361 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) - (shinjigen-1 . 6886) (=ucs . #x843C) ; 萼 - (=jis-x0208 . #x6855) ; &I-J90-6855; - (=gb2312 . #x5D60) ; &I-G0-5D60; - (=big5 . #xB8B0) ; &I-B-B8B0; - (=gt . 40986) ; &I-GT-40986; - (=gt-pj-1 . #x6855) ; &I-GT-40986; - (mojikyo . 055577) ; &MCS-6000D919; + (->subsumptive + ((total-strokes . 13) + (=cns11643-1 . #x6637) ; &M-31361; + (=daikanwa . 31361) ; &I-M-31361; + ) + ((total-strokes . 12) + (shinjigen-1 . 6886) + (=jis-x0208 . #x6855) ; >-40986; + (=gb2312 . #x5D60) ; &I-G0-5D60; + (=big5 . #xB8B0) ; &I-B-B8B0; + (=gt . 40986) ; &I-GT-40986; + (=gt-pj-1 . #x6855) ; &I-GT-40986; + (=ucs@unicode . #x843C) ; >-40986; + (mojikyo . 055577) ; &MCS-6000D919; + )) )) (define-char '((=>ucs . #x843D) ; 落 @@ -25755,31 +25753,30 @@ (=daikanwa . 31969) ; &I-M-31969; )) (define-char - '((=>ucs . #x855A) ; 蕚 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 12) - (total-strokes . 16) - (=cns11643-3 . #x5258) ; &M-31970; - (=daikanwa . 31970) ; &I-M-31970; - )) -(define-char - '((morohashi-daikanwa 31970 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 12) - (total-strokes . 15) - (<-vulgar-ideograph - ((shinjigen-1 . 6886) - (=ucs . #x843C) ; 萼 - )) - (<-vulgar-ideograph*sources - shinjigen-1) - (hanyu-dazidian 5 3291 3) - (shinjigen-1 . 6887) (=ucs . #x855A) ; 蕚 - (=jis-x0208 . #x6856) ; &I-J90-6856; - (=gt . 42222) ; &I-GT-42222; - (=gt-pj-1 . #x6856) ; &I-GT-42222; - (=hanziku-9 . #xA9CB) ; &I-HZK09-A9CB; + (->subsumptive + ((total-strokes . 16) + (=cns11643-3 . #x5258) ; &M-31970; + (=daikanwa . 31970) ; &I-M-31970; + ) + ((total-strokes . 15) + (<-vulgar + ((shinjigen-1 . 6886) + (=jis-x0208 . #x6855) ; >-40986; + (=gb2312 . #x5D60) ; &I-G0-5D60; + )) + (<-vulgar*sources + shinjigen-1) + (hanyu-dazidian 5 3291 3) + (shinjigen-1 . 6887) + (=jis-x0208 . #x6856) ; >-42222; + (=gt . 42222) ; &I-GT-42222; + (=gt-pj-1 . #x6856) ; &I-GT-42222; + (=hanziku-9 . #xA9CB) ; &I-HZK09-A9CB; + (=ucs@unicode . #x855A) ; >-42222; + )) )) (define-char '((=>ucs . #x26EAC) ; 𦺬 diff --git a/lisp/utf-2000/Ideograph-R160-Bitter.el b/lisp/utf-2000/Ideograph-R160-Bitter.el index 410ffa3..301a182 100644 --- a/lisp/utf-2000/Ideograph-R160-Bitter.el +++ b/lisp/utf-2000/Ideograph-R160-Bitter.el @@ -218,40 +218,45 @@ (=cns11643-3 . #x3F4B) ; &I-C3-3F4B; )) (define-char - '((=>ucs . #x8F9E) ; 辞 - (ideographic-radical . 160) ; ⾟ + '((ideographic-radical . 160) ; ⾟ (ideographic-strokes . 6) (total-strokes . 13) - (<-simplified@JP/Jouyou - ((=jis-x0208 . #x6D66) ; >-51611; - (=ks-x1001 . #x5E76) ; &I-K0-5E76; - (=daikanwa . 38671) ; &I-M-38671; - )) - (<-vulgar-ideograph@jiyun - ((=daikanwa . 38649) ; &I-M-38649; - )) - (<-vulgar-ideograph@jiyun*sources - jiyun daikanwa) - (<-vulgar-ideograph@zhengzi-tong - ((=daikanwa . 38671) ; &I-M-38671; - )) - (<-vulgar-ideograph@zhengzi-tong*sources - zhengzi-tong daikanwa) - (shinjigen-2 . 8199) - (=jis-x0208 . #x3C2D) ; >-51568; - (=gt . 51568) ; &I-GT-51568; - (=gt-pj-1 . #x3C2D) ; &I-GT-51568; - (=daikanwa . 38638) ; &I-M-38638; - (=ucs@jis . #x8F9E) ; >-51568; + (=ucs . #x8F9E) ; 辞 )) (define-char - '((morohashi-daikanwa 38638 0 0) - (ideographic-radical . 160) ; ⾟ + '((ideographic-radical . 160) ; ⾟ (ideographic-strokes . 6) (total-strokes . 13) - (=ucs . #x8F9E) ; 辞 - (=gb2312 . #x3447) ; &I-G0-3447; - (=cns11643-3 . #x4477) ; &I-C3-4477; + (<-denotational + ((=ucs . #x8F9E) ; 辞 + )) + (->subsumptive + ((<-simplified@JP/Jouyou + ((=jis-x0208 . #x6D66) ; >-51611; + (=ks-x1001 . #x5E76) ; &I-K0-5E76; + (=daikanwa . 38671) ; &I-M-38671; + )) + (<-vulgar@jiyun + ((=daikanwa . 38649) ; &I-M-38649; + )) + (<-vulgar@jiyun*sources + jiyun daikanwa) + (<-vulgar@zhengzi-tong + ((=daikanwa . 38671) ; &I-M-38671; + )) + (<-vulgar@zhengzi-tong*sources + zhengzi-tong daikanwa) + (shinjigen-2 . 8199) + (=jis-x0208 . #x3C2D) ; >-51568; + (=gt . 51568) ; &I-GT-51568; + (=gt-pj-1 . #x3C2D) ; &I-GT-51568; + (=daikanwa . 38638) ; &I-M-38638; + (=ucs@jis . #x8F9E) ; >-51568; + ) + ((=gb2312 . #x3447) ; &C3-4477; + (=cns11643-3 . #x4477) ; &I-C3-4477; + (=ucs@unicode . #x8F9E) ; &C3-4477; + )) )) (define-char '((=>ucs . #x28414) ; 𨐔 diff --git a/lisp/utf-2000/Ideograph-R165-Distinguish.el b/lisp/utf-2000/Ideograph-R165-Distinguish.el index 1992227..57ab7bb 100644 --- a/lisp/utf-2000/Ideograph-R165-Distinguish.el +++ b/lisp/utf-2000/Ideograph-R165-Distinguish.el @@ -79,10 +79,10 @@ (ideographic-radical . 165) ; ⾤ (ideographic-strokes . 4) (total-strokes . 11) - (<-vulgar-ideograph + (<-vulgar ((=daikanwa . 40129) ; &I-M-40129; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (=gt . 53949) ; >-53949; (=gt-pj-7 . #x6356) ; >-53949; diff --git a/lisp/utf-2000/Ideograph-R177-Leather.el b/lisp/utf-2000/Ideograph-R177-Leather.el index fae277ba..c6129fe 100644 --- a/lisp/utf-2000/Ideograph-R177-Leather.el +++ b/lisp/utf-2000/Ideograph-R177-Leather.el @@ -163,40 +163,32 @@ (=daikanwa . 42723) ; &I-M-42723; )) (define-char - '((=>ucs . #x9771) ; 靱 - (morohashi-daikanwa ho 701) - (ideographic-radical . 177) ; ⾰ + '((ideographic-radical . 177) ; ⾰ (ideographic-strokes . 3) (total-strokes . 12) - (<-vulgar-ideograph - (:sources (doubun-tsuukou morohashi-daikanwa) - :char ((=daikanwa . 42713) ; &I-M-42713; - ) + (=ucs . #x9771) ; 靱 + (->subsumptive + ((morohashi-daikanwa ho 701) + (<-vulgar@ruijumyougishou + ((=daikanwa . 27248) ; &I-M-27248; + )) + (<-vulgar@ruijumyougishou*sources + ruijumyougishou daikanwa) + (<-vulgar@tongwen-tongkao + ((=daikanwa . 42713) ; &I-M-42713; + )) + (<-vulgar@tongwen-tongkao*sources + tongwen-tongkao daikanwa) + (=jis-x0208-1990 . #x7057) ; >-57335; + (=gt . 57335) ; &I-GT-57335; + (=gt-pj-1 . #x7057) ; &I-GT-57335; + (=ucs@jis . #x9771) ; >-57335; ) - (:sources (ruishuu-meigishou morohashi-daikanwa) - :char ((=daikanwa . 27248) ; &I-M-27248; - ) + ((=jis-x0208-1983 . #x7057) ; &J83-7057; + (=ucs@unicode . #x9771) ; &J83-7057; + ) + ((=jis-x0208-1978 . #x3F59) ; &J78-3F59; )) - (=jis-x0208-1990 . #x7057) ; >-57335; - (=gt . 57335) ; &I-GT-57335; - (=gt-pj-1 . #x7057) ; &I-GT-57335; - (=ucs@jis . #x9771) ; >-57335; - )) -(define-char - '((morohashi-daikanwa ho 701 0) - (ideographic-radical . 177) ; ⾰ - (ideographic-strokes . 3) - (total-strokes . 12) - (=ucs . #x9771) ; 靱 - (=jis-x0208-1983 . #x7057) ; &I-J83-7057; - )) -(define-char - '((=>ucs . #x9771) ; 靱 - (morohashi-daikanwa ho 701 2) - (ideographic-radical . 177) ; ⾰ - (ideographic-strokes . 3) - (total-strokes . 12) - (=jis-x0208-1978 . #x3F59) ; &J78-3F59; )) (define-char '((ideographic-radical . 177) ; ⾰ diff --git a/lisp/utf-2000/Ideograph-R189-Tall.el b/lisp/utf-2000/Ideograph-R189-Tall.el index 8ae1564..6bce67e 100644 --- a/lisp/utf-2000/Ideograph-R189-Tall.el +++ b/lisp/utf-2000/Ideograph-R189-Tall.el @@ -24,25 +24,25 @@ (=cns11643-1 . #x586D) ; &I-C1-586D; )) (define-char - '((=>ucs . #x9AD9) ; 髙 - (ideographic-radical . 189) ; ⾼ - (ideographic-strokes . 0) - (total-strokes . 11) - (<-vulgar-ideograph - (:char ((=daikanwa . 45313) ; &I-M-45313; - ) - :sources (inkai morohashi-daikanwa))) - (=daikanwa . 45314) ; &M-45314; - )) -(define-char - '((morohashi-daikanwa 45314 0 0) - (ideographic-radical . 189) ; ⾼ + '((ideographic-radical . 189) ; ⾼ (ideographic-strokes . 0) (total-strokes . 11) - (hanyu-dazidian 7 4594 1) (=ucs . #x9AD9) ; 髙 - (=cns11643-4 . #x362D) ; &I-C4-362D; - (=hanziku-12 . #xB9E2) ; &I-HZK12-B9E2; + (->subsumptive + ((<-vulgar + ((=jis-x0208 . #x3962) ; >-60968; + (=ks-x1001 . #x4D54) ; &I-K0-4D54; + (=daikanwa . 45313) ; &I-M-45313; + )) + (<-vulgar*sources + yunhai daikanwa) + (=daikanwa . 45314) ; &M-45314; + ) + ((hanyu-dazidian 7 4594 1) + (=cns11643-4 . #x362D) ; &HZK12-B9E2; + (=hanziku-12 . #xB9E2) ; &I-HZK12-B9E2; + (=ucs@unicode . #x9AD9) ; &HZK12-B9E2; + )) )) (define-char '((=>ucs . #x4BE7) ; 䯧 diff --git a/lisp/utf-2000/Ideograph-R205-Frog.el b/lisp/utf-2000/Ideograph-R205-Frog.el index 0ae2495..2d15686 100644 --- a/lisp/utf-2000/Ideograph-R205-Frog.el +++ b/lisp/utf-2000/Ideograph-R205-Frog.el @@ -33,17 +33,18 @@ (ideographic-radical . 205) ; ⿌ (ideographic-strokes . 0) (total-strokes . 8) - (<-vulgar-ideograph - ((=daikanwa . 48257) ; &I-M-48257; + (<-vulgar + ((=jis-x0208 . #x7366) ; &M-48257; + (=daikanwa . 48257) ; &I-M-48257; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources zhengzi-tong daikanwa) (=ucs . #x2FA18) ; 黾 (=cns11643-4 . #x2834) ; &I-C4-2834; (=daikanwa . 48258) ; &I-M-48258; )) (define-char - '((morohashi-daikanwa 48258 0 2) + '((=>daikanwa . 48258) ; 黾 (ideographic-radical@ucs . 205) ; ⿌ (ideographic-strokes@ucs . 0) (ideographic-radical@cns . 30) ; ⼝ diff --git a/lisp/utf-2000/Ideograph-R213-Turtle.el b/lisp/utf-2000/Ideograph-R213-Turtle.el index c1bd781..83045cf 100644 --- a/lisp/utf-2000/Ideograph-R213-Turtle.el +++ b/lisp/utf-2000/Ideograph-R213-Turtle.el @@ -9,11 +9,12 @@ (ideographic-radical@cns*sources shinjigen-1 cns11643 gt) (total-strokes . 11) - (<-vulgar-ideograph - ((ideographic-radical . 213) ; ⿔ + (<-vulgar + ((=jis-x0208-1983 . #x737D) ; >-66712; + (=ks-x1001 . #x4F4F) ; &I-K0-4F4F; (=daikanwa . 48847) ; &I-M-48847; )) - (<-vulgar-ideograph*sources + (<-vulgar*sources daikanwa) (hanyu-dazidian 8 10 19) (ideographic-structure diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 3495f53..9cf6d07 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -908,8 +908,14 @@ line-breaking)) ) ((and (not readable) + (null (get-char-attribute + char + (intern (format "%s*sources" name)))) + (not (string-match "\\*sources$" (symbol-name name))) (or (eq name '<-identical) - (string-match "^->simplified" (symbol-name name)))) + (string-match "^->simplified" (symbol-name name)) + (string-match "^->vulgar" (symbol-name name)) + )) ) ((or (eq name 'ideographic-structure) (eq name 'ideographic-) @@ -946,11 +952,8 @@ (setq required-features nil) (dolist (source sources) (cond - ((find-charset - (setq ret (intern (format "=%s" source)))) - (setq required-features - (cons ret required-features))) - ((memq source '(JP JP/Jouyou)) + ((memq source '(JP JP/Jouyou + shinjigen-1)) (setq required-features (union required-features '(=jis-x0208 @@ -965,7 +968,12 @@ (union required-features '(=gb2312 =gb12345 - =iso-ir165)))) + =iso-ir165))))) + (cond + ((find-charset + (setq ret (intern (format "=%s" source)))) + (setq required-features + (cons ret required-features))) (t (setq required-features (cons source required-features))))) (cond ((string-match "@JP" (symbol-name name)) diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el index 43f27f8..d9974c3 100644 --- a/lisp/utf-2000/read-maps.el +++ b/lisp/utf-2000/read-maps.el @@ -139,7 +139,8 @@ (char-feature chr '=>ucs))) ucs))) (if (or ucs-code (null ucs-ccs)) - (put-char-attribute chr '=>ucs ucs) + (unless (eq (char-feature chr '=>ucs) ucs) + (put-char-attribute chr '=>ucs ucs)) (unless (eq (encode-char chr ucs-ccs 'defined-only) ucs) (put-char-attribute chr ucs-ccs ucs))))) diff --git a/src/ChangeLog b/src/ChangeLog index b38f420..113f5af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2004-04-17 MORIOKA Tomohiko + + * chartab.c (Q_vulgar): New variable. + (Q_vulgar_of): New variable. + (Fput_char_attribute): Convert char-refs in value of + `{->|<-}vulgar' to characters and put reverse links. + (Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' + for `{->|<-}vulgar'. + (syms_of_chartab): Add new symbols `{->|<-}vulgar'. + 2004-04-12 MORIOKA Tomohiko * text-coding.c (decode_add_er_char): Must to quote prefix string diff --git a/src/chartab.c b/src/chartab.c index 179f6bc..f7f90bf 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1142,6 +1142,8 @@ Lisp_Object Q_component; Lisp_Object Q_component_of; Lisp_Object Q_same; Lisp_Object Q_same_of; +Lisp_Object Q_vulgar; +Lisp_Object Q_vulgar_of; Lisp_Object Qto_ucs; Lisp_Object Q_ucs_unified; Lisp_Object Qcompat; @@ -3512,6 +3514,8 @@ Store CHARACTER's ATTRIBUTE with VALUE. EQ (attribute, Q_component_of) || EQ (attribute, Q_same) || EQ (attribute, Q_same_of) || + EQ (attribute, Q_vulgar) || + EQ (attribute, Q_vulgar_of) || !NILP (Fstring_match (build_string ("^<-simplified[^*]*$"), Fsymbol_name (attribute), Qnil, Qnil)) ) @@ -3542,6 +3546,10 @@ Store CHARACTER's ATTRIBUTE with VALUE. rev_feature = Q_same_of; else if (EQ (attribute, Q_same_of)) rev_feature = Q_same; + else if (EQ (attribute, Q_vulgar)) + rev_feature = Q_vulgar_of; + else if (EQ (attribute, Q_vulgar_of)) + rev_feature = Q_vulgar; else { Lisp_String* name = symbol_name (XSYMBOL (attribute)); @@ -4607,6 +4615,8 @@ syms_of_chartab (void) defsymbol (&Q_component_of, "<-ideographic-component-forms"); defsymbol (&Q_same, "->same"); defsymbol (&Q_same_of, "<-same"); + defsymbol (&Q_vulgar, "->vulgar"); + defsymbol (&Q_vulgar_of, "<-vulgar"); defsymbol (&Qcomposition, "composition"); defsymbol (&Q_decomposition, "->decomposition"); defsymbol (&Qcompat, "compat");