From 1837c2752fe3d44c9e9f4775ef992f7716f83133 Mon Sep 17 00:00:00 2001 From: tomo Date: Thu, 3 Apr 2003 04:48:12 +0000 Subject: [PATCH] Sync up with r21-4-11-chise-0_20-=ucs-big5. --- lisp/ChangeLog | 5 ++++ lisp/mule/mule-conf.el | 3 ++- lisp/utf-2000/ChangeLog | 24 +++++++++++++++++++- lisp/utf-2000/Ideograph-R001-One.el | 6 ++--- lisp/utf-2000/Ideograph-R002-Line.el | 2 +- lisp/utf-2000/Ideograph-R003-Dot.el | 2 +- lisp/utf-2000/Ideograph-R004-Slash.el | 4 ++-- lisp/utf-2000/Ideograph-R005-Second.el | 6 ++--- lisp/utf-2000/Ideograph-R013-Down-Box.el | 2 +- lisp/utf-2000/Ideograph-R015-Ice.el | 2 +- lisp/utf-2000/Ideograph-R018-Knife.el | 2 +- lisp/utf-2000/Ideograph-R022-Right-Open-Box.el | 2 +- lisp/utf-2000/Ideograph-R032-Earth.el | 4 ++-- lisp/utf-2000/Ideograph-R038-Woman.el | 2 +- lisp/utf-2000/Ideograph-R043-Lame.el | 2 +- lisp/utf-2000/Ideograph-R072-Sun.el | 2 +- lisp/utf-2000/Ideograph-R085-Water.el | 2 +- lisp/utf-2000/Ideograph-R145-Clothes.el | 2 +- lisp/utf-2000/char-db-util.el | 18 +++++++-------- lisp/utf-2000/u02000-General-Punctuation.el | 2 +- lisp/utf-2000/u02200-Mathematical-Operators.el | 2 +- lisp/utf-2000/u02E00-CJK-Radical-Supplement.el | 2 +- .../u0FF00-Halfwidth-and-Fullwidth-Forms.el | 2 +- 23 files changed, 64 insertions(+), 36 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index edce9bb..7d8b51c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-31 MORIOKA Tomohiko + + * mule/mule-conf.el (=ucs@big5): Renamed from `ucs-big5'. + (ucs-big5): Changed to an alias for `=ucs@big5'. + 2003-03-29 MORIOKA Tomohiko * mule/mule-conf.el (=ucs@ks): Renamed from `ucs-ks'. diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index bc9450d..291d627 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -201,7 +201,7 @@ direction l2r mother =ucs)) (define-charset-alias 'ucs-ks '=ucs@ks) - (make-charset 'ucs-big5 + (make-charset '=ucs@big5 "UCS for Big5" `(long-name "ISO/IEC 10646 for Big5" chars 256 @@ -210,6 +210,7 @@ graphic 2 direction l2r mother =ucs)) + (define-charset-alias 'ucs-big5 '=ucs@big5) (make-charset 'ideograph-daikanwa "Daikanwa" diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 7622c18..269a046 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,8 +1,30 @@ +2003-04-01 MORIOKA Tomohiko + + * Ideograph-R032-Earth.el (U+FA10): Rename `=>ucs-big5' to + `=>ucs@big5'. + + * char-db-util.el (insert-char-attributes): Convert `=>ucs-big5' + to `=>ucs@big5'. + +2003-03-31 MORIOKA Tomohiko + + * u0FF00-Halfwidth-and-Fullwidth-Forms.el, + u02E00-CJK-Radical-Supplement.el, u02000-General-Punctuation.el, + u02200-Mathematical-Operators.el, Ideograph-R145-Clothes.el, + Ideograph-R085-Water.el, Ideograph-R043-Lame.el, + Ideograph-R072-Sun.el, Ideograph-R038-Woman.el, + Ideograph-R032-Earth.el, Ideograph-R022-Right-Open-Box.el, + Ideograph-R018-Knife.el, Ideograph-R015-Ice.el, + Ideograph-R013-Down-Box.el, Ideograph-R005-Second.el, + Ideograph-R003-Dot.el, Ideograph-R004-Slash.el, + Ideograph-R002-Line.el, Ideograph-R001-One.el: Rename `=ucs-big5' + to `=ucs@big5'. + 2003-03-30 MORIOKA Tomohiko * Ideograph-R125-Old.el, Ideograph-R140-Grass.el, Ideograph-R085-Water.el, Ideograph-R072-Sun.el, - Ideograph-R061-Heart.el: Convert `=>ucs-ks' to `=>ucs@ks'. + Ideograph-R061-Heart.el: Rename `=>ucs-ks' to `=>ucs@ks'. * char-db-util.el (insert-char-attributes): New implementation to convert `=>ucs-FOO' to `=>ucs@FOO'; convert `=>ucs-ks' to diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index 5a9c5e6..d148110 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -286,7 +286,7 @@ (ideograph-daikanwa . 00011) ; ø¸€€‹ (=gt-k . 00189) ; ý¡„€‚½ (=jef-china3 . #x41A5) ; øº„†¥ - (ucs-big5 . #x4E08) ; ø»‚§« + (=ucs@big5 . #x4E08) ; ø»‚§« (=gt . 00018) ; ý¡€€€’ )) (define-char @@ -544,7 +544,7 @@ ((=gt-k . 00002) ; ý¡„€€‚ )) (chinese-big5 . #xC94F) ; ý¢€Œ¥ - (ucs-big5 . #x4E0E) ; ý¢€Œ¥ + (=ucs@big5 . #x4E0E) ; ý¢€Œ¥ )) (define-char '((=>ucs . #x4E0E) ; 与 @@ -612,7 +612,7 @@ (ideograph-daikanwa . 00023) ; ø¸€€— (=gt-k . 00398) ; ý¡„€†Ž (=ucs@jis . #x4E11) ; ø½Šª - (ucs-big5 . #x4E11) ; ø½Šª + (=ucs@big5 . #x4E11) ; ø½Šª (=gt . 00033) ; ý¡€€€¡ (mojikyo . 000023) ; ý €€€— )) diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index f596ab9..28fe892 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -238,7 +238,7 @@ (chinese-cns11643-1 . #x4464) ; ø»‘¶¹ (chinese-big5 . #xA4A5) ; ý¢€Š’¥ (=ucs@cns . #x4E30) ; ø»‘¶¹ - (ucs-big5 . #x4E30) ; ø»‘¶¹ + (=ucs@big5 . #x4E30) ; ø»‘¶¹ )) (define-char '((ideographic-radical . 2) ; ⼁ diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index 941100c..86f4fec 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -105,7 +105,7 @@ (ideograph-daikanwa . 00095) ; ø¸€Ÿ (=gt-k . 00162) ; ý¡„€‚¢ (=ucs@cns . #x4E38) ; ø»‘¶ - (ucs-big5 . #x4E38) ; ø»‘¶ + (=ucs@big5 . #x4E38) ; ø»‘¶ (=gt . 00132) ; ý¡€€‚„ (mojikyo . 000095) ; ý €€Ÿ )) diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index 8308f26..72992fd 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -485,7 +485,7 @@ (=gt-k . 00200) ; ý¡„€ƒˆ (=ucs@jis . #x4E4B) ; ø½Š®† (=ucs@ks . #x4E4B) ; ø½Š®† - (ucs-big5 . #x4E4B) ; ø½Š®† + (=ucs@big5 . #x4E4B) ; ø½Š®† (=gt . 00166) ; ý¡€€‚¦ (mojikyo . 000125) ; ý €€½ )) @@ -728,7 +728,7 @@ (=gt-k . 00491) ; ý¡„€‡« (=ucs@jis . #x4E4F) ; ø½Š³º (=ucs@ks . #x4E4F) ; ø½Š³º - (ucs-big5 . #x4E4F) ; ø½Š³º + (=ucs@big5 . #x4E4F) ; ø½Š³º (=gt . 00175) ; ý¡€€‚¯ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index 72ee555..ef8fc01 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -1082,7 +1082,7 @@ (=gt-k . 03792) ; ý¡„€» (=jef-china3 . #x41C4) ; øº„‡„ (=ucs@ks . #x4E73) ; ø»Š†š - (ucs-big5 . #x4E73) ; ø»Š†š + (=ucs@big5 . #x4E73) ; ø»Š†š (=gt . 00257) ; ý¡€€„ (mojikyo . 000190) ; ý €€‚¾ )) @@ -1717,7 +1717,7 @@ (ideograph-daikanwa . 00205) ; ø¸€ƒ (=jef-china3 . #x41C5) ; øº„‡… (=ucs@jis . #x4E7F) ; ø»Šº­ - (ucs-big5 . #x4E7F) ; ø»Šº­ + (=ucs@big5 . #x4E7F) ; ø»Šº­ (=gt . 00276) ; ý¡€€„” (mojikyo . 000205) ; ý €€ƒ )) @@ -2116,7 +2116,7 @@ (=gt-k . 10403) ; ý¡„‚¢£ (=ucs@jis . #x4E82) ; ø½Š»‰ (=ucs@ks . #x4E82) ; ø½Š»‰ - (ucs-big5 . #x4E82) ; ø½Š»‰ + (=ucs@big5 . #x4E82) ; ø½Š»‰ (=gt . 00285) ; ý¡€€„ (mojikyo . 000214) ; ý €€ƒ– )) diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el index 90e97c6..cb971bc 100644 --- a/lisp/utf-2000/Ideograph-R013-Down-Box.el +++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el @@ -892,7 +892,7 @@ ((=ucs . #x5401) ; 吁 )) (chinese-big5 . #xD0DF) ; ý¢€ƒŸ - (ucs-big5 . #x5194) ; ý¢€ƒŸ + (=ucs@big5 . #x5194) ; ý¢€ƒŸ )) (define-char '((ideographic-radical . 13) ; ⼌ diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index 396dda7..15abef9 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -2594,7 +2594,7 @@ (ideographic-strokes . 13) (total-strokes . 15) (chinese-big5 . #xE8F9) ; ý¢€Ž£¹ - (ucs-big5 . #x51DE) ; ý¢€Ž£¹ + (=ucs@big5 . #x51DE) ; ý¢€Ž£¹ )) (define-char '((=>ucs . #x51DE) ; 凞 diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index a530981..251ca62 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -7316,7 +7316,7 @@ (chinese-big5 . #xBC41) ; ý¢€‹± (ideograph-daikanwa . 02223) ; ø¸€¢¯ (=ucs@jis . #x5288) ; ø½Š½· - (ucs-big5 . #x5288) ; ø½Š½· + (=ucs@big5 . #x5288) ; ø½Š½· )) (define-char '((morohashi-daikanwa 2223 0 0) diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el index fae3fae..ff809d4 100644 --- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el @@ -722,7 +722,7 @@ )) (korean-ksc5601 . #x5D63) ; ø»‰³– (chinese-big5 . #xADEA) ; ý¢€Š·ª - (ucs-big5 . #x532A) ; ø»‰³– + (=ucs@big5 . #x532A) ; ø»‰³– )) (define-char '((morohashi-daikanwa 2629 0 2) diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 5e48c0e..47baf80 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -7662,7 +7662,7 @@ '((=>ucs* . #x585A) ; 塚 (=>ucs@gb . #x585A) ; 塚 (=>ucs@cns . #x585A) ; ø»’¤ - (=>ucs-big5 . #x585A) ; ø»’¤ + (=>ucs@big5 . #x585A) ; ø»’¤ (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 10) (total-strokes . 13) @@ -7693,7 +7693,7 @@ (chinese-cns11643-1 . #x6356) ; ø»’¤ (chinese-big5 . #xB6EF) ; ý¢€‹›¯ (=ucs@cns . #x585A) ; ø»’¤ - (ucs-big5 . #x585A) ; ø»’¤ + (=ucs@big5 . #x585A) ; ø»’¤ )) (define-char '((=>ucs . #x585A) ; 塚 diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el index 12e1be2..d169ea4 100644 --- a/lisp/utf-2000/Ideograph-R038-Woman.el +++ b/lisp/utf-2000/Ideograph-R038-Woman.el @@ -8428,7 +8428,7 @@ (ideographic-strokes . 10) (total-strokes . 13) (chinese-big5 . #xB6F9) ; ý¢€‹›¹ - (ucs-big5 . #x5AC1) ; ý¢€‹›¹ + (=ucs@big5 . #x5AC1) ; ý¢€‹›¹ )) (define-char '((morohashi-daikanwa 6602 0 1) diff --git a/lisp/utf-2000/Ideograph-R043-Lame.el b/lisp/utf-2000/Ideograph-R043-Lame.el index 0aa231a..01e0fac 100644 --- a/lisp/utf-2000/Ideograph-R043-Lame.el +++ b/lisp/utf-2000/Ideograph-R043-Lame.el @@ -22,7 +22,7 @@ (=gt-k . 00220) ; ý¡„€ƒœ (=ucs@gb . #x5C22) ; 尢 (=ucs@jis . #x5C22) ; 尢 - (ucs-big5 . #x5C22) ; 尢 + (=ucs@big5 . #x5C22) ; 尢 (=ucs . #x2F875) ; 尢 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index 1ebe6b4..e71ba29 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -3365,7 +3365,7 @@ (=jef-china3 . #x51A7) ; øº…†§ (=ucs@cns . #x6677) ; ø»’ž¢ (=ucs@jis-2000 . #x6677) ; ø»’ž¢ - (ucs-big5 . #x6677) ; ø»’ž¢ + (=ucs@big5 . #x6677) ; ø»’ž¢ (mojikyo . 014005) ; ý €ƒšµ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index 05707d1..06f2cc4 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -6459,7 +6459,7 @@ (=gt-k . 06556) ; ý¡„¦œ (=ucs@jis . #x6D41) ; ø½Š¸ (=ucs@ks . #x6D41) ; ø½Š¸ - (ucs-big5 . #x6D41) ; ø½Š¸ + (=ucs@big5 . #x6D41) ; ø½Š¸ (mojikyo . 050250) ; ý €Œ‘Š )) (define-char diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el index 4aacd58..115c837 100644 --- a/lisp/utf-2000/Ideograph-R145-Clothes.el +++ b/lisp/utf-2000/Ideograph-R145-Clothes.el @@ -5365,7 +5365,7 @@ (ideograph-daikanwa . 34556) ; ø¸ˆ›¼ (=ucs@jis . #x8944) ; ø½‹¢  (=ucs@ks . #x8944) ; ø½‹¢  - (ucs-big5 . #x8944) ; ø½‹¢  + (=ucs@big5 . #x8944) ; ø½‹¢  )) (define-char '((morohashi-daikanwa 34556 0 0) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 0a34759..aacb226 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -512,7 +512,7 @@ ;; line-breaking)) ;; (setq attributes (delq '=>ucs* attributes)) ;; ) - (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks)) + (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -525,7 +525,7 @@ line-breaking)) (setq attributes (delq name attributes)) )) - (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks)) + (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks =>ucs-big5)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -554,13 +554,13 @@ ;; line-breaking)) ;; (setq attributes (delq '=>ucs-cns attributes)) ;; ) - (when (and (memq '=>ucs-big5 attributes) - (setq value (get-char-attribute char '=>ucs-big5))) - (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s" - value (decode-char 'ucs-big5 value) - line-breaking)) - (setq attributes (delq '=>ucs-big5 attributes)) - ) + ;; (when (and (memq '=>ucs-big5 attributes) + ;; (setq value (get-char-attribute char '=>ucs-big5))) + ;; (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s" + ;; value (decode-char 'ucs-big5 value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-big5 attributes)) + ;; ) ;; (when (and (memq '=>ucs-jis attributes) ;; (setq value (get-char-attribute char '=>ucs-jis))) ;; (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s" diff --git a/lisp/utf-2000/u02000-General-Punctuation.el b/lisp/utf-2000/u02000-General-Punctuation.el index 252f4a5..a3745d9 100644 --- a/lisp/utf-2000/u02000-General-Punctuation.el +++ b/lisp/utf-2000/u02000-General-Punctuation.el @@ -577,7 +577,7 @@ (mirrored . nil) (chinese-cns11643-1 . #x2224) ; ø»‘ƒ½ (chinese-big5 . #xA1C3) ; ý¢€Š‡ƒ - (ucs-big5 . #xFFE3) ; ø»‘ƒ½ + (=ucs@big5 . #xFFE3) ; ø»‘ƒ½ )) (define-char '((name . "UNDERTIE") diff --git a/lisp/utf-2000/u02200-Mathematical-Operators.el b/lisp/utf-2000/u02200-Mathematical-Operators.el index 2219c57..11d9e04 100644 --- a/lisp/utf-2000/u02200-Mathematical-Operators.el +++ b/lisp/utf-2000/u02200-Mathematical-Operators.el @@ -551,7 +551,7 @@ (korean-ksc5601 . #x212D) ; ø»ˆš˜ (chinese-cns11643-1 . #x2244) ; ø»‘„ (chinese-big5 . #xA1E3) ; ý¢€Š‡£ - (ucs-big5 . #xFF5E) ; ∼ + (=ucs@big5 . #xFF5E) ; ∼ (=ucs . #x223C) ; ∼ )) (define-char diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el index 0731170..b74193e 100644 --- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el +++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el @@ -100,7 +100,7 @@ ((=ucs . #x5202) ; 刂 )) (=big5-eten . #xC87D) ; ý¢€Œ¡½ - (ucs-big5 . #x5202) ; ⺉ + (=ucs@big5 . #x5202) ; ⺉ (=ucs . #x2E89) ; ⺉ )) (define-char diff --git a/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el b/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el index 41900e1..10b09b3 100644 --- a/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el +++ b/lisp/utf-2000/u0FF00-Halfwidth-and-Fullwidth-Forms.el @@ -1205,7 +1205,7 @@ (mirrored . nil) (chinese-cns11643-1 . #x2226) ; ø»‘ƒ¿ (chinese-big5 . #xA1C5) ; ý¢€Š‡… - (ucs-big5 . #x02CD) ; ø»‘ƒ¿ + (=ucs@big5 . #x02CD) ; ø»‘ƒ¿ )) (define-char '((name . "FULLWIDTH GRAVE ACCENT") -- 1.7.10.4