From 922315ac3c903ecd0d8b2595a4f811f06f946f32 Mon Sep 17 00:00:00 2001 From: tomo Date: Thu, 24 Jul 2008 17:31:44 +0000 Subject: [PATCH] Sync up with r21-4-21-chise-0_24-shinjigen-fix. --- lisp/utf-2000/ChangeLog | 270 +++++++++++++++ lisp/utf-2000/Ideograph-R001-One.el | 11 +- lisp/utf-2000/Ideograph-R007-Two.el | 102 ++++-- lisp/utf-2000/Ideograph-R009-Man.el | 59 +++- lisp/utf-2000/Ideograph-R011-Enter.el | 14 +- lisp/utf-2000/Ideograph-R013-Down-Box.el | 7 +- lisp/utf-2000/Ideograph-R020-Wrap.el | 2 +- lisp/utf-2000/Ideograph-R022-Right-Open-Box.el | 116 +++---- lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el | 126 +++++-- lisp/utf-2000/Ideograph-R027-Cliff.el | 228 +++++++++---- lisp/utf-2000/Ideograph-R032-Earth.el | 41 ++- lisp/utf-2000/Ideograph-R050-Turban.el | 2 +- lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el | 17 +- lisp/utf-2000/Ideograph-R064-Hand.el | 27 +- lisp/utf-2000/Ideograph-R066-Rap.el | 28 +- lisp/utf-2000/Ideograph-R067-Script.el | 3 +- lisp/utf-2000/Ideograph-R069-Axe.el | 44 +-- lisp/utf-2000/Ideograph-R075-Tree.el | 65 ++-- lisp/utf-2000/Ideograph-R076-Lack.el | 3 +- lisp/utf-2000/Ideograph-R083-Clan.el | 6 +- lisp/utf-2000/Ideograph-R085-Water.el | 199 ++++++----- lisp/utf-2000/Ideograph-R086-Fire.el | 100 +++--- lisp/utf-2000/Ideograph-R118-Bamboo.el | 21 +- lisp/utf-2000/Ideograph-R120-Silk.el | 36 +- lisp/utf-2000/Ideograph-R128-Ear.el | 10 +- lisp/utf-2000/Ideograph-R130-Meat.el | 17 +- lisp/utf-2000/Ideograph-R140-Grass.el | 346 ++++++++++++++------ lisp/utf-2000/Ideograph-R142-Insect.el | 88 +++-- lisp/utf-2000/Ideograph-R145-Clothes.el | 143 +++++--- lisp/utf-2000/Ideograph-R158-Body.el | 90 +++-- lisp/utf-2000/Ideograph-R195-Fish.el | 47 ++- lisp/utf-2000/Ideograph-R199-Wheat.el | 128 +++++--- lisp/utf-2000/Ideograph-R203-Black.el | 112 ++++--- lisp/utf-2000/maps-conf.el | 2 +- .../utf-2000/u03000-CJK-Symbols-and-Punctuation.el | 16 +- src/ChangeLog | 9 +- src/char-ucs.h | 4 +- src/chartab.c | 14 +- src/fns.c | 6 +- src/mule-charset.c | 76 ++--- 40 files changed, 1826 insertions(+), 809 deletions(-) diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index df7dd51..9533ac2 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,273 @@ +2008-07-22 MORIOKA Tomohiko + + * Ideograph-R142-Insect.el (U+874E): Fix `shinjigen-1'. + (U-0002736F): Use `->subsumptive'. + (U-00027375): Likewise. + (B-E7BD): Moved to root. + (C7-282A): Map to U-00027371. + (B-BDBA): Moved to root. + +2008-07-17 MORIOKA Tomohiko + + * Ideograph-R145-Clothes.el (U-000276CF): Use `->subsumptive'. + (U+8905): Use `->subsumptive'. + (U-000276BB): New character; integrate GT-46376 and H8-D8F1. + (U+4644): Use `->denotational' and `->subsumptive'. + (C7-2854): Map to U-000276D0. + (U+8906): Use `->subsumptive'. + (U+8907): Use `->denotational' and `->subsumptive'. + +2008-07-17 MORIOKA Tomohiko + + * Ideograph-R085-Water.el (U+3D1E): Use `->denotational'. + (U-00023E72): Use `->subsumptive'. + (U+3D38): Likewise. + (U+6ED1): Use `->subsumptive' and `->subsumptive'. + (U+6ED2): Use `->subsumptive'. + (U+6ED3): Use `->subsumptive'. + (U+6ED4): Use `->denotational'. + (U+6ED5): Use `->denotational'. + (U-00023E73): Use `->subsumptive'. + + * Ideograph-R158-Body.el (C7-436C): Map to M-38139 instead of + M-38142; map to U-0002827A. + (U+483F): Use `->subsumptive' to integrate M-38142. + (U+8EC2): Use `->subsumptive'. + (C7-4A6C): Unify U-0002827F. + (U+8EC3): Use `->subsumptive'. + (C7-4A6D): Unify U-00028280. + (C7-4A6A): Map to U-00028281. + (C7-4A69): Map to U-0002828A. + (U+8EC4): Use `->subsumptive'; integrate CB04537 and H10-C142. + +2008-07-15 MORIOKA Tomohiko + + * u03000-CJK-Symbols-and-Punctuation.el (): Use + `->denotational' to separate Unicode representative form and JIS + X0208 form. + + * Ideograph-R203-Black.el (U+9ED3): Use `->subsumptive'. + (U-0002A41F): Likewise. + (C7-2C35): Use `->subsumptive'. + (M-48055): Map to U-0002A423. + (U+9ED4): Use `->subsumptive'. + (U+9ED5): Use `->subsumptive'. + (C7-3669): Map to U-0002A428. + (U+9ED6): Use `->subsumptive'. + (C7-366A): Map to U-0002A424. + +2008-07-10 MORIOKA Tomohiko + + * Ideograph-R142-Insect.el (U+87A0): Use `->denotational'. + (U+87A1): Use `->subsumptive'. + (C7-3324): Map to U-000273CE. + (U-000273CE): Use `->subsumptive'. + (J0-6A25): Fix `shinjigen-2'; use `shinjigen-2-p' for S2-7136a. + + * Ideograph-R066-Rap.el (U-00022F0C): Use `->subsumptive'. + (U+3A85): Unify GT-16629 and GT-K05707; add `<-same' for J83-3939. + + * Ideograph-R009-Man.el (J83-4A58): Unify S{1|2}-0270 instead of + S{1|2}-0269. + (U-000202B3): Use `->subsumptive' to integrate S{1|2}-0271. + +2008-07-09 MORIOKA Tomohiko + + * Ideograph-R075-Tree.el (U+68AB): Use `->denotational'. + (U+68AD): Use `->denotational' and `->subsumptive'; fix duplicated + `shinjigen-2'. + + * Ideograph-R118-Bamboo.el (J90-4F36): Use `shinjigen-2-p' instead + of `shinjigen-2'; add `<-same' for J83-6446; add `<-vulgar' for + S2-5891. + (J83-6446): Separate S2-5891. + (S2-5891): Add S1-5891. + + * Ideograph-R069-Axe.el (M-13571): Unify U-000230AC. + (U+65B0): Use `->denotational' and `->subsumptive'. + + * Ideograph-R128-Ear.el (J90-3F26): Add S1-6406. + (J83-3F26): Delete S2-6406. + (JC3-60D2): Add S{1|2}-6407. + +2008-07-06 MORIOKA Tomohiko + + * Ideograph-R064-Hand.el (U+649A): Use `->subsumptive'; fix + duplicated `shinjigen-2'. + + * Ideograph-R120-Silk.el (S2-6190): Fix `shinjigen-1'. + + * Ideograph-R083-Clan.el (J83-5D62): Delete S2-4040. + (J90-5D62): Add S1-4040. + + * Ideograph-R050-Turban.el (J0-3B54): Add S1-2082. + (G0-4A50): Delete S2-2082. + +2008-07-02 MORIOKA Tomohiko + + * Ideograph-R007-Two.el (U+4E9B): Use `->denotational'; use + `hanyu-dazidian' instead of `hanyu-dazidian-{vol|page|char}. + (U-00020128): Use `->denotational' instead of `->subsumptive'. + +2008-07-01 MORIOKA Tomohiko + + * Ideograph-R022-Right-Open-Box.el (U+533C): Use `->denotational' + instead of `->subsumptive'; add + `ideographic-radical@{daikanwa|cns}'. + (M-02620): Unify U-0002093D. + (U+5327): Use `->subsumptive'. + + * Ideograph-R140-Grass.el (U-00026B01): Use `->denotational'. + (U+8283): Likewise. + (U+8284): Likewise. + (U+8285): Use `->denotational' and `->subsumptive'. + (U+4496): Likewise. + (U+8286): Likewise. + (U+8287): Use `->denotational'. + (U+8289): Use `->denotational' instead of `->subsumptive'. + +2008-06-28 MORIOKA Tomohiko + + * Ideograph-R023-Hiding-Enclosure.el (U-00020971): Use + `->denotational' to integrate H1-B273. + (C6-2637): Use `<-denotational' for U-00020971; add `<-Zetian' and + `<-same' for GT-18141. + (U+3530): Use `->denotational'. + (U+533C): Use `->denotational' instead of `->subsumptive'; add + `ideographic-radical@{daikanwa|cns}'. + +2008-06-28 MORIOKA Tomohiko + + * Ideograph-R076-Lack.el (U-000238AD): Add `sound@ja/on'. + (M-16058): Modify for M-02941. + +2008-06-27 MORIOKA Tomohiko + + * Ideograph-R027-Cliff.el (U-00020A3B): Use `->subsumptive'. + (M-02915): Unify U-00020A3E and H1-B257. + (M-02925): Map to U-00020A48. + (M-02926): Map to U-00020A46. + (M-02927): Unify U-00020A49. + (M-02940): Map to U-00020A54. + (U-00020A57): Use `->subsumptive'. + (U+5396): Use `->denotational' and `->subsumptive'; use + `hanyu-dazidian' instead of `hanyu-dazidian-{vol|page|char}'. + (M-02957): Map to U-00020A65. + (U-00020A66): Use `->subsumptive'. + (U-00020A46): Use `->subsumptive' to integrate M-02926. + (U-00020A48): Use `->denotational' to integrate M-02925. + (U-00020A49): Don't unify H1-B273; unify M-02927. + (U-00020A54): Use `->subsumptive' to integrate M-02940. + (U-00020A65): Use `->denotational' to integrate M-02957 and + GT-03749. + +2008-06-23 MORIOKA Tomohiko + + * Ideograph-R022-Right-Open-Box.el (CB06935): New character; add + `<-unknown' for U-00020971. + +2008-06-21 MORIOKA Tomohiko + + * Ideograph-R053-Dotted-Cliff.el (M-09333): Fix `shinjigen-1' in + `<-vulgar'. + (JX2-2C25): Delete S1-0879. + (S1-0880): Add S2-0880; fix `<-formed'. + +2008-06-20 MORIOKA Tomohiko + + * Ideograph-R145-Clothes.el (M-34094): Fix `shinjigen-1'; add + S2-0824; add `shinjigen-2' into `<-original*sources'. + + * Ideograph-R013-Down-Box.el (J97-4662): Add B-A4BA. + + * Ideograph-R011-Enter.el (K0-522E): Move B-A4BA to J97-4662. + (C1-4479): Delete S{1|2}-0482. + (J97-4662): Add B-A4BA. + + * Ideograph-R009-Man.el (J97-4662): Add B-A4BA. + + * Ideograph-R001-One.el (GT-00089): Fix `shinjigen-1'; add + S2-5734; add `<-formed' for U+4E26. + +2008-06-19 MORIOKA Tomohiko + + * Ideograph-R020-Wrap.el (JX1-2E6B): Fix `shinjigen-1'. + +2008-06-18 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+8473): Use `->denotational' and + `->subsumptive'. + (U+8474): Use `->denotational'. + (U+8475): Use `->denotational' and `->subsumptive'. + (M-31458): Use `shinjigen-2-p' instead of `shinjigen-2' with value ' + (6889 1). + (C1-6631): Add S1-6889. + (G0-3F7B): Move S1-6889 to C1-6631. + (U+8476): Use `->denotational' and `->subsumptive'. + +2008-06-13 MORIOKA Tomohiko + + * Ideograph-R086-Fire.el (U+708A): Use `->subsumptive'; integrate + S1-4567. + (U+3DA7): Use `->denotational' and `->subsumptive'. + (U+708B): Use `->subsumptive'. + (U+7092): Use `->subsumptive'. + (J0-5F56): Use `<-subsumptive' for U+7092; unify S2-4569 instead + of S2-4568; add S1-4568. + +2008-06-12 MORIOKA Tomohiko + + * Ideograph-R067-Script.el (J83-4865): Use `shinjigen-2-p' instead + of `shinjigen-2' with value '(3207 1); add S1-3207. + +2008-06-10 MORIOKA Tomohiko + + * Ideograph-R032-Earth.el (U+58D3): Use `->denotational' and + `->subsumptive'; delete bogus `shinjigen-2'; integrate + S{1|2}-1340. + +2008-06-10 MORIOKA Tomohiko + + * Ideograph-R199-Wheat.el (U+9EA9): Use `->denotational'. + (J0-734F): Delete bogus `shinjigen-2'. + (G1-746F): Add S{1|2}-9795. + (U+9EB8): Use `->denotational'. + (G0-746F): Use `<-denotational' for U+9EB8; add `<-simplified@CN' + for G1-746F. + (J0-7350): Use `<-denotational' for U+9EB8; add `<-simplified@JP' + for J0-734F. + (U+4D31): Use `->denotational' and `->subsumptive'. + (U+9EAD): Use `->denotational'; delete bogus `shinjigen-2'. + (UU+9EAD): Use `<-denotational' for U+9EAD; add S{1|2}-9799. + + * Ideograph-R195-Fish.el (C7-3E46): Unify U-00029DAA. + (U+4C4A): Use `->subsumptive'. + (C7-3E4D): Unify U-00029DAB. + (U+9BA0): Use `->subsumptive'; delete bogus `shinjigen-2'; + integrate S1-9555 and S2-9555. + (U+9BA1): Use `->subsumptive'. + (U+9BA3): Likewise. + + * Ideograph-R130-Meat.el (JSP-5628): Add S1-6484 and S2-6484; add + `<-original' for J0-4048. + (J0-4048): Add S1-6483; delete bogus S2-0000. + (U+8106): Integrate S2-6483. + +2008-06-07 MORIOKA Tomohiko + + * maps-conf.el: Don't add `=gt-pj-1' for J90-545A. + +2008-06-06 MORIOKA Tomohiko + + * Ideograph-R120-Silk.el (J0-3F25): Add S1-6187. + (U+7E54): Integrate S2-6190. + (J0-4136): Add S1-6189; unify S2-6191 instead of S2-6189. + (U-00026142): Use `->denotational' instead of `->subsumptive'. + +2008-05-22 MORIOKA Tomohiko + + * Ideograph-R086-Fire.el (G0-5456): Unify JC3-90AF. + 2008-05-16 MORIOKA Tomohiko * Ideograph-R169-Gate.el (JX1-7D54): Unify JC3-6BEC; add S1-8826. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 124302b..f716bd5 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -2015,13 +2015,22 @@ (total-strokes@gt . 9) (=ucs . #xFA70) ; ï©° (->subsumptive - ((shinjigen-1 . 5733) + ((shinjigen-1 . 5734) + (shinjigen-2 . 5734) (=gt . 00089) ; >-00089; (=gt-k . 06059) ; &I-GT-K06059; (=gt-pj-2 . #x3046) ; >-00089; [16-38] (=daikanwa . 00053) ; &I-M-00053; (=ucs@JP . #xFA70) ; >-00089; (mojikyo . 000053) ; &MCS-60000035; + (<-formed + ((shinjigen-1 . 5732) + (shinjigen-2 . 5732) + (=ucs . #x4E26) ; 並 + (=jis-x0208 . #x4A42) ; &I-J90-4A42; [42-34] + )) + (<-formed*sources + shinjigen-1 shinjigen-2) ) ((=ucs@unicode . #xFA70) ; &UU+FA70; )) diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el index 13f6dec..1daba14 100644 --- a/lisp/utf-2000/Ideograph-R007-Two.el +++ b/lisp/utf-2000/Ideograph-R007-Two.el @@ -573,11 +573,7 @@ )) (define-char '((ideographic-radical . 7) ; ⼆ - (ideographic-strokes . 5) - (total-strokes . 7) - (hanyu-dazidian-vol . 2) - (hanyu-dazidian-page . 1441) - (hanyu-dazidian-char . 8) + (hanyu-dazidian 2 1441 8) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ @@ -586,65 +582,105 @@ ) ((=ucs . #x4E8C) ; 二 )) - (shinjigen-1 . 86) - (shinjigen-2 . 86) (sound@ja/kun "isasa-ka") (sound@ja/on/go "sa") (=ucs . #x4E9B) ; 些 - (=jis-x0208 . #x3A33) ; &I-J90-3A33; [26-19] + (=big5 . #xA8C7) ; &I-B-A8C7; + )) +(define-char + '((<-denotational + ((=ucs . #x4E9B) ; 些 + )) + (ideographic-radical . 7) ; ⼆ + (ideographic-strokes . 5) + (total-strokes . 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=jis-x0208 . #x3A21) ; >-20888; [26-01] + (=gb2312 . #x344B) ; &I-G0-344B; [20-43] + (=ks-x1001 . #x732E) ; &I-K0-732E; [83-14] + (=daikanwa . 16259) ; &I-M-16259; + ) + ((=ucs . #x4E8C) ; 二 + )) + (shinjigen-1 . 86) + (shinjigen-2 . 86) + (=jis-x0208 . #x3A33) ; >-00360; [26-19] (=gb2312 . #x5029) ; &I-G0-5029; [48-09] (=ks-x1001 . #x5E41) ; &I-K0-5E41; [62-33] (=gt . 00360) ; &I-GT-00360; (=gt-k . 03713) ; &I-GT-K03713; (=gt-pj-1 . #x3A33) ; &I-GT-00360; [26-19] (=daikanwa . 00268) ; &I-M-00268; + (=ucs@unicode . #x4E9B) ; >-00360; (mojikyo . 000268) ; &MCS-6000010C; )) (define-char - '((=>ucs . #x4E9B) ; 些 - (morohashi-daikanwa 268 0 0) + '((<-denotational + ((=ucs . #x4E9B) ; 些 + )) (ideographic-radical . 7) ; ⼆ (ideographic-strokes . 6) (total-strokes . 8) - (hanyu-dazidian 2 1441 8) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x6B64) ; æ­¤ + ((=cns11643-1 . #x483A) ; &C1-483A; [40-26] ) ((=ucs . #x4E8C) ; 二 )) (=cns11643-1 . #x4B68) ; &C1-4B68; [43-72] - (=big5 . #xA8C7) ; &I-B-A8C7; - (=ucs@big5 . #x4E9B) ; &C1-4B68; )) (define-char '((ideographic-radical . 7) ; ⼆ (ideographic-strokes . 5) (total-strokes . 7) + (sound@ja/on "kou") (=ucs . #x20128) ; 𠄨 - (->subsumptive - ((=gt . 00353) ; >-00353; - (=gt-pj-2 . #x3239) ; >-00353; [18-25] - (=daikanwa . 00269) ; &I-M-00269; + )) +(define-char + '((<-denotational + ((=ucs . #x20128) ; 𠄨 + )) + (ideographic-radical . 7) ; ⼆ + (ideographic-strokes . 5) + (total-strokes . 7) + (=gt . 00353) ; >-00353; + (=gt-pj-2 . #x3239) ; >-00353; [18-25] + (=daikanwa . 00269) ; &I-M-00269; + (<-ancient + ((=ucs . #x6046) ; 恆 + (=daikanwa . 10528) ; &I-M-10528; + )) + (<-ancient*sources + shuowen daikanwa) + (<-formed@shuowen + ((=daikanwa . 02682) ; &M-02682; + )) + )) +(define-char + '((<-denotational + ((=ucs . #x20128) ; 𠄨 + )) + (ideographic-radical . 7) ; ⼆ + (ideographic-strokes . 5) + (total-strokes . 7) + (hanyu-dazidian 1 21 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND") + (=ucs . #x2FF4) ; â¿´ ) - ((hanyu-dazidian 1 21 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((=ucs . #x4E00) ; 一 - ) - ((=ucs . #x5916) ; 外 - ) - ((=ucs . #x4E00) ; 一 - )) - (=cns11643-6 . #x2568) ; &HZK01-A873; [05-72] - (=hanziku-1 . #xA873) ; &I-HZK01-A873; - (=ucs@iso . #x20128) ; &HZK01-A873; - (mojikyo . 000269) ; &MCS-6000010D; + ((=ucs . #x4E8C) ; 二 + ) + ((=ucs . #x5916) ; 外 )) + (=cns11643-6 . #x2568) ; &HZK01-A873; [05-72] + (=hanziku-1 . #xA873) ; &I-HZK01-A873; + (=ucs@iso . #x20128) ; &HZK01-A873; + (mojikyo . 000269) ; &MCS-6000010D; )) (define-char '((ideographic-radical . 7) ; ⼆ diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index a8e5e12..8753af7 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -857,7 +857,8 @@ )) (define-char '((<-denotational - ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + ((=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] )) (ideographic-radical@ucs . 13) ; ⼌ (ideographic-strokes@ucs . 2) @@ -901,7 +902,9 @@ (ideographic-radical@cns-3*sources cns11643-3 daikanwa=366-1) (total-strokes . 4) - (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + (=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] + (=ucs@big5 . #x5167) ; &B-A4BA; )) (define-char '((ideographic-radical . 9) ; ⼈ @@ -10892,8 +10895,8 @@ (=ks-x1001 . #x4C5A) ; &I-K0-4C5A; [44-58] (=daikanwa . 14283) ; &I-M-14283; )) - (shinjigen-1 . 269) - (shinjigen-2 . 269) + (shinjigen-1 . 270) + (shinjigen-2 . 270) (=jis-x0208@1978 . #x4A58) ; &M-00659; [42-56] (=jis-x0208@1983 . #x4A58) ; &I-J83-4A58; [42-56] (=ks-x1001 . #x7835) ; &I-K0-7835; [88-21] @@ -18995,20 +18998,44 @@ '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 9) (total-strokes . 11) - (hanyu-dazidian 1 187 4) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) - ((name . "CJK RADICAL PERSON") - (=ucs . #x2E85) ; ⺅ + (=ucs . #x202B3) ; 𠊳 + (->subsumptive + ((hanyu-dazidian 1 187 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((name . "CJK RADICAL PERSON") + (=ucs . #x2E85) ; ⺅ + ) + ((=ucs . #x3A85) ; 㪅 + )) + (=cns11643-6 . #x3D2E) ; &M-00878; [29-14] + (=daikanwa . 00878) ; &I-M-00878; + (=hanziku-1 . #xCCD5) ; &I-HZK01-CCD5; + (=ucs@iso . #x202B3) ; &M-00878; + (<-original + ((=jis-x0208@1978 . #x4A58) ; &M-00659; [42-56] + (=jis-x0208@1983 . #x4A58) ; &I-J83-4A58; [42-56] + (=ks-x1001 . #x7835) ; &I-K0-7835; [88-21] + (=daikanwa . 00659) ; &I-M-00659; + )) + (<-original*sources + zhengzitong daikanwa) ) - ((=ucs . #x3A85) ; 㪅 + ((shinjigen-1 . 271) + (shinjigen-2 . 271) + (<-original + ((shinjigen-1 . 270) + (shinjigen-2 . 270) + (=jis-x0208@1978 . #x4A58) ; &M-00659; [42-56] + (=jis-x0208@1983 . #x4A58) ; &I-J83-4A58; [42-56] + (=ks-x1001 . #x7835) ; &I-K0-7835; [88-21] + (=daikanwa . 00659) ; &I-M-00659; + )) + (<-original*sources + shinjigen-1 shinjigen-2) )) - (=ucs . #x202B3) ; 𠊳 - (=cns11643-6 . #x3D2E) ; &I-C6-3D2E; [29-14] - (=daikanwa . 00878) ; &I-M-00878; - (=hanziku-1 . #xCCD5) ; &I-HZK01-CCD5; )) (define-char '((=>ucs . #x202B3) ; 𠊳 diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el index 8f93ab2..3c9317d 100644 --- a/lisp/utf-2000/Ideograph-R011-Enter.el +++ b/lisp/utf-2000/Ideograph-R011-Enter.el @@ -118,7 +118,8 @@ )) (define-char '((<-denotational - ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + ((=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] )) (ideographic-radical . 11) ; ⼊ (ideographic-strokes . 2) @@ -128,16 +129,12 @@ ((shinjigen-1 . 482) (shinjigen-2 . 482) (=ks-x1001 . #x522E) ; &M-01418; [50-14] - (=big5 . #xA4BA) ; &I-B-A4BA; (=daikanwa . 01418) ; &I-M-01418; (=jef-china3 . #x43DE) ; &I-JC3-43DE; (=ucs@JP . #x5167) ; &M-01418; - (=ucs@big5 . #x5167) ; &M-01418; (mojikyo . 001418) ; &MCS-6000058A; ) ((hanyu-dazidian 1 97 2) - (shinjigen-1 . 482) - (shinjigen-2 . 482) (=cns11643-1 . #x4479) ; &C1-4479; [36-89] (=ucs@unicode . #x5167) ; &C1-4479; )) @@ -156,11 +153,14 @@ (ideographic-radical@cns-3*sources cns11643-3 daikanwa=366-1) (total-strokes . 4) - (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + (=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] + (=ucs@big5 . #x5167) ; &B-A4BA; )) (define-char '((<-denotational - ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + ((=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] )) (ideographic-radical@ucs . 13) ; ⼌ (ideographic-strokes@ucs . 2) diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el index 71c2872..6cdeee7 100644 --- a/lisp/utf-2000/Ideograph-R013-Down-Box.el +++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el @@ -175,7 +175,8 @@ )) (define-char '((<-denotational - ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + ((=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] )) (ideographic-radical@ucs . 13) ; ⼌ (ideographic-strokes@ucs . 2) @@ -222,7 +223,9 @@ (ideographic-radical@cns-3*sources cns11643-3 daikanwa=366-1) (total-strokes . 4) - (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + (=big5 . #xA4BA) ; &B-A4BA; + (=jis-x0208@1997 . #x4662) ; &B-A4BA; [38-66] + (=ucs@big5 . #x5167) ; &B-A4BA; )) (define-char '((<-denotational diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el index 8a112f2..704f61f 100644 --- a/lisp/utf-2000/Ideograph-R020-Wrap.el +++ b/lisp/utf-2000/Ideograph-R020-Wrap.el @@ -125,7 +125,7 @@ (total-strokes . 4) (=ucs . #x5300) ; 匀 (->subsumptive - ((shinjigen-1 . 764) + ((shinjigen-1 . 765) (shinjigen-2 . 765) (=jis-x0212 . #x337B) ; &M-02497; [19-91] (=jis-x0213-1-2000 . #x2E6B) ; &I-JX1-2E6B; [14-75] diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el index b048638..166e19e 100644 --- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el @@ -432,6 +432,15 @@ )) (define-char '((ideographic-radical . 22) ; ⼕ + (ideographic-strokes . 5) + (total-strokes . 7) + (=cbeta . 06935) ; &CB06935; + (<-unknown + ((=ucs . #x20971) ; ð ¥± + )) + )) +(define-char + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 6) (total-strokes . 8) (hanyu-dazidian 1 85 11) @@ -468,41 +477,6 @@ (=hanziku-1 . #xB57E) ; &I-HZK01-B57E; )) (define-char - '((=>daikanwa . 02683) ; &M-02683; - (ideographic-strokes . 6) - (total-strokes . 8) - (=ucs . #x533C) ; 匼 - (->subsumptive - ((ideographic-radical . 23) ; ⼖ - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; â¿· - ) - ((=ucs . #x5338) ; 匸 - ) - ((=ucs . #x5408) ; 合 - )) - (=jis-x0212 . #x3433) ; &M-02683; [20-19] - (=daikanwa . 02683) ; &I-M-02683; - (=ucs@jis . #x533C) ; &M-02683; - ) - ((ideographic-radical . 22) ; ⼕ - (hanyu-dazidian 1 85 14) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; â¿· - ) - ((=ucs . #x531A) ; 匚 - ) - ((=ucs . #x5408) ; 合 - )) - (=cns11643-2 . #x2558) ; &C2-2558; [05-56] - (=big5 . #xCBD8) ; &I-B-CBD8; - (=jef-china3 . #x45B6) ; &I-JC3-45B6; - (=ucs@unicode . #x533C) ; &C2-2558; - )) - )) -(define-char '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 6) (total-strokes . 8) @@ -527,6 +501,34 @@ (=hanziku-1 . #xB57C) ; &I-HZK01-B57C; )) (define-char + '((ideographic-radical@daikanwa . 23) ; ⼖ + (ideographic-radical@cns . 22) ; ⼕ + (ideographic-strokes . 6) + (total-strokes . 8) + (=ucs . #x533C) ; 匼 + )) +(define-char + '((<-denotational + ((=ucs . #x533C) ; 匼 + )) + (ideographic-radical . 22) ; ⼕ + (ideographic-strokes . 6) + (total-strokes . 8) + (hanyu-dazidian 1 85 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; â¿· + ) + ((=ucs . #x531A) ; 匚 + ) + ((=ucs . #x5408) ; 合 + )) + (=cns11643-2 . #x2558) ; &C2-2558; [05-56] + (=big5 . #xCBD8) ; &I-B-CBD8; + (=jef-china3 . #x45B6) ; &I-JC3-45B6; + (=ucs@unicode . #x533C) ; &C2-2558; + )) +(define-char '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 7) (total-strokes . 9) @@ -540,27 +542,35 @@ '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 7) (total-strokes . 9) - (=daikanwa . 02620) ; &M-02620; + (hanyu-dazidian 1 86 3) + (=ucs . #x2093D) ; 𠤽 + (=daikanwa . 02620) ; &I-M-02620; + (=hanziku-1 . #xB5B7) ; &I-HZK01-B5B7; )) (define-char '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 85 18) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; â¿· - ) - ((=ucs . #x531A) ; 匚 - ) - ((=ucs . #x593E) ; 夾 - )) (=ucs . #x5327) ; 匧 - (=jis-x0212 . #x342A) ; &I-JSP-342A; [20-10] - (=cns11643-3 . #x2B49) ; &I-C3-2B49; [11-41] - (=daikanwa . 02621) ; &I-M-02621; - (=hanziku-1 . #xB5A6) ; &I-HZK01-B5A6; - (=jef-china3 . #x45B7) ; &I-JC3-45B7; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; â¿· + ) + ((=ucs . #x531A) ; 匚 + ) + ((=ucs . #x593E) ; 夾 + )) + (=jis-x0212 . #x342A) ; &M-02621; [20-10] + (=cns11643-3 . #x2B49) ; &I-C3-2B49; [11-41] + (=daikanwa . 02621) ; &I-M-02621; + (=jef-china3 . #x45B7) ; &I-JC3-45B7; + (=ucs@jis . #x5327) ; &M-02621; + ) + ((hanyu-dazidian 1 85 18) + (=hanziku-1 . #xB5A6) ; &HZK01-B5A6; + (=ucs@unicode . #x5327) ; &HZK01-B5A6; + )) )) (define-char '((ideographic-radical . 22) ; ⼕ @@ -1689,12 +1699,6 @@ )) (define-char '((ideographic-radical . 22) ; ⼕ - (hanyu-dazidian 1 86 3) - (=ucs . #x2093D) ; 𠤽 - (=hanziku-1 . #xB5B7) ; &I-HZK01-B5B7; - )) -(define-char - '((ideographic-radical . 22) ; ⼕ (hanyu-dazidian 1 86 8) (=ucs . #x20947) ; 𠥇 (=hanziku-1 . #xB5BC) ; &I-HZK01-B5BC; diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el index 0d8a795..75168ae 100644 --- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el @@ -284,59 +284,115 @@ (ideographic-strokes . 5) (total-strokes . 7) (=ucs . #x20971) ; ð ¥± - (=cns11643-6 . #x2637) ; &I-C6-2637; [06-23] - (=daikanwa . 02681) ; &I-M-02681; )) (define-char - '((=>ucs . #x3530) ; 㔰 + '((<-denotational + ((=ucs . #x20971) ; ð ¥± + )) + (script Zetian Ideograph) (ideographic-radical . 23) ; ⼖ (ideographic-strokes . 5) (total-strokes . 7) - (=cns11643-6 . #x2638) ; &M-02682; [06-24] - (=daikanwa . 02682) ; &I-M-02682; + (=cns11643-6 . #x2637) ; &M-02681; [06-23] + (=daikanwa . 02681) ; &I-M-02681; + (=ucs@iso . #x20971) ; &M-02681; + (<-Zetian + ((=gt . 18141) ; >-18141; + (=daikanwa . 14330) ; &I-M-14330; + )) + (<-Zetian*sources + zihui-bu) + (<-same + ((=gt . 18141) ; >-18141; + (=daikanwa . 14330) ; &I-M-14330; + )) + (<-same*sources + zihui-bu daikanwa) )) (define-char - '((morohashi-daikanwa 2682 0 1) + '((<-denotational + ((=ucs . #x20971) ; ð ¥± + )) (ideographic-radical . 23) ; ⼖ (ideographic-strokes . 5) (total-strokes . 7) + (hanyu-dazidian 1 70 10) + (=hanziku-1 . #xB273) ; &HZK01-B273; + )) +(define-char + '((ideographic-radical . 23) ; ⼖ + (ideographic-strokes . 5) + (total-strokes . 7) (=ucs . #x3530) ; 㔰 - (=jef-china3 . #x45B5) ; &I-JC3-45B5; )) (define-char - '((=>daikanwa . 02683) ; &M-02683; + '((<-denotational + ((=ucs . #x3530) ; 㔰 + )) + (ideographic-radical . 23) ; ⼖ + (ideographic-strokes . 5) + (total-strokes . 7) + (sound@ja/on "kou") + (=daikanwa . 02682) ; &M-02682; + (<-ancient + ((=ucs . #x6046) ; 恆 + (=daikanwa . 10528) ; &I-M-10528; + )) + (<-ancient*sources + zihui-bu daikanwa) + (->formed@shuowen + ((=gt . 00353) ; >-00353; + (=daikanwa . 00269) ; &I-M-00269; + )) + (->formed@shuowen*sources + daikanwa) + )) +(define-char + '((<-denotational + ((=ucs . #x3530) ; 㔰 + )) + (ideographic-radical . 23) ; ⼖ + (ideographic-strokes . 5) + (total-strokes . 7) + (=jef-china3 . #x45B5) ; &JC3-45B5; + (=ucs@unicode . #x3530) ; &JC3-45B5; + )) +(define-char + '((<-denotational + ((=ucs . #x3530) ; 㔰 + )) + (ideographic-radical . 23) ; ⼖ + (ideographic-strokes . 5) + (total-strokes . 7) + (=cns11643-6 . #x2638) ; &C6-2638; [06-24] + )) +(define-char + '((ideographic-radical@daikanwa . 23) ; ⼖ + (ideographic-radical@cns . 22) ; ⼕ (ideographic-strokes . 6) (total-strokes . 8) (=ucs . #x533C) ; 匼 - (->subsumptive - ((ideographic-radical . 23) ; ⼖ - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; â¿· - ) - ((=ucs . #x5338) ; 匸 - ) - ((=ucs . #x5408) ; 合 - )) - (=jis-x0212 . #x3433) ; &M-02683; [20-19] - (=daikanwa . 02683) ; &I-M-02683; - (=ucs@jis . #x533C) ; &M-02683; + )) +(define-char + '((<-denotational + ((=ucs . #x533C) ; 匼 + )) + (ideographic-radical . 23) ; ⼖ + (ideographic-strokes . 6) + (total-strokes . 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; â¿· ) - ((ideographic-radical . 22) ; ⼕ - (hanyu-dazidian 1 85 14) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; â¿· - ) - ((=ucs . #x531A) ; 匚 - ) - ((=ucs . #x5408) ; 合 - )) - (=cns11643-2 . #x2558) ; &C2-2558; [05-56] - (=big5 . #xCBD8) ; &I-B-CBD8; - (=jef-china3 . #x45B6) ; &I-JC3-45B6; - (=ucs@unicode . #x533C) ; &C2-2558; + ((=jis-x0208 . #x523E) ; >-03427; [50-30] + (=cns11643-3 . #x2129) ; &I-C3-2129; [01-09] + (=daikanwa . 02672) ; &I-M-02672; + ) + ((=ucs . #x5408) ; 合 )) + (=jis-x0212 . #x3433) ; &M-02683; [20-19] + (=daikanwa . 02683) ; &I-M-02683; + (=ucs@jis . #x533C) ; &M-02683; )) (define-char '((ideographic-radical . 23) ; ⼖ diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el index dc6135b..60a2c5c 100644 --- a/lisp/utf-2000/Ideograph-R027-Cliff.el +++ b/lisp/utf-2000/Ideograph-R027-Cliff.el @@ -417,27 +417,27 @@ (=daikanwa . 02913) ; &I-M-02913; )) (define-char - '((=>ucs . #x20A3B) ; 𠨻 - (ideographic-radical . 27) ; ⼚ - (ideographic-strokes . 4) - (total-strokes . 6) - (=daikanwa . 02914) ; &M-02914; - )) -(define-char - '((morohashi-daikanwa 2914 0 0) - (ideographic-radical . 27) ; ⼚ + '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 4) (total-strokes . 6) - (hanyu-dazidian 1 69 20) (=ucs . #x20A3B) ; 𠨻 - (=cns11643-5 . #x223E) ; &I-C5-223E; [02-30] - (=hanziku-1 . #xB25D) ; &I-HZK01-B25D; + (->subsumptive + ((=daikanwa . 02914) ; &M-02914; + ) + ((hanyu-dazidian 1 69 20) + (=cns11643-5 . #x223E) ; &HZK01-B25D; [02-30] + (=hanziku-1 . #xB25D) ; &I-HZK01-B25D; + (=ucs@iso . #x20A3B) ; &HZK01-B25D; + )) )) (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 4) (total-strokes . 6) - (=daikanwa . 02915) ; &M-02915; + (hanyu-dazidian 1 69 14) + (=ucs . #x20A3E) ; 𠨾 + (=daikanwa . 02915) ; &I-M-02915; + (=hanziku-1 . #xB257) ; &I-HZK01-B257; )) (define-char '((ideographic-radical . 27) ; ⼚ @@ -653,20 +653,50 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 5) (total-strokes . 7) + (=ucs . #x20A48) ; 𠩈 + )) +(define-char + '((<-denotational + ((=ucs . #x20A48) ; 𠩈 + )) + (ideographic-radical . 27) ; ⼚ + (ideographic-strokes . 5) + (total-strokes . 7) (=daikanwa . 02925) ; &M-02925; (=jef-china3 . #x93C6) ; &I-JC3-93C6; )) (define-char - '((ideographic-radical . 27) ; ⼚ + '((<-denotational + ((=ucs . #x20A48) ; 𠩈 + )) + (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 5) (total-strokes . 7) - (=daikanwa . 02926) ; &M-02926; + (hanyu-dazidian 1 70 7) + (=hanziku-1 . #xB270) ; &HZK01-B270; + (=ucs@iso . #x20A48) ; &HZK01-B270; + )) +(define-char + '((ideographic-radical . 27) ; ⼚ + (=ucs . #x20A46) ; 𠩆 + (->subsumptive + ((ideographic-strokes . 5) + (total-strokes . 7) + (=daikanwa . 02926) ; &M-02926; + (=ucs@iso . #x20A46) ; &M-02926; + ) + ((ideographic-strokes . 6) + (total-strokes . 8) + (hanyu-dazidian 1 71 3) + (=hanziku-1 . #xB2AE) ; &HZK01-B2AE; + )) )) (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 5) (total-strokes . 7) - (=daikanwa . 02927) ; &M-02927; + (=ucs . #x20A49) ; 𠩉 + (=daikanwa . 02927) ; &I-M-02927; )) (define-char '((ideographic-radical . 27) ; ⼚ @@ -886,7 +916,14 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 6) (total-strokes . 8) - (=daikanwa . 02940) ; &M-02940; + (=ucs . #x20A54) ; 𠩔 + (->subsumptive + ((=daikanwa . 02940) ; &M-02940; + ) + ((hanyu-dazidian 1 71 16) + (=hanziku-1 . #xB2BB) ; &HZK01-B2BB; + (=ucs@iso . #x20A54) ; &HZK01-B2BB; + )) )) (define-char '((ideographic-radical . 27) ; ⼚ @@ -919,37 +956,84 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 73 6) (=ucs . #x20A57) ; 𠩗 - (=cns11643-5 . #x2839) ; &I-C5-2839; [08-25] - (=daikanwa . 02941) ; &I-M-02941; - (=hanziku-1 . #xB2F1) ; &I-HZK01-B2F1; + (->subsumptive + ((=cns11643-5 . #x2839) ; >-03730; [08-25] + (=gt . 03730) ; &I-GT-03730; + (=gt-pj-2 . #x4A4F) ; &I-GT-03730; [42-47] + (=daikanwa . 02941) ; &I-M-02941; + (->formed + ((=daikanwa . 02958) ; &M-02958; + )) + (->formed*sources + jiyun daikanwa) + ) + ((hanyu-dazidian 1 73 6) + (=hanziku-1 . #xB2F1) ; &HZK01-B2F1; + (=ucs@iso . #x20A57) ; &HZK01-B2F1; + )) )) (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 72) - (hanyu-dazidian-char . 1) + (hanyu-dazidian 1 72 1) + (=ucs . #x5396) ; 厖 + )) +(define-char + '((<-denotational + ((=ucs . #x5396) ; 厖 + )) + (ideographic-radical . 27) ; ⼚ + (ideographic-strokes . 7) + (total-strokes . 9) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") (=ucs . #x2FF8) ; ⿸ ) ((=ucs . #x5382) ; 厂 ) - ((=ucs . #x5C28) ; å°¨ + ((=jis-x0208 . #x5578) ; &J90-5578; [53-88] )) - (shinjigen-1 . 879) - (shinjigen-2 . 879) - (=ucs . #x5396) ; 厖 - (=jis-x0208 . #x524D) ; &I-J90-524D; [50-45] + (=jis-x0208 . #x524D) ; >-03745; [50-45] (=cns11643-2 . #x2939) ; &I-C2-2939; [09-25] (=big5 . #xCDF7) ; &I-B-CDF7; (=gt . 03745) ; &I-GT-03745; (=gt-k . 05218) ; &I-GT-K05218; (=gt-pj-1 . #x524D) ; &I-GT-03745; [50-45] (=daikanwa . 02942) ; &I-M-02942; + (=ucs@jis . #x5396) ; >-03745; + )) +(define-char + '((<-denotational + ((=ucs . #x5396) ; 厖 + )) + (ideographic-radical . 27) ; ⼚ + (ideographic-strokes . 7) + (total-strokes . 9) + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=ucs@unicode . #x5C28) ; &UU+5C28; + )) + (=ucs@unicode . #x5396) ; &UU+5396; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ + ) + ((=ucs . #x5382) ; 厂 + ) + ((=ks-x1001 . #x5B2B) ; &M-07554; [59-11] + (=daikanwa . 07554) ; &I-M-07554; + )) + (shinjigen-1 . 879) + (shinjigen-2 . 879) + )) )) (define-char '((ideographic-radical . 27) ; ⼚ @@ -1173,17 +1257,57 @@ '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 7) (total-strokes . 9) - (=daikanwa . 02957) ; &M-02957; + (=ucs . #x20A65) ; ð ©¥ + )) +(define-char + '((<-denotational + ((=ucs . #x20A65) ; ð ©¥ + )) + (ideographic-radical . 27) ; ⼚ + (ideographic-strokes . 7) + (total-strokes . 9) + (hanyu-dazidian 1 73 1) + (=gt . 03749) ; >-03749; + (=gt-pj-2 . #x4A5C) ; >-03749; [42-60] + (=daikanwa . 02957) ; &I-M-02957; + (=hanziku-1 . #xB2EC) ; &I-HZK01-B2EC; + )) +(define-char + '((<-denotational + ((=ucs . #x20A65) ; ð ©¥ + )) + (ideographic-radical . 27) ; ⼚ + (ideographic-strokes . 7) + (total-strokes . 9) + (=ucs@iso . #x20A65) ; &U-00020A65; )) (define-char '((ideographic-radical . 27) ; ⼚ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 73 7) (=ucs . #x20A66) ; 𠩦 - (=cns11643-6 . #x2F3F) ; &I-C6-2F3F; [15-31] - (=daikanwa . 02958) ; &I-M-02958; - (=hanziku-1 . #xB2F2) ; &I-HZK01-B2F2; + (->subsumptive + ((hanyu-dazidian 1 73 7) + (=daikanwa . 02958) ; &M-02958; + (=hanziku-1 . #xB2F2) ; &I-HZK01-B2F2; + (=ucs@iso . #x20A66) ; &M-02958; + (<-formed + ((=cns11643-5 . #x2839) ; >-03730; [08-25] + (=daikanwa . 02941) ; &I-M-02941; + )) + (<-formed*sources + jiyun) + (<-same + ((=cns11643-5 . #x2839) ; >-03730; [08-25] + (=daikanwa . 02941) ; &I-M-02941; + )) + (<-same*sources + jiyun daikanwa) + ) + ((=cns11643-6 . #x2F3F) ; >-03731; [15-31] + (=gt . 03731) ; &I-GT-03731; + (=gt-pj-2 . #x4A5D) ; &I-GT-03731; [42-61] + )) )) (define-char '((ideographic-radical . 27) ; ⼚ @@ -3415,54 +3539,18 @@ )) (define-char '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 69 14) - (=ucs . #x20A3E) ; 𠨾 - (=hanziku-1 . #xB257) ; &I-HZK01-B257; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ (hanyu-dazidian 8 7 15) (=ucs . #x20A3F) ; 𠨿 (=hanziku-12 . #xEB4E) ; &I-HZK12-EB4E; )) (define-char '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 71 3) - (=ucs . #x20A46) ; 𠩆 - (=hanziku-1 . #xB2AE) ; &I-HZK01-B2AE; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 70 7) - (=ucs . #x20A48) ; 𠩈 - (=hanziku-1 . #xB270) ; &I-HZK01-B270; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 70 10) - (=ucs . #x20A49) ; 𠩉 - (=hanziku-1 . #xB273) ; &I-HZK01-B273; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ (hanyu-dazidian 1 71 11) (=ucs . #x20A53) ; 𠩓 (=hanziku-1 . #xB2B6) ; &I-HZK01-B2B6; )) (define-char '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 71 16) - (=ucs . #x20A54) ; 𠩔 - (=hanziku-1 . #xB2BB) ; &I-HZK01-B2BB; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ - (hanyu-dazidian 1 73 1) - (=ucs . #x20A65) ; ð ©¥ - (=hanziku-1 . #xB2EC) ; &I-HZK01-B2EC; - )) -(define-char - '((ideographic-radical . 27) ; ⼚ (hanyu-dazidian 1 73 10) (=ucs . #x20A75) ; ð ©µ (=hanziku-1 . #xB2F5) ; &I-HZK01-B2F5; diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 7c8c31d..4efa684 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -199,8 +199,7 @@ (=gt-pj-1 . #x3035) ; &I-GT-06129; [16-21] (mojikyo . 050135) ; &MCS-6000C3D7; (<-simplified@JP/Jouyou - ((=ucs . #x58D3) ; 壓 - (=jis-x0208 . #x545A) ; &I-J90-545A; [52-58] + ((=jis-x0208 . #x545A) ; &J90-545A; [52-58] )) )) (define-char @@ -12157,23 +12156,39 @@ (ideographic-strokes . 14) (total-strokes . 17) (hanyu-dazidian 1 495 6) - (shinjigen-2 . 0) (=ucs . #x58D3) ; 壓 - (=jis-x0208 . #x545A) ; &I-J90-545A; [52-58] - (=ks-x1001 . #x6462) ; &I-K0-6462; [68-66] - (=gb12345 . #x5139) ; 壓 [49-25] - (=big5 . #xC0A3) ; &I-B-C0A3; - (=gt . 07014) ; &I-GT-07014; - (=gt-pj-1 . #x545A) ; &I-GT-07014; [52-58] - (=daikanwa . 05557) ; &I-M-05557; )) (define-char - '((=>ucs . #x58D3) ; 壓 - (morohashi-daikanwa 5557 0 0) + '((<-denotational + ((=ucs . #x58D3) ; 壓 + )) (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 14) (total-strokes . 17) - (=cns11643-1 . #x734C) ; &C1-734C; [83-44] + (hanyu-dazidian 1 495 6) + (=big5 . #xC0A3) ; &B-C0A3; + (->subsumptive + ((shinjigen-1 . 1340) + (shinjigen-2 . 1340) + (=ks-x1001 . #x6462) ; >-07014; [68-66] + (=gt . 07014) ; &I-GT-07014; + (=gt-pj-1 . #x545A) ; &I-GT-07014; [52-58] + (=daikanwa . 05557) ; &I-M-05557; + ) + ((=cns11643-1 . #x734C) ; &C1-734C; [83-44] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x58D3) ; 壓 + )) + (ideographic-radical . 32) ; ⼟ + (ideographic-strokes . 14) + (total-strokes . 17) + (hanyu-dazidian 1 495 6) + (=jis-x0208 . #x545A) ; &J90-545A; [52-58] + (=gb12345 . #x5139) ; &J90-545A; [49-25] + (=ucs@unicode . #x58D3) ; &J90-545A; )) (define-char '((ideographic-radical . 32) ; ⼟ diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el index a8aa7bf..4211c91 100644 --- a/lisp/utf-2000/Ideograph-R050-Turban.el +++ b/lisp/utf-2000/Ideograph-R050-Turban.el @@ -75,6 +75,7 @@ ) ((=ucs . #x5DFE) ; å·¾ )) + (shinjigen-1 . 2082) (shinjigen-2 . 2082) (=jis-x0208 . #x3B54) ; >-11066; [27-52] (=ks-x1001 . #x633C) ; &I-K0-633C; [67-28] @@ -93,7 +94,6 @@ ) ((=ucs . #x5DFE) ; å·¾ )) - (shinjigen-2 . 2082) (=gb2312 . #x4A50) ; &C1-464B; [42-48] (=cns11643-1 . #x464B) ; &I-C1-464B; [38-43] (=ucs@unicode . #x5E02) ; &C1-464B; diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el index 6e5dee4..9a411c3 100644 --- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el +++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el @@ -1758,16 +1758,14 @@ (->subsumptive ((=daikanwa . 09333) ; &M-09333; (<-vulgar - ((shinjigen-1 . 879) - (=ucs . #x5396) ; 厖 - (=jis-x0208 . #x524D) ; &I-J90-524D; [50-45] + ((=jis-x0208 . #x524D) ; >-03745; [50-45] + (=cns11643-2 . #x2939) ; &I-C2-2939; [09-25] (=daikanwa . 02942) ; &I-M-02942; )) (<-vulgar*sources - zhengzitong daikanwa shinjigen-1) + zhengzitong daikanwa) ) - ((shinjigen-1 . 879) - (=jis-x0212 . #x3C4A) ; &JX2-2C25; [28-42] + ((=jis-x0212 . #x3C4A) ; &JX2-2C25; [28-42] (=jis-x0213-2-2000 . #x2C25) ; &I-JX2-2C25; [12-05] (=ucs@jis . #x5EAC) ; &JX2-2C25; ) @@ -1785,10 +1783,13 @@ (total-strokes . 10) (->subsumptive ((shinjigen-1 . 880) + (shinjigen-2 . 880) (<-formed - ((=jis-x0212 . #x3C4A) ; &JX2-2C25; [28-42] - (=jis-x0213-2-2000 . #x2C25) ; &I-JX2-2C25; [12-05] + ((shinjigen-1 . 879) + (shinjigen-2 . 879) )) + (<-formed*sources + shinjigen-1 shinjigen-2) ) ((=cns11643-2 . #x2E7A) ; &C2-2E7A; [14-90] )) diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index 8e6c954..f6f40e8 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -15421,23 +15421,20 @@ '((ideographic-radical . 64) ; ⼿ (ideographic-strokes . 12) (total-strokes . 15) - (shinjigen-2 . 3087) (=ucs . #x649A) ; 撚 - (=jis-x0208 . #x4732) ; &I-J90-4732; [39-18] - (=ks-x1001 . #x5235) ; &I-K0-5235; [50-21] (=big5 . #xBCBF) ; &I-B-BCBF; - (=gt . 16122) ; &I-GT-16122; - (=gt-pj-1 . #x4732) ; &I-GT-16122; [39-18] - (=daikanwa . 12713) ; &I-M-12713; - )) -(define-char - '((=>ucs . #x649A) ; 撚 - (morohashi-daikanwa 12713 0 0) - (ideographic-radical . 64) ; ⼿ - (ideographic-strokes . 12) - (total-strokes . 15) - (shinjigen-2 . 3087) - (=cns11643-1 . #x6D29) ; &C1-6D29; [77-09] + (->subsumptive + ((shinjigen-1 . 3087) + (shinjigen-2 . 3087) + (=jis-x0208 . #x4732) ; >-16122; [39-18] + (=ks-x1001 . #x5235) ; &I-K0-5235; [50-21] + (=gt . 16122) ; &I-GT-16122; + (=gt-pj-1 . #x4732) ; &I-GT-16122; [39-18] + (=daikanwa . 12713) ; &I-M-12713; + (=ucs@unicode . #x649A) ; >-16122; + ) + ((=cns11643-1 . #x6D29) ; &C1-6D29; [77-09] + )) )) (define-char '((ideographic-radical . 64) ; ⼿ diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el index fe4ac24..94b0504 100644 --- a/lisp/utf-2000/Ideograph-R066-Rap.el +++ b/lisp/utf-2000/Ideograph-R066-Rap.el @@ -645,19 +645,16 @@ (=cbeta . 00329) ; &I-CB00329; )) (define-char - '((=>ucs . #x22F0C) ; 𢼌 - (ideographic-radical . 66) ; ⽁ - (ideographic-strokes . 5) - (total-strokes . 9) - (=daikanwa . 13157) ; &M-13157; - )) -(define-char - '((morohashi-daikanwa 13157 0 0) - (ideographic-radical . 66) ; ⽁ + '((ideographic-radical . 66) ; ⽁ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x22F0C) ; 𢼌 - (=cns11643-5 . #x294B) ; &I-C5-294B; [09-43] + (->subsumptive + ((=daikanwa . 13157) ; &M-13157; + ) + ((=cns11643-5 . #x294B) ; &C5-294B; [09-43] + (=ucs@iso . #x22F0C) ; &C5-294B; + )) )) (define-char '((ideographic-radical . 66) ; ⽁ @@ -665,7 +662,18 @@ (total-strokes . 9) (=ucs . #x3A85) ; 㪅 (=cns11643-3 . #x2C75) ; &I-C3-2C75; [12-85] + (=gt . 16629) ; &I-GT-16629; + (=gt-k . 05707) ; &I-GT-K05707; + (=gt-pj-3 . #x6860) ; &I-GT-16629; [72-64] (=daikanwa . 13158) ; &I-M-13158; + (<-same + ((=jis-x0208@1978 . #x3939) ; &M-14283; [25-25] + (=jis-x0208@1983 . #x3939) ; &I-J83-3939; [25-25] + (=ks-x1001 . #x4C5A) ; &I-K0-4C5A; [44-58] + (=daikanwa . 14283) ; &I-M-14283; + )) + (<-same*sources + zihui daikanwa) )) (define-char '((ideographic-radical . 66) ; ⽁ diff --git a/lisp/utf-2000/Ideograph-R067-Script.el b/lisp/utf-2000/Ideograph-R067-Script.el index 879b911..dbc8fa2 100644 --- a/lisp/utf-2000/Ideograph-R067-Script.el +++ b/lisp/utf-2000/Ideograph-R067-Script.el @@ -384,7 +384,8 @@ (=ucs . #x6590) ; 斐 (=big5 . #xB4B4) ; &I-B-B4B4; (->subsumptive - ((shinjigen-2 3207 1) + ((shinjigen-1 . 3207) + (shinjigen-2-p . 3207) (=jis-x0208@1978 . #x4865) ; &M-13469; [40-69] (=jis-x0208@1983 . #x4865) ; &I-J83-4865; [40-69] (=daikanwa . 13469) ; &I-M-13469; diff --git a/lisp/utf-2000/Ideograph-R069-Axe.el b/lisp/utf-2000/Ideograph-R069-Axe.el index 30e7634..fdf95ff 100644 --- a/lisp/utf-2000/Ideograph-R069-Axe.el +++ b/lisp/utf-2000/Ideograph-R069-Axe.el @@ -490,40 +490,46 @@ '((ideographic-radical . 69) ; ⽄ (ideographic-strokes . 8) (total-strokes . 12) - (=daikanwa . 13571) ; &M-13571; + (=ucs . #x230AC) ; 𣂬 + (=daikanwa . 13571) ; &I-M-13571; )) (define-char - '((=>ucs . #x65B0) ; 新 - (ideographic-radical . 69) ; ⽄ + '((ideographic-radical . 69) ; ⽄ (ideographic-strokes . 9) (total-strokes . 13) - (shinjigen-2 . 3233) - (=jis-x0208 . #x3F37) ; >-17156; [31-23] - (=ks-x1001 . #x6366) ; &I-K0-6366; [67-70] + (=ucs . #x65B0) ; 新 (=big5 . #xB773) ; &I-B-B773; - (=gt . 17156) ; &I-GT-17156; - (=gt-k . 10225) ; &I-GT-K10225; - (=gt-pj-1 . #x3F37) ; &I-GT-17156; [31-23] - (=daikanwa . 13572) ; &I-M-13572; - (=ucs@jis . #x65B0) ; >-17156; - (=ucs@big5 . #x65B0) ; >-17156; )) (define-char - '((=>ucs . #x65B0) ; 新 - (morohashi-daikanwa 13572 0 0) + '((<-denotational + ((=ucs . #x65B0) ; 新 + )) (ideographic-radical . 69) ; ⽄ (ideographic-strokes . 9) (total-strokes . 13) - (shinjigen-2 . 3233) - (=cns11643-1 . #x643B) ; &C1-643B; [68-27] + (->subsumptive + ((shinjigen-1 . 3233) + (shinjigen-2 . 3233) + (=jis-x0208 . #x3F37) ; >-17156; [31-23] + (=ks-x1001 . #x6366) ; &I-K0-6366; [67-70] + (=gt . 17156) ; &I-GT-17156; + (=gt-k . 10225) ; &I-GT-K10225; + (=gt-pj-1 . #x3F37) ; &I-GT-17156; [31-23] + (=daikanwa . 13572) ; &I-M-13572; + (=ucs@jis . #x65B0) ; >-17156; + ) + ((=cns11643-1 . #x643B) ; &C1-643B; [68-27] + )) )) (define-char - '((morohashi-daikanwa 13572 0 1) + '((<-denotational + ((=ucs . #x65B0) ; 新 + )) (ideographic-radical . 69) ; ⽄ (ideographic-strokes . 9) (total-strokes . 13) - (=ucs . #x65B0) ; 新 - (=gb2312 . #x5042) ; &I-G0-5042; [48-34] + (=gb2312 . #x5042) ; &G0-5042; [48-34] + (=ucs@unicode . #x65B0) ; &G0-5042; )) (define-char '((=>ucs . #x65B1) ; 斱 diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index e342480..db5e44f 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -8108,10 +8108,28 @@ (ideographic-strokes . 7) (total-strokes . 11) (=ucs . #x68AB) ; 梫 - (=cns11643-2 . #x3579) ; &I-C2-3579; [21-89] - (=jis-x0213-2-2000 . #x2E73) ; &I-JX2-2E73; [14-83] (=big5 . #xD5B7) ; &I-B-D5B7; + )) +(define-char + '((<-denotational + ((=ucs . #x68AB) ; 梫 + )) + (ideographic-radical . 75) ; ⽊ + (ideographic-strokes . 7) + (total-strokes . 11) + (=cns11643-2 . #x3579) ; &M-14876; [21-89] + (=jis-x0213-2-2000 . #x2E73) ; &I-JX2-2E73; [14-83] (=daikanwa . 14876) ; &I-M-14876; + (=ucs@jis . #x68AB) ; &M-14876; + )) +(define-char + '((<-denotational + ((=ucs . #x68AB) ; 梫 + )) + (ideographic-radical . 75) ; ⽊ + (ideographic-strokes . 7) + (total-strokes . 11) + (=ucs@unicode . #x68AB) ; &UU+68AB; )) (define-char '((ideographic-radical . 75) ; ⽊ @@ -8123,43 +8141,50 @@ (=daikanwa . 14877) ; &I-M-14877; )) (define-char - '((=>ucs . #x68AD) ; 梭 + '((ideographic-radical . 75) ; ⽊ + (ideographic-strokes . 7) + (total-strokes . 11) + (=ucs . #x68AD) ; 梭 + (=big5 . #xB1F4) ; &I-B-B1F4; + (=jis-x0208@1997 . #x5B68) ; 梭 [59-72] + )) +(define-char + '((<-denotational + ((=ucs . #x68AD) ; 梭 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 7) (total-strokes . 11) - (=daikanwa . 14878) ; &M-14878; + (->subsumptive + ((=daikanwa . 14878) ; &M-14878; + ) + ((=cns11643-1 . #x5B3A) ; &C1-5B3A; [59-26] + )) )) (define-char - '((=>ucs . #x68AD) ; 梭 - (morohashi-daikanwa 14878 0 0) + '((<-denotational + ((=ucs . #x68AD) ; 梭 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 7) (total-strokes . 11) - (shinjigen-2 . 3634) - (=cns11643-1 . #x5B3A) ; &C1-5B3A; [59-26] + (=gb2312 . #x4B73) ; &G0-4B73; [43-83] + (=ucs@unicode . #x68AD) ; &G0-4B73; )) (define-char - '((=>ucs . #x68AD) ; 梭 - (morohashi-daikanwa 14878 0 1) + '((<-denotational + ((=ucs . #x68AD) ; 梭 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 7) (total-strokes . 11) + (shinjigen-1 . 3634) (shinjigen-2 . 3634) (=jis-x0208 . #x5B68) ; >-18876; [59-72] (=ks-x1001 . #x5E5C) ; &I-K0-5E5C; [62-60] - (=big5 . #xB1F4) ; &I-B-B1F4; (=gt . 18876) ; &I-GT-18876; (=gt-pj-1 . #x5B68) ; &I-GT-18876; [59-72] (=ucs@jis . #x68AD) ; >-18876; - (=ucs@big5 . #x68AD) ; >-18876; - )) -(define-char - '((morohashi-daikanwa 14878 0 2) - (ideographic-radical . 75) ; ⽊ - (ideographic-strokes . 7) - (total-strokes . 11) - (=ucs . #x68AD) ; 梭 - (=gb2312 . #x4B73) ; &I-G0-4B73; [43-83] )) (define-char '((ideographic-radical . 75) ; ⽊ diff --git a/lisp/utf-2000/Ideograph-R076-Lack.el b/lisp/utf-2000/Ideograph-R076-Lack.el index a180a89..02667ff 100644 --- a/lisp/utf-2000/Ideograph-R076-Lack.el +++ b/lisp/utf-2000/Ideograph-R076-Lack.el @@ -1128,11 +1128,12 @@ '((ideographic-radical . 76) ; ⽋ (ideographic-strokes . 6) (total-strokes . 10) + (sound@ja/on "i") (=ucs . #x238AD) ; 𣢭 (->subsumptive ((=daikanwa . 16058) ; &M-16058; (<-same - ((=ucs . #x20A57) ; 𠩗 + ((=cns11643-5 . #x2839) ; >-03730; [08-25] (=daikanwa . 02941) ; &I-M-02941; )) (<-same*sources diff --git a/lisp/utf-2000/Ideograph-R083-Clan.el b/lisp/utf-2000/Ideograph-R083-Clan.el index 496095b..9a41160 100644 --- a/lisp/utf-2000/Ideograph-R083-Clan.el +++ b/lisp/utf-2000/Ideograph-R083-Clan.el @@ -79,13 +79,13 @@ (=ucs . #x6C13) ; 氓 (=big5 . #xAA5D) ; &I-B-AA5D; (->subsumptive - ((shinjigen-2 . 4040) - (=jis-x0208@1978 . #x5D62) ; &M-17030; [61-66] + ((=jis-x0208@1978 . #x5D62) ; &M-17030; [61-66] (=jis-x0208@1983 . #x5D62) ; &I-J83-5D62; [61-66] (=ks-x1001 . #x586C) ; &I-K0-586C; [56-76] (=daikanwa . 17030) ; &I-M-17030; ) - ((shinjigen-2 . 4040) + ((shinjigen-1 . 4040) + (shinjigen-2 . 4040) (=jis-x0208@1990 . #x5D62) ; &J90-5D62; [61-66] (=ucs@jis . #x6C13) ; &J90-5D62; ) diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index 1ef4ad1..d7eb1c4 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -12533,20 +12533,41 @@ )) )) (define-char - '((=>ucs . #x3D1E) ; 㴞 + '((ideographic-radical . 85) ; ⽔ + (ideographic-strokes . 9) + (total-strokes . 12) + (=ucs . #x3D1E) ; 㴞 + )) +(define-char + '((<-denotational + ((=ucs . #x3D1E) ; 㴞 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 9) (total-strokes . 12) + (shinjigen-1 . 4396) + (shinjigen-2 . 4396) (=daikanwa . 17921) ; &M-17921; + (<-vulgar + ((shinjigen-1 . 4395) + (shinjigen-2 . 4395) + (=jis-x0208 . #x5E6D) ; >-23037; [62-77] + (=ks-x1001 . #x5425) ; &I-K0-5425; [52-05] + (=daikanwa . 18035) ; &I-M-18035; + )) + (<-vulgar*sources + songyuan-yilai-suzipu daikanwa shinjigen-1 shinjigen-2) )) (define-char - '((morohashi-daikanwa 17921 0 2) + '((<-denotational + ((=ucs . #x3D1E) ; 㴞 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x3D1E) ; 㴞 - (=cns11643-6 . #x4A6D) ; &I-C6-4A6D; [42-77] + (=cns11643-6 . #x4A6D) ; &JX2-6E7E; [42-77] (=jis-x0213-2-2000 . #x6E7E) ; &I-JX2-6E7E; [78-94] + (=ucs@unicode . #x3D1E) ; &JX2-6E7E; )) (define-char '((morohashi-daikanwa 17921 1) @@ -14424,123 +14445,151 @@ )) )) (define-char - '((=>ucs . #x23E72) ; 𣹲 - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 10) - (total-strokes . 13) - (=daikanwa . 18030) ; &M-18030; - )) -(define-char - '((morohashi-daikanwa 18030 0 0) - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) (=ucs . #x23E72) ; 𣹲 - (=cns11643-4 . #x3E31) ; &I-C4-3E31; [30-17] + (->subsumptive + ((=daikanwa . 18030) ; &M-18030; + ) + ((=cns11643-4 . #x3E31) ; &C4-3E31; [30-17] + (=ucs@iso . #x23E72) ; &C4-3E31; + )) )) (define-char '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) (=ucs . #x3D38) ; ã´¸ - (=cns11643-3 . #x4232) ; &I-C3-4232; [34-18] - (=daikanwa . 18031) ; &I-M-18031; - (=cbeta . 05273) ; &I-CB05273; + (->subsumptive + ((=daikanwa . 18031) ; &M-18031; + ) + ((=cbeta . 05273) ; &CB05273; + ) + ((=cns11643-3 . #x4232) ; &C3-4232; [34-18] + (=ucs@unicode . #x3D38) ; &C3-4232; + )) )) (define-char - '((=>ucs . #x6ED1) ; 滑 - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 10) - (total-strokes . 13) - (shinjigen-2 . 4368) - (=jis-x0208 . #x336A) ; >-22916; [19-74] - (=ks-x1001 . #x7C41) ; &I-K0-7C41; [92-33] - (=big5 . #xB7C6) ; &I-B-B7C6; - (=gt . 22916) ; &I-GT-22916; - (=gt-k . 10183) ; &I-GT-K10183; - (=gt-pj-1 . #x336A) ; &I-GT-22916; [19-74] - (=daikanwa . 18032) ; &I-M-18032; - (=ucs@jis . #x6ED1) ; >-22916; + '((ideographic-radical . 85) ; ⽔ + (=ucs . #x6ED1) ; 滑 )) (define-char - '((=>ucs . #x6ED1) ; 滑 - (morohashi-daikanwa 18032 0 0) + '((<-denotational + ((=ucs . #x6ED1) ; 滑 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) - (shinjigen-2 . 4368) - (=cns11643-1 . #x646C) ; &C1-646C; [68-76] + (=big5 . #xB7C6) ; &B-B7C6; + (->subsumptive + ((shinjigen-1 . 4368) + (shinjigen-2 . 4368) + (=jis-x0208 . #x336A) ; >-22916; [19-74] + (=ks-x1001 . #x7C41) ; &I-K0-7C41; [92-33] + (=gt . 22916) ; &I-GT-22916; + (=gt-k . 10183) ; &I-GT-K10183; + (=gt-pj-1 . #x336A) ; &I-GT-22916; [19-74] + (=daikanwa . 18032) ; &I-M-18032; + (=ucs@jis . #x6ED1) ; >-22916; + ) + ((=cns11643-1 . #x646C) ; &C1-646C; [68-76] + )) )) (define-char - '((morohashi-daikanwa 18032 0 4) + '((<-denotational + ((=ucs . #x6ED1) ; 滑 + )) (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 10) - (total-strokes . 13) - (=ucs . #x6ED1) ; 滑 - (=gb2312 . #x3B2C) ; &I-G0-3B2C; [27-12] + (ideographic-strokes . 9) + (total-strokes . 12) + (=gb2312 . #x3B2C) ; &G0-3B2C; [27-12] + (=ucs@unicode . #x6ED1) ; &G0-3B2C; )) (define-char '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) (=ucs . #x6ED2) ; 滒 - (=cns11643-2 . #x4435) ; &I-C2-4435; [36-21] (=big5 . #xDE4F) ; &I-B-DE4F; - (=daikanwa . 18033) ; &I-M-18033; + (->subsumptive + ((=daikanwa . 18033) ; &M-18033; + ) + ((=ucs@unicode . #x6ED2) ; &UU+6ED2; + ) + ((=cns11643-2 . #x4435) ; &C2-4435; [36-21] + )) )) (define-char - '((=>ucs . #x6ED3) ; 滓 - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) - (shinjigen-2 . 4377) - (=jis-x0208 . #x5E68) ; >-22967; [62-72] - (=ks-x1001 . #x6E2B) ; &I-K0-6E2B; [78-11] + (=ucs . #x6ED3) ; 滓 (=big5 . #xB7BA) ; &I-B-B7BA; - (=gt . 22967) ; &I-GT-22967; - (=gt-pj-1 . #x5E68) ; &I-GT-22967; [62-72] - (=daikanwa . 18034) ; &I-M-18034; - (=ucs@jis . #x6ED3) ; >-22967; + (->subsumptive + ((shinjigen-1 . 4377) + (shinjigen-2 . 4377) + (=jis-x0208 . #x5E68) ; >-22967; [62-72] + (=ks-x1001 . #x6E2B) ; &I-K0-6E2B; [78-11] + (=gt . 22967) ; &I-GT-22967; + (=gt-pj-1 . #x5E68) ; &I-GT-22967; [62-72] + (=daikanwa . 18034) ; &I-M-18034; + (=ucs@jis . #x6ED3) ; >-22967; + ) + ((=gb2312 . #x5752) ; &C1-6460; [55-50] + (=cns11643-1 . #x6460) ; &I-C1-6460; [68-64] + (=ucs@unicode . #x6ED3) ; &C1-6460; + )) )) (define-char - '((morohashi-daikanwa 18034 0 0) - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) - (=ucs . #x6ED3) ; 滓 - (=gb2312 . #x5752) ; &I-G0-5752; [55-50] - (=cns11643-1 . #x6460) ; &I-C1-6460; [68-64] + (=ucs . #x6ED4) ; 滔 + (=big5 . #xB7CA) ; &I-B-B7CA; )) (define-char - '((=>ucs . #x6ED4) ; 滔 + '((<-denotational + ((=ucs . #x6ED4) ; 滔 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) + (shinjigen-1 . 4395) (shinjigen-2 . 4395) (=jis-x0208 . #x5E6D) ; >-23037; [62-77] (=ks-x1001 . #x5425) ; &I-K0-5425; [52-05] - (=big5 . #xB7CA) ; &I-B-B7CA; (=gt . 23037) ; &I-GT-23037; (=gt-pj-1 . #x5E6D) ; &I-GT-23037; [62-77] (=daikanwa . 18035) ; &I-M-18035; (=ucs@jis . #x6ED4) ; >-23037; )) (define-char - '((morohashi-daikanwa 18035 0 2) + '((<-denotational + ((=ucs . #x6ED4) ; 滔 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) - (=ucs . #x6ED4) ; 滔 - (=gb2312 . #x4C4F) ; &I-G0-4C4F; [44-47] + (=gb2312 . #x4C4F) ; &C1-6470; [44-47] (=cns11643-1 . #x6470) ; &I-C1-6470; [68-80] + (=ucs@unicode . #x6ED4) ; &C1-6470; )) (define-char - '((=>ucs . #x6ED5) ; 滕 + '((ideographic-radical . 85) ; ⽔ + (ideographic-strokes . 10) + (total-strokes . 15) + (=ucs . #x6ED5) ; 滕 + (=big5 . #xBCF0) ; &I-B-BCF0; + )) +(define-char + '((<-denotational + ((=ucs . #x6ED5) ; 滕 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 15) (=jis-x0208 . #x5E6E) ; >-23452; [62-78] - (=big5 . #xBCF0) ; &I-B-BCF0; (=gt . 23452) ; &I-GT-23452; (=gt-k . 11983) ; &I-GT-K11983; (=gt-pj-1 . #x5E6E) ; &I-GT-23452; [62-78] @@ -14548,28 +14597,28 @@ (=ucs@jis . #x6ED5) ; >-23452; )) (define-char - '((morohashi-daikanwa 18036 0 2) + '((<-denotational + ((=ucs . #x6ED5) ; 滕 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 15) - (=ucs . #x6ED5) ; 滕 - (=gb2312 . #x6B78) ; &I-G0-6B78; [75-88] + (=gb2312 . #x6B78) ; &C1-6D5A; [75-88] (=cns11643-1 . #x6D5A) ; &I-C1-6D5A; [77-58] + (=ucs@unicode . #x6ED5) ; &C1-6D5A; )) (define-char - '((=>ucs . #x23E73) ; 𣹳 - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 10) - (total-strokes . 14) - (=daikanwa . 18037) ; &M-18037; - )) -(define-char - '((morohashi-daikanwa 18037 0 1) - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 14) (=ucs . #x23E73) ; 𣹳 - (=cns11643-6 . #x5E32) ; &I-C6-5E32; [62-18] + (->subsumptive + ((=daikanwa . 18037) ; &M-18037; + ) + ((=ucs@iso . #x23E73) ; &U-00023E73; + ) + ((=cns11643-6 . #x5E32) ; &C6-5E32; [62-18] + )) )) (define-char '((ideographic-radical . 85) ; ⽔ diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 469e08f..f3eabf5 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -1113,40 +1113,64 @@ '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 4) (total-strokes . 8) - (shinjigen-2 . 4568) (=ucs . #x708A) ; 炊 - (=jis-x0208 . #x3F66) ; &I-J90-3F66; [31-70] - (=gb2312 . #x3436) ; &I-G0-3436; [20-22] - (=ks-x1001 . #x7627) ; &I-K0-7627; [86-07] (=big5 . #xAAA4) ; &I-B-AAA4; - (=gt . 24220) ; &I-GT-24220; - (=gt-k . 03754) ; &I-GT-K03754; - (=gt-pj-1 . #x3F66) ; &I-GT-24220; [31-70] - (=daikanwa . 18904) ; &I-M-18904; + (->subsumptive + ((shinjigen-1 . 4567) + (=gb2312 . #x3436) ; &M-18904; [20-22] + (=daikanwa . 18904) ; &I-M-18904; + (=ucs@unicode . #x708A) ; &M-18904; + ) + ((shinjigen-2 . 4568) + (=jis-x0208 . #x3F66) ; >-24220; [31-70] + (=ks-x1001 . #x7627) ; &I-K0-7627; [86-07] + (=gt . 24220) ; &I-GT-24220; + (=gt-k . 03754) ; &I-GT-K03754; + (=gt-pj-1 . #x3F66) ; &I-GT-24220; [31-70] + (=ucs@jis . #x708A) ; >-24220; + ) + ((=cns11643-1 . #x4E65) ; &C1-4E65; [46-69] + )) )) (define-char - '((=>ucs . #x708A) ; 炊 - (morohashi-daikanwa 18904 0 0) + '((ideographic-radical . 86) ; ⽕ + (ideographic-strokes . 4) + (total-strokes . 8) + (=ucs . #x3DA7) ; 㶧 + )) +(define-char + '((<-denotational + ((=ucs . #x3DA7) ; 㶧 + )) (ideographic-radical . 86) ; ⽕ (ideographic-strokes . 4) (total-strokes . 8) - (=cns11643-1 . #x4E65) ; &C1-4E65; [46-69] + (->subsumptive + ((=daikanwa . 18905) ; &M-18905; + ) + ((=cns11643-4 . #x2727) ; &C4-2727; [07-07] + )) )) (define-char - '((ideographic-radical . 86) ; ⽕ + '((<-denotational + ((=ucs . #x3DA7) ; 㶧 + )) + (ideographic-radical . 86) ; ⽕ (ideographic-strokes . 4) (total-strokes . 8) - (=ucs . #x3DA7) ; 㶧 - (=cns11643-4 . #x2727) ; &I-C4-2727; [07-07] - (=daikanwa . 18905) ; &I-M-18905; + (=ucs@unicode . #x3DA7) ; &UU+3DA7; )) (define-char '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x708B) ; 炋 - (=cns11643-3 . #x296F) ; &I-C3-296F; [09-79] - (=daikanwa . 18906) ; &I-M-18906; + (->subsumptive + ((=daikanwa . 18906) ; &M-18906; + (=ucs@unicode . #x708B) ; &M-18906; + ) + ((=cns11643-3 . #x296F) ; &C3-296F; [09-79] + )) )) (define-char '((ideographic-radical . 86) ; ⽕ @@ -1242,34 +1266,26 @@ )) )) (define-char - '((=>ucs . #x7092) ; 炒 - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 4) - (total-strokes . 8) - (shinjigen-2 . 4568) - (=jis-x0208 . #x5F56) ; >-24218; [63-54] - (=ks-x1001 . #x7524) ; &I-K0-7524; [85-04] - (=big5 . #xAAA3) ; &I-B-AAA3; - (=gt . 24218) ; &I-GT-24218; - (=gt-pj-1 . #x5F56) ; &I-GT-24218; [63-54] - (=daikanwa . 18915) ; &I-M-18915; - (=ucs@jis . #x7092) ; >-24218; - )) -(define-char - '((morohashi-daikanwa 18915 0 0) - (ideographic-radical . 86) ; ⽕ + '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x7092) ; 炒 - (=gb2312 . #x3334) ; &I-G0-3334; [19-20] - )) -(define-char - '((=>ucs . #x7092) ; 炒 - (morohashi-daikanwa 18915 0 1) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 4) - (total-strokes . 8) - (=cns11643-1 . #x4E64) ; &C1-4E64; [46-68] + (=big5 . #xAAA3) ; &I-B-AAA3; + (->subsumptive + ((shinjigen-1 . 4568) + (shinjigen-2 . 4569) + (=jis-x0208 . #x5F56) ; >-24218; [63-54] + (=ks-x1001 . #x7524) ; &I-K0-7524; [85-04] + (=gt . 24218) ; &I-GT-24218; + (=gt-pj-1 . #x5F56) ; &I-GT-24218; [63-54] + (=daikanwa . 18915) ; &I-M-18915; + (=ucs@jis . #x7092) ; >-24218; + ) + ((=gb2312 . #x3334) ; &G0-3334; [19-20] + (=ucs@unicode . #x7092) ; &G0-3334; + ) + ((=cns11643-1 . #x4E64) ; &C1-4E64; [46-68] + )) )) (define-char '((ideographic-radical . 86) ; ⽕ diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index 5c7db9a..2965454 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -5951,7 +5951,7 @@ (total-strokes . 16) (=ucs . #x7BED) ; 篭 (->subsumptive - ((shinjigen-2 . 5891) + ((shinjigen-2-p . 5891) (=jis-x0208@1978 . #x6446) ; >-34010; [68-38] (=jis-x0208@1983 . #x4F36) ; &I-J83-4F36; [47-22] (=jis-x0208@1990 . #x4F36) ; &I-J90-4F36; [47-22] @@ -5959,6 +5959,19 @@ (=gt-pj-1 . #x4F36) ; &I-GT-34010; [47-22] (=daikanwa . 26371) ; &I-M-26371; (=ucs@jis . #x7BED) ; >-34010; + (<-same + ((=jis-x0208@1978 . #x4F36) ; >-34499; [47-22] + (=jis-x0208@1983 . #x6446) ; &I-J83-6446; [68-38] + (=ks-x1001 . #x566B) ; &I-K0-566B; [54-75] + (=daikanwa . 26752) ; &I-M-26752; + )) + (<-same*sources + zihui-bu daikanwa) + (<-vulgar + ((shinjigen-2 . 5891) + )) + (<-vulgar*sources + shinjigen-2) ) ((=cns11643-3 . #x5234) ; &C3-5234; [50-20] (=ucs@unicode . #x7BED) ; &C3-5234; @@ -10981,8 +10994,7 @@ (=ucs . #x7C60) ; ç±  (=big5 . #xC5A2) ; &I-B-C5A2; (->subsumptive - ((shinjigen-2 . 5891) - (=jis-x0208@1978 . #x4F36) ; >-34499; [47-22] + ((=jis-x0208@1978 . #x4F36) ; >-34499; [47-22] (=jis-x0208@1983 . #x6446) ; &I-J83-6446; [68-38] (=ks-x1001 . #x566B) ; &I-K0-566B; [54-75] (=jis-x0208@1990 . #x6446) ; &I-J90-6446; [68-38] @@ -10995,6 +11007,9 @@ (=ucs@unicode . #x7C60) ; &UU+7C60; ) ((=cns11643-1 . #x7B6C) ; &C1-7B6C; [91-76] + ) + ((shinjigen-1 . 5891) + (shinjigen-2 . 5891) )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index 61fc3d6..a9dc0ce 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -12023,7 +12023,8 @@ (=ucs . #x7E54) ; 織 (=big5 . #xC2B4) ; &I-B-C2B4; (->subsumptive - ((shinjigen-2 . 6189) + ((shinjigen-1 . 6187) + (shinjigen-2 . 6189) (=jis-x0208 . #x3F25) ; >-35947; [31-05] (=ks-x1001 . #x7244) ; &I-K0-7244; [82-36] (=gt . 35947) ; &I-GT-35947; @@ -12034,6 +12035,9 @@ ((=cns11643-1 . #x767E) ; &C1-767E; [86-94] (=gb12345 . #x562F) ; &C1-767E; [54-15] (=ucs@unicode . #x7E54) ; &C1-767E; + ) + ((shinjigen-1 . 6188) + (shinjigen-2 . 6190) )) )) (define-char @@ -12043,7 +12047,8 @@ (=ucs . #x7E55) ; 繕 (=big5 . #xC2B5) ; &I-B-C2B5; (->subsumptive - ((shinjigen-2 . 6189) + ((shinjigen-1 . 6189) + (shinjigen-2 . 6191) (=jis-x0208 . #x4136) ; >-35958; [33-22] (=ks-x1001 . #x604B) ; &I-K0-604B; [64-43] (=gt . 35958) ; &I-GT-35958; @@ -12062,14 +12067,27 @@ (ideographic-strokes . 12) (total-strokes . 18) (=ucs . #x26142) ; 𦅂 - (->subsumptive - ((hanyu-dazidian 5 3453 8) - (=daikanwa . 27894) ; &M-27894; - (=hanziku-9 . #xCD72) ; &I-HZK09-CD72; - ) - ((=cns11643-7 . #x4154) ; &C7-4154; [33-52] - (=ucs@iso . #x26142) ; &C7-4154; + )) +(define-char + '((<-denotational + ((=ucs . #x26142) ; 𦅂 + )) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 12) + (total-strokes . 18) + (hanyu-dazidian 5 3453 8) + (=daikanwa . 27894) ; &M-27894; + (=hanziku-9 . #xCD72) ; &I-HZK09-CD72; + )) +(define-char + '((<-denotational + ((=ucs . #x26142) ; 𦅂 )) + (ideographic-radical . 120) ; â½· + (ideographic-strokes . 12) + (total-strokes . 18) + (=cns11643-7 . #x4154) ; &C7-4154; [33-52] + (=ucs@iso . #x26142) ; &C7-4154; )) (define-char '((ideographic-radical . 120) ; â½· diff --git a/lisp/utf-2000/Ideograph-R128-Ear.el b/lisp/utf-2000/Ideograph-R128-Ear.el index 3a6ac1f..84c73a3 100644 --- a/lisp/utf-2000/Ideograph-R128-Ear.el +++ b/lisp/utf-2000/Ideograph-R128-Ear.el @@ -2808,7 +2808,8 @@ (=ucs . #x8077) ; 職 (=big5 . #xC2BE) ; &I-B-C2BE; (->subsumptive - ((shinjigen-2 . 6406) + ((shinjigen-1 . 6406) + (shinjigen-2 . 6406) (=ks-x1001 . #x7245) ; >-37781; [82-37] (=jis-x0208@1990 . #x3F26) ; &I-J90-3F26; [31-06] (=gt . 37781) ; &I-GT-37781; @@ -2818,14 +2819,15 @@ ) ((=cns11643-1 . #x772A) ; &C1-772A; [87-10] ) - ((shinjigen-2 . 6406) - (=jis-x0208@1978 . #x3F26) ; &J83-3F26; [31-06] + ((=jis-x0208@1978 . #x3F26) ; &J83-3F26; [31-06] (=jis-x0208@1983 . #x3F26) ; &I-J83-3F26; [31-06] ) ((=gb12345 . #x5630) ; &UU+8077; [54-16] (=ucs@unicode . #x8077) ; &UU+8077; ) - ((=jef-china3 . #x60D2) ; &JC3-60D2; + ((shinjigen-1 . 6407) + (shinjigen-2 . 6407) + (=jef-china3 . #x60D2) ; &JC3-60D2; (mojikyo . 055041) ; &MCS-6000D701; )) )) diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index e231c80..9f63f78 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -4349,9 +4349,20 @@ (ideographic-strokes . 6) (total-strokes . 10) (->subsumptive - ((=jis-x0212 . #x5628) ; &M-29464; [54-08] + ((shinjigen-1 . 6484) + (shinjigen-2 . 6484) + (=jis-x0212 . #x5628) ; &M-29464; [54-08] (=daikanwa . 29464) ; &I-M-29464; (=ucs@jis . #x8103) ; &M-29464; + (<-original + ((shinjigen-1 . 6483) + (=jis-x0208 . #x4048) ; >-38113; [32-40] + (=gb2312 . #x3460) ; &I-G0-3460; [20-64] + (=ks-x1001 . #x762A) ; &I-K0-762A; [86-10] + (=daikanwa . 29468) ; &I-M-29468; + )) + (<-original*sources + shinjigen-1) ) ((=cns11643-3 . #x334E) ; &C3-334E; [19-46] )) @@ -4432,7 +4443,7 @@ (total-strokes . 10) (=ucs . #x8106) ; 脆 (->subsumptive - ((shinjigen-2 . 0) + ((shinjigen-1 . 6483) (=jis-x0208 . #x4048) ; >-38113; [32-40] (=gb2312 . #x3460) ; &I-G0-3460; [20-64] (=ks-x1001 . #x762A) ; &I-K0-762A; [86-10] @@ -4443,6 +4454,8 @@ (=ucs@unicode . #x8106) ; >-38113; ) ((=cns11643-1 . #x5760) ; &C1-5760; [55-64] + ) + ((shinjigen-2 . 6483) )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 9d78f8b..5349f34 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -716,7 +716,15 @@ (=ucs@unicode . #x4495) ; &UU+4495; )) (define-char - '((=>ucs . #x26B01) ; 𦬁 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 7) + (=ucs . #x26B01) ; 𦬁 + )) +(define-char + '((<-denotational + ((=ucs . #x26B01) ; 𦬁 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) @@ -726,34 +734,54 @@ (mojikyo . 030661) ; &MCS-600077C5; )) (define-char - '((morohashi-daikanwa 30661 0 1) + '((<-denotational + ((=ucs . #x26B01) ; 𦬁 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) - (=ucs . #x26B01) ; 𦬁 - (=cns11643-4 . #x2477) ; &I-C4-2477; [04-87] + (=cns11643-4 . #x2477) ; &C4-2477; [04-87] + (=ucs@iso . #x26B01) ; &C4-2477; )) (define-char - '((=>ucs . #x8283) ; 芃 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (=ucs . #x8283) ; 芃 + (=big5 . #xCBA2) ; &I-B-CBA2; + )) +(define-char + '((<-denotational + ((=ucs . #x8283) ; 芃 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) (=cns11643-2 . #x2522) ; &M-30662; [05-02] (=daikanwa . 30662) ; &I-M-30662; + (=jef-china3 . #x61BC) ; &I-JC3-61BC; )) (define-char - '((morohashi-daikanwa 30662 0 3) + '((<-denotational + ((=ucs . #x8283) ; 芃 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 6) - (=ucs . #x8283) ; 芃 - (=jis-x0212 . #x5731) ; &I-JSP-5731; [55-17] + (=jis-x0212 . #x5731) ; &JX2-757A; [55-17] (=iso-ir165 . #x7E37) ; &I-EGB-7E37; [94-23] (=jis-x0213-2-2000 . #x757A) ; &I-JX2-757A; [85-90] - (=big5 . #xCBA2) ; &I-B-CBA2; + (=ucs@unicode . #x8283) ; &JX2-757A; )) (define-char - '((=>ucs . #x8284) ; 芄 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (=ucs . #x8284) ; 芄 + (=big5 . #xCBA3) ; &I-B-CBA3; + )) +(define-char + '((<-denotational + ((=ucs . #x8284) ; 芄 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) @@ -761,81 +789,171 @@ (=jef-china3 . #x9EAD) ; &I-JC3-9EAD; )) (define-char - '((=>ucs . #x8284) ; 芄 - (morohashi-daikanwa 30663 0 0) + '((<-denotational + ((=ucs . #x8284) ; 芄 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 6) + (=gb2312 . #x5C39) ; &JSP-5732; [60-25] + (=jis-x0212 . #x5732) ; &I-JSP-5732; [55-18] + (=ucs@unicode . #x8284) ; &JSP-5732; + )) +(define-char + '((<-denotational + ((=ucs . #x8284) ; 芄 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) (=cns11643-2 . #x2523) ; &C2-2523; [05-03] )) (define-char - '((morohashi-daikanwa 30663 0 2) + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (=ucs . #x8285) ; 芅 + (=big5 . #xCB7B) ; &I-B-CB7B; + )) +(define-char + '((<-denotational + ((=ucs . #x8285) ; 芅 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 7) + (->subsumptive + ((=daikanwa . 30664) ; &M-30664; + ) + ((=cns11643-2 . #x247B) ; &C2-247B; [04-91] + ) + ((=gt . 39828) ; >-39828; + (=gt-pj-6 . #x467E) ; >-39828; [38-94] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x8285) ; 芅 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 6) - (=ucs . #x8284) ; 芄 - (=gb2312 . #x5C39) ; &I-G0-5C39; [60-25] - (=jis-x0212 . #x5732) ; &I-JSP-5732; [55-18] - (=big5 . #xCBA3) ; &I-B-CBA3; + (=gt . 39718) ; >-39718; + (=gt-k . 02238) ; &I-GT-K02238; + (=gt-pj-10 . #x623F) ; >-39718; [66-31] + (=ucs@unicode . #x8285) ; >-39718; )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) + (=ucs . #x4496) ; 䒖 + )) +(define-char + '((<-denotational + ((=ucs . #x4496) ; 䒖 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) (total-strokes . 7) - (=ucs . #x8285) ; 芅 - (=cns11643-2 . #x247B) ; &I-C2-247B; [04-91] - (=big5 . #xCB7B) ; &I-B-CB7B; - (=daikanwa . 30664) ; &I-M-30664; + (->subsumptive + ((=gt . 39781) ; >-39781; + (=gt-pj-6 . #x4721) ; >-39781; [39-01] + (=daikanwa . 30665) ; &I-M-30665; + ) + ((=cns11643-4 . #x2476) ; &C4-2476; [04-86] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x4496) ; 䒖 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 6) + (=ucs@unicode . #x4496) ; &UU+4496; )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) + (=ucs . #x8286) ; 芆 + )) +(define-char + '((<-denotational + ((=ucs . #x8286) ; 芆 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) (total-strokes . 7) - (=ucs . #x4496) ; 䒖 - (=cns11643-4 . #x2476) ; &I-C4-2476; [04-86] - (=daikanwa . 30665) ; &I-M-30665; + (->subsumptive + ((=gt . 39766) ; >-39766; + (=gt-pj-6 . #x4722) ; >-39766; [39-02] + (=daikanwa . 30666) ; &I-M-30666; + ) + ((=cns11643-3 . #x2728) ; &C3-2728; [07-08] + )) )) (define-char - '((ideographic-radical . 140) ; ⾋ + '((<-denotational + ((=ucs . #x8286) ; 芆 + )) + (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) - (=ucs . #x8286) ; 芆 - (=cns11643-3 . #x2728) ; &I-C3-2728; [07-08] - (=daikanwa . 30666) ; &I-M-30666; + (=ucs@unicode . #x8286) ; &UU+8286; )) (define-char - '((=>ucs . #x8287) ; 芇 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (=ucs . #x8287) ; 芇 + )) +(define-char + '((<-denotational + ((=ucs . #x8287) ; 芇 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 7) (=cns11643-4 . #x247B) ; &M-30667; [04-91] (=daikanwa . 30667) ; &I-M-30667; + (=jef-china3 . #x61BD) ; &I-JC3-61BD; )) (define-char - '((morohashi-daikanwa 30667 0 3) + '((<-denotational + ((=ucs . #x8287) ; 芇 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (total-strokes . 6) (hanyu-dazidian 5 3175 4) - (=ucs . #x8287) ; 芇 - (=jis-x0212 . #x5733) ; &I-JSP-5733; [55-19] + (=jis-x0212 . #x5733) ; &HZK08-E7DB; [55-19] (=hanziku-8 . #xE7DB) ; &I-HZK08-E7DB; + (=ucs@unicode . #x8287) ; &HZK08-E7DB; )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 3) (=ucs . #x8289) ; 芉 - (->subsumptive - ((total-strokes . 7) - (=cns11643-4 . #x2475) ; &M-30668; [04-85] - (=daikanwa . 30668) ; &I-M-30668; - ) - ((total-strokes . 6) - (hanyu-dazidian 5 3174 4) - (=jis-x0212 . #x5734) ; &HZK08-E7BB; [55-20] - (=hanziku-8 . #xE7BB) ; &I-HZK08-E7BB; - (=ucs@unicode . #x8289) ; &HZK08-E7BB; + )) +(define-char + '((<-denotational + ((=ucs . #x8289) ; 芉 )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 7) + (=cns11643-4 . #x2475) ; &M-30668; [04-85] + (=daikanwa . 30668) ; &I-M-30668; + )) +(define-char + '((<-denotational + ((=ucs . #x8289) ; 芉 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 3) + (total-strokes . 6) + (hanyu-dazidian 5 3174 4) + (=jis-x0212 . #x5734) ; &HZK08-E7BB; [55-20] + (=hanziku-8 . #xE7BB) ; &I-HZK08-E7BB; + (=ucs@unicode . #x8289) ; &HZK08-E7BB; )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -18025,120 +18143,138 @@ (=ucs . #x8472) ; 葲 )) (define-char - '((=>ucs . #x8473) ; 葳 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=daikanwa . 31456) ; &M-31456; + (=ucs . #x8473) ; 葳 + (=big5 . #xDFBB) ; &I-B-DFBB; )) (define-char - '((=>ucs . #x8473) ; 葳 - (morohashi-daikanwa 31456 0 0) + '((<-denotational + ((=ucs . #x8473) ; 葳 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 13) - (=cns11643-2 . #x4660) ; &C2-4660; [38-64] + (->subsumptive + ((=daikanwa . 31456) ; &M-31456; + (=jef-china3 . #x62B8) ; &I-JC3-62B8; + ) + ((=cns11643-2 . #x4660) ; &C2-4660; [38-64] + )) )) (define-char - '((morohashi-daikanwa 31456 0 1) + '((<-denotational + ((=ucs . #x8473) ; 葳 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x8473) ; 葳 - (=gb2312 . #x5D5A) ; &I-G0-5D5A; [61-58] + (=gb2312 . #x5D5A) ; &JX1-7B2B; [61-58] (=jis-x0212 . #x5862) ; &I-JSP-5862; [56-66] (=jis-x0213-1-2000 . #x7B2B) ; &I-JX1-7B2B; [91-11] - (=big5 . #xDFBB) ; &I-B-DFBB; - )) -(define-char - '((=>ucs . #x8474) ; 葴 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-2 . #x465F) ; &M-31457; [38-63] - (=daikanwa . 31457) ; &I-M-31457; + (=ucs@unicode . #x8473) ; &JX1-7B2B; )) (define-char - '((morohashi-daikanwa 31457 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) (=ucs . #x8474) ; 葴 - (=jis-x0212 . #x5863) ; &I-JSP-5863; [56-67] (=big5 . #xDFBA) ; &I-B-DFBA; )) (define-char - '((=>ucs . #x8475) ; 葵 + '((<-denotational + ((=ucs . #x8474) ; 葴 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 13) - (shinjigen-2 6889 1) - (=daikanwa . 31458) ; &M-31458; + (=cns11643-2 . #x465F) ; &M-31457; [38-63] + (=daikanwa . 31457) ; &I-M-31457; + (=jef-china3 . #x62B9) ; &I-JC3-62B9; )) (define-char - '((=>ucs . #x8475) ; 葵 - (morohashi-daikanwa 31458 0 0) + '((<-denotational + ((=ucs . #x8474) ; 葴 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-1 . #x6631) ; &C1-6631; [70-17] + (total-strokes . 12) + (=jis-x0212 . #x5863) ; &JSP-5863; [56-67] + (=ucs@unicode . #x8474) ; &JSP-5863; )) (define-char - '((=>ucs . #x8475) ; 葵 - (morohashi-daikanwa 31458 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) - (=jis-x0208 . #x302A) ; >-41004; [16-10] - (=ks-x1001 . #x502D) ; &I-K0-502D; [48-13] + (=ucs . #x8475) ; 葵 (=big5 . #xB8AA) ; &I-B-B8AA; - (=gt . 41004) ; &I-GT-41004; - (=gt-pj-1 . #x302A) ; &I-GT-41004; [16-10] - (=ucs@jis . #x8475) ; >-41004; )) (define-char - '((morohashi-daikanwa 31458 0 2) + '((<-denotational + ((=ucs . #x8475) ; 葵 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) - (shinjigen-1 . 6889) - (shinjigen-2 . 6889) - (=ucs . #x8475) ; 葵 - (=gb2312 . #x3F7B) ; &I-G0-3F7B; [31-91] + (total-strokes . 13) + (->subsumptive + ((shinjigen-2-p . 6889) + (=daikanwa . 31458) ; &M-31458; + ) + ((shinjigen-1 . 6889) + (=cns11643-1 . #x6631) ; &C1-6631; [70-17] + )) )) (define-char - '((=>ucs . #x8476) ; 葶 + '((<-denotational + ((=ucs . #x8475) ; 葵 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=daikanwa . 31459) ; &M-31459; + (total-strokes . 12) + (->subsumptive + ((=jis-x0208 . #x302A) ; >-41004; [16-10] + (=ks-x1001 . #x502D) ; &I-K0-502D; [48-13] + (=gt . 41004) ; &I-GT-41004; + (=gt-pj-1 . #x302A) ; &I-GT-41004; [16-10] + (=ucs@jis . #x8475) ; >-41004; + ) + ((shinjigen-2 . 6889) + (=gb2312 . #x3F7B) ; &G0-3F7B; [31-91] + (=ucs@unicode . #x8475) ; &G0-3F7B; + )) )) (define-char - '((=>ucs . #x8476) ; 葶 - (morohashi-daikanwa 31459 0 0) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-2 . #x4651) ; &C2-4651; [38-49] + (=ucs . #x8476) ; 葶 + (=big5 . #xDFAC) ; &I-B-DFAC; )) (define-char - '((=>ucs . #x8476) ; 葶 - (morohashi-daikanwa 31459 0 1) + '((<-denotational + ((=ucs . #x8476) ; 葶 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) - (=jis-x0212 . #x5864) ; &JX2-7650; [56-68] - (=jis-x0213-2-2000 . #x7650) ; &I-JX2-7650; [86-48] - (=big5 . #xDFAC) ; &I-B-DFAC; - (=ucs@jis . #x8476) ; &JX2-7650; + (total-strokes . 13) + (->subsumptive + ((=daikanwa . 31459) ; &M-31459; + ) + ((=cns11643-2 . #x4651) ; &C2-4651; [38-49] + )) )) (define-char - '((morohashi-daikanwa 31459 0 2) + '((<-denotational + ((=ucs . #x8476) ; 葶 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x8476) ; 葶 - (=gb2312 . #x5D63) ; &I-G0-5D63; [61-67] + (->subsumptive + ((=jis-x0212 . #x5864) ; &JX2-7650; [56-68] + (=jis-x0213-2-2000 . #x7650) ; &I-JX2-7650; [86-48] + (=ucs@jis . #x8476) ; &JX2-7650; + ) + ((=gb2312 . #x5D63) ; &G0-5D63; [61-67] + (=ucs@unicode . #x8476) ; &G0-5D63; + )) )) (define-char '((ideographic-radical . 140) ; ⾋ diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el index aa03efa..c754949 100644 --- a/lisp/utf-2000/Ideograph-R142-Insect.el +++ b/lisp/utf-2000/Ideograph-R142-Insect.el @@ -6102,7 +6102,7 @@ '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 9) (total-strokes . 15) - (shinjigen-1 . 7223) + (shinjigen-1 . 7222) (shinjigen-2 . 7223) (=ucs . #x874E) ; 蝎 (=jis-x0208 . #x6979) ; &I-J90-6979; [73-89] @@ -7102,19 +7102,16 @@ (=daikanwa . 33325) ; &I-M-33325; )) (define-char - '((=>ucs . #x2736F) ; 𧍯 - (ideographic-radical . 142) ; ⾍ - (ideographic-strokes . 9) - (total-strokes . 15) - (=daikanwa . 33326) ; &M-33326; - )) -(define-char - '((morohashi-daikanwa 33326 0 0) - (ideographic-radical . 142) ; ⾍ + '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x2736F) ; 𧍯 - (=cns11643-5 . #x5059) ; &I-C5-5059; [48-57] + (->subsumptive + ((=daikanwa . 33326) ; &M-33326; + ) + ((=cns11643-5 . #x5059) ; &C5-5059; [48-57] + (=ucs@iso . #x2736F) ; &C5-5059; + )) )) (define-char '((ideographic-radical . 142) ; ⾍ @@ -7149,24 +7146,21 @@ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x27375) ; 𧍵 - (=daikanwa . 33329) ; &I-M-33329; - )) -(define-char - '((=>ucs . #x27375) ; 𧍵 - (morohashi-daikanwa 33329 0 0) - (ideographic-radical . 142) ; ⾍ - (ideographic-strokes . 9) - (total-strokes . 15) - (=cns11643-5 . #x505E) ; &C5-505E; [48-62] + (->subsumptive + ((=daikanwa . 33329) ; &M-33329; + (=ucs@iso . #x27375) ; &M-33329; + ) + ((=cns11643-5 . #x505E) ; &C5-505E; [48-62] + )) )) (define-char '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x8775) ; 蝵 + (=big5 . #xE7BD) ; &I-B-E7BD; (->subsumptive - ((=big5 . #xE7BD) ; &M-33330; - (=daikanwa . 33330) ; &I-M-33330; + ((=daikanwa . 33330) ; &M-33330; (=ucs@unicode . #x8775) ; &M-33330; ) ((=cns11643-2 . #x5426) ; &C2-5426; [52-06] @@ -7184,21 +7178,26 @@ '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 9) (total-strokes . 15) - (=cns11643-7 . #x282A) ; &M-33332; [08-10] - (=daikanwa . 33332) ; &I-M-33332; + (=ucs . #x27371) ; 𧍱 + (->subsumptive + ((=daikanwa . 33332) ; &M-33332; + ) + ((=cns11643-7 . #x282A) ; &C7-282A; [08-10] + (=ucs@iso . #x27371) ; &C7-282A; + )) )) (define-char '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x8776) ; 蝶 + (=big5 . #xBDBA) ; &I-B-BDBA; (->subsumptive ((shinjigen-1 . 7230) (shinjigen-2 . 7231) (=jis-x0208 . #x4433) ; >-44956; [36-19] (=gb2312 . #x357B) ; &I-G0-357B; [21-91] (=ks-x1001 . #x6F4A) ; &I-K0-6F4A; [79-42] - (=big5 . #xBDBA) ; &I-B-BDBA; (=gt . 44956) ; &I-GT-44956; (=gt-pj-1 . #x4433) ; &I-GT-44956; [36-19] (=daikanwa . 33333) ; &I-M-33333; @@ -8535,7 +8534,15 @@ (=ucs@unicode . #x45DD) ; &UU+45DD; )) (define-char - '((=>ucs . #x87A0) ; 螠 + '((ideographic-radical . 142) ; ⾍ + (ideographic-strokes . 10) + (total-strokes . 16) + (=ucs . #x87A0) ; 螠 + )) +(define-char + '((<-denotational + ((=ucs . #x87A0) ; 螠 + )) (ideographic-radical . 142) ; ⾍ (ideographic-strokes . 10) (total-strokes . 16) @@ -8545,27 +8552,40 @@ (=ucs@jis . #x87A0) ; &M-33431; )) (define-char - '((morohashi-daikanwa 33431 0 2) + '((<-denotational + ((=ucs . #x87A0) ; 螠 + )) (ideographic-radical . 142) ; ⾍ (ideographic-strokes . 10) (total-strokes . 16) - (=ucs . #x87A0) ; 螠 - (=cns11643-4 . #x5339) ; &I-C4-5339; [51-25] + (=cns11643-4 . #x5339) ; &C4-5339; [51-25] + (=ucs@unicode . #x87A0) ; &C4-5339; )) (define-char '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 10) (total-strokes . 16) (=ucs . #x87A1) ; 螡 - (=cns11643-3 . #x525E) ; &I-C3-525E; [50-62] - (=daikanwa . 33432) ; &I-M-33432; + (->subsumptive + ((=daikanwa . 33432) ; &M-33432; + ) + ((=cns11643-3 . #x525E) ; &C3-525E; [50-62] + (=ucs@unicode . #x87A1) ; &C3-525E; + )) )) (define-char '((ideographic-radical . 142) ; ⾍ (ideographic-strokes . 10) (total-strokes . 16) - (=cns11643-7 . #x3324) ; &M-33433; [19-04] - (=daikanwa . 33433) ; &I-M-33433; + (=ucs . #x273CE) ; 𧏎 + (->subsumptive + ((=daikanwa . 33433) ; &M-33433; + ) + ((=cns11643-7 . #x3324) ; &C7-3324; [19-04] + ) + ((=hanziku-8 . #xA955) ; &HZK08-A955; + (=ucs@iso . #x273CE) ; &HZK08-A955; + )) )) (define-char '((ideographic-radical . 142) ; ⾍ @@ -8574,7 +8594,7 @@ (=ucs . #x87A2) ; 螢 (->subsumptive ((shinjigen-1 . 7239) - (shinjigen-2 . 7136) + (shinjigen-2-p . 7136) (=jis-x0208 . #x6A25) ; >-45046; [74-05] (=ks-x1001 . #x7B2B) ; &I-K0-7B2B; [91-11] (=gb12345 . #x5329) ; >-45046; [51-09] diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el index df57fdd..642b562 100644 --- a/lisp/utf-2000/Ideograph-R145-Clothes.el +++ b/lisp/utf-2000/Ideograph-R145-Clothes.el @@ -94,16 +94,18 @@ (total-strokes . 8) (=ucs . #x461A) ; 䘚 (->subsumptive - ((shinjigen-1 . 823) + ((shinjigen-1 . 824) + (shinjigen-2 . 824) (=daikanwa . 34094) ; &M-34094; (<-original ((shinjigen-1 . 823) + (shinjigen-2 . 823) (=jis-x0208 . #x4234) ; >-03504; [34-20] (=ks-x1001 . #x706F) ; &I-K0-706F; [80-79] (=daikanwa . 02740) ; &I-M-02740; )) (<-original*sources - zhengzitong daikanwa shinjigen-1) + zhengzitong daikanwa shinjigen-1 shinjigen-2) ) ((=cns11643-3 . #x2A6E) ; &C3-2A6E; [10-78] (=ucs@unicode . #x461A) ; &C3-2A6E; @@ -5389,108 +5391,141 @@ )) )) (define-char - '((=>ucs . #x276CF) ; 𧛏 - (ideographic-radical . 145) ; ⾐ - (ideographic-strokes . 9) - (total-strokes . 15) - (=daikanwa . 34412) ; &M-34412; - )) -(define-char - '((morohashi-daikanwa 34412 0 0) - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x276CF) ; 𧛏 - (=cns11643-5 . #x5066) ; &I-C5-5066; [48-70] + (->subsumptive + ((=daikanwa . 34412) ; &M-34412; + ) + ((=cns11643-5 . #x5066) ; &C5-5066; [48-70] + (=ucs@iso . #x276CF) ; &C5-5066; + )) )) (define-char '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x8905) ; 褅 - (=cns11643-2 . #x542B) ; &I-C2-542B; [52-11] (=big5 . #xE7C2) ; &I-B-E7C2; - (=daikanwa . 34413) ; &I-M-34413; + (->subsumptive + ((=daikanwa . 34413) ; &M-34413; + ) + ((=cns11643-2 . #x542B) ; &C2-542B; [52-11] + (=ucs@unicode . #x8905) ; &C2-542B; + )) )) (define-char - '((=>ucs . #x4644) ; 䙄 - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=daikanwa . 34414) ; &M-34414; + (=ucs . #x276BB) ; 𧚻 + (->subsumptive + ((morohashi-daikanwa 34413 1) + (total-strokes@gt . 14) + (=gt . 46376) ; >-46376; + (=gt-pj-6 . #x6E6A) ; >-46376; [78-74] + ) + ((=hanziku-8 . #xD8F1) ; &HZK08-D8F1; + (=ucs@iso . #x276BB) ; &HZK08-D8F1; + )) )) (define-char - '((morohashi-daikanwa 34414 0 0) - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x4644) ; 䙄 - (=cns11643-4 . #x4D3F) ; &I-C4-4D3F; [45-31] )) (define-char - '((ideographic-radical . 145) ; ⾐ + '((<-denotational + ((=ucs . #x4644) ; 䙄 + )) + (ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=cns11643-7 . #x2854) ; &M-34415; [08-52] - (=daikanwa . 34415) ; &I-M-34415; + (->subsumptive + ((=daikanwa . 34414) ; &M-34414; + ) + ((=ucs@unicode . #x4644) ; &UU+4644; + )) )) (define-char - '((=>ucs . #x8906) ; 褆 + '((<-denotational + ((=ucs . #x4644) ; 䙄 + )) (ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=jis-x0212 . #x5C56) ; &M-34416; [60-54] - (=big5 . #xE7C9) ; &I-B-E7C9; - (=daikanwa . 34416) ; &I-M-34416; - (=jef-china3 . #x64AC) ; &I-JC3-64AC; - (=ucs@jis . #x8906) ; &M-34416; + (=cns11643-4 . #x4D3F) ; &C4-4D3F; [45-31] )) (define-char - '((morohashi-daikanwa 34416 0 0) - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=ucs . #x8906) ; 褆 - (=cns11643-2 . #x5432) ; &I-C2-5432; [52-18] + (=ucs . #x276D0) ; 𧛐 + (->subsumptive + ((=daikanwa . 34415) ; &M-34415; + ) + ((=cns11643-7 . #x2854) ; &C7-2854; [08-52] + (=ucs@iso . #x276D0) ; &C7-2854; + )) )) (define-char - '((=>ucs . #x8907) ; 複 - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (shinjigen-2 . 7424) - (=daikanwa . 34417) ; &M-34417; + (=ucs . #x8906) ; 褆 + (=big5 . #xE7C9) ; &I-B-E7C9; + (->subsumptive + ((=jis-x0212 . #x5C56) ; &M-34416; [60-54] + (=daikanwa . 34416) ; &I-M-34416; + (=jef-china3 . #x64AC) ; &I-JC3-64AC; + (=ucs@jis . #x8906) ; &M-34416; + ) + ((=cns11643-2 . #x5432) ; &C2-5432; [52-18] + (=ucs@unicode . #x8906) ; &C2-5432; + )) )) (define-char - '((=>ucs . #x8907) ; 複 - (morohashi-daikanwa 34417 0 0) - (ideographic-radical . 145) ; ⾐ + '((ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=cns11643-1 . #x6E6F) ; &C1-6E6F; [78-79] + (=ucs . #x8907) ; 複 + (=big5 . #xBDC6) ; &I-B-BDC6; )) (define-char - '((=>ucs . #x8907) ; 複 - (morohashi-daikanwa 34417 0 1) + '((<-denotational + ((=ucs . #x8907) ; 複 + )) (ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (shinjigen-2 . 7424) - (=jis-x0208 . #x4A23) ; >-46405; [42-03] - (=ks-x1001 . #x5C5C) ; &I-K0-5C5C; [60-60] - (=big5 . #xBDC6) ; &I-B-BDC6; - (=gt . 46405) ; &I-GT-46405; - (=gt-k . 11170) ; &I-GT-K11170; - (=gt-pj-1 . #x4A23) ; &I-GT-46405; [42-03] - (=ucs@jis . #x8907) ; >-46405; + (->subsumptive + ((=daikanwa . 34417) ; &M-34417; + ) + ((=cns11643-1 . #x6E6F) ; &C1-6E6F; [78-79] + )) )) (define-char - '((morohashi-daikanwa 34417 0 2) + '((<-denotational + ((=ucs . #x8907) ; 複 + )) (ideographic-radical . 145) ; ⾐ (ideographic-strokes . 9) (total-strokes . 15) - (=ucs . #x8907) ; 複 - (=gb12345 . #x7834) ; 複 [88-20] + (->subsumptive + ((shinjigen-1 . 7424) + (shinjigen-2 . 7424) + (=jis-x0208 . #x4A23) ; >-46405; [42-03] + (=ks-x1001 . #x5C5C) ; &I-K0-5C5C; [60-60] + (=gt . 46405) ; &I-GT-46405; + (=gt-k . 11170) ; &I-GT-K11170; + (=gt-pj-1 . #x4A23) ; &I-GT-46405; [42-03] + (=ucs@jis . #x8907) ; >-46405; + ) + ((=gb12345 . #x7834) ; &UU+8907; [88-20] + (=ucs@unicode . #x8907) ; &UU+8907; + )) )) (define-char '((ideographic-radical . 145) ; ⾐ diff --git a/lisp/utf-2000/Ideograph-R158-Body.el b/lisp/utf-2000/Ideograph-R158-Body.el index 1a81eaa..2599930 100644 --- a/lisp/utf-2000/Ideograph-R158-Body.el +++ b/lisp/utf-2000/Ideograph-R158-Body.el @@ -1077,69 +1077,113 @@ '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 11) (total-strokes . 18) - (=cns11643-7 . #x436C) ; &M-38142; [35-76] - (=daikanwa . 38142) ; &I-M-38142; + (=ucs . #x2827A) ; 𨉺 + (->subsumptive + ((=daikanwa . 38139) ; &M-38139; + ) + ((=cns11643-7 . #x436C) ; &C7-436C; [35-76] + ) + ((=ucs@iso . #x2827A) ; &U-0002827A; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=ucs . #x8EC2) ; 軂 - (=cns11643-2 . #x6741) ; &I-C2-6741; [71-33] - (=daikanwa . 38143) ; &I-M-38143; + (=ucs . #x483F) ; ä ¿ + (->subsumptive + ((=cns11643-3 . #x5B3E) ; &M-38142; [59-30] + (=daikanwa . 38142) ; &I-M-38142; + ) + ((=ucs@unicode . #x483F) ; &UU+483F; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=cns11643-7 . #x4A6C) ; &M-38144; [42-76] - (=daikanwa . 38144) ; &I-M-38144; + (=ucs . #x8EC2) ; 軂 + (->subsumptive + ((=daikanwa . 38143) ; &M-38143; + ) + ((=ucs@unicode . #x8EC2) ; &UU+8EC2; + ) + ((=cns11643-2 . #x6741) ; &C2-6741; [71-33] + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=ucs . #x8EC3) ; 軃 - (=jis-x0212 . #x6056) ; &I-JSP-6056; [64-54] - (=cns11643-3 . #x5B3F) ; &I-C3-5B3F; [59-31] - (=daikanwa . 38145) ; &I-M-38145; + (=ucs . #x2827F) ; 𨉿 + (=cns11643-7 . #x4A6C) ; &I-C7-4A6C; [42-76] + (=daikanwa . 38144) ; &I-M-38144; )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=cns11643-7 . #x4A6D) ; &M-38146; [42-77] - (=daikanwa . 38146) ; &I-M-38146; + (=ucs . #x8EC3) ; 軃 + (->subsumptive + ((=jis-x0212 . #x6056) ; &M-38145; [64-54] + (=cns11643-3 . #x5B3F) ; &I-C3-5B3F; [59-31] + (=daikanwa . 38145) ; &I-M-38145; + (=ucs@jis . #x8EC3) ; &M-38145; + ) + ((=ucs@unicode . #x8EC3) ; &UU+8EC3; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=cns11643-7 . #x4A6A) ; &M-38147; [42-74] - (=daikanwa . 38147) ; &I-M-38147; + (=ucs . #x28280) ; 𨊀 + (=cns11643-7 . #x4A6D) ; &I-C7-4A6D; [42-77] + (=daikanwa . 38146) ; &I-M-38146; )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=cns11643-7 . #x4A69) ; &M-38149; [42-73] - (=daikanwa . 38149) ; &I-M-38149; + (=ucs . #x28281) ; 𨊁 + (->subsumptive + ((=daikanwa . 38147) ; &M-38147; + ) + ((=ucs@iso . #x28281) ; &U-00028281; + ) + ((=cns11643-7 . #x4A6A) ; &C7-4A6A; [42-74] + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=ucs . #x8EC4) ; 軄 - (=jis-x0212 . #x6057) ; &I-JSP-6057; [64-55] - (=cns11643-4 . #x6156) ; &I-C4-6156; [65-54] - (=daikanwa . 38152) ; &I-M-38152; + (=ucs . #x2828A) ; 𨊊 + (->subsumptive + ((=daikanwa . 38149) ; &M-38149; + ) + ((=ucs@iso . #x2828A) ; &U-0002828A; + ) + ((=cns11643-7 . #x4A69) ; &C7-4A69; [42-73] + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 12) (total-strokes . 19) - (=ucs . #x483F) ; ä ¿ - (=cns11643-3 . #x5B3E) ; &I-C3-5B3E; [59-30] + (=ucs . #x8EC4) ; 軄 + (->subsumptive + ((=jis-x0212 . #x6057) ; &M-38152; [64-55] + (=daikanwa . 38152) ; &I-M-38152; + (=ucs@jis . #x8EC4) ; &M-38152; + ) + ((=cns11643-4 . #x6156) ; &C4-6156; [65-54] + ) + ((=cbeta . 04537) ; &CB04537; + ) + ((=hanziku-10 . #xC142) ; &HZK10-C142; + (=ucs@unicode . #x8EC4) ; &HZK10-C142; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ diff --git a/lisp/utf-2000/Ideograph-R195-Fish.el b/lisp/utf-2000/Ideograph-R195-Fish.el index 6dc2313..996bfa9 100644 --- a/lisp/utf-2000/Ideograph-R195-Fish.el +++ b/lisp/utf-2000/Ideograph-R195-Fish.el @@ -1845,7 +1845,8 @@ '((ideographic-radical . 195) ; ⿂ (ideographic-strokes . 6) (total-strokes . 17) - (=cns11643-7 . #x3E46) ; &M-46109; [30-38] + (=ucs . #x29DAA) ; 𩶪 + (=cns11643-7 . #x3E46) ; &I-C7-3E46; [30-38] (=daikanwa . 46109) ; &I-M-46109; )) (define-char @@ -1853,35 +1854,49 @@ (ideographic-strokes . 6) (total-strokes . 17) (=ucs . #x4C4A) ; 䱊 - (=cns11643-4 . #x5A40) ; &I-C4-5A40; [58-32] - (=daikanwa . 46110) ; &I-M-46110; + (->subsumptive + ((=daikanwa . 46110) ; &M-46110; + (=ucs@unicode . #x4C4A) ; &M-46110; + ) + ((=cns11643-4 . #x5A40) ; &C4-5A40; [58-32] + )) )) (define-char '((ideographic-radical . 195) ; ⿂ (ideographic-strokes . 6) (total-strokes . 17) - (=cns11643-7 . #x3E4D) ; &M-46111; [30-45] + (=ucs . #x29DAB) ; 𩶫 + (=cns11643-7 . #x3E4D) ; &I-C7-3E4D; [30-45] (=daikanwa . 46111) ; &I-M-46111; )) (define-char '((ideographic-radical . 195) ; ⿂ (ideographic-strokes . 6) (total-strokes . 17) - (shinjigen-2 . 0) (=ucs . #x9BA0) ; é®  - (=jis-x0208 . #x723E) ; &I-J90-723E; [82-30] - (=cns11643-2 . #x6122) ; &I-C2-6122; [65-02] - (=gt . 62150) ; &I-GT-62150; - (=gt-pj-1 . #x723E) ; &I-GT-62150; [82-30] - (=daikanwa . 46112) ; &I-M-46112; + (->subsumptive + ((=jis-x0208 . #x723E) ; >-62150; [82-30] + (=cns11643-2 . #x6122) ; &I-C2-6122; [65-02] + (=gt . 62150) ; &I-GT-62150; + (=gt-pj-1 . #x723E) ; &I-GT-62150; [82-30] + (=daikanwa . 46112) ; &I-M-46112; + (=ucs@unicode . #x9BA0) ; >-62150; + ) + ((shinjigen-1 . 9555) + (shinjigen-2 . 9555) + )) )) (define-char '((ideographic-radical . 195) ; ⿂ (ideographic-strokes . 6) (total-strokes . 17) (=ucs . #x9BA1) ; 鮡 - (=cns11643-2 . #x607B) ; &I-C2-607B; [64-91] - (=daikanwa . 46113) ; &I-M-46113; + (->subsumptive + ((=daikanwa . 46113) ; &M-46113; + ) + ((=cns11643-2 . #x607B) ; &C2-607B; [64-91] + (=ucs@unicode . #x9BA1) ; &C2-607B; + )) )) (define-char '((ideographic-radical . 195) ; ⿂ @@ -1904,8 +1919,12 @@ (ideographic-strokes . 6) (total-strokes . 17) (=ucs . #x9BA3) ; 鮣 - (=cns11643-3 . #x5742) ; &I-C3-5742; [55-34] - (=daikanwa . 46116) ; &I-M-46116; + (->subsumptive + ((=daikanwa . 46116) ; &M-46116; + ) + ((=cns11643-3 . #x5742) ; &C3-5742; [55-34] + (=ucs@unicode . #x9BA3) ; &C3-5742; + )) )) (define-char '((ideographic-radical . 195) ; ⿂ diff --git a/lisp/utf-2000/Ideograph-R199-Wheat.el b/lisp/utf-2000/Ideograph-R199-Wheat.el index 84a5eeb..fbae926 100644 --- a/lisp/utf-2000/Ideograph-R199-Wheat.el +++ b/lisp/utf-2000/Ideograph-R199-Wheat.el @@ -462,11 +462,18 @@ (=cns11643-4 . #x4F4B) ; &C4-4F4B; [47-43] )) (define-char - '((=>ucs . #x9EA9) ; 麩 + '((ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 4) + (total-strokes . 15) + (=ucs . #x9EA9) ; 麩 + )) +(define-char + '((<-denotational + ((=ucs . #x9EA9) ; 麩 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 4) (total-strokes . 15) - (shinjigen-2 . 0) (=jis-x0208 . #x734F) ; >-65035; [83-47] (=gt . 65035) ; &I-GT-65035; (=gt-pj-1 . #x734F) ; &I-GT-65035; [83-47] @@ -474,39 +481,26 @@ (=ucs@jis . #x9EA9) ; >-65035; )) (define-char - '((=>ucs . #x9EA9) ; 麩 - (morohashi-daikanwa 47739 0 0) + '((<-denotational + ((=ucs . #x9EA9) ; 麩 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 4) (total-strokes . 15) - (=cns11643-1 . #x702B) ; &C1-702B; [80-11] + (shinjigen-1 . 9795) + (shinjigen-2 . 9795) + (=gb12345 . #x746F) ; &JC3-6FBF; [84-79] + (=jef-china3 . #x6FBF) ; &JC3-6FBF; + (=ucs@unicode . #x9EA9) ; &JC3-6FBF; )) (define-char - '((=>ucs . #x9EB8) ; 麸 - (morohashi-daikanwa 47739 0 3) - (ideographic-radical . 199) ; ⿆ - (ideographic-strokes . 4) - (total-strokes . 11) - (=jis-x0208 . #x7350) ; >-64935; [83-48] - (=gt . 64935) ; &I-GT-64935; - (=gt-pj-1 . #x7350) ; &I-GT-64935; [83-48] - (=ucs@jis . #x9EB8) ; >-64935; - )) -(define-char - '((morohashi-daikanwa 47739 0 5) + '((<-denotational + ((=ucs . #x9EA9) ; 麩 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 4) (total-strokes . 15) - (=ucs . #x9EA9) ; 麩 - (=gb12345 . #x746F) ; 麩 [84-79] - )) -(define-char - '((morohashi-daikanwa 47739 0 7) - (ideographic-radical . 199) ; ⿆ - (ideographic-strokes . 4) - (total-strokes . 11) - (=ucs . #x9EB8) ; 麸 - (=gb2312 . #x746F) ; &I-G0-746F; [84-79] + (=cns11643-1 . #x702B) ; &C1-702B; [80-11] )) (define-char '((ideographic-radical . 199) ; ⿆ @@ -695,14 +689,62 @@ )) (define-char '((ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 4) + (total-strokes . 11) + (=ucs . #x9EB8) ; 麸 + )) +(define-char + '((<-denotational + ((=ucs . #x9EB8) ; 麸 + )) + (ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 4) + (total-strokes . 11) + (=gb2312 . #x746F) ; &G0-746F; [84-79] + (=ucs@unicode . #x9EB8) ; &G0-746F; + (<-simplified@CN + ((=gb12345 . #x746F) ; &JC3-6FBF; [84-79] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x9EB8) ; 麸 + )) + (ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 4) + (total-strokes . 11) + (=jis-x0208 . #x7350) ; >-64935; [83-48] + (=gt . 64935) ; &I-GT-64935; + (=gt-pj-1 . #x7350) ; &I-GT-64935; [83-48] + (=ucs@jis . #x9EB8) ; >-64935; + (<-simplified@JP + ((=jis-x0208 . #x734F) ; >-65035; [83-47] + (=daikanwa . 47739) ; &I-M-47739; + )) + )) +(define-char + '((ideographic-radical . 199) ; ⿆ (ideographic-strokes . 5) (total-strokes . 16) (=ucs . #x4D31) ; ä´± - (=daikanwa . 47752) ; &I-M-47752; )) (define-char - '((=>ucs . #x4D31) ; ä´± - (morohashi-daikanwa 47752 0 3) + '((<-denotational + ((=ucs . #x4D31) ; ä´± + )) + (ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 5) + (total-strokes . 16) + (->subsumptive + ((=daikanwa . 47752) ; &M-47752; + ) + ((=ucs@unicode . #x4D31) ; &UU+4D31; + )) + )) +(define-char + '((<-denotational + ((=ucs . #x4D31) ; ä´± + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 5) (total-strokes . 16) @@ -767,11 +809,18 @@ (=cns11643-4 . #x555C) ; &C4-555C; [53-60] )) (define-char - '((=>ucs . #x9EAD) ; 麭 + '((ideographic-radical . 199) ; ⿆ + (ideographic-strokes . 5) + (total-strokes . 16) + (=ucs . #x9EAD) ; 麭 + )) +(define-char + '((<-denotational + ((=ucs . #x9EAD) ; 麭 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 5) (total-strokes . 16) - (shinjigen-2 . 0) (=jis-x0208 . #x7352) ; >-65076; [83-50] (=gt . 65076) ; &I-GT-65076; (=gt-pj-1 . #x7352) ; &I-GT-65076; [83-50] @@ -779,19 +828,24 @@ (=ucs@jis . #x9EAD) ; >-65076; )) (define-char - '((=>ucs . #x9EAD) ; 麭 - (morohashi-daikanwa 47757 0 0) + '((<-denotational + ((=ucs . #x9EAD) ; 麭 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 5) (total-strokes . 16) - (=cns11643-2 . #x5C3F) ; &C2-5C3F; [60-31] + (shinjigen-1 . 9799) + (shinjigen-2 . 9799) + (=ucs@unicode . #x9EAD) ; &UU+9EAD; )) (define-char - '((morohashi-daikanwa 47757 0 2) + '((<-denotational + ((=ucs . #x9EAD) ; 麭 + )) (ideographic-radical . 199) ; ⿆ (ideographic-strokes . 5) (total-strokes . 16) - (=ucs . #x9EAD) ; 麭 + (=cns11643-2 . #x5C3F) ; &C2-5C3F; [60-31] )) (define-char '((ideographic-radical . 199) ; ⿆ diff --git a/lisp/utf-2000/Ideograph-R203-Black.el b/lisp/utf-2000/Ideograph-R203-Black.el index 5bf4bfe..1317f79 100644 --- a/lisp/utf-2000/Ideograph-R203-Black.el +++ b/lisp/utf-2000/Ideograph-R203-Black.el @@ -232,90 +232,120 @@ (ideographic-strokes . 3) (total-strokes . 15) (=ucs . #x9ED3) ; 黓 - (=cns11643-2 . #x563C) ; &I-C2-563C; [54-28] - (=daikanwa . 48052) ; &I-M-48052; + (->subsumptive + ((=cns11643-2 . #x563C) ; &M-48052; [54-28] + (=daikanwa . 48052) ; &I-M-48052; + ) + ((=ucs@unicode . #x9ED3) ; &UU+9ED3; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 3) (total-strokes . 15) (=ucs . #x2A41F) ; 𪐟 - (=cns11643-5 . #x5350) ; &I-C5-5350; [51-48] - (=daikanwa . 48053) ; &I-M-48053; + (->subsumptive + ((=daikanwa . 48053) ; &M-48053; + ) + ((=cns11643-5 . #x5350) ; &C5-5350; [51-48] + (=ucs@unicode . #x2A41F) ; &C5-5350; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 3) (total-strokes . 15) - (=cns11643-7 . #x2C35) ; &M-48054; [12-21] - (=daikanwa . 48054) ; &I-M-48054; + (=ucs . #x2A420) ; 𪐠 + (->subsumptive + ((=daikanwa . 48054) ; &M-48054; + ) + ((=ucs@iso . #x2A420) ; &U-0002A420; + ) + ((=cns11643-7 . #x2C35) ; &C7-2C35; [12-21] + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 3) (total-strokes . 15) - (=daikanwa . 48055) ; &M-48055; - )) -(define-char - '((=>ucs . #x9ED4) ; 黔 - (ideographic-radical . 203) ; ⿊ - (ideographic-strokes . 4) - (total-strokes . 16) - (shinjigen-2 . 9820) - (=daikanwa . 48056) ; &M-48056; - )) -(define-char - '((=>ucs . #x9ED4) ; 黔 - (morohashi-daikanwa 48056 0 0) - (ideographic-radical . 203) ; ⿊ - (ideographic-strokes . 4) - (total-strokes . 16) - (shinjigen-2 . 9820) - (=jis-x0208 . #x7358) ; >-65575; [83-56] - (=ks-x1001 . #x4C23) ; &I-K0-4C23; [44-03] - (=cns11643-1 . #x733D) ; &I-C1-733D; [83-29] - (=gt . 65575) ; &I-GT-65575; - (=gt-pj-1 . #x7358) ; &I-GT-65575; [83-56] - (=ucs@jis . #x9ED4) ; >-65575; + (=ucs . #x2A423) ; 𪐣 + (->subsumptive + ((=daikanwa . 48055) ; &M-48055; + ) + ((=ucs@iso . #x2A423) ; &U-0002A423; + )) )) (define-char - '((morohashi-daikanwa 48056 0 2) - (ideographic-radical . 203) ; ⿊ + '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 4) (total-strokes . 16) (=ucs . #x9ED4) ; 黔 - (=gb2312 . #x472D) ; &I-G0-472D; [39-13] + (->subsumptive + ((shinjigen-1 . 9820) + (shinjigen-2 . 9820) + (=daikanwa . 48056) ; &M-48056; + ) + ((=jis-x0208 . #x7358) ; >-65575; [83-56] + (=ks-x1001 . #x4C23) ; &I-K0-4C23; [44-03] + (=cns11643-1 . #x733D) ; &I-C1-733D; [83-29] + (=gt . 65575) ; &I-GT-65575; + (=gt-pj-1 . #x7358) ; &I-GT-65575; [83-56] + (=ucs@jis . #x9ED4) ; >-65575; + ) + ((=gb2312 . #x472D) ; &G0-472D; [39-13] + (=ucs@unicode . #x9ED4) ; &G0-472D; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 4) (total-strokes . 16) (=ucs . #x9ED5) ; 黕 - (=jis-x0212 . #x6C74) ; &I-JSP-6C74; [76-84] - (=cns11643-2 . #x5C40) ; &I-C2-5C40; [60-32] - (=daikanwa . 48057) ; &I-M-48057; + (->subsumptive + ((=jis-x0212 . #x6C74) ; &M-48057; [76-84] + (=daikanwa . 48057) ; &I-M-48057; + (=ucs@jis . #x9ED5) ; &M-48057; + ) + ((=cns11643-2 . #x5C40) ; &C2-5C40; [60-32] + (=ucs@unicode . #x9ED5) ; &C2-5C40; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 4) (total-strokes . 16) - (=cns11643-7 . #x3669) ; &M-48058; [22-73] - (=daikanwa . 48058) ; &I-M-48058; + (=ucs . #x2A428) ; 𪐨 + (->subsumptive + ((=daikanwa . 48058) ; &M-48058; + ) + ((=cns11643-7 . #x3669) ; &C7-3669; [22-73] + (=ucs@iso . #x2A428) ; &C7-3669; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 4) (total-strokes . 16) (=ucs . #x9ED6) ; 黖 - (=cns11643-2 . #x5C41) ; &I-C2-5C41; [60-33] - (=daikanwa . 48059) ; &I-M-48059; + (->subsumptive + ((=daikanwa . 48059) ; &M-48059; + ) + ((=ucs@unicode . #x9ED6) ; &UU+9ED6; + ) + ((=cns11643-2 . #x5C41) ; &C2-5C41; [60-33] + )) )) (define-char '((ideographic-radical . 203) ; ⿊ (ideographic-strokes . 4) (total-strokes . 16) - (=cns11643-7 . #x366A) ; &M-48060; [22-74] - (=daikanwa . 48060) ; &I-M-48060; + (=ucs . #x2A424) ; 𪐤 + (->subsumptive + ((=daikanwa . 48060) ; &M-48060; + ) + ((=cns11643-7 . #x366A) ; &C7-366A; [22-74] + (=ucs@iso . #x2A424) ; &C7-366A; + )) )) (define-char '((ideographic-radical . 203) ; ⿊ diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el index 83ab102..520c8c9 100644 --- a/lisp/utf-2000/maps-conf.el +++ b/lisp/utf-2000/maps-conf.el @@ -60,7 +60,7 @@ ;; #x4337 #x492D #x3F6C #x6E4D #x4F3F ;; #x353D #x4324 #x475B #x6E47 #x4371 ;; #x3F5D #x6E49 #x4D6F #x3C72 #x3D37 -;; #x6E4C #x3B44 #x734E #x5567)) +;; #x6E4C #x3B44 #x734E #x5567 #x545A)) ;; (put-char-attribute (decode-char 'japanese-jisx0208-1990 v) ;; '=gt-pj-1 v)) ;; nil) diff --git a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el index 6461bd0..39e6cdb 100644 --- a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el +++ b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el @@ -315,7 +315,21 @@ (bidi-category . "ON") (mirrored . nil) (=ucs . #x301C) ; 〜 - (=jis-x0208 . #x2141) ; &I-J90-2141; [01-33] + )) +(define-char + '((<-denotational + ((name . "WAVE DASH") + (=ucs . #x301C) ; 〜 + )) + (=ucs@unicode . #x301C) ; &UU+301C; + )) +(define-char + '((<-denotational + ((name . "WAVE DASH") + (=ucs . #x301C) ; 〜 + )) + (=jis-x0208 . #x2141) ; &J90-2141; [01-33] + (=ucs@jis . #x301C) ; &J90-2141; )) (define-char '((name . "REVERSED DOUBLE PRIME QUOTATION MARK") diff --git a/src/ChangeLog b/src/ChangeLog index 15cabab..a6980c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-06-04 MORIOKA Tomohiko + + * char-ucs.h, chartab.c, fns.c, mule-charset.c: Rename Qmap_* to + Qrep_*. + 2007-09-05 MORIOKA Tomohiko * mule.c (vars_of_mule): Update `xemacs-chise-version' to 0.24 @@ -6566,7 +6571,7 @@ * event-gtk.c: Recognise AltGr as a valid modifier. -2005-01-12 Ville Skyttä +2005-01-12 Ville Skyttä * console-x.h: #include X11/keysym.h before xintrinsic.h. @@ -6952,7 +6957,7 @@ * sysdll.c: configure sets HAVE_DLD_INIT, not HAVE_INIT_DLD. -2003-07-31 René Kyllingstad +2003-07-31 René Kyllingstad * event-msw.c (mswindows_enqueue_mouse_button_event): * event-msw.c (mswindows_wnd_proc): diff --git a/src/char-ucs.h b/src/char-ucs.h index c6e68b3..204efac 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -1,5 +1,5 @@ /* Header for UCS-4 character representation. - Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2008 MORIOKA Tomohiko This file is part of XEmacs. @@ -49,7 +49,7 @@ extern Lisp_Object Vcharset_japanese_jisx0212; EXFUN (Fget_charset, 1); extern Lisp_Object Qsystem_char_id; -extern Lisp_Object Qmap_ucs, Qucs; +extern Lisp_Object Qrep_ucs, Qucs; extern Lisp_Object Q_subsumptive, Q_denotational; Lisp_Object put_char_ccs_code_point (Lisp_Object character, diff --git a/src/chartab.c b/src/chartab.c index 22313a1..4b70f46 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -4,7 +4,7 @@ Copyright (C) 1995, 1996 Ben Wing. Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2008 MORIOKA Tomohiko This file is part of XEmacs. @@ -1130,7 +1130,7 @@ make_char_id_table (Lisp_Object initval) Lisp_Object Qcomposition; -Lisp_Object Qmap_decomposition; +Lisp_Object Qrep_decomposition; Lisp_Object Qto_decomposition_at_superscript; Lisp_Object Qto_decomposition_at_circled; Lisp_Object Q_canonical; @@ -3496,7 +3496,7 @@ put_char_composition (Lisp_Object character, Lisp_Object value) } #endif } - return Qmap_decomposition; + return Qrep_decomposition; } static Lisp_Object @@ -3533,12 +3533,12 @@ Store CHARACTER's ATTRIBUTE with VALUE. value = put_char_ccs_code_point (character, ccs, value); attribute = XCHARSET_NAME (ccs); } - else if ( EQ (attribute, Qmap_decomposition) || + else if ( EQ (attribute, Qrep_decomposition) || EQ (attribute, Q_decomposition) ) { value = Fcopy_sequence (Fchar_refs_simplify_char_specs (value)); attribute = put_char_composition (character, value); - if ( !EQ (attribute, Qmap_decomposition) && + if ( !EQ (attribute, Qrep_decomposition) && SYMBOLP (XCAR (value)) ) value = XCDR (value); } @@ -4238,7 +4238,7 @@ Store character's ATTRIBUTES. (attributes)) { Lisp_Object rest; - Lisp_Object code = Fcdr (Fassq (Qmap_ucs, attributes)); + Lisp_Object code = Fcdr (Fassq (Qrep_ucs, attributes)); Lisp_Object character; if (NILP (code)) @@ -4717,7 +4717,7 @@ syms_of_chartab (void) defsymbol (&Q_component, "->ideographic-component-forms"); defsymbol (&Q_component_of, "<-ideographic-component-forms"); defsymbol (&Qcomposition, "composition"); - defsymbol (&Qmap_decomposition, "=decomposition"); + defsymbol (&Qrep_decomposition, "=decomposition"); defsymbol (&Qto_decomposition_at_superscript, "=>decomposition@superscript"); defsymbol (&Qto_decomposition_at_circled, "=>decomposition@circled"); diff --git a/src/fns.c b/src/fns.c index 9b38b1b..9de6fea 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,7 +1,7 @@ /* Random utility Lisp functions. Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc. Copyright (C) 1995, 1996 Ben Wing. - Copyright (C) 2002, 2003, 2004 MORIOKA Tomohiko + Copyright (C) 2002, 2003, 2004, 2008 MORIOKA Tomohiko This file is part of XEmacs. @@ -3810,7 +3810,7 @@ ids_format_unit (Lisp_Object ids_char) if (CHARP (ids_char)) return Fchar_to_string (ids_char); else if (INTP (ids_char)) - return Fchar_to_string (Fdecode_char (Qmap_ucs, ids_char, Qnil, Qnil)); + return Fchar_to_string (Fdecode_char (Qrep_ucs, ids_char, Qnil, Qnil)); else { Lisp_Object ret = Ffind_char (ids_char); @@ -3867,7 +3867,7 @@ simplify_char_spec (Lisp_Object char_spec) return char_spec; } else if (INTP (char_spec)) - return Fdecode_char (Qmap_ucs, char_spec, Qnil, Qnil); + return Fdecode_char (Qrep_ucs, char_spec, Qnil, Qnil); else { #if 0 diff --git a/src/mule-charset.c b/src/mule-charset.c index e32fcf2..70cb061 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -1,7 +1,7 @@ /* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2008 MORIOKA Tomohiko This file is part of XEmacs. @@ -267,7 +267,7 @@ Lisp_Object put_char_ccs_code_point (Lisp_Object character, Lisp_Object ccs, Lisp_Object value) { - if ( !( EQ (XCHARSET_NAME (ccs), Qmap_ucs) + if ( !( EQ (XCHARSET_NAME (ccs), Qrep_ucs) && INTP (value) && (XINT (value) < 0xF0000) && XCHAR (character) == XINT (value) ) || !INTP (value) ) @@ -386,17 +386,17 @@ Lisp_Object Qascii, Qlatin_jisx0201, Qcyrillic_iso8859_5, Qlatin_iso8859_9, - Qmap_jis_x0208_1978, - Qmap_gb2312, - Qmap_gb12345, - Qmap_jis_x0208_1983, - Qmap_ks_x1001, - Qmap_jis_x0212, - Qmap_cns11643_1, - Qmap_cns11643_2, + Qrep_jis_x0208_1978, + Qrep_gb2312, + Qrep_gb12345, + Qrep_jis_x0208_1983, + Qrep_ks_x1001, + Qrep_jis_x0212, + Qrep_cns11643_1, + Qrep_cns11643_2, #ifdef UTF2000 Qsystem_char_id, - Qmap_ucs, Qucs, + Qrep_ucs, Qucs, Qucs_bmp, Qucs_smp, Qucs_sip, @@ -406,9 +406,9 @@ Lisp_Object Qascii, Qlatin_viscii_upper, Qvietnamese_viscii_lower, Qvietnamese_viscii_upper, - Qmap_jis_x0208, - Qmap_jis_x0208_1990, - Qmap_big5, + Qrep_jis_x0208, + Qrep_jis_x0208_1990, + Qrep_big5, Qethiopic_ucs, #endif Qchinese_big5_1, @@ -3073,17 +3073,17 @@ syms_of_mule_charset (void) defsymbol (&Qlatin_jisx0201, "latin-jisx0201"); defsymbol (&Qcyrillic_iso8859_5, "cyrillic-iso8859-5"); defsymbol (&Qlatin_iso8859_9, "latin-iso8859-9"); - defsymbol (&Qmap_jis_x0208_1978, "=jis-x0208@1978"); - defsymbol (&Qmap_gb2312, "=gb2312"); - defsymbol (&Qmap_gb12345, "=gb12345"); - defsymbol (&Qmap_jis_x0208_1983, "=jis-x0208@1983"); - defsymbol (&Qmap_ks_x1001, "=ks-x1001"); - defsymbol (&Qmap_jis_x0212, "=jis-x0212"); - defsymbol (&Qmap_cns11643_1, "=cns11643-1"); - defsymbol (&Qmap_cns11643_2, "=cns11643-2"); + defsymbol (&Qrep_jis_x0208_1978, "=jis-x0208@1978"); + defsymbol (&Qrep_gb2312, "=gb2312"); + defsymbol (&Qrep_gb12345, "=gb12345"); + defsymbol (&Qrep_jis_x0208_1983, "=jis-x0208@1983"); + defsymbol (&Qrep_ks_x1001, "=ks-x1001"); + defsymbol (&Qrep_jis_x0212, "=jis-x0212"); + defsymbol (&Qrep_cns11643_1, "=cns11643-1"); + defsymbol (&Qrep_cns11643_2, "=cns11643-2"); #ifdef UTF2000 defsymbol (&Qsystem_char_id, "system-char-id"); - defsymbol (&Qmap_ucs, "=ucs"); + defsymbol (&Qrep_ucs, "=ucs"); defsymbol (&Qucs, "ucs"); defsymbol (&Qucs_bmp, "ucs-bmp"); defsymbol (&Qucs_smp, "ucs-smp"); @@ -3094,9 +3094,9 @@ syms_of_mule_charset (void) defsymbol (&Qlatin_viscii_upper, "latin-viscii-upper"); defsymbol (&Qvietnamese_viscii_lower, "vietnamese-viscii-lower"); defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper"); - defsymbol (&Qmap_jis_x0208, "=jis-x0208"); - defsymbol (&Qmap_jis_x0208_1990, "=jis-x0208@1990"); - defsymbol (&Qmap_big5, "=big5"); + defsymbol (&Qrep_jis_x0208, "=jis-x0208"); + defsymbol (&Qrep_jis_x0208_1990, "=jis-x0208@1990"); + defsymbol (&Qrep_big5, "=big5"); defsymbol (&Qethiopic_ucs, "ethiopic-ucs"); #endif defsymbol (&Qchinese_big5_1, "chinese-big5-1"); @@ -3189,7 +3189,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_ucs); Vcharset_ucs = - make_charset (LEADING_BYTE_UCS, Qmap_ucs, 256, 4, + make_charset (LEADING_BYTE_UCS, Qrep_ucs, 256, 4, 1, 2, 0, CHARSET_LEFT_TO_RIGHT, build_string ("UCS"), build_string ("UCS"), @@ -3367,7 +3367,7 @@ complex_vars_of_mule_charset (void) staticpro (&Vcharset_jis_x0208); Vcharset_jis_x0208 = make_charset (LEADING_BYTE_JIS_X0208, - Qmap_jis_x0208, 94, 2, + Qrep_jis_x0208, 94, 2, 2, 0, 'B', CHARSET_LEFT_TO_RIGHT, build_string ("JIS X0208"), build_string ("JIS X0208 Common"), @@ -3381,7 +3381,7 @@ complex_vars_of_mule_charset (void) staticpro (&Vcharset_japanese_jisx0208_1978); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, - Qmap_jis_x0208_1978, 94, 2, + Qrep_jis_x0208_1978, 94, 2, 2, 0, '@', CHARSET_LEFT_TO_RIGHT, build_string ("JIS X0208:1978"), build_string ("JIS X0208:1978 (Japanese)"), @@ -3397,7 +3397,7 @@ complex_vars_of_mule_charset (void) CONVERSION_IDENTICAL); staticpro (&Vcharset_chinese_gb2312); Vcharset_chinese_gb2312 = - make_charset (LEADING_BYTE_CHINESE_GB2312, Qmap_gb2312, 94, 2, + make_charset (LEADING_BYTE_CHINESE_GB2312, Qrep_gb2312, 94, 2, 2, 0, 'A', CHARSET_LEFT_TO_RIGHT, build_string ("GB2312"), build_string ("GB2312)"), @@ -3406,7 +3406,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_chinese_gb12345); Vcharset_chinese_gb12345 = - make_charset (LEADING_BYTE_CHINESE_GB12345, Qmap_gb12345, 94, 2, + make_charset (LEADING_BYTE_CHINESE_GB12345, Qrep_gb12345, 94, 2, 2, 0, 0, CHARSET_LEFT_TO_RIGHT, build_string ("G1"), build_string ("GB 12345)"), @@ -3415,7 +3415,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_japanese_jisx0208); Vcharset_japanese_jisx0208 = - make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qmap_jis_x0208_1983, 94, 2, + make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qrep_jis_x0208_1983, 94, 2, 2, 0, 'B', CHARSET_LEFT_TO_RIGHT, build_string ("JISX0208"), build_string ("JIS X0208:1983 (Japanese)"), @@ -3432,7 +3432,7 @@ complex_vars_of_mule_charset (void) staticpro (&Vcharset_japanese_jisx0208_1990); Vcharset_japanese_jisx0208_1990 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1990, - Qmap_jis_x0208_1990, 94, 2, + Qrep_jis_x0208_1990, 94, 2, 2, 0, 0, CHARSET_LEFT_TO_RIGHT, build_string ("JISX0208-1990"), build_string ("JIS X0208:1990 (Japanese)"), @@ -3447,7 +3447,7 @@ complex_vars_of_mule_charset (void) #endif staticpro (&Vcharset_korean_ksc5601); Vcharset_korean_ksc5601 = - make_charset (LEADING_BYTE_KOREAN_KSC5601, Qmap_ks_x1001, 94, 2, + make_charset (LEADING_BYTE_KOREAN_KSC5601, Qrep_ks_x1001, 94, 2, 2, 0, 'C', CHARSET_LEFT_TO_RIGHT, build_string ("KSC5601"), build_string ("KSC5601 (Korean"), @@ -3456,7 +3456,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_japanese_jisx0212); Vcharset_japanese_jisx0212 = - make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qmap_jis_x0212, 94, 2, + make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qrep_jis_x0212, 94, 2, 2, 0, 'D', CHARSET_LEFT_TO_RIGHT, build_string ("JISX0212"), build_string ("JISX0212 (Japanese)"), @@ -3467,7 +3467,7 @@ complex_vars_of_mule_charset (void) #define CHINESE_CNS_PLANE_RE(n) "cns11643[.-]\\(.*[.-]\\)?" n "$" staticpro (&Vcharset_chinese_cns11643_1); Vcharset_chinese_cns11643_1 = - make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qmap_cns11643_1, 94, 2, + make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qrep_cns11643_1, 94, 2, 2, 0, 'G', CHARSET_LEFT_TO_RIGHT, build_string ("CNS11643-1"), build_string ("CNS11643-1 (Chinese traditional)"), @@ -3477,7 +3477,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_chinese_cns11643_2); Vcharset_chinese_cns11643_2 = - make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qmap_cns11643_2, 94, 2, + make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qrep_cns11643_2, 94, 2, 2, 0, 'H', CHARSET_LEFT_TO_RIGHT, build_string ("CNS11643-2"), build_string ("CNS11643-2 (Chinese traditional)"), @@ -3524,7 +3524,7 @@ complex_vars_of_mule_charset (void) Qnil, 0, 0, 0, 0, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_chinese_big5); Vcharset_chinese_big5 = - make_charset (LEADING_BYTE_CHINESE_BIG5, Qmap_big5, 256, 2, + make_charset (LEADING_BYTE_CHINESE_BIG5, Qrep_big5, 256, 2, 2, 2, 0, CHARSET_LEFT_TO_RIGHT, build_string ("Big5"), build_string ("Big5"), -- 1.7.10.4