From f069c4e745bf6c9d014be52e551d34587d70969a Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Sun, 30 Mar 2003 16:15:04 +0000
Subject: [PATCH] Sync up with r21-4-11-chise-0_20-=ucs-ks.
---
lisp/ChangeLog | 5 ++
lisp/mule/mule-conf.el | 3 +-
lisp/utf-2000/ChangeLog | 36 +++++++++
lisp/utf-2000/Ideograph-R004-Slash.el | 4 +-
lisp/utf-2000/Ideograph-R005-Second.el | 4 +-
lisp/utf-2000/Ideograph-R009-Man.el | 2 +-
lisp/utf-2000/Ideograph-R020-Wrap.el | 2 +-
lisp/utf-2000/Ideograph-R030-Mouth.el | 2 +-
lisp/utf-2000/Ideograph-R032-Earth.el | 2 +-
lisp/utf-2000/Ideograph-R044-Corpse.el | 2 +-
lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el | 2 +-
lisp/utf-2000/Ideograph-R061-Heart.el | 10 +--
lisp/utf-2000/Ideograph-R072-Sun.el | 6 +-
lisp/utf-2000/Ideograph-R074-Moon.el | 2 +-
lisp/utf-2000/Ideograph-R075-Tree.el | 2 +-
lisp/utf-2000/Ideograph-R085-Water.el | 6 +-
lisp/utf-2000/Ideograph-R086-Fire.el | 2 +-
lisp/utf-2000/Ideograph-R087-Claw.el | 2 +-
lisp/utf-2000/Ideograph-R094-Dog.el | 2 +-
lisp/utf-2000/Ideograph-R113-Spirit.el | 22 +++---
lisp/utf-2000/Ideograph-R115-Grain.el | 2 +-
lisp/utf-2000/Ideograph-R116-Cave.el | 2 +-
lisp/utf-2000/Ideograph-R118-Bamboo.el | 2 +-
lisp/utf-2000/Ideograph-R120-Silk.el | 4 +-
lisp/utf-2000/Ideograph-R122-Net.el | 2 +-
lisp/utf-2000/Ideograph-R125-Old.el | 4 +-
lisp/utf-2000/Ideograph-R140-Grass.el | 6 +-
lisp/utf-2000/Ideograph-R141-Tiger.el | 2 +-
lisp/utf-2000/Ideograph-R142-Insect.el | 2 +-
lisp/utf-2000/Ideograph-R145-Clothes.el | 4 +-
lisp/utf-2000/Ideograph-R147-See.el | 2 +-
lisp/utf-2000/Ideograph-R149-Speech.el | 8 +-
lisp/utf-2000/Ideograph-R154-Shell.el | 4 +-
lisp/utf-2000/Ideograph-R157-Foot.el | 2 +-
lisp/utf-2000/Ideograph-R160-Bitter.el | 2 +-
lisp/utf-2000/Ideograph-R162-Walk.el | 4 +-
lisp/utf-2000/Ideograph-R163-City.el | 2 +-
lisp/utf-2000/Ideograph-R164-Wine.el | 2 +-
lisp/utf-2000/Ideograph-R169-Gate.el | 2 +-
lisp/utf-2000/Ideograph-R170-Mound.el | 2 +-
.../Ideograph-R172-Short-Tailed-Bird.el | 2 +-
lisp/utf-2000/Ideograph-R181-Leaf.el | 2 +-
lisp/utf-2000/Ideograph-R187-Horse.el | 2 +-
lisp/utf-2000/Ideograph-R189-Tall.el | 2 +-
lisp/utf-2000/Ideograph-R198-Deer.el | 2 +-
lisp/utf-2000/Ideograph-R209-Nose.el | 2 +-
lisp/utf-2000/Ideograph-R210-Even.el | 2 +-
lisp/utf-2000/char-db-util.el | 73 +++++++++++--------
48 files changed, 161 insertions(+), 104 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db9728d54e..edce9bb823 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-29 MORIOKA Tomohiko <tomo@mousai.as.wakwak.ne.jp>
+
+ * mule/mule-conf.el (=ucs@ks): Renamed from `ucs-ks'.
+ (ucs-ks): Changed to an alias for `=ucs@ks'.
+
2003-03-27 MORIOKA Tomohiko <tomo@mousai.as.wakwak.ne.jp>
* 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 576c043c0f..bc9450d1bc 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 9163d0e519..7622c18c49 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,39 @@
+2003-03-30 MORIOKA Tomohiko <tomo@mousai.as.wakwak.ne.jp>
+
+ * 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 <tomo@mousai.as.wakwak.ne.jp>
+
+ * 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 <tomo@mousai.as.wakwak.ne.jp>
* 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 6cf5901b06..8308f2617f 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 6cfd2eca9e..72ee555df0 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 3b44daaec3..891c14eb5e 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 3c8fbe3a46..64b493186d 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 93cc11ec89..d3ace03a27 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 0d7fcbba7d..5e48c0e6da 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 253706d527..0d56ffb16e 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 d9c660170f..850d43f361 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 dea25f4d76..fb7f1723ed 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 e1dd0f9ca2..1ebe6b4728 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 db06a0fcfd..79b34a1832 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 9825b37c07..1cd3b285c3 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 9b041e2dd7..05707d1dda 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 32c2445608..a2c05a03a4 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 cdeaf36503..b23d139da3 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 2e3f1431b2..d9abda6ff3 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 389e26f9f9..8947c1a960 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 6a9ef5143e..15e22101f6 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 5343e2a740..3bb375e011 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 7c3a8d67c1..56ee0842b8 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 a3163e95cd..fcaff2af38 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 44510d42f6..ad29c926e2 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 b39abbc8c4..a78f6e9bc4 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 307dfe9505..a1e971c189 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 dfc1a259f8..4e4b2ecb6c 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 13729b3a52..52cadbd833 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 2ba71030e5..4aacd58269 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 fc8974cb6b..c7e28713e2 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 759a469e9a..d6f110d910 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 169fcaf5d6..484508886e 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 ba915ccfe9..4dfba051a3 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 670d2a7590..e083f73dc8 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 b2ca12c403..a4d702a2d8 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 18eefd4068..216e9b92fe 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 135efeedfa..05637e1452 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 795b63e19f..008878d4c0 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 3e2b37a4b6..c3aff1dcf4 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 7227844f1c..c1add93097 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 e1555eed49..9b7d5d362f 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 0c2b960a7f..4069cd0454 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 3a27ac285b..9fd3f3e459 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 893f9f36dc..d8bc1569ff 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 8d49afa22f..3f087934b1 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 d39ad40920..7c9ffba480 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 2726ffeb1f..0a3475907f 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
--
GitLab