From: tomo Date: Mon, 4 Aug 2003 02:41:45 +0000 (+0000) Subject: Sync up with r21-4-12-chise-0_21-pre2. X-Git-Tag: r21-2-44-utf-2000-m0_18-o-=iso-ir165~2 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d81ebefd7eb8173388fa18fc995d2d8504bfb4d1;p=chise%2Fxemacs-chise.git Sync up with r21-4-12-chise-0_21-pre2. --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index a0d240a..c3f57bc 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,44 @@ +2003-08-01 MORIOKA Tomohiko + + * Ideograph-R009-Man.el (U+4EBB): Unify GT-K00141 and GT-00457. + (U-00020089): Use `ideographic-{radical|strokes}@{ucs|gt|misc}' + and `ideographic-radical@{ucs|gt}*sources' instead of + `ideographic-'; delete `ideograph-cdp'. + (M-48920): Separate C6-353A and U-0002028B; modify + `ideographic-structure'. + +2003-07-31 MORIOKA Tomohiko + + * Ideograph-R004-Slash.el (U-00020088): Separate C6-2124. + (C6-2124): Unify GT-K00130. + (U-00020089): Use `ideographic-{radical|strokes}@{ucs|gt|misc}' + and `ideographic-radical@{ucs|gt}*sources' instead of + `ideographic-'; delete `ideograph-cdp'. + + * Ideograph-R001-One.el (U-00020089): Use + `ideographic-{radical|strokes}@{ucs|gt|misc}' and + `ideographic-radical@{ucs|gt}*sources' instead of `ideographic-'; + delete `ideograph-cdp'. + + * char-db-util.el (char-db-feature-domains): Add `misc' and + `unknown'. + +2003-07-31 MORIOKA Tomohiko + + * Ideograph-R002-Line.el (C4-2127): Unify GT-K00068. + (U-00020061): Don't use char-ref format in `<->same-ideograph' and + `<-ancient-ideograph'; use `->same-ideograph*sources' and + `<-ancient-ideograph*sources' instead. + + * Ideograph-R077-Stop.el (M-16254): Unify GT-K00187 and GT-20883. + + * u02E00-CJK-Radical-Supplement.el (U+2EBC): Unify GT-37857. + +2003-07-31 MORIOKA Tomohiko + + * Ideograph-R005-Second.el (BC-87F5): Use `hanyu-dazidian' instead + of `hanyu-dazidian-{vol|page|char}'. + 2003-07-30 MORIOKA Tomohiko * Ideograph-R140-Grass.el: Add some GT code points. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 9e6955e..0389b36 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -225,16 +225,17 @@ )) (define-char '((name* . "ideographic component person for top") - (ideographic- (:radical 4 ; ⼃ - :strokes 1 - :sources (ucs)) - (:radical 1 ; ⼀ - :strokes 1 - :sources (gt)) - (:radical 9 ; ⼈ - :strokes 0)) + (ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 1) + (ideographic-radical@ucs*sources + ucs) + (ideographic-radical@gt . 1) ; ⼀ + (ideographic-strokes@gt . 1) + (ideographic-radical@gt*sources + gt) + (ideographic-radical@misc . 9) ; ⼈ + (ideographic-strokes@misc . 0) (total-strokes . 2) - (ideograph-cdp . -63) (=jis-x0213-2-2000 . #x2121) ; ø»¤€ (=gt-pj-9 . #x4D4A) ; ý¡€€€ˆ (=big5-cdp . #x8B4A) ; ý¢€ˆ­Š diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index a9fbe90..598e5b3 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -39,6 +39,8 @@ (ideographic-strokes . 1) (total-strokes . 2) (=cns11643-4 . #x2127) ; ø»— ® + (=gt-pj-k1 . #x735C) ; ø»— ® + (=gt-k . 00068) ; ý¡„€„ (=ucs@cns . #x4E29) ; ø»— ® )) (define-char @@ -47,15 +49,15 @@ (total-strokes . 2) (->mojikyo . 002775) ; ý €€«— (->same-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 02775) ; ø¸€«— - ) + ((=daikanwa . 02775) ; ø¸€«— )) + (->same-ideograph*sources + daikanwa) (<-ancient-ideograph - (:sources (morohashi-daikanwa) - :char ((=daikanwa . 02774) ; ø¸€«– - ) + ((=daikanwa . 02774) ; ø¸€«– )) + (<-ancient-ideograph*sources + daikanwa) (hanyu-dazidian 1 28 4) (=gt-pj-2 . #x3055) ; ý¡€€§ (=daikanwa . 00069) ; ø¸€… diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index 7d3feab..84f237d 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -186,10 +186,19 @@ (ideographic-radical . 4) ; ⼃ (ideographic-strokes . 1) (total-strokes . 2) - (=cns11643-6 . #x2124) ; ø»›´³ (=ucs . #x20088) ; 𠂈 )) (define-char + '((=>ucs . #x20088) ; 𠂈 + (morohashi-daikanwa 114 0 2) + (ideographic-radical . 4) ; ⼃ + (ideographic-strokes . 1) + (total-strokes . 2) + (=cns11643-6 . #x2124) ; ø»›´³ + (=gt-pj-k2 . #x322C) ; ø»›´³ + (=gt-k . 00130) ; ý¡„€‚‚ + )) +(define-char '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 1) (total-strokes . 2) @@ -241,16 +250,17 @@ )) (define-char '((name* . "ideographic component person for top") - (ideographic- (:radical 4 ; ⼃ - :strokes 1 - :sources (ucs)) - (:radical 1 ; ⼀ - :strokes 1 - :sources (gt)) - (:radical 9 ; ⼈ - :strokes 0)) + (ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 1) + (ideographic-radical@ucs*sources + ucs) + (ideographic-radical@gt . 1) ; ⼀ + (ideographic-strokes@gt . 1) + (ideographic-radical@gt*sources + gt) + (ideographic-radical@misc . 9) ; ⼈ + (ideographic-strokes@misc . 0) (total-strokes . 2) - (ideograph-cdp . -63) (=jis-x0213-2-2000 . #x2121) ; ø»¤€ (=gt-pj-9 . #x4D4A) ; ý¡€€€ˆ (=big5-cdp . #x8B4A) ; ý¢€ˆ­Š diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index 8a8528c..b1a244c 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -241,12 +241,11 @@ (=ucs . #x200D0) ; 𠃐 )) (define-char - '((ideographic-radical . 5) ; ⼄ + '((=>ucs . #x20088) ; 𠂈 + (ideographic-radical . 5) ; ⼄ (ideographic-strokes . 1) (total-strokes . 2) - (hanyu-dazidian-vol . 1) - (hanyu-dazidian-page . 49) - (hanyu-dazidian-char . 4) + (hanyu-dazidian 1 49 4) (=big5-cdp . #x87F5) ; ý¢€ˆŸµ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 65b08b6..45e5cd0 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -59,23 +59,27 @@ (=gb2312 . #x5869) ; ø»…—¾ (=iso-ir165 . #x5869) ; ø»Ž€Ž (=jis-x0213-2-2000 . #x2135) ; ø»¤” + (=gt-pj-9 . #x4D4D) ; ý¡€€‡‰ + (=gt-k . 00141) ; ý¡„€‚ (=cbeta . 04768) ; ø¸¡Š  (=jef-china3 . #x71FB) ; øº‡‡» + (=gt . 00457) ; ý¡€€‡‰ (mojikyo . 050927) ; ý €Œ›¯ (=ucs . #x4EBB) ; 亻 )) (define-char '((name* . "ideographic component person for top") - (ideographic- (:radical 4 ; ⼃ - :strokes 1 - :sources (ucs)) - (:radical 1 ; ⼀ - :strokes 1 - :sources (gt)) - (:radical 9 ; ⼈ - :strokes 0)) + (ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 1) + (ideographic-radical@ucs*sources + ucs) + (ideographic-radical@gt . 1) ; ⼀ + (ideographic-strokes@gt . 1) + (ideographic-radical@gt*sources + gt) + (ideographic-radical@misc . 9) ; ⼈ + (ideographic-strokes@misc . 0) (total-strokes . 2) - (ideograph-cdp . -63) (=jis-x0213-2-2000 . #x2121) ; ø»¤€ (=gt-pj-9 . #x4D4A) ; ý¡€€€ˆ (=big5-cdp . #x8B4A) ; ý¢€ˆ­Š @@ -15282,7 +15286,8 @@ (=ucs . #x3468) ; 㑨 )) (define-char - '((ideographic-radical . 9) ; ⼈ + '((=>ucs . #x2028B) ; 𠊋 + (ideographic-radical . 9) ; ⼈ (ideographic-strokes . 8) (total-strokes . 10) (hanyu-dazidian 1 169 12) @@ -15293,13 +15298,19 @@ ((name* . "ideographic component person as roof") (=gt . 00458) ; ý¡€€‡Š ) - ((=big5-cdp . #x8B4B) ; ý¢€ˆ­‹ + ((=ucs . #x4491) ; 䒑 ) ((=big5-cdp . #x8BE8) ; ý¢€ˆ¯¨ )) - (=cns11643-6 . #x353A) ; ø»œ’¡ (=daikanwa . 48920) ; ø¸‹¼˜ (=hanziku-1 . #xC952) ; ý¢€œ¥’ + )) +(define-char + '((morohashi-daikanwa 48920 0 2) + (ideographic-radical . 9) ; ⼈ + (ideographic-strokes . 8) + (total-strokes . 10) + (=cns11643-6 . #x353A) ; ø»œ’¡ (=ucs . #x2028B) ; 𠊋 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index a2670a4..200c7b3 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -8564,6 +8564,7 @@ ((=ucs . #x53E3) ; 口 ) ((=daikanwa . 30648) ; ø¸‡ž¸ + (=gt . 39673) ; ý¡€‰«¹ )) (=big5 . #xAB75) ; ý¢€Š­µ (=daikanwa . 03628) ; ø¸€¸¬ diff --git a/lisp/utf-2000/Ideograph-R077-Stop.el b/lisp/utf-2000/Ideograph-R077-Stop.el index 2c4d5f9..b2f8bde 100644 --- a/lisp/utf-2000/Ideograph-R077-Stop.el +++ b/lisp/utf-2000/Ideograph-R077-Stop.el @@ -20,7 +20,10 @@ (ideographic-radical . 77) ; ⽌ (ideographic-strokes . 0) (total-strokes . 3) + (=gt-pj-4 . #x4128) ; ý¡€…†“ (=daikanwa . 16254) ; ø¸ƒ½¾ + (=gt-k . 00187) ; ý¡„€‚» + (=gt . 20883) ; ý¡€…†“ )) (define-char '((morohashi-daikanwa 16254 0 0) diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index 820a3d4..2673486 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -249,6 +249,7 @@ (=jis-x0212 . #x556C) ; ø»‹±³ (=gt-pj-6 . #x3923) ; ý¡€‰§ (=daikanwa . 29247) ; ø¸‡ˆ¿ + (=ucs@jis . #x808E) ; ø»‹±³ (=gt . 37863) ; ý¡€‰§ )) (define-char @@ -311,6 +312,7 @@ (total-strokes . 6) (=gt-pj-6 . #x3927) ; ý¡€‰£ (=daikanwa . 29251) ; ø¸‡‰ƒ + (=gt-k . 01763) ; ý¡„€›£ (=gt . 37859) ; ý¡€‰£ (=ucs . #x43CD) ; 䏍 )) @@ -547,7 +549,6 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 3) (total-strokes . 7) - (->mojikyo . 050368) ; 肖 (=cns11643-1 . #x4B39) ; ø»’€  )) (define-char @@ -1562,6 +1563,7 @@ (ideographic-strokes . 3) (total-strokes . 7) (=gt-pj-6 . #x3939) ; ý¡€‰° + (=gt-k . 02503) ; ý¡„€§‡ (=gt . 37872) ; ý¡€‰° )) (define-char @@ -3370,7 +3372,6 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 5) (total-strokes . 9) - (->mojikyo . 050370) ; 脉 (=cns11643-3 . #x2E63) ; ø»•ª¬ )) (define-char @@ -5599,7 +5600,6 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 7) (total-strokes . 11) - (->mojikyo . 050372) ; 脱 (=cns11643-3 . #x3845) ; ø»•¸º )) (define-char @@ -10428,7 +10428,6 @@ (ideographic-radical . 130) ; ⾁ (ideographic-strokes . 10) (total-strokes . 14) - (->mojikyo . 050375) ; 䐰 (=cns11643-6 . #x606F) ; ø»’  )) (define-char diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index ffcc61c..7ccf552 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -44,6 +44,7 @@ (=iso-ir165 . #x5C33) ; ø»Ž… (=jis-x0213-2-2000 . #x7576) ; ø»¦™­ (=gt-pj-9 . #x4F47) ; ý¡€‰«— + (=gt-k . 00279) ; ý¡„€„— (=jef-china3 . #x72FA) ; øº‡‹º (=gt . 39639) ; ý¡€‰«— (=ucs . #x8279) ; 艹 @@ -60,6 +61,7 @@ )) (=jis-x0213-2-2000 . #x7574) ; ø»¦™« (=gt-pj-9 . #x4E5A) ; ý¡€‰« + (=gt-k . 00569) ; ý¡„€ˆ¹ (=gt . 39645) ; ý¡€‰« (=ucs . #xFA5D) ; 艹 )) @@ -109,6 +111,7 @@ (ideographic-strokes . 1) (total-strokes . 4) (=gt-pj-10 . #x622A) ; ý¡€‰«š + (=gt-k . 00806) ; ý¡„€Œ¦ (=gt . 39642) ; ý¡€‰«š )) (define-char @@ -256,6 +259,7 @@ (total-strokes . 6) (=gt-pj-6 . #x466D) ; ý¡€‰«¹ (=daikanwa . 30648) ; ø¸‡ž¸ + (=gt-k . 01737) ; ý¡„€›‰ (=gt . 39673) ; ý¡€‰«¹ )) (define-char @@ -9318,7 +9322,7 @@ ) ((=ucs . #x4E1A) ; 业 ) - ((=big5-cdp . #x8B4B) ; ý¢€ˆ­‹ + ((=ucs . #x4491) ; 䒑 ) ((=ucs . #x592B) ; 夫 )) @@ -9340,7 +9344,7 @@ ) ((=ucs . #x4E1A) ; 业 ) - ((=big5-cdp . #x8B4B) ; ý¢€ˆ­‹ + ((=ucs . #x4491) ; 䒑 ) ((=ucs . #x592B) ; 夫 )) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 258627b..94bb961 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -70,7 +70,7 @@ v)) (defvar char-db-feature-domains - '(ucs daikanwa cns gt jis jis/alt jis/a jis/b)) + '(ucs daikanwa cns gt jis jis/alt jis/a jis/b misc unknown)) (defvar char-db-ignored-attributes nil)