(U-00020086): Use `ideographic-radical',

`ideographic-strokes@{ucs|gt}', `total-strokes@{ucs|gt}' and
`ideographic-strokes@ucs*sources' instead of `ideographic-'.
(U+53CA): Use `ideographic-{radical|strokes}@{ucs|gt}',
`total-strokes@{ucs|gt}' and `ideographic-radical@ucs*sources' instead
of `ideographic-'.
(M-00129): Don't use char-ref format in `->same-ideograph'; use
`->same-ideograph*sources' instead.
(U+5C39): Copied from Ideograph-R044-Corpse.el; add
`ideographic-{radical|strokes}@cns'.
(U+738D): Copied from Ideograph-R096-Jade.el; add
`ideographic-{radical|strokes}@cns'.

diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el
index 9a21055..45bde6e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R004-Slash.el
+++ b/lisp/utf-2000/Ideograph-R004-Slash.el
@@ -40,14 +40,13 @@
     (mojikyo           . 000107)       ; ������
     ))
 (define-char
-  '((ideographic-      (:radical       4 ; ⼃
-                        :strokes       0
-                        :total-strokes 1
-                        :sources       (ucs cns-11643 morohashi-daikanwa))
-                       (:radical       4 ; ⼃
-                        :strokes       1
-                        :total-strokes 2
-                        :sources       (gt)))
+  '((ideographic-radical . 4)  ; ⼃
+    (ideographic-strokes@ucs . 0)
+    (total-strokes@ucs      . 1)
+    (ideographic-strokes@ucs*sources
+     daikanwa cns11643 ucs)
+    (ideographic-strokes@gt . 1)
+    (total-strokes@gt      . 2)
     (hanyu-dazidian    1 67 17)
     (=cns11643-4       . #x2121)       ; �����
     (=gt-pj-2          . #x3074)       ; ������
@@ -408,14 +407,14 @@
     ))
 (define-char
   '((morohashi-daikanwa        3118 1)
-    (ideographic-      (:radical       29 ; ⼜
-                        :strokes       2
-                        :total-strokes 4
-                        :sources       (morohashi-daikanwa jis-x0208 cns-11643 ucs))
-                       (:radical       4 ; ⼃
-                        :strokes       2
-                        :total-strokes 3
-                        :sources       (gt)))
+    (ideographic-radical@ucs . 29)     ; ⼜
+    (ideographic-strokes@ucs . 2)
+    (total-strokes@ucs      . 4)
+    (ideographic-radical@ucs*sources
+     daikanwa jis-x0208 cns11643 ucs)
+    (ideographic-radical@gt . 4)       ; ⼃
+    (ideographic-strokes@gt . 2)
+    (total-strokes@gt      . 3)
     (hanyu-dazidian    1 35 1)
     (shinjigen-1       . 900)
     (shinjigen-2       . 900)
@@ -574,16 +573,37 @@
     (ideographic-strokes . 3)
     (total-strokes      . 4)
     (->same-ideograph
-     (:sources (morohashi-daikanwa)
-      :char    ((ideographic-radical . 20)     ; ⼓
-                (=daikanwa          . 02502)   ; �����
-                )
+     ((ideographic-radical . 20)       ; ⼓
+      (=daikanwa            . 02502)   ; �����
       ))
+    (->same-ideograph*sources
+     daikanwa)
     (=gt-pj-11         . #x527B)       ; ������
     (=daikanwa         . 00129)        ; �����
     (=gt               . 00176)        ; ������
     ))
 (define-char
+  '((ideographic-radical@ucs . 44)     ; ⼫
+    (ideographic-strokes@ucs . 1)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 4)      ; ⼃
+    (ideographic-strokes@cns . 3)
+    (total-strokes      . 4)
+    (shinjigen-2       . 1919)
+    (=gb2312           . #x527C)       ; �����
+    (=jis-x0208                . #x557A)       ; �����
+    (=ks-x1001         . #x6B45)       ; �����
+    (=iso-ir165                . #x527C)       ; �����
+    (=cns11643-1       . #x4467)       ; �����
+    (=gt-pj-1          . #x557A)       ; ������
+    (=big5             . #xA4A8)       ; ������
+    (=daikanwa         . 07631)        ; �����
+    (=gt-k             . 00525)        ; ������
+    (=gt               . 09616)        ; ������
+    (=ucs              . #x5C39)       ; 尹
+    ))
+(define-char
   '((ideographic-radical . 4)  ; ⼃
     (ideographic-strokes . 3)
     (total-strokes      . 4)
@@ -847,6 +867,16 @@
     (=ucs              . #x4E50)       ; 乐
     ))
 (define-char
+  '((ideographic-radical@ucs . 96)     ; ⽟
+    (ideographic-strokes@ucs . 1)
+    (ideographic-radical@cns . 4)      ; ⼃
+    (ideographic-strokes@cns . 4)
+    (total-strokes      . 5)
+    (=cns11643-3       . #x216B)       ; �����
+    (mojikyo           . 053003)       ; ������
+    (=ucs              . #x738D)       ; 玍
+    ))
+(define-char
   '((ideographic-radical . 4)  ; ⼃
     (ideographic-strokes . 4)
     (total-strokes      . 5)