Use char-spec instead of char-ref as operators in

`ideographic-structure' properties.
(M-01801): Unify BC-8AAF.
(CB-00631): Unify BC-8DC7.
(C6-2361): Unify BC-87B4.
(U+342B): Add `ideographic-structure'.
(C6-3548): Unify BC-87BF.

diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el
index 8890c90..d755199 100644 (file)
--- a/lisp/utf-2000/Ideograph-R017-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el
@@ -2,6 +2,9 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 0)
     (total-strokes      . 2)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 306)
+    (hanyu-dazidian-char . 15)
     (japanese-jisx0208-1978    . #x5161)       ; �����
     (chinese-gb2312            . #x5B49)       ; �����
     (japanese-jisx0208         . #x5161)       ; �����
@@ -17,6 +20,7 @@
     (ideographic-strokes . 0)
     (total-strokes      . 2)
     (ideograph-daikanwa . 01801)       ; �����
+    (chinese-big5-cdp  . #x8AAF)       ; ������
     ))
 (define-char
   '((morohashi-daikanwa        1801 0 9)
@@ -36,15 +40,16 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 2)
     (total-strokes      . 4)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 306)
+    (hanyu-dazidian-char . 19)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
-                (ucs                . #x2FF6)  ; ⿶
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (ucs               . #x2FF6)     ; ⿶
       )
      ((ucs               . #x51F5)     ; 凵
       )
-     ((chinese-big5-cdp          . #x8B49)     ; ������
+     ((ucs               . #x3405)     ; 㐅
       ))
     (shinjigen-1       . 578)
     (shinjigen-2       . 578)
@@ -111,6 +116,7 @@
     (chinese-cns11643-4 . #x2160)      ; �����
     (ideograph-daikanwa . 01807)       ; �����
     (ideograph-cbeta   . 00631)        ; �����
+    (chinese-big5-cdp  . #x8DC7)       ; ������
     (ucs               . #x51F7)       ; 凷
     ))
 (define-char
@@ -124,6 +130,9 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 3)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 307)
+    (hanyu-dazidian-char . 6)
     (shinjigen-1       . 583)
     (shinjigen-2       . 583)
     (japanese-jisx0208-1978    . #x464C)       ; �����
@@ -141,6 +150,9 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 3)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 308)
+    (hanyu-dazidian-char . 3)
     (shinjigen-1       . 580)
     (shinjigen-2       . 580)
     (japanese-jisx0208-1978    . #x317A)       ; �����
@@ -158,11 +170,12 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 3)
     (total-strokes      . 5)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 307)
+    (hanyu-dazidian-char . 8)
     (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               . #x5C6E)     ; 屮
       )
@@ -229,6 +242,7 @@
     (ideographic-strokes . 4)
     (total-strokes      . 6)
     (chinese-cns11643-6 . #x2361)      ; �����
+    (chinese-big5-cdp  . #x87B4)       ; ������
     ))
 (define-char
   '((ideographic-radical . 17) ; ⼐
@@ -287,6 +301,14 @@
     (ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 4)
     (total-strokes      . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
+      )
+     ((ucs               . #x4EA0)     ; 亠
+      )
+     ((ucs               . #x51F6)     ; 凶
+      ))
     (chinese-cns11643-3 . #x2323)      ; �����
     (ucs               . #x342B)       ; 㐫
     ))
@@ -331,6 +353,9 @@
   '((ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 6)
     (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 309)
+    (hanyu-dazidian-char . 9)
     (shinjigen-1       . 584)
     (shinjigen-2       . 584)
     (japanese-jisx0208-1978    . #x4821)       ; �����
@@ -427,6 +452,7 @@
     (total-strokes      . 10)
     (chinese-cns11643-6 . #x3548)      ; �����
     (ideograph-daikanwa . 01833)       ; �����
+    (chinese-big5-cdp  . #x87BF)       ; ������
     ))
 (define-char
   '((ideographic-radical . 17) ; ⼐