(U-00023D9A): Use `->subsumptive'; delete incomplete

`ideographic-structure'.
(U+6E00): Use `->subsumptive'.
(U+3D03): Likewise.

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 242d050..3e193a9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -8672,70 +8672,48 @@
     (=daikanwa         . 17708)        ; &I-M-17708;
     ))
 (define-char
-  '((=>ucs             . #x23D9A)      ; 𣶚
-    (ideographic-radical . 85) ; ⽔
+  '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (hanyu-dazidian    1 203 5)
-    (ideographic-structure
-     (:cdp-combinator  4)
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x53E3)     ; 口
-      )
-     ((=big5-cdp         . #x8BED)     ; &CDP-8BED;
+    (=ucs              . #x23D9A)      ; 𣶚
+    (->subsumptive
+     ((hanyu-dazidian    1 203 5)
+      (=daikanwa         . 17712)      ; &M-17712;
+      (=hanziku-1        . #xD040)     ; &I-HZK01-D040;
       )
-     ((=ucs              . #x6C34)     ; 水
+     ((=cns11643-6       . #x4A59)     ; &C6-4A59; [42-57]
+      (=ucs@iso                  . #x23D9A)    ; &C6-4A59;
       ))
-    (=daikanwa         . 17712)        ; &M-17712;
-    (=hanziku-1                . #xD040)       ; &I-HZK01-D040;
     ))
 (define-char
-  '((morohashi-daikanwa        17712 0 0)
-    (ideographic-radical . 85) ; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
-    (hanyu-dazidian    1 203 5)
-    (ideographic-structure
-     (:cdp-combinator  4)
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x53E3)     ; 口
-      )
-     ((=big5-cdp         . #x8BED)     ; &CDP-8BED;
+  '((ideographic-radical . 85) ; ⽔
+    (=ucs              . #x6E00)       ; 渀
+    (->subsumptive
+     ((ideographic-strokes . 8)
+      (total-strokes      . 11)
+      (=jis-x0212        . #x4767)     ; &M-17714; [39-71]
+      (=cns11643-2       . #x364F)     ; &I-C2-364F; [22-47]
+      (=big5             . #xD5EB)     ; &I-B-D5EB;
+      (=daikanwa         . 17714)      ; &I-M-17714;
+      (=ucs@unicode      . #x6E00)     ; &M-17714;
       )
-     ((=ucs              . #x6C34)     ; 水
+     ((ideographic-strokes . 9)
+      (total-strokes      . 12)
+      (=jef-china3       . #x56BB)     ; &JC3-56BB;
       ))
-    (=ucs              . #x23D9A)      ; 𣶚
-    (=cns11643-6       . #x4A59)       ; &I-C6-4A59; [42-57]
-    (=hanziku-1                . #xD040)       ; &I-HZK01-D040;
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (=ucs              . #x6E00)       ; 渀
-    (=jis-x0212                . #x4767)       ; &I-JSP-4767; [39-71]
-    (=cns11643-2       . #x364F)       ; &I-C2-364F; [22-47]
-    (=big5             . #xD5EB)       ; &I-B-D5EB;
-    (=daikanwa         . 17714)        ; &I-M-17714;
-    (=jef-china3       . #x56BB)       ; &I-JC3-56BB;
-    ))
-(define-char
-  '((=>ucs             . #x3D03)       ; 㴃
-    (ideographic-radical . 85) ; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes      . 11)
-    (=cns11643-6       . #x412B)       ; &M-17718; [33-11]
-    (=daikanwa         . 17718)        ; &I-M-17718;
-    (=cbeta            . 02889)        ; &I-CB02889;
-    ))
-(define-char
-  '((morohashi-daikanwa        17718 0 1)
-    (ideographic-radical . 85) ; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes      . 11)
     (=ucs              . #x3D03)       ; 㴃
+    (->subsumptive
+     ((=cns11643-6       . #x412B)     ; &M-17718; [33-11]
+      (=daikanwa         . 17718)      ; &I-M-17718;
+      (=cbeta            . 02889)      ; &I-CB02889;
+      )
+     ((=ucs@unicode      . #x3D03)     ; &UU+3D03;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85) ; ⽔