From: tomo Date: Sun, 30 Mar 2003 16:15:04 +0000 (+0000) Subject: Sync up with r21-4-11-chise-0_20-=ucs-ks. X-Git-Tag: r21-2-44-utf-2000-m0_18-=ucs-ks~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f069c4e745bf6c9d014be52e551d34587d70969a;p=chise%2Fxemacs-chise.git Sync up with r21-4-11-chise-0_20-=ucs-ks. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db9728d..edce9bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-29 MORIOKA Tomohiko + + * mule/mule-conf.el (=ucs@ks): Renamed from `ucs-ks'. + (ucs-ks): Changed to an alias for `=ucs@ks'. + 2003-03-27 MORIOKA Tomohiko * mule/mule-conf.el (=ucs@jis-2000): Renamed from `=ucs-jis-2000'. diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 576c043..bc9450d 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -191,7 +191,7 @@ direction l2r mother ucs-jis)) (define-charset-alias '=ucs-jis-2000 '=ucs@jis-2000) - (make-charset 'ucs-ks + (make-charset '=ucs@ks "UCS for KS" `(long-name "ISO/IEC 10646 for Korean Standards" chars 256 @@ -200,6 +200,7 @@ graphic 2 direction l2r mother =ucs)) + (define-charset-alias 'ucs-ks '=ucs@ks) (make-charset 'ucs-big5 "UCS for Big5" `(long-name "ISO/IEC 10646 for Big5" diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 9163d0e..7622c18 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,39 @@ +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'. + + * char-db-util.el (insert-char-attributes): New implementation to + convert `=>ucs-FOO' to `=>ucs@FOO'; convert `=>ucs-ks' to + `=>ucs@ks'. + +2003-03-29 MORIOKA Tomohiko + + * Ideograph-R209-Nose.el, Ideograph-R210-Even.el, + Ideograph-R198-Deer.el, Ideograph-R189-Tall.el, + Ideograph-R187-Horse.el, Ideograph-R181-Leaf.el, + Ideograph-R172-Short-Tailed-Bird.el, Ideograph-R170-Mound.el, + Ideograph-R169-Gate.el, Ideograph-R164-Wine.el, + Ideograph-R163-City.el, Ideograph-R160-Bitter.el, + Ideograph-R162-Walk.el, Ideograph-R157-Foot.el, + Ideograph-R154-Shell.el, Ideograph-R149-Speech.el, + Ideograph-R147-See.el, Ideograph-R145-Clothes.el, + Ideograph-R142-Insect.el, Ideograph-R141-Tiger.el, + Ideograph-R125-Old.el, Ideograph-R140-Grass.el, + Ideograph-R122-Net.el, Ideograph-R120-Silk.el, + Ideograph-R118-Bamboo.el, Ideograph-R116-Cave.el, + Ideograph-R115-Grain.el, Ideograph-R113-Spirit.el, + Ideograph-R087-Claw.el, Ideograph-R094-Dog.el, + Ideograph-R086-Fire.el, Ideograph-R085-Water.el, + Ideograph-R075-Tree.el, Ideograph-R074-Moon.el, + Ideograph-R072-Sun.el, Ideograph-R061-Heart.el, + Ideograph-R053-Dotted-Cliff.el, Ideograph-R044-Corpse.el, + Ideograph-R032-Earth.el, Ideograph-R030-Mouth.el, + Ideograph-R020-Wrap.el, Ideograph-R009-Man.el, + Ideograph-R005-Second.el, Ideograph-R004-Slash.el: Rename + `=ucs-ks' to `=ucs@ks'. + 2003-03-27 MORIOKA Tomohiko * Ideograph-R085-Water.el (JX1-7654): Rename `=ucs-jis-2000' to diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index 6cf5901..8308f26 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -484,7 +484,7 @@ (ideograph-daikanwa . 00125) ; ø¸€½ (=gt-k . 00200) ; ý¡„€ƒˆ (=ucs@jis . #x4E4B) ; ø½Š®† - (ucs-ks . #x4E4B) ; ø½Š®† + (=ucs@ks . #x4E4B) ; ø½Š®† (ucs-big5 . #x4E4B) ; ø½Š®† (=gt . 00166) ; ý¡€€‚¦ (mojikyo . 000125) ; ý €€½ @@ -727,7 +727,7 @@ (ideograph-daikanwa . 00133) ; ø¸€‚… (=gt-k . 00491) ; ý¡„€‡« (=ucs@jis . #x4E4F) ; ø½Š³º - (ucs-ks . #x4E4F) ; ø½Š³º + (=ucs@ks . #x4E4F) ; ø½Š³º (ucs-big5 . #x4E4F) ; ø½Š³º (=gt . 00175) ; ý¡€€‚¯ )) diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index 6cfd2ec..72ee555 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -1081,7 +1081,7 @@ (ideograph-daikanwa . 00190) ; ø¸€‚¾ (=gt-k . 03792) ; ý¡„€» (=jef-china3 . #x41C4) ; øº„‡„ - (ucs-ks . #x4E73) ; ø»Š†š + (=ucs@ks . #x4E73) ; ø»Š†š (ucs-big5 . #x4E73) ; ø»Š†š (=gt . 00257) ; ý¡€€„ (mojikyo . 000190) ; ý €€‚¾ @@ -2115,7 +2115,7 @@ (ideograph-daikanwa . 00214) ; ø¸€ƒ– (=gt-k . 10403) ; ý¡„‚¢£ (=ucs@jis . #x4E82) ; ø½Š»‰ - (ucs-ks . #x4E82) ; ø½Š»‰ + (=ucs@ks . #x4E82) ; ø½Š»‰ (ucs-big5 . #x4E82) ; ø½Š»‰ (=gt . 00285) ; ý¡€€„ (mojikyo . 000214) ; ý €€ƒ– diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 3b44daa..891c14e 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -24446,7 +24446,7 @@ (ideograph-daikanwa . 01117) ; ø¸€‘ (=big5-cdp . #xB9AC) ; ý¢€‹¦¬ (=jef-china3 . #x43B7) ; øº„Ž· - (ucs-ks . #x50E7) ; 僧 + (=ucs@ks . #x50E7) ; 僧 (mojikyo . 001117) ; ý €€‘ (=ucs . #xFA31) ; 僧 )) diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el index 3c8fbe3..64b4931 100644 --- a/lisp/utf-2000/Ideograph-R020-Wrap.el +++ b/lisp/utf-2000/Ideograph-R020-Wrap.el @@ -34,7 +34,7 @@ (ideograph-daikanwa . 02494) ; ø¸€¦¾ (=big5-cdp . #xA463) ; ý¢€Š‘£ (=jef-china3 . #x45A1) ; øº„–¡ - (ucs-ks . #x52FA) ; 勺 + (=ucs@ks . #x52FA) ; 勺 (=ucs . #x2F828) ; 勺 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 93cc11e..d3ace03 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -3767,7 +3767,7 @@ (=gt-k . 02740) ; ý¡„€ª´ (=ucs@gb . #x5448) ; 呈 (=ucs@jis . #x5448) ; 呈 - (ucs-ks . #x5448) ; 呈 + (=ucs@ks . #x5448) ; 呈 (=ucs . #x2F83E) ; 呈 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 0d7fcbb..5e48c0e 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -7670,7 +7670,7 @@ (korean-ksc5601 . #x7540) ; ø»Š–ƒ (=jis-x0213-1-2000 . #x2F57) ; ø»¢¨– (ideograph-daikanwa . 05345) ; ø¸“¡ - (ucs-ks . #x585A) ; 塚 + (=ucs@ks . #x585A) ; 塚 (=ucs . #xFA10) ; 塚 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el index 253706d..0d56ffb 100644 --- a/lisp/utf-2000/Ideograph-R044-Corpse.el +++ b/lisp/utf-2000/Ideograph-R044-Corpse.el @@ -1947,7 +1947,7 @@ (ideograph-daikanwa . 07798) ; ø¸¹¶ (=big5-cdp . #xBC68) ; ý¢€‹±¨ (=jef-china3 . #x4AE0) ; øº„«  - (ucs-ks . #x5C64) ; 層 + (=ucs@ks . #x5C64) ; 層 (=ucs . #xFA3B) ; 層 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el index d9c6601..850d43f 100644 --- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el +++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el @@ -2993,7 +2993,7 @@ (=jis-x0213-1-2000 . #x742E) ; ø»¤ƒ (ideograph-daikanwa . 09437) ; ø¸‚“ (=ucs@jis . #xF928) ; ø»‰§‰ - (ucs-ks . #x5ECA) ; ø»‰§‰ + (=ucs@ks . #x5ECA) ; ø»‰§‰ )) (define-char '((=>ucs . #x2F88E) ; 廊 diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el index dea25f4..fb7f172 100644 --- a/lisp/utf-2000/Ideograph-R061-Heart.el +++ b/lisp/utf-2000/Ideograph-R061-Heart.el @@ -11159,7 +11159,7 @@ )) (define-char '((=>ucs . #xFA3E) ; 慨 - (=>ucs-ks . #x6168) ; 慨 + (=>ucs@ks . #x6168) ; 慨 (morohashi-daikanwa 11122 0 1) (ideographic-radical . 61) ; â¼¼ (ideographic-strokes . 11) @@ -11175,7 +11175,7 @@ (total-strokes . 14) (korean-ksc5601 . #x4B46) ; ø»‰˜ (=jis-x0213-1-2000 . #x745C) ; ø»¤± - (ucs-ks . #x6168) ; 慨 + (=ucs@ks . #x6168) ; 慨 (=ucs . #xFA3E) ; 慨 )) (define-char @@ -12337,7 +12337,7 @@ (ideograph-daikanwa . 11202) ; ø¸‚¯‚ (=big5-cdp . #xBCA8) ; ý¢€‹²¨ (=jef-china3 . #x4ED8) ; øº„»˜ - (ucs-ks . #x618E) ; 憎 + (=ucs@ks . #x618E) ; 憎 (=ucs . #xFA3F) ; 憎 )) (define-char @@ -15406,7 +15406,7 @@ (korean-ksc5601 . #x7324) ; ø»Š’« (chinese-big5 . #xC367) ; ý¢€Œ§ (ideograph-daikanwa . 11424) ; ø¸‚²  - (ucs-ks . #x61F2) ; ø»Š’« + (=ucs@ks . #x61F2) ; ø»Š’« )) (define-char '((=>ucs@jis . #xFA40) ; 懲 @@ -15421,7 +15421,7 @@ '((=>ucs* . #x61F2) ; 懲 (=>ucs@gb . #x61F2) ; 懲 (=>ucs@cns . #x61F2) ; ø»“‚¡ - (=>ucs-ks . #x61F2) ; ø»Š’« + (=>ucs@ks . #x61F2) ; ø»Š’« (morohashi-daikanwa 11424 0 1) (ideographic-radical . 61) ; â¼¼ (ideographic-strokes . 15) diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index e1dd0f9..1ebe6b4 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -3340,7 +3340,7 @@ (japanese-jisx0212 . #x4247) ; ø»‹•” (ideograph-daikanwa . 14005) ; ø¸ƒšµ (=ucs@jis-1990 . #x6677) ; ø»‰Ÿ‹ - (ucs-ks . #x6677) ; ø»‰Ÿ‹ + (=ucs@ks . #x6677) ; ø»‰Ÿ‹ )) (define-char '((morohashi-daikanwa 14005 0 1) @@ -4107,12 +4107,12 @@ (=jis-x0213-1-2000 . #x7543) ; ø»¤Ž¶ (ideograph-daikanwa . 14051) ; ø¸ƒ›£ (=jef-china3 . #x51AA) ; øº…†ª - (ucs-ks . #x6691) ; 暑 + (=ucs@ks . #x6691) ; 暑 (=ucs . #xFA43) ; 暑 )) (define-char '((=>ucs . #xFA43) ; 暑 - (=>ucs-ks . #x6691) ; 暑 + (=>ucs@ks . #x6691) ; 暑 (morohashi-daikanwa 14051 0 0) (ideographic-radical . 72) ; ⽇ (ideographic-strokes . 9) diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el index db06a0f..79b34a1 100644 --- a/lisp/utf-2000/Ideograph-R074-Moon.el +++ b/lisp/utf-2000/Ideograph-R074-Moon.el @@ -457,7 +457,7 @@ (ideograph-daikanwa . 14364) ; ø¸ƒ œ (=jef-china3 . #x52AD) ; øº…Š­ (=ucs@jis . #xF929) ; ø»‰§Š - (ucs-ks . #x6717) ; ø»‰§Š + (=ucs@ks . #x6717) ; ø»‰§Š )) (define-char '((=>ucs . #x2F8D8) ; 朗 diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index 9825b37..1cd3b28 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -15775,7 +15775,7 @@ (=jis-x0213-1-2000 . #x7624) ; ø»¤µ (=jef-china3 . #x53FA) ; øº…º (=ucs@jis . #x69EA) ; ø»‰˜Ÿ - (ucs-ks . #x69EA) ; ø»‰˜Ÿ + (=ucs@ks . #x69EA) ; ø»‰˜Ÿ (=gt . 19861) ; ý¡€„¶• )) (define-char diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index 9b041e2..05707d1 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -6458,7 +6458,7 @@ (chinese-big5 . #xAC79) ; ý¢€Š±¹ (=gt-k . 06556) ; ý¡„¦œ (=ucs@jis . #x6D41) ; ø½Š¸ - (ucs-ks . #x6D41) ; ø½Š¸ + (=ucs@ks . #x6D41) ; ø½Š¸ (ucs-big5 . #x6D41) ; ø½Š¸ (mojikyo . 050250) ; ý €Œ‘Š )) @@ -6477,7 +6477,7 @@ '((=>ucs* . #x6D41) ; 流 (=>ucs@gb . #x6D41) ; 流 (=>ucs@jis . #x6D41) ; ø½Š¸ - (=>ucs-ks . #x6D41) ; ø½Š¸ + (=>ucs@ks . #x6D41) ; ø½Š¸ (morohashi-daikanwa 17572 1 1) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 7) @@ -9410,7 +9410,7 @@ (=jis-x0213-1-2000 . #x7677) ; ø»¤‘ˆ (ideograph-daikanwa . 17758) ; ø¸„•ž (=big5-cdp . #xB25A) ; ý¢€‹‰š - (ucs-ks . #x6E1A) ; 渚 + (=ucs@ks . #x6E1A) ; 渚 (mojikyo . 017758) ; ý €„•ž (=ucs . #xFA46) ; 渚 )) diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 32c2445..a2c05a0 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -6049,7 +6049,7 @@ (ideograph-daikanwa . 19188) ; ø¸„«´ (=big5-cdp . #xB54E) ; ý¢€‹•Ž (=jef-china3 . #x58A7) ; øº…¢§ - (ucs-ks . #x716E) ; 煮 + (=ucs@ks . #x716E) ; 煮 (=ucs . #xFA48) ; 煮 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el index cdeaf36..b23d139 100644 --- a/lisp/utf-2000/Ideograph-R087-Claw.el +++ b/lisp/utf-2000/Ideograph-R087-Claw.el @@ -632,7 +632,7 @@ (ideograph-daikanwa . 19711) ; ø¸„³¿ (=big5-cdp . #xC0EF) ; ý¢€Œƒ¯ (=jef-china3 . #x58AE) ; øº…¢® - (ucs-ks . #x7235) ; ø»ŠŠœ + (=ucs@ks . #x7235) ; ø»ŠŠœ (mojikyo . 019711) ; ý €„³¿ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el index 2e3f143..d9abda6 100644 --- a/lisp/utf-2000/Ideograph-R094-Dog.el +++ b/lisp/utf-2000/Ideograph-R094-Dog.el @@ -3591,7 +3591,7 @@ (=jis-x0213-1-2000 . #x776F) ; ø»¤’ž (ideograph-daikanwa . 20534) ; ø¸…€¶ (=jef-china3 . #x58EF) ; øº…£¯ - (ucs-ks . #x732A) ; 猪 + (=ucs@ks . #x732A) ; 猪 (mojikyo . 020534) ; ý €…€¶ (=ucs . #xFA16) ; 猪 )) diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el index 389e26f..8947c1a 100644 --- a/lisp/utf-2000/Ideograph-R113-Spirit.el +++ b/lisp/utf-2000/Ideograph-R113-Spirit.el @@ -175,7 +175,7 @@ (=jis-x0213-1-2000 . #x7933) ; ø»¤”ž (ideograph-daikanwa . 24631) ; ø¸†€· (=jef-china3 . #x5CD3) ; øº…³“ - (ucs-ks . #x793E) ; 社 + (=ucs@ks . #x793E) ; 社 (mojikyo . 024631) ; ý €†€· (=ucs . #xFA4C) ; 社 )) @@ -459,7 +459,7 @@ (=jis-x0213-1-2000 . #x7937) ; ø»¤”¢ (ideograph-daikanwa . 24640) ; ø¸†€ (=jef-china3 . #x5CD4) ; øº…³” - (ucs-ks . #x7948) ; 祈 + (=ucs@ks . #x7948) ; 祈 (mojikyo . 024640) ; ý €†€ (=ucs . #xFA4E) ; 祈 )) @@ -484,7 +484,7 @@ (=jis-x0213-1-2000 . #x7934) ; ø»¤”Ÿ (ideograph-daikanwa . 24641) ; ø¸† (=jef-china3 . #x5CD5) ; øº…³• - (ucs-ks . #x7949) ; 祉 + (=ucs@ks . #x7949) ; 祉 (mojikyo . 024641) ; ý €† (=ucs . #xFA4D) ; 祉 )) @@ -799,7 +799,7 @@ (=jis-x0213-1-2000 . #x7938) ; ø»¤”£ (ideograph-daikanwa . 24652) ; ø¸†Œ (=jef-china3 . #x5CD6) ; øº…³– - (ucs-ks . #x7950) ; 祐 + (=ucs@ks . #x7950) ; 祐 (mojikyo . 024652) ; ý €†Œ (=ucs . #xFA4F) ; 祐 )) @@ -918,7 +918,7 @@ (=jis-x0213-1-2000 . #x7939) ; ø»¤”¤ (ideograph-daikanwa . 24664) ; ø¸†˜ (=jef-china3 . #x5CD7) ; øº…³— - (ucs-ks . #x7956) ; 祖 + (=ucs@ks . #x7956) ; 祖 (mojikyo . 024664) ; ý €†˜ (=ucs . #xFA50) ; 祖 )) @@ -1079,7 +1079,7 @@ (=jis-x0213-1-2000 . #x793B) ; ø»¤”¦ (ideograph-daikanwa . 24672) ; ø¸†  (=jef-china3 . #x5CD9) ; øº…³™ - (ucs-ks . #x795D) ; 祝 + (=ucs@ks . #x795D) ; 祝 (mojikyo . 024672) ; ý €†  (=ucs . #xFA51) ; 祝 )) @@ -1107,7 +1107,7 @@ (=jis-x0213-1-2000 . #x793C) ; ø»¤”§ (ideograph-daikanwa . 24673) ; ø¸†¡ (=jef-china3 . #x5CDA) ; øº…³š - (ucs-ks . #x795E) ; 神 + (=ucs@ks . #x795E) ; 神 (mojikyo . 024673) ; ý €†¡ (=ucs . #xFA19) ; 神 )) @@ -1585,7 +1585,7 @@ (=jis-x0213-1-2000 . #x793D) ; ø»¤”¨ (ideograph-daikanwa . 24689) ; ø¸†± (=jef-china3 . #x5CDC) ; øº…³œ - (ucs-ks . #x7965) ; 祥 + (=ucs@ks . #x7965) ; 祥 (mojikyo . 024689) ; ý €†± (=ucs . #xFA1A) ; 祥 )) @@ -2792,7 +2792,7 @@ (=jis-x0213-1-2000 . #x793F) ; ø»¤”ª (ideograph-daikanwa . 24766) ; ø¸†‚¾ (=jef-china3 . #x5CE2) ; øº…³¢ - (ucs-ks . #x798D) ; 禍 + (=ucs@ks . #x798D) ; 禍 (mojikyo . 024766) ; ý €†‚¾ (=ucs . #xFA52) ; 禍 )) @@ -2836,7 +2836,7 @@ (=jis-x0213-1-2000 . #x7940) ; ø»¤”« (ideograph-daikanwa . 24767) ; ø¸†‚¿ (=jef-china3 . #x5CE3) ; øº…³£ - (ucs-ks . #x798E) ; 禎 + (=ucs@ks . #x798E) ; 禎 (mojikyo . 024767) ; ý €†‚¿ (=ucs . #xFA53) ; 禎 )) @@ -2861,7 +2861,7 @@ (=jis-x0213-1-2000 . #x7941) ; ø»¤”¬ (ideograph-daikanwa . 24768) ; ø¸†ƒ€ (=jef-china3 . #x5CE4) ; øº…³¤ - (ucs-ks . #x798F) ; 福 + (=ucs@ks . #x798F) ; 福 (mojikyo . 024768) ; ý €†ƒ€ (=ucs . #xFA1B) ; 福 )) diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el index 6a9ef51..15e2210 100644 --- a/lisp/utf-2000/Ideograph-R115-Grain.el +++ b/lisp/utf-2000/Ideograph-R115-Grain.el @@ -3207,7 +3207,7 @@ (korean-ksc5601 . #x4D5A) ; ø»‰›­ (=jis-x0213-1-2000 . #x794D) ; ø»¤”¸ (ideograph-daikanwa . 25221) ; ø¸†Š… - (ucs-ks . #x7A40) ; 穀 + (=ucs@ks . #x7A40) ; 穀 (=ucs . #xFA54) ; 穀 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el index 5343e2a..3bb375e 100644 --- a/lisp/utf-2000/Ideograph-R116-Cave.el +++ b/lisp/utf-2000/Ideograph-R116-Cave.el @@ -344,7 +344,7 @@ (=jis-x0213-1-2000 . #x7951) ; ø»¤”¼ (ideograph-daikanwa . 25439) ; ø¸†Ÿ (=jef-china3 . #x5DCD) ; øº…· - (ucs-ks . #x7A81) ; 突 + (=ucs@ks . #x7A81) ; 突 (=ucs . #xFA55) ; 突 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el index 7c3a8d6..56ee084 100644 --- a/lisp/utf-2000/Ideograph-R118-Bamboo.el +++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el @@ -4425,7 +4425,7 @@ (total-strokes . 15) (korean-ksc5601 . #x6F3D) ; ø»ŠŒ (=jis-x0213-1-2000 . #x7964) ; ø»¤• - (ucs-ks . #x7BC0) ; 節 + (=ucs@ks . #x7BC0) ; 節 (mojikyo . 054432) ; ý €’  (=ucs . #xFA56) ; 節 )) diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index a3163e9..fcaff2a 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -9485,7 +9485,7 @@ (=jis-x0213-1-2000 . #x7A2E) ; ø»¤•· (ideograph-daikanwa . 27689) ; ø¸†°© (=jef-china3 . #x5FC8) ; øº…¿ˆ - (ucs-ks . #x7DF4) ; 練 + (=ucs@ks . #x7DF4) ; 練 (=ucs . #xFA57) ; 練 )) (define-char @@ -12932,7 +12932,7 @@ (=jis-x0213-1-2000 . #x7A33) ; ø»¤•¼ (ideograph-daikanwa . 27849) ; ø¸†³‰ (=ucs@cns . #x7E41) ; 繁 - (ucs-ks . #x7E41) ; 繁 + (=ucs@ks . #x7E41) ; 繁 (=ucs . #xFA59) ; 繁 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el index 44510d4..ad29c92 100644 --- a/lisp/utf-2000/Ideograph-R122-Net.el +++ b/lisp/utf-2000/Ideograph-R122-Net.el @@ -1473,7 +1473,7 @@ (=jis-x0213-1-2000 . #x7A3A) ; ø»¤–ƒ (ideograph-daikanwa . 28319) ; ø¸†ºŸ (=jef-china3 . #x5FF0) ; øº…¿° - (ucs-ks . #x7F72) ; 署 + (=ucs@ks . #x7F72) ; 署 (=ucs . #xFA5A) ; 署 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R125-Old.el b/lisp/utf-2000/Ideograph-R125-Old.el index b39abbc..a78f6e9 100644 --- a/lisp/utf-2000/Ideograph-R125-Old.el +++ b/lisp/utf-2000/Ideograph-R125-Old.el @@ -194,13 +194,13 @@ (=jis-x0213-1-2000 . #x7A44) ; ø»¤– (ideograph-daikanwa . 28853) ; ø¸‡‚µ (=jef-china3 . #x60B5) ; øº†‚µ - (ucs-ks . #x8005) ; 者 + (=ucs@ks . #x8005) ; 者 (=ucs . #xFA5B) ; 者 )) (define-char '((=>ucs* . #x8005) ; 者 (=>ucs@jis . #xFA5B) ; 者 - (=>ucs-ks . #x8005) ; 者 + (=>ucs@ks . #x8005) ; 者 (morohashi-daikanwa 28853 0 0) (ideographic-radical . 125) ; â½¼ (ideographic-strokes . 5) diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 307dfe9..a1e971c 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -1356,7 +1356,7 @@ (japanese-jisx0212 . #x5743) ; ø»‹´† (=jis-x0213-1-2000 . #x7A62) ; ø»¤–« (=ucs@jis . #x82A9) ; ø»‰ † - (ucs-ks . #x82A9) ; ø»‰ † + (=ucs@ks . #x82A9) ; ø»‰ † )) (define-char '((morohashi-daikanwa 30724 0 2) @@ -11636,7 +11636,7 @@ )) (define-char '((=>ucs . #xFA5F) ; 著 - (=>ucs-ks . #x8457) ; 著 + (=>ucs@ks . #x8457) ; 著 (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 13) @@ -11650,7 +11650,7 @@ (total-strokes . 12) (korean-ksc5601 . #x6E4A) ; ø»Š‹» (=jis-x0213-1-2000 . #x7B27) ; ø»¤—Ž - (ucs-ks . #x8457) ; 著 + (=ucs@ks . #x8457) ; 著 (=ucs . #xFA5F) ; 著 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R141-Tiger.el b/lisp/utf-2000/Ideograph-R141-Tiger.el index dfc1a25..4e4b2ec 100644 --- a/lisp/utf-2000/Ideograph-R141-Tiger.el +++ b/lisp/utf-2000/Ideograph-R141-Tiger.el @@ -399,7 +399,7 @@ (=jis-x0213-1-2000 . #x7B4F) ; ø»¤—¶ (ideograph-daikanwa . 32710) ; ø¸‡¿† (=ucs@jis . #xF936) ; ø»‰¨¸ - (ucs-ks . #x865C) ; ø»‰¨¸ + (=ucs@ks . #x865C) ; ø»‰¨¸ )) (define-char '((name . "CJK COMPATIBILITY IDEOGRAPH-F936") diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el index 13729b3..52cadbd 100644 --- a/lisp/utf-2000/Ideograph-R142-Insect.el +++ b/lisp/utf-2000/Ideograph-R142-Insect.el @@ -3253,7 +3253,7 @@ (ideograph-daikanwa . 33143) ; ø¸ˆ…· (=gt-k . 11182) ; ý¡„‚®® (=ucs@jis . #x871C) ; ø½Šµ - (ucs-ks . #x871C) ; ø½Šµ + (=ucs@ks . #x871C) ; ø½Šµ )) (define-char '((morohashi-daikanwa 33143 0 0) diff --git a/lisp/utf-2000/Ideograph-R145-Clothes.el b/lisp/utf-2000/Ideograph-R145-Clothes.el index 2ba7103..4aacd58 100644 --- a/lisp/utf-2000/Ideograph-R145-Clothes.el +++ b/lisp/utf-2000/Ideograph-R145-Clothes.el @@ -3891,7 +3891,7 @@ (=jis-x0213-1-2000 . #x7B6F) ; ø»¤˜– (ideograph-daikanwa . 34435) ; ø¸ˆšƒ (=big5-cdp . #xBDC5) ; ý¢€‹·… - (ucs-ks . #x8910) ; ï©  + (=ucs@ks . #x8910) ; ï©  (=ucs . #xFA60) ; ï©  )) (define-char @@ -5364,7 +5364,7 @@ (chinese-big5 . #xC1B8) ; ý¢€Œ†¸ (ideograph-daikanwa . 34556) ; ø¸ˆ›¼ (=ucs@jis . #x8944) ; ø½‹¢  - (ucs-ks . #x8944) ; ø½‹¢  + (=ucs@ks . #x8944) ; ø½‹¢  (ucs-big5 . #x8944) ; ø½‹¢  )) (define-char diff --git a/lisp/utf-2000/Ideograph-R147-See.el b/lisp/utf-2000/Ideograph-R147-See.el index fc8974c..c7e2871 100644 --- a/lisp/utf-2000/Ideograph-R147-See.el +++ b/lisp/utf-2000/Ideograph-R147-See.el @@ -407,7 +407,7 @@ (korean-ksc5601 . #x634A) ; ø»‰»± (=jis-x0213-1-2000 . #x7B79) ; ø»¤˜  (ideograph-daikanwa . 34836) ; ø¸ˆ ” - (ucs-ks . #x8996) ; ï©¡ + (=ucs@ks . #x8996) ; ï©¡ (=ucs . #xFA61) ; ï©¡ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el index 759a469..d6f110d 100644 --- a/lisp/utf-2000/Ideograph-R149-Speech.el +++ b/lisp/utf-2000/Ideograph-R149-Speech.el @@ -3112,7 +3112,7 @@ (=jis-x0213-1-2000 . #x7C28) ; ø»¤˜­ (ideograph-daikanwa . 35458) ; ø¸ˆª‚ (=ucs@jis . #x8A79) ; ø»Š”¿ - (ucs-ks . #x8A79) ; ø»Š”¿ + (=ucs@ks . #x8A79) ; ø»Š”¿ )) (define-char '((=>ucs . #x8A79) ; 詹 @@ -6604,7 +6604,7 @@ (korean-ksc5601 . #x7033) ; ø»ŠŽ  (=jis-x0213-1-2000 . #x7C2E) ; ø»¤˜³ (ideograph-daikanwa . 35743) ; ø¸ˆ®Ÿ - (ucs-ks . #x8AF8) ; 諸 + (=ucs@ks . #x8AF8) ; 諸 (=ucs . #xFA22) ; 諸 )) (define-char @@ -6784,7 +6784,7 @@ (korean-ksc5601 . #x6457) ; ø»‰½œ (=jis-x0213-1-2000 . #x7C2F) ; ø»¤˜´ (ideograph-daikanwa . 35757) ; ø¸ˆ®­ - (ucs-ks . #x8B01) ; ï©¢ + (=ucs@ks . #x8B01) ; ï©¢ (=ucs . #xFA62) ; ï©¢ )) (define-char @@ -8653,7 +8653,7 @@ (korean-ksc5601 . #x504D) ; ø»‰Ÿº (=jis-x0213-1-2000 . #x7C30) ; ø»¤˜µ (ideograph-daikanwa . 35900) ; ø¸ˆ°¼ - (ucs-ks . #x8B39) ; ï©£ + (=ucs@ks . #x8B39) ; ï©£ (=ucs . #xFA63) ; ï©£ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el index 169fcaf..4845088 100644 --- a/lisp/utf-2000/Ideograph-R154-Shell.el +++ b/lisp/utf-2000/Ideograph-R154-Shell.el @@ -1808,7 +1808,7 @@ (korean-ksc5601 . #x5E39) ; ø»‰´Š (=jis-x0213-1-2000 . #x7C38) ; ø»¤˜½ (ideograph-daikanwa . 36788) ; ø¸ˆ¾´ - (ucs-ks . #x8CD3) ; 賓 + (=ucs@ks . #x8CD3) ; 賓 (=ucs . #xFA64) ; 賓 )) (define-char @@ -3475,7 +3475,7 @@ (korean-ksc5601 . #x717C) ; ø»Š‘‡ (=jis-x0213-1-2000 . #x7C3D) ; ø»¤™‚ (ideograph-daikanwa . 36929) ; ø¸‰ - (ucs-ks . #x8D08) ; ï©¥ + (=ucs@ks . #x8D08) ; ï©¥ (=ucs . #xFA65) ; ï©¥ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R157-Foot.el b/lisp/utf-2000/Ideograph-R157-Foot.el index ba915cc..4dfba05 100644 --- a/lisp/utf-2000/Ideograph-R157-Foot.el +++ b/lisp/utf-2000/Ideograph-R157-Foot.el @@ -3659,7 +3659,7 @@ (korean-ksc5601 . #x4B74) ; ø»‰™‹ (ideograph-daikanwa . 37741) ; ø¸‰­ (=ucs@jis . #x8E47) ; ø½‹¥¤ - (ucs-ks . #x8E47) ; ø½‹¥¤ + (=ucs@ks . #x8E47) ; ø½‹¥¤ )) (define-char '((morohashi-daikanwa 37741 0 0) diff --git a/lisp/utf-2000/Ideograph-R160-Bitter.el b/lisp/utf-2000/Ideograph-R160-Bitter.el index 670d2a7..e083f73 100644 --- a/lisp/utf-2000/Ideograph-R160-Bitter.el +++ b/lisp/utf-2000/Ideograph-R160-Bitter.el @@ -153,7 +153,7 @@ (ideograph-daikanwa . 38636) ; ø¸‰›¬ (=gt-k . 09237) ; ý¡„‚• (=ucs@jis . #x8F9C) ; ø½‹¦¦ - (ucs-ks . #x8F9C) ; ø½‹¦¦ + (=ucs@ks . #x8F9C) ; ø½‹¦¦ )) (define-char '((morohashi-daikanwa 38636 0 0) diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index b2ca12c..a4d702a 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -4671,7 +4671,7 @@ (korean-ksc5601 . #x6C6F) ; ø»Š‰¤ (=jis-x0213-1-2000 . #x7C59) ; ø»¤™ž (ideograph-daikanwa . 38951) ; ø¸‰ § - (ucs-ks . #x9038) ; 逸 + (=ucs@ks . #x9038) ; 逸 (=ucs . #xFA67) ; 逸 )) (define-char @@ -5240,7 +5240,7 @@ (=gt-pj-7 . #x5821) ; ý¡€Œ±½ (ideograph-daikanwa . 38985) ; ø¸‰¡‰ (=gt-k . 10928) ; ý¡„‚ª° - (ucs-ks . #x9042) ; ø»‰º + (=ucs@ks . #x9042) ; ø»‰º (=gt . 52349) ; ý¡€Œ±½ )) (define-char diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el index 18eefd4..216e9b9 100644 --- a/lisp/utf-2000/Ideograph-R163-City.el +++ b/lisp/utf-2000/Ideograph-R163-City.el @@ -2606,7 +2606,7 @@ (korean-ksc5601 . #x5434) ; ø»‰¥™ (=jis-x0213-1-2000 . #x7C6A) ; ø»¤™¯ (ideograph-daikanwa . 39509) ; ø¸‰©• - (ucs-ks . #x90FD) ; 都 + (=ucs@ks . #x90FD) ; 都 (=ucs . #xFA26) ; 都 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el index 135efee..05637e1 100644 --- a/lisp/utf-2000/Ideograph-R164-Wine.el +++ b/lisp/utf-2000/Ideograph-R164-Wine.el @@ -2411,7 +2411,7 @@ (korean-ksc5601 . #x6C22) ; ø»Šˆ— (ideograph-daikanwa . 40006) ; ø¸‰±† (=ucs@jis . #x91AB) ; ø½‹§± - (ucs-ks . #x91AB) ; ø½‹§± + (=ucs@ks . #x91AB) ; ø½‹§± )) (define-char '((morohashi-daikanwa 40006 0 0) diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el index 795b63e..008878d 100644 --- a/lisp/utf-2000/Ideograph-R169-Gate.el +++ b/lisp/utf-2000/Ideograph-R169-Gate.el @@ -1877,7 +1877,7 @@ (=jis-x0208 . #x6F65) ; ø½‹©¤ (korean-ksc5601 . #x6722) ; ø»Š (=ucs@jis . #x95BB) ; ø½‹©¤ - (ucs-ks . #x95BB) ; ø½‹©¤ + (=ucs@ks . #x95BB) ; ø½‹©¤ )) (define-char '((morohashi-daikanwa 41379 0 1) diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el index 3e2b37a..c3aff1d 100644 --- a/lisp/utf-2000/Ideograph-R170-Mound.el +++ b/lisp/utf-2000/Ideograph-R170-Mound.el @@ -1898,7 +1898,7 @@ (=gt-pj-1 . #x4E4D) ; ø½Š¸® (=gt-k . 07898) ; ý¡„»š (=ucs@jis . #x9675) ; ø½Š¸® - (ucs-ks . #x9675) ; ø½Š¸® + (=ucs@ks . #x9675) ; ø½Š¸® )) (define-char '((morohashi-daikanwa 41704 0 2) diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el index 7227844..c1add93 100644 --- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el +++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el @@ -3197,7 +3197,7 @@ (korean-ksc5601 . #x5171) ; ø»‰¡¼ (=jis-x0213-1-2000 . #x7D63) ; ø»¤›† (ideograph-daikanwa . 42145) ; ø¸Š’¡ - (ucs-ks . #x96E3) ; 難 + (=ucs@ks . #x96E3) ; 難 (=ucs . #xFA68) ; 難 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el index e1555ee..9b7d5d3 100644 --- a/lisp/utf-2000/Ideograph-R181-Leaf.el +++ b/lisp/utf-2000/Ideograph-R181-Leaf.el @@ -2042,7 +2042,7 @@ (korean-ksc5601 . #x5E3A) ; ø»‰´‹ (=jis-x0213-1-2000 . #x7D7B) ; ø»¤›ž (ideograph-daikanwa . 43519) ; ø¸Š§¿ - (ucs-ks . #x983B) ; 頻 + (=ucs@ks . #x983B) ; 頻 (=ucs . #xFA6A) ; 頻 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R187-Horse.el b/lisp/utf-2000/Ideograph-R187-Horse.el index 0c2b960..4069cd0 100644 --- a/lisp/utf-2000/Ideograph-R187-Horse.el +++ b/lisp/utf-2000/Ideograph-R187-Horse.el @@ -3305,7 +3305,7 @@ (korean-ksc5601 . #x4B76) ; ø»‰™ (ideograph-daikanwa . 44894) ; ø¸Š½ž (=ucs@jis . #x9A2B) ; ø½‹¬• - (ucs-ks . #x9A2B) ; ø½‹¬• + (=ucs@ks . #x9A2B) ; ø½‹¬• )) (define-char '((morohashi-daikanwa 44894 0 0) diff --git a/lisp/utf-2000/Ideograph-R189-Tall.el b/lisp/utf-2000/Ideograph-R189-Tall.el index 3a27ac2..9fd3f3e 100644 --- a/lisp/utf-2000/Ideograph-R189-Tall.el +++ b/lisp/utf-2000/Ideograph-R189-Tall.el @@ -10,7 +10,7 @@ (ideograph-daikanwa . 45313) ; ø¸‹„ (=gt-k . 06430) ; ý¡„¤ž (=ucs@jis . #x9AD8) ; ø½Šš - (ucs-ks . #x9AD8) ; ø½Šš + (=ucs@ks . #x9AD8) ; ø½Šš )) (define-char '((morohashi-daikanwa 45313 0 0) diff --git a/lisp/utf-2000/Ideograph-R198-Deer.el b/lisp/utf-2000/Ideograph-R198-Deer.el index 893f9f3..d8bc156 100644 --- a/lisp/utf-2000/Ideograph-R198-Deer.el +++ b/lisp/utf-2000/Ideograph-R198-Deer.el @@ -10,7 +10,7 @@ (ideograph-daikanwa . 47586) ; ø¸‹§¢ (=gt-k . 07773) ; ý¡„¹ (=ucs@jis . #x9E7F) ; ø½Š´ - (ucs-ks . #x9E7F) ; ø½Š´ + (=ucs@ks . #x9E7F) ; ø½Š´ )) (define-char '((morohashi-daikanwa 47586 0 0) diff --git a/lisp/utf-2000/Ideograph-R209-Nose.el b/lisp/utf-2000/Ideograph-R209-Nose.el index 8d49afa..3f08793 100644 --- a/lisp/utf-2000/Ideograph-R209-Nose.el +++ b/lisp/utf-2000/Ideograph-R209-Nose.el @@ -21,7 +21,7 @@ (=gt-pj-1 . #x4921) ; 鼻 (=gt-k . 11267) ; ý¡„‚°ƒ (=ucs@jis . #x9F3B) ; 鼻 - (ucs-ks . #x9F3B) ; 鼻 + (=ucs@ks . #x9F3B) ; 鼻 (mojikyo . 050611) ; ý €Œ–³ (=ucs . #x2FA1C) ; 鼻 )) diff --git a/lisp/utf-2000/Ideograph-R210-Even.el b/lisp/utf-2000/Ideograph-R210-Even.el index d39ad40..7c9ffba 100644 --- a/lisp/utf-2000/Ideograph-R210-Even.el +++ b/lisp/utf-2000/Ideograph-R210-Even.el @@ -10,7 +10,7 @@ (ideograph-daikanwa . 48560) ; ø¸‹¶° (=gt-k . 11243) ; ý¡„‚¯« (=ucs@jis . #x9F4A) ; ø½‹¯¥ - (ucs-ks . #x9F4A) ; ø½‹¯¥ + (=ucs@ks . #x9F4A) ; ø½‹¯¥ )) (define-char '((morohashi-daikanwa 48560 0 0) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 2726ffe..0a34759 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)) + (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -525,20 +525,35 @@ line-breaking)) (setq attributes (delq name attributes)) )) - (when (and (memq '=>ucs-gb attributes) - (setq value (get-char-attribute char '=>ucs-gb))) - (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s" - value (decode-char '=ucs@gb value) - line-breaking)) - (setq attributes (delq '=>ucs-gb attributes)) - ) - (when (and (memq '=>ucs-cns attributes) - (setq value (get-char-attribute char '=>ucs-cns))) - (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s" - value (decode-char '=ucs@cns value) - line-breaking)) - (setq attributes (delq '=>ucs-cns attributes)) - ) + (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks)) + (when (and (memq name attributes) + (setq value (get-char-attribute char name))) + (insert (format "(%-18s . #x%04X)\t; %c%s" + (intern + (concat "=>ucs@" + (substring (symbol-name name) 6))) + value + (decode-char (intern + (concat "=ucs@" + (substring + (symbol-name name) 6))) + value) + line-breaking)) + (setq attributes (delq name attributes)))) + ;; (when (and (memq '=>ucs-gb attributes) + ;; (setq value (get-char-attribute char '=>ucs-gb))) + ;; (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s" + ;; value (decode-char '=ucs@gb value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-gb attributes)) + ;; ) + ;; (when (and (memq '=>ucs-cns attributes) + ;; (setq value (get-char-attribute char '=>ucs-cns))) + ;; (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s" + ;; value (decode-char '=ucs@cns value) + ;; 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" @@ -546,20 +561,20 @@ 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" - value (decode-char '=ucs@jis value) - line-breaking)) - (setq attributes (delq '=>ucs-jis attributes)) - ) - (when (and (memq '=>ucs-ks attributes) - (setq value (get-char-attribute char '=>ucs-ks))) - (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s" - value (decode-char 'ucs-ks value) - line-breaking)) - (setq attributes (delq '=>ucs-ks 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" + ;; value (decode-char '=ucs@jis value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-jis attributes)) + ;; ) + ;; (when (and (memq '=>ucs-ks attributes) + ;; (setq value (get-char-attribute char '=>ucs-ks))) + ;; (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s" + ;; value (decode-char 'ucs-ks value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-ks attributes)) + ;; ) (when (and (memq '->ucs attributes) (setq value (get-char-attribute char '->ucs))) (insert (format (if char-db-convert-obsolete-format