From: tomo Date: Wed, 9 Feb 2005 09:34:11 +0000 (+0000) Subject: Sync up with r21-4-15-chise-0_21-33. X-Git-Tag: r21-4-15-u2km-0_21-33~4 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2c5d228bd255a879312025c0f78e4a3b97da4e85;p=chise%2Fxemacs-chise.git- Sync up with r21-4-15-chise-0_21-33. --- diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog index b6de50a..56a508e 100644 --- a/etc/char-data/ChangeLog +++ b/etc/char-data/ChangeLog @@ -1,3 +1,8 @@ +2005-02-02 MORIOKA Tomohiko + + * JC3-to-UCS.txt (JC3-47B8): Map to U+FA78 instead of U+559D. + (JC3-47C9): Map to U+FA7C instead of U+585A. + 2005-01-11 MORIOKA Tomohiko * B-to-UCS.txt (B-A1C3): Delete mapping for U+203E. diff --git a/etc/char-data/JC3-to-UCS.txt b/etc/char-data/JC3-to-UCS.txt index 76161c8..a1c3cf7 100644 --- a/etc/char-data/JC3-to-UCS.txt +++ b/etc/char-data/JC3-to-UCS.txt @@ -506,7 +506,7 @@ JC3-47B4 U+56C9 JC3-47B5 U+53F2 JC3-47B6 U+540F JC3-47B7 U+5669 -JC3-47B8 U+559D +JC3-47B8 U+FA78 JC3-47B9 U+5516 JC3-47BA U+5653 JC3-47BB U+5642 @@ -523,7 +523,7 @@ JC3-47C5 U+5711 JC3-47C6 U+571A JC3-47C7 U+571B JC3-47C8 U+5C2D -JC3-47C9 U+585A +JC3-47C9 U+FA7C JC3-47CA U+586B JC3-47CB U+5835 JC3-47CC U+5721 diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index ed8cce7..4345769 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,209 @@ +2005-02-08 MORIOKA Tomohiko + + * Ideograph-R152-Pig.el (U+8C59): Use `->subsumptive'. + + * Ideograph-R129-Brush.el (C3-383E): Unify BC-88C9. + + * Ideograph-R087-Claw.el (U+722B): Changed to abstract character; + add `<-ideographic-component-forms' for U+722A. + (): Copied from + u02E00-CJK-Radical-Supplement.el; use `<-denotational' for U+722B; + add `<-radical' for U+722A. + (JX2-7029): Unify and BC-8B58; use + `=ucs@unicode' instead of `=ucs@gb' for UU+722B; use + `->subsumptive' for U+FA49. + + * u02E00-CJK-Radical-Supplement.el (): Use + `<-denotational' for U+722B; unify JX2-7029, UU+722B and JU+FA49; + add `->subsumptive' for U+FA49. + (): Use `<-denotational' for U+722B; add + `<-radical' for U+722A. + + * Ideograph-R072-Sun.el (U+669B): Changed to abstract character. + (U+669C): Use `->subsumptive'. + +2005-02-07 MORIOKA Tomohiko + + * Ideograph-R046-Mountain.el (U+5D11): Use `->subsumptive'. + (U-00021E1C): Likewise. + +2005-02-06 MORIOKA Tomohiko + + * Ideograph-R071-Not.el (J0-5A5B): Unify CB07099. + +2005-02-03 MORIOKA Tomohiko + + * Ideograph-R149-Speech.el (BC-8BE7): New character. + + * Ideograph-R055-Two-Hands.el (U-0002F890): Unify BC-887D. + + * Ideograph-R101-Use.el (U-00024C08): Use `->subsumptive'. + (CB08880): New character. + + * Ideograph-R162-Walk.el (U+48A1): Changed to abstract character. + (U+9040): Changed to abstract character. + (C3-447D): Use `<-denotational' for U+9040; unify BC-8CBC. + +2005-02-03 MORIOKA Tomohiko + + * Ideograph-R073-Say.el (U+66F0): Use `->subsumptive'. + + * Ideograph-R013-Down-Box.el (U+5190): Use `->denotational' + instead of `->subsumptive'. + (BC-8CCB): New character. + + * Ideograph-R009-Man.el (U-00020203): Delete incomplete + `ideographic-structure'. + (U-000202A7): Changed to abstract character. + (U-000202BB): Likewise. + (U-000202FD): Use `->subsumptive'. + (U-000202FE): Likewise. + (U-000202FF): Delete incomplete `ideographic-structure'. + +2005-02-02 MORIOKA Tomohiko + + * Ideograph-R149-Speech.el (U+470C): Use `->subsumptive'. + (U+9FBB): New character; add `<-denotational' for C5-6952; add + `<-ideographic-component-forms' for U+470C. + + * Ideograph-R167-Gold.el (U+9FAC): New character; unify CB02156. + + * Ideograph-R163-City.el (U+90C1): Use `->subsumptive'. + + * Ideograph-R140-Grass.el (U+9FB7): New character; unify BC-8B5C. + (U+82F1): Changed to abstract character. + + * Ideograph-R130-Meat.el (U+8127): Use `->subsumptive'. + + * Ideograph-R100-Life.el (BC-8B77): Unify U+9FB6. + + * Ideograph-R045-Sprout.el (U+37B7): Use `->subsumptive'. + + * Ideograph-R037-Big.el (M-05921): Unify U+FA7F; add + `<-denotational' for J97-4B5B. + (J97-4B5B): New character. + (U+5954): Add `<-denotational' for J97-4B5B; add `<-simplified' + for M-05921. + + * Ideograph-R032-Earth.el (GT-06661): Unify U+FA7C into the parent + node. + +2005-02-02 MORIOKA Tomohiko + + * Ideograph-R077-Stop.el (GT-K00182): Use `=>daikanwa' instead of + `morohashi-daikanwa'; add `<-ideographic-component-forms' for + U+6B62. + (GT-K00439): Likewise. + (GT-K00440): Likewise; unify U+9FB0. + + * Ideograph-R066-Rap.el (U+656C): Changed to abstract character. + + * Ideograph-R064-Hand.el (U+9FB5): New character; unify BC-8B6D. + + * Ideograph-R031-Enclosure.el (CB00638): Unify U+9FB1. + (U+5705): Use `->subsumptive'. + + * Ideograph-R030-Mouth.el (U+35A9): Use `->subsumptive'. + (JU+559D): Unify U+FA78. + (U+55E2): Changed to abstract character. + (UU+55E2): Unify U+FA7B. + + * Ideograph-R024-Ten.el (U+9FBA): New character. + + * Ideograph-R015-Ice.el (U+51B5): Separate CB00288. + (CB00288): Unify U+FA71. + + * Ideograph-R010-Legs.el (M-01344): Unify U+FA74. + (U-00020496): Changed to abstract character. + (U-000204A8): Likewise. + (M-01398): Unify U-000204AE and H1-DEC9. + + * Ideograph-R012-Eight.el (U+9FB9): New character. + (GT-K01769): Map to U+9FB9 instead of U-00020509. + (BC-8BFA): Likewise. + + * Ideograph-R011-Enter.el (U+5168): Use `->denotational' instead + of `->subsumptive'. + (UU+5168): Use `<-denotational' for U+5168; unify U+FA72. + + * Ideograph-R002-Line.el (U+4E35): Use `->subsumptive'. + + * Ideograph-R001-One.el (M-00053): Unify GT-00089 and GT-K06059; + map to U+FA70 instead of U+4E26. + (U+FA70): New character. + +2005-01-31 MORIOKA Tomohiko + + * Ideograph-R020-Wrap.el (U+52FA): Changed to abstract character. + (GT-03204): Use `<-denotational' U+52FA; unify U+FA77; add + UU+52FA. + + * Ideograph-R019-Power.el (UU+52C7): Unify U+FA76. + + * Ideograph-R005-Second.el (U+9FB4): New character; unify BC-8B69. + + * char-db-util.el (insert-char-data-with-variant): Don't refer + `->ucs'; fix problem about cyclic relations. + +2005-01-31 MORIOKA Tomohiko + + * Ideograph-R059-Bristle.el (U+5F65): Add `<-denotational' for + J97-4927. + (J97-4927): New abstract character. + (U+5F66): Add `<-denotational' for J97-4927. + + * Ideograph-R030-Mouth.el (U+356F): Changed to abstract character. + (U+5436): Use `->subsumptive'. + (U+5468): Changed to abstract character. + +2005-01-31 MORIOKA Tomohiko + + * Ideograph-R059-Bristle.el (U+5F65): Use `->subsumptive'. + (U+5F66): Likewise. + + * Ideograph-R146-West.el (J97-4D57): New abstract character. + (M-34768): Use `<-denotational' for J97-4D57 instead of `=>ucs' + for U+8981. + (U+8981): Use `<-denotational' for J97-4D57; use `->subsumptive'. + + * Ideograph-R009-Man.el (U+5185): Add `<-denotational' for + J97-4662; delete `<-vulgar' for U+5167. + (C3-2148): Delete `->identical' for C6-2150. + (J97-4662): New abstract character. + (U-000202EE): Use `->subsumptive'. + (U+50FF): Likewise. + +2005-01-14 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+82E5): Changed to abstract character. + + * Ideograph-R032-Earth.el (U+585E): Use `->subsumptive'. + + * Ideograph-R013-Down-Box.el (U+5185): Add `<-denotational' for + J97-4662; delete `<-vulgar' for U+5167. + (J97-4662): New abstract character. + + * Ideograph-R011-Enter.el (U+5167): Use `->subsumptive'; add + `<-denotational' for J97-4662. + (J97-4662): New abstract character. + (U+5185): Copied from Ideograph-R009-Man.el and + Ideograph-R013-Down-Box.el; changed to abstract character; add + `<-denotational' for J97-4662. + + * Ideograph-R074-Moon.el (J97-442B): New abstract character. + (M-14374): Use `<-denotational' for J97-442B instead of `=>ucs' + for U+671D. + (U+671D): Likewise. + + * Ideograph-R061-Heart.el (U+611B): Use `->subsumptive'. + +2005-01-12 MORIOKA Tomohiko + + * ideograph-util.el (char-total-strokes-from-domains): Use + `char-feature' instead of `get-char-attribute' to get + `total-strokes'. + (char-total-strokes): Likewise. + 2005-01-28 MORIOKA Tomohiko * Ideograph-R009-Man.el (U+4FC0): Unify B-CDED. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 022c71a..b5d528f 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -1966,22 +1966,24 @@ (=gt-pj-9 . #x3B41) ; >-00074; [27-33] )) (define-char - '((=>ucs . #x4E26) ; 並 + '((=>ucs* . #x4E26) ; 並 (ideographic-radical . 1) ; ⼀ - (ideographic-strokes . 7) - (total-strokes . 8) - (shinjigen-1 . 5733) - (=daikanwa . 00053) ; &M-00053; - (mojikyo . 000053) ; &MCS-60000035; - )) -(define-char - '((morohashi-daikanwa 53 0 0) - (ideographic-radical . 1) ; ⼀ - (ideographic-strokes . 8) - (total-strokes . 9) - (=gt . 00089) ; >-00089; - (=gt-k . 06059) ; &I-GT-K06059; - (=gt-pj-2 . #x3046) ; >-00089; [16-38] + (ideographic-strokes@daikanwa . 7) + (total-strokes@daikanwa . 8) + (ideographic-strokes@gt . 8) + (total-strokes@gt . 9) + (=ucs . #xFA70) ; 並 + (->subsumptive + ((shinjigen-1 . 5733) + (=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; + ) + ((=ucs@unicode . #xFA70) ; &UU+FA70; + )) )) (define-char '((ideographic-radical . 1) ; ⼀ diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index affe4be..0c36e3a 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -570,23 +570,27 @@ '((ideographic-radical . 2) ; ⼁ (ideographic-strokes . 9) (total-strokes . 10) - (hanyu-dazidian 1 30 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E1A) ; 业 + (=ucs . #x4E35) ; 丵 + (->subsumptive + ((hanyu-dazidian 1 30 6) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E1A) ; 业 + ) + ((=big5-cdp . #x8B75) ; &RUI6-E00E; + )) + (=jis-x0212 . #x302E) ; >-00124; [16-14] + (=cns11643-4 . #x2B5E) ; &I-C4-2B5E; [11-62] + (=gt . 00124) ; &I-GT-00124; + (=gt-pj-2 . #x3063) ; &I-GT-00124; [16-67] + (=daikanwa . 00087) ; &I-M-00087; + (=ucs@unicode . #x4E35) ; >-00124; + (mojikyo . 000087) ; &MCS-60000057; ) - ((=big5-cdp . #x8B75) ; &RUI6-E00E; + ((=big5-cdp . #x8AA8) ; &CDP-8AA8; )) - (=ucs . #x4E35) ; 丵 - (=jis-x0212 . #x302E) ; &I-JSP-302E; [16-14] - (=cns11643-4 . #x2B5E) ; &I-C4-2B5E; [11-62] - (=big5-cdp . #x8AA8) ; &I-CDP-8AA8; - (=gt . 00124) ; &I-GT-00124; - (=gt-pj-2 . #x3063) ; &I-GT-00124; [16-67] - (=daikanwa . 00087) ; &I-M-00087; - (mojikyo . 000087) ; &MCS-60000057; )) (define-char '((ideographic-radical . 2) ; ⼁ diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index afe421c..4c91f21 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -247,6 +247,13 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 1) (total-strokes . 2) + (=ucs . #x9FB4) ; 龴 + (=big5-cdp . #x8B69) ; &I-CDP-8B69; + )) +(define-char + '((ideographic-radical . 5) ; ⼄ + (ideographic-strokes . 1) + (total-strokes . 2) (hanyu-dazidian 1 49 8) (=big5-cdp . #x8871) ; &CDP-8871; )) diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index a0ac37d..c585030 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -804,8 +804,8 @@ (ideographic-radical@cns*sources cns11643-3 daikanwa) (total-strokes . 4) - (<-vulgar - ((=ucs . #x5167) ; 內 + (<-denotational + ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] )) (=ucs . #x5185) ; 内 )) @@ -814,10 +814,6 @@ (ideographic-radical . 9) ; ⼈ (ideographic-strokes . 2) (total-strokes . 4) - (->identical - ((=cns11643-6 . #x2150) ; >-01982; [01-48] - (=daikanwa . 01512) ; &I-M-01512; - )) (<-denotational ((=ucs . #x5185) ; 内 )) @@ -830,6 +826,22 @@ (=ucs@cns . #x5185) ; &C3-2148; )) (define-char + '((ideographic-radical@ucs . 13) ; ⼌ + (ideographic-strokes@ucs . 2) + (ideographic-radical@ucs*sources + daikanwa=01512 cns11643-6 ucs=0x5185) + (ideographic-radical@daikanwa . 11) ; ⼊ + (ideographic-strokes@daikanwa . 2) + (ideographic-radical@daikanwa*sources + daikanwa=01418 cns11643-1 ucs=0x5167) + (ideographic-radical@cns-3 . 9) ; ⼈ + (ideographic-strokes@cns-3 . 2) + (ideographic-radical@cns-3*sources + cns11643-3 daikanwa=366-1) + (total-strokes . 4) + (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + )) +(define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 2) (total-strokes . 4) @@ -1440,7 +1452,7 @@ ) ((=big5-cdp . #x8AFC) ; &CDP-8AFC; ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; + ((=ucs . #x9FB4) ; 龴 )) (=cns11643-1 . #x456F) ; >-K01023; [37-79] (=gt-k . 01023) ; &I-GT-K01023; @@ -1453,7 +1465,7 @@ ) ((=ucs . #x4EBD) ; 亽 ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; + ((=ucs . #x9FB4) ; 龴 )) (=gb2312 . #x416E) ; >-K01022; [33-78] (=gt-k . 01022) ; &I-GT-K01022; @@ -6460,14 +6472,6 @@ (ideographic-strokes . 6) (total-strokes . 8) (hanyu-dazidian 1 154 12) - (ideographic-structure - (:cdp-combinator 4) - ((=ucs . #x4EBB) ; 亻 - ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; - ) - ((=ucs . #x6728) ; 木 - )) (=ucs . #x20203) ; 𠈃 (=cns11643-6 . #x2943) ; &I-C6-2943; [09-35] (=daikanwa . 00542) ; &I-M-00542; @@ -15540,7 +15544,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x8B77) ; &CDP-8B77; + ((=ucs . #x9FB6) ; 龶 ) ((=ucs . #x8D1D) ; 贝 )) @@ -15717,8 +15721,15 @@ )) (define-char '((ideographic-radical . 9) ; ⼈ + (=ucs . #x202A7) ; 𠊧 + )) +(define-char + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 9) (total-strokes . 11) + (<-denotational + ((=ucs . #x202A7) ; 𠊧 + )) (hanyu-dazidian 1 195 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -15726,19 +15737,21 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=daikanwa . 00053) ; &M-00053; + ((=gt . 00089) ; >-00089; + (=daikanwa . 00053) ; &I-M-00053; )) - (=ucs . #x202A7) ; 𠊧 - (=daikanwa . 00826) ; &I-M-00826; + (=daikanwa . 00826) ; &M-00826; (=hanziku-1 . #xCE76) ; &I-HZK01-CE76; + (=ucs@iso . #x202A7) ; &M-00826; (mojikyo . 000826) ; &MCS-6000033A; )) (define-char - '((=>ucs . #x202A7) ; 𠊧 - (morohashi-daikanwa 826 0 3) - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 8) (total-strokes . 10) + (<-denotational + ((=ucs . #x202A7) ; 𠊧 + )) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ @@ -15799,7 +15812,9 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=ucs@unicode . #x82F1) ; &UU+82F1; + ((=jis-x0208 . #x3151) ; >-39838; [17-49] + (=gb2312 . #x5322) ; &I-G0-5322; [51-02] + (=ks-x1001 . #x6748) ; &I-K0-6748; [71-40] )) (=jis-x0212 . #x315F) ; &JX1-2E41; [17-63] (=jis-x0213-1-2000 . #x2E41) ; &I-JX1-2E41; [14-33] @@ -16461,7 +16476,7 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=daikanwa . 09980) ; &I-M-09980; + ((=daikanwa . 09980) ; &M-09980; )) (shinjigen-1 . 331) (shinjigen-2 . 331) @@ -17069,7 +17084,7 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=ucs@unicode . #x8981) ; &UU+8981; + ((=ucs@unicode . #x8981) ; >-46811; )) (=big5 . #xD450) ; &B-D450; (=ucs@unicode . #x5060) ; &B-D450; @@ -18205,33 +18220,65 @@ (=hanziku-1 . #xCCB5) ; &I-HZK01-CCB5; )) (define-char - '((=>ucs . #x202BB) ; 𠊻 - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ + (ideographic-strokes . 9) + (total-strokes . 11) + (=ucs . #x202BB) ; 𠊻 + )) +(define-char + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 9) (total-strokes . 11) + (<-denotational + ((=ucs . #x202BB) ; 𠊻 + )) (=daikanwa . 00905) ; &M-00905; (mojikyo . 000905) ; &MCS-60000389; )) (define-char - '((morohashi-daikanwa 905 0 2) - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ + (ideographic-strokes . 9) + (total-strokes . 11) + (<-denotational + ((=ucs . #x202BB) ; 𠊻 + )) + (=cns11643-6 . #x3D32) ; &C6-3D32; [29-18] + (=ucs@iso . #x202BB) ; &C6-3D32; + )) +(define-char + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 9) (total-strokes . 11) + (<-denotational + ((=ucs . #x202BB) ; 𠊻 + )) (hanyu-dazidian 1 203 15) (ideographic-structure - (:cdp-combinator 4) - ((=ucs . #x4EBB) ; 亻 - ) - ((name . "CJK RADICAL PAW ONE") - (=ucs . #x2EA4) ; ⺤ + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; + ((=ucs . #x4EBB) ; 亻 ) - ((=ucs . #x6728) ; 木 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=jis-x0212 . #x4A48) ; &M-19655; [42-40] + (=cns11643-4 . #x2151) ; &I-C4-2151; [01-49] + (=jis-x0213-2-2000 . #x702A) ; &I-JX2-702A; [80-10] + (=daikanwa . 19655) ; &I-M-19655; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x9FB4) ; 龴 + ) + ((=ucs . #x6728) ; 木 + )) + )) )) - (=ucs . #x202BB) ; 𠊻 - (=cns11643-6 . #x3D32) ; &I-C6-3D32; [29-18] - (=hanziku-1 . #xD04A) ; &I-HZK01-D04A; + (=hanziku-1 . #xD04A) ; &HZK01-D04A; )) (define-char '((ideographic-radical . 9) ; ⼈ @@ -20823,57 +20870,119 @@ '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 188 8) - (ideographic-structure - (:cdp-combinator 4) - ((=ucs . #x4EBB) ; 亻 - ) - ((=ucs . #x5927) ; 大 + (=ucs . #x202FD) ; 𠋽 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5927) ; 大 + ) + ((=jis-x0208@1978 . #x446E) ; &M-09571; [36-78] + (=jis-x0208@1983 . #x446E) ; &I-J83-446E; [36-78] + (=ks-x1001 . #x6F55) ; &I-K0-6F55; [79-53] + (=daikanwa . 09571) ; &I-M-09571; + )) + )) + (=daikanwa . 00978) ; &M-00978; ) - ((=ucs . #x5EF7) ; 廷 + ((hanyu-dazidian 1 188 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5927) ; 大 + ) + ((=gb2312 . #x4D22) ; >-12057; [45-02] + (=cns11643-1 . #x4A2C) ; &I-C1-4A2C; [42-12] + )) + )) + (=cns11643-6 . #x4650) ; &HZK01-CCF9; [38-48] + (=hanziku-1 . #xCCF9) ; &I-HZK01-CCF9; + (=ucs@iso . #x202FD) ; &HZK01-CCF9; + (mojikyo . 000978) ; &MCS-600003D2; )) - (=ucs . #x202FD) ; 𠋽 - (=cns11643-6 . #x4650) ; &I-C6-4650; [38-48] - (=daikanwa . 00978) ; &I-M-00978; - (=hanziku-1 . #xCCF9) ; &I-HZK01-CCF9; - (mojikyo . 000978) ; &MCS-600003D2; )) (define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 199 7) - (ideographic-structure - (:cdp-combinator 4) - ((=ucs . #x4EBB) ; 亻 - ) - ((=ucs . #x738B) ; 王 - ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; - ) - ((=ucs . #x4E5B) ; 乛 + (=ucs . #x202FE) ; 𠋾 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x738B) ; 王 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=ucs . #x9FB4) ; 龴 + ) + ((=ucs . #x4E5B) ; 乛 + ) + ((=gt-k . 00305) ; >-K00305; + )) + )) + )) + (=daikanwa . 00979) ; &M-00979; ) - ((=ucs . #x5C0F) ; 小 + ((hanyu-dazidian 1 199 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x738B) ; 王 + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (=ucs . #x2FF3) ; ⿳ + ) + ((=ucs . #x9FB4) ; 龴 + ) + ((=ucs . #x4E5B) ; 乛 + ) + ((=ucs . #x5C0F) ; 小 + )) + )) + )) + (=cns11643-6 . #x464B) ; &HZK01-CF5F; [38-43] + (=hanziku-1 . #xCF5F) ; &I-HZK01-CF5F; + (=ucs@iso . #x202FE) ; &HZK01-CF5F; + (mojikyo . 000979) ; &MCS-600003D3; )) - (=ucs . #x202FE) ; 𠋾 - (=cns11643-6 . #x464B) ; &I-C6-464B; [38-43] - (=daikanwa . 00979) ; &I-M-00979; - (=hanziku-1 . #xCF5F) ; &I-HZK01-CF5F; - (mojikyo . 000979) ; &MCS-600003D3; )) (define-char '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 10) (total-strokes . 12) (hanyu-dazidian 1 200 6) - (ideographic-structure - (:cdp-combinator 4) - ((=ucs . #x4EBB) ; 亻 - ) - ((=big5-cdp . #x89B6) ; &CDP-89B6; - ) - ((=ucs . #x571F) ; 土 - )) (=ucs . #x202FF) ; 𠋿 (=cns11643-6 . #x464E) ; &I-C6-464E; [38-46] (=daikanwa . 00980) ; &I-M-00980; @@ -21031,52 +21140,51 @@ (=cns11643-6 . #x4649) ; &I-C6-4649; [38-41] )) (define-char - '((=>ucs . #x202EE) ; 𠋮 - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 10) (total-strokes . 12) - (hanyu-dazidian 1 202 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + (=ucs . #x202EE) ; 𠋮 + (->subsumptive + ((hanyu-dazidian 1 202 3) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) - ((=ucs . #x5728) ; 在 + ((=ucs . #x4EBB) ; 亻 ) - ((=daikanwa . 01418) ; &I-M-01418; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5728) ; 在 + ) + ((=ks-x1001 . #x522E) ; &M-01418; [50-14] + (=daikanwa . 01418) ; &I-M-01418; + )) )) - )) - (=daikanwa . 00987) ; &M-00987; - (=hanziku-1 . #xCFDD) ; &I-HZK01-CFDD; - (mojikyo . 000987) ; &MCS-600003DB; - )) -(define-char - '((morohashi-daikanwa 987 0 2) - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 10) - (total-strokes . 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 + (=daikanwa . 00987) ; &M-00987; + (=hanziku-1 . #xCFDD) ; &I-HZK01-CFDD; + (mojikyo . 000987) ; &MCS-600003DB; ) ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) - ((=ucs . #x5728) ; 在 + ((=ucs . #x4EBB) ; 亻 ) - ((=ucs . #x5185) ; 内 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5728) ; 在 + ) + ((=jis-x0208 . #x4662) ; >-01983; [38-66] + (=gb2312 . #x445A) ; &I-G0-445A; [36-58] + )) )) + (=cns11643-6 . #x464F) ; &C6-464F; [38-47] + (=ucs@iso . #x202EE) ; &C6-464F; )) - (=ucs . #x202EE) ; 𠋮 - (=cns11643-6 . #x464F) ; &I-C6-464F; [38-47] )) (define-char '((=>ucs . #x202EF) ; 𠋯 @@ -24778,7 +24886,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") (=ucs . #x2FF3) ; ⿳ ) - ((=big5-cdp . #x8B5C) ; &CDP-8B5C; + ((=ucs . #x9FB7) ; 龷 ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -26993,7 +27101,8 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=ucs@unicode . #x611B) ; &UU+611B; + ((=jis-x0208 . #x3026) ; >-13779; [16-06] + (=ks-x1001 . #x6471) ; &I-K0-6471; [68-81] )) (=jis-x0212 . #x3248) ; &JSP-3248; [18-40] (=big5 . #xE4ED) ; &I-B-E4ED; @@ -27011,39 +27120,39 @@ (mojikyo . 001170) ; &MCS-60000492; )) (define-char - '((=>ucs . #x50FF) ; 僿 - (ideographic-radical . 9) ; ⼈ - (ideographic-strokes . 13) - (total-strokes . 15) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 - ) - ((=ucs . #x585E) ; 塞 - )) - (=ks-x1001 . #x5E47) ; &M-01171; [62-39] - (=daikanwa . 01171) ; &I-M-01171; - (mojikyo . 001171) ; &MCS-60000493; - )) -(define-char - '((morohashi-daikanwa 1171 0 1) - (ideographic-radical . 9) ; ⼈ + '((ideographic-radical . 9) ; ⼈ (ideographic-strokes . 13) (total-strokes . 15) (hanyu-dazidian 1 229 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x4EBB) ; 亻 - ) - ((=ucs . #x585E) ; 塞 - )) (=ucs . #x50FF) ; 僿 - (=cns11643-2 . #x4F4E) ; &I-C2-4F4E; [47-46] (=big5 . #xE4E6) ; &I-B-E4E6; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=jis-x0208 . #x3A49) ; >-06725; [26-41] + (=ks-x1001 . #x5F5D) ; &I-K0-5F5D; [63-61] + (=daikanwa . 05349) ; &I-M-05349; + )) + (=ks-x1001 . #x5E47) ; &M-01171; [62-39] + (=daikanwa . 01171) ; &I-M-01171; + (mojikyo . 001171) ; &MCS-60000493; + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x4EBB) ; 亻 + ) + ((=gb2312 . #x487B) ; &C1-6352; [40-91] + (=cns11643-1 . #x6352) ; &I-C1-6352; [67-50] + )) + (=cns11643-2 . #x4F4E) ; &C2-4F4E; [47-46] + (=ucs@unicode . #x50FF) ; &C2-4F4E; + )) )) (define-char '((ideographic-radical . 9) ; ⼈ @@ -27632,7 +27741,10 @@ ) ((=ucs . #x4EBB) ; 亻 ) - ((=ucs@unicode . #x656C) ; &UU+656C; + ((=jis-x0208 . #x3749) ; >-16746; [23-41] + (=gb2312 . #x3E34) ; &I-G0-3E34; [30-20] + (=ks-x1001 . #x4C57) ; &I-K0-4C57; [44-55] + (=cns11643-6 . #x4957) ; &I-C6-4957; [41-55] )) (=gb2312 . #x5953) ; &JX1-2E4A; [57-51] (=ks-x1001 . #x4C4C) ; &I-K0-4C4C; [44-44] diff --git a/lisp/utf-2000/Ideograph-R010-Legs.el b/lisp/utf-2000/Ideograph-R010-Legs.el index 375823e..a0ca853 100644 --- a/lisp/utf-2000/Ideograph-R010-Legs.el +++ b/lisp/utf-2000/Ideograph-R010-Legs.el @@ -232,7 +232,8 @@ (=ucs . #x5145) ; 充 )) (define-char - '((ideographic-strokes . 3) + '((=>ucs* . #x5145) ; 充 + (ideographic-strokes . 3) (total-strokes . 5) (<-denotational ((=ucs . #x5145) ; 充 @@ -248,7 +249,8 @@ )) (shinjigen-1 . 454) (shinjigen-2 . 454) - (=cns11643-1 . #x4572) ; &M-01344; [37-82] + (=ucs . #xFA74) ; 充 + (=cns11643-1 . #x4572) ; &I-C1-4572; [37-82] (=daikanwa . 01344) ; &I-M-01344; (mojikyo . 001344) ; &MCS-60000540; )) @@ -1602,10 +1604,16 @@ (mojikyo . 001384) ; &MCS-60000568; )) (define-char - '((=>ucs . #x20496) ; 𠒖 - (ideographic-radical . 10) ; ⼉ + '((ideographic-radical . 10) ; ⼉ + (=ucs . #x20496) ; 𠒖 + )) +(define-char + '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 8) (total-strokes . 10) + (<-denotational + ((=ucs . #x20496) ; 𠒖 + )) (hanyu-dazidian 1 273 7) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") @@ -1613,7 +1621,7 @@ ) ((=ucs . #x5341) ; 十 ) - ((=big5-cdp . #x8B5C) ; &CDP-8B5C; + ((=ucs . #x9FB7) ; 龷 ) ((=ucs . #x5140) ; 兀 )) @@ -1621,10 +1629,12 @@ (=hanziku-1 . #xDE6C) ; &I-HZK01-DE6C; )) (define-char - '((morohashi-daikanwa 1385 0 1) - (ideographic-radical . 10) ; ⼉ + '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 8) (total-strokes . 10) + (<-denotational + ((=ucs . #x20496) ; 𠒖 + )) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") (=ucs . #x2FF3) ; ⿳ @@ -1642,8 +1652,8 @@ ) ((=ucs . #x5143) ; 元 )) - (=ucs . #x20496) ; 𠒖 - (=cns11643-6 . #x353C) ; &I-C6-353C; [21-28] + (=cns11643-6 . #x353C) ; &C6-353C; [21-28] + (=ucs@iso . #x20496) ; &C6-353C; (mojikyo . 001385) ; &MCS-60000569; )) (define-char @@ -1946,52 +1956,84 @@ (=cns11643-7 . #x2C41) ; &I-C7-2C41; [12-33] )) (define-char - '((=>ucs . #x204A8) ; 𠒨 - (ideographic-radical . 10) ; ⼉ - (ideographic-strokes . 12) - (total-strokes . 14) - (=daikanwa . 01397) ; &M-01397; - (mojikyo . 001397) ; &MCS-60000575; + '((ideographic-radical . 10) ; ⼉ + (=ucs . #x204A8) ; 𠒨 )) (define-char - '((=>ucs . #x204A8) ; 𠒨 - (morohashi-daikanwa 1397 0 1) - (ideographic-radical . 10) ; ⼉ + '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 12) (total-strokes . 14) - (hanyu-dazidian 1 275 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") - (=ucs . #x2FFA) ; ⿺ - ) - ((=ucs . #x5145) ; 充 + (<-denotational + ((=ucs . #x204A8) ; 𠒨 + )) + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") + (=ucs . #x2FFA) ; ⿺ + ) + ((=jis-x0208 . #x3D3C) ; >-01746; [29-28] + (=ks-x1001 . #x7576) ; &I-K0-7576; [85-86] + (=daikanwa . 01345) ; &I-M-01345; + ) + ((=jis-x0208 . #x357E) ; >-00397; [21-94] + (=ks-x1001 . #x4C48) ; &I-K0-4C48; [44-40] + (=daikanwa . 00299) ; &I-M-00299; + )) + (=daikanwa . 01397) ; &M-01397; + (mojikyo . 001397) ; &MCS-60000575; ) - ((=ucs . #x4EAC) ; 京 + ((hanyu-dazidian 1 275 3) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") + (=ucs . #x2FFA) ; ⿺ + ) + ((=gb2312 . #x3364) ; &HZK01-DDA6; [19-68] + (=cns11643-6 . #x2352) ; &I-C6-2352; [03-50] + ) + ((=gb2312 . #x3E29) ; &C1-4B6B; [30-09] + (=cns11643-1 . #x4B6B) ; &I-C1-4B6B; [43-75] + )) + (=hanziku-1 . #xDECA) ; &HZK01-DECA; )) - (=hanziku-1 . #xDECA) ; &HZK01-DECA; )) (define-char - '((morohashi-daikanwa 1397 0 2) - (ideographic-radical . 10) ; ⼉ + '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 11) (total-strokes . 13) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") - (=ucs . #x2FFA) ; ⿺ - ) - ((=cns11643-1 . #x4572) ; &M-01344; [37-82] - (=daikanwa . 01344) ; &I-M-01344; + (<-denotational + ((=ucs . #x204A8) ; 𠒨 + )) + (->subsumptive + ((=cns11643-6 . #x5063) ; &C6-5063; [48-67] ) - ((=ucs . #x4EAC) ; 京 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") + (=ucs . #x2FFA) ; ⿺ + ) + ((=ucs . #xFA74) ; 充 + ) + ((=gb2312 . #x3E29) ; &C1-4B6B; [30-09] + (=cns11643-1 . #x4B6B) ; &I-C1-4B6B; [43-75] + )) + (=ucs@iso . #x204A8) ; &UU+204A8; )) - (=ucs . #x204A8) ; 𠒨 - (=cns11643-6 . #x5063) ; &I-C6-5063; [48-67] )) (define-char '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 12) (total-strokes . 14) - (=daikanwa . 01398) ; &M-01398; + (hanyu-dazidian 1 275 2) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") + (=ucs . #x2FFA) ; ⿺ + ) + ((=ucs . #x5146) ; 兆 + ) + ((=ucs . #x6614) ; 昔 + )) + (=ucs . #x204AE) ; 𠒮 + (=daikanwa . 01398) ; &I-M-01398; + (=hanziku-1 . #xDEC9) ; &I-HZK01-DEC9; (mojikyo . 001398) ; &MCS-60000576; )) (define-char @@ -2030,22 +2072,6 @@ '((ideographic-radical . 10) ; ⼉ (ideographic-strokes . 12) (total-strokes . 14) - (hanyu-dazidian 1 275 2) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") - (=ucs . #x2FFA) ; ⿺ - ) - ((=ucs . #x5146) ; 兆 - ) - ((=ucs . #x6614) ; 昔 - )) - (=ucs . #x204AE) ; 𠒮 - (=hanziku-1 . #xDEC9) ; &I-HZK01-DEC9; - )) -(define-char - '((ideographic-radical . 10) ; ⼉ - (ideographic-strokes . 12) - (total-strokes . 14) (hanyu-dazidian 1 275 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el index c171857..51fd178 100644 --- a/lisp/utf-2000/Ideograph-R011-Enter.el +++ b/lisp/utf-2000/Ideograph-R011-Enter.el @@ -117,36 +117,61 @@ (=hanziku-12 . #xEB63) ; &I-HZK12-EB63; )) (define-char - '((=>ucs . #x5167) ; 內 - (ideographic-radical . 11) ; ⼊ + '((ideographic-radical . 11) ; ⼊ (ideographic-strokes . 2) (total-strokes . 4) - (shinjigen-1 . 482) - (shinjigen-2 . 482) - (=big5 . #xA4BA) ; &M-01418; - (=daikanwa . 01418) ; &I-M-01418; - (=jef-china3 . #x43DE) ; &I-JC3-43DE; - (=ucs@big5 . #x5167) ; &M-01418; - (mojikyo . 001418) ; &MCS-6000058A; + (<-denotational + ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + )) + (=ucs . #x5167) ; 內 + (->subsumptive + ((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; + )) )) (define-char - '((morohashi-daikanwa 1418 0 1) - (ideographic-radical . 11) ; ⼊ - (ideographic-strokes . 2) + '((ideographic-radical@ucs . 13) ; ⼌ + (ideographic-strokes@ucs . 2) + (ideographic-radical@ucs*sources + daikanwa=01512 cns11643-6 ucs=0x5185) + (ideographic-radical@daikanwa . 11) ; ⼊ + (ideographic-strokes@daikanwa . 2) + (ideographic-radical@daikanwa*sources + daikanwa=01418 cns11643-1 ucs=0x5167) + (ideographic-radical@cns-3 . 9) ; ⼈ + (ideographic-strokes@cns-3 . 2) + (ideographic-radical@cns-3*sources + cns11643-3 daikanwa=366-1) (total-strokes . 4) - (hanyu-dazidian 1 97 2) - (shinjigen-1 . 482) - (shinjigen-2 . 482) - (=ucs . #x5167) ; 內 - (=cns11643-1 . #x4479) ; &I-C1-4479; [36-89] + (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] )) (define-char - '((=>ucs . #x5167) ; 內 - (morohashi-daikanwa 1418 0 2) - (ideographic-radical . 11) ; ⼊ - (ideographic-strokes . 2) + '((ideographic-radical@ucs . 13) ; ⼌ + (ideographic-strokes@ucs . 2) + (ideographic-radical@ucs*sources + daikanwa cns11643-6 ucs) + (ideographic-radical@cns . 9) ; ⼈ + (ideographic-strokes@cns . 2) + (ideographic-radical@cns*sources + cns11643-3 daikanwa) (total-strokes . 4) - (=ks-x1001 . #x522E) ; &K0-522E; [50-14] + (<-denotational + ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + )) + (=ucs . #x5185) ; 内 )) (define-char '((ideographic-radical . 11) ; ⼊ @@ -306,6 +331,14 @@ (ideographic-strokes . 4) (total-strokes . 6) (=ucs . #x5168) ; 全 + )) +(define-char + '((ideographic-radical . 11) ; ⼊ + (ideographic-strokes . 4) + (total-strokes . 6) + (<-denotational + ((=ucs . #x5168) ; 全 + )) (->subsumptive ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -334,28 +367,38 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x5165) ; 入 + ((=gb2312 . #x486B) ; &C1-442B; [40-75] + (=cns11643-1 . #x442B) ; &I-C1-442B; [36-11] ) ((=ucs . #x738B) ; 王 )) (=cns11643-1 . #x4740) ; &C1-4740; [39-32] + )) + )) +(define-char + '((=>ucs* . #x5168) ; 全 + (ideographic-radical . 11) ; ⼊ + (ideographic-strokes . 4) + (total-strokes . 6) + (<-denotational + ((=ucs . #x5168) ; 全 + )) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((name* . "ideographic component person as roof") - (=big5-cdp . #x8B5D) ; >-00458; - ) - ((=ucs . #x738B) ; 王 - )) - (=jis-x0208 . #x4134) ; >-00565; [33-20] - (=gb2312 . #x482B) ; &I-G0-482B; [40-11] - (=gt . 00565) ; &I-GT-00565; - (=gt-k . 01658) ; &I-GT-K01658; - (=gt-pj-1 . #x4134) ; &I-GT-00565; [33-20] - (=ucs@unicode . #x5168) ; >-00565; + ((name* . "ideographic component person as roof") + (=big5-cdp . #x8B5D) ; >-00458; + ) + ((=ucs . #x738B) ; 王 )) + (=ucs . #xFA72) ; 全 + (=jis-x0208 . #x4134) ; &I-J90-4134; [33-20] + (=gb2312 . #x482B) ; &I-G0-482B; [40-11] + (=gt . 00565) ; &I-GT-00565; + (=gt-k . 01658) ; &I-GT-K01658; + (=gt-pj-1 . #x4134) ; &I-GT-00565; [33-20] + (=ucs@unicode . #x5168) ; 全 )) (define-char '((ideographic-radical . 11) ; ⼊ diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el index c8d86a7..e59aa9f 100644 --- a/lisp/utf-2000/Ideograph-R012-Eight.el +++ b/lisp/utf-2000/Ideograph-R012-Eight.el @@ -354,9 +354,9 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x8B5C) ; &CDP-8B5C; + ((=ucs . #x9FB7) ; 龷 ) - ((=ucs . #x516B) ; 八 + ((=gt-k . 00059) ; >-K00059; )) (shinjigen-1 . 496) (shinjigen-2 . 496) @@ -502,11 +502,27 @@ (=gt-k . 01768) ; &I-GT-K01768; (=gt-pj-k1 . #x322C) ; >-K01768; [18-12] (=ucs@jis . #x20509) ; >-K01768; - ) + )) + )) +(define-char + '((=>daikanwa . 48931) ; &M-48931; + (ideographic-radical . 12) ; ⼋ + (ideographic-strokes . 4) + (total-strokes . 6) + (<-same + ((=ucs . #x20509) ; 𠔉 + )) + (<-simplified + ((=jis-x0213-2-2000 . #x2327) ; >-K01768; [03-07] + )) + (=ucs . #x9FB9) ; 龹 + (->subsumptive ((=gt-k . 01769) ; >-K01769; (=gt-pj-k1 . #x3238) ; >-K01769; [18-24] + (=ucs@JP . #x9FB9) ; >-K01769; ) ((=big5-cdp . #x8BFA) ; &CDP-8BFA; + (=ucs@unicode . #x9FB9) ; &CDP-8BFA; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el index 97496eb..93026e3 100644 --- a/lisp/utf-2000/Ideograph-R013-Down-Box.el +++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el @@ -131,8 +131,8 @@ (ideographic-radical@cns*sources cns11643-3 daikanwa) (total-strokes . 4) - (<-vulgar - ((=ucs . #x5167) ; 內 + (<-denotational + ((=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] )) (=ucs . #x5185) ; 内 )) @@ -144,7 +144,8 @@ ((=ucs . #x5185) ; 内 )) (<-vulgar - ((=daikanwa . 01418) ; &I-M-01418; + ((=ks-x1001 . #x522E) ; &M-01418; [50-14] + (=daikanwa . 01418) ; &I-M-01418; )) (<-vulgar*sources daikanwa) @@ -154,6 +155,22 @@ (=daikanwa . 01512) ; &I-M-01512; )) (define-char + '((ideographic-radical@ucs . 13) ; ⼌ + (ideographic-strokes@ucs . 2) + (ideographic-radical@ucs*sources + daikanwa=01512 cns11643-6 ucs=0x5185) + (ideographic-radical@daikanwa . 11) ; ⼊ + (ideographic-strokes@daikanwa . 2) + (ideographic-radical@daikanwa*sources + daikanwa=01418 cns11643-1 ucs=0x5167) + (ideographic-radical@cns-3 . 9) ; ⼈ + (ideographic-strokes@cns-3 . 2) + (ideographic-radical@cns-3*sources + cns11643-3 daikanwa=366-1) + (total-strokes . 4) + (=jis-x0208@1997 . #x4662) ; &J97-4662; [38-66] + )) +(define-char '((ideographic-radical . 13) ; ⼌ (ideographic-strokes . 2) (total-strokes . 4) @@ -785,51 +802,76 @@ (ideographic-strokes . 6) (total-strokes . 8) (=ucs . #x5190) ; 冐 + )) +(define-char + '((ideographic-radical . 13) ; ⼌ + (ideographic-strokes . 6) + (total-strokes . 8) + (<-denotational + ((=ucs . #x5190) ; 冐 + )) + (hanyu-dazidian 2 1490 4) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((name* . "ideographic component hood") + (=big5-cdp . #x8A78) ; &CDP-8A78; + ) + ((=big5-cdp . #x8958) ; &CDP-8958; + )) + (=jis-x0208 . #x666E) ; >-02014; [70-78] + (=gt . 02014) ; &I-GT-02014; + (=gt-k . 03995) ; &I-GT-K03995; + (=gt-pj-1 . #x666E) ; &I-GT-02014; [70-78] + (=daikanwa . 01534) ; &I-M-01534; + (=hanziku-4 . #xDCEE) ; &I-HZK04-DCEE; + (=ucs@unicode . #x5190) ; >-02014; + (mojikyo . 001534) ; &MCS-600005FE; + )) +(define-char + '((ideographic-radical . 13) ; ⼌ + (ideographic-strokes . 6) + (total-strokes . 8) + (<-denotational + ((=ucs . #x5190) ; 冐 + )) (->subsumptive - ((hanyu-dazidian 2 1490 4) - (ideographic-structure + ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((name* . "ideographic component hood") - (=big5-cdp . #x8A78) ; &CDP-8A78; + ((=ucs . #x66F0) ; 曰 ) ((=big5-cdp . #x8958) ; &CDP-8958; )) - (=jis-x0208 . #x666E) ; >-02014; [70-78] - (=gt . 02014) ; &I-GT-02014; - (=gt-k . 03995) ; &I-GT-K03995; - (=gt-pj-1 . #x666E) ; &I-GT-02014; [70-78] - (=daikanwa . 01534) ; &I-M-01534; - (=hanziku-4 . #xDCEE) ; &I-HZK04-DCEE; - (=ucs@unicode . #x5190) ; >-02014; - (mojikyo . 001534) ; &MCS-600005FE; + (=cbeta . 00155) ; &CB00155; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x66F0) ; 曰 + ((=cns11643-1 . #x454B) ; &C1-454B; [37-43] ) ((=big5-cdp . #x8958) ; &CDP-8958; )) - (=cbeta . 00155) ; &CB00155; + (=cbeta . 04393) ; &CB04393; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x65E5) ; 日 + ((=cns11643-1 . #x454B) ; &C1-454B; [37-43] ) - ((=big5-cdp . #x8958) ; &CDP-8958; + ((=big5-cdp . #x8A73) ; &CDP-8A73; )) - (=cbeta . 04393) ; &CB04393; + (=big5-cdp . #x8CCB) ; &CDP-8CCB; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x65E5) ; 日 + ((=cns11643-1 . #x454B) ; &C1-454B; [37-43] ) ((=ucs . #x6708) ; 月 )) @@ -1196,7 +1238,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs@unicode . #x65E5) ; &UU+65E5; + ((=ucs . #x65E5) ; 日 ) ((=gb2312 . #x4362) ; &C1-492D; [35-66] (=ks-x1001 . #x5873) ; &I-K0-5873; [56-83] diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index 681ad30..d1c9506 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -419,6 +419,22 @@ (=gt-pj-1 . #x5157) ; &I-GT-02141; [49-55] (=daikanwa . 01620) ; &I-M-01620; (=hanziku-1 . #xE2E4) ; &I-HZK01-E2E4; + )) +(define-char + '((=>ucs* . #x51B5) ; 况 + (=>daikanwa . 01620) ; 况 + (ideographic-radical . 15) ; ⼎ + (ideographic-strokes . 5) + (total-strokes . 7) + (<-same + ((=ucs . #x51B5) ; 况 + ) + ((=ucs . #x2F81B) ; 况 + )) + (<-vulgar + ((=ucs . #x6CC1) ; 況 + )) + (=ucs . #xFA71) ; 况 (=cbeta . 00288) ; &I-CB00288; (mojikyo . 001620) ; &MCS-60000654; )) @@ -1421,7 +1437,9 @@ ) ((=ucs . #x51AB) ; 冫 ) - ((=ucs@unicode . #x5468) ; &UU+5468; + ((=jis-x0208 . #x3C7E) ; >-04362; [28-94] + (=gb2312 . #x565C) ; &I-G0-565C; [54-60] + (=cns11643-1 . #x4C52) ; &I-C1-4C52; [44-50] )) (=gb2312 . #x3572) ; >-02197; [21-82] (=jis-x0208@1983 . #x437C) ; &I-J83-437C; [35-92] diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index 13c423b..04a6079 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -1537,13 +1537,15 @@ ((=ucs . #x52C7) ; 勇 )) (->subsumptive - ((hanyu-dazidian 1 372 7) + ((=>ucs* . #x52C7) ; 勇 + (hanyu-dazidian 1 372 7) (shinjigen-1 . 731) (shinjigen-2 . 731) - (=gb2312 . #x5342) ; &M-02360; [51-34] + (=ucs . #xFA76) ; 勇 + (=gb2312 . #x5342) ; &I-G0-5342; [51-34] (=big5 . #xAB69) ; &I-B-AB69; (=daikanwa . 02360) ; &I-M-02360; - (=ucs@unicode . #x52C7) ; &M-02360; + (=ucs@unicode . #x52C7) ; 勇 ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1564,7 +1566,7 @@ )) (<-vulgar ((shinjigen-1 . 731) - (=gb2312 . #x5342) ; &M-02360; [51-34] + (=ucs . #xFA76) ; 勇 (=daikanwa . 02360) ; &I-M-02360; )) (<-vulgar*sources diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el index db2414f..281a46a 100644 --- a/lisp/utf-2000/Ideograph-R020-Wrap.el +++ b/lisp/utf-2000/Ideograph-R020-Wrap.el @@ -16,10 +16,21 @@ (=daikanwa . 02493) ; &I-M-02493; )) (define-char + '((ideographic-radical . 20) ; ⼓ + (ideographic-strokes . 1) + (total-strokes . 3) + (=ucs . #x52FA) ; 勺 + (=big5 . #xA463) ; &I-B-A463; + (=jis-x0208@1997 . #x3C5B) ; 勺 [28-59] + )) +(define-char '((=>ucs* . #x52FA) ; 勺 (ideographic-radical . 20) ; ⼓ (ideographic-strokes . 1) (total-strokes . 3) + (<-denotational + ((=ucs . #x52FA) ; 勺 + )) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") (=ucs . #x2FF9) ; ⿹ @@ -33,7 +44,6 @@ (=ucs . #x2F828) ; 勺 (=ks-x1001 . #x6D43) ; &I-K0-6D43; [77-35] (=cns11643-4 . #x212F) ; &I-C4-212F; [01-15] - (=big5-cdp . #xA463) ; &I-B-A463; (=gt . 03203) ; &I-GT-03203; (=gt-k . 00184) ; &I-GT-K00184; (=gt-pj-2 . #x4634) ; &I-GT-03203; [38-20] @@ -42,9 +52,13 @@ (=ucs@ks . #x52FA) ; 勺 )) (define-char - '((ideographic-radical . 20) ; ⼓ + '((=>ucs* . #x52FA) ; 勺 + (ideographic-radical . 20) ; ⼓ (ideographic-strokes . 1) (total-strokes . 3) + (<-denotational + ((=ucs . #x52FA) ; 勺 + )) (hanyu-dazidian 1 254 14) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") @@ -56,15 +70,15 @@ )) (shinjigen-1 . 762) (shinjigen-2 . 762) - (=ucs . #x52FA) ; 勺 + (=ucs . #xFA77) ; 勺 (=jis-x0208 . #x3C5B) ; &I-J90-3C5B; [28-59] (=gb2312 . #x4957) ; &I-G0-4957; [41-55] (=cns11643-1 . #x4444) ; &I-C1-4444; [36-36] - (=big5 . #xA463) ; &I-B-A463; (=gt . 03204) ; &I-GT-03204; (=gt-k . 00183) ; &I-GT-K00183; (=gt-pj-1 . #x3C5B) ; &I-GT-03204; [28-59] (=daikanwa . 02495) ; &I-M-02495; + (=ucs@unicode . #x52FA) ; 勺 )) (define-char '((ideographic-radical . 20) ; ⼓ diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el index 4cd3f5e..e9f02ad 100644 --- a/lisp/utf-2000/Ideograph-R024-Ten.el +++ b/lisp/utf-2000/Ideograph-R024-Ten.el @@ -1102,6 +1102,18 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 6) (total-strokes . 8) + (<-denotational + ((=ucs . #x2099D) ; 𠦝 + )) + (<-ideographic-component-forms + ((=ucs . #x2099D) ; 𠦝 + )) + (=ucs . #x9FBA) ; 龺 + )) +(define-char + '((ideographic-radical . 24) ; ⼗ + (ideographic-strokes . 6) + (total-strokes . 8) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 3a6bd99..4c66fbf 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -3081,57 +3081,68 @@ (=cns11643-1 . #x4950) ; &I-C1-4950; [41-48] )) (define-char - '((=>ucs . #x356F) ; 㕯 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (=daikanwa . 03369) ; &M-03369; + (=ucs . #x356F) ; 㕯 )) (define-char - '((morohashi-daikanwa 3369 0 0) - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x356F) ; 㕯 - (=cns11643-3 . #x2472) ; &I-C3-2472; [04-82] + (<-denotational + ((=ucs . #x356F) ; 㕯 + )) + (->subsumptive + ((=daikanwa . 03369) ; &M-03369; + ) + ((=cns11643-3 . #x2472) ; &C3-2472; [04-82] + )) )) (define-char - '((=>ucs . #x5436) ; 吶 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=daikanwa . 01418) ; &I-M-01418; + (<-denotational + ((=ucs . #x356F) ; 㕯 )) - (shinjigen-2 . 1000) - (=jis-x0208 . #x5265) ; >-04273; [50-69] - (=big5 . #xA76F) ; &I-B-A76F; - (=gt . 04273) ; &I-GT-04273; - (=gt-pj-1 . #x5265) ; &I-GT-04273; [50-69] - (=daikanwa . 03370) ; &I-M-03370; - (=ucs@jis . #x5436) ; >-04273; - (=ucs@big5 . #x5436) ; >-04273; + (=ucs@unicode . #x356F) ; &UU+356F; )) (define-char - '((morohashi-daikanwa 3370 0 0) - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 + (=ucs . #x5436) ; 吶 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ks-x1001 . #x522E) ; &M-01418; [50-14] + (=daikanwa . 01418) ; &I-M-01418; + )) + (shinjigen-2 . 1000) + (=jis-x0208 . #x5265) ; >-04273; [50-69] + (=big5 . #xA76F) ; &I-B-A76F; + (=gt . 04273) ; &I-GT-04273; + (=gt-pj-1 . #x5265) ; &I-GT-04273; [50-69] + (=daikanwa . 03370) ; &I-M-03370; + (=ucs@jis . #x5436) ; >-04273; + (=ucs@big5 . #x5436) ; >-04273; ) - ((=ucs . #x5167) ; 內 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=cns11643-1 . #x4479) ; &C1-4479; [36-89] + )) + (=cns11643-1 . #x4951) ; &C1-4951; [41-49] + (=ucs@unicode . #x5436) ; &C1-4951; )) - (=ucs . #x5436) ; 吶 - (=cns11643-1 . #x4951) ; &I-C1-4951; [41-49] )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -4707,10 +4718,19 @@ (=hanziku-2 . #xCFC6) ; &I-HZK02-CFC6; )) (define-char - '((=>ucs . #x5468) ; 周 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 5) + (total-strokes . 8) + (=ucs . #x5468) ; 周 + (=big5 . #xA950) ; &I-B-A950; + )) +(define-char + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 5) (total-strokes . 8) + (<-denotational + ((=ucs . #x5468) ; 周 + )) (=ks-x1001 . #x7132) ; &M-03441; [81-18] (=cns11643-6 . #x2A3C) ; &I-C6-2A3C; [10-28] (=daikanwa . 03441) ; &I-M-03441; @@ -4721,6 +4741,9 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 5) (total-strokes . 8) + (<-denotational + ((=ucs . #x5468) ; 周 + )) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") (=ucs . #x2FF5) ; ⿵ @@ -4730,14 +4753,13 @@ ) ((=ucs . #x20BB7) ; 𠮷 )) - (=ucs . #x5468) ; 周 - (=jis-x0208 . #x3C7E) ; &I-J90-3C7E; [28-94] + (=jis-x0208 . #x3C7E) ; >-04362; [28-94] (=gb2312 . #x565C) ; &I-G0-565C; [54-60] (=cns11643-1 . #x4C52) ; &I-C1-4C52; [44-50] - (=big5 . #xA950) ; &I-B-A950; (=gt . 04362) ; &I-GT-04362; (=gt-k . 03736) ; &I-GT-K03736; (=gt-pj-1 . #x3C7E) ; &I-GT-04362; [28-94] + (=ucs@unicode . #x5468) ; >-04362; (mojikyo . 050120) ; &MCS-6000C3C8; )) (define-char @@ -13759,19 +13781,17 @@ (=cbeta . 00064) ; &I-CB00064; )) (define-char - '((=>ucs . #x35A9) ; 㖩 - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 8) - (total-strokes . 11) - (=daikanwa . 03834) ; &M-03834; - )) -(define-char - '((morohashi-daikanwa 3834 0 0) - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x35A9) ; 㖩 - (=cns11643-4 . #x306D) ; &I-C4-306D; [16-77] + (->subsumptive + ((=daikanwa . 03834) ; &M-03834; + ) + ((=cns11643-4 . #x306D) ; &C4-306D; [16-77] + ) + ((=ucs@unicode . #x35A9) ; &UU+35A9; + )) )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -14659,7 +14679,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=big5-cdp . #x8B77) ; &CDP-8B77; + ((=ucs . #x9FB6) ; 龶 ) ((=ucs . #x8D1D) ; 贝 )) @@ -15973,7 +15993,10 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x82E5) ; &UU+82E5; + ((=jis-x0208 . #x3C63) ; >-39907; [28-67] + (=gb2312 . #x4874) ; &I-G0-4874; [40-84] + (=ks-x1001 . #x6534) ; &I-K0-6534; [69-20] + (=cns11643-6 . #x2E24) ; &I-C6-2E24; [14-04] )) (=gb2312 . #x5F76) ; &JSP-356B; [63-86] (=jis-x0212 . #x356B) ; &I-JSP-356B; [21-75] @@ -16041,7 +16064,10 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x90C1) ; &UU+90C1; + ((=jis-x0208 . #x306A) ; >-52972; [16-74] + (=gb2312 . #x5374) ; &I-G0-5374; [51-84] + (=ks-x1001 . #x6974) ; &I-K0-6974; [73-84] + (=daikanwa . 39371) ; &I-M-39371; )) (=gb12345 . #x7C2B) ; &M-03930; [92-11] (=daikanwa . 03930) ; &M-03930; @@ -16663,7 +16689,8 @@ (=ucs@big5 . #x559D) ; 喝 )) (define-char - '((ideographic-radical . 30) ; ⼝ + '((=>ucs* . #x559D) ; 喝 + (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) (total-strokes . 12) (<-denotational @@ -16674,13 +16701,14 @@ (=jis-x0208@1978 . #x3365) ; &I-J78-3365; [19-69] (=jis-x0213-1-2000 . #x2F2C) ; &I-JX1-2F2C; [15-12] )) - (=jis-x0208@1983 . #x3365) ; >-04705; [19-69] + (=ucs . #xFA78) ; 喝 + (=jis-x0208@1983 . #x3365) ; &I-J83-3365; [19-69] (=jis-x0208@1990 . #x3365) ; &I-J90-3365; [19-69] (=gt . 04705) ; &I-GT-04705; (=gt-k . 07729) ; &I-GT-K07729; (=gt-pj-1 . #x3365) ; &I-GT-04705; [19-69] (=jef-china3 . #x47B8) ; &I-JC3-47B8; - (=ucs@jis . #x559D) ; >-04705; + (=ucs@jis . #x559D) ; 喝 )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -17456,7 +17484,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=daikanwa . 09980) ; &I-M-09980; + ((=daikanwa . 09980) ; &M-09980; )) (=jis-x0212 . #x3573) ; &M-03991; [21-83] (=jis-x0213-1-2000 . #x2F2D) ; &I-JX1-2F2D; [15-13] @@ -17470,7 +17498,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs . #x5F65) ; 彥 + ((=ucs@unicode . #x5F65) ; &UU+5F65; )) (=cns11643-2 . #x3A4D) ; &C2-3A4D; [26-45] (=ucs@cns . #x55AD) ; &C2-3A4D; @@ -17489,7 +17517,8 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x5F66) ; &UU+5F66; + ((=gb2312 . #x5165) ; &C3-2C50; [49-69] + (=cns11643-3 . #x2C50) ; &I-C3-2C50; [12-48] )) (=ucs@unicode . #x55AD) ; &UU+55AD; )) @@ -20414,22 +20443,48 @@ )) (define-char '((ideographic-radical . 30) ; ⼝ + (=ucs . #x55E2) ; 嗢 + (=big5 . #xDCDA) ; &I-B-DCDA; + )) +(define-char + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 10) (total-strokes . 13) + (<-denotational + ((=ucs . #x55E2) ; 嗢 + )) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs . #x6637) ; 昷 + ((=ucs . #x25055) ; 𥁕 )) - (=ucs . #x55E2) ; 嗢 - (=jis-x0212 . #x3626) ; &I-JSP-3626; [22-06] + (=jis-x0212 . #x3626) ; &M-04107; [22-06] (=cns11643-2 . #x4221) ; &I-C2-4221; [34-01] (=jis-x0213-2-2000 . #x2439) ; &I-JX2-2439; [04-25] - (=big5 . #xDCDA) ; &I-B-DCDA; (=daikanwa . 04107) ; &I-M-04107; + (=ucs@jis . #x55E2) ; &M-04107; + )) +(define-char + '((=>ucs* . #x55E2) ; 嗢 + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 9) + (total-strokes . 12) + (<-denotational + ((=ucs . #x55E2) ; 嗢 + )) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x6637) ; 昷 + )) + (=ucs . #xFA7B) ; 嗢 + (=ucs@unicode . #x55E2) ; 嗢 )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -23687,7 +23742,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=cns11643-3 . #x383E) ; &C3-383E; [24-30] + ((=cns11643-3 . #x383E) ; &CDP-88C9; [24-30] )) (=cns11643-3 . #x4630) ; &C3-4630; [38-16] )) @@ -24206,7 +24261,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x671D) ; &UU+671D; + ((=ucs . #x671D) ; 朝 )) (=gb2312 . #x3330) ; >-05428; [19-16] (=jis-x0208@1983 . #x535E) ; &I-J83-535E; [51-62] diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el index d3dd034..f308ccf 100644 --- a/lisp/utf-2000/Ideograph-R031-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el @@ -249,7 +249,8 @@ ) ((=ucs . #x3405) ; 㐅 )) - (=cbeta . 00638) ; &CB00638; + (=ucs . #x9FB1) ; 龱 + (=cbeta . 00638) ; &I-CB00638; (mojikyo . 071253) ; &MCS-60011655; )) (define-char @@ -2058,27 +2059,31 @@ '((ideographic-radical . 31) ; ⼞ (ideographic-strokes . 7) (total-strokes . 10) - (hanyu-dazidian 1 720 5) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=big5-cdp . #x8B69) ; &CDP-8B69; - ) + (=ucs . #x5705) ; 圅 + (->subsumptive ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND") - (=ucs . #x2FF4) ; ⿴ + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x56D7) ; 囗 + ((=ucs . #x9FB4) ; 龴 ) - ((=big5-cdp . #x8B75) ; &RUI6-E00E; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND") + (=ucs . #x2FF4) ; ⿴ + ) + ((=ucs . #x56D7) ; 囗 + ) + ((=big5-cdp . #x8B75) ; &RUI6-E00E; + )) )) + (=cns11643-3 . #x3027) ; &M-04776; [16-07] + (=daikanwa . 04776) ; &I-M-04776; + (=cbeta . 05585) ; &I-CB05585; + (=ucs@unicode . #x5705) ; &M-04776; + ) + ((hanyu-dazidian 1 720 5) + (=hanziku-2 . #xE665) ; &HZK02-E665; )) - (=ucs . #x5705) ; 圅 - (=cns11643-3 . #x3027) ; &I-C3-3027; [16-07] - (=daikanwa . 04776) ; &I-M-04776; - (=hanziku-2 . #xE665) ; &I-HZK02-E665; - (=cbeta . 05585) ; &I-CB05585; )) (define-char '((=>ucs . #x211E3) ; 𡇣 diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 4c1631a..be5d4d3 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -7901,12 +7901,14 @@ )) )) (define-char - '((ideographic-radical . 32) ; ⼟ + '((=>ucs* . #x585A) ; 塚 + (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 9) (total-strokes . 12) (<-denotational ((=ucs . #x585A) ; 塚 )) + (=ucs . #xFA7C) ; 塚 (->subsumptive ((<-simplified@JP/Jouyou ((=ucs . #xFA10) ; 塚 @@ -7920,6 +7922,8 @@ (=ucs@jis . #x585A) ; >-06661; (mojikyo . 054239) ; &MCS-6000D3DF; ) + ((=ucs@unicode . #xFA7C) ; &UU+FA7C; + ) ((=jef-china3 . #x47C9) ; &JC3-47C9; )) )) @@ -7967,30 +7971,26 @@ (=cns11643-6 . #x5B62) ; &C6-5B62; [59-66] )) (define-char - '((=>ucs . #x585E) ; 塞 - (ideographic-radical . 32) ; ⼟ - (ideographic-strokes . 10) - (total-strokes . 13) - (shinjigen-2 . 1464) - (=jis-x0208 . #x3A49) ; >-06725; [26-41] - (=ks-x1001 . #x5F5D) ; &I-K0-5F5D; [63-61] - (=big5 . #xB6EB) ; &I-B-B6EB; - (=gt . 06725) ; &I-GT-06725; - (=gt-k . 10208) ; &I-GT-K10208; - (=gt-pj-1 . #x3A49) ; &I-GT-06725; [26-41] - (=daikanwa . 05349) ; &I-M-05349; - (=ucs@jis . #x585E) ; >-06725; - (=ucs@big5 . #x585E) ; >-06725; - )) -(define-char - '((morohashi-daikanwa 5349 0 0) - (ideographic-radical . 32) ; ⼟ + '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 10) (total-strokes . 13) (hanyu-dazidian 1 475 1) (=ucs . #x585E) ; 塞 - (=gb2312 . #x487B) ; &I-G0-487B; [40-91] - (=cns11643-1 . #x6352) ; &I-C1-6352; [67-50] + (=big5 . #xB6EB) ; &I-B-B6EB; + (->subsumptive + ((shinjigen-2 . 1464) + (=jis-x0208 . #x3A49) ; >-06725; [26-41] + (=ks-x1001 . #x5F5D) ; &I-K0-5F5D; [63-61] + (=gt . 06725) ; &I-GT-06725; + (=gt-k . 10208) ; &I-GT-K10208; + (=gt-pj-1 . #x3A49) ; &I-GT-06725; [26-41] + (=daikanwa . 05349) ; &I-M-05349; + (=ucs@jis . #x585E) ; >-06725; + ) + ((=gb2312 . #x487B) ; &C1-6352; [40-91] + (=cns11643-1 . #x6352) ; &I-C1-6352; [67-50] + (=ucs@unicode . #x585E) ; &C1-6352; + )) )) (define-char '((ideographic-radical . 32) ; ⼟ diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el index 491f537..b6b1536 100644 --- a/lisp/utf-2000/Ideograph-R037-Big.el +++ b/lisp/utf-2000/Ideograph-R037-Big.el @@ -1385,17 +1385,30 @@ (=jef-china3 . #x48E3) ; &I-JC3-48E3; )) (define-char - '((=>ucs . #x5954) ; 奔 + '((=>ucs* . #x5954) ; 奔 (ideographic-radical . 37) ; ⼤ (ideographic-strokes . 6) (total-strokes . 9) - (=daikanwa . 05921) ; &M-05921; + (<-denotational + ((=jis-x0208@1997 . #x4B5B) ; &J97-4B5B; [43-59] + )) + (=ucs . #xFA7F) ; 奔 + (=daikanwa . 05921) ; &I-M-05921; )) (define-char - '((morohashi-daikanwa 5921 0 2) - (ideographic-radical . 37) ; ⼤ + '((ideographic-radical . 37) ; ⼤ + (=jis-x0208@1997 . #x4B5B) ; &J97-4B5B; [43-59] + )) +(define-char + '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) + (<-denotational + ((=jis-x0208@1997 . #x4B5B) ; &J97-4B5B; [43-59] + )) + (<-simplified + ((=ucs . #xFA7F) ; 奔 + )) (=ucs . #x5954) ; 奔 (=jis-x0208 . #x4B5B) ; &I-J90-4B5B; [43-59] (=gb2312 . #x313C) ; &I-G0-313C; [17-28] diff --git a/lisp/utf-2000/Ideograph-R045-Sprout.el b/lisp/utf-2000/Ideograph-R045-Sprout.el index c5efca7..69e31c5 100644 --- a/lisp/utf-2000/Ideograph-R045-Sprout.el +++ b/lisp/utf-2000/Ideograph-R045-Sprout.el @@ -181,8 +181,12 @@ (ideographic-strokes . 4) (total-strokes . 7) (=ucs . #x37B7) ; 㞷 - (=cns11643-4 . #x2376) ; &I-C4-2376; [03-86] - (=daikanwa . 07840) ; &I-M-07840; + (->subsumptive + ((=cns11643-4 . #x2376) ; &M-07840; [03-86] + (=daikanwa . 07840) ; &I-M-07840; + ) + ((=ucs@unicode . #x37B7) ; &UU+37B7; + )) )) (define-char '((=>ucs . #x21D08) ; 𡴈 diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el index d66d4eb..fb24aa3 100644 --- a/lisp/utf-2000/Ideograph-R046-Mountain.el +++ b/lisp/utf-2000/Ideograph-R046-Mountain.el @@ -3599,31 +3599,33 @@ '((ideographic-radical . 46) ; ⼭ (ideographic-strokes . 8) (total-strokes . 11) - (shinjigen-2 . 2001) (=ucs . #x5D11) ; 崑 - (=jis-x0208 . #x5642) ; &I-J90-5642; [54-34] - (=ks-x1001 . #x4D5F) ; &I-K0-4D5F; [45-63] - (=iso-ir165 . #x2D63) ; &I-EGB-2D63; [13-67] - (=cns11643-1 . #x597C) ; &I-C1-597C; [57-92] - (=big5 . #xB158) ; &I-B-B158; - (=gt . 10303) ; &I-GT-10303; - (=gt-pj-1 . #x5642) ; &I-GT-10303; [54-34] - (=daikanwa . 08173) ; &I-M-08173; - )) -(define-char - '((=>ucs . #x21E1C) ; 𡸜 - (ideographic-radical . 46) ; ⼭ - (ideographic-strokes . 8) - (total-strokes . 11) - (=daikanwa . 08174) ; &M-08174; + (->subsumptive + ((shinjigen-2 . 2001) + (=jis-x0208 . #x5642) ; >-10303; [54-34] + (=ks-x1001 . #x4D5F) ; &I-K0-4D5F; [45-63] + (=iso-ir165 . #x2D63) ; &I-EGB-2D63; [13-67] + (=big5 . #xB158) ; &I-B-B158; + (=gt . 10303) ; &I-GT-10303; + (=gt-pj-1 . #x5642) ; &I-GT-10303; [54-34] + (=daikanwa . 08173) ; &I-M-08173; + (=ucs@unicode . #x5D11) ; >-10303; + ) + ((=cns11643-1 . #x597C) ; &C1-597C; [57-92] + )) )) (define-char - '((morohashi-daikanwa 8174 0 5) - (ideographic-radical . 46) ; ⼭ + '((ideographic-radical . 46) ; ⼭ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x21E1C) ; 𡸜 - (=cns11643-4 . #x3138) ; &I-C4-3138; [17-24] + (->subsumptive + ((=daikanwa . 08174) ; &M-08174; + ) + ((=ucs@iso . #x21E1C) ; &UU+21E1C; + ) + ((=cns11643-4 . #x3138) ; &C4-3138; [17-24] + )) )) (define-char '((=>ucs . #x5D12) ; 崒 diff --git a/lisp/utf-2000/Ideograph-R055-Two-Hands.el b/lisp/utf-2000/Ideograph-R055-Two-Hands.el index 88c3fee..636e9ad 100644 --- a/lisp/utf-2000/Ideograph-R055-Two-Hands.el +++ b/lisp/utf-2000/Ideograph-R055-Two-Hands.el @@ -31,6 +31,7 @@ )) (=ucs . #x2F890) ; 廾 (=cns11643-6 . #x2174) ; &I-C6-2174; [01-84] + (=big5-cdp . #x887D) ; &I-CDP-887D; (=daikanwa . 09584) ; &I-M-09584; )) (define-char diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el index 35038ba..c73a593 100644 --- a/lisp/utf-2000/Ideograph-R059-Bristle.el +++ b/lisp/utf-2000/Ideograph-R059-Bristle.el @@ -218,37 +218,51 @@ (=hanziku-3 . #xABDE) ; &I-HZK03-ABDE; )) (define-char - '((=>ucs . #x5F65) ; 彥 - (ideographic-radical . 59) ; ⼺ + '((ideographic-radical . 59) ; ⼺ (ideographic-strokes . 6) (total-strokes . 9) - (=big5 . #xABDB) ; &M-09980; - (=daikanwa . 09980) ; &I-M-09980; - (=jef-china3 . #x4DA1) ; &I-JC3-4DA1; - (=ucs@big5 . #x5F65) ; &M-09980; + (<-denotational + ((=jis-x0208@1997 . #x4927) ; &J97-4927; [41-07] + )) + (=ucs . #x5F65) ; 彥 + (=big5 . #xABDB) ; &I-B-ABDB; + (->subsumptive + ((=daikanwa . 09980) ; &M-09980; + (=jef-china3 . #x4DA1) ; &I-JC3-4DA1; + ) + ((=ucs@unicode . #x5F65) ; &UU+5F65; + ) + ((=cns11643-1 . #x507D) ; &C1-507D; [48-93] + )) )) (define-char - '((morohashi-daikanwa 9980 0 0) - (ideographic-radical . 59) ; ⼺ + '((ideographic-radical . 59) ; ⼺ (ideographic-strokes . 6) (total-strokes . 9) - (=ucs . #x5F65) ; 彥 - (=cns11643-1 . #x507D) ; &I-C1-507D; [48-93] + (=jis-x0208@1997 . #x4927) ; &J97-4927; [41-07] )) (define-char '((ideographic-radical . 59) ; ⼺ (ideographic-strokes . 6) (total-strokes . 9) - (shinjigen-2 . 2312) + (<-denotational + ((=jis-x0208@1997 . #x4927) ; &J97-4927; [41-07] + )) (=ucs . #x5F66) ; 彦 - (=jis-x0208 . #x4927) ; &I-J90-4927; [41-07] - (=gb2312 . #x5165) ; &I-G0-5165; [49-69] - (=ks-x1001 . #x6569) ; &I-K0-6569; [69-73] - (=cns11643-3 . #x2C50) ; &I-C3-2C50; [12-48] - (=gt . 12591) ; &I-GT-12591; - (=gt-k . 05167) ; &I-GT-K05167; - (=gt-pj-1 . #x4927) ; &I-GT-12591; [41-07] - (=daikanwa . 09981) ; &I-M-09981; + (->subsumptive + ((shinjigen-2 . 2312) + (=jis-x0208 . #x4927) ; >-12591; [41-07] + (=ks-x1001 . #x6569) ; &I-K0-6569; [69-73] + (=gt . 12591) ; &I-GT-12591; + (=gt-k . 05167) ; &I-GT-K05167; + (=gt-pj-1 . #x4927) ; &I-GT-12591; [41-07] + (=daikanwa . 09981) ; &I-M-09981; + (=ucs@jis . #x5F66) ; >-12591; + ) + ((=gb2312 . #x5165) ; &C3-2C50; [49-69] + (=cns11643-3 . #x2C50) ; &I-C3-2C50; [12-48] + (=ucs@unicode . #x5F66) ; &C3-2C50; + )) )) (define-char '((=>ucs . #x2F899) ; 形 diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el index 908d4ed..05137b5 100644 --- a/lisp/utf-2000/Ideograph-R061-Heart.el +++ b/lisp/utf-2000/Ideograph-R061-Heart.el @@ -8742,34 +8742,25 @@ (=daikanwa . 10946) ; &I-M-10946; )) (define-char - '((=>ucs . #x611B) ; 愛 - (ideographic-radical . 61) ; ⼼ - (ideographic-strokes . 9) - (total-strokes . 13) - (=daikanwa . 10947) ; &M-10947; - )) -(define-char - '((=>ucs . #x611B) ; 愛 - (morohashi-daikanwa 10947 0 0) - (ideographic-radical . 61) ; ⼼ - (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-1 . #x6378) ; &C1-6378; [67-88] - )) -(define-char - '((morohashi-daikanwa 10947 0 1) - (ideographic-radical . 61) ; ⼼ + '((ideographic-radical . 61) ; ⼼ (ideographic-strokes . 9) (total-strokes . 13) - (shinjigen-1 . 2574) - (shinjigen-2 . 2574) (=ucs . #x611B) ; 愛 - (=jis-x0208 . #x3026) ; &I-J90-3026; [16-06] - (=ks-x1001 . #x6471) ; &I-K0-6471; [68-81] - (=gb12345 . #x302E) ; 愛 [16-14] - (=big5 . #xB752) ; &I-B-B752; - (=gt . 13779) ; &I-GT-13779; - (=gt-pj-1 . #x3026) ; &I-GT-13779; [16-06] + (->subsumptive + ((=daikanwa . 10947) ; &M-10947; + ) + ((=cns11643-1 . #x6378) ; &C1-6378; [67-88] + ) + ((shinjigen-1 . 2574) + (shinjigen-2 . 2574) + (=jis-x0208 . #x3026) ; >-13779; [16-06] + (=ks-x1001 . #x6471) ; &I-K0-6471; [68-81] + (=gb12345 . #x302E) ; >-13779; [16-14] + (=big5 . #xB752) ; &I-B-B752; + (=gt . 13779) ; &I-GT-13779; + (=gt-pj-1 . #x3026) ; &I-GT-13779; [16-06] + (=ucs@unicode . #x611B) ; >-13779; + )) )) (define-char '((ideographic-radical . 61) ; ⼼ diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index 8b9c65b..98b2940 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -60,6 +60,13 @@ )) (define-char '((ideographic-radical . 64) ; ⼿ + (ideographic-strokes . 0) + (total-strokes . 4) + (=ucs . #x9FB5) ; 龵 + (=big5-cdp . #x8B6D) ; &I-CDP-8B6D; + )) +(define-char + '((ideographic-radical . 64) ; ⼿ (ideographic-strokes . 1) (total-strokes . 4) (shinjigen-2 . 2808) diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el index 5072130..91ba7f8 100644 --- a/lisp/utf-2000/Ideograph-R066-Rap.el +++ b/lisp/utf-2000/Ideograph-R066-Rap.el @@ -2377,12 +2377,18 @@ (=daikanwa . 13285) ; &M-13285; )) (define-char + '((ideographic-radical . 66) ; ⽁ + (=ucs . #x656C) ; 敬 + )) +(define-char '((morohashi-daikanwa 13285 1) (ideographic-radical . 66) ; ⽁ (ideographic-strokes . 8) (total-strokes . 12) - (=ucs . #x656C) ; 敬 - (=jis-x0208 . #x3749) ; &I-J90-3749; [23-41] + (<-denotational + ((=ucs . #x656C) ; 敬 + )) + (=jis-x0208 . #x3749) ; >-16746; [23-41] (=gb2312 . #x3E34) ; &I-G0-3E34; [30-20] (=ks-x1001 . #x4C57) ; &I-K0-4C57; [44-55] (=cns11643-6 . #x4957) ; &I-C6-4957; [41-55] @@ -2390,6 +2396,7 @@ (=gt . 16746) ; &I-GT-16746; (=gt-k . 09042) ; &I-GT-K09042; (=gt-pj-1 . #x3749) ; &I-GT-16746; [23-41] + (=ucs@unicode . #x656C) ; >-16746; (mojikyo . 050210) ; &MCS-6000C422; )) (define-char @@ -2672,10 +2679,12 @@ (=daikanwa . 13302) ; &I-M-13302; )) (define-char - '((=>ucs . #x656C) ; 敬 - (ideographic-radical . 66) ; ⽁ + '((ideographic-radical . 66) ; ⽁ (ideographic-strokes . 9) (total-strokes . 13) + (<-denotational + ((=ucs . #x656C) ; 敬 + )) (=cns11643-1 . #x6439) ; &M-13303; [68-25] (=daikanwa . 13303) ; &I-M-13303; )) diff --git a/lisp/utf-2000/Ideograph-R071-Not.el b/lisp/utf-2000/Ideograph-R071-Not.el index 2a71435..a2d8711 100644 --- a/lisp/utf-2000/Ideograph-R071-Not.el +++ b/lisp/utf-2000/Ideograph-R071-Not.el @@ -12,6 +12,7 @@ (=gt-k . 00532) ; &I-GT-K00532; (=gt-pj-1 . #x5A5B) ; &I-GT-17330; [58-59] (=daikanwa . 13716) ; &I-M-13716; + (=cbeta . 07099) ; &I-CB07099; (=ucs@jis . #x65E0) ; >-17330; ) ((=gb2312 . #x4E5E) ; &C3-2169; [46-62] diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index 0d8fbb0..ce2434b 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -4809,23 +4809,45 @@ )) (define-char '((ideographic-radical . 72) ; ⽇ + (=ucs . #x669B) ; 暛 + )) +(define-char + '((ideographic-radical . 72) ; ⽇ (ideographic-strokes . 10) (total-strokes . 14) - (=ucs . #x669B) ; 暛 - (=jis-x0212 . #x4254) ; &I-JSP-4254; [34-52] + (<-denotational + ((=ucs . #x669B) ; 暛 + )) + (=jis-x0212 . #x4254) ; &M-14080; [34-52] (=cns11643-4 . #x436B) ; &I-C4-436B; [35-75] (=daikanwa . 14080) ; &I-M-14080; (=jef-china3 . #x51E7) ; &I-JC3-51E7; + (=ucs@jis . #x669B) ; &M-14080; + )) +(define-char + '((ideographic-radical . 72) ; ⽇ + (ideographic-strokes . 9) + (total-strokes . 13) + (<-denotational + ((=ucs . #x669B) ; 暛 + )) + (=ucs@unicode . #x669B) ; &UU+669B; )) (define-char '((ideographic-radical . 72) ; ⽇ (ideographic-strokes . 10) (total-strokes . 14) (=ucs . #x669C) ; 暜 - (=jis-x0212 . #x4255) ; &I-JSP-4255; [34-53] - (=cns11643-3 . #x4735) ; &I-C3-4735; [39-21] - (=daikanwa . 14082) ; &I-M-14082; - (=jef-china3 . #x51B7) ; &I-JC3-51B7; + (->subsumptive + ((=jis-x0212 . #x4255) ; &M-14082; [34-53] + (=daikanwa . 14082) ; &I-M-14082; + (=ucs@jis . #x669C) ; &M-14082; + ) + ((=jef-china3 . #x51B7) ; &JC3-51B7; + ) + ((=cns11643-3 . #x4735) ; &C3-4735; [39-21] + (=ucs@unicode . #x669C) ; &C3-4735; + )) )) (define-char '((=>ucs . #x669D) ; 暝 diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el index e4d3a93..83d5d80 100644 --- a/lisp/utf-2000/Ideograph-R073-Say.el +++ b/lisp/utf-2000/Ideograph-R073-Say.el @@ -3,27 +3,24 @@ '((ideographic-radical . 73) ; ⽈ (ideographic-strokes . 0) (total-strokes . 4) - (shinjigen-2 . 3405) (=ucs . #x66F0) ; 曰 - (=jis-x0208 . #x5B29) ; &I-J90-5B29; [59-09] - (=gb2312 . #x543B) ; &I-G0-543B; [52-27] - (=ks-x1001 . #x6858) ; &I-K0-6858; [72-56] (=big5 . #xA4EA) ; &I-B-A4EA; - (=gt . 18071) ; &I-GT-18071; - (=gt-k . 00535) ; &I-GT-K00535; - (=gt-pj-1 . #x5B29) ; &I-GT-18071; [59-09] - (=daikanwa . 14278) ; &I-M-14278; - )) -(define-char - '((=>ucs . #x66F0) ; 曰 - (morohashi-daikanwa 14278 0 0) - (ideographic-radical . 73) ; ⽈ - (ideographic-strokes . 0) - (total-strokes . 4) - (->confusing - ((=ucs . #x65E5) ; 日 + (->subsumptive + ((shinjigen-2 . 3405) + (=jis-x0208 . #x5B29) ; >-18071; [59-09] + (=gb2312 . #x543B) ; &I-G0-543B; [52-27] + (=ks-x1001 . #x6858) ; &I-K0-6858; [72-56] + (=gt . 18071) ; &I-GT-18071; + (=gt-k . 00535) ; &I-GT-K00535; + (=gt-pj-1 . #x5B29) ; &I-GT-18071; [59-09] + (=daikanwa . 14278) ; &I-M-14278; + (=ucs@unicode . #x66F0) ; >-18071; + ) + ((->confusing + ((=ucs . #x65E5) ; 日 + )) + (=cns11643-1 . #x454B) ; &C1-454B; [37-43] )) - (=cns11643-1 . #x454B) ; &C1-454B; [37-43] )) (define-char '((ideographic-radical . 73) ; ⽈ diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el index 33159f0..409525f 100644 --- a/lisp/utf-2000/Ideograph-R074-Moon.el +++ b/lisp/utf-2000/Ideograph-R074-Moon.el @@ -738,6 +738,15 @@ (ideographic-radical . 74) ; ⽉ (ideographic-strokes . 8) (total-strokes . 12) + (=jis-x0208@1997 . #x442B) ; &J97-442B; [36-11] + )) +(define-char + '((ideographic-radical . 74) ; ⽉ + (ideographic-strokes . 8) + (total-strokes . 12) + (<-denotational + ((=jis-x0208@1997 . #x442B) ; &J97-442B; [36-11] + )) (=daikanwa . 14374) ; &M-14374; (=jef-china3 . #x52AF) ; &I-JC3-52AF; (mojikyo . 014374) ; &MCS-60003826; @@ -747,6 +756,9 @@ (ideographic-radical . 74) ; ⽉ (ideographic-strokes . 8) (total-strokes . 12) + (<-denotational + ((=jis-x0208@1997 . #x442B) ; &J97-442B; [36-11] + )) (=ucs . #x671D) ; 朝 (=jis-x0208 . #x442B) ; &I-J90-442B; [36-11] (=gb2312 . #x332F) ; &I-G0-332F; [19-15] diff --git a/lisp/utf-2000/Ideograph-R077-Stop.el b/lisp/utf-2000/Ideograph-R077-Stop.el index 9393169..62b86df 100644 --- a/lisp/utf-2000/Ideograph-R077-Stop.el +++ b/lisp/utf-2000/Ideograph-R077-Stop.el @@ -17,30 +17,39 @@ )) (define-char '((=>ucs . #x6B62) ; 止 - (morohashi-daikanwa 16253 0 0) + (=>daikanwa . 16253) ; 止 (ideographic-radical . 77) ; ⽌ (ideographic-strokes . 0) (total-strokes . 3) + (<-ideographic-component-forms + ((=ucs . #x6B62) ; 止 + )) (=gt-k . 00182) ; >-K00182; (=gt-pj-k1 . #x3A42) ; >-K00182; [26-34] )) (define-char '((=>ucs . #x6B62) ; 止 - (morohashi-daikanwa 16253 0 1) + (=>daikanwa . 16253) ; 止 (ideographic-radical . 77) ; ⽌ (ideographic-strokes . 0) (total-strokes . 3) + (<-ideographic-component-forms + ((=ucs . #x6B62) ; 止 + )) (=gt-k . 00439) ; >-K00439; (=gt-pj-k1 . #x347D) ; >-K00439; [20-93] )) (define-char - '((=>ucs . #x6B62) ; 止 - (morohashi-daikanwa 16253 0 2) + '((=>daikanwa . 16253) ; 止 (ideographic-radical . 77) ; ⽌ (ideographic-strokes . 0) (total-strokes . 4) - (=gt-k . 00440) ; >-K00440; - (=gt-pj-k1 . #x3675) ; >-K00440; [22-85] + (<-ideographic-component-forms + ((=ucs . #x6B62) ; 止 + )) + (=ucs . #x9FB0) ; 龰 + (=gt-k . 00440) ; &I-GT-K00440; + (=gt-pj-k1 . #x3675) ; 龰 [22-85] )) (define-char '((=>ucs . #x23942) ; 𣥂 diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el index 04bc0d9..83b7d65 100644 --- a/lisp/utf-2000/Ideograph-R087-Claw.el +++ b/lisp/utf-2000/Ideograph-R087-Claw.el @@ -16,10 +16,21 @@ (=daikanwa . 19653) ; &I-M-19653; )) (define-char - '((=>ucs . #x722B) ; 爫 - (ideographic-radical . 87) ; ⽖ + '((ideographic-radical . 87) ; ⽖ (ideographic-strokes . 0) (total-strokes . 4) + (<-ideographic-component-forms + ((=ucs . #x722A) ; 爪 + )) + (=ucs . #x722B) ; 爫 + )) +(define-char + '((ideographic-radical . 87) ; ⽖ + (ideographic-strokes . 0) + (total-strokes . 4) + (<-denotational + ((=ucs . #x722B) ; 爫 + )) (=jis-x0212 . #x4A48) ; &M-19655; [42-40] (=cns11643-4 . #x2151) ; &I-C4-2151; [01-49] (=jis-x0213-2-2000 . #x702A) ; &I-JX2-702A; [80-10] @@ -27,25 +38,38 @@ (=ucs@jis . #x722B) ; &M-19655; )) (define-char - '((=>ucs@jis . #xFA49) ; 爫 - (morohashi-daikanwa 19655 0 2) - (ideographic-radical . 87) ; ⽖ - (ideographic-strokes . 0) - (total-strokes . 4) - (->identical - ((=ucs . #xFA49) ; 爫 + '((name . "CJK RADICAL PAW TWO") + (general-category symbol other) ; Informative Category + (bidi-category . "ON") + (mirrored . nil) + (<-denotational + ((=ucs . #x722B) ; 爫 )) - (=ucs . #x722B) ; 爫 + (<-radical + ((=ucs . #x722A) ; 爪 + )) + (=ucs . #x2EA5) ; ⺥ )) (define-char - '((=>ucs* . #x722B) ; 爫 - (morohashi-daikanwa 19655 0 3) + '((name . "CJK RADICAL PAW ONE") + (general-category symbol other) ; Informative Category + (bidi-category . "ON") + (mirrored . nil) (ideographic-radical . 87) ; ⽖ (ideographic-strokes . 0) (total-strokes . 4) - (=ucs . #xFA49) ; 爫 + (<-denotational + ((=ucs . #x722B) ; 爫 + )) + (=ucs . #x2EA4) ; ⺤ (=jis-x0213-2-2000 . #x7029) ; &I-JX2-7029; [80-09] - (=ucs@gb . #x722B) ; 爫 + (=big5-cdp . #x8B58) ; &I-CDP-8B58; + (=ucs@unicode . #x722B) ; ⺤ + (=ucs@jis . #xFA49) ; ⺤ + (->subsumptive + ((=>ucs* . #x722B) ; 爫 + (=ucs . #xFA49) ; 爫 + )) )) (define-char '((ideographic-radical . 87) ; ⽖ diff --git a/lisp/utf-2000/Ideograph-R100-Life.el b/lisp/utf-2000/Ideograph-R100-Life.el index 5b04851..a812586 100644 --- a/lisp/utf-2000/Ideograph-R100-Life.el +++ b/lisp/utf-2000/Ideograph-R100-Life.el @@ -25,28 +25,32 @@ )) (define-char '((ideographic-radical . 100) ; ⽣ + (ideographic-radical@unicode . 32) ; ⼟ + (ideographic-strokes@unicode . 1) (ideographic-strokes . 0) (total-strokes . 4) (<-ideographic-component-forms ((=ucs . #x751F) ; 生 - ) - ((=gt-k . 00586) ; &I-GT-K00586; )) - (=gt-k . 00587) ; >-K00587; - (=gt-pj-k1 . #x347B) ; >-K00587; [20-91] + (=ucs . #x9FB6) ; 龶 + (=big5-cdp . #x8B77) ; &I-CDP-8B77; + (=gt-k . 00586) ; &I-GT-K00586; + (=gt-pj-k1 . #x323F) ; 龶 [18-31] + (=jef-china3 . #x72FD) ; &I-JC3-72FD; + (mojikyo . 073909) ; &MCS-600120B5; )) (define-char - '((ideographic-radical . 100) ; ⽣ + '((=>ucs . #x9FB6) ; 龶 + (ideographic-radical . 100) ; ⽣ (ideographic-strokes . 0) (total-strokes . 4) (<-ideographic-component-forms ((=ucs . #x751F) ; 生 + ) + ((=ucs . #x9FB6) ; 龶 )) - (=big5-cdp . #x8B77) ; &CDP-8B77; - (=gt-k . 00586) ; &I-GT-K00586; - (=gt-pj-k1 . #x323F) ; &CDP-8B77; [18-31] - (=jef-china3 . #x72FD) ; &I-JC3-72FD; - (mojikyo . 073909) ; &MCS-600120B5; + (=gt-k . 00587) ; >-K00587; + (=gt-pj-k1 . #x347B) ; >-K00587; [20-91] )) (define-char '((ideographic-radical . 100) ; ⽣ diff --git a/lisp/utf-2000/Ideograph-R101-Use.el b/lisp/utf-2000/Ideograph-R101-Use.el index e215b33..e6eee0c 100644 --- a/lisp/utf-2000/Ideograph-R101-Use.el +++ b/lisp/utf-2000/Ideograph-R101-Use.el @@ -267,22 +267,27 @@ (=daikanwa . 21715) ; &I-M-21715; )) (define-char - '((=>ucs . #x24C08) ; 𤰈 - (ideographic-radical . 101) ; ⽤ + '((ideographic-radical . 101) ; ⽤ (ideographic-strokes . 6) (total-strokes . 11) - (=cns11643-5 . #x3361) ; &M-21716; [19-65] - (=daikanwa . 21716) ; &I-M-21716; - (mojikyo . 021716) ; &MCS-600054D4; + (=ucs . #x24C08) ; 𤰈 + (->subsumptive + ((=cns11643-5 . #x3361) ; &M-21716; [19-65] + (=daikanwa . 21716) ; &I-M-21716; + (mojikyo . 021716) ; &MCS-600054D4; + ) + ((hanyu-dazidian 5 3223 6) + (=hanziku-8 . #xF1BB) ; &HZK08-F1BB; + (=ucs@iso . #x24C08) ; &HZK08-F1BB; + )) )) (define-char - '((morohashi-daikanwa 21716 0 0) + '((=>ucs . #x24C08) ; 𤰈 + (=>daikanwa . 21716) ; &M-21716; (ideographic-radical . 101) ; ⽤ - (ideographic-strokes . 6) - (total-strokes . 11) - (hanyu-dazidian 5 3223 6) - (=ucs . #x24C08) ; 𤰈 - (=hanziku-8 . #xF1BB) ; &I-HZK08-F1BB; + (ideographic-strokes . 5) + (total-strokes . 10) + (=cbeta . 08880) ; &CB08880; )) (define-char '((ideographic-radical . 101) ; ⽤ diff --git a/lisp/utf-2000/Ideograph-R129-Brush.el b/lisp/utf-2000/Ideograph-R129-Brush.el index c84dc8a..694d40c 100644 --- a/lisp/utf-2000/Ideograph-R129-Brush.el +++ b/lisp/utf-2000/Ideograph-R129-Brush.el @@ -133,7 +133,8 @@ (=ucs@unicode . #x7C9B) ; >-37838; (mojikyo . 050367) ; &MCS-6000C4BF; ) - ((=cns11643-3 . #x383E) ; &C3-383E; [24-30] + ((=cns11643-3 . #x383E) ; &CDP-88C9; [24-30] + (=big5-cdp . #x88C9) ; &I-CDP-88C9; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index 7aa343c..8e2926e 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -5394,17 +5394,17 @@ (ideographic-strokes . 7) (total-strokes . 11) (=ucs . #x8127) ; 脧 - (=jis-x0212 . #x5631) ; &I-JSP-5631; [54-17] - (=jis-x0213-2-2000 . #x7544) ; &I-JX2-7544; [85-36] - (=daikanwa . 29531) ; &I-M-29531; - )) -(define-char - '((=>ucs . #x8127) ; 脧 - (morohashi-daikanwa 29531 0 0) - (ideographic-radical . 130) ; ⾁ - (ideographic-strokes . 7) - (total-strokes . 11) - (=cns11643-2 . #x3853) ; &C2-3853; [24-51] + (->subsumptive + ((=daikanwa . 29531) ; &M-29531; + ) + ((=cns11643-2 . #x3853) ; &C2-3853; [24-51] + ) + ((=jis-x0212 . #x5631) ; &JX2-7544; [54-17] + (=jis-x0213-2-2000 . #x7544) ; &I-JX2-7544; [85-36] + (=ucs@jis . #x8127) ; &JX2-7544; + ) + ((=ucs@unicode . #x8127) ; &UU+8127; + )) )) (define-char '((ideographic-radical . 130) ; ⾁ diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 2746378..b7e5e97 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -173,6 +173,13 @@ (=hanziku-8 . #xE758) ; &I-HZK08-E758; )) (define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 1) + (total-strokes . 4) + (=ucs . #x9FB7) ; 龷 + (=big5-cdp . #x8B5C) ; &I-CDP-8B5C; + )) +(define-char '((=>ucs . #x827B) ; 艻 (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 2) @@ -3247,10 +3254,17 @@ (=big5 . #xD0A1) ; &I-B-D0A1; )) (define-char - '((=>ucs . #x82E5) ; 若 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 5) + (=ucs . #x82E5) ; 若 + )) +(define-char + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 5) (total-strokes . 9) + (<-denotational + ((=ucs . #x82E5) ; 若 + )) (=cns11643-1 . #x533C) ; >-40124; [51-28] (=gt . 40124) ; &I-GT-40124; (=gt-k . 05092) ; &I-GT-K05092; @@ -3262,8 +3276,10 @@ (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 5) (total-strokes . 8) - (=ucs . #x82E5) ; 若 - (=jis-x0208 . #x3C63) ; &I-J90-3C63; [28-67] + (<-denotational + ((=ucs . #x82E5) ; 若 + )) + (=jis-x0208 . #x3C63) ; >-39907; [28-67] (=gb2312 . #x4874) ; &I-G0-4874; [40-84] (=ks-x1001 . #x6534) ; &I-K0-6534; [69-20] (=cns11643-6 . #x2E24) ; &I-C6-2E24; [14-04] @@ -3271,6 +3287,7 @@ (=gt . 39907) ; &I-GT-39907; (=gt-k . 03733) ; &I-GT-K03733; (=gt-pj-1 . #x3C63) ; &I-GT-39907; [28-67] + (=ucs@unicode . #x82E5) ; >-39907; (mojikyo . 050392) ; &MCS-6000C4D8; )) (define-char @@ -3533,33 +3550,39 @@ (=big5 . #xD07D) ; &I-B-D07D; )) (define-char - '((=>ucs . #x82F1) ; 英 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 5) - (total-strokes . 9) - (=daikanwa . 30808) ; &M-30808; + (=ucs . #x82F1) ; 英 )) (define-char - '((=>ucs . #x82F1) ; 英 - (morohashi-daikanwa 30808 0 0) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 5) (total-strokes . 9) - (=cns11643-1 . #x5341) ; &C1-5341; [51-33] + (<-denotational + ((=ucs . #x82F1) ; 英 + )) + (->subsumptive + ((=daikanwa . 30808) ; &M-30808; + ) + ((=cns11643-1 . #x5341) ; &C1-5341; [51-33] + )) )) (define-char '((morohashi-daikanwa 30808 1) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 5) (total-strokes . 8) - (=ucs . #x82F1) ; 英 - (=jis-x0208 . #x3151) ; &I-J90-3151; [17-49] + (<-denotational + ((=ucs . #x82F1) ; 英 + )) + (=jis-x0208 . #x3151) ; >-39838; [17-49] (=gb2312 . #x5322) ; &I-G0-5322; [51-02] (=ks-x1001 . #x6748) ; &I-K0-6748; [71-40] (=big5 . #xAD5E) ; &I-B-AD5E; (=gt . 39838) ; &I-GT-39838; (=gt-k . 03632) ; &I-GT-K03632; (=gt-pj-1 . #x3151) ; &I-GT-39838; [17-49] + (=ucs@unicode . #x82F1) ; >-39838; (mojikyo . 050394) ; &MCS-6000C4DA; )) (define-char diff --git a/lisp/utf-2000/Ideograph-R146-West.el b/lisp/utf-2000/Ideograph-R146-West.el index cfdfec9..a92985b 100644 --- a/lisp/utf-2000/Ideograph-R146-West.el +++ b/lisp/utf-2000/Ideograph-R146-West.el @@ -92,6 +92,15 @@ (ideographic-radical . 146) ; ⾑ (ideographic-strokes . 3) (total-strokes . 9) + (=jis-x0208@1997 . #x4D57) ; &J97-4D57; [45-55] + )) +(define-char + '((ideographic-radical . 146) ; ⾑ + (ideographic-strokes . 3) + (total-strokes . 9) + (<-denotational + ((=jis-x0208@1997 . #x4D57) ; &J97-4D57; [45-55] + )) (=daikanwa . 34768) ; &M-34768; (=jef-china3 . #x64B7) ; &I-JC3-64B7; (mojikyo . 034768) ; &MCS-600087D0; @@ -101,23 +110,22 @@ (ideographic-radical . 146) ; ⾑ (ideographic-strokes . 3) (total-strokes . 9) + (<-denotational + ((=jis-x0208@1997 . #x4D57) ; &J97-4D57; [45-55] + )) (=ucs . #x8981) ; 要 - (=jis-x0208 . #x4D57) ; &I-J90-4D57; [45-55] - (=gb2312 . #x522A) ; &I-G0-522A; [50-10] - (=ks-x1001 . #x6929) ; &I-K0-6929; [73-09] - (=gt . 46811) ; &I-GT-46811; - (=gt-k . 05360) ; &I-GT-K05360; - (=gt-pj-1 . #x4D57) ; &I-GT-46811; [45-55] - (mojikyo . 050447) ; &MCS-6000C50F; - )) -(define-char - '((=>ucs . #x8981) ; 要 - (morohashi-daikanwa 34768 1 0) - (ideographic-radical . 146) ; ⾑ - (ideographic-strokes . 3) - (total-strokes . 9) - (->mojikyo . 050447) ; 要 - (=cns11643-1 . #x5351) ; &C1-5351; [51-49] + (->subsumptive + ((=jis-x0208 . #x4D57) ; >-46811; [45-55] + (=gb2312 . #x522A) ; &I-G0-522A; [50-10] + (=ks-x1001 . #x6929) ; &I-K0-6929; [73-09] + (=gt . 46811) ; &I-GT-46811; + (=gt-k . 05360) ; &I-GT-K05360; + (=gt-pj-1 . #x4D57) ; &I-GT-46811; [45-55] + (=ucs@unicode . #x8981) ; >-46811; + (mojikyo . 050447) ; &MCS-6000C50F; + ) + ((=cns11643-1 . #x5351) ; &C1-5351; [51-49] + )) )) (define-char '((ideographic-radical . 146) ; ⾑ diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el index 3e51eef..adf96ee 100644 --- a/lisp/utf-2000/Ideograph-R149-Speech.el +++ b/lisp/utf-2000/Ideograph-R149-Speech.el @@ -12708,9 +12708,28 @@ (ideographic-strokes . 12) (total-strokes . 19) (=ucs . #x470C) ; 䜌 - (=cns11643-5 . #x6952) ; &I-C5-6952; [73-50] - (=jis-x0213-2-2000 . #x786B) ; &I-JX2-786B; [88-75] - (=daikanwa . 35943) ; &I-M-35943; + (->subsumptive + ((=jis-x0213-2-2000 . #x786B) ; &M-35943; [88-75] + (=daikanwa . 35943) ; &I-M-35943; + (=ucs@jis . #x470C) ; &M-35943; + ) + ((=big5-cdp . #x8BE7) ; &CDP-8BE7; + ) + ((=cns11643-5 . #x6952) ; &C5-6952; [73-50] + (=ucs@unicode . #x470C) ; &C5-6952; + )) + )) +(define-char + '((ideographic-radical . 149) ; ⾔ + (ideographic-strokes . 12) + (total-strokes . 19) + (<-denotational + ((=cns11643-5 . #x6952) ; &C5-6952; [73-50] + )) + (<-ideographic-component-forms + ((=ucs . #x470C) ; 䜌 + )) + (=ucs . #x9FBB) ; 龻 )) (define-char '((=>ucs . #x27B06) ; 𧬆 diff --git a/lisp/utf-2000/Ideograph-R152-Pig.el b/lisp/utf-2000/Ideograph-R152-Pig.el index 81f8c81..5d759d4 100644 --- a/lisp/utf-2000/Ideograph-R152-Pig.el +++ b/lisp/utf-2000/Ideograph-R152-Pig.el @@ -256,22 +256,21 @@ (=daikanwa . 36360) ; &I-M-36360; )) (define-char - '((=>ucs . #x8C59) ; 豙 - (ideographic-radical . 152) ; ⾗ - (ideographic-strokes . 4) - (total-strokes . 11) - (=jis-x0212 . #x5E72) ; &CDP-8AD1; [62-82] - (=big5-cdp . #x8AD1) ; &I-CDP-8AD1; - (=daikanwa . 36361) ; &I-M-36361; - (=ucs@jis . #x8C59) ; &CDP-8AD1; - )) -(define-char - '((morohashi-daikanwa 36361 0 0) - (ideographic-radical . 152) ; ⾗ + '((ideographic-radical . 152) ; ⾗ (ideographic-strokes . 4) (total-strokes . 11) (=ucs . #x8C59) ; 豙 - (=cns11643-4 . #x354D) ; &I-C4-354D; [21-45] + (->subsumptive + ((=jis-x0212 . #x5E72) ; &M-36361; [62-82] + (=daikanwa . 36361) ; &I-M-36361; + (=ucs@jis . #x8C59) ; &M-36361; + ) + ((=ucs@unicode . #x8C59) ; &UU+8C59; + ) + ((=big5-cdp . #x8AD1) ; &CDP-8AD1; + ) + ((=cns11643-4 . #x354D) ; &C4-354D; [21-45] + )) )) (define-char '((ideographic-radical . 152) ; ⾗ diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index 22ea451..47bc8a3 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -5943,34 +5943,69 @@ (=ucs . #x903F) ; 逿 )) (define-char - '((=>ucs . #x48A1) ; 䢡 - (ideographic-radical . 162) ; ⾡ + '((ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 9) + (=ucs . #x48A1) ; 䢡 + )) +(define-char + '((ideographic-radical . 162) ; ⾡ (ideographic-strokes . 9) (total-strokes . 13) + (<-denotational + ((=ucs . #x48A1) ; 䢡 + )) (=daikanwa . 38979) ; &M-38979; )) (define-char - '((morohashi-daikanwa 38979 0 3) - (ideographic-radical . 162) ; ⾡ + '((ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 9) + (total-strokes . 12) + (<-denotational + ((=ucs . #x48A1) ; 䢡 + )) + (=ucs@unicode . #x48A1) ; &UU+48A1; + )) +(define-char + '((ideographic-radical . 162) ; ⾡ (ideographic-strokes . 9) (total-strokes . 13) - (=ucs . #x48A1) ; 䢡 - (=cns11643-4 . #x412F) ; &I-C4-412F; [33-15] + (<-denotational + ((=ucs . #x48A1) ; 䢡 + )) + (=cns11643-4 . #x412F) ; &C4-412F; [33-15] )) (define-char - '((=>ucs . #x9040) ; 遀 - (ideographic-radical . 162) ; ⾡ + '((ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 9) + (=ucs . #x9040) ; 遀 + )) +(define-char + '((ideographic-radical . 162) ; ⾡ (ideographic-strokes . 9) (total-strokes . 13) + (<-denotational + ((=ucs . #x9040) ; 遀 + )) (=daikanwa . 38980) ; &M-38980; )) (define-char - '((morohashi-daikanwa 38980 0 0) - (ideographic-radical . 162) ; ⾡ + '((ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 9) + (total-strokes . 12) + (<-denotational + ((=ucs . #x9040) ; 遀 + )) + (=ucs@unicode . #x9040) ; &UU+9040; + )) +(define-char + '((ideographic-radical . 162) ; ⾡ (ideographic-strokes . 9) (total-strokes . 13) - (=ucs . #x9040) ; 遀 - (=cns11643-3 . #x447D) ; &I-C3-447D; [36-93] + (<-denotational + ((=ucs . #x9040) ; 遀 + )) + (=cns11643-3 . #x447D) ; &CDP-8CBC; [36-93] + (=big5-cdp . #x8CBC) ; &I-CDP-8CBC; )) (define-char '((ideographic-radical . 162) ; ⾡ diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el index 2a91768..6c11d93 100644 --- a/lisp/utf-2000/Ideograph-R163-City.el +++ b/lisp/utf-2000/Ideograph-R163-City.el @@ -1206,25 +1206,22 @@ '((ideographic-radical . 163) ; ⾢ (ideographic-strokes . 6) (total-strokes . 9) - (shinjigen-2 . 8430) (=ucs . #x90C1) ; 郁 - (=jis-x0208 . #x306A) ; &I-J90-306A; [16-74] - (=gb2312 . #x5374) ; &I-G0-5374; [51-84] - (=ks-x1001 . #x6974) ; &I-K0-6974; [73-84] - (=big5 . #xADA7) ; &I-B-ADA7; - (=gt . 52972) ; &I-GT-52972; - (=gt-k . 05021) ; &I-GT-K05021; - (=gt-pj-1 . #x306A) ; &I-GT-52972; [16-74] - (=daikanwa . 39371) ; &I-M-39371; - )) -(define-char - '((=>ucs . #x90C1) ; 郁 - (morohashi-daikanwa 39371 0 0) - (ideographic-radical . 163) ; ⾢ - (ideographic-strokes . 6) - (total-strokes . 9) - (=cns11643-1 . #x5368) ; &C1-5368; [51-72] - (=ucs@cns . #x90C1) ; &C1-5368; + (->subsumptive + ((shinjigen-2 . 8430) + (=jis-x0208 . #x306A) ; >-52972; [16-74] + (=gb2312 . #x5374) ; &I-G0-5374; [51-84] + (=ks-x1001 . #x6974) ; &I-K0-6974; [73-84] + (=big5 . #xADA7) ; &I-B-ADA7; + (=gt . 52972) ; &I-GT-52972; + (=gt-k . 05021) ; &I-GT-K05021; + (=gt-pj-1 . #x306A) ; &I-GT-52972; [16-74] + (=daikanwa . 39371) ; &I-M-39371; + (=ucs@unicode . #x90C1) ; >-52972; + ) + ((=cns11643-1 . #x5368) ; &C1-5368; [51-72] + (=ucs@cns . #x90C1) ; &C1-5368; + )) )) (define-char '((ideographic-radical . 163) ; ⾢ diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el index 9eaef34..8f7e575 100644 --- a/lisp/utf-2000/Ideograph-R167-Gold.el +++ b/lisp/utf-2000/Ideograph-R167-Gold.el @@ -6598,6 +6598,13 @@ '((ideographic-radical . 167) ; ⾦ (ideographic-strokes . 8) (total-strokes . 16) + (=ucs . #x9FAC) ; 龬 + (=cbeta . 02156) ; &I-CB02156; + )) +(define-char + '((ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 8) + (total-strokes . 16) (=ucs . #x289FE) ; 𨧾 (->subsumptive ((=ucs@iso . #x289FE) ; &UU+289FE; diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 66d3995..3ee5dbd 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -1,6 +1,6 @@ ;;; char-db-util.el --- Character Database utility -;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko. +;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE. @@ -1109,14 +1109,14 @@ no-ucs-unified script excluded-script) (insert-char-data char printable) - (let ((variants (or (char-variants char) - (let ((ucs (get-char-attribute char '->ucs))) - (if ucs - (delete char (char-variants (int-char ucs))))))) + (let ((variants (char-variants char)) + rest variant vs ret) (setq variants (sort variants #'<)) - (while variants - (setq variant (car variants)) + (setq rest variants) + (setq variants (cons char variants)) + (while rest + (setq variant (car rest)) (unless (get-char-attribute variant '<-subsumptive) (if (and (or (null script) (null (setq vs (get-char-attribute variant 'script))) @@ -1130,9 +1130,9 @@ (while ret (or (memq (car ret) variants) ;; (get-char-attribute (car ret) '<-subsumptive) - (setq variants (append variants (list (car ret))))) + (setq rest (nconc rest (list (car ret))))) (setq ret (cdr ret))))))) - (setq variants (cdr variants))))) + (setq rest (cdr rest))))) (defun insert-char-range-data (min max &optional script excluded-script) (let ((code min) diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index fa429c9..d6a0022 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -1,6 +1,6 @@ ;;; ideograph-util.el --- Ideographic Character Database utility -;; Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko. +;; Copyright (C) 1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Chaon model, ISO/IEC 10646, Unicode, UCS-4, MULE. @@ -70,34 +70,7 @@ feature domain)) (char-feature ch feature)))) (throw 'tag ret)))))) - char ignore-sisters) - ;; (let ((rest (list char)) - ;; ret checked) - ;; (catch 'tag - ;; (while rest - ;; (setq char (car rest)) - ;; (unless (memq char checked) - ;; (dolist (domain domains) - ;; (if (and (setq ret (char-feature - ;; char - ;; (expand-char-feature-name - ;; feature domain))) - ;; (or (null tester) - ;; (equal (or (char-feature - ;; char - ;; (expand-char-feature-name - ;; tester domain)) - ;; (char-feature char tester)) - ;; arg))) - ;; (throw 'tag ret))) - ;; (setq rest (append rest - ;; (get-char-attribute char '->subsumptive) - ;; (get-char-attribute char '->denotational) - ;; (get-char-attribute char '<-subsumptive) - ;; (get-char-attribute char '<-denotational)) - ;; checked (cons char checked))) - ;; (setq rest (cdr rest))))) - ) + char ignore-sisters)) (defvar ideograph-radical-chars-vector @@ -173,35 +146,7 @@ (if radical (get-char-feature-from-domains char 'ideographic-strokes domains 'ideographic-radical radical) - (get-char-feature-from-domains char 'ideographic-strokes domains)) - ;; (let ((rest (list char)) - ;; ret checked) - ;; (catch 'tag - ;; (while rest - ;; (setq char (car rest)) - ;; (unless (memq char checked) - ;; (dolist (domain domains) - ;; (if (and (setq ret (or (char-feature - ;; char - ;; (expand-char-feature-name - ;; 'ideographic-radical domain)) - ;; (char-feature - ;; char 'ideographic-radical))) - ;; (or (eq ret radical) - ;; (null radical)) - ;; (setq ret (or (char-feature - ;; char - ;; (expand-char-feature-name - ;; 'ideographic-strokes domain)) - ;; (char-feature - ;; char 'ideographic-strokes)))) - ;; (throw 'tag ret))) - ;; (setq rest (append rest - ;; (get-char-attribute char '->subsumptive) - ;; (get-char-attribute char '->denotational)) - ;; checked (cons char checked))) - ;; (setq rest (cdr rest))))) - ) + (get-char-feature-from-domains char 'ideographic-strokes domains))) ;;;###autoload (defun char-ideographic-strokes (char &optional radical preferred-domains) @@ -236,7 +181,7 @@ (let (ret) (catch 'tag (dolist (domain domains) - (if (setq ret (get-char-attribute + (if (setq ret (char-feature char (intern (format "%s@%s" @@ -246,7 +191,7 @@ ;;;###autoload (defun char-total-strokes (char &optional preferred-domains) (or (char-total-strokes-from-domains char preferred-domains) - (get-char-attribute char 'total-strokes) + (char-feature char 'total-strokes) (char-total-strokes-from-domains char char-db-feature-domains))) ;;;###autoload @@ -260,12 +205,7 @@ (if (string-match "^ideographic-radical@[^@*]+$" (symbol-name feature)) (setq dest (cons feature dest)))) - dest) - ;; (mapcar - ;; (lambda (domain) - ;; (intern (format "%s@%s" 'ideographic-radical domain))) - ;; char-db-feature-domains) - )) + dest))) (map-char-attribute (lambda (chr radical) (dolist (char (append @@ -441,61 +381,6 @@ rest (cdr rest)))))) (unless ignore-default char))))) -;; (defun char-representative-of-daikanwa (char &optional radical -;; ignore-default dont-inherit) -;; (unless radical -;; (setq radical ideographic-radical)) -;; (if (or (encode-char char 'ideograph-daikanwa 'defined-only) -;; (encode-char char '=daikanwa-rev2 'defined-only)) -;; char -;; (let ((m (char-feature char '=>daikanwa)) -;; m-m m-s pat -;; scs sc ret -;; ) -;; (or (and (integerp m) -;; (or (decode-char '=daikanwa-rev2 m 'defined-only) -;; (decode-char 'ideograph-daikanwa m))) -;; (when (or m -;; (setq m (get-char-attribute char 'morohashi-daikanwa))) -;; (setq m-m (car m)) -;; (setq m-s (nth 1 m)) -;; (if (= m-s 0) -;; (or (decode-char '=daikanwa-rev2 m-m 'defined-only) -;; (decode-char 'ideograph-daikanwa m-m)) -;; (when m -;; (setq pat (list m-m m-s)) -;; (map-char-attribute (lambda (c v) -;; (if (equal pat v) -;; c)) -;; 'morohashi-daikanwa)))) -;; (unless dont-inherit -;; ;; (map-char-family -;; ;; (lambda (sc) -;; ;; (let ((ret (char-representative-of-daikanwa sc nil t t))) -;; ;; (if (and ret -;; ;; (or (null radical) -;; ;; (eq (char-ideographic-radical ret radical) -;; ;; radical))) -;; ;; ret))) -;; ;; char) -;; (when (setq scs (append -;; (get-char-attribute char '->subsumptive) -;; (get-char-attribute char '->denotational))) -;; (while (and scs -;; (setq sc (car scs)) -;; (not -;; (and -;; (setq ret -;; (char-representative-of-daikanwa sc nil t t)) -;; (or (null radical) -;; (eq (char-ideographic-radical ret radical) -;; radical) -;; (setq ret nil))))) -;; (setq scs (cdr scs))) -;; ret) -;; ) -;; (unless ignore-default -;; char))))) (defun char-attributes-poly< (c1 c2 accessors testers defaulters) (catch 'tag diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el index c2188b1..c7242d9 100644 --- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el +++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el @@ -404,19 +404,33 @@ (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) + (ideographic-radical . 87) ; ⽖ + (ideographic-strokes . 0) (total-strokes . 4) - (<-radical + (<-denotational ((=ucs . #x722B) ; 爫 )) - (ideograph-cdp . -493) (=ucs . #x2EA4) ; ⺤ + (=jis-x0213-2-2000 . #x7029) ; &I-JX2-7029; [80-09] (=big5-cdp . #x8B58) ; &I-CDP-8B58; + (=ucs@unicode . #x722B) ; ⺤ + (=ucs@jis . #xFA49) ; ⺤ + (->subsumptive + ((=>ucs* . #x722B) ; 爫 + (=ucs . #xFA49) ; 爫 + )) )) (define-char '((name . "CJK RADICAL PAW TWO") (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) + (<-denotational + ((=ucs . #x722B) ; 爫 + )) + (<-radical + ((=ucs . #x722A) ; 爪 + )) (=ucs . #x2EA5) ; ⺥ )) (define-char