From: tomo Date: Sun, 25 Jul 2004 03:46:53 +0000 (+0000) Subject: Sync up with r21-4-15-chise-0_21-30-rev-same. X-Git-Tag: r21-4-15-u2km-0_21-30-rev-same X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c44732866ad44246c83a8fa3ca3dcceabf488be;p=chise%2Fxemacs-chise.git- Sync up with r21-4-15-chise-0_21-30-rev-same. --- diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 297633b..fd57027 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -2071,10 +2071,6 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 7) (total-strokes . 8) - (->same - ((=cns11643-3 . #x2740) ; >-00145; [07-32] - (=daikanwa . 00104) ; &I-M-00104; - )) (<-ancient ((=jis-x0208-1978 . #x4E6F) ; >-64844; [46-79] (=jis-x0208-1983 . #x4E6F) ; &I-J83-4E6F; [46-79] @@ -2086,6 +2082,10 @@ (<-denotational ((=ucs . #x4E3D) ; 丽 )) + (<-same + ((=cns11643-3 . #x2740) ; >-00145; [07-32] + (=daikanwa . 00104) ; &I-M-00104; + )) (=cns11643-6 . #x2936) ; >-00087; [09-22] (=gt . 00087) ; &I-GT-00087; (=gt-pj-2 . #x304B) ; &I-GT-00087; [16-43] @@ -2121,10 +2121,6 @@ (ideographic-radical@cns*sources cns11643) (total-strokes . 8) - (->same - ((=cns11643-6 . #x2936) ; >-00087; [09-22] - (=daikanwa . 00059) ; &I-M-00059; - )) (<-ancient ((=jis-x0208-1978 . #x4E6F) ; >-64844; [46-79] (=jis-x0208-1983 . #x4E6F) ; &I-J83-4E6F; [46-79] @@ -2136,6 +2132,10 @@ (<-denotational ((=ucs . #x4E3D) ; 丽 )) + (<-same + ((=cns11643-6 . #x2936) ; >-00087; [09-22] + (=daikanwa . 00059) ; &I-M-00059; + )) (hanyu-dazidian 1 24 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -2534,7 +2534,7 @@ (:radical 1 ; ⼀ :strokes 11)) (total-strokes . 12) - (->same + (<-same ((=cns11643-6 . #x472D) ; &C6-472D; [39-13] )) (hanyu-dazidian 1 26 11) diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index aa1c059..d4cf8b2 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -303,7 +303,7 @@ (:radical 2 ; ⼁ :strokes 4)) (total-strokes . 5) - (->same + (<-same ((=daikanwa . 04684) ; &M-04684; )) (hanyu-dazidian 1 29 3) diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index 78b871c..b94bc81 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -245,7 +245,7 @@ (ideographic-radical . 3) ; ⼂ (ideographic-strokes . 3) (total-strokes . 4) - (->same + (<-same ((=ucs . #x2007E) ; 𠁾 )) (hanyu-dazidian 1 52 1) @@ -416,10 +416,6 @@ (ideographic-radical@cns*sources cns11643) (total-strokes . 8) - (->same - ((=cns11643-6 . #x2936) ; >-00087; [09-22] - (=daikanwa . 00059) ; &I-M-00059; - )) (<-ancient ((=jis-x0208-1978 . #x4E6F) ; >-64844; [46-79] (=jis-x0208-1983 . #x4E6F) ; &I-J83-4E6F; [46-79] @@ -431,6 +427,10 @@ (<-denotational ((=ucs . #x4E3D) ; 丽 )) + (<-same + ((=cns11643-6 . #x2936) ; >-00087; [09-22] + (=daikanwa . 00059) ; &I-M-00059; + )) (hanyu-dazidian 1 24 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index 2714407..27425fc 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -490,7 +490,7 @@ (ideographic-radical . 4) ; ⼃ (ideographic-strokes . 2) (total-strokes . 3) - (->same + (<-same ((=ucs . #x4E87) ; 亇 )) (=cns11643-3 . #x212D) ; &C3-212D; [01-13] @@ -608,11 +608,11 @@ (ideographic-radical . 4) ; ⼃ (ideographic-strokes . 3) (total-strokes . 4) - (->same + (<-same ((=ucs . #x5301) ; 匁 (=daikanwa . 02502) ; &I-M-02502; )) - (->same*sources + (<-same*sources daikanwa) (=gt . 00176) ; >-00176; (=gt-pj-11 . #x527B) ; >-00176; [50-91] diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index ac7e7e0..50130cb 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -1275,7 +1275,7 @@ (:radical 5 ; ⼄ :strokes 7)) (total-strokes . 8) - (->same + (<-same ((=daikanwa . 21712) ; &M-21712; )) (hanyu-dazidian 1 55 3) diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el index f92e7bf..4785643 100644 --- a/lisp/utf-2000/Ideograph-R008-Lid.el +++ b/lisp/utf-2000/Ideograph-R008-Lid.el @@ -2038,7 +2038,7 @@ '((ideographic-radical . 8) ; ⼇ (ideographic-strokes . 10) (total-strokes . 12) - (->same + (<-same ((=daikanwa . 23981) ; &M-23981; )) (hanyu-dazidian 1 290 1) @@ -2586,7 +2586,7 @@ (:radical 8 ; ⼇ :strokes 13)) (total-strokes . 15) - (->same + (<-same ((=daikanwa . 49510) ; &M-49510; )) (hanyu-dazidian 1 292 5) diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 9a3db26..c6eaa83 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -814,14 +814,14 @@ ((=cns11643-6 . #x2150) ; &M-01512; [01-48] (=daikanwa . 01512) ; &I-M-01512; )) - (->same - ((=daikanwa . 01418) ; &I-M-01418; - )) - (->same*sources - daikanwa) (<-denotational ((=ucs . #x5185) ; 内 )) + (<-same + ((=daikanwa . 01418) ; &I-M-01418; + )) + (<-same*sources + daikanwa) (=cns11643-3 . #x2148) ; &C3-2148; [01-40] (=ucs@cns . #x5185) ; &C3-2148; )) @@ -19249,11 +19249,11 @@ (ideographic-radical@cns*sources cns11643 daikanwa) (total-strokes . 12) - (->same + (<-same ((=ucs . #x5013) ; 倓 (=daikanwa . 00768) ; &I-M-00768; )) - (->same*sources + (<-same*sources shuowen yunhai-bei daikanwa) (=ucs . #x202F4) ; 𠋴 )) diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index ce30094..a4668dd 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -139,12 +139,6 @@ '((ideographic-radical . 15) ; ⼎ (ideographic-strokes . 4) (total-strokes . 6) - (->same - ((=cns11643-3 . #x214C) ; &M-00360; [01-44] - (=daikanwa . 00360) ; &I-M-00360; - )) - (->same*sources - shuowen kanjo ronkou jiyun daikanwa) (->vulgar ((=ucs . #x6C37) ; 氷 (=daikanwa . 17087) ; &I-M-17087; @@ -158,6 +152,12 @@ )) (<-original*sources shinjigen-1) + (<-same + ((=cns11643-3 . #x214C) ; &M-00360; [01-44] + (=daikanwa . 00360) ; &I-M-00360; + )) + (<-same*sources + shuowen kanjo ronkou jiyun daikanwa) (hanyu-dazidian 1 295 9) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el index 6fcd1b7..64c3704 100644 --- a/lisp/utf-2000/Ideograph-R017-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el @@ -775,7 +775,7 @@ (->identical ((=cns11643-7 . #x4E3E) ; &C7-4E3E; [46-30] )) - (->same + (<-same ((=daikanwa . 49274) ; &M-49274; )) (=ucs . #x206A1) ; 𠚡 diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index 5c87547..03b9060 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -1682,14 +1682,14 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 5) (total-strokes . 7) - (->same + (<-same ((=ucs . #x5227) ; 刧 (=daikanwa . 01927) ; &I-M-01927; ) ((=ucs . #x52AB) ; 劫 (=daikanwa . 02316) ; &I-M-02316; )) - (->same*sources + (<-same*sources zhengzi-tong daikanwa) (<-vulgar ((shinjigen-1 . 709) @@ -1719,14 +1719,14 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 5) (total-strokes . 7) - (->same + (<-same ((=ucs . #x5226) ; 刦 (=daikanwa . 01926) ; &I-M-01926; ) ((=ucs . #x52AB) ; 劫 (=daikanwa . 02316) ; &I-M-02316; )) - (->same*sources + (<-same*sources zhengzi-tong daikanwa) (<-vulgar ((shinjigen-1 . 709) @@ -4727,11 +4727,11 @@ '((ideographic-radical . 18) ; ⼑ (ideographic-strokes . 8) (total-strokes . 10) - (->same + (<-same ((=ucs . #x525D) ; 剝 (=daikanwa . 02049) ; &I-M-02049; )) - (->same*sources + (<-same*sources daikanwa) (<-vulgar ((shinjigen-1 . 666) @@ -6031,11 +6031,11 @@ (ideographic-radical@cns*sources cns11643 daikanwa) (total-strokes . 12) - (->same + (<-same ((=ucs . #x5013) ; 倓 (=daikanwa . 00768) ; &I-M-00768; )) - (->same*sources + (<-same*sources shuowen yunhai-bei daikanwa) (=ucs . #x202F4) ; 𠋴 )) @@ -7310,11 +7310,11 @@ (ideographic-radical@cns . 118) ; ⽵ (ideographic-strokes@cns . 8) (total-strokes . 14) - (->same + (<-same ((=ucs . #x7B9A) ; 箚 (=daikanwa . 26149) ; &I-M-26149; )) - (->same*sources + (<-same*sources kouin kangxi daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -8014,19 +8014,19 @@ (total-strokes . 16) (=ucs . #x5292) ; 劒 (->subsumptive - ((->same - ((=ucs . #x528D) ; 劍 - (=daikanwa . 02228) ; &I-M-02228; - )) - (->same*sources - yupian daikanwa) - (<-ancient + ((<-ancient ((shinjigen-1 . 653) (=ucs . #x528D) ; 劍 (=jis-x0208 . #x5178) ; &I-J90-5178; [49-88] )) (<-ancient*sources shinjigen-1) + (<-same + ((=ucs . #x528D) ; 劍 + (=daikanwa . 02228) ; &I-M-02228; + )) + (<-same*sources + yupian daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index 3f8580c..5da8842 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -1605,16 +1605,16 @@ (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 7) (total-strokes . 9) - (->same + (<-denotational + ((=ucs . #x52C9) ; 勉 + )) + (<-same ((shinjigen-1 . 735) (=jis-x0208 . #x4A59) ; >-03050; [42-57] (=cns11643-6 . #x3558) ; &I-C6-3558; [21-56] )) - (->same*sources + (<-same*sources shinjigen-1) - (<-denotational - ((=ucs . #x52C9) ; 勉 - )) (hanyu-dazidian 1 372 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT") diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el index f96406d..ce12d2a 100644 --- a/lisp/utf-2000/Ideograph-R020-Wrap.el +++ b/lisp/utf-2000/Ideograph-R020-Wrap.el @@ -231,7 +231,7 @@ '((ideographic-radical . 20) ; ⼓ (ideographic-strokes . 2) (total-strokes . 4) - (->same + (<-same ((=gt . 00176) ; >-00176; (=daikanwa . 00129) ; &I-M-00129; )) diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el index 636790a..417d8b8 100644 --- a/lisp/utf-2000/Ideograph-R026-Seal.el +++ b/lisp/utf-2000/Ideograph-R026-Seal.el @@ -857,11 +857,11 @@ (ideographic-radical . 26) ; ⼙ (ideographic-strokes . 8) (total-strokes . 10) - (->same + (<-same ((=ucs . #x2F833) ; 卿 (=daikanwa . 02879) ; &I-M-02879; )) - (->same*sources + (<-same*sources zhonghua-dazidian daikanwa) (=daikanwa . 02875) ; &M-02875; )) diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index 20f925d..9014fb1 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -2265,7 +2265,7 @@ (->identical ((=cns11643-6 . #x537B) ; &C6-537B; [51-91] )) - (->same + (<-same ((=daikanwa . 16642) ; &M-16642; )) (=ucs . #x20B81) ; 𠮁 diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 046f4a5..343753a 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -3787,7 +3787,7 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 4) (total-strokes . 7) - (->same + (<-same ((=ucs . #x2F83E) ; 呈 )) (=ucs . #x5448) ; 呈 @@ -11464,7 +11464,7 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 7) (total-strokes . 10) - (->same + (<-same ((=cns11643-6 . #x395E) ; &M-21715; [25-62] (=daikanwa . 21715) ; &I-M-21715; )) @@ -13342,7 +13342,7 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 8) (total-strokes . 11) - (->same + (<-same ((=ucs . #x2F843) ; 啓 )) (=ucs . #x5553) ; 啓 @@ -17849,7 +17849,7 @@ (:radical 1 ; ⼀ :strokes 11)) (total-strokes . 12) - (->same + (<-same ((=cns11643-6 . #x472D) ; &C6-472D; [39-13] )) (hanyu-dazidian 1 26 11) diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el index cbd0fde..7592ea6 100644 --- a/lisp/utf-2000/Ideograph-R031-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el @@ -229,7 +229,7 @@ (:radical 2 ; ⼁ :strokes 4)) (total-strokes . 5) - (->same + (<-same ((=daikanwa . 04684) ; &M-04684; )) (hanyu-dazidian 1 29 3) diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 8cf705a..4df1cb9 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -2360,7 +2360,7 @@ '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 5) (total-strokes . 8) - (->same + (<-same ((=cns11643-6 . #x2641) ; &M-48957; [06-33] (=daikanwa . 48957) ; &I-M-48957; )) diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el index 562a99f..46ad2ef 100644 --- a/lisp/utf-2000/Ideograph-R036-Evening.el +++ b/lisp/utf-2000/Ideograph-R036-Evening.el @@ -70,11 +70,11 @@ )) (->mistakable*sources kangxi daikanwa) - (->same + (<-same ((=ucs . #x5917) ; 夗 (=daikanwa . 05752) ; &I-M-05752; )) - (->same*sources + (<-same*sources zihui daikanwa) (<-vulgar ((shinjigen-1 . 848) @@ -170,11 +170,11 @@ '((ideographic-radical . 36) ; ⼣ (ideographic-strokes . 3) (total-strokes . 6) - (->same + (<-same ((=ucs . #x591A) ; 多 (=daikanwa . 05756) ; &I-M-05756; )) - (->same*sources + (<-same*sources jiyun daikanwa) (hanyu-dazidian 2 862 1) (=ucs . #x21587) ; 𡖇 diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index 83e815f..6286598 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -1130,12 +1130,12 @@ (ideographic-radical . 40) ; ⼧ (ideographic-strokes . 5) (total-strokes . 8) - (->same + (<-same ((=jis-x0208 . #x3539) ; >-08923; [21-25] (=ks-x1001 . #x6B71) ; &I-K0-6B71; [75-81] (=daikanwa . 07111) ; &I-M-07111; )) - (->same*sources + (<-same*sources daikanwa) (->subsumptive ((=daikanwa . 07112) ; &M-07112; diff --git a/lisp/utf-2000/Ideograph-R043-Lame.el b/lisp/utf-2000/Ideograph-R043-Lame.el index ddcc841..105d706 100644 --- a/lisp/utf-2000/Ideograph-R043-Lame.el +++ b/lisp/utf-2000/Ideograph-R043-Lame.el @@ -32,7 +32,7 @@ (ideographic-radical . 43) ; ⼪ (ideographic-strokes . 0) (total-strokes . 3) - (->same + (<-same ((=ucs . #x2F875) ; 尢 )) (=ucs . #x5C22) ; 尢 @@ -607,11 +607,11 @@ '((ideographic-radical . 43) ; ⼪ (ideographic-strokes . 7) (total-strokes . 10) - (->same + (<-same ((=cns11643-6 . #x366A) ; &M-07583; [22-74] (=daikanwa . 07583) ; &I-M-07583; )) - (->same*sources + (<-same*sources daikanwa) (=ucs . #x21BED) ; 𡯭 (=cns11643-6 . #x366B) ; &I-C6-366B; [22-75] diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el index 3d097ba..a2a8b99 100644 --- a/lisp/utf-2000/Ideograph-R044-Corpse.el +++ b/lisp/utf-2000/Ideograph-R044-Corpse.el @@ -1633,7 +1633,7 @@ '((ideographic-radical . 44) ; ⼫ (ideographic-strokes . 9) (total-strokes . 12) - (->same + (<-same ((=daikanwa . 07001) ; &M-07001; )) (=ucs . #x21CAA) ; 𡲪 diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el index a7b97cf..a4dd568 100644 --- a/lisp/utf-2000/Ideograph-R046-Mountain.el +++ b/lisp/utf-2000/Ideograph-R046-Mountain.el @@ -4831,7 +4831,7 @@ (ideographic-radical . 46) ; ⼭ (ideographic-strokes . 9) (total-strokes . 12) - (->same + (<-same ((=ucs . #x2F87C) ; 嵃 )) (=ucs . #x5D43) ; 嵃 diff --git a/lisp/utf-2000/Ideograph-R058-Snout.el b/lisp/utf-2000/Ideograph-R058-Snout.el index 11ff2c0..0af2961 100644 --- a/lisp/utf-2000/Ideograph-R058-Snout.el +++ b/lisp/utf-2000/Ideograph-R058-Snout.el @@ -225,7 +225,7 @@ (->identical ((=cns11643-6 . #x2D32) ; &C6-2D32; [13-18] )) - (->same + (<-same ((=daikanwa . 21759) ; &M-21759; )) (=ucs . #x22456) ; 𢑖 diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el index bdc6007..1c3b180 100644 --- a/lisp/utf-2000/Ideograph-R059-Bristle.el +++ b/lisp/utf-2000/Ideograph-R059-Bristle.el @@ -446,12 +446,12 @@ (ideographic-radical . 59) ; ⼺ (ideographic-strokes . 8) (total-strokes . 11) - (->same + (<-same ((=jis-x0208 . #x4937) ; >-12610; [41-23] (=ks-x1001 . #x7873) ; &I-K0-7873; [88-83] (=daikanwa . 09993) ; &I-M-09993; )) - (->same*sources + (<-same*sources zihui-bei daikanwa) (=ucs . #x2249C) ; 𢒜 (->subsumptive diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el index 2de9caf..f274384 100644 --- a/lisp/utf-2000/Ideograph-R060-Step.el +++ b/lisp/utf-2000/Ideograph-R060-Step.el @@ -847,12 +847,12 @@ (ideographic-radical . 60) ; ⼻ (ideographic-strokes . 6) (total-strokes . 9) - (->same + (<-same ((=jis-x0212 . #x3070) ; &M-00522; [16-80] (=jis-x0213-1-2000 . #x2E31) ; &I-JX1-2E31; [14-17] (=daikanwa . 00522) ; &I-M-00522; )) - (->same*sources + (<-same*sources chuanpian daikanwa) (=daikanwa . 10104) ; &M-10104; (=jef-china3 . #x4DB3) ; &I-JC3-4DB3; diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el index ec1082c..6f8c9a8 100644 --- a/lisp/utf-2000/Ideograph-R061-Heart.el +++ b/lisp/utf-2000/Ideograph-R061-Heart.el @@ -16007,13 +16007,6 @@ '((ideographic-radical . 61) ; ⼼ (ideographic-strokes . 16) (total-strokes . 20) - (->same - ((=jis-x0208 . #x5874) ; >-14505; [56-84] - (=ks-x1001 . #x6B73) ; &I-K0-6B73; [75-83] - (=daikanwa . 11501) ; &I-M-11501; - )) - (->same*sources - zhengzi-tong daikanwa) (<-original ((shinjigen-1 . 2743) (=jis-x0208 . #x5874) ; >-14505; [56-84] @@ -16022,6 +16015,13 @@ )) (<-original*sources shinjigen-1) + (<-same + ((=jis-x0208 . #x5874) ; >-14505; [56-84] + (=ks-x1001 . #x6B73) ; &I-K0-6B73; [75-83] + (=daikanwa . 11501) ; &I-M-11501; + )) + (<-same*sources + zhengzi-tong daikanwa) (shinjigen-1 . 2744) (=ucs . #x39A4) ; 㦤 (=cns11643-4 . #x6343) ; &I-C4-6343; [67-35] diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index 24e805c..feb386d 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -14807,7 +14807,7 @@ (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 12) (total-strokes . 15) - (->same + (<-same ((=ucs . #x2F8C5) ; 撝 )) (=ucs . #x649D) ; 撝 @@ -20168,7 +20168,7 @@ '((ideographic-radical . 64) ; ⼿ (ideographic-strokes . 19) (total-strokes . 22) - (->same@unknown + (<-same@unknown ((=ucs . #x7C61) ; 籡 )) (hanyu-dazidian 3 1991 1) diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index c951143..7ef348d 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -2344,17 +2344,17 @@ )) (->confusing*sources daikanwa) - (->same - ((=ucs . #x26618) ; 𦘘 - (=daikanwa . 29223) ; &I-M-29223; - )) - (->same*sources - daikanwa) (<-Large-Seal ((=daikanwa . 13948) ; &I-M-13948; )) (<-Large-Seal*sources shuowen daikanwa) + (<-same + ((=ucs . #x26618) ; 𦘘 + (=daikanwa . 29223) ; &I-M-29223; + )) + (<-same*sources + daikanwa) (=ucs . #x2F8CC) ; 書 (=cns11643-6 . #x3836) ; &I-C6-3836; [24-22] (=daikanwa . 13928) ; &I-M-13928; @@ -5302,17 +5302,17 @@ (->subsumptive ((ideographic-strokes . 11) (total-strokes . 15) - (->same - ((=ucs . #x6635) ; 昵 - (=daikanwa . 13866) ; &I-M-13866; - )) - (->same*sources - shuowen daikanwa) (->synonyms ((=daikanwa . 00279) ; &I-M-00279; )) (->synonyms*sources shuowen-tongxun-dingsheng daikanwa) + (<-same + ((=ucs . #x6635) ; 昵 + (=daikanwa . 13866) ; &I-M-13866; + )) + (<-same*sources + shuowen daikanwa) (=daikanwa . 14132) ; &M-14132; (=jef-china3 . #x51EA) ; &I-JC3-51EA; ) diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index cbf0bd1..32e077a 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -4705,20 +4705,20 @@ ((=ucs . #x6D3E) ; 派 )) (->subsumptive - ((->same + ((->vulgar ((=gb2312 . #x4549) ; &M-17427; [37-41] (=cns11643-1 . #x5226) ; &I-C1-5226; [50-06] (=daikanwa . 17427) ; &I-M-17427; )) - (->same*sources - daikanwa) - (->vulgar + (->vulgar*sources + zhengzi-tong) + (<-same ((=gb2312 . #x4549) ; &M-17427; [37-41] (=cns11643-1 . #x5226) ; &I-C1-5226; [50-06] (=daikanwa . 17427) ; &I-M-17427; )) - (->vulgar*sources - zhengzi-tong) + (<-same*sources + daikanwa) (shinjigen-1 . 4197) (shinjigen-2 . 4197) (=jis-x0208-1978 . #x4749) ; &M-17428; [39-41] diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el index 126e5df..4733609 100644 --- a/lisp/utf-2000/Ideograph-R087-Claw.el +++ b/lisp/utf-2000/Ideograph-R087-Claw.el @@ -351,12 +351,12 @@ )) (->ancient*sources zhengzi-tong shuowen danchuu daikanwa) - (->same + (<-same ((=jis-x0208 . #x502C) ; >-00285; [48-12] (=ks-x1001 . #x552F) ; &I-K0-552F; [53-15] (=daikanwa . 00214) ; &I-M-00214; )) - (->same*sources + (<-same*sources shuowen daikanwa) (=gt . 25281) ; >-25281; (=gt-k . 09318) ; &I-GT-K09318; @@ -401,7 +401,7 @@ (->identical ((=cns11643-6 . #x4743) ; &C6-4743; [39-35] )) - (->same + (<-same ((=daikanwa . 04811) ; &M-04811; )) (hanyu-dazidian 3 2033 18) diff --git a/lisp/utf-2000/Ideograph-R101-Use.el b/lisp/utf-2000/Ideograph-R101-Use.el index e47f061..04914d8 100644 --- a/lisp/utf-2000/Ideograph-R101-Use.el +++ b/lisp/utf-2000/Ideograph-R101-Use.el @@ -194,7 +194,7 @@ (:radical 5 ; ⼄ :strokes 7)) (total-strokes . 8) - (->same + (<-same ((=daikanwa . 21712) ; &M-21712; )) (hanyu-dazidian 1 55 3) diff --git a/lisp/utf-2000/Ideograph-R102-Field.el b/lisp/utf-2000/Ideograph-R102-Field.el index 5cd9d72..dbde47d 100644 --- a/lisp/utf-2000/Ideograph-R102-Field.el +++ b/lisp/utf-2000/Ideograph-R102-Field.el @@ -178,11 +178,11 @@ (ideographic-radical . 102) ; ⽥ (ideographic-strokes . 2) (total-strokes . 7) - (->same + (<-same ((=ucs . #x753A) ; 町 (=daikanwa . 21735) ; &I-M-21735; )) - (->same*sources + (<-same*sources daikanwa) (=ucs . #x753C) ; 甼 (=jis-x0208 . #x6136) ; &I-J90-6136; [65-22] diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el index fab5859..a1afd59 100644 --- a/lisp/utf-2000/Ideograph-R109-Eye.el +++ b/lisp/utf-2000/Ideograph-R109-Eye.el @@ -3468,7 +3468,7 @@ (ideographic-radical . 109) ; ⽬ (ideographic-strokes . 7) (total-strokes . 12) - (->same + (<-same ((=ucs . #x2F949) ; 䀹 )) (=ucs . #x4039) ; 䀹 diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index 81ab5ed..ee1c5a6 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -3631,11 +3631,11 @@ (ideographic-radical@cns . 118) ; ⽵ (ideographic-strokes@cns . 8) (total-strokes . 14) - (->same + (<-same ((=ucs . #x7B9A) ; 箚 (=daikanwa . 26149) ; &I-M-26149; )) - (->same*sources + (<-same*sources kouin kangxi daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R123-Sheep.el b/lisp/utf-2000/Ideograph-R123-Sheep.el index 7cc98ee..0ddccfc 100644 --- a/lisp/utf-2000/Ideograph-R123-Sheep.el +++ b/lisp/utf-2000/Ideograph-R123-Sheep.el @@ -1668,7 +1668,7 @@ (:radical 8 ; ⼇ :strokes 13)) (total-strokes . 15) - (->same + (<-same ((=daikanwa . 49510) ; &M-49510; )) (hanyu-dazidian 1 292 5) diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el index ac51a1e..a88548b 100644 --- a/lisp/utf-2000/Ideograph-R124-Feather.el +++ b/lisp/utf-2000/Ideograph-R124-Feather.el @@ -4499,10 +4499,10 @@ (ideographic-radical . 124) ; ⽻ (ideographic-strokes . 11) (total-strokes . 17) - (->same + (<-same ((=daikanwa . 28818) ; &M-28818; )) - (->same*sources + (<-same*sources daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R128-Ear.el b/lisp/utf-2000/Ideograph-R128-Ear.el index f47fa04..249904a 100644 --- a/lisp/utf-2000/Ideograph-R128-Ear.el +++ b/lisp/utf-2000/Ideograph-R128-Ear.el @@ -158,7 +158,7 @@ '((ideographic-radical . 128) ; ⽿ (ideographic-strokes . 2) (total-strokes . 8) - (->same + (<-same ((=big5-cdp . #x8C5B) ; &CDP-8C5B; )) (=gt-k . 04926) ; >-K04926; @@ -168,7 +168,7 @@ '((ideographic-radical . 128) ; ⽿ (ideographic-strokes . 2) (total-strokes . 8) - (->same + (<-same ((=gt-k . 04926) ; >-K04926; )) (=big5-cdp . #x8C5B) ; &CDP-8C5B; diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index f3dfc61..c42f198 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -10457,7 +10457,7 @@ (->identical ((=cns11643-6 . #x5D5C) ; &C6-5D5C; [61-60] )) - (->same + (<-same ((=daikanwa . 49158) ; &M-49158; )) (hanyu-dazidian 3 2104 5) @@ -10468,7 +10468,7 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 10) (total-strokes . 14) - (->same + (<-same ((=daikanwa . 49158) ; &M-49158; ) ((=cns11643-6 . #x5D5C) ; &C6-5D5C; [61-60] @@ -11300,7 +11300,7 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 11) (total-strokes . 15) - (->same + (<-same ((=jis-x0208 . #x6733) ; >-38614; [71-19] )) (=ucs . #x81A4) ; 膤 diff --git a/lisp/utf-2000/Ideograph-R135-Tongue.el b/lisp/utf-2000/Ideograph-R135-Tongue.el index 5b87c30..6d774f8 100644 --- a/lisp/utf-2000/Ideograph-R135-Tongue.el +++ b/lisp/utf-2000/Ideograph-R135-Tongue.el @@ -458,7 +458,7 @@ ((=jis-x0208 . #x3C2D) ; >-51568; [28-13] (=daikanwa . 38638) ; &I-M-38638; )) - (->same*sources + (<-same*sources daikanwa) (<-vulgar@jiyun ((=jis-x0212 . #x6130) ; &M-38649; [65-16] diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 1feb777..a18d6f2 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -1000,13 +1000,7 @@ (=ucs . #x8294) ; 芔 (=big5 . #xD06A) ; &I-B-D06A; (->subsumptive - ((->same - ((=ucs . #x2F82C) ; 卉 - (=daikanwa . 02720) ; &I-M-02720; - )) - (->same*sources - shuowen zihui daikanwa) - (<-original + ((<-original ((shinjigen-1 . 816) (=ucs . #x5349) ; 卉 (=jis-x0208 . #x5243) ; &I-J90-5243; [50-35] @@ -1014,6 +1008,12 @@ )) (<-original*sources daikanwa shinjigen-1) + (<-same + ((=ucs . #x2F82C) ; 卉 + (=daikanwa . 02720) ; &I-M-02720; + )) + (<-same*sources + shuowen zihui daikanwa) (shinjigen-1 . 817) (=jis-x0212 . #x5738) ; &M-30685; [55-24] (=cns11643-2 . #x2D2D) ; &I-C2-2D2D; [13-13] @@ -4493,7 +4493,7 @@ (->identical ((=cns11643-6 . #x333E) ; &C6-333E; [19-30] )) - (->same + (<-same ((=daikanwa . 23187) ; &M-23187; )) (=ucs . #x26B5D) ; 𦭝 diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el index bef7946..9659498 100644 --- a/lisp/utf-2000/Ideograph-R142-Insect.el +++ b/lisp/utf-2000/Ideograph-R142-Insect.el @@ -6821,7 +6821,7 @@ (ideographic-radical . 142) ; ⾍ (ideographic-strokes . 10) (total-strokes . 16) - (->same + (<-same ((=ucs . #x2F9BB) ; 蝹 )) (=ucs . #x8779) ; 蝹 diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el index 67cdf79..44482fe 100644 --- a/lisp/utf-2000/Ideograph-R170-Mound.el +++ b/lisp/utf-2000/Ideograph-R170-Mound.el @@ -1571,10 +1571,10 @@ '((ideographic-radical . 170) ; ⾩ (ideographic-strokes . 7) (total-strokes . 10) - (->same + (<-same ((=daikanwa . 41704) ; &M-41704; )) - (->same*sources + (<-same*sources zhonghua-dazidian daikanwa) (=daikanwa . 41676) ; &M-41676; (mojikyo . 041676) ; &MCS-6000A2CC; @@ -4749,7 +4749,7 @@ '((ideographic-radical . 170) ; ⾩ (ideographic-strokes . 23) (total-strokes . 31) - (->same + (<-same ((=daikanwa . 19650) ; &M-19650; )) (=ucs . #x28F75) ; 𨽵 diff --git a/lisp/utf-2000/Ideograph-R177-Leather.el b/lisp/utf-2000/Ideograph-R177-Leather.el index 24fbe64..58412c3 100644 --- a/lisp/utf-2000/Ideograph-R177-Leather.el +++ b/lisp/utf-2000/Ideograph-R177-Leather.el @@ -62,16 +62,16 @@ '((ideographic-radical . 177) ; ⾰ (ideographic-strokes . 3) (total-strokes . 12) - (->same@jiyun + (<-same@jiyun ((=daikanwa . 29262) ; &M-29262; )) - (->same@jiyun*sources + (<-same@jiyun*sources jiyun daikanwa) - (->same@zihui + (<-same@zihui ((=gb12345 . #x484D) ; &M-43109; [40-45] (=daikanwa . 43109) ; &M-43109; )) - (->same@zihui*sources + (<-same@zihui*sources jiyun zihui daikanwa) (=ucs . #x976D) ; 靭 (->subsumptive diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el index b44eb94..3e7e50e 100644 --- a/lisp/utf-2000/Ideograph-R184-Eat.el +++ b/lisp/utf-2000/Ideograph-R184-Eat.el @@ -500,12 +500,12 @@ (ideographic-radical . 184) ; ⾷ (ideographic-strokes . 3) (total-strokes . 12) - (->same + (<-same ((=jis-x0212 . #x6870) ; &M-44433; [72-80] (=jis-x0213-1-2000 . #x7E2A) ; &I-JX1-7E2A; [94-10] (=daikanwa . 44433) ; &I-M-44433; )) - (->same*sources + (<-same*sources daikanwa) (=gt . 59087) ; >-59087; (=gt-pj-8 . #x4646) ; >-59087; [38-38] diff --git a/lisp/utf-2000/Ideograph-R186-Fragrant.el b/lisp/utf-2000/Ideograph-R186-Fragrant.el index c6c47d0..ff50788 100644 --- a/lisp/utf-2000/Ideograph-R186-Fragrant.el +++ b/lisp/utf-2000/Ideograph-R186-Fragrant.el @@ -317,7 +317,7 @@ (ideographic-radical . 186) ; ⾹ (ideographic-strokes . 9) (total-strokes . 18) - (->same + (<-same ((=ucs . #x2FA05) ; 馧 )) (=ucs . #x99A7) ; 馧 diff --git a/lisp/utf-2000/Ideograph-R196-Bird.el b/lisp/utf-2000/Ideograph-R196-Bird.el index f95bc88..fd7ba31 100644 --- a/lisp/utf-2000/Ideograph-R196-Bird.el +++ b/lisp/utf-2000/Ideograph-R196-Bird.el @@ -4862,7 +4862,7 @@ (ideographic-radical . 196) ; ⿃ (ideographic-strokes . 9) (total-strokes . 20) - (->same + (<-same ((=ucs . #x2FA0E) ; 䳭 )) (=ucs . #x4CED) ; 䳭 diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index b87dea3..84b6a98 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -872,8 +872,7 @@ (unless readable (dolist (ignored '(composition ->denotational <-subsumptive ->ucs-unified - ->ideographic-component-forms - <-same)) + ->ideographic-component-forms)) (setq attributes (delq ignored attributes)))) ;; (setq rest ccs-attributes) ;; (while (and rest @@ -949,7 +948,9 @@ (not (string-match "\\*sources$" (symbol-name name))) (or (eq name '<-identical) (string-match "^->simplified" (symbol-name name)) - (string-match "^<-same" (symbol-name name)) + ;; (string-match "^<-same" (symbol-name name)) + (string-match "^->same" (symbol-name name)) + ;; (string-match "^->ideographic-same" (symbol-name name)) (string-match "^->vulgar" (symbol-name name)) (string-match "^->wrong" (symbol-name name)) (string-match "^->original" (symbol-name name))