From 7a83e52f0a69b975fc564047d8a2bcdea6ad857d Mon Sep 17 00:00:00 2001 From: tomo Date: Thu, 26 Mar 2009 11:19:53 +0000 Subject: [PATCH] Sync up with r21-4-21-chise-0_24-10. --- lisp/utf-2000/ChangeLog | 91 +++++++++++ lisp/utf-2000/Ideograph-R012-Eight.el | 117 +++++++++----- lisp/utf-2000/Ideograph-R029-Again.el | 72 +++++++-- lisp/utf-2000/Ideograph-R030-Mouth.el | 19 --- lisp/utf-2000/Ideograph-R042-Small.el | 21 +++ lisp/utf-2000/Ideograph-R058-Snout.el | 88 ++++++++--- lisp/utf-2000/Ideograph-R086-Fire.el | 40 +++-- lisp/utf-2000/Ideograph-R129-Brush.el | 15 ++ lisp/utf-2000/Ideograph-R130-Meat.el | 64 +++++++- lisp/utf-2000/Ideograph-R134-Mortar.el | 246 +++++++++++++++++++++++------- lisp/utf-2000/Ideograph-R193-Cauldron.el | 121 ++++++++++++--- lisp/utf-2000/maps-conf.el | 3 +- lisp/utf-2000/ruimoku6.el | 54 ++++++- src/ChangeLog | 5 + src/mule-charset.c | 5 +- 15 files changed, 768 insertions(+), 193 deletions(-) diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index baedec6..db24f9e 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,94 @@ +2009-03-24 MORIOKA Tomohiko + + * Ideograph-R012-Eight.el (U-0002053A): Use `->denotational'. + (U+34B9): Use `->denotational' and `->subsumptive'. + (U-0002053B): Use `->denotational'; integrate M-30276. + +2009-03-17 MORIOKA Tomohiko + + * Ideograph-R134-Mortar.el (U-000269B1): Use `->subsumptive'. + (U-000269B2): Use `->denotational' and `->subsumptive'; add + `sound@ja/on/s={company|roll}'. + (U-000269B6): Use `->subsumptive'. + (U-000269B9): Use `->subsumptive'. + (RUI6-E017): New character. + (U-000269BA): Use `->subsumptive'. + (U-000269BC): Use `->subsumptive'. + (U-000269BD): Use `->subsumptive'. + (U-000269BE): Use `->subsumptive'. + (U-000269BF): Use `->subsumptive'. + (U-000269C1): Use `->denotational' and `->subsumptive'. + (U-000269C2): Use `->subsumptive'. + (U-000269C4): Use `->subsumptive'. + (U-000269C5): Use `->denotational'. + (U-0002053B): New character [copied from Ideograph-R012-Eight.el]; + integrate M-30276. + +2009-03-13 MORIOKA Tomohiko + + * Ideograph-R193-Cauldron.el (U-00029C2B): Use `->denotational' + and `->subsumptive'. + (U-00029C2C): Add `sound@ja/on/p={guo|wai1}'; use `->denotational' + instead of `->subsumptive'. + (U+4C19): Use `->denotational' and `->subsumptive'. + +2009-03-11 MORIOKA Tomohiko + + * Ideograph-R058-Snout.el (U+38C8): Add `sound@ja/on'; use + `->subsumptive'; integrate GT-12554 and H3-C1EC. + (U-0002246F): Use `->subsumptive'. + (U+5F5B): Use `->denotational' and `->subsumptive'. + (U+5F5C): Use `=>daikanwa' instead of `morohashi-daikanwa'; use + `->subsumptive'. + +2009-03-09 MORIOKA Tomohiko + + * maps-conf.el: Don't add `=gt-pj-1' for J90-5734. + +2009-03-06 MORIOKA Tomohiko + + * Ideograph-R130-Meat.el (GT-K02391): New character. + (BC-8C4F): New character. + (U+43CE): Use `->denotational' and `->subsumptive'; add + `sound@ja/on/{kan|go}/s=breast' and `sound@ja/on/go/s=scratch'. + + * Ideograph-R029-Again.el (BC-8C4E): New character. + (M-03207): Unify U-00020B80 and H1-F8A5. + (M-03208): Map to U-00021A9E. + (U-00020B7E): Use `->subsumptive'. + (U-00020B87): Use `->subsumptive'. + + * Ideograph-R086-Fire.el (RUI6-E018): New character. + (U-000244A1): Use `->subsumptive'. + +2009-03-03 MORIOKA Tomohiko + + * ruimoku6.el (RUI6-E00A): Use `=ucs@iso' instead of + `=ucs@unicode' for IU-00029C2C. + (RUI6-E017): Add `ideographic-{radical|strokes}' and + `total-strokes'; add `ideographic-structure'. + (RUI6-E018): Likewise; add `<-unknown' for U+8C73 and U+71F9. + (RUI6-E019): Add `ideographic-{radical|strokes}' and + `total-strokes'; add `ideographic-structure'. + + * Ideograph-R042-Small.el (GT-K02290): New character. + +2009-02-28 MORIOKA Tomohiko + + * Ideograph-R129-Brush.el (RUI6-E019): New character. + +2009-02-27 MORIOKA Tomohiko + + * Ideograph-R030-Mouth.el (U+540F): Fix typo. + (J0-3862): Omit `ideographic-structure'. + +2009-02-21 MORIOKA Tomohiko + + * Ideograph-R066-Rap.el (U+6586): Use `->subsumptive'. + + * Ideograph-R032-Earth.el (U+5789): Use `->denotational' instead + of `->subsumptive'. + 2009-02-19 MORIOKA Tomohiko * Ideograph-R163-City.el (JX1-7C67): Unify JC3-68A6. diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el index b127a69..6667fc9 100644 --- a/lisp/utf-2000/Ideograph-R012-Eight.el +++ b/lisp/utf-2000/Ideograph-R012-Eight.el @@ -1596,7 +1596,18 @@ (=ucs . #x2053A) ; 𠔺 )) (define-char - '((=>ucs . #x2053A) ; 𠔺 + '((<-denotational + ((=ucs . #x2053A) ; 𠔺 + )) + (ideographic-radical . 12) ; ⼋ + (ideographic-strokes . 17) + (total-strokes . 19) + (=ucs@iso . #x2053A) ; &U-0002053A; + )) +(define-char + '((<-denotational + ((=ucs . #x2053A) ; 𠔺 + )) (ideographic-radical . 12) ; ⼋ (ideographic-strokes . 17) (total-strokes . 19) @@ -1604,28 +1615,15 @@ (=hanziku-12 . #xEBA3) ; &HZK12-EBA3; )) (define-char - '((=>ucs . #x34B9) ; 㒹 - (ideographic-radical . 12) ; ⼋ + '((ideographic-radical . 12) ; ⼋ (ideographic-strokes . 18) (total-strokes . 20) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=jis-x0208 . #x3F3F) ; >-29752; [31-31] - (=jis-x0213-1 . #x3F3F) ; &I-JX1-3F3F; [31-31] - (=daikanwa . 23236) ; &I-M-23236; - ) - ((=jis-x0208 . #x3F3F) ; >-29752; [31-31] - (=jis-x0213-1 . #x3F3F) ; &I-JX1-3F3F; [31-31] - (=daikanwa . 23236) ; &I-M-23236; - )) - (=daikanwa . 01504) ; &M-01504; - (mojikyo . 001504) ; &MCS-600005E0; + (=ucs . #x34B9) ; 㒹 )) (define-char - '((=>ucs . #x34B9) ; 㒹 - (morohashi-daikanwa 1504 0 0) + '((<-denotational + ((=ucs . #x34B9) ; 㒹 + )) (ideographic-radical . 12) ; ⼋ (ideographic-strokes . 18) (total-strokes . 20) @@ -1637,10 +1635,16 @@ ) ((=cns11643-6 . #x3A2D) ; &C6-3A2D; [26-13] )) - (=cns11643-7 . #x4D3D) ; &C7-4D3D; [45-29] + (=cns11643-7 . #x4D3D) ; >-01973; [45-29] + (=gt . 01973) ; &I-GT-01973; + (=gt-pj-2 . #x3D26) ; &I-GT-01973; [29-06] + (=daikanwa . 01504) ; &I-M-01504; + (mojikyo . 001504) ; &MCS-600005E0; )) (define-char - '((morohashi-daikanwa 1504 0 1) + '((<-denotational + ((=ucs . #x34B9) ; 㒹 + )) (ideographic-radical . 12) ; ⼋ (ideographic-strokes . 18) (total-strokes . 20) @@ -1649,34 +1653,69 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) - ((=ucs . #x771F) ; 真 + ((=gb2312 . #x5566) ; &C1-5678; [53-70] + (=cns11643-1 . #x5678) ; &I-C1-5678; [54-88] ) - ((=ucs . #x771F) ; 真 + ((=gb2312 . #x5566) ; &C1-5678; [53-70] + (=cns11643-1 . #x5678) ; &I-C1-5678; [54-88] )) - (=ucs . #x34B9) ; 㒹 - (=hanziku-1 . #xDAA1) ; &I-HZK01-DAA1; + (=hanziku-1 . #xDAA1) ; &HZK01-DAA1; + (=ucs@unicode . #x34B9) ; &HZK01-DAA1; )) (define-char - '((ideographic-radical . 12) ; ⼋ + '((<-denotational + ((=ucs . #x34B9) ; 㒹 + )) + (ideographic-radical . 12) ; ⼋ (ideographic-strokes . 18) (total-strokes . 20) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs@unicode . #x771E) ; &UU+771E; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs@unicode . #x771E) ; &UU+771E; + ) + ((=ucs@unicode . #x771E) ; &UU+771E; + )) + (=daikanwa . 01505) ; &M-01505; + (=cbeta . 04138) ; &I-CB04138; ) - ((=ucs@unicode . #x771E) ; &UU+771E; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=cns11643-3 . #x3759) ; &C3-3759; [23-57] + ) + ((=cns11643-3 . #x3759) ; &C3-3759; [23-57] + )) + (=cns11643-7 . #x4D3E) ; &C7-4D3E; [45-30] )) - (=cns11643-7 . #x4D3E) ; &M-01505; [45-30] - (=daikanwa . 01505) ; &I-M-01505; - (=cbeta . 04138) ; &I-CB04138; )) (define-char - '((ideographic-radical . 12) ; ⼋ - (ideographic-strokes . 62) + '((ideographic-radical@ucs . 12) ; ⼋ + (ideographic-radical@daikanwa . 134) ; ⾅ + (=ucs . #x2053B) ; 𠔻 + )) +(define-char + '((<-denotational + ((=ucs . #x2053B) ; 𠔻 + )) + (ideographic-radical@ucs . 12) ; ⼋ + (ideographic-strokes@ucs . 62) + (ideographic-radical@daikanwa . 134) ; ⾅ + (ideographic-strokes@daikanwa . 57) (total-strokes . 64) + (=daikanwa . 30276) ; &M-30276; + (=ucs@iso . #x2053B) ; &M-30276; + )) +(define-char + '((<-denotational + ((=ucs . #x2053B) ; 𠔻 + )) + (ideographic-radical . 12) ; ⼋ + (ideographic-strokes . 58) + (total-strokes . 60) (hanyu-dazidian 1 254 12) - (=ucs . #x2053B) ; 𠔻 - (=hanziku-1 . #xDAA7) ; &I-HZK01-DAA7; + (=hanziku-1 . #xDAA7) ; &HZK01-DAA7; )) diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index 1c75ed4..3011445 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -41,6 +41,16 @@ )) )) (define-char + '((=>ucs . #x53C8) ; 又 + (ideographic-radical . 29) ; ⼜ + (ideographic-strokes . 0) + (total-strokes . 2) + (=big5-cdp . #x8C4E) ; &CDP-8C4E; + (<-formed@component/connect-left + ((=ucs . #x53C8) ; 又 + )) + )) +(define-char '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 1) (total-strokes . 3) @@ -2258,23 +2268,45 @@ '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 12) (total-strokes . 14) - (=daikanwa . 03207) ; &M-03207; + (hanyu-dazidian 1 401 16) + (=ucs . #x20B80) ; 𠮀 + (=daikanwa . 03207) ; &I-M-03207; + (=hanziku-1 . #xF8A5) ; &I-HZK01-F8A5; )) (define-char '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 12) (total-strokes . 14) - (=daikanwa . 03208) ; &M-03208; + (=ucs . #x21A9E) ; 𡪞 + (->subsumptive + ((=daikanwa . 03208) ; &M-03208; + ) + ((=ucs@iso . #x21A9E) ; &U-00021A9E; + )) )) (define-char '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 12) (total-strokes . 14) - (hanyu-dazidian 1 401 14) (=ucs . #x20B7E) ; 𠭾 - (=cns11643-6 . #x5B3D) ; &I-C6-5B3D; [59-29] - (=daikanwa . 03209) ; &I-M-03209; - (=hanziku-1 . #xF8A3) ; &I-HZK01-F8A3; + (->subsumptive + ((=daikanwa . 03209) ; &M-03209; + (<-ancient + ((=daikanwa . 09946) ; &M-09946; + )) + (<-ancient*sources + shuowen daikanwa) + (<-ancient@jiyun + ((=daikanwa . 09946) ; &M-09946; + )) + ) + ((hanyu-dazidian 1 401 14) + (=hanziku-1 . #xF8A3) ; &HZK01-F8A3; + ) + ((=ucs@iso . #x20B7E) ; &U-00020B7E; + ) + ((=cns11643-6 . #x5B3D) ; &C6-5B3D; [59-29] + )) )) (define-char '((ideographic-radical . 29) ; ⼜ @@ -2426,11 +2458,25 @@ '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 14) (total-strokes . 16) - (hanyu-dazidian 1 402 6) (=ucs . #x20B87) ; 𠮇 - (=cns11643-7 . #x2C55) ; &I-C7-2C55; [12-53] - (=daikanwa . 03216) ; &I-M-03216; - (=hanziku-1 . #xF8BB) ; &I-HZK01-F8BB; + (->subsumptive + ((=daikanwa . 03216) ; &M-03216; + (<-ancient + ((=daikanwa . 09946) ; &M-09946; + )) + (<-ancient*sources + kangxi daikanwa) + (<-ancient@kangxi + ((=daikanwa . 09946) ; &M-09946; + )) + ) + ((=ucs@iso . #x20B87) ; &U-00020B87; + ) + ((hanyu-dazidian 1 402 6) + (=hanziku-1 . #xF8BB) ; &HZK01-F8BB; + ) + ((=cns11643-7 . #x2C55) ; &C7-2C55; [12-53] + )) )) (define-char '((ideographic-radical . 29) ; ⼜ @@ -2668,12 +2714,6 @@ )) (define-char '((ideographic-radical . 29) ; ⼜ - (hanyu-dazidian 1 401 16) - (=ucs . #x20B80) ; 𠮀 - (=hanziku-1 . #xF8A5) ; &I-HZK01-F8A5; - )) -(define-char - '((ideographic-radical . 29) ; ⼜ (hanyu-dazidian 1 402 9) (=ucs . #x20B8C) ; 𠮌 (=hanziku-1 . #xF8BE) ; &I-HZK01-F8BE; diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index a1909e0..1b053be 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -1630,8 +1630,6 @@ (total-strokes . 6) (hanyu-dazidian 1 18 3) (=ucs . #x540F) ; 吏 - (=jis-x0208 . #x4D79) ; &I-J90-4D79; [45-89] - (=jis-x0213-1 . #x4D79) ; &I-JX1-4D79; [45-89] (=big5 . #xA64F) ; &I-B-A64F; (->subsumptive ((=jis-x0208@1978 . #x4D79) ; &M-03299; [45-89] @@ -3196,23 +3194,6 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") - (=ucs . #x2FF3) ; ⿳ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") - (=ucs . #x2FFA) ; ⿺ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=big5-cdp . #x89F5) ; &CDP-89F5; - )) - ) - ((=ucs . #x4E00) ; 一 - ) - ((=ucs . #x516B) ; 八 - )) (=jis-x0208 . #x3862) ; >-04233; [24-66] (=jis-x0213-1 . #x3862) ; &I-JX1-3862; [24-66] (=gt . 04233) ; &I-GT-04233; diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el index 1d7602e..78cf71b 100644 --- a/lisp/utf-2000/Ideograph-R042-Small.el +++ b/lisp/utf-2000/Ideograph-R042-Small.el @@ -274,6 +274,27 @@ )) (define-char '((ideographic-radical . 42) ; ⼩ + (ideographic-strokes . 3) + (total-strokes . 6) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((name . "CJK RADICAL SMALL TWO") + (=ucs . #x2E8D) ; ⺍ + ) + ((=ucs . #x4E00) ; 一 + ) + ((=ucs . #x516B) ; 八 + )) + (=gt-k . 02290) ; >-K02290; + (=gt-pj-k1 . #x3226) ; >-K02290; [18-06] + (<-simplified@component/connect-below + ((=ucs . #x8207) ; 與 + )) + )) +(define-char + '((ideographic-radical . 42) ; ⼩ (ideographic-strokes . 4) (total-strokes . 7) (=ucs . #x21B5D) ; 𡭝 diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el index 09cd1ac..bb297ae 100644 --- a/lisp/utf-2000/Ideograph-R058-Snout.el +++ b/lisp/utf-2000/Ideograph-R058-Snout.el @@ -649,47 +649,97 @@ '((ideographic-radical . 58) ; ⼹ (ideographic-strokes . 13) (total-strokes . 16) + (sound@ja/on "si" "i") (=ucs . #x38C8) ; 㣈 - (=cns11643-4 . #x5031) ; &I-C4-5031; [48-17] - (=daikanwa . 09946) ; &I-M-09946; + (->subsumptive + ((=daikanwa . 09946) ; &M-09946; + (->ancient@jiyun + ((=daikanwa . 03209) ; &M-03209; + )) + (->ancient@jiyun*sources + jiyun daikanwa) + (->ancient@kangxi + ((=daikanwa . 03216) ; &M-03216; + )) + (->ancient@kangxi*sources + kangxi daikanwa) + ) + ((=cns11643-4 . #x5031) ; &C4-5031; [48-17] + ) + ((=gt . 12554) ; >-12554; + (=gt-pj-3 . #x4A40) ; >-12554; [42-32] + ) + ((=ucs@unicode . #x38C8) ; &UU+38C8; + ) + ((=hanziku-3 . #xC1EC) ; &HZK03-C1EC; + )) )) (define-char '((ideographic-radical . 58) ; ⼹ (ideographic-strokes . 13) (total-strokes . 16) (=ucs . #x2246F) ; 𢑯 - (=daikanwa . 09947) ; &I-M-09947; + (->subsumptive + ((=daikanwa . 09947) ; &M-09947; + (=ucs@iso . #x2246F) ; &M-09947; + ) + ((=cns11643-7 . #x2D61) ; &C7-2D61; [13-65] + )) + )) +(define-char + '((ideographic-radical . 58) ; ⼹ + (ideographic-strokes . 13) + (total-strokes . 16) + (=ucs . #x5F5B) ; 彛 )) (define-char - '((=>ucs . #x2246F) ; 𢑯 - (morohashi-daikanwa 9947 0 0) + '((<-denotational + ((=ucs . #x5F5B) ; 彛 + )) (ideographic-radical . 58) ; ⼹ (ideographic-strokes . 13) (total-strokes . 16) - (=cns11643-7 . #x2D61) ; &C7-2D61; [13-65] + (->subsumptive + ((=ks-x1001 . #x6C2D) ; &M-09948; [76-13] + (=jis-x0212 . #x3C7A) ; &I-JSP-3C7A; [28-90] + (=daikanwa . 09948) ; &I-M-09948; + (=cbeta . 01820) ; &I-CB01820; + (=ucs@jis . #x5F5B) ; &M-09948; + ) + ((=cns11643-3 . #x505E) ; &C3-505E; [48-62] + )) )) (define-char - '((ideographic-radical . 58) ; ⼹ + '((<-denotational + ((=ucs . #x5F5B) ; 彛 + )) + (ideographic-radical . 58) ; ⼹ (ideographic-strokes . 13) (total-strokes . 16) - (=ucs . #x5F5B) ; 彛 - (=ks-x1001 . #x6C2D) ; &I-K0-6C2D; [76-13] - (=jis-x0212 . #x3C7A) ; &I-JSP-3C7A; [28-90] - (=cns11643-3 . #x505E) ; &I-C3-505E; [48-62] - (=daikanwa . 09948) ; &I-M-09948; - (=cbeta . 01820) ; &I-CB01820; + (=ucs@unicode . #x5F5B) ; &UU+5F5B; )) (define-char - '((morohashi-daikanwa 9948 0 5) + '((=>daikanwa . 09948) ; &M-09948; (ideographic-radical . 58) ; ⼹ (ideographic-strokes . 13) (total-strokes . 16) (=ucs . #x5F5C) ; 彜 - (=jis-x0208 . #x5734) ; &I-J90-5734; [55-20] - (=jis-x0213-1 . #x5734) ; &I-JX1-5734; [55-20] - (=gt . 12550) ; &I-GT-12550; - (=gt-pj-1 . #x5734) ; &I-GT-12550; [55-20] - (=cbeta . 02362) ; &I-CB02362; + (->subsumptive + ((=jis-x0208 . #x5734) ; &CB02362; [55-20] + (=jis-x0213-1 . #x5734) ; &I-JX1-5734; [55-20] + (=cbeta . 02362) ; &I-CB02362; + (=ucs@jis . #x5F5C) ; &CB02362; + (<-formed + ((=ks-x1001 . #x6C2D) ; &M-09948; [76-13] + (=jis-x0212 . #x3C7A) ; &I-JSP-3C7A; [28-90] + (=daikanwa . 09948) ; &I-M-09948; + )) + ) + ((=gt . 12550) ; >-12550; + (=gt-pj-1 . #x5734) ; >-12550; [55-20] + ) + ((=ucs@unicode . #x5F5C) ; &UU+5F5C; + )) )) (define-char '((ideographic-radical . 58) ; ⼹ diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 15e8d3c..28e4250 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -14397,20 +14397,40 @@ )) (define-char '((ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 17) - (total-strokes . 21) - (hanyu-dazidian 3 2248 11) - (=ucs . #x244A1) ; 𤒡 - (=daikanwa . 19598) ; &I-M-19598; - (=hanziku-6 . #xD158) ; &I-HZK06-D158; + (ideographic-strokes . 16) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x38C8) ; 㣈 + ) + ((=cns11643-1 . #x4556) ; &C1-4556; [37-54] + )) + (sources bos=A2003-10320-00001 bos=A2003-10320-00002 + bos=A2003-10320-00004 bos=A2003-10620-00005 + bos=A2003-10693-00007 bos=A2003-11142-00007) + (=ruimoku-v6 . #xE018) ; &RUI6-E018; + (<-unknown + ((=ucs . #x8C73) ; 豳 + ) + ((=ucs . #x71F9) ; 燹 + )) )) (define-char - '((=>ucs . #x244A1) ; 𤒡 - (morohashi-daikanwa 19598 0 0) - (ideographic-radical . 86) ; ⽕ + '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 17) (total-strokes . 21) - (=cns11643-7 . #x5364) ; &C7-5364; [51-68] + (=ucs . #x244A1) ; 𤒡 + (->subsumptive + ((=daikanwa . 19598) ; &M-19598; + ) + ((hanyu-dazidian 3 2248 11) + (=hanziku-6 . #xD158) ; &HZK06-D158; + (=ucs@iso . #x244A1) ; &HZK06-D158; + ) + ((=cns11643-7 . #x5364) ; &C7-5364; [51-68] + )) )) (define-char '((ideographic-radical . 86) ; ⽕ diff --git a/lisp/utf-2000/Ideograph-R129-Brush.el b/lisp/utf-2000/Ideograph-R129-Brush.el index dd8ba90..9be8164 100644 --- a/lisp/utf-2000/Ideograph-R129-Brush.el +++ b/lisp/utf-2000/Ideograph-R129-Brush.el @@ -329,6 +329,21 @@ )) (define-char '((ideographic-radical . 129) ; ⾀ + (ideographic-strokes . 8) + (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x38C7) ; 㣇 + ) + ((=ucs . #x807F) ; 聿 + )) + (sources bos=A021708-00010) + (=ruimoku-v6 . #xE019) ; &RUI6-E019; + )) +(define-char + '((ideographic-radical . 129) ; ⾀ (ideographic-strokes . 9) (total-strokes . 15) (=ucs . #x26620) ; 𦘠 diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index e436e21..2a742e2 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -369,27 +369,77 @@ )) (define-char '((ideographic-radical . 130) ; ⾁ + (ideographic-strokes . 2) + (total-strokes . 8) + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00758) ; >-K00758; + ) + ((=big5-cdp . #x8C4E) ; &CDP-8C4E; + )) + (=gt-k . 02391) ; >-K02391; + (=gt-pj-k1 . #x392A) ; >-K02391; [25-10] + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=big5-cdp . #x88F0) ; &CDP-88F0; + ) + ((=big5-cdp . #x8C4E) ; &CDP-8C4E; + )) + (=big5-cdp . #x8C4F) ; &CDP-8C4F; + )) + )) +(define-char + '((ideographic-radical . 130) ; ⾁ (ideographic-strokes . 3) (total-strokes . 7) + (sound@ja/on/go/s=breast "bu") + (sound@ja/on/go/s=scratch "gWaN") + (sound@ja/on/kan/s=breast "huu") (=ucs . #x43CE) ; 䏎 + )) +(define-char + '((<-denotational + ((=ucs . #x43CE) ; 䏎 + )) + (ideographic-radical . 130) ; ⾁ + (ideographic-strokes . 3) + (total-strokes . 7) + (=gt . 37898) ; >-37898; + (=gt-pj-6 . #x3929) ; >-37898; [25-09] (=daikanwa . 29253) ; &I-M-29253; + (<-original@s=scratch + ((=daikanwa . 29256) ; &M-29256; + )) + (<-original@s=scratch*sources + zhengzitong daikanwa) )) (define-char - '((=>ucs . #x43CE) ; 䏎 - (morohashi-daikanwa 29253 0 1) + '((<-denotational + ((=ucs . #x43CE) ; 䏎 + )) (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 3) (total-strokes . 7) - (=cns11643-4 . #x246F) ; &C4-246F; [04-79] + (->subsumptive + ((=ucs@unicode . #x43CE) ; &UU+43CE; + ) + ((=cns11643-4 . #x246F) ; &C4-246F; [04-79] + )) )) (define-char '((ideographic-radical . 130) ; ⾁ (ideographic-strokes . 3) (total-strokes . 7) (=ucs . #x8090) ; 肐 + (=big5 . #xCB76) ; &I-B-CB76; (->subsumptive - ((=big5 . #xCB76) ; &M-29254; - (=daikanwa . 29254) ; &I-M-29254; + ((=daikanwa . 29254) ; &M-29254; (=ucs@unicode . #x8090) ; &M-29254; ) ((=cns11643-2 . #x2476) ; &C2-2476; [04-86] @@ -428,9 +478,9 @@ (ideographic-strokes . 3) (total-strokes . 7) (=ucs . #x8092) ; 肒 + (=big5 . #xCB77) ; &I-B-CB77; (->subsumptive - ((=big5 . #xCB77) ; &M-29256; - (=daikanwa . 29256) ; &I-M-29256; + ((=daikanwa . 29256) ; &M-29256; (=ucs@unicode . #x8092) ; &M-29256; ) ((=cns11643-2 . #x2477) ; &C2-2477; [04-87] diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el index af50437..c4adb6b 100644 --- a/lisp/utf-2000/Ideograph-R134-Mortar.el +++ b/lisp/utf-2000/Ideograph-R134-Mortar.el @@ -1563,8 +1563,13 @@ (ideographic-strokes . 14) (total-strokes . 20) (=ucs . #x269B1) ; 𦦱 - (=cns11643-7 . #x4F41) ; &I-C7-4F41; [47-33] - (=daikanwa . 30262) ; &I-M-30262; + (->subsumptive + ((=daikanwa . 30262) ; &M-30262; + ) + ((=ucs@iso . #x269B1) ; &U-000269B1; + ) + ((=cns11643-7 . #x4F41) ; &C7-4F41; [47-33] + )) )) (define-char '((=>ucs . #x269B1) ; 𦦱 @@ -1578,13 +1583,36 @@ '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 14) (total-strokes . 20) + (sound@ja/on/s=company "yo") + (sound@ja/on/s=roll "u") (=ucs . #x269B2) ; 𦦲 - (=daikanwa . 30263) ; &I-M-30263; - (mojikyo . 030263) ; &MCS-60007637; )) (define-char - '((=>ucs . #x269B2) ; 𦦲 - (morohashi-daikanwa 30263 0 1) + '((<-denotational + ((=ucs . #x269B2) ; 𦦲 + )) + (ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 14) + (total-strokes . 20) + (->subsumptive + ((=daikanwa . 30263) ; &M-30263; + (mojikyo . 030263) ; &MCS-60007637; + (<-ancient@s=company + ((=jis-x0208 . #x6750) ; >-39084; [71-48] + (=ks-x1001 . #x6628) ; &I-K0-6628; [70-08] + (=jis-x0213-1 . #x6750) ; &I-JX1-6750; [71-48] + (=daikanwa . 30212) ; &I-M-30212; + )) + (<-ancient@s=company*sources + jiyun daikanwa) + ) + ((=ucs@iso . #x269B2) ; &U-000269B2; + )) + )) +(define-char + '((<-denotational + ((=ucs . #x269B2) ; 𦦲 + )) (ideographic-radical . 134) ; ⾅ (ideographic-strokes . 14) (total-strokes . 21) @@ -1595,24 +1623,77 @@ (ideographic-strokes . 15) (total-strokes . 22) (=ucs . #x269B6) ; 𦦶 - (=cns11643-7 . #x5866) ; &I-C7-5866; [56-70] - (=daikanwa . 30264) ; &I-M-30264; + (->subsumptive + ((=daikanwa . 30264) ; &M-30264; + ) + ((=gt . 39159) ; >-39159; + (=gt-pj-6 . #x4326) ; >-39159; [35-06] + ) + ((=cns11643-7 . #x5866) ; &C7-5866; [56-70] + ) + ((=ucs@iso . #x269B6) ; &U-000269B6; + )) )) (define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 16) (total-strokes . 22) (=ucs . #x269B9) ; 𦦹 - (=cns11643-7 . #x5867) ; &I-C7-5867; [56-71] - (=daikanwa . 30265) ; &I-M-30265; + (->subsumptive + ((=daikanwa . 30265) ; &M-30265; + (<-same + ((=jis-x0208 . #x6F58) ; &M-41088; [79-56] + (=ks-x1001 . #x733A) ; &I-K0-733A; [83-26] + (=jis-x0213-1 . #x6F58) ; &I-JX1-6F58; [79-56] + (=daikanwa . 41088) ; &I-M-41088; + )) + (<-same*sources + longkanshoujian daikanwa) + ) + ((=ucs@iso . #x269B9) ; &U-000269B9; + ) + ((=cns11643-7 . #x5867) ; &C7-5867; [56-71] + )) + )) +(define-char + '((ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 16) + (total-strokes . 23) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") + (=ucs . #x2FF6) ; ⿶ + ) + ((=big5-cdp . #x8B64) ; &CDP-8B64; + ) + ((=ucs . #x540C) ; 同 + )) + ) + ((=ucs . #x6614) ; 昔 + )) + (sound@ja/on "saku") + (sources bos=A021003-00010 bos=A2003-10164-00008) + (=ruimoku-v6 . #xE017) ; &RUI6-E017; )) (define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 17) (total-strokes . 23) (=ucs . #x269BA) ; 𦦺 - (=cns11643-7 . #x5C49) ; &I-C7-5C49; [60-41] - (=daikanwa . 30266) ; &I-M-30266; + (->subsumptive + ((=daikanwa . 30266) ; &M-30266; + (<-same + ((=daikanwa . 30270) ; &M-30270; + )) + (<-same*sources + jiyun daikanwa) + ) + ((=cns11643-7 . #x5C49) ; &C7-5C49; [60-41] + (=ucs@iso . #x269BA) ; &C7-5C49; + )) )) (define-char '((ideographic-radical . 134) ; ⾅ @@ -1622,19 +1703,17 @@ (=cns11643-5 . #x777E) ; &I-C5-777E; [87-94] )) (define-char - '((=>ucs . #x269BC) ; 𦦼 - (ideographic-radical . 134) ; ⾅ - (ideographic-strokes . 18) - (total-strokes . 25) - (=daikanwa . 30267) ; &M-30267; - )) -(define-char - '((morohashi-daikanwa 30267 0 0) - (ideographic-radical . 134) ; ⾅ + '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 18) (total-strokes . 25) (=ucs . #x269BC) ; 𦦼 - (=cns11643-7 . #x6137) ; &I-C7-6137; [65-23] + (->subsumptive + ((=daikanwa . 30267) ; &M-30267; + ) + ((=ucs@iso . #x269BC) ; &U-000269BC; + ) + ((=cns11643-7 . #x6137) ; &C7-6137; [65-23] + )) )) (define-char '((ideographic-radical@ucs . 86) ; ⽕ @@ -1655,79 +1734,132 @@ )) )) (define-char - '((=>ucs . #x269BD) ; 𦦽 - (ideographic-radical . 134) ; ⾅ - (ideographic-strokes . 19) - (total-strokes . 25) - (=daikanwa . 30269) ; &M-30269; - )) -(define-char - '((morohashi-daikanwa 30269 0 0) - (ideographic-radical . 134) ; ⾅ + '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 19) (total-strokes . 25) (=ucs . #x269BD) ; 𦦽 - (=cns11643-5 . #x793D) ; &I-C5-793D; [89-29] + (->subsumptive + ((=daikanwa . 30269) ; &M-30269; + ) + ((=cns11643-5 . #x793D) ; &C5-793D; [89-29] + (=ucs@iso . #x269BD) ; &C5-793D; + )) )) (define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 19) (total-strokes . 25) (=ucs . #x269BE) ; 𦦾 - (=cns11643-5 . #x793F) ; &I-C5-793F; [89-31] - (=daikanwa . 30270) ; &I-M-30270; - )) -(define-char - '((=>ucs . #x269BF) ; 𦦿 - (ideographic-radical . 134) ; ⾅ - (ideographic-strokes . 19) - (total-strokes . 25) - (=daikanwa . 30271) ; &M-30271; + (->subsumptive + ((=daikanwa . 30270) ; &M-30270; + ) + ((=cns11643-5 . #x793F) ; &C5-793F; [89-31] + (=ucs@iso . #x269BE) ; &C5-793F; + )) )) (define-char - '((morohashi-daikanwa 30271 0 0) - (ideographic-radical . 134) ; ⾅ + '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 19) (total-strokes . 25) (=ucs . #x269BF) ; 𦦿 - (=cns11643-5 . #x793E) ; &I-C5-793E; [89-30] + (->subsumptive + ((=daikanwa . 30271) ; &M-30271; + ) + ((=ucs@iso . #x269BF) ; &U-000269BF; + ) + ((=cns11643-5 . #x793E) ; &C5-793E; [89-30] + )) )) (define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 22) (total-strokes . 29) (=ucs . #x269C1) ; 𦧁 - (=cns11643-7 . #x653E) ; &I-C7-653E; [69-30] - (=daikanwa . 30272) ; &I-M-30272; )) (define-char - '((ideographic-radical . 134) ; ⾅ + '((<-denotational + ((=ucs . #x269C1) ; 𦧁 + )) + (ideographic-radical . 134) ; ⾅ (ideographic-strokes . 22) (total-strokes . 29) - (=ucs . #x269C2) ; 𦧂 - (=daikanwa . 30273) ; &I-M-30273; + (->subsumptive + ((=daikanwa . 30272) ; &M-30272; + ) + ((=cns11643-7 . #x653E) ; &C7-653E; [69-30] + )) )) (define-char - '((=>ucs . #x269C2) ; 𦧂 - (morohashi-daikanwa 30273 0 0) + '((<-denotational + ((=ucs . #x269C1) ; 𦧁 + )) (ideographic-radical . 134) ; ⾅ (ideographic-strokes . 22) (total-strokes . 29) - (=cns11643-7 . #x653F) ; &C7-653F; [69-31] + (=ucs@iso . #x269C1) ; &U-000269C1; + )) +(define-char + '((ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 22) + (total-strokes . 29) + (=ucs . #x269C2) ; 𦧂 + (->subsumptive + ((=daikanwa . 30273) ; &M-30273; + (=ucs@iso . #x269C2) ; &M-30273; + ) + ((=cns11643-7 . #x653F) ; &C7-653F; [69-31] + )) )) (define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 37) (total-strokes . 43) (=ucs . #x269C4) ; 𦧄 - (=cns11643-7 . #x6653) ; &I-C7-6653; [70-51] - (=daikanwa . 30274) ; &I-M-30274; + (->subsumptive + ((=daikanwa . 30274) ; &M-30274; + ) + ((=cns11643-7 . #x6653) ; &C7-6653; [70-51] + ) + ((=ucs@iso . #x269C4) ; &U-000269C4; + )) )) (define-char '((ideographic-radical . 134) ; ⾅ + (=ucs . #x269C5) ; 𦧅 + )) +(define-char + '((<-denotational + ((=ucs . #x269C5) ; 𦧅 + )) + (ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 38) + (total-strokes . 45) + (=daikanwa . 30275) ; &M-30275; + )) +(define-char + '((<-denotational + ((=ucs . #x269C5) ; 𦧅 + )) + (ideographic-radical . 134) ; ⾅ (ideographic-strokes . 41) (total-strokes . 48) - (=ucs . #x269C5) ; 𦧅 - (=cns11643-5 . #x7C50) ; &I-C5-7C50; [92-48] - (=daikanwa . 30275) ; &I-M-30275; + (=cns11643-5 . #x7C50) ; &C5-7C50; [92-48] + (=ucs@iso . #x269C5) ; &C5-7C50; + )) +(define-char + '((ideographic-radical@ucs . 12) ; ⼋ + (ideographic-radical@daikanwa . 134) ; ⾅ + (=ucs . #x2053B) ; 𠔻 + )) +(define-char + '((<-denotational + ((=ucs . #x2053B) ; 𠔻 + )) + (ideographic-radical@ucs . 12) ; ⼋ + (ideographic-strokes@ucs . 62) + (ideographic-radical@daikanwa . 134) ; ⾅ + (ideographic-strokes@daikanwa . 57) + (total-strokes . 64) + (=daikanwa . 30276) ; &M-30276; + (=ucs@iso . #x2053B) ; &M-30276; )) diff --git a/lisp/utf-2000/Ideograph-R193-Cauldron.el b/lisp/utf-2000/Ideograph-R193-Cauldron.el index ade6597..113459e 100644 --- a/lisp/utf-2000/Ideograph-R193-Cauldron.el +++ b/lisp/utf-2000/Ideograph-R193-Cauldron.el @@ -36,52 +36,135 @@ (=ucs@unicode . #x9B32) ; &C1-586F; )) (define-char - '((=>ucs . #x29C2B) ; 𩰫 + '((ideographic-radical . 193) ; ⿀ + (ideographic-strokes . 3) + (total-strokes . 13) + (=ucs . #x29C2B) ; 𩰫 + )) +(define-char + '((<-denotational + ((=ucs . #x29C2B) ; 𩰫 + )) (ideographic-radical . 193) ; ⿀ (ideographic-strokes . 3) (total-strokes . 13) (=daikanwa . 45673) ; &M-45673; + (<-original + ((=jis-x0208 . #x4669) ; >-54586; [38-73] + (=ks-x1001 . #x4E27) ; &I-K0-4E27; [46-07] + (=cns11643-1 . #x7572) ; &I-C1-7572; [85-82] + (=jis-x0213-1 . #x4669) ; &I-JX1-4669; [38-73] + (=daikanwa . 40603) ; &I-M-40603; + )) + (<-original*sources + shuowen-zhu) + (<-same + ((=daikanwa . 45674) ; &M-45674; + ) + ((=jis-x0208 . #x4669) ; >-54586; [38-73] + (=ks-x1001 . #x4E27) ; &I-K0-4E27; [46-07] + (=cns11643-1 . #x7572) ; &I-C1-7572; [85-82] + (=jis-x0213-1 . #x4669) ; &I-JX1-4669; [38-73] + (=daikanwa . 40603) ; &I-M-40603; + )) + (<-same*sources + daikanwa) + (->formed + ((=daikanwa . 45674) ; &M-45674; + )) + (->formed*sources + jiyun) )) (define-char - '((morohashi-daikanwa 45673 0 2) + '((<-denotational + ((=ucs . #x29C2B) ; 𩰫 + )) (ideographic-radical . 193) ; ⿀ (ideographic-strokes . 3) (total-strokes . 13) - (=ucs . #x29C2B) ; 𩰫 - (=cns11643-4 . #x4224) ; &I-C4-4224; [34-04] + (->subsumptive + ((=ucs@iso . #x29C2B) ; &U-00029C2B; + ) + ((=cns11643-4 . #x4224) ; &C4-4224; [34-04] + )) )) (define-char - '((=>daikanwa . 45674) ; &M-45674; - (ideographic-radical . 193) ; ⿀ + '((ideographic-radical . 193) ; ⿀ (ideographic-strokes . 3) (total-strokes . 13) + (sound@ja/on/p=guo "kWa") + (sound@ja/on/p=wai1 "kWai") (=ucs . #x29C2C) ; 𩰬 + )) +(define-char + '((<-denotational + ((=ucs . #x29C2C) ; 𩰬 + )) + (ideographic-radical . 193) ; ⿀ + (ideographic-strokes . 3) + (total-strokes . 13) + (=daikanwa . 45674) ; &M-45674; + (<-formed + ((=daikanwa . 45673) ; &M-45673; + )) + (<-same@p=guo + ((=daikanwa . 45673) ; &M-45673; + )) + (<-same@p=guo*sources + jiyun daikanwa) + (<-same@p=wai1 + ((=jis-x0208 . #x5325) ; >-04428; [51-05] + (=cns11643-2 . #x294B) ; &I-C2-294B; [09-43] + (=jis-x0213-1 . #x5325) ; &I-JX1-5325; [51-05] + (=daikanwa . 03573) ; &I-M-03573; + )) + (<-same@p=wai1*sources + jiyun daikanwa) + )) +(define-char + '((<-denotational + ((=ucs . #x29C2C) ; 𩰬 + )) + (ideographic-radical . 193) ; ⿀ + (ideographic-strokes . 3) + (total-strokes . 13) (->subsumptive - ((=daikanwa . 45674) ; &M-45674; + ((sources bos=A016374-00004) + (=ruimoku-v6 . #xE00A) ; &RUI6-E00A; + (=ucs@iso . #x29C2C) ; &RUI6-E00A; ) - ((->subsumptive - ((sources bos=A016374-00004) - (=ruimoku-v6 . #xE00A) ; &RUI6-E00A; - (=ucs@unicode . #x29C2C) ; &RUI6-E00A; - ) - ((=cns11643-6 . #x5A4E) ; &C6-5A4E; [58-46] - )) + ((=cns11643-6 . #x5A4E) ; &C6-5A4E; [58-46] )) )) (define-char - '((=>ucs . #x4C19) ; 䰙 + '((ideographic-radical . 193) ; ⿀ + (ideographic-strokes . 4) + (total-strokes . 14) + (=ucs . #x4C19) ; 䰙 + )) +(define-char + '((<-denotational + ((=ucs . #x4C19) ; 䰙 + )) (ideographic-radical . 193) ; ⿀ (ideographic-strokes . 4) (total-strokes . 14) - (=daikanwa . 45675) ; &M-45675; + (->subsumptive + ((=daikanwa . 45675) ; &M-45675; + ) + ((=gt . 61443) ; >-61443; + (=gt-pj-8 . #x573E) ; >-61443; [55-30] + )) )) (define-char - '((morohashi-daikanwa 45675 0 2) + '((<-denotational + ((=ucs . #x4C19) ; 䰙 + )) (ideographic-radical . 193) ; ⿀ (ideographic-strokes . 4) (total-strokes . 14) - (=ucs . #x4C19) ; 䰙 - (=cns11643-3 . #x4A77) ; &I-C3-4A77; [42-87] + (=cns11643-3 . #x4A77) ; &C3-4A77; [42-87] + (=ucs@unicode . #x4C19) ; &C3-4A77; )) (define-char '((=>ucs . #x4C1A) ; 䰚 diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el index 060de00..23c0be4 100644 --- a/lisp/utf-2000/maps-conf.el +++ b/lisp/utf-2000/maps-conf.el @@ -61,7 +61,8 @@ ;; #x353D #x4324 #x475B #x6E47 #x4371 ;; #x3F5D #x6E49 #x4D6F #x3C72 #x3D37 ;; #x6E4C #x3B44 #x734E #x5567 #x545A -;; #x3071 #x332A #x516A #x476D #x3675)) +;; #x3071 #x332A #x516A #x476D #x3675 +;; #x5734)) ;; (put-char-attribute (decode-char 'japanese-jisx0208-1990 v) ;; '=gt-pj-1 v)) ;; nil) diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el index 5e872d0..8c7f0f2 100644 --- a/lisp/utf-2000/ruimoku6.el +++ b/lisp/utf-2000/ruimoku6.el @@ -100,7 +100,7 @@ (define-char '((sources bos=A016374-00004) (=ruimoku-v6 . #xE00A) ; &RUI6-E00A; - (=ucs@unicode . #x29C2C) ; &RUI6-E00A; + (=ucs@iso . #x29C2C) ; &RUI6-E00A; )) (define-char '((ideographic-radical . 69) ; ⽄ @@ -244,17 +244,63 @@ (=ruimoku-v6 . #xE016) ; &I-RUI6-E016; )) (define-char - '((sources bos=A021003-00010 bos=A2003-10164-00008) + '((ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 16) + (total-strokes . 23) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") + (=ucs . #x2FF6) ; ⿶ + ) + ((=big5-cdp . #x8B64) ; &CDP-8B64; + ) + ((=ucs . #x540C) ; 同 + )) + ) + ((=ucs . #x6614) ; 昔 + )) + (sound@ja/on "saku") + (sources bos=A021003-00010 bos=A2003-10164-00008) (=ruimoku-v6 . #xE017) ; &RUI6-E017; )) (define-char - '((sources bos=A2003-10320-00001 bos=A2003-10320-00002 + '((ideographic-radical . 86) ; ⽕ + (ideographic-strokes . 16) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x38C8) ; 㣈 + ) + ((=cns11643-1 . #x4556) ; &C1-4556; [37-54] + )) + (sources bos=A2003-10320-00001 bos=A2003-10320-00002 bos=A2003-10320-00004 bos=A2003-10620-00005 bos=A2003-10693-00007 bos=A2003-11142-00007) (=ruimoku-v6 . #xE018) ; &RUI6-E018; + (<-unknown + ((=ucs . #x8C73) ; 豳 + ) + ((=ucs . #x71F9) ; 燹 + )) )) (define-char - '((sources bos=A021708-00010) + '((ideographic-radical . 129) ; ⾀ + (ideographic-strokes . 8) + (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x38C7) ; 㣇 + ) + ((=ucs . #x807F) ; 聿 + )) + (sources bos=A021708-00010) (=ruimoku-v6 . #xE019) ; &RUI6-E019; )) (define-char diff --git a/src/ChangeLog b/src/ChangeLog index e3abb13..53ac354 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-03-07 MORIOKA Tomohiko + + * mule-charset.c (Fdecode_char): Fix problem when decoding GR + code-point by GL charset. + 2008-10-08 MORIOKA Tomohiko * concord.c (concord_id_validate): New function. diff --git a/src/mule-charset.c b/src/mule-charset.c index e7127a7..fb0ca3f 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,2008 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2008,2009 MORIOKA Tomohiko This file is part of XEmacs. @@ -2703,7 +2703,8 @@ If corresponding character is not found, nil is returned. charset = Fget_charset (charset); CHECK_INT (code); c = XINT (code); - if (XCHARSET_GRAPHIC (charset) == 1) + if ( (XCHARSET_GRAPHIC (charset) == 0) || + (XCHARSET_GRAPHIC (charset) == 1) ) c &= 0x7F7F7F7F; if (NILP (defined_only)) c = DECODE_CHAR (charset, c, !NILP (without_inheritance)); -- 1.7.10.4