From 7dfb9517a6af19d40c9cb0a6473ca3a454289d7d Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 2 Jun 2004 18:34:43 +0000 Subject: [PATCH] Sync up with r21-4-14-chise-0_21-25. --- etc/char-data/ChangeLog | 9 + etc/char-data/JC3-to-UCS.txt | 6 +- lisp/utf-2000/ChangeLog | 105 +++++++++++ lisp/utf-2000/Ideograph-R001-One.el | 78 ++++---- lisp/utf-2000/Ideograph-R003-Dot.el | 20 ++- lisp/utf-2000/Ideograph-R004-Slash.el | 7 +- lisp/utf-2000/Ideograph-R040-Roof.el | 1 + lisp/utf-2000/Ideograph-R042-Small.el | 16 +- lisp/utf-2000/Ideograph-R046-Mountain.el | 7 +- lisp/utf-2000/Ideograph-R064-Hand.el | 189 ++++++++++++-------- lisp/utf-2000/Ideograph-R069-Axe.el | 18 +- lisp/utf-2000/Ideograph-R075-Tree.el | 61 ++++--- lisp/utf-2000/Ideograph-R086-Fire.el | 33 ++-- lisp/utf-2000/Ideograph-R104-Sickness.el | 9 +- lisp/utf-2000/Ideograph-R109-Eye.el | 29 +-- lisp/utf-2000/Ideograph-R112-Stone.el | 26 +-- lisp/utf-2000/Ideograph-R113-Spirit.el | 38 ++-- lisp/utf-2000/Ideograph-R134-Mortar.el | 2 +- lisp/utf-2000/char-db-util.el | 44 +---- lisp/utf-2000/ideograph-util.el | 21 ++- .../utf-2000/u03000-CJK-Symbols-and-Punctuation.el | 12 +- 21 files changed, 450 insertions(+), 281 deletions(-) diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog index a70e33c..fb8444e 100644 --- a/etc/char-data/ChangeLog +++ b/etc/char-data/ChangeLog @@ -1,3 +1,12 @@ +2004-02-22 MORIOKA Tomohiko + + * JC3-to-UCS.txt (JC3-81F6): Map to U+6EE8 instead of U+6EEB. + (JC3-82BF): Map to U+6CA7 instead of U+6CA6. + +2004-02-20 MORIOKA Tomohiko + + * JC3-to-UCS.txt (JC3-81F7): Map to U+5BBE instead of U+6EE8. + 2004-02-06 MORIOKA Tomohiko * jp-jouyou.txt (J0-482F): Fix map. diff --git a/etc/char-data/JC3-to-UCS.txt b/etc/char-data/JC3-to-UCS.txt index d28b0e8..7942a51 100644 --- a/etc/char-data/JC3-to-UCS.txt +++ b/etc/char-data/JC3-to-UCS.txt @@ -4191,8 +4191,8 @@ JC3-81F1 U+98DE JC3-81F2 U+5907 JC3-81F4 U+7B14 JC3-81F5 U+6807 -JC3-81F6 U+6EEB -JC3-81F7 U+6EE8 +JC3-81F6 U+6EE8 +JC3-81F7 U+5BBE JC3-81F8 U+629A JC3-81F9 U+829C JC3-81FB U+590D @@ -4227,7 +4227,7 @@ JC3-82BB U+4EEC JC3-82BC U+5C97 JC3-82BD U+5E2E JC3-82BE U+6D51 -JC3-82BF U+6CA6 +JC3-82BF U+6CA7 JC3-82C0 U+6CF8 JC3-82C1 U+7B79 JC3-82C2 U+8138 diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 60c5fea..8916a3b 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,108 @@ +2004-02-22 MORIOKA Tomohiko + + * Ideograph-R042-Small.el (U+5C12): Use `->subsumptive'; add + JC3-41E1. + + * Ideograph-R113-Spirit.el (U+7962): Use `->subsumptive'; add + JC3-5CDB. + +2004-02-22 MORIOKA Tomohiko + + * Ideograph-R112-Stone.el (U+78CC): Use `->subsumptive'; add + JC3-5CB9. + + * Ideograph-R109-Eye.el (U+7784): Use `->subsumptive'; add + JC3-8FA2. + + * Ideograph-R104-Sickness.el (U+764E): Use `->subsumptive'; add + JC3-5AF0. + + * Ideograph-R086-Fire.el (U+70D2): Use `->subsumptive'; add + JC3-8EE2. + (U+70E7): Unify JC3-81CF. + (U+70ED): Unify JC3-81E9. + (U+70EE): Use `->subsumptive'. + +2004-02-20 MORIOKA Tomohiko + + * Ideograph-R075-Tree.el (U+672F): Unify JC3-81CB. + (U+67A6): Use `->subsumptive'; add JC3-70C9. + (U+67CA): Use `->subsumptive'; add JC3-70C7. + (U+6962): Unify JC3-70C5. + (U+6994): Unify JC3-70C8. + (U+69CC): Unify JC3-70C4. + + * Ideograph-R069-Axe.el (U+65B5): Use `->subsumptive'; add + JC3-50E5. + + * Ideograph-R064-Hand.el (U+62D0): Use `->subsumptive'; add + JC3-4FBA. + + * Ideograph-R046-Mountain.el (U+5C72): Use `->subsumptive' to add + JC3-8EFA. + +2004-02-19 MORIOKA Tomohiko + + * Ideograph-R040-Roof.el (U+5BBE): Unify JC3-81F7. + + * u03000-CJK-Symbols-and-Punctuation.el (): Unify GT-00135, GT-K00282, M-00097 and CB02728; modify + `script'. + + * Ideograph-R003-Dot.el (GT-00135): Unify ; set `Ideograph symbol' instead of `Ideograph' into + `script'. + +2004-02-18 MORIOKA Tomohiko + + * Ideograph-R064-Hand.el: Add some GT code points. + (U+624D): Separate GT-00010 and GT-K00176; use + `ideographic-{radical|strokes}' instead of `ideographic-'. + (U-00022A65): Use `->subsumptive'; add `<-original' for M-05844. + (U+39C3): Use `->subsumptive'. + (U+6252): Likewise. + (U-00022A69): Likewise. + (U+6256): Likewise. + + * Ideograph-R003-Dot.el (C3-2740): Use + `<-ancient-ideograph*sources' instead of char-ref in + `<-ancient-ideograph'. + + * Ideograph-R001-One.el (GT-00010): Separate U+624D, G0-3245 and + C1-445F; use `ideographic-{radical|strokes}' instead of + `ideographic-'; use `<-unknown' for U+624D. + (U+4E22): Unify C3-2263, GT-00193, GT-K02131, M-00144, H1-F56D and + JC3-41BA instead of using `->same-ideograph' for M-00144; use + `ideographic-radical@{ucs|cns}'; don't use + `hanyu-dazidian-{vol|page|char}'. + (C6-2936): Use `<-ancient-ideograph*sources' instead of char-ref + in `<-ancient-ideograph'. + (C3-2740): Likewise. + + * Ideograph-R004-Slash.el (C3-2263): Unify U+4E22 and G0-362A; use + `ideographic-radical@{ucs|cns}'. + +2004-02-17 MORIOKA Tomohiko + + * ideograph-util.el (char-ideographic-strokes): Modify preferences + to support inheritance. + (update-ideograph-radical-table): Check radical of inherited + character. + (char-daikanwa): Modify preferences to support inheritance. + (char-ucs): Use `char-feature' instead of `get-char-attribute' to + refer '=>ucs'. + +2004-02-16 MORIOKA Tomohiko + + * char-db-util.el (char-db-insert-char-spec): Delete unused local + variables `al', `cal' and `key'. + (char-db-insert-alist): Don't use deleted local variable `cal'. + +2004-02-16 MORIOKA Tomohiko + + * char-db-util.el (insert-char-attributes): Check each character + specified in `->subsumptive' with `char-db-ignored-attributes'. + 2004-02-16 MORIOKA Tomohiko * char-db-util.el (char-attribute-name<): Fixed. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index c336f26..3a0cd1c 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -422,17 +422,12 @@ (mojikyo . 000018) ; ý €€€’ )) (define-char - '((morohashi-daikanwa 11769 0 1) - (ideographic- (:radical 64 ; ⼿ - :strokes 0 - :sources (morohashi-daikanwa cns-11643 ucs)) - (:radical 1 ; ⼀ - :strokes 2 - :sources (gt))) + '((ideographic-radical . 1) ; ⼀ + (ideographic-strokes . 2) (total-strokes . 3) - (=ucs . #x624D) ; 才 - (=gb2312 . #x3245) ; ø»„Ÿ¦ - (=cns11643-1 . #x445F) ; ø»‘¶´ + (<-unknown + ((=ucs . #x624D) ; 才 + )) (=gt . 00010) ; ý¡€€€Š (=gt-k . 00176) ; ý¡„€‚° (=gt-pj-9 . #x4A2B) ; ý¡€€€Š @@ -1430,6 +1425,31 @@ (mojikyo . 000046) ; ý €€€® )) (define-char + '((ideographic-radical@ucs . 1) ; ⼀ + (ideographic-radical@cns . 4) ; ⼃ + (ideographic-strokes . 5) + (total-strokes . 6) + (hanyu-dazidian 1 386 3) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E3F) ; 丿 + ) + ((=ucs . #x53BB) ; 去 + )) + (=ucs . #x4E22) ; 丢 + (=gb2312 . #x362A) ; ø»„¥ƒ + (=cns11643-3 . #x2263) ; ø»•™„ + (=gt . 00193) ; ý¡€€ƒ + (=gt-k . 02131) ; ý¡„€¡“ + (=gt-pj-2 . #x3132) ; ý¡€€ƒ + (=daikanwa . 00144) ; ø¸€‚ + (=hanziku-1 . #xF56D) ; ý¢€Ÿ•­ + (=jef-china3 . #x41BA) ; øº„†º + (mojikyo . 000144) ; ý €€‚ + )) +(define-char '((ideographic- (:radical 1 ; ⼀ :strokes 5) (:radical 55 ; ⼶ @@ -1480,27 +1500,6 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 5) (total-strokes . 6) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 386) - (hanyu-dazidian-char . 3) - (->same-ideograph - ((=daikanwa . 00144) ; ø¸€‚ - )) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E3F) ; 丿 - ) - ((=ucs . #x53BB) ; 去 - )) - (=ucs . #x4E22) ; 丢 - (=gb2312 . #x362A) ; ø»„¥ƒ - )) -(define-char - '((ideographic-radical . 1) ; ⼀ - (ideographic-strokes . 5) - (total-strokes . 6) (hanyu-dazidian 1 17 9) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1970,11 +1969,11 @@ ((=daikanwa . 00104) ; ø¸€¨ )) (<-ancient-ideograph - (:sources (morohashi-daikanwa) - :char ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; ø¸‹¨¯ - ) + ((ideographic-radical . 198) ; ⿅ + (=daikanwa . 47663) ; ø¸‹¨¯ )) + (<-ancient-ideograph*sources + daikanwa) (=cns11643-6 . #x2936) ; ø»œ€µ (=gt . 00087) ; ý¡€€— (=gt-pj-2 . #x304B) ; ý¡€€— @@ -2011,10 +2010,11 @@ (=daikanwa . 00059) ; ø¸€€» )) (<-ancient-ideograph - (:char ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; ø¸‹¨¯ - ) - :sources (morohashi-daikanwa))) + ((ideographic-radical . 198) ; ⿅ + (=daikanwa . 47663) ; ø¸‹¨¯ + )) + (<-ancient-ideograph*sources + daikanwa) (hanyu-dazidian 1 24 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index e4027ee..1b55961 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -128,15 +128,22 @@ (mojikyo . 000096) ; ý €€  )) (define-char - '((script Ideograph) - (=>ucs . #x3005) ; 々 + '((name . "IDEOGRAPHIC ITERATION MARK") + (script Ideograph symbol) + (general-category letter modifier) ; Informative Category + (bidi-category . "L") + (mirrored . nil) (ideographic-radical . 3) ; ⼂ (ideographic-strokes . 2) (total-strokes . 3) + (=ucs . #x3005) ; 々 + (=jis-x0208 . #x2139) ; ø½‰¶” + (=gb2312 . #x2129) ; ø»„†Œ (=gt . 00135) ; ý¡€€‚‡ (=gt-k . 00282) ; ý¡„€„š (=gt-pj-2 . #x306C) ; ý¡€€‚‡ (=daikanwa . 00097) ; ø¸€¡ + (=big5-eten . #xC6E0) ; ý¢€Œ›  (=cbeta . 02728) ; ø¸ ª¨ (mojikyo . 000097) ; ý €€¡ )) @@ -402,10 +409,11 @@ (=daikanwa . 00059) ; ø¸€€» )) (<-ancient-ideograph - (:char ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; ø¸‹¨¯ - ) - :sources (morohashi-daikanwa))) + ((ideographic-radical . 198) ; ⿅ + (=daikanwa . 47663) ; ø¸‹¨¯ + )) + (<-ancient-ideograph*sources + daikanwa) (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 2af366a..3f22e22 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -1049,8 +1049,8 @@ (mojikyo . 000143) ; ý €€‚ )) (define-char - '((=>ucs . #x4E22) ; 丢 - (ideographic-radical . 4) ; ⼃ + '((ideographic-radical@ucs . 1) ; ⼀ + (ideographic-radical@cns . 4) ; ⼃ (ideographic-strokes . 5) (total-strokes . 6) (hanyu-dazidian 1 386 3) @@ -1062,6 +1062,8 @@ ) ((=ucs . #x53BB) ; 去 )) + (=ucs . #x4E22) ; 丢 + (=gb2312 . #x362A) ; ø»„¥ƒ (=cns11643-3 . #x2263) ; ø»•™„ (=gt . 00193) ; ý¡€€ƒ (=gt-k . 02131) ; ý¡„€¡“ @@ -1069,7 +1071,6 @@ (=daikanwa . 00144) ; ø¸€‚ (=hanziku-1 . #xF56D) ; ý¢€Ÿ•­ (=jef-china3 . #x41BA) ; øº„†º - (=ucs@cns . #x4E22) ; ø»•™„ (mojikyo . 000144) ; ý €€‚ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index 6478e8f..8282cf7 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -2419,6 +2419,7 @@ (total-strokes . 10) (=ucs . #x5BBE) ; 宾 (=gb2312 . #x3176) ; ø»„ž¹ + (=jef-china3 . #x81F7) ; øºˆ‡· )) (define-char '((ideographic-radical . 40) ; ⼧ diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el index af8bbb0..121345f 100644 --- a/lisp/utf-2000/Ideograph-R042-Small.el +++ b/lisp/utf-2000/Ideograph-R042-Small.el @@ -65,14 +65,20 @@ (=daikanwa . 07476) ; ø¸´´ )) (define-char - '((ideographic-radical . 42) ; ⼩ + '((=>daikanwa . 07477) ; ø¸´µ + (ideographic-radical . 42) ; ⼩ (ideographic-strokes . 2) (total-strokes . 5) (=ucs . #x5C12) ; 尒 - (=cns11643-2 . #x2155) ; ø»“” - (=jis-x0213-1-2000 . #x4F5B) ; ø»£—š - (=big5 . #xC974) ; ý¢€Œ¥´ - (=daikanwa . 07477) ; ø¸´µ + (->subsumptive + ((=daikanwa . 07477) ; ø¸´µ + (=jef-china3 . #x41E1) ; øº„‡¡ + ) + ((=cns11643-2 . #x2155) ; ø»“” + (=jis-x0213-1-2000 . #x4F5B) ; ø»£—š + (=big5 . #xC974) ; ý¢€Œ¥´ + (=ucs@unicode . #x5C12) ; ø»“” + )) )) (define-char '((ideographic-radical . 42) ; ⼩ diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el index 8a4c31e..f45f892 100644 --- a/lisp/utf-2000/Ideograph-R046-Mountain.el +++ b/lisp/utf-2000/Ideograph-R046-Mountain.el @@ -43,7 +43,12 @@ (ideographic-strokes . 1) (total-strokes . 4) (=ucs . #x5C72) ; å±² - (=iso-ir165 . #x2E39) ; ø»² + (->subsumptive + ((=iso-ir165 . #x2E39) ; ø»² + (=ucs@unicode . #x5C72) ; ø»² + ) + ((=jef-china3 . #x8EFA) ; øºˆ»º + )) )) (define-char '((ideographic-radical . 46) ; â¼­ diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index ed1fdb7..128c0e7 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -34,19 +34,12 @@ )) (define-char '((morohashi-daikanwa 11769 0 1) - (ideographic- (:radical 64 ; ⼿ - :strokes 0 - :sources (morohashi-daikanwa cns-11643 ucs)) - (:radical 1 ; ⼀ - :strokes 2 - :sources (gt))) + (ideographic-radical . 64) ; ⼿ + (ideographic-strokes . 0) (total-strokes . 3) (=ucs . #x624D) ; 才 (=gb2312 . #x3245) ; ø»„Ÿ¦ (=cns11643-1 . #x445F) ; ø»‘¶´ - (=gt . 00010) ; ý¡€€€Š - (=gt-k . 00176) ; ý¡„€‚° - (=gt-pj-9 . #x4A2B) ; ý¡€€€Š (mojikyo . 051101) ; ý €Œž )) (define-char @@ -58,6 +51,9 @@ (=jis-x0212 . #x3F37) ; ø»‹ª (=cns11643-4 . #x2137) ; ø»— ¾ (=jis-x0213-2-2000 . #x2C77) ; ø»¤®  + (=gt . 14887) ; ý¡€ƒ¨§ + (=gt-k . 00334) ; ý¡„€…Ž + (=gt-pj-3 . #x5B72) ; ý¡€ƒ¨§ (=daikanwa . 11770) ; ø¸‚·º (=cbeta . 02854) ; ø¸ ¬¦ (=jef-china3 . #x4FA3) ; øº„¾£ @@ -78,14 +74,26 @@ (=daikanwa . 11771) ; ø¸‚·» )) (define-char - '((ideographic-radical . 64) ; ⼿ + '((=>daikanwa . 11772) ; ø»›·³ + (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 1) (total-strokes . 5) - (hanyu-dazidian 3 1825 2) + (<-original + ((=daikanwa . 05844) ; ø¸›” + )) + (<-original*sources + zhengzi-tong daikanwa) (=ucs . #x22A65) ; 𢩥 - (=cns11643-6 . #x2328) ; ø»›·³ - (=daikanwa . 11772) ; ø¸‚·¼ - (=hanziku-5 . #xCE43) ; ý¢œ¹ƒ + (->subsumptive + ((=cns11643-6 . #x2328) ; ø»›·³ + (=gt . 14896) ; ý¡€ƒ¨° + (=gt-pj-3 . #x5B73) ; ý¡€ƒ¨° + (=daikanwa . 11772) ; ø¸‚·¼ + ) + ((hanyu-dazidian 3 1825 2) + (=hanziku-5 . #xCE43) ; ý¢œ¹ƒ + (=ucs@iso . #x22A65) ; ý¢œ¹ƒ + )) )) (define-char '((ideographic-radical . 64) ; ⼿ @@ -94,23 +102,25 @@ (hanyu-dazidian 3 1825 1) (=ucs . #x22A66) ; 𢩦 (=cns11643-5 . #x216E) ; ø»™«¹ + (=gt . 14893) ; ý¡€ƒ¨­ + (=gt-pj-3 . #x5B74) ; ý¡€ƒ¨­ (=daikanwa . 11773) ; ø¸‚·½ (=hanziku-5 . #xCE42) ; ý¢œ¹‚ )) (define-char - '((=>ucs . #x39C3) ; 㧃 - (ideographic-radical . 64) ; ⼿ - (ideographic-strokes . 2) - (total-strokes . 5) - (=daikanwa . 11774) ; ø¸‚·¾ - )) -(define-char - '((morohashi-daikanwa 11774 0 1) + '((=>daikanwa . 11774) ; ý¡€ƒ¨« (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 2) (total-strokes . 5) (=ucs . #x39C3) ; 㧃 - (=cns11643-4 . #x217B) ; ø»—¢‚ + (->subsumptive + ((=gt . 14891) ; ý¡€ƒ¨« + (=gt-pj-3 . #x5B75) ; ý¡€ƒ¨« + (=daikanwa . 11774) ; ø¸‚·¾ + (=ucs@unicode . #x39C3) ; ý¡€ƒ¨« + ) + ((=cns11643-4 . #x217B) ; ø»—¢‚ + )) )) (define-char '((ideographic-radical . 64) ; ⼿ @@ -128,6 +138,8 @@ (total-strokes . 5) (=ucs . #x624F) ; 扏 (=cns11643-3 . #x2250) ; ø»•˜± + (=gt . 14892) ; ý¡€ƒ¨¬ + (=gt-pj-3 . #x5B77) ; ý¡€ƒ¨¬ (=daikanwa . 11776) ; ø¸‚¸€ )) (define-char @@ -136,6 +148,8 @@ (total-strokes . 5) (=ucs . #x39C4) ; 㧄 (=cns11643-4 . #x217A) ; ø»—¢ + (=gt . 14890) ; ý¡€ƒ¨ª + (=gt-pj-3 . #x5B78) ; ý¡€ƒ¨ª (=daikanwa . 11777) ; ø¸‚¸ )) (define-char @@ -146,6 +160,8 @@ (=jis-x0212 . #x3F38) ; ø»‹« (=cns11643-2 . #x215E) ; ø»“ (=big5 . #xC97D) ; ý¢€Œ¥½ + (=gt . 14906) ; ý¡€ƒ¨º + (=gt-pj-3 . #x5B79) ; ý¡€ƒ¨º (=daikanwa . 11778) ; ø¸‚¸‚ )) (define-char @@ -158,30 +174,33 @@ (=cns11643-1 . #x4657) ; ø»‘¹¨ (=jis-x0213-2-2000 . #x2C78) ; ø»¤®¡ (=big5 . #xA5B7) ; ý¢€Š–· + (=gt . 14903) ; ý¡€ƒ¨· + (=gt-pj-3 . #x5B7A) ; ý¡€ƒ¨· (=daikanwa . 11779) ; ø¸‚¸ƒ (=jef-china3 . #x4FA9) ; øº„¾© )) (define-char - '((=>ucs . #x6252) ; 扒 - (ideographic-radical . 64) ; ⼿ - (ideographic-strokes . 2) - (total-strokes . 5) - (=jis-x0212 . #x3F3A) ; ø»‹­ - (=jis-x0213-2-2000 . #x2C79) ; ø»¤®¢ - (=big5 . #xA5B6) ; ý¢€Š–¶ - (=daikanwa . 11780) ; ø¸‚¸„ - (=jef-china3 . #x4FAA) ; øº„¾ª - (=ucs@jis . #x6252) ; ø»‹­ - (=ucs@big5 . #x6252) ; ø»‹­ - )) -(define-char - '((morohashi-daikanwa 11780 0 0) + '((=>daikanwa . 11780) ; ø»‹­ (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 2) (total-strokes . 5) (=ucs . #x6252) ; 扒 - (=gb2312 . #x3047) ; ø»„œ¬ - (=cns11643-1 . #x4656) ; ø»‘¹§ + (->subsumptive + ((=jis-x0212 . #x3F3A) ; ø»‹­ + (=jis-x0213-2-2000 . #x2C79) ; ø»¤®¢ + (=big5 . #xA5B6) ; ý¢€Š–¶ + (=gt . 14900) ; ý¡€ƒ¨´ + (=gt-pj-3 . #x5B7B) ; ý¡€ƒ¨´ + (=daikanwa . 11780) ; ø¸‚¸„ + (=jef-china3 . #x4FAA) ; øº„¾ª + (=ucs@jis . #x6252) ; ø»‹­ + (=ucs@big5 . #x6252) ; ø»‹­ + ) + ((=cns11643-1 . #x4656) ; ø»‘¹§ + ) + ((=gb2312 . #x3047) ; ø»„œ¬ + (=ucs@unicode . #x6252) ; ø»„œ¬ + )) )) (define-char '((ideographic-radical . 64) ; ⼿ @@ -208,6 +227,8 @@ (=jis-x0212 . #x3F3B) ; ø»‹® (=cns11643-1 . #x4655) ; ø»‘¹¦ (=big5 . #xA5B5) ; ý¢€Š–µ + (=gt . 14897) ; ý¡€ƒ¨± + (=gt-pj-3 . #x5B7C) ; ý¡€ƒ¨± (=daikanwa . 11782) ; ø¸‚¸† (=jef-china3 . #x80D8) ; øºˆƒ˜ )) @@ -218,6 +239,8 @@ (hanyu-dazidian 3 1827 6) (=ucs . #x22A6B) ; 𢩫 (=cns11643-5 . #x216F) ; ø»™«º + (=gt . 14898) ; ý¡€ƒ¨² + (=gt-pj-3 . #x5B7D) ; ý¡€ƒ¨² (=daikanwa . 11783) ; ø¸‚¸‡ (=hanziku-5 . #xCEA9) ; ý¢œº© )) @@ -247,22 +270,22 @@ (=hanziku-5 . #xCE45) ; ý¢œ¹… )) (define-char - '((=>ucs . #x22A69) ; 𢩩 + '((=>daikanwa . 11786) ; ý¡€ƒ¨¯ (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 2) (total-strokes . 5) - (=daikanwa . 11786) ; ø¸‚¸Š - (mojikyo . 011786) ; ý €‚¸Š - )) -(define-char - '((morohashi-daikanwa 11786 0 0) - (ideographic-radical . 64) ; ⼿ - (ideographic-strokes . 2) - (total-strokes . 5) - (hanyu-dazidian 3 1827 4) (=ucs . #x22A69) ; 𢩩 - (=cns11643-6 . #x232A) ; ø»›·µ - (=hanziku-5 . #xCEA7) ; ý¢œº§ + (->subsumptive + ((=gt . 14895) ; ý¡€ƒ¨¯ + (=gt-pj-3 . #x5C21) ; ý¡€ƒ¨¯ + (=daikanwa . 11786) ; ø¸‚¸Š + ) + ((hanyu-dazidian 3 1827 4) + (=cns11643-6 . #x232A) ; ø»›·µ + (=hanziku-5 . #xCEA7) ; ý¢œº§ + (=ucs@iso . #x22A69) ; ø»›·µ + (mojikyo . 011786) ; ý €‚¸Š + )) )) (define-char '((ideographic-radical . 64) ; ⼿ @@ -270,6 +293,8 @@ (total-strokes . 5) (=ucs . #x39C5) ; 㧅 (=cns11643-3 . #x224F) ; ø»•˜° + (=gt . 14904) ; ý¡€ƒ¨¸ + (=gt-pj-3 . #x5C22) ; ý¡€ƒ¨¸ (=daikanwa . 11787) ; ø¸‚¸‹ (=cbeta . 06599) ; ø¸¡§‡ )) @@ -278,10 +303,18 @@ (ideographic-strokes . 2) (total-strokes . 5) (=ucs . #x6256) ; 扖 - (=jis-x0212 . #x3F3C) ; ø»‹¯ - (=jis-x0213-1-2000 . #x7465) ; ø»¤º - (=daikanwa . 11788) ; ø¸‚¸Œ - (=jef-china3 . #x4FAB) ; øº„¾« + (->subsumptive + ((=jis-x0212 . #x3F3C) ; ø»‹¯ + (=jis-x0213-1-2000 . #x7465) ; ø»¤º + (=gt . 14901) ; ý¡€ƒ¨µ + (=gt-pj-3 . #x5C23) ; ý¡€ƒ¨µ + (=daikanwa . 11788) ; ø¸‚¸Œ + (=jef-china3 . #x4FAB) ; øº„¾« + (=ucs@jis-1990 . #x6256) ; ø»‹¯ + (=ucs@jis-2000 . #x6256) ; ø»‹¯ + ) + ((=ucs@unicode . #x6256) ; 󰀗 + )) )) (define-char '((ideographic-radical . 64) ; ⼿ @@ -2602,32 +2635,34 @@ (=cns11643-2 . #x2A55) ; ø»“š¢ )) (define-char - '((=>ucs . #x62D0) ; 拐 - (ideographic-radical . 64) ; ⼿ - (ideographic-strokes . 5) - (total-strokes . 8) - (shinjigen-2 . 2851) - (=jis-x0208-1983 . #x327D) ; ø»†ª¢ - (=jis-x0208-1990 . #x327D) ; ø½Š– - (=cns11643-1 . #x4D66) ; ø»’„‰ - (=big5 . #xA9E4) ; ý¢€Š§¤ - (=gt . 15032) ; ý¡€ƒª¸ - (=gt-k . 03656) ; ý¡„€¹ˆ - (=gt-pj-1 . #x327D) ; ý¡€ƒª¸ - (=daikanwa . 11955) ; ø¸‚º³ - (=jef-china3 . #x4FBB) ; øº„¾» - (=ucs@jis . #x62D0) ; ø»†ª¢ - (=ucs@big5 . #x62D0) ; ø»†ª¢ - )) -(define-char - '((morohashi-daikanwa 11955 0 5) + '((=>daikanwa . 11955) ; ø»†ª¢ (ideographic-radical . 64) ; ⼿ (ideographic-strokes . 5) (total-strokes . 8) (=ucs . #x62D0) ; 拐 - (=jis-x0208-1978 . #x327D) ; ø»‚–š - (=gb2312 . #x3955) ; ø»„ªˆ - (=ks-x1001 . #x4E58) ; ø»‰‰ + (->subsumptive + ((shinjigen-1 . 2852) + (shinjigen-2 . 2851) + (=jis-x0208-1983 . #x327D) ; ø»†ª¢ + (=jis-x0208-1990 . #x327D) ; ø½Š– + (=cns11643-1 . #x4D66) ; ø»’„‰ + (=big5 . #xA9E4) ; ý¢€Š§¤ + (=gt . 15032) ; ý¡€ƒª¸ + (=gt-k . 03656) ; ý¡„€¹ˆ + (=gt-pj-1 . #x327D) ; ý¡€ƒª¸ + (=daikanwa . 11955) ; ø¸‚º³ + (=jef-china3 . #x4FBB) ; øº„¾» + (=ucs@jis . #x62D0) ; ø»†ª¢ + (=ucs@big5 . #x62D0) ; ø»†ª¢ + ) + ((shinjigen-1 . 2851) + (=jef-china3 . #x4FBA) ; øº„¾º + ) + ((=jis-x0208-1978 . #x327D) ; ø»‚–š + (=gb2312 . #x3955) ; ø»„ªˆ + (=ks-x1001 . #x4E58) ; ø»‰‰ + (=ucs@unicode . #x62D0) ; ø»‚–š + )) )) (define-char '((ideographic-radical . 64) ; ⼿ diff --git a/lisp/utf-2000/Ideograph-R069-Axe.el b/lisp/utf-2000/Ideograph-R069-Axe.el index 16a35d9..a7edf20 100644 --- a/lisp/utf-2000/Ideograph-R069-Axe.el +++ b/lisp/utf-2000/Ideograph-R069-Axe.el @@ -906,15 +906,21 @@ (=cns11643-4 . #x504D) ; ø»˜¦– )) (define-char - '((ideographic-radical . 69) ; ⽄ + '((=>daikanwa . 13604) ; ø»¤¯² + (ideographic-radical . 69) ; ⽄ (ideographic-strokes . 13) (total-strokes . 17) (=ucs . #x65B5) ; 斵 - (=cns11643-3 . #x546B) ; ø»–¢¨ - (=jis-x0213-2-2000 . #x2D6B) ; ø»¤¯² - (=daikanwa . 13604) ; ø¸ƒ”¤ - (=cbeta . 00010) ; ø¸ €Š - (mojikyo . 013604) ; ý €ƒ”¤ + (->subsumptive + ((=jis-x0213-2-2000 . #x2D6B) ; ø»¤¯² + (=daikanwa . 13604) ; ø¸ƒ”¤ + ) + ((=cns11643-3 . #x546B) ; ø»–¢¨ + (=cbeta . 00010) ; ø¸ €Š + (=jef-china3 . #x50E5) ; øº…ƒ¥ + (=ucs@unicode . #x65B5) ; ø»–¢¨ + (mojikyo . 013604) ; ý €ƒ”¤ + )) )) (define-char '((ideographic-radical . 69) ; ⽄ diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index 474c2d9..3464707 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -168,6 +168,7 @@ (=gb2312 . #x4A75) ; ø»…ƒ¦ (=cns11643-3 . #x2252) ; ø»•˜³ (=big5-cdp . #x8A61) ; ý¢€ˆ©¡ + (=jef-china3 . #x81CB) ; øºˆ‡‹ )) (define-char '((=>ucs . #x672F) ; 术 @@ -2792,18 +2793,19 @@ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x67A6) ; 枦 - (=jis-x0208-1983 . #x5B45) ; ø»‡¥¸ - (=jis-x0208-1990 . #x5B45) ; ø½‹‹¬ - (=gt . 18539) ; ý¡€„¡« - (=gt-pj-1 . #x5B45) ; ý¡€„¡« - (mojikyo . 055279) ; ý €Ÿ¯ - )) -(define-char - '((=>ucs . #x67A6) ; 枦 - (ideographic-radical . 75) ; ⽊ - (ideographic-strokes . 4) - (total-strokes . 8) - (=jis-x0208-1978 . #x5B45) ; ø»ƒ‘° + (->subsumptive + ((=jis-x0208-1978 . #x5B45) ; ø»ƒ‘° + ) + ((=jis-x0208-1983 . #x5B45) ; ø»‡¥¸ + (=jis-x0208-1990 . #x5B45) ; ø½‹‹¬ + (=gt . 18539) ; ý¡€„¡« + (=gt-pj-1 . #x5B45) ; ý¡€„¡« + (=jef-china3 . #x70C9) ; øº‡ƒ‰ + (=ucs@jis . #x67A6) ; ø»‡¥¸ + (mojikyo . 055279) ; ý €Ÿ¯ + ) + ((=ucs@unicode . #x67A6) ; 󰀘 + )) )) (define-char '((ideographic-radical . 75) ; ⽊ @@ -3407,26 +3409,26 @@ (mojikyo . 014609) ; ý €ƒ¤‘ )) (define-char - '((=>ucs . #x67CA) ; 柊 - (ideographic-radical . 75) ; ⽊ - (ideographic-strokes . 5) - (total-strokes . 9) - (=jis-x0208-1978 . #x4922) ; ø»‚¶± - (=big5 . #xCF60) ; ý¢€Œ½  - (=daikanwa . 14610) ; ø¸ƒ¤’ - (=ucs@big5 . #x67CA) ; ø»‚¶± - )) -(define-char - '((morohashi-daikanwa 14610 0 1) + '((=>daikanwa . 14610) ; ø»‚¶± (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x67CA) ; 柊 - (=jis-x0208-1983 . #x4922) ; ø»‡Š¹ - (=jis-x0208-1990 . #x4922) ; ø½Š°­ - (=cns11643-2 . #x2B42) ; ø»“›­ - (=gt . 18605) ; ý¡€„¢­ - (=gt-pj-1 . #x4922) ; ý¡€„¢­ + (->subsumptive + ((=jis-x0208-1978 . #x4922) ; ø»‚¶± + (=big5 . #xCF60) ; ý¢€Œ½  + (=daikanwa . 14610) ; ø¸ƒ¤’ + (=ucs@big5 . #x67CA) ; ø»‚¶± + ) + ((=jis-x0208-1983 . #x4922) ; ø»‡Š¹ + (=jis-x0208-1990 . #x4922) ; ø½Š°­ + (=gt . 18605) ; ý¡€„¢­ + (=gt-pj-1 . #x4922) ; ý¡€„¢­ + (=ucs@unicode . #x67CA) ; ø»‡Š¹ + ) + ((=cns11643-2 . #x2B42) ; ø»“›­ + (=jef-china3 . #x70C7) ; øº‡ƒ‡ + )) )) (define-char '((ideographic-radical . 75) ; ⽊ @@ -12379,6 +12381,7 @@ (=cns11643-2 . #x4353) ; ø»“¿Ž (=gt . 19314) ; ý¡€„­² (=gt-pj-1 . #x466A) ; ý¡€„­² + (=jef-china3 . #x70C5) ; øº‡ƒ… )) (define-char '((ideographic-radical . 75) ; ⽊ @@ -13803,6 +13806,7 @@ (=ucs . #x6994) ; 榔 (=gb2312 . #x4046) ; ø»„´‹ (=cns11643-1 . #x6445) ; ø»’¥š + (=jef-china3 . #x70C8) ; øº‡ƒˆ )) (define-char '((=>ucs . #x3BA4) ; 㮤 @@ -15162,6 +15166,7 @@ (=jis-x0208-1990 . #x4448) ; ø½Š©½ (=gt . 19365) ; ý¡€„®¥ (=gt-pj-1 . #x4448) ; ý¡€„®¥ + (=jef-china3 . #x70C4) ; øº‡ƒ„ )) (define-char '((=>ucs . #x69CD) ; 槍 diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 238e737..b05c65a 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -2705,21 +2705,20 @@ (=cns11643-2 . #x304F) ; ø»“£ )) (define-char - '((ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 6) - (total-strokes . 10) - (=ucs . #x70D2) ; 烒 - (=big5 . #xD272) ; ý¢€‰² - (=daikanwa . 19001) ; ø¸„¨¹ - (mojikyo . 019001) ; ý €„¨¹ - )) -(define-char - '((=>ucs . #x70D2) ; 烒 - (morohashi-daikanwa 19001 0 0) + '((=>daikanwa . 19001) ; ý¢€‰² (ideographic-radical . 86) ; ⽕ (ideographic-strokes . 6) (total-strokes . 10) - (=cns11643-2 . #x3055) ; ø»“£– + (=ucs . #x70D2) ; 烒 + (->subsumptive + ((=big5 . #xD272) ; ý¢€‰² + (=daikanwa . 19001) ; ø¸„¨¹ + (=jef-china3 . #x8EE2) ; øºˆ»¢ + (=ucs@unicode . #x70D2) ; ý¢€‰² + (mojikyo . 019001) ; ý €„¨¹ + ) + ((=cns11643-2 . #x3055) ; ø»“£– + )) )) (define-char '((ideographic-radical . 86) ; ⽕ @@ -3252,6 +3251,7 @@ (total-strokes . 10) (=ucs . #x70E7) ; 烧 (=gb2312 . #x4955) ; ø»…¨ + (=jef-china3 . #x81CF) ; øºˆ‡ )) (define-char '((ideographic-radical . 86) ; ⽕ @@ -3296,14 +3296,19 @@ (total-strokes . 10) (=ucs . #x70ED) ; 热 (=gb2312 . #x4848) ; ø»„¿½ + (=jef-china3 . #x81E9) ; øºˆ‡© )) (define-char '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 6) (total-strokes . 10) (=ucs . #x70EE) ; 烮 - (=cns11643-3 . #x3230) ; ø»•¯± - (mojikyo . 059745) ; ý €Ž¥¡ + (->subsumptive + ((=ucs@unicode . #x70EE) ; ý €Ž¥¡ + (mojikyo . 059745) ; ý €Ž¥¡ + ) + ((=cns11643-3 . #x3230) ; ø»•¯± + )) )) (define-char '((ideographic-radical . 86) ; ⽕ diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el index 9f3b19b..2ccf807 100644 --- a/lisp/utf-2000/Ideograph-R104-Sickness.el +++ b/lisp/utf-2000/Ideograph-R104-Sickness.el @@ -6797,8 +6797,13 @@ (ideographic-strokes . 12) (total-strokes . 17) (=ucs . #x764E) ; 癎 - (=ks-x1001 . #x4A56) ; ø»‰— - (=cns11643-3 . #x5554) ; ø»–£¯ + (->subsumptive + ((=ks-x1001 . #x4A56) ; ø»‰— + (=jef-china3 . #x5AF0) ; øº…«° + ) + ((=cns11643-3 . #x5554) ; ø»–£¯ + (=ucs@unicode . #x764E) ; ø»–£¯ + )) )) (define-char '((ideographic-radical . 104) ; ⽧ diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el index 16222c2..46059b8 100644 --- a/lisp/utf-2000/Ideograph-R109-Eye.el +++ b/lisp/utf-2000/Ideograph-R109-Eye.el @@ -5636,22 +5636,23 @@ (=daikanwa . 23553) ; ø¸…° )) (define-char - '((=>ucs . #x7784) ; 瞄 + '((=>daikanwa . 23554) ; ø»’­ (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 9) - (total-strokes . 14) - (=cns11643-1 . #x6972) ; ø»’­ - (=daikanwa . 23554) ; ø¸…°‚ - )) -(define-char - '((morohashi-daikanwa 23554 0 2) - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 8) - (total-strokes . 13) (=ucs . #x7784) ; 瞄 - (=gb2312 . #x4369) ; ø»„¹ˆ - (=jis-x0212 . #x4F2C) ; ø»‹§¿ - (=big5 . #xBACB) ; ý¢€‹«‹ + (->subsumptive + ((ideographic-strokes . 9) + (total-strokes . 14) + (=cns11643-1 . #x6972) ; ø»’­ + (=daikanwa . 23554) ; ø¸…°‚ + ) + ((ideographic-strokes . 8) + (total-strokes . 13) + (=gb2312 . #x4369) ; ø»„¹ˆ + (=jis-x0212 . #x4F2C) ; ø»‹§¿ + (=big5 . #xBACB) ; ý¢€‹«‹ + (=jef-china3 . #x8FA2) ; øºˆ¾¢ + (=ucs@unicode . #x7784) ; ø»„¹ˆ + )) )) (define-char '((ideographic-radical . 109) ; ⽬ diff --git a/lisp/utf-2000/Ideograph-R112-Stone.el b/lisp/utf-2000/Ideograph-R112-Stone.el index 803e135..096c837 100644 --- a/lisp/utf-2000/Ideograph-R112-Stone.el +++ b/lisp/utf-2000/Ideograph-R112-Stone.el @@ -4941,23 +4941,23 @@ (=gb2312 . #x3468) ; ø»„£… )) (define-char - '((=>ucs . #x78CC) ; 磌 - (ideographic-radical . 112) ; ⽯ - (ideographic-strokes . 10) - (total-strokes . 15) - (=jis-x0212 . #x5027) ; ø»‹©˜ - (=jis-x0213-2-2000 . #x7251) ; ø»¦”® - (=big5 . #xE6C3) ; ý¢€Ž›ƒ - (=daikanwa . 24396) ; ø¸…½Œ - (=ucs@jis . #x78CC) ; ø»‹©˜ - )) -(define-char - '((morohashi-daikanwa 24396 0 5) + '((=>daikanwa . 24396) ; ø»‹©˜ (ideographic-radical . 112) ; ⽯ (ideographic-strokes . 10) (total-strokes . 15) (=ucs . #x78CC) ; 磌 - (=cns11643-2 . #x524B) ; ø»”•ˆ + (->subsumptive + ((=jis-x0212 . #x5027) ; ø»‹©˜ + (=jis-x0213-2-2000 . #x7251) ; ø»¦”® + (=big5 . #xE6C3) ; ý¢€Ž›ƒ + (=daikanwa . 24396) ; ø¸…½Œ + (=ucs@jis . #x78CC) ; ø»‹©˜ + ) + ((=jef-china3 . #x5CB9) ; øº…²¹ + ) + ((=cns11643-2 . #x524B) ; ø»”•ˆ + (=ucs@unicode . #x78CC) ; ø»”•ˆ + )) )) (define-char '((=>ucs . #x78CD) ; 磍 diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el index d259bd0..c4f601a 100644 --- a/lisp/utf-2000/Ideograph-R113-Spirit.el +++ b/lisp/utf-2000/Ideograph-R113-Spirit.el @@ -1344,32 +1344,26 @@ (=ucs . #x7961) ; 祡 )) (define-char - '((=>ucs . #x7962) ; 祢 - (ideographic-radical . 113) ; â½° - (ideographic-strokes . 5) - (total-strokes . 10) - (=daikanwa . 24679) ; ø¸†§ - )) -(define-char - '((=>ucs . #x7962) ; 祢 - (morohashi-daikanwa 24679 0 2) - (ideographic-radical . 113) ; â½° - (ideographic-strokes . 5) - (total-strokes . 10) - (=jis-x0208 . #x472A) ; ø½Š­¹ - (=gt . 31587) ; ý¡€‡­£ - (=gt-pj-1 . #x472A) ; ý¡€‡­£ - (=ucs@jis . #x7962) ; ø½Š­¹ - )) -(define-char - '((morohashi-daikanwa 24679 0 3) + '((=>daikanwa . 24679) ; ø¸†§ (ideographic-radical . 113) ; â½° (ideographic-strokes . 5) (total-strokes . 10) (=ucs . #x7962) ; 祢 - (=gb2312 . #x6C72) ; ø»…µŸ - (=cns11643-3 . #x3272) ; ø»•°³ - (=jef-china3 . #x70E4) ; øº‡ƒ¤ + (->subsumptive + ((=daikanwa . 24679) ; ø¸†§ + (=jef-china3 . #x5CDB) ; øº…³› + ) + ((=jis-x0208 . #x472A) ; ø½Š­¹ + (=gt . 31587) ; ý¡€‡­£ + (=gt-pj-1 . #x472A) ; ý¡€‡­£ + (=ucs@jis . #x7962) ; ø½Š­¹ + ) + ((=cns11643-3 . #x3272) ; ø»•°³ + (=jef-china3 . #x70E4) ; øº‡ƒ¤ + ) + ((=gb2312 . #x6C72) ; ø»…µŸ + (=ucs@unicode . #x7962) ; ø»…µŸ + )) )) (define-char '((ideographic-radical . 113) ; â½° diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el index a7250e2..b466f48 100644 --- a/lisp/utf-2000/Ideograph-R134-Mortar.el +++ b/lisp/utf-2000/Ideograph-R134-Mortar.el @@ -77,7 +77,7 @@ (=daikanwa . 30177) ; ø¸‡—¡ (=ucs@jis . #x81FD) ; ø»‹³ ) - ((=ucs@unicode . #x81FD) ; 󰀙 + ((=ucs@unicode . #x81FD) ; 󰀝 )) )) (define-char diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index e6d3b81..457d5f4 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -220,7 +220,7 @@ required-features) (unless column (setq column (current-column))) - (let (char-spec al cal key temp-char) + (let (char-spec temp-char) (setq char-spec (char-db-make-char-spec char)) (unless (or (characterp char) ; char (condition-case nil @@ -232,40 +232,10 @@ char-spec))) (remove-char-attribute temp-char 'ideograph-daikanwa) (setq char temp-char)) - ;; (setq al nil - ;; cal nil) - ;; (while char-spec - ;; (setq key (car (car char-spec))) - ;; (unless (memq key char-db-ignored-attributes) - ;; (if (find-charset key) - ;; (if (encode-char char key 'defined-only) - ;; (setq cal (cons key cal))) - ;; (setq al (cons key al)))) - ;; (setq char-spec (cdr char-spec))) - ;; (unless cal - ;; (setq char-spec (char-db-make-char-spec char)) - ;; (while char-spec - ;; (setq key (car (car char-spec))) - ;; (unless (memq key char-db-ignored-attributes) - ;; (if (find-charset key) - ;; (setq cal (cons key cal)) - ;; (setq al (cons key al)))) - ;; (setq char-spec (cdr char-spec))) - ;; ) - ;; (unless (or cal - ;; (memq 'ideographic-structure al)) - ;; (push 'ideographic-structure al)) - ;; (dolist (feature required-features) - ;; (if (find-charset feature) - ;; (if (encode-char char feature 'defined-only) - ;; (setq cal (adjoin feature cal))) - ;; (setq al (adjoin feature al)))) (insert-char-attributes char readable - ;; (or al 'none) cal - (union (mapcar #'car char-spec) - required-features) - ) + (union (mapcar #'car char-spec) + required-features)) (when temp-char ;; undefine temporary character ;; Current implementation is dirty. @@ -294,7 +264,8 @@ (error nil))) (progn (setq al nil - cal nil) + ;; cal nil + ) (while value (setq key (car (car value))) ;; (if (find-charset key) @@ -323,7 +294,8 @@ (progn (setq rest cell al nil - cal nil) + ;; cal nil + ) (while rest (setq key (car (car rest))) ;; (if (find-charset key) @@ -946,7 +918,7 @@ 'defined-only)) ccss)) (if separator - (insert lbs)) + (insert lbs)) (let ((char-db-ignored-attributes (cons '<-subsumptive char-db-ignored-attributes))) diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index c89e905..13ba6ff 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -109,17 +109,18 @@ ;;;###autoload (defun char-ideographic-strokes (char &optional radical preferred-domains) (let (ret) - (or (char-ideographic-strokes-from-domains - char preferred-domains radical) - (char-feature char 'ideographic-strokes) - (char-ideographic-strokes-from-domains - char char-db-feature-domains radical) - (catch 'tag + (or (catch 'tag (dolist (cell (get-char-attribute char 'ideographic-)) (if (and (setq ret (plist-get cell :radical)) (or (eq ret radical) (null radical))) (throw 'tag (plist-get cell :strokes))))) + (char-ideographic-strokes-from-domains + char preferred-domains radical) + (get-char-attribute char 'ideographic-strokes) + (char-ideographic-strokes-from-domains + char char-db-feature-domains radical) + (char-feature char 'ideographic-strokes) (get-char-attribute char 'daikanwa-strokes) (let ((strokes (or (get-char-attribute char 'kangxi-strokes) @@ -167,6 +168,8 @@ (dolist (char (cons chr (get-char-attribute chr '->denotational))) (when (and radical + (eq radical + (char-ideographic-radical char radical)) (or (null (setq script (get-char-attribute char 'script))) (memq 'Ideograph script))) @@ -301,18 +304,18 @@ (defun char-daikanwa (char) (or (encode-char char 'ideograph-daikanwa 'defined-only) (encode-char char '=daikanwa-rev2 'defined-only) + (get-char-attribute char 'morohashi-daikanwa) (let ((ret (char-feature char '=>daikanwa))) (and ret (if (or (get-char-attribute char '<-subsumptive) (get-char-attribute char '<-denotational)) (list ret 0) - ret))) - (get-char-attribute char 'morohashi-daikanwa))) + ret))))) ;;;###autoload (defun char-ucs (char) (or (encode-char char '=ucs 'defined-only) - (get-char-attribute char '=>ucs))) + (char-feature char '=>ucs))) (defun char-id (char) (logand (char-int char) #x3FFFFFFF)) diff --git a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el index 5485ff7..04e80a9 100644 --- a/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el +++ b/lisp/utf-2000/u03000-CJK-Symbols-and-Punctuation.el @@ -60,15 +60,23 @@ )) (define-char '((name . "IDEOGRAPHIC ITERATION MARK") - (script Ideographic symbol) + (script Ideograph symbol) (general-category letter modifier) ; Informative Category (bidi-category . "L") (mirrored . nil) - (morohashi-daikanwa 97) + (ideographic-radical . 3) ; ⼂ + (ideographic-strokes . 2) + (total-strokes . 3) (=ucs . #x3005) ; 々 (=jis-x0208 . #x2139) ; ø½‰¶” (=gb2312 . #x2129) ; ø»„†Œ + (=gt . 00135) ; ý¡€€‚‡ + (=gt-k . 00282) ; ý¡„€„š + (=gt-pj-2 . #x306C) ; ý¡€€‚‡ + (=daikanwa . 00097) ; ø¸€¡ (=big5-eten . #xC6E0) ; ý¢€Œ›  + (=cbeta . 02728) ; ø¸ ª¨ + (mojikyo . 000097) ; ý €€¡ )) (define-char '((name . "IDEOGRAPHIC CLOSING MARK") -- 1.7.10.4