From: tomo Date: Tue, 3 Jun 2003 09:55:14 +0000 (+0000) Subject: Sync with r21-2-44-utf-2000-m0_18-mh-r016. X-Git-Tag: r21-4-11-chise-0_21-pre4^2~2 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b3b72ed5eac3cb8ae5d5e341b6bfe5b7e4250b0;p=chise%2Fxemacs-chise.git- Sync with r21-2-44-utf-2000-m0_18-mh-r016. --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 476c616..7a32154 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,38 @@ +2003-06-02 MORIOKA Tomohiko + + * Ideograph-R016-Table.el (M-01741): Separate C6-2152 and + U-00020629. + (M-01742): Unify H1-DEEC and U-0002062A. + (U+51E4): Separate C3-2151. + (U-0002062F): Unify M-03067; don't use `->identical'; use + `ideographic-{radical|strokes}@{ucs|daikanwa}' instead of + `ideographic-{radical|strokes}'. + (MH-00045): New character. + (U-00020643): Unify MH-0046; add strokes. + (MH-0047): New character; unify U+9F21; copied from + Ideograph-R208-Rat.el. + +2003-06-02 MORIOKA Tomohiko + + * Ideograph-R208-Rat.el (U+9F21): Unify MH-0047; use + `ideographic-{radical|strokes}@{ucs|daikanwa}' instead of + `ideographic-{radical|strokes}'. + + * Ideograph-R118-Bamboo.el (C2-4C61): Unify MH-0052, JX2-233D, + JC3-5EC1 and U+5284; use `ideographic-{radical|strokes}@{ucs|cns}' + instead of `ideographic-{radical|strokes}'; delete + `ideograph-cdp'. + (J0-6459): Separate U+7C4F. + + * Ideograph-R028-Private.el (M-03067): Unify U-0002062F; use + `ideographic-{radical|strokes}@{ucs|daikanwa}' instead of + `ideographic-{radical|strokes}'. + + * Ideograph-R018-Knife.el (U+5284): Unify C2-4C61 and B-E35A; use + `ideographic-{radical|strokes}@{ucs|cns}' instead of + `ideographic-{radical|strokes}'; don't use char-spec format in + `->same-ideograph'; use `->same-ideograph*sources' instead. + 2003-06-01 MORIOKA Tomohiko * Ideograph-R142-Insect.el, Ideograph-R140-Grass.el: Add some diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el index 7c456cf..30322fb 100644 --- a/lisp/utf-2000/Ideograph-R016-Table.el +++ b/lisp/utf-2000/Ideograph-R016-Table.el @@ -114,20 +114,30 @@ (=ucs . #x51E3) ; 凣 )) (define-char - '((ideographic-radical . 16) ; ⼏ + '((=>ucs . #x20629) ; 𠘩 + (ideographic-radical . 16) ; ⼏ (ideographic-strokes . 2) (total-strokes . 4) (hanyu-dazidian 1 276 6) - (=cns11643-6 . #x2152) ; ø»›µ¡ (=daikanwa . 01741) ; ø¸€› (=hanziku-1 . #xDEED) ; ý¢€»­ + )) +(define-char + '((morohashi-daikanwa 1741 0 0) + (ideographic-radical . 16) ; ⼏ + (ideographic-strokes . 2) + (total-strokes . 4) + (=cns11643-6 . #x2152) ; ø»›µ¡ (=ucs . #x20629) ; 𠘩 )) (define-char '((ideographic-radical . 16) ; ⼏ (ideographic-strokes . 2) (total-strokes . 4) + (hanyu-dazidian 1 276 5) (=daikanwa . 01742) ; ø¸€›Ž + (=hanziku-1 . #xDEEC) ; ý¢€»¬ + (=ucs . #x2062A) ; 𠘪 )) (define-char '((ideographic-radical . 16) ; ⼏ @@ -141,25 +151,49 @@ ((name . "CJK RADICAL TABLE") (=ucs . #x2E87) ; ⺇ ) - ((=ucs . #x53C8) ; 又 + ((=gt-k . 00064) ; ý¡„€€ )) (=gb2312 . #x376F) ; ø»„§¦ (=iso-ir165 . #x376F) ; ø»¶ - (=cns11643-3 . #x2151) ; ø»•—” (=daikanwa . 01743) ; ø¸€› (=hanziku-1 . #xDEEE) ; ý¢€»® (=ucs . #x51E4) ; 凤 )) (define-char - '((ideographic-radical . 16) ; ⼏ + '((=>ucs . #x51E4) ; 凤 + (morohashi-daikanwa 1743 0 0) + (ideographic-radical . 16) ; ⼏ (ideographic-strokes . 2) (total-strokes . 4) - (->identical - ((=daikanwa . 03067) ; ø¸€¯» + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") + (=ucs . #x2FF5) ; ⿵ + ) + ((name . "CJK RADICAL TABLE") + (=ucs . #x2E87) ; ⺇ + ) + ((=ucs . #x53C8) ; 又 )) + (=cns11643-3 . #x2151) ; ø»•—” + )) +(define-char + '((ideographic-radical@ucs . 16) ; ⼏ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 28) ; ⼛ + (ideographic-strokes@daikanwa . 2) + (total-strokes . 4) + (=daikanwa . 03067) ; ø¸€¯» (=ucs . #x2062F) ; 𠘯 )) (define-char + '((morohashi-daikanwa ho 45) + (ideographic-radical . 16) ; ⼏ + (ideographic-strokes . 2) + (total-strokes . 4) + (=gt-pj-11 . #x432A) ; ý¡€€£° + (=gt . 02288) ; ý¡€€£° + )) +(define-char '((ideographic-radical . 16) ; ⼏ (ideographic-strokes . 3) (total-strokes . 5) @@ -484,6 +518,15 @@ (=ucs . #x51EC) ; 凬 )) (define-char + '((morohashi-daikanwa ho 46) + (ideographic-radical . 16) ; ⼏ + (ideographic-strokes . 5) + (total-strokes . 7) + (hanyu-dazidian 1 277 15) + (=hanziku-1 . #xDF57) ; ý¢€½— + (=ucs . #x20643) ; 𠙃 + )) +(define-char '((ideographic-radical . 16) ; ⼏ (ideographic-strokes . 6) (total-strokes . 8) @@ -636,6 +679,18 @@ (=ucs . #x51EE) ; 凮 )) (define-char + '((morohashi-daikanwa ho 47) + (ideographic-radical@ucs . 208) ; ⿏ + (ideographic-strokes@ucs . 0) + (ideographic-radical@daikanwa . 16) ; ⼏ + (ideographic-strokes@daikanwa . 6) + (total-strokes . 8) + (=jis-x0208 . #x736B) ; ø½‹¯¢ + (=gt-pj-1 . #x736B) ; 鼡 + (=gt-k . 03927) ; ý¡„€½— + (=ucs . #x9F21) ; 鼡 + )) +(define-char '((ideographic-radical . 16) ; ⼏ (ideographic-strokes . 6) (total-strokes . 8) @@ -1026,12 +1081,6 @@ )) (define-char '((ideographic-radical . 16) ; ⼏ - (hanyu-dazidian 1 276 5) - (=hanziku-1 . #xDEEC) ; ý¢€»¬ - (=ucs . #x2062A) ; 𠘪 - )) -(define-char - '((ideographic-radical . 16) ; ⼏ (hanyu-dazidian 1 277 6) (=hanziku-1 . #xDF4E) ; ý¢€½Ž (=ucs . #x2063A) ; 𠘺 @@ -1056,12 +1105,6 @@ )) (define-char '((ideographic-radical . 16) ; ⼏ - (hanyu-dazidian 1 277 15) - (=hanziku-1 . #xDF57) ; ý¢€½— - (=ucs . #x20643) ; 𠙃 - )) -(define-char - '((ideographic-radical . 16) ; ⼏ (hanyu-dazidian 8 9 25) (=hanziku-12 . #xEBA8) ; ý¢ƒŽ®¨ (=ucs . #x20644) ; 𠙄 diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index 73c3189..fd9ed44 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -7020,14 +7020,16 @@ )) (define-char '((morohashi-daikanwa ho 52) - (ideographic-radical . 18) ; ⼑ - (ideographic-strokes . 12) + (ideographic-radical@ucs . 18) ; ⼑ + (ideographic-strokes@ucs . 12) + (ideographic-radical@cns . 118) ; â½µ + (ideographic-strokes@cns . 8) (total-strokes . 14) (->same-ideograph - (:sources (kouin kangxi morohashi-daikanwa) - :char ((=daikanwa . 26149) ; ø¸†˜¥ - ) + ((=daikanwa . 26149) ; ø¸†˜¥ )) + (->same-ideograph*sources + kouin kangxi morohashi-daikanwa) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; â¿° @@ -7036,7 +7038,9 @@ ) ((=ucs . #x5202) ; 刂 )) + (=cns11643-2 . #x4C61) ; ø»”Œª (=jis-x0213-2-2000 . #x233D) ; ø»¤ ˜ + (=big5 . #xE35A) ; ý¢€Žš (=jef-china3 . #x5EC1) ; øº…» (=ucs . #x5284) ; 劄 )) diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el index e4c6c38..a4ff53e 100644 --- a/lisp/utf-2000/Ideograph-R028-Private.el +++ b/lisp/utf-2000/Ideograph-R028-Private.el @@ -165,11 +165,13 @@ (=ucs . #x20AD7) ; 𠫗 )) (define-char - '((=>ucs . #x2062F) ; 𠘯 - (ideographic-radical . 28) ; ⼛ - (ideographic-strokes . 2) + '((ideographic-radical@ucs . 16) ; ⼏ + (ideographic-strokes@ucs . 2) + (ideographic-radical@daikanwa . 28) ; ⼛ + (ideographic-strokes@daikanwa . 2) (total-strokes . 4) (=daikanwa . 03067) ; ø¸€¯» + (=ucs . #x2062F) ; 𠘯 )) (define-char '((=>ucs . #x2062F) ; 𠘯 diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index da4d7de..06008bf 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -3379,6 +3379,32 @@ (=ucs . #x7BA5) ; 箥 )) (define-char + '((morohashi-daikanwa ho 52) + (ideographic-radical@ucs . 18) ; ⼑ + (ideographic-strokes@ucs . 12) + (ideographic-radical@cns . 118) ; â½µ + (ideographic-strokes@cns . 8) + (total-strokes . 14) + (->same-ideograph + ((=daikanwa . 26149) ; ø¸†˜¥ + )) + (->same-ideograph*sources + kouin kangxi morohashi-daikanwa) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; â¿° + ) + ((=ucs . #x7B54) ; 答 + ) + ((=ucs . #x5202) ; 刂 + )) + (=cns11643-2 . #x4C61) ; ø»”Œª + (=jis-x0213-2-2000 . #x233D) ; ø»¤ ˜ + (=big5 . #xE35A) ; ý¢€Žš + (=jef-china3 . #x5EC1) ; øº…» + (=ucs . #x5284) ; 劄 + )) +(define-char '((ideographic-radical . 118) ; â½µ (ideographic-strokes . 8) (total-strokes . 14) @@ -3442,23 +3468,6 @@ (=ucs . #x420B) ; 䈋 )) (define-char - '((=>ucs . #x5284) ; 劄 - (ideographic-radical . 118) ; â½µ - (ideographic-strokes . 8) - (total-strokes . 14) - (ideograph-cdp . 3231) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; â¿° - ) - ((=ucs . #x7B54) ; 答 - ) - ((=ucs . #x5202) ; 刂 - )) - (=cns11643-2 . #x4C61) ; ø»”Œª - (=big5 . #xE35A) ; ý¢€Žš - )) -(define-char '((ideographic-radical . 118) ; â½µ (ideographic-strokes . 8) (=gb2312 . #x7365) ; ø»…¿¤ @@ -9037,11 +9046,18 @@ (=ucs . #x25D79) ; 𥵹 )) (define-char - '((morohashi-daikanwa ho 465) + '((=>ucs . #x7C4F) ; 籏 + (morohashi-daikanwa ho 465) (ideographic-radical . 118) ; â½µ (ideographic-strokes . 14) (total-strokes . 20) (=jis-x0208 . #x6459) ; ø½‹™Ž + )) +(define-char + '((morohashi-daikanwa ho 465 0) + (ideographic-radical . 118) ; â½µ + (ideographic-strokes . 14) + (total-strokes . 20) (=ucs . #x7C4F) ; 籏 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R208-Rat.el b/lisp/utf-2000/Ideograph-R208-Rat.el index 6f82275..92d2d07 100644 --- a/lisp/utf-2000/Ideograph-R208-Rat.el +++ b/lisp/utf-2000/Ideograph-R208-Rat.el @@ -21,8 +21,11 @@ (=cns11643-1 . #x6771) ; ø»’ª  )) (define-char - '((ideographic-radical . 208) ; ⿏ - (ideographic-strokes . 0) + '((morohashi-daikanwa ho 47) + (ideographic-radical@ucs . 208) ; ⿏ + (ideographic-strokes@ucs . 0) + (ideographic-radical@daikanwa . 16) ; ⼏ + (ideographic-strokes@daikanwa . 6) (total-strokes . 8) (=jis-x0208 . #x736B) ; ø½‹¯¢ (=gt-pj-1 . #x736B) ; 鼡