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

`ideographic-structure' properties.
(U-00020AD3): Unify BC-8B7E.
(C6-213C): Add `ideographic-structure'; unify BC-89AC.
(U+53B7): Add `ideographic-structure'; unify BC-8CEB.
(C4-2249): Add `ideographic-structure'; unify BC-88E6.

diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index 1fd1118..1a8815d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -2,7 +2,9 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 0)
     (total-strokes      . 2)
-    (ideograph-cdp     . 3549)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 383)
+    (hanyu-dazidian-char . 9)
     (shinjigen-1       . 889)
     (shinjigen-2       . 889)
     (japanese-jisx0208-1978    . #x5253)       ; �����
@@ -21,6 +23,7 @@
     (total-strokes      . 3)
     (chinese-cns11643-5 . #x212E)      ; �����
     (ideograph-daikanwa . 03058)       ; �����
+    (chinese-big5-cdp  . #x8B7E)       ; ������
     (ucs               . #x20AD3)      ; 𠫓
     ))
 (define-char
@@ -35,8 +38,17 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 1)
     (total-strokes      . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
+      )
+     ((ucs               . #x4E00)     ; 一
+      )
+     ((ucs               . #x53B6)     ; 厶
+      ))
     (chinese-cns11643-6 . #x213C)      ; �����
     (ideograph-daikanwa . 03059)       ; �����
+    (chinese-big5-cdp  . #x89AC)       ; ������
     ))
 (define-char
   '((ideographic-radical . 28) ; ⼛
@@ -61,10 +73,19 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 2)
     (total-strokes      . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (ucs               . #x2FF8)     ; ⿸
+      )
+     ((ucs               . #x20087)    ; 𠂇
+      )
+     ((ucs               . #x53B6)     ; 厶
+      ))
     (japanese-jisx0212         . #x3453)       ; �����
     (chinese-cns11643-3                . #x215C)       ; �����
     (japanese-jisx0213-2       . #x235A)       ; �����
     (ideograph-daikanwa                . 03062)        ; �����
+    (chinese-big5-cdp          . #x8CEB)       ; ������
     (ucs                       . #x53B7)       ; 厷
     ))
 (define-char
@@ -89,17 +110,16 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (ideograph-cdp     . 3556)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 384)
+    (hanyu-dazidian-char . 5)
     (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               . #x4E5D)     ; 九
       )
-     ((chinese-big5-cdp          . #x8AFD)     ; ������
-      (ucs               . #x53B6)     ; 厶
+     ((ucs               . #x53B6)     ; 厶
       ))
     (chinese-cns11643-2 . #x2138)      ; �����
     (chinese-big5      . #xC958)       ; �����
@@ -118,6 +138,9 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 2)
     (total-strokes      . 4)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 276)
+    (hanyu-dazidian-char . 9)
     (chinese-cns11643-6 . #x215C)      ; �����
     (ideograph-daikanwa . 03067)       ; �����
     (chinese-big5-cdp  . #x87B8)       ; ������
@@ -148,17 +171,16 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (ideograph-cdp     . 3559)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 384)
+    (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               . #x571F)     ; 土
       )
-     ((chinese-big5-cdp          . #x8AFD)     ; ������
-      (ucs               . #x53B6)     ; 厶
+     ((ucs               . #x53B6)     ; 厶
       ))
     (shinjigen-1       . 890)
     (shinjigen-2       . 890)
@@ -277,9 +299,18 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 4)
     (total-strokes      . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
+      )
+     ((ucs               . #x3405)     ; 㐅
+      )
+     ((chinese-big5-cdp          . #x8CEB)     ; ������
+      ))
     (chinese-cns11643-4 . #x2249)      ; �����
     (ideograph-daikanwa . 48956)       ; �����
     (ideograph-cbeta   . 06611)        ; �����
+    (chinese-big5-cdp  . #x88E6)       ; ������
     ))
 (define-char
   '((ideographic-radical . 28) ; ⼛
@@ -443,19 +474,18 @@
   '((ideographic-radical . 28) ; ⼛
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (ideograph-cdp     . 3606)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 387)
+    (hanyu-dazidian-char . 23)
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (ucs               . #x2FF3)     ; ⿳
       )
      ((chinese-big5-cdp          . #x8DF6)     ; ������
       )
-     ((chinese-big5-cdp          . #x8AFD)     ; ������
-      (ucs               . #x53B6)     ; 厶
+     ((ucs               . #x53B6)     ; 厶
       )
-     ((chinese-big5-cdp          . #x8BFC)     ; ������
+     ((ucs               . #x3431)     ; 㐱
       ))
     (shinjigen-1       . 893)
     (shinjigen-2       . 893)