(M-28635): Use char-spec instead of char-ref for the operator of the

`ideographic-structure'; unify B-AFCE.
(M028635): Use char-spec instead of char-ref for the operator of the
`ideographic-structure'.
(J83-3227): Likewise.
(U+7FC1): Likewise; separate B-AFCE.

diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index 435c52f..3587f8b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -405,16 +405,15 @@
     (ideographic-strokes . 4)
     (total-strokes      . 10)
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
      ((ideograph-daikanwa . 01452)     ; �����
       )
      ((ideograph-daikanwa . 28614)     ; �����
       ))
     (korean-ksc5601    . #x683A)       ; �����
+    (chinese-big5      . #xAFCE)       ; �����
     (ideograph-daikanwa . 28635)       ; �����
     ))
 (define-char
@@ -424,10 +423,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 10)
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
      ((ucs               . #x516C)     ; 公
       )
@@ -443,10 +440,8 @@
     (total-strokes      . 10)
     (->mojikyo         . 050359)       ; 翁
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
      ((japanese-jisx0208-1978    . #x3878)     ; �����
       (japanese-jisx0208         . #x3878)     ; �����
@@ -464,10 +459,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 10)
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
      ((ucs               . #x516C)     ; 公
       )
@@ -477,7 +470,6 @@
     (chinese-isoir165          . #x4E4C)       ; �����
     (chinese-cns11643-1                . #x5751)       ; �����
     (japanese-jisx0208-1990    . #x3227)       ; �����
-    (chinese-big5              . #xAFCE)       ; �����
     (mojikyo                   . 050359)       ; ������
     (ucs                       . #x7FC1)       ; 翁
     ))