From: tomo Date: Sun, 22 Dec 2002 16:23:23 +0000 (+0000) Subject: Sync with r21-4-10-utf-2000-0_19-pdump. X-Git-Tag: r21-2-44-utf-2000-m0_18-pdump~2 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=36220252b6cba075a6357b8de7174a2ecaf4c543;p=chise%2Fxemacs-chise.git.1 Sync with r21-4-10-utf-2000-0_19-pdump. --- diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index 140bbe7..7eec595 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -1242,7 +1242,9 @@ ) ((ucs . #x51AB) ; 冫 ) - ((ucs . #x4EAC) ; 京 + ((=jis-x0208 . #x357E) ; ø½Š”± + (korean-ksc5601 . #x4C48) ; ø»‰™½ + (ideograph-daikanwa . 00299) ; ø¸€„« )) (shinjigen-1 . 4309) (shinjigen-2 . 4310) @@ -2277,17 +2279,19 @@ (ucs . #x51DA) ; 凚 )) (define-char - '((ideographic-radical . 15) ; ⼎ + '((=>ucs . #x51DC) ; 凜 + (ideographic-radical . 15) ; ⼎ (ideographic-strokes . 13) (total-strokes . 15) - (hanyu-dazidian 1 301 13) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (ucs . #x2FF0) ; â¿° ) ((ucs . #x51AB) ; 冫 ) - ((ucs . #x7A1F) ; 稟 + ((=jis-x0208 . #x6348) ; ø½‹—Ÿ + (korean-ksc5601 . #x7922) ; ø»Š› + (ideograph-daikanwa . 25127) ; ø¸†ˆ§ )) (shinjigen-1 . 561) (shinjigen-2 . 561) @@ -2295,8 +2299,23 @@ (japanese-jisx0208-1990 . #x7425) ; ø½‹¯º (chinese-big5 . #xBBFE) ; ý¢€‹¯¾ (ideograph-daikanwa . 01717) ; ø¸€šµ - (china3-jef . #x44A4) ; øº„’¤ - (ucs . #x51DC) ; 凜 + )) +(define-char + '((morohashi-daikanwa 1717 0 0) + (ideographic-radical . 15) ; ⼎ + (ideographic-strokes . 13) + (total-strokes . 15) + (hanyu-dazidian 1 301 13) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x51AB) ; 冫 + ) + ((ucs . #x7A1F) ; 稟 + )) + (china3-jef . #x44A4) ; øº„’¤ + (ucs . #x51DC) ; 凜 )) (define-char '((=>ucs . #x51DC) ; 凜 @@ -2305,10 +2324,8 @@ (ideographic-strokes . 13) (total-strokes . 15) (ideographic-structure - (:cdp-combinator 1 - :char ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (ucs . #x2FF0) ; â¿° - ) + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° ) ((chinese-big5-cdp . #x8BEE) ; ý¢€ˆ¯® (ucs . #x51AB) ; 冫 diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index f2071a4..969457a 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -971,10 +971,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (ucs . #x2FF0) ; â¿° ) - ((japanese-jisx0208-1978 . #x3872) ; ø»‚Ÿƒ - (japanese-jisx0208 . #x3872) ; ø»†³‹ - (korean-ksc5601 . #x4E5F) ; ø»‰ - (ideograph-daikanwa . 00291) ; ø¸€„£ + ((japanese-jisx0208-1990 . #x3872) ; ø½Š˜¿ ) ((ucs . #x529B) ; 力 )) diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index e176a2f..0257262 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -17528,7 +17528,8 @@ (ucs . #x55B5) ; 喵 )) (define-char - '((ideographic-radical . 30) ; ⼝ + '((=>ucs . #x55B6) ; 営 + (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 9) (total-strokes . 12) (ideographic-structure @@ -17539,12 +17540,28 @@ ) ((ucs . #x5196) ; 冖 ) - ((ucs . #x5415) ; 吕 + ((ucs . #x5442) ; 呂 )) (shinjigen-2 . 1136) (=jis-x0208 . #x3144) ; ø½Š¿ (chinese-cns11643-6 . #x4729) ; ø»œ¬¬ (ideograph-daikanwa . 04025) ; ø¸€¾¹ + )) +(define-char + '((morohashi-daikanwa 4025 0 2) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 8) + (total-strokes . 11) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW") + (ucs . #x2FF3) ; ⿳ + ) + ((chinese-big5-cdp . #x89B2) ; ý¢€ˆ¦² + ) + ((ucs . #x5196) ; 冖 + ) + ((ucs . #x5415) ; 吕 + )) (ucs . #x55B6) ; 営 )) (define-char @@ -20567,7 +20584,8 @@ (ideograph-hanziku-2 . #xDDEA) ; ý¢€­·ª )) (define-char - '((ideographic-radical . 30) ; ⼝ + '((=>ucs . #x55F7) ; 嗷 + (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 11) (total-strokes . 14) (ideographic-structure @@ -20576,15 +20594,61 @@ ) ((ucs . #x53E3) ; 口 ) - ((ucs . #x6556) ; 敖 + ((=jis-x0208 . #x5A44) ; ø½‹Š + (korean-ksc5601 . #x6779) ; ø»Š‚˜ + (ideograph-daikanwa . 13226) ; ø¸ƒŽª )) (shinjigen-2 . 1213) - (chinese-gb2312 . #x603B) ; ø»…£€ (=jis-x0208 . #x5353) ; ø½‹€Š - (chinese-isoir165 . #x603B) ; ø»Ž‹ - (chinese-cns11643-1 . #x6830) ; ø»’ª½ - (chinese-big5 . #xB9C8) ; ý¢€‹§ˆ (ideograph-daikanwa . 04142) ; ø¸€® + )) +(define-char + '((=>ucs . #x55F7) ; 嗷 + (morohashi-daikanwa 4142 0 2) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 11) + (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x53E3) ; 口 + ) + ((chinese-big5 . #xB1CE) ; ý¢€‹‡Ž + )) + (chinese-big5 . #xB9C8) ; ý¢€‹§ˆ + )) +(define-char + '((=>ucs . #x55F7) ; 嗷 + (morohashi-daikanwa 4142 0 3) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 11) + (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x53E3) ; 口 + ) + ((chinese-cns11643-1 . #x5A72) ; ø»’—› + )) + (chinese-cns11643-1 . #x6830) ; ø»’ª½ + )) +(define-char + '((morohashi-daikanwa 4142 0 5) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 10) + (total-strokes . 13) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x53E3) ; 口 + ) + ((ucs . #x6556) ; 敖 + )) + (chinese-gb2312 . #x603B) ; ø»…£€ + (chinese-isoir165 . #x603B) ; ø»Ž‹ (ucs . #x55F7) ; 嗷 )) (define-char @@ -25838,7 +25902,8 @@ (ucs . #x566A) ; 噪 )) (define-char - '((ideographic-radical . 30) ; ⼝ + '((=>ucs . #x566B) ; 噫 + (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 13) (total-strokes . 16) (ideographic-structure @@ -25847,16 +25912,32 @@ ) ((ucs . #x53E3) ; 口 ) - ((ucs . #x610F) ; 意 + ((=jis-x0208 . #x3055) ; ø½ŠŒ² + (korean-ksc5601 . #x6B72) ; ø»Šˆ‰ + (ideograph-daikanwa . 10921) ; ø¸‚ª© )) (shinjigen-2 . 1255) - (chinese-gb2312 . #x6066) ; ø»…£« (=jis-x0208 . #x5360) ; ø½‹€— (korean-ksc5601 . #x7D6D) ; ø»Š¢  - (chinese-isoir165 . #x6066) ; ø»Ž‹» - (chinese-cns11643-1 . #x703C) ; ø»’¶¹ (chinese-big5 . #xBEB3) ; ý¢€‹º³ (ideograph-daikanwa . 04381) ; ø¸„ + )) +(define-char + '((morohashi-daikanwa 4381 0 0) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 13) + (total-strokes . 16) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x53E3) ; 口 + ) + ((ucs . #x610F) ; 意 + )) + (chinese-gb2312 . #x6066) ; ø»…£« + (chinese-isoir165 . #x6066) ; ø»Ž‹» + (chinese-cns11643-1 . #x703C) ; ø»’¶¹ (ucs . #x566B) ; 噫 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el index 784d410..1f6c268 100644 --- a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el +++ b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el @@ -134,7 +134,8 @@ (chinese-cns11643-2 . #x2623) ; ø»““¸ )) (define-char - '((morohashi-daikanwa 5714 0 2) + '((=>ucs . #x590C) ; 夌 + (morohashi-daikanwa 5714 0 2) (ideographic-radical . 35) ; â¼¢ (ideographic-strokes . 5) (total-strokes . 8) @@ -142,7 +143,13 @@ (japanese-jisx0213-1 . #x2F67) ; ø»¢¨¦ (chinese-big5 . #xCC42) ; ý¢€Œ±‚ (china3-jef . #x48D1) ; øº„£‘ - (ucs . #x590C) ; 夌 + )) +(define-char + '((morohashi-daikanwa 5714 0 3) + (ideographic-radical . 35) ; â¼¢ + (ideographic-strokes . 5) + (total-strokes . 8) + (ucs . #x590C) ; 夌 )) (define-char '((=>ucs . #x21562) ; 𡕢 diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el index df827f8..4b66143 100644 --- a/lisp/utf-2000/Ideograph-R040-Roof.el +++ b/lisp/utf-2000/Ideograph-R040-Roof.el @@ -2376,17 +2376,24 @@ (ucs . #x5BC4) ; 寄 )) (define-char - '((ideographic-radical . 40) ; ⼧ + '((=>ucs . #x5BC5) ; 寅 + (ideographic-radical . 40) ; ⼧ (ideographic-strokes . 8) (total-strokes . 11) (shinjigen-2 . 1843) - (chinese-gb2312 . #x527A) ; ø»…› (=jis-x0208 . #x4652) ; ø½Š­ƒ (korean-ksc5601 . #x6C59) ; ø»Š‰Ž - (chinese-isoir165 . #x527A) ; ø»·« - (chinese-cns11643-1 . #x596B) ; ø»’•¶ (chinese-big5 . #xB147) ; ý¢€‹…‡ (ideograph-daikanwa . 07204) ; ø¸°¤ + )) +(define-char + '((morohashi-daikanwa 7204 0 0) + (ideographic-radical . 40) ; ⼧ + (ideographic-strokes . 8) + (total-strokes . 11) + (chinese-gb2312 . #x527A) ; ø»…› + (chinese-isoir165 . #x527A) ; ø»·« + (chinese-cns11643-1 . #x596B) ; ø»’•¶ (ucs . #x5BC5) ; 寅 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el index d6cd583..36898aa 100644 --- a/lisp/utf-2000/Ideograph-R042-Small.el +++ b/lisp/utf-2000/Ideograph-R042-Small.el @@ -616,7 +616,9 @@ ((korean-ksc5601 . #x6424) ; ø»‰¼© (ideograph-daikanwa . 21648) ; ø¸…’ ) - ((ucs . #x5C11) ; 少 + ((=jis-x0208 . #x3E2F) ; ø½Š ° + (korean-ksc5601 . #x6134) ; ø»‰¸Ÿ + (ideograph-daikanwa . 07475) ; ø¸´³ )) (shinjigen-2 . 1906) (=jis-x0208 . #x5576) ; ø½‹ƒ© diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el index 019fff9..d75e3b7 100644 --- a/lisp/utf-2000/Ideograph-R046-Mountain.el +++ b/lisp/utf-2000/Ideograph-R046-Mountain.el @@ -2215,14 +2215,7 @@ ) ((ucs . #x5C71) ; å±± ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (ucs . #x2FF1) ; ⿱ - ) - ((ucs . #x4E0A) ; 上 - ) - ((ucs . #x4E0B) ; 下 - )) + ((ucs . #x209D7) ; 𠧗 )) (shinjigen-2 . 1980) (=jis-x0208 . #x463D) ; ø½Š¬® diff --git a/lisp/utf-2000/Ideograph-R049-Oneself.el b/lisp/utf-2000/Ideograph-R049-Oneself.el index fd2a42f..0a176e2 100644 --- a/lisp/utf-2000/Ideograph-R049-Oneself.el +++ b/lisp/utf-2000/Ideograph-R049-Oneself.el @@ -13,6 +13,14 @@ (ucs . #x5DF1) ; å·± )) (define-char + '((=>ucs . #x5DF1) ; å·± + (morohashi-daikanwa 8742 0 2) + (ideographic-radical . 49) ; â¼° + (ideographic-strokes . 0) + (total-strokes . 3) + (chinese-big5-cdp . #x896D) ; ý¢€ˆ¥­ + )) +(define-char '((ideographic-radical . 49) ; â¼° (ideographic-strokes . 0) (total-strokes . 3) @@ -105,14 +113,6 @@ (ideographic-strokes . 4) (total-strokes . 7) (hanyu-dazidian 1 69 27) - (ideographic-structure - (:cdp-combinator 4) - ((ucs . #x20086) ; 𠂆 - ) - ((ucs . #x4E00) ; 一 - ) - ((ucs . #x5DF4) ; å·´ - )) (shinjigen-2 . 847) (=jis-x0208 . #x5662) ; ø½‹„³ (chinese-cns11643-3 . #x2567) ; ø»•¢ diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el index 507c177..1a0c154 100644 --- a/lisp/utf-2000/Ideograph-R050-Turban.el +++ b/lisp/utf-2000/Ideograph-R050-Turban.el @@ -4397,27 +4397,42 @@ (ucs . #x5E61) ; 幡 )) (define-char - '((ideographic-radical . 50) ; â¼± + '((=>ucs . #x5E62) ; å¹¢ + (ideographic-radical . 50) ; â¼± (ideographic-strokes . 12) (total-strokes . 15) (ideographic-structure - (:cdp-combinator 1 - :char ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (ucs . #x2FF0) ; â¿° - ) + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° ) ((ucs . #x5DFE) ; å·¾ ) - ((ucs . #x7AE5) ; ç«¥ + ((=jis-x0208 . #x4638) ; ø½Š¬© + (korean-ksc5601 . #x545B) ; ø»‰¦€ + (ideograph-daikanwa . 25775) ; ø¸†’¯ )) (shinjigen-2 . 2135) - (chinese-gb2312 . #x3431) ; ø»„¢Ž (=jis-x0208 . #x5671) ; ø½‹…‚ (korean-ksc5601 . #x5353) ; ø»‰¤š - (chinese-isoir165 . #x3431) ; ø»Šž - (chinese-cns11643-1 . #x6C56) ; ø»’±› (chinese-big5 . #xBC6C) ; ý¢€‹±¬ (ideograph-daikanwa . 09087) ; ø¸‚¿ + )) +(define-char + '((morohashi-daikanwa 9087 0 0) + (ideographic-radical . 50) ; â¼± + (ideographic-strokes . 12) + (total-strokes . 15) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((ucs . #x5DFE) ; å·¾ + ) + ((ucs . #x7AE5) ; ç«¥ + )) + (chinese-gb2312 . #x3431) ; ø»„¢Ž + (chinese-isoir165 . #x3431) ; ø»Šž + (chinese-cns11643-1 . #x6C56) ; ø»’±› (ucs . #x5E62) ; å¹¢ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index e445bb1..c9865ae 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -16785,8 +16785,8 @@ (ideographic-strokes . 14) (total-strokes . 17) (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") - (ucs . #x2FF5) ; ⿵ + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (ucs . #x2FF1) ; ⿱ ) ((ucs . #x8207) ; 與 ) diff --git a/lisp/utf-2000/Ideograph-R068-Dipper.el b/lisp/utf-2000/Ideograph-R068-Dipper.el index e5b0b50..c0a3084 100644 --- a/lisp/utf-2000/Ideograph-R068-Dipper.el +++ b/lisp/utf-2000/Ideograph-R068-Dipper.el @@ -201,18 +201,36 @@ (chinese-cns11643-1 . #x4B45) ; ø»’€¬ (ideograph-daikanwa . 35003) ; ø¸ˆ¢» ) - ((ucs . #x5347) ; 升 + ((ucs . #x6597) ; 斗 )) (shinjigen-2 . 3213) (=jis-x0208 . #x5A4F) ; ø½‹Š˜ (korean-ksc5601 . #x4D57) ; ø»‰›ª - (chinese-cns11643-1 . #x5A7C) ; ø»’—¥ (chinese-big5 . #xB1D8) ; ý¢€‹‡˜ (ideograph-daikanwa . 13508) ; ø¸ƒ“„ - (ideograph-cbeta . 00976) ; ø¸  (ucs-jis . #x659B) ; ø½‹Š˜ )) (define-char + '((=>ucs . #x659B) ; 斛 + (morohashi-daikanwa 13508 0 0) + (ideographic-radical . 68) ; ⽃ + (ideographic-strokes . 7) + (total-strokes . 11) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((=jis-x0208 . #x3351) ; ø½Š‘ˆ + (korean-ksc5601 . #x4A47) ; ø»‰—€ + (chinese-cns11643-1 . #x4B45) ; ø»’€¬ + (ideograph-daikanwa . 35003) ; ø¸ˆ¢» + ) + ((chinese-cns11643-1 . #x4547) ; ø»‘·º + )) + (chinese-cns11643-1 . #x5A7C) ; ø»’—¥ + (ucs-cns . #x659B) ; ø»’—¥ + )) +(define-char '((morohashi-daikanwa 13508 0 2) (ideographic-radical . 68) ; ⽃ (ideographic-strokes . 7) @@ -223,7 +241,7 @@ ) ((ucs . #x89D2) ; 角 ) - ((ucs . #x5347) ; 升 + ((ucs . #x6597) ; 斗 )) (chinese-gb2312 . #x757A) ; ø»†‚µ (chinese-isoir165 . #x757A) ; ø»Ž«… diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el index 5365155..0d47681 100644 --- a/lisp/utf-2000/Ideograph-R116-Cave.el +++ b/lisp/utf-2000/Ideograph-R116-Cave.el @@ -11,15 +11,23 @@ (china3-jef . #x5DCB) ; øº…·‹ )) (define-char - '((morohashi-daikanwa 25406 0 0) + '((=>ucs . #x7A74) ; ç©´ + (morohashi-daikanwa 25406 0 0) (ideographic-radical . 116) ; â½³ (ideographic-strokes . 0) (total-strokes . 5) - (chinese-gb2312 . #x5128) ; ø»…Œ« - (chinese-isoir165 . #x5128) ; ø»´» - (chinese-cns11643-1 . #x467E) ; ø»‘º (japanese-jisx0208-1990 . #x376A) ; ø½Š—™ - (ucs . #x7A74) ; ç©´ + (ucs-jis . #x7A74) ; ø½Š—™ + )) +(define-char + '((morohashi-daikanwa 25406 0 1) + (ideographic-radical . 116) ; â½³ + (ideographic-strokes . 0) + (total-strokes . 5) + (chinese-gb2312 . #x5128) ; ø»…Œ« + (chinese-isoir165 . #x5128) ; ø»´» + (chinese-cns11643-1 . #x467E) ; ø»‘º + (ucs . #x7A74) ; ç©´ )) (define-char '((ideographic-radical . 116) ; â½³ diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el index 2e582da..03360c9 100644 --- a/lisp/utf-2000/Ideograph-R124-Feather.el +++ b/lisp/utf-2000/Ideograph-R124-Feather.el @@ -947,7 +947,9 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (ucs . #x2FF0) ; â¿° ) - ((ucs . #x7ACB) ; 立 + ((=jis-x0208 . #x4E29) ; ø½Š¸Š + (korean-ksc5601 . #x5821) ; ø»‰ª¾ + (ideograph-daikanwa . 25721) ; ø¸†‘¹ ) ((korean-ksc5601 . #x6962) ; ø»Š„½ (ideograph-daikanwa . 28614) ; ø¸†¿† @@ -3815,15 +3817,6 @@ (ideographic-radical . 124) ; â½» (ideographic-strokes . 10) (total-strokes . 16) - (ideographic-structure - (:cdp-combinator 4) - ((chinese-big5-cdp . #x8C49) ; ý¢€ˆ±‰ - ) - ((chinese-big5-cdp . #x8B5D) ; ý¢€ˆ­ - ) - ((korean-ksc5601 . #x6962) ; ø»Š„½ - (ideograph-daikanwa . 28614) ; ø¸†¿† - )) (japanese-jisx0208-1978 . #x344D) ; ø»‚˜¦ (korean-ksc5601 . #x7957) ; ø»Šœ’ (chinese-big5 . #xBFAB) ; ý¢€‹¾« @@ -3834,14 +3827,6 @@ (ideographic-radical . 124) ; â½» (ideographic-strokes . 10) (total-strokes . 16) - (ideographic-structure - (:cdp-combinator 4) - ((chinese-big5-cdp . #x8C49) ; ý¢€ˆ±‰ - ) - ((chinese-big5-cdp . #x8B5D) ; ý¢€ˆ­ - ) - ((ucs . #x7FBD) ; ç¾½ - )) (chinese-gb2312 . #x3A32) ; ø»„«ƒ (japanese-jisx0208 . #x344D) ; ø»†¬® (chinese-isoir165 . #x3A32) ; ø»““ diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el index 0678bb1..d85acc8 100644 --- a/lisp/utf-2000/Ideograph-R134-Mortar.el +++ b/lisp/utf-2000/Ideograph-R134-Mortar.el @@ -44,6 +44,14 @@ (ucs . #x26954) ; 𦥔 )) (define-char + '((=>ucs . #x26954) ; 𦥔 + (morohashi-daikanwa 30176 0 0) + (ideographic-radical . 134) ; ⾅ + (ideographic-strokes . 1) + (total-strokes . 8) + (chinese-big5-cdp . #x8CCD) ; ý¢€ˆ³ + )) +(define-char '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 2) (total-strokes . 8) diff --git a/lisp/utf-2000/Ideograph-R135-Tongue.el b/lisp/utf-2000/Ideograph-R135-Tongue.el index 13b54ea..04e2696 100644 --- a/lisp/utf-2000/Ideograph-R135-Tongue.el +++ b/lisp/utf-2000/Ideograph-R135-Tongue.el @@ -130,12 +130,10 @@ (total-strokes . 10) (ideograph-cdp . 31465) (ideographic-structure - (:cdp-combinator 1 - :char ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (ucs . #x2FF0) ; â¿° - ) + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° ) - ((chinese-cns11643-1 . #x485F) ; ø»‘¼¬ + ((ucs . #x820C) ; 舌 ) ((ucs . #x6C0F) ; 氏 )) @@ -153,6 +151,14 @@ (ideographic-radical . 135) ; ⾆ (ideographic-strokes . 4) (total-strokes . 10) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((chinese-cns11643-1 . #x485F) ; ø»‘¼¬ + ) + ((ucs . #x6C0F) ; 氏 + )) (chinese-cns11643-1 . #x576B) ; ø»’’º )) (define-char diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index ef03c6c..0fc84a6 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -10,23 +10,35 @@ (ucs . #x8278) ; 艸 )) (define-char - '((=>ucs . #x8279) ; 艹 + '((name . "CJK RADICAL GRASS TWO") + (=>ucs . #x8279) ; 艹 + (general-category symbol other) ; Informative Category + (bidi-category . "ON") + (mirrored . nil) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 0) (total-strokes . 4) (chinese-cns11643-4 . #x2153) ; ø»—¡š (japanese-jisx0213-2 . #x7575) ; ø»¦™¬ (ideograph-daikanwa . 30639) ; ø¸‡ž¯ + (chinese-big5-cdp . #x8AFE) ; ý¢€ˆ«¾ + (ucs-cns . #x8279) ; ⺿ + (ucs . #x2EBF) ; ⺿ )) (define-char '((morohashi-daikanwa 30639 0 3) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 0) (total-strokes . 3) - (chinese-gb2312 . #x5C33) ; ø»…€ - (chinese-isoir165 . #x5C33) ; ø»Ž… - (china3-jef . #x72FA) ; øº‡‹º - (ucs . #x8279) ; 艹 + (->ideographic-component-forms + ((name . "CJK RADICAL GRASS ONE") + (ucs . #x2EBE) ; ⺾ + )) + (chinese-gb2312 . #x5C33) ; ø»…€ + (chinese-isoir165 . #x5C33) ; ø»Ž… + (japanese-jisx0213-2 . #x7576) ; ø»¦™­ + (china3-jef . #x72FA) ; øº‡‹º + (ucs . #x8279) ; 艹 )) (define-char '((ideographic-radical . 140) ; ⾋ diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el index 4e8faa4..c82cf96 100644 --- a/lisp/utf-2000/Ideograph-R145-Clothes.el +++ b/lisp/utf-2000/Ideograph-R145-Clothes.el @@ -1,15 +1,22 @@ (define-char - '((ideographic-radical . 145) ; ⾐ + '((=>ucs . #x8863) ; è¡£ + (ideographic-radical . 145) ; ⾐ (ideographic-strokes . 0) (total-strokes . 6) (shinjigen-2 . 7335) - (chinese-gb2312 . #x5242) ; ø»…Ž£ (=jis-x0208 . #x3061) ; ø½ŠŒ¾ (korean-ksc5601 . #x6B7D) ; ø»Šˆ” - (chinese-isoir165 . #x5242) ; ø»¶³ - (chinese-cns11643-1 . #x4868) ; ø»‘¼µ (chinese-big5 . #xA6E7) ; ý¢€Š›§ (ideograph-daikanwa . 34091) ; ø¸ˆ”« + )) +(define-char + '((morohashi-daikanwa 34091 0 0) + (ideographic-radical . 145) ; ⾐ + (ideographic-strokes . 0) + (total-strokes . 6) + (chinese-gb2312 . #x5242) ; ø»…Ž£ + (chinese-isoir165 . #x5242) ; ø»¶³ + (chinese-cns11643-1 . #x4868) ; ø»‘¼µ (ucs . #x8863) ; è¡£ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R148-Horn.el b/lisp/utf-2000/Ideograph-R148-Horn.el index eeb6312..2722cad 100644 --- a/lisp/utf-2000/Ideograph-R148-Horn.el +++ b/lisp/utf-2000/Ideograph-R148-Horn.el @@ -333,6 +333,23 @@ )) (define-char '((ideographic-radical . 148) ; ⾓ + (ideographic-strokes . 4) + (total-strokes . 11) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (ucs . #x2FF0) ; â¿° + ) + ((=jis-x0208 . #x3351) ; ø½Š‘ˆ + (korean-ksc5601 . #x4A47) ; ø»‰—€ + (chinese-cns11643-1 . #x4B45) ; ø»’€¬ + (ideograph-daikanwa . 35003) ; ø¸ˆ¢» + ) + ((ucs . #x5347) ; 升 + )) + (ideograph-cbeta . 00976) ; ø¸  + )) +(define-char + '((ideographic-radical . 148) ; ⾓ (ideographic-strokes . 5) (total-strokes . 12) (chinese-cns11643-5 . #x3C37) ; ø»š’¬ diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el index 40d049c..a61768f 100644 --- a/lisp/utf-2000/Ideograph-R149-Speech.el +++ b/lisp/utf-2000/Ideograph-R149-Speech.el @@ -5619,6 +5619,7 @@ (ideographic-strokes . 8) (total-strokes . 15) (=jis-x0208 . #x315A) ; ø½ŠŽ• + (ideograph-cbeta . 05919) ; ø¸¡œŸ (ucs-jis . #x8B01) ; ø½ŠŽ• (mojikyo . 050460) ; ý €Œ”œ )) diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index ee6f917..561b6f8 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -17,27 +17,44 @@ (ideograph-daikanwa . 38701) ; ø¸‰œ­ )) (define-char - '((=>ucs . #x8FB6) ; 辶 + '((name . "CJK RADICAL WALK ONE") + (=>ucs . #x8FB6) ; 辶 + (general-category symbol other) ; Informative Category + (bidi-category . "ON") + (mirrored . nil) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 0) (total-strokes . 4) (japanese-jisx0212 . #x6134) ; ø»Œ‚£ (japanese-jisx0213-2 . #x796A) ; ø»¦Ÿ™ (ideograph-daikanwa . 38702) ; ø¸‰œ® + (ucs-jis . #x8FB6) ; ⻍ + (ucs . #x2ECD) ; ⻍ )) (define-char - '((=>ucs . #x8FB6) ; 辶 + '((name . "CJK RADICAL WALK TWO") + (=>ucs . #x8FB6) ; 辶 + (general-category symbol other) ; Informative Category + (bidi-category . "ON") + (mirrored . nil) (morohashi-daikanwa 38702 0 2) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 0) (total-strokes . 4) (chinese-cns11643-4 . #x2154) ; ø»—¡› + (chinese-big5-cdp . #x8AF7) ; ý¢€ˆ«· + (ucs-cns . #x8FB6) ; ⻎ + (ucs . #x2ECE) ; ⻎ )) (define-char '((morohashi-daikanwa 38702 0 3) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 0) (total-strokes . 3) + (->ideographic-component-forms + ((name . "CJK RADICAL SIMPLIFIED WALK") + (ucs . #x2ECC) ; ⻌ + )) (chinese-gb2312 . #x6541) ; ø»…ªœ (chinese-isoir165 . #x6541) ; ø»Ž’¬ (ucs . #x8FB6) ; 辶 diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el index 37e5321..de307ca 100644 --- a/lisp/utf-2000/Ideograph-R163-City.el +++ b/lisp/utf-2000/Ideograph-R163-City.el @@ -1994,16 +1994,24 @@ (ideograph-daikanwa . 39459) ; ø¸‰¨£ )) (define-char - '((ideographic-radical . 163) ; â¾¢ + '((=>ucs . #x90E8) ; 部 + (ideographic-radical . 163) ; â¾¢ (ideographic-strokes . 8) (total-strokes . 11) (shinjigen-2 . 8457) - (chinese-gb2312 . #x323F) ; ø»„Ÿ  (=jis-x0208 . #x4974) ; ø½Š±¿ (korean-ksc5601 . #x5D3B) ; ø»‰²® + (ideograph-daikanwa . 39460) ; ø¸‰¨¤ + (ucs-jis . #x90E8) ; ø½Š±¿ + )) +(define-char + '((morohashi-daikanwa 39460 0 0) + (ideographic-radical . 163) ; â¾¢ + (ideographic-strokes . 8) + (total-strokes . 11) + (chinese-gb2312 . #x323F) ; ø»„Ÿ  (chinese-isoir165 . #x323F) ; ø»‡° (chinese-cns11643-1 . #x5D65) ; ø»’›¨ - (ideograph-daikanwa . 39460) ; ø¸‰¨¤ (ucs . #x90E8) ; 部 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el index 58cd38d..c64361c 100644 --- a/lisp/utf-2000/Ideograph-R184-Eat.el +++ b/lisp/utf-2000/Ideograph-R184-Eat.el @@ -3,6 +3,15 @@ (ideographic-radical . 184) ; â¾· (ideographic-strokes . 0) (total-strokes . 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (ucs . #x2FF1) ; ⿱ + ) + ((chinese-big5-cdp . #x8AFC) ; ý¢€ˆ«¼ + ) + ((ucs . #x826E) ; 艮 + )) + (shinjigen-1 . 9234) (shinjigen-2 . 9233) (korean-ksc5601 . #x635D) ; ø»‰¼„ (chinese-cns11643-1 . #x537A) ; ø»’‘ @@ -14,6 +23,7 @@ (ideographic-radical . 184) ; â¾· (ideographic-strokes . 0) (total-strokes . 9) + (shinjigen-1 . 9233) (shinjigen-2 . 9234) (=jis-x0208 . #x3F29) ; ø½Š¢ˆ (ucs-jis . #x98DF) ; ø½Š¢ˆ @@ -24,11 +34,69 @@ (ideographic-radical . 184) ; â¾· (ideographic-strokes . 0) (total-strokes . 9) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (ucs . #x2FF1) ; ⿱ + ) + ((ucs . #x4EBD) ; 亽 + ) + ((ucs . #x826E) ; 艮 + )) (chinese-gb2312 . #x4A33) ; ø»…‚¤ (chinese-isoir165 . #x4A33) ; ø»ª´ (ucs . #x98DF) ; 食 )) (define-char + '((=>ucs . #x98E0) ; 飠 + (morohashi-daikanwa 44014 0 3) + (ideographic-radical . 184) ; â¾· + (ideographic-strokes . 0) + (total-strokes . 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (ucs . #x2FF1) ; ⿱ + ) + ((chinese-big5-cdp . #x8AFC) ; ý¢€ˆ«¼ + ) + ((chinese-big5-cdp . #x8B7C) ; ý¢€ˆ­¼ + )) + (chinese-big5-cdp . #x8BB9) ; ý¢€ˆ®¹ + )) +(define-char + '((morohashi-daikanwa 44014 0 4) + (ideographic-radical . 184) ; â¾· + (ideographic-strokes . 0) + (total-strokes . 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (ucs . #x2FF1) ; ⿱ + ) + ((ucs . #x4EBD) ; 亽 + ) + ((chinese-big5-cdp . #x8B7C) ; ý¢€ˆ­¼ + )) + (chinese-gb12345 . #x623B) ; 飠 + (ucs . #x98E0) ; 飠 + )) +(define-char + '((=>ucs . #x98E0) ; 飠 + (morohashi-daikanwa 44014 0 5) + (ideographic-radical . 184) ; â¾· + (ideographic-strokes . 0) + (total-strokes . 8) + (ideograph-gt-pj-k1 . #x3471) ; ý¡„Ž„ + (ideograph-gt-k . 04996) ; ý¡„Ž„ + )) +(define-char + '((morohashi-daikanwa 44014 0 7) + (ideographic-radical . 184) ; â¾· + (ideographic-strokes . 0) + (total-strokes . 3) + (chinese-gb2312 . #x623B) ; ø»…¥¼ + (chinese-isoir165 . #x623B) ; ø»ŽŽŒ + (ucs . #x9963) ; 饣 + )) +(define-char '((ideographic-radical . 184) ; â¾· (ideographic-strokes . 0) (total-strokes . 9) @@ -70,20 +138,6 @@ )) (define-char '((ideographic-radical . 184) ; â¾· - (ideographic-strokes . 0) - (total-strokes . 8) - (chinese-gb12345 . #x623B) ; 飠 - (ucs . #x98E0) ; 飠 - )) -(define-char - '((ideographic-radical . 184) ; â¾· - (ideographic-strokes . 0) - (chinese-gb2312 . #x623B) ; ø»…¥¼ - (chinese-isoir165 . #x623B) ; ø»ŽŽŒ - (ucs . #x9963) ; 饣 - )) -(define-char - '((ideographic-radical . 184) ; â¾· (ideographic-strokes . 1) (total-strokes . 10) (ideograph-daikanwa . 44019) ; ø¸Š¯³ diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 96beee9..fd69226 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -934,6 +934,7 @@ (cond ((memq name '(ideograph-daikanwa-2 ideograph-daikanwa ideograph-gt + ideograph-gt-k ideograph-cbeta)) (if has-long-ccs-name "(%-26s . %05d)\t; %c%s" diff --git a/lisp/utf-2000/isolated-char.el b/lisp/utf-2000/isolated-char.el index 286ca9e..59a6ea3 100644 --- a/lisp/utf-2000/isolated-char.el +++ b/lisp/utf-2000/isolated-char.el @@ -185,6 +185,26 @@ code) ))) +(with-temp-buffer + (buffer-disable-undo) + (insert-file-contents "../etc/char-data/GT-fmap-K1.txt") + (insert-file-contents "../etc/char-data/GT-fmap-K2.txt") + (goto-char (point-min)) + (let (plane code gt-code) + (while (re-search-forward "^GTps-\\([0-9k][0-9]\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)\tGT-K\\([0-9]+\\)" nil t) + (setq plane (match-string 1) + code (string-to-int (match-string 2) 16) + gt-code (string-to-int (match-string 3))) + (if (eq (aref plane 0) ?0) + (setq plane (substring plane 1))) + (put-char-attribute (decode-builtin-char 'ideograph-gt-k gt-code) + (intern (format "ideograph-gt-pj-%s" plane)) + (encode-char + (decode-shift-jis-char (cons (/ code 256) + (% code 256))) + 'japanese-jisx0208)) + ))) + (define-char '((ideograph-gt-pj-4 . #x3844) (ideograph-gt . 19655) diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el index 1757e5f..f68d917 100644 --- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el +++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el @@ -438,6 +438,7 @@ (<-radical ((ucs . #x793B) ; 礻 )) + (chinese-big5-cdp . #x8B70) ; ý¢€ˆ­° (ucs . #x2EAD) ; ⺭ )) (define-char @@ -599,20 +600,27 @@ )) (define-char '((name . "CJK RADICAL GRASS TWO") + (=>ucs . #x8279) ; 艹 (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) - (<-radical - ((ideograph-daikanwa . 30639) ; ø¸‡ž¯ - )) - (ucs . #x2EBF) ; ⺿ + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 0) + (total-strokes . 4) + (chinese-cns11643-4 . #x2153) ; ø»—¡š + (japanese-jisx0213-2 . #x7575) ; ø»¦™¬ + (ideograph-daikanwa . 30639) ; ø¸‡ž¯ + (chinese-big5-cdp . #x8AFE) ; ý¢€ˆ«¾ + (ucs-cns . #x8279) ; ⺿ + (ucs . #x2EBF) ; ⺿ )) (define-char '((name . "CJK RADICAL GRASS THREE") (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) - (ucs . #x2EC0) ; ⻀ + (japanese-jisx0213-2 . #x7574) ; ø»¦™« + (ucs . #x2EC0) ; ⻀ )) (define-char '((name . "CJK RADICAL TIGER") @@ -732,27 +740,38 @@ (<-radical ((ucs . #x8FB6) ; 辶 )) - (chinese-big5-cdp . #x8966) ; ý¢€ˆ¥¦ - (ucs . #x2ECC) ; ⻌ + (japanese-jisx0213-2 . #x7969) ; ø»¦Ÿ˜ + (chinese-big5-cdp . #x8966) ; ý¢€ˆ¥¦ + (ucs . #x2ECC) ; ⻌ )) (define-char '((name . "CJK RADICAL WALK ONE") + (=>ucs . #x8FB6) ; 辶 (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) - (<-radical - ((ideograph-daikanwa . 38702) ; ø¸‰œ® - )) - (ucs . #x2ECD) ; ⻍ + (ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 0) + (total-strokes . 4) + (japanese-jisx0212 . #x6134) ; ø»Œ‚£ + (japanese-jisx0213-2 . #x796A) ; ø»¦Ÿ™ + (ideograph-daikanwa . 38702) ; ø¸‰œ® + (ucs-jis . #x8FB6) ; ⻍ + (ucs . #x2ECD) ; ⻍ )) (define-char '((name . "CJK RADICAL WALK TWO") + (=>ucs . #x8FB6) ; 辶 (general-category symbol other) ; Informative Category (bidi-category . "ON") (mirrored . nil) - (<-radical - ((chinese-cns11643-4 . #x2154) ; ø»—¡› - )) + (morohashi-daikanwa 38702 0 2) + (ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 0) + (total-strokes . 4) + (chinese-cns11643-4 . #x2154) ; ø»—¡› + (chinese-big5-cdp . #x8AF7) ; ý¢€ˆ«· + (ucs-cns . #x8FB6) ; ⻎ (ucs . #x2ECE) ; ⻎ )) (define-char