(C*-****): Merge CJK Ext-B code points.

- Add `hanyu-dazidian-vol', `hanyu-dazidian-page' and
  `hanyu-dazidian-char'.
- Use char-spec instead of char-ref as operators in
  `ideographic-structure' properties.

diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index 25cea28..ccf36b3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -17,6 +17,9 @@
     (ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 0)
     (total-strokes      . 2)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 102)
+    (hanyu-dazidian-char . 1)
     (chinese-gb2312    . #x486B)       ; �����
     (chinese-isoir165  . #x486B)       ; �����
     (chinese-cns11643-1 . #x442B)      ; �����
@@ -72,6 +75,9 @@
     (ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 2)
     (total-strokes      . 4)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 97)
+    (hanyu-dazidian-char . 2)
     (shinjigen-1       . 482)
     (shinjigen-2       . 482)
     (chinese-cns11643-1 . #x4479)      ; �����
@@ -104,9 +110,17 @@
   '((ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (chinese-cns11643-5 . #x2135)      ; �����
     (ideograph-daikanwa . 01420)       ; �����
     (mojikyo           . 001420)       ; ������
+    (ucs               . #x204DD)      ; 𠓝
+    ))
+(define-char
+  '((=>ucs             . #x204DD)      ; 𠓝
+    (morohashi-daikanwa        1420 0 0)
+    (ideographic-radical . 11) ; ⼊
+    (ideographic-strokes . 2)
+    (total-strokes      . 4)
+    (chinese-cns11643-5 . #x2135)      ; �����
     ))
 (define-char
   '((ideographic-radical . 11) ; ⼊
@@ -151,10 +165,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 6)
     (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    . #x467E)     ; �����
       (japanese-jisx0208         . #x467E)     ; �����
@@ -175,11 +187,12 @@
     (ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 4)
     (total-strokes      . 6)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 115)
+    (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               . #x5165)     ; 入
       )
@@ -194,10 +207,8 @@
     (ideographic-strokes . 4)
     (total-strokes      . 6)
     (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               . #x5165)     ; 入
       )
@@ -368,11 +379,12 @@
     (ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 6)
     (total-strokes      . 8)
+    (hanyu-dazidian-vol         . 1)
+    (hanyu-dazidian-page . 24)
+    (hanyu-dazidian-char . 2)
     (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               . #x4E00)     ; 一
       )