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

`ideographic-structure' properties.
(C4-2129): Unify BC-8AAE.
(U+51E6): Unify BC-8BE4; add `ideographic-structure'.

diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index b0e72cd..ce1aba6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -2,6 +2,9 @@
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 0)
     (total-strokes      . 2)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 275)
+    (hanyu-dazidian-char . 19)
     (shinjigen-1       . 565)
     (shinjigen-2       . 565)
     (japanese-jisx0208-1978    . #x515C)       ; �����
@@ -20,22 +23,23 @@
     (total-strokes      . 2)
     (chinese-cns11643-4 . #x2129)      ; �����
     (ideograph-daikanwa . 01738)       ; �����
+    (chinese-big5-cdp  . #x8AAE)       ; ������
     ))
 (define-char
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 1)
     (cns-radical        . 3)   ; ⼂
     (total-strokes      . 3)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 276)
+    (hanyu-dazidian-char . 3)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-                (ucs                . #x2FF5)  ; ⿵
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (ucs               . #x2FF5)     ; ⿵
       )
      ((ucs               . #x51E0)     ; 几
       )
-     ((chinese-big5-cdp          . #x8B41)     ; ������
-      (ucs               . #x4E36)     ; 丶
+     ((ucs               . #x4E36)     ; 丶
       ))
     (shinjigen-1       . 566)
     (shinjigen-2       . 566)
@@ -123,15 +127,22 @@
 (define-char
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 3)
-    (kangxi-radical     . 34)  ; 夂
-    (kangxi-strokes     . 2)
     (total-strokes      . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (ucs               . #x2FFA)     ; ⿺
+      )
+     ((chinese-big5-cdp          . #x8B45)     ; ������
+      )
+     ((ucs               . #x51E0)     ; 几
+      ))
     (shinjigen-1       . 568)
     (shinjigen-2       . 568)
     (japanese-jisx0208-1978    . #x3D68)       ; �����
     (japanese-jisx0208         . #x3D68)       ; �����
     (japanese-jisx0208-1990    . #x3D68)       ; �����
     (ideograph-daikanwa                . 01745)        ; �����
+    (chinese-big5-cdp          . #x8BE4)       ; ������
     (ucs                       . #x51E6)       ; 処
     ))
 (define-char
@@ -467,14 +478,14 @@
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 9)
     (total-strokes      . 11)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 278)
+    (hanyu-dazidian-char . 10)
     (ideographic-structure
-     (:cdp-combinator  3
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-                (ucs                . #x2FF5)  ; ⿵
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (ucs               . #x2FF5)     ; ⿵
       )
      ((name              . "CJK RADICAL TABLE")
-      (chinese-big5-cdp          . #x8D66)     ; ������
       (ucs               . #x2E87)     ; ⺇
       )
      ((ucs               . #x7687)     ; 皇
@@ -531,11 +542,12 @@
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 278)
+    (hanyu-dazidian-char . 13)
     (ideographic-structure
-     (:cdp-combinator  1
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-                (ucs                . #x2FF0)  ; ⿰
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs               . #x2FF0)     ; ⿰
       )
      ((ucs               . #x8C48)     ; 豈
       )
@@ -605,11 +617,12 @@
   '((ideographic-radical . 16) ; ⼏
     (ideographic-strokes . 12)
     (total-strokes      . 14)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 278)
+    (hanyu-dazidian-char . 20)
     (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               . #x767B)     ; 登
       )