update.
[chise/chiset.git] / Ideograph-R085-Water.ttl
index 8a104b7..b3443db 100644 (file)
@@ -15,6 +15,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_iso: <http://www.chise.org/est/view/character/a.ucs@iso=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
+@prefix a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
 @prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
 @prefix rep.hanyo-denshi...jb: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jb=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...._.p: <http://www.chise.org/est/view/character/rep.daikanwa...+p=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
+@prefix rep.big5-cdp-var-001: <http://www.chise.org/est/view/character/rep.big5-cdp-var-001=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
 @prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 @prefix a.ucs-itaiji-002: <http://www.chise.org/est/view/character/a.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
 @prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
+@prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix hng-kar: <http://rdf.chise.org/data/ccs/hng-kar/code-point/> .
 @prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
+@prefix big5-cdp-var-001: <http://rdf.chise.org/data/ccs/big5-cdp-var-001/code-point/> .
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
 @prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
 @prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/code-point/> .
 @prefix ucs-itaiji-002: <http://rdf.chise.org/data/ccs/ucs-itaiji-002/code-point/> .
 @prefix ucs-itaiji-003: <http://rdf.chise.org/data/ccs/ucs-itaiji-003/code-point/> .
 @prefix ucs-itaiji-004: <http://rdf.chise.org/data/ccs/ucs-itaiji-004/code-point/> .
+@prefix ucs-itaiji-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
+
+a.ucs_cognate:0x6C34
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x6C34  ] ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     4 ;
+    :eq a.ucs_component:0x6C34    ; # &A-cgnU+6C34;
+    .
+    a.ucs_component:0x6C34
+           :abstract-character-of [ :context domain:component ;
+                                    :target     ucs:0x6C34  ] .
 
 a.ucs:0x6C34
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6C34 ;
+    :denotation-of
+        a.ucs_cognate:0x6C34 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
@@ -557,7 +579,7 @@ a.ucs:0x6C37
     :eq rep.daikanwa:17087        ; # &I-M-17087;
     :eq rep.shinjigen:4051        ; # 氷
     :eq rep.cbeta:00457           ; # &I-CB00457;
-    :from.vulgar         a.ucs:0x51B0         ;
+    ideo:vulgar-form-of  a.ucs:0x51B0         ;
     .
     rep.adobe-japan1-0:03499
                :abstract-glyph-of adobe-japan1-0:03499   .
@@ -772,15 +794,33 @@ a.ucs:0x6C39
                              :target     ucs:0x6C39  ] ;
         .
 
+a.ucs_cognate:0x6C3A
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x6C3A  ] ;
+    :denotation-of
+        a.ucs_cognate:0x6C34 ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     5 ;
+    :eq a.ucs_component:0x6C3A    ; # &A-cgnU+6C3A;
+    .
+    a.ucs_component:0x6C3A
+           :abstract-character-of [ :context domain:component ;
+                                    :target     ucs:0x6C3A  ] .
+
 a.ucs:0x6C3A
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6C3A ;
+    :denotation-of
+        a.ucs_cognate:0x6C3A ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           1 ;
     ideo:total-strokes     5 ;
     :eq rep.adobe-japan1-5:20309  ; # &I-AJ1-20309;
     :eq rep.jis-x0212:0x4655      ; # &I-JSP-4655;
     :eq rep.jis-x0213-2:0x6E33    ; # &I-JX2-6E33;
+    :eq rep.big5-cdp:0x8C43       ; # &I-CDP-8C43;
     :eq rep.daikanwa:17092        ; # &I-M-17092;
     :eq rep.cbeta:06162           ; # &I-CB06162;
     :form-of             [ :context domain:component...connect-above ;
@@ -790,7 +830,9 @@ a.ucs:0x6C3A
     :subsume
         g2.adobe-japan1-5:20309 ,
         g2.ucs_unicode:0x6C3A ,
-        g2.cbeta:06162       ;
+        g2.big5-cdp:0x8C43   ,
+        g2.cbeta:06162       ,
+        rep.big5-cdp:0x8C41  ;
     .
     rep.adobe-japan1-5:20309
                :abstract-glyph-of adobe-japan1-5:20309   .
@@ -798,6 +840,8 @@ a.ucs:0x6C3A
                :abstract-glyph-of      jis-x0212:0x4655  .
     rep.jis-x0213-2:0x6E33
                :abstract-glyph-of    jis-x0213-2:0x6E33  .
+    rep.big5-cdp:0x8C43
+               :abstract-glyph-of       big5-cdp:0x8C43  .
     rep.daikanwa:17092
                :abstract-glyph-of       daikanwa:17092   .
     rep.cbeta:06162
@@ -844,10 +888,24 @@ a.ucs:0x6C3A
                                   :target     ucs:0x6C3A  ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
+    g2.big5-cdp:0x8C43
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8C43 ;
+        .
     g2.cbeta:06162
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cbeta:06162 ;
         .
+    rep.big5-cdp:0x8C41
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of big5-cdp:0x8C41 ;
+        :subsume
+            g2.big5-cdp:0x8C41   ;
+        .
+        g2.big5-cdp:0x8C41
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of big5-cdp:0x8C41 ;
+            .
 
 a.ucs:0x2EA2
     a chisegg:abstract-character ;
@@ -858,12 +916,31 @@ a.ucs:0x2EA2
     :general-category     "(symbol other)" ; # Informative Category
     :bidi-category        "ON" ;
     :mirrored             "nil" ;
-    :eq rep.big5-cdp:0x8C43       ; # &I-CDP-8C43;
     :from.identical      [ :context domain:component ;
                            :target  a.ucs:0x6C3A         ] ;
     .
-    rep.big5-cdp:0x8C43
-               :abstract-glyph-of       big5-cdp:0x8C43  .
+
+rep.gt-k:01494
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:01494 ;
+    :denotation-of
+        a.ucs_cognate:0x6C3A ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     5 ;
+    :eq rep.gt-pj-k1:14630        ; # &GT-K01494;
+    :subsume
+        g2.gt-k:01494        ;
+    .
+    rep.gt-pj-k1:14630
+               :abstract-glyph-of       gt-pj-k1:14630   .
+    g2.gt-k:01494
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:01494 ;
+        :eq g2.gt-pj-k1:14630         ; # &g2-GT-K01494;
+        .
+        g2.gt-pj-k1:14630
+              :abstract-glyph-form-of       gt-pj-k1:14630   .
 
 a.ucs:0x3CB8
     a chisegg:abstract-character ;
@@ -1311,20 +1388,20 @@ rep.mj:015049
     :eq rep.gt-pj-1:13665         ; # &I-GT-21960;
     :eq rep.daikanwa:17105        ; # &I-M-17105;
     :eq rep.shinjigen:4054        ; # &MJ015049;
-    :from.ancient        [ :sources chisebib:shuowen-zhu ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen-zhu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x88D8         ] ;
     :form-of             rep.mj:025914        ;
-    :from.interchangeable [ :sources chisebib:daikanwa ;
-                            :target  [ :target  a.ucs:0x7A76         ;
-                                       :sources chisebib:shuowen-tongxun-dingsheng ,
-                                                chisebib:daikanwa ] ,
-                                     [ :target  rep.mj:025914        ;
-                                       :sources chisebib:shuowen-tongxun-dingsheng ,
-                                                chisebib:daikanwa ] ,
-                                     [ :target  a.ucs:0x7403         ;
-                                       :sources chisebib:xu-zihui-bu ,
-                                                chisebib:daikanwa ] ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:daikanwa ;
+                                   :target  [ :target  a.ucs:0x7A76         ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.mj:025914        ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  a.ucs:0x7403         ;
+                                              :sources chisebib:xu-zihui-bu ,
+                                                       chisebib:daikanwa ] ] ;
     :subsume
         g2.mj:015049         ,
         g2.cns11643-1:0x4A65 ,
@@ -3038,12 +3115,12 @@ a.ucs:0x2F8FA
     :eq rep.cns11643-6:0x252E     ; # &I-C6-252E;
     :eq rep.hanyo-denshi...ks:193830 ; # 汎
     :eq rep.daikanwa:49206        ; # &I-M-49206;
-    :from.original       [ :sources chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-5:17911 ] ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:original-form-of [ :sources chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-5:17911 ] ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :note   ("mapping bug?") ;
                            :target  a.ucs:0x6C4E         ] ;
-    :to.mistakable       a.ucs:0x6C4E         ;
+    ideo:mistakable      a.ucs:0x6C4E         ;
     :subsume
         g2.mj:015062         ;
     .
@@ -3838,8 +3915,8 @@ rep.mj:015105
     :eq rep.gt:21917              ; # &I-GT-21917;
     :eq rep.gt-pj-1:13666         ; # &I-GT-21917;
     :eq rep.jef-china3:0x70D4     ; # &I-JC3-70D4;
-    :from.simplified     [ :context domain:JP...extra...design ;
-                           :target  rep.mj:015106        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra...design ;
+                              :target  rep.mj:015106        ] ;
     :subsume
         g2.mj:015105         ;
     .
@@ -3975,9 +4052,9 @@ a.ucs:0x6C73
         :eq rep.shinjigen:4103        ; # &AJ1-05393;
         :form-of             [ :sources chisebib:jiyun ;
                                :target  a.ucs:0x6C74         ] ;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  a.ucs:0x6C74         ] ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:original-form-of [ :sources chisebib:shinjigen ;
+                                :target  a.ucs:0x6C74         ] ;
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x6C74         ] ;
         .
@@ -4441,8 +4518,8 @@ rep.adobe-japan1-0:01854
     :eq rep.gt-pj-1:14184         ; # &I-GT-21966;
     :eq rep.daikanwa:17174        ; # &I-M-17174;
     :eq rep.shinjigen:4080        ; # &AJ1-01854;
-    :from.interchangeable a.ucs:0x592C         ;
-    :from.same           [ :sources chisebib:shuowen-tongxun-dingsheng ,
+    ideo:interchangeable-form-of a.ucs:0x592C         ;
+    ideo:same-as         [ :sources chisebib:shuowen-tongxun-dingsheng ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x592C         ,
                                     rep.adobe-japan1-0:04952 ] ;
@@ -5399,7 +5476,7 @@ rep.adobe-japan1-5:17915
     :eq rep.daikanwa:17190        ; # &I-M-17190;
     :eq rep.shinjigen:4095        ; # &AJ1-17915;
     :eq rep.jef-china3:0x55C4     ; # &I-JC3-55C4;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6C88         ] ;
     .
     rep.ucs_unicode:0x6C89
@@ -5865,10 +5942,10 @@ a.ucs:0x3CC4
     :eq rep.cns11643-3:0x265A     ; # &I-C3-265A;
     :eq rep.big5-cdp:0x8D58       ; # &I-CDP-8D58;
     :eq rep.daikanwa:17203        ; # &I-M-17203;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05428 ] ;
-    :to.mistakable       [ :sources chisebib:zihui-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:014748        ] ;
     :subsume
@@ -7284,10 +7361,10 @@ rep.mj:015160
     :eq rep.gt-pj-1:19287         ; # &I-GT-22026;
     :eq rep.daikanwa:17233        ; # &I-M-17233;
     :eq rep.shinjigen:4106        ; # &MJ015160;
-    :from.simplified     [ :context domain:JP      ;
-                           :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:05394 ] ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:simplified-form-of [ :context domain:JP      ;
+                              :sources chisebib:shinjigen ;
+                              :target  rep.adobe-japan1-0:05394 ] ;
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05394 ] ;
     :subsume
@@ -7464,8 +7541,8 @@ a.ucs:0x6CA2
     :eq rep.gt-pj-1:17012         ; # &I-GT-22002;
     :eq rep.daikanwa:17234        ; # &I-M-17234;
     :eq rep.shinjigen:4090        ; # 沢
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:016002        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:016002        ] ;
     .
     rep.adobe-japan1-0:02900
                :abstract-glyph-of adobe-japan1-0:02900   .
@@ -7737,9 +7814,9 @@ a.ucs:0x23CAD
                                   :target     ucs:0x23CAD ] ;
         .
 
-rep.cbeta:04742
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of cbeta:04742 ;
+a.ucs:0x2DBFA
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2DBFA ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           4 ;
     ideo:total-strokes     7 ;
@@ -7747,8 +7824,79 @@ rep.cbeta:04742
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    a.ucs:0x58EC   # 壬
     ] ;
+    :eq rep.cbeta:04742           ; # &I-CB04742;
+    :subsume
+        g2.ucs_iso:0x2DBFA   ;
+    .
+    rep.cbeta:04742
+               :abstract-glyph-of          cbeta:04742   .
+    g2.ucs_iso:0x2DBFA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2DBFA ] ;
+        :eq g2.cbeta:04742            ; # &g2-CB04742;
+        :subsume
+            repi.cbeta:04742     ,
+            repi.ucs_iso:0x2DBFA ;
+        .
+        g2.cbeta:04742
+              :abstract-glyph-form-of          cbeta:04742   .
+        repi.cbeta:04742
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:04742 ;
+            .
+        repi.ucs_iso:0x2DBFA
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2DBFA ] ;
+            .
+
+a.big5-cdp:0x8DBC
+    a chisegg:abstract-character ;
+    :abstract-character-of big5-cdp:0x8DBC ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x5205   # 刅
+    ] ;
     .
 
+rep.big5-cdp-var-001:0x8DBC
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp-var-001:0x8DBC ;
+    :denotation-of
+        a.big5-cdp:0x8DBC    ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-5:19183   # &AJ1-19183;
+    ] ;
+    .
+
+rep.big5-cdp:0x8DBC
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x8DBC ;
+    :denotation-of
+        a.big5-cdp:0x8DBC    ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.cns11643-3:0x2152   # &C3-2152;
+    ] ;
+    :subsume
+        g2.big5-cdp:0x8DBC   ;
+    .
+    g2.big5-cdp:0x8DBC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8DBC ;
+        .
+
 a.ucs:0x6CAB
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6CAB ;
@@ -9967,6 +10115,10 @@ a.ucs:0x6CCA
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x767D   # 白
+    ] ;
     :eq rep.adobe-japan1-0:03367  ; # &I-AJ1-03367;
     :eq rep.jis-x0208:0x4771      ; # &I-J90-4771;
     :eq rep.gb2312:0x3234         ; # &I-G0-3234;
@@ -9978,7 +10130,22 @@ a.ucs:0x6CCA
     :eq rep.gt-k:03798            ; # &I-GT-K03798;
     :eq rep.gt-pj-1:18289         ; # &I-GT-22127;
     :eq rep.daikanwa:17275        ; # &I-M-17275;
-    :eq rep.shinjigen_rev:4145    ; # 泊
+    :eq rep.shinjigen:4145        ; # 泊
+    ideo:ancient-form-of [ :sources chisebib:shuowen-zhu ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x6D26         ] ;
+    ideo:interchangeable-form-of rep.mj:015839        ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  [ :target  rep.cns11643-1:0x752B ;
+                                      :sources chisebib:zihui ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x6015         ;
+                                      :sources chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x5CB6         ;
+                                      :sources chisebib:jiyun ,
+                                               chisebib:daikanwa ] ] ;
+    :subsume
+        g2.ucs_unicode:0x6CCA ;
     .
     rep.adobe-japan1-0:03367
                :abstract-glyph-of adobe-japan1-0:03367   .
@@ -10002,9 +10169,90 @@ a.ucs:0x6CCA
                :abstract-glyph-of        gt-pj-1:18289   .
     rep.daikanwa:17275
                :abstract-glyph-of       daikanwa:17275   .
-    rep.shinjigen_rev:4145
-               :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:4145    ] .
+    rep.shinjigen:4145
+               :abstract-glyph-of      shinjigen:4145    .
+    g2.ucs_unicode:0x6CCA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6CCA  ] ;
+        :eq g2.adobe-japan1-0:03367   ; # &g2-AJ1-03367;
+        :eq g2.gb2312:0x3234          ; # &g2-AJ1-03367;
+        :eq g2.ks-x1001:0x5A55        ; # &g2-AJ1-03367;
+        :eq g2.jis-x0208:0x4771       ; # &g2-AJ1-03367;
+        :eq g2.cns11643-1:0x4E5C      ; # &g2-AJ1-03367;
+        :eq g2.jis-x0213-1:0x4771     ; # &g2-AJ1-03367;
+        :eq g2.gt:22127               ; # &g2-AJ1-03367;
+        :eq g2.gt-k:03798             ; # &g2-AJ1-03367;
+        :eq g2.daikanwa:17275         ; # &g2-AJ1-03367;
+        :eq g2.shinjigen:4145         ; # &g2-AJ1-03367;
+        :subsume
+            repi.daikanwa:17275  ,
+            repi.jis-x0208:0x4771 ,
+            repi.adobe-japan1-6:03367 ,
+            repi.cns11643-1:0x4E5C ,
+            repi.gt:22127        ,
+            repi.ks-x1001:0x5A55 ,
+            repi.ucs_unicode:0x6CCA ;
+        .
+        g2.adobe-japan1-0:03367
+              :abstract-glyph-form-of adobe-japan1-0:03367   .
+        g2.gb2312:0x3234
+              :abstract-glyph-form-of         gb2312:0x3234  .
+        g2.ks-x1001:0x5A55
+              :abstract-glyph-form-of       ks-x1001:0x5A55  .
+        g2.jis-x0208:0x4771
+              :abstract-glyph-form-of      jis-x0208:0x4771  .
+        g2.cns11643-1:0x4E5C
+              :abstract-glyph-form-of     cns11643-1:0x4E5C  .
+        g2.jis-x0213-1:0x4771
+              :abstract-glyph-form-of    jis-x0213-1:0x4771  .
+        g2.gt:22127
+              :abstract-glyph-form-of             gt:22127   .
+        g2.gt-k:03798
+              :abstract-glyph-form-of           gt-k:03798   .
+        g2.daikanwa:17275
+              :abstract-glyph-form-of       daikanwa:17275   .
+        g2.shinjigen:4145
+              :abstract-glyph-form-of      shinjigen:4145    .
+        repi.daikanwa:17275
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17275 ;
+            .
+        repi.jis-x0208:0x4771
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x4771 ;
+            :eq repi.jis-x0213-1:0x4771   ; # &R-J0-4771;
+            .
+            repi.jis-x0213-1:0x4771
+                          :glyph-image-of    jis-x0213-1:0x4771  .
+        repi.adobe-japan1-0:03367
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:03367 ;
+            .
+        repi.cns11643-1:0x4E5C
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x4E5C ;
+            .
+        repi.gt:22127
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:22127 ;
+            :eq repi.gt-k:03798           ; # &R-GT-22127;
+            .
+            repi.gt-k:03798
+                          :glyph-image-of           gt-k:03798   .
+        repi.ks-x1001:0x5A55
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x5A55 ;
+            :eq repi.ucs_ks:0x6CCA        ; # &R-K0-5A55;
+            .
+            repi.ucs_ks:0x6CCA
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x6CCA  ] .
+        repi.ucs_unicode:0x6CCA
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6CCA  ] ;
+            .
 
 a.ucs:0x6CCB
     a chisegg:abstract-character ;
@@ -11535,8 +11783,8 @@ rep.mj:015227
     :eq rep.gt-k:03826            ; # &I-GT-K03826;
     :eq rep.gt-pj-1:19234         ; # &I-GT-22147;
     :eq rep.jef-china3:0x55AE     ; # &I-JC3-55AE;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:015226        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:015226        ] ;
     :subsume
         g2.mj:015227         ;
     .
@@ -13008,27 +13256,63 @@ a.ucs:0x3CD1
     rep.jef-china3:0x55DD
                :abstract-glyph-of     jef-china3:0x55DD  .
 
-rep.daikanwa:17331
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:17331 ;
-    :to.ucs              a.ucs:0x23CBF ; # 𣲿
-    ideo:radical          85 ; # ⽔ 
-    ideo:strokes           5 ;
-    ideo:total-strokes     8 ;
-    .
-
 a.ucs:0x23CBF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23CBF ;
-
-    :morohashi-daikanwa          (17331 0 0) ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x20B26   # 𠬦
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "dAu" ) ;
+                         ] ;
     :eq rep.cns11643-6:0x2C58     ; # &I-C6-2C58;
+    :eq rep.daikanwa:17331        ; # &I-M-17331;
+    :form-of             [ :target  a.ucs:0x20B26        ;
+                           :sources chisebib:jiyun ] ,
+                         a.ucs:0x7847         ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x20B26        ] ;
+    :subsume
+        g2.ucs_iso:0x23CBF   ,
+        g2.cns11643-6:0x2C58 ;
     .
     rep.cns11643-6:0x2C58
                :abstract-glyph-of     cns11643-6:0x2C58  .
+    rep.daikanwa:17331
+               :abstract-glyph-of       daikanwa:17331   .
+    g2.ucs_iso:0x23CBF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23CBF ] ;
+        :eq g2.daikanwa:17331         ; # &g2-M-17331;
+        :subsume
+            repi.daikanwa:17331  ,
+            repi.ucs_iso:0x23CBF ;
+        .
+        g2.daikanwa:17331
+              :abstract-glyph-form-of       daikanwa:17331   .
+        repi.daikanwa:17331
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17331 ;
+            .
+        repi.ucs_iso:0x23CBF
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23CBF ] ;
+            .
+    g2.cns11643-6:0x2C58
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x2C58 ;
+        :eq g2.ucs_cns:0x23CBF        ; # &g2-CU+23CBF;
+        .
+        g2.ucs_cns:0x23CBF
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x23CBF ] .
 
 a.ucs:0x23CC0
     a chisegg:abstract-character ;
@@ -13292,10 +13576,10 @@ a.ucs:0x2F8FD
     :sound               [ :context domain:ja...on ;
                            :target  ( "sei" ) ;
                          ] ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :note   ("different char.") ;
                            :target  rep.jis-x0212:0x4678 ] ;
-    :to.mistakable       rep.jis-x0212:0x4678 ;
+    ideo:mistakable      rep.jis-x0212:0x4678 ;
     :subsume
         rep.daikanwa:49209   ,
         rep.ucs_iso:0x2F8FD  ;
@@ -13303,8 +13587,8 @@ a.ucs:0x2F8FD
     rep.daikanwa:49209
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:49209 ;
-        :from.original       [ :sources chisebib:daikanwa ;
-                               :target  a.ucs:0x6CF2         ] ;
+        ideo:original-form-of [ :sources chisebib:daikanwa ;
+                                :target  a.ucs:0x6CF2         ] ;
         .
     rep.ucs_iso:0x2F8FD
         a chisegg:abstract-glyph ;
@@ -13332,8 +13616,8 @@ a.ucs:0x23CCB
     rep.daikanwa:49210
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:49210 ;
-        :from.original       [ :sources chisebib:daikanwa ;
-                               :target  a.ucs:0x6CDB         ] ;
+        ideo:original-form-of [ :sources chisebib:daikanwa ;
+                                :target  a.ucs:0x6CDB         ] ;
         :subsume
             g2.daikanwa:49210    ;
         .
@@ -13719,7 +14003,7 @@ a.ucs:0x23CE0
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
     :eq rep.hanziku-4:0xF36E      ; # &I-HZK04-F36E;
-    :from.ancient        [ :context domain:chu     ;
+    ideo:ancient-form-of [ :context domain:chu     ;
                            :target  a.ucs:0x6D77         ] ;
     .
     rep.hanziku-4:0xF36E
@@ -14482,7 +14766,7 @@ a.ucs:0x3CD9
     :eq rep.cns11643-3:0x2D54     ; # &I-C3-2D54;
     :eq rep.daikanwa:17372        ; # &I-M-17372;
     :eq rep.shinjigen:4207        ; # 㳙
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x6D93         ] ;
@@ -15485,12 +15769,18 @@ a.ucs:0x6D26
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           6 ;
     ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x767E   # 百
+    ] ;
     :eq rep.adobe-japan1-5:17928  ; # &I-AJ1-17928;
     :eq rep.jis-x0212:0x4733      ; # &I-JSP-4733;
     :eq rep.cns11643-3:0x2D53     ; # &I-C3-2D53;
     :eq rep.jis-x0213-2:0x6E4D    ; # &I-JX2-6E4D;
     :eq rep.daikanwa:17397        ; # &I-M-17397;
     :eq rep.jef-china3:0x55E9     ; # &I-JC3-55E9;
+    :subsume
+        g2.ucs_unicode:0x6D26 ;
     .
     rep.adobe-japan1-5:17928
                :abstract-glyph-of adobe-japan1-5:17928   .
@@ -15504,6 +15794,64 @@ a.ucs:0x6D26
                :abstract-glyph-of       daikanwa:17397   .
     rep.jef-china3:0x55E9
                :abstract-glyph-of     jef-china3:0x55E9  .
+    g2.ucs_unicode:0x6D26
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6D26  ] ;
+        :eq g2.adobe-japan1-5:17928   ; # &g2-AJ1-17928;
+        :eq g2.jis-x0212:0x4733       ; # &g2-AJ1-17928;
+        :eq g2.cns11643-3:0x2D53      ; # &g2-AJ1-17928;
+        :eq g2.jis-x0213-2:0x6E4D     ; # &g2-AJ1-17928;
+        :eq g2.daikanwa:17397         ; # &g2-AJ1-17928;
+        :eq g2.jef-china3:0x55E9      ; # &g2-AJ1-17928;
+        :subsume
+            repi.daikanwa:17397  ,
+            repi.jis-x0213-2:0x6E4D ,
+            repi.adobe-japan1-6:17928 ,
+            repi.cns11643-3:0x2D53 ,
+            repi.jef-china3:0x55E9 ,
+            repi.ucs_unicode:0x6D26 ;
+        .
+        g2.adobe-japan1-5:17928
+              :abstract-glyph-form-of adobe-japan1-5:17928   .
+        g2.jis-x0212:0x4733
+              :abstract-glyph-form-of      jis-x0212:0x4733  .
+        g2.cns11643-3:0x2D53
+              :abstract-glyph-form-of     cns11643-3:0x2D53  .
+        g2.jis-x0213-2:0x6E4D
+              :abstract-glyph-form-of    jis-x0213-2:0x6E4D  .
+        g2.daikanwa:17397
+              :abstract-glyph-form-of       daikanwa:17397   .
+        g2.jef-china3:0x55E9
+              :abstract-glyph-form-of     jef-china3:0x55E9  .
+        repi.daikanwa:17397
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17397 ;
+            .
+        repi.jis-x0212:0x4733
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x4733 ;
+            :eq repi.jis-x0213-2:0x6E4D   ; # &R-JX2-6E4D;
+            .
+            repi.jis-x0213-2:0x6E4D
+                          :glyph-image-of    jis-x0213-2:0x6E4D  .
+        repi.adobe-japan1-5:17928
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-5:17928 ;
+            .
+        repi.cns11643-3:0x2D53
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2D53 ;
+            .
+        repi.jef-china3:0x55E9
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x55E9 ;
+            .
+        repi.ucs_unicode:0x6D26
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6D26  ] ;
+            .
 
 a.ucs:0x6D27
     a chisegg:abstract-character ;
@@ -16730,7 +17078,7 @@ rep.mj:015324
     :eq rep.daikanwa:17427        ; # &I-M-17427;
     :eq rep.shinjigen:4198        ; # &MJ015324;
     :eq rep.jef-china3:0x55EF     ; # &I-JC3-55EF;
-    :from.vulgar         rep.gt:22264         ;
+    ideo:vulgar-form-of  rep.gt:22264         ;
     :subsume
         g2.daikanwa:17427    ,
         g2.mj:015324         ;
@@ -16840,7 +17188,7 @@ rep.gt:22264
     :eq rep.gt-pj-1:18249         ; # &I-GT-22264;
     :eq rep.daikanwa:17428        ; # &I-M-17428;
     :eq rep.shinjigen:4197        ; # &GT-22264;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.mj:015324        ] ;
     .
     rep.jis-x0208_1978:0x4749
@@ -17500,10 +17848,10 @@ a.ucs:0x2F901
     :eq rep.gt-pj-1:13092         ; # &I-GT-22177;
     :eq rep.daikanwa:17450        ; # &I-M-17450;
     :eq rep.shinjigen:4166        ; # 海
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  rep.jis-x0213-1:0x7669 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  rep.jis-x0213-1:0x7669 ] ;
     :subsume
         g2.ucs_iso:0x2F901   ;
     .
@@ -17644,8 +17992,8 @@ rep.adobe-japan1-0:02524
     :eq rep.gt-pj-1:15988         ; # &I-GT-22237;
     :eq rep.daikanwa:17451        ; # &I-M-17451;
     :eq rep.shinjigen:4183        ; # &AJ1-02524;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:015488        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:015488        ] ;
     .
     rep.ucs_unicode:0x6D44
                :abstract-glyph-of [ :context domain:unicode ;
@@ -17701,8 +18049,8 @@ rep.adobe-japan1-0:02713
     :eq rep.gt-pj-1:16501         ; # &I-GT-22248;
     :eq rep.daikanwa:17452        ; # &I-M-17452;
     :eq rep.shinjigen_rev:4190    ; # &AJ1-02713;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6DFA         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6DFA         ] ;
     :subsume
         g2.adobe-japan1-0:02713 ,
         g2.cns11643-3:0x2D51 ;
@@ -18727,8 +19075,8 @@ a.ucs:0x6D5C
     :eq rep.gt-pj-1:18765         ; # &I-GT-22412;
     :eq rep.daikanwa:17462        ; # &I-M-17462;
     :eq rep.shinjigen:4234        ; # 浜
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:016101        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:016101        ] ;
     .
     rep.adobe-japan1-0:03519
                :abstract-glyph-of adobe-japan1-0:03519   .
@@ -19220,9 +19568,31 @@ a.ucs:0x6D66
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6D66 ;
     ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x752B   # 甫
+    ] ;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "hu" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "ho" ) ;
+                         ] ;
+    .
+
+rep.adobe-japan1-0:01244
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-0:01244 ;
+    :denotation-of
+        a.ucs:0x6D66         ;
+    ideo:radical          85 ; # ⽔ 
     ideo:strokes           7 ;
     ideo:total-strokes    10 ;
-    :eq rep.adobe-japan1-0:01244  ; # &I-AJ1-01244;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-0:03635   # &AJ1-03635;
+    ] ;
+    :eq rep.ucs_unicode:0x6D66    ; # &AJ1-01244;
     :eq rep.jis-x0208:0x313A      ; # &I-J90-313A;
     :eq rep.gb2312:0x4656         ; # &I-G0-4656;
     :eq rep.ks-x1001:0x785D       ; # &I-K0-785D;
@@ -19233,10 +19603,13 @@ a.ucs:0x6D66
     :eq rep.gt-k:06376            ; # &I-GT-K06376;
     :eq rep.gt-pj-1:12602         ; # &I-GT-22418;
     :eq rep.daikanwa:17475        ; # &I-M-17475;
-    :eq rep.shinjigen_rev:4239    ; # 浦
+    :eq rep.shinjigen:4239        ; # &AJ1-01244;
+    :subsume
+        g2.ucs_unicode:0x6D66 ;
     .
-    rep.adobe-japan1-0:01244
-               :abstract-glyph-of adobe-japan1-0:01244   .
+    rep.ucs_unicode:0x6D66
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x6D66  ] .
     rep.jis-x0208:0x313A
                :abstract-glyph-of      jis-x0208:0x313A  .
     rep.gb2312:0x4656
@@ -19257,9 +19630,90 @@ a.ucs:0x6D66
                :abstract-glyph-of        gt-pj-1:12602   .
     rep.daikanwa:17475
                :abstract-glyph-of       daikanwa:17475   .
-    rep.shinjigen_rev:4239
-               :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:4239    ] .
+    rep.shinjigen:4239
+               :abstract-glyph-of      shinjigen:4239    .
+    g2.ucs_unicode:0x6D66
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6D66  ] ;
+        :eq g2.adobe-japan1-0:01244   ; # &g2-AJ1-01244;
+        :eq g2.gb2312:0x4656          ; # &g2-AJ1-01244;
+        :eq g2.ks-x1001:0x785D        ; # &g2-AJ1-01244;
+        :eq g2.jis-x0208:0x313A       ; # &g2-AJ1-01244;
+        :eq g2.cns11643-1:0x563E      ; # &g2-AJ1-01244;
+        :eq g2.jis-x0213-1:0x313A     ; # &g2-AJ1-01244;
+        :eq g2.gt:22418               ; # &g2-AJ1-01244;
+        :eq g2.gt-k:06376             ; # &g2-AJ1-01244;
+        :eq g2.daikanwa:17475         ; # &g2-AJ1-01244;
+        :eq g2.shinjigen:4239         ; # &g2-AJ1-01244;
+        :subsume
+            repi.daikanwa:17475  ,
+            repi.jis-x0208:0x313A ,
+            repi.adobe-japan1-6:01244 ,
+            repi.cns11643-1:0x563E ,
+            repi.gt:22418        ,
+            repi.ks-x1001:0x785D ,
+            repi.ucs_unicode:0x6D66 ;
+        .
+        g2.adobe-japan1-0:01244
+              :abstract-glyph-form-of adobe-japan1-0:01244   .
+        g2.gb2312:0x4656
+              :abstract-glyph-form-of         gb2312:0x4656  .
+        g2.ks-x1001:0x785D
+              :abstract-glyph-form-of       ks-x1001:0x785D  .
+        g2.jis-x0208:0x313A
+              :abstract-glyph-form-of      jis-x0208:0x313A  .
+        g2.cns11643-1:0x563E
+              :abstract-glyph-form-of     cns11643-1:0x563E  .
+        g2.jis-x0213-1:0x313A
+              :abstract-glyph-form-of    jis-x0213-1:0x313A  .
+        g2.gt:22418
+              :abstract-glyph-form-of             gt:22418   .
+        g2.gt-k:06376
+              :abstract-glyph-form-of           gt-k:06376   .
+        g2.daikanwa:17475
+              :abstract-glyph-form-of       daikanwa:17475   .
+        g2.shinjigen:4239
+              :abstract-glyph-form-of      shinjigen:4239    .
+        repi.daikanwa:17475
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17475 ;
+            .
+        repi.jis-x0208:0x313A
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x313A ;
+            :eq repi.jis-x0213-1:0x313A   ; # &R-J0-313A;
+            .
+            repi.jis-x0213-1:0x313A
+                          :glyph-image-of    jis-x0213-1:0x313A  .
+        repi.adobe-japan1-0:01244
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:01244 ;
+            .
+        repi.cns11643-1:0x563E
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x563E ;
+            .
+        repi.gt:22418
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:22418 ;
+            :eq repi.gt-k:06376           ; # &R-GT-22418;
+            .
+            repi.gt-k:06376
+                          :glyph-image-of           gt-k:06376   .
+        repi.ks-x1001:0x785D
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x785D ;
+            :eq repi.ucs_ks:0x6D66        ; # &R-K0-785D;
+            .
+            repi.ucs_ks:0x6D66
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x6D66  ] .
+        repi.ucs_unicode:0x6D66
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6D66  ] ;
+            .
 
 a.ucs:0x6D67
     a chisegg:abstract-character ;
@@ -21854,8 +22308,8 @@ a.ucs:0x6D8C
     :eq rep.gt-pj-1:19760         ; # &I-GT-22430;
     :eq rep.daikanwa:17534        ; # &I-M-17534;
     :eq rep.shinjigen:4362        ; # 涌
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.mj:015631        ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.mj:015631        ] ;
     .
     rep.adobe-japan1-0:03866
                :abstract-glyph-of adobe-japan1-0:03866   .
@@ -23212,10 +23666,10 @@ rep.adobe-japan1-0:04006
     :eq rep.gt-pj-1:20062         ; # &I-GT-22448;
     :eq rep.daikanwa...._.p:17573 ; # &AJ1-04006;
     :eq rep.shinjigen:4251        ; # &AJ1-04006;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  rep.jis-x0213-1:0x7673 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  rep.jis-x0213-1:0x7673 ] ;
     :subsume
         g2.adobe-japan1-0:04006 ,
         g2.ucs_unicode:0x6D99 ;
@@ -23320,7 +23774,7 @@ a.ucs:0x23D40
     :eq rep.jef-china3:0x56AA     ; # &I-JC3-56AA;
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x6D85         ] ;
-    :from.vulgar         [ :sources chisebib:zijian ,
+    ideo:vulgar-form-of  [ :sources chisebib:zijian ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x6D85         ] ;
@@ -23486,28 +23940,145 @@ a.ucs:0x23D69
         :abstract-glyph-of cns11643-6:0x387D ;
         .
 
+a.ucs_cognate:0x23D68
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x23D68 ] ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs_cognate:0x20122   # &A-cgnU+20122;
+    ] ;
+    .
+
 a.ucs:0x23D68
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23D68 ;
+    :denotation-of
+        a.ucs_cognate:0x23D68 ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x20122   # 𠄢
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "WeN" ) ;
+                         ] ;
+    .
+
+rep.mj:039327
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:039327 ;
+    :denotation-of
+        a.ucs:0x23D68        ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           7 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x2F803   # 𠄢
+    ] ;
+    :eq rep.ucs_iso:0x23D68       ; # &MJ039327;
+    :eq rep.cns11643-6:0x3927     ; # &I-C6-3927;
+    :eq rep.koseki:198280         ; # &MJ039327;
+    :eq rep.daikanwa:49214        ; # &I-M-49214;
+    ideo:original-form-of [ :sources chisebib:daikanwa ;
+                            :target  a.ucs:0x6D39         ] ;
     :subsume
-        rep.daikanwa:49214   ,
-        rep.ucs_iso:0x23D68  ;
+        g2.mj:039327         ,
+        g2.ucs_iso:0x23D68   ;
     .
+    rep.ucs_iso:0x23D68
+               :abstract-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x23D68 ] .
+    rep.cns11643-6:0x3927
+               :abstract-glyph-of     cns11643-6:0x3927  .
+    rep.koseki:198280
+               :abstract-glyph-of         koseki:198280  .
     rep.daikanwa:49214
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:49214 ;
+               :abstract-glyph-of       daikanwa:49214   .
+    g2.mj:039327
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:039327 ;
+        :eq g2.koseki:198280          ; # &g2-MJ039327;
+        :eq g2.daikanwa:49214         ; # &g2-MJ039327;
+        :subsume
+            repi.daikanwa:49214  ,
+            repi.mj:039327       ;
         .
-    rep.ucs_iso:0x23D68
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x23D68 ] ;
-        :eq rep.cns11643-6:0x3927     ; # &C6-3927;
+        g2.koseki:198280
+              :abstract-glyph-form-of         koseki:198280  .
+        g2.daikanwa:49214
+              :abstract-glyph-form-of       daikanwa:49214   .
+        repi.daikanwa:49214
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:49214 ;
+            .
+        repi.mj:039327
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:039327 ;
+            .
+    g2.ucs_iso:0x23D68
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23D68 ] ;
+        :eq g2.cns11643-6:0x3927      ; # &g2-IU-00023D68;
+        :subsume
+            repi.cns11643-6:0x3927 ,
+            repi.ucs_iso:0x23D68 ;
+        .
+        g2.cns11643-6:0x3927
+              :abstract-glyph-form-of     cns11643-6:0x3927  .
+        repi.cns11643-6:0x3927
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x3927 ;
+            .
+        repi.ucs_iso:0x23D68
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23D68 ] ;
+            .
+
+a.ucs:0x23DFB
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23DFB ;
+    :denotation-of
+        a.ucs_cognate:0x23D68 ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           7 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-itaiji-001:0x20122   # &U-i001+20122;
+    ] ;
+    :eq rep.cns11643-6:0x387A     ; # &I-C6-387A;
+    :form-of             a.ucs:0x23D68        ,
+                         a.ucs:0x6D39         ;
+    :subsume
+        g2.ucs_iso:0x23DFB   ;
+    .
+    rep.cns11643-6:0x387A
+               :abstract-glyph-of     cns11643-6:0x387A  .
+    g2.ucs_iso:0x23DFB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23DFB ] ;
+        :eq g2.cns11643-6:0x387A      ; # &g2-IU-00023DFB;
+        :subsume
+            repi.cns11643-6:0x387A ,
+            repi.ucs_iso:0x23DFB ;
         .
-        rep.cns11643-6:0x3927
-                   :abstract-glyph-of     cns11643-6:0x3927  .
+        g2.cns11643-6:0x387A
+              :abstract-glyph-form-of     cns11643-6:0x387A  .
+        repi.cns11643-6:0x387A
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x387A ;
+            .
+        repi.ucs_iso:0x23DFB
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23DFB ] ;
+            .
 
 a.ucs:0x23D64
     a chisegg:abstract-character ;
@@ -23648,8 +24219,8 @@ rep.adobe-japan1-0:03181
     :eq rep.jis-x0213-1:0x4573    ; # &I-JX1-4573;
     :eq rep.gt:22393              ; # &I-GT-22393;
     :eq rep.gt-pj-1:17779         ; # &I-GT-22393;
-    :from.simplified     [ :context domain:JP      ;
-                           :target  a.ucs:0x6FE4         ] ;
+    ideo:simplified-form-of [ :context domain:JP      ;
+                              :target  a.ucs:0x6FE4         ] ;
     :subsume
         g2.adobe-japan1-0:03181 ;
     .
@@ -24064,17 +24635,6 @@ a.ucs:0x23D71
     rep.cns11643-5:0x2E46
                :abstract-glyph-of     cns11643-5:0x2E46  .
 
-a.ucs:0x23DFB
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x23DFB ;
-    ideo:radical          85 ; # ⽔ 
-    ideo:strokes           7 ;
-    ideo:total-strokes    10 ;
-    :eq rep.cns11643-6:0x387A     ; # &I-C6-387A;
-    .
-    rep.cns11643-6:0x387A
-               :abstract-glyph-of     cns11643-6:0x387A  .
-
 a.ucs:0x23D92
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23D92 ;
@@ -24802,7 +25362,7 @@ a.ucs:0x23D7A
     :eq rep.cns11643-4:0x326B     ; # &I-C4-326B;
     :eq rep.daikanwa:17590        ; # &I-M-17590;
     :eq rep.shinjigen:4135        ; # 𣵺
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6CB1         ] ;
     :subsume
         g2.ucs_iso:0x23D7A   ,
@@ -27869,7 +28429,7 @@ a.ucs:0x3CFA
     :eq rep.daikanwa:17652        ; # &I-M-17652;
     :eq rep.shinjigen:4360        ; # 㳺
     :eq rep.hanziku-5:0xA5D3      ; # &I-HZK05-A5D3;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6E38         ] ;
     .
     rep.cns11643-3:0x3722
@@ -29031,8 +29591,8 @@ o.ucs_unicode:0x6DEB
         :eq rep.gt-k:07720            ; # &I-GT-K07720;
         :eq rep.gt-pj-1:12412         ; # &I-GT-22466;
         :eq rep.jef-china3:0x57C8     ; # &I-JC3-57C8;
-        :from.simplified     [ :context domain:JP...jis ;
-                               :target  rep.mj:015492        ] ;
+        ideo:simplified-form-of [ :context domain:JP...jis ;
+                                  :target  rep.mj:015492        ] ;
         :subsume
             g2.mj:015493         ;
         .
@@ -30347,7 +30907,7 @@ a.ucs:0x6E15
     :eq rep.gt:22478              ; # &I-GT-22478;
     :eq rep.gt-pj-1:24124         ; # &I-GT-22478;
     :eq rep.shinjigen:4258        ; # 渕
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:015504        ] ;
     :subsume
         g2.ucs_unicode:0x6E15 ;
@@ -30568,10 +31128,18 @@ a.jis-x0208:0x4036
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs_iwds-1:0x9751   # &A-IWDSU+9751;
+    ] ;
+    :eq a.ucs_iwds-1:0x6DF8       ; # &J97-4036;
     :eq rep.ucs_big5:0x6E05       ; # &J97-4036;
     :eq a.jis-x0213-1:0x4036      ; # &J97-4036;
     :eq a.big5:0xB24D             ; # &J97-4036;
     .
+    a.ucs_iwds-1:0x6DF8
+           :abstract-character-of [ :context domain:iwds-1  ;
+                                    :target     ucs:0x6DF8  ] .
     rep.ucs_big5:0x6E05
                :abstract-glyph-of [ :context domain:big5    ;
                                     :target     ucs:0x6E05  ] .
@@ -30588,6 +31156,10 @@ a.ucs:0x6DF8
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x9751   # 靑
+    ] ;
     :eq rep.adobe-japan1-2:08521  ; # &I-AJ1-08521;
     :eq rep.ks-x1001:0x7468       ; # &I-K0-7468;
     :eq rep.cns11643-3:0x367C     ; # &I-C3-367C;
@@ -30679,6 +31251,10 @@ a.ucs:0x6E05
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x9752   # 青
+    ] ;
     :eq rep.adobe-japan1-0:02650  ; # &I-AJ1-02650;
     :eq rep.jis-x0208:0x4036      ; # &I-J90-4036;
     :eq rep.gb2312:0x4765         ; # &I-G0-4765;
@@ -31345,7 +31921,7 @@ rep.cns11643-6:0x413B
     ideo:total-strokes    11 ;
     :eq rep.ucs_cns:0x23D93       ; # &C6-413B;
     :eq rep.daikanwa:17700        ; # &I-M-17700;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6D12         ] ;
     :subsume
@@ -31796,7 +32372,7 @@ a.ucs:0x23D9F
     rep.daikanwa:17720
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:17720 ;
-        :from.ancient        [ :sources chisebib:jiyun ,
+        ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x6EC4         ] ;
         .
@@ -31977,43 +32553,87 @@ a.ucs:0x23DA2
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x3AC4   # 㫄
+    ] ;
     :eq rep.cns11643-6:0x412F     ; # &I-C6-412F;
     :eq rep.daikanwa:17727        ; # &I-M-17727;
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x6EC2         ] ;
     :subsume
-        g2.cns11643-6:0x412F ,
-        g2.ucs_iso:0x23DA2   ;
+        g.ucs_cns:0x23DA2    ,
+        g.ucs_iso:0x23DA2    ;
     .
     rep.cns11643-6:0x412F
                :abstract-glyph-of     cns11643-6:0x412F  .
     rep.daikanwa:17727
                :abstract-glyph-of       daikanwa:17727   .
-    g2.cns11643-6:0x412F
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of cns11643-6:0x412F ;
-        :eq g2.ucs_cns:0x23DA2        ; # &g2-M-17727;
-        :eq g2.daikanwa:17727         ; # &g2-M-17727;
+    g.ucs_cns:0x23DA2
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:cns     ;
+                             :target     ucs:0x23DA2 ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x6C35 ; # 氵
+            isd:right    rep.adobe-japan1-5:20135   # &AJ1-20135;
+        ] ;
+        :eq g.daikanwa:17727          ; # &G-CU+23DA2;
         :subsume
-            repi.daikanwa:17727  ,
-            repi.cns11643-6:0x412F ;
+            g2.cns11643-6:0x412F ;
         .
-        g2.ucs_cns:0x23DA2
-              :abstract-glyph-form-of [ :context domain:cns     ;
-                                        :target     ucs:0x23DA2 ] .
-        g2.daikanwa:17727
-              :abstract-glyph-form-of       daikanwa:17727   .
-        repi.daikanwa:17727
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:17727 ;
+        g.daikanwa:17727
+                   :detailed-glyph-of       daikanwa:17727   .
+        g2.cns11643-6:0x412F
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of cns11643-6:0x412F ;
+            :eq g2.ucs_cns:0x23DA2        ; # &g2-M-17727;
+            :eq g2.daikanwa:17727         ; # &g2-M-17727;
+            :subsume
+                repi.daikanwa:17727  ,
+                repi.cns11643-6:0x412F ;
             .
-        repi.cns11643-6:0x412F
-            a chisegg:glyph-image ;
-            :glyph-image-of cns11643-6:0x412F ;
+            g2.ucs_cns:0x23DA2
+                  :abstract-glyph-form-of [ :context domain:cns     ;
+                                            :target     ucs:0x23DA2 ] .
+            g2.daikanwa:17727
+                  :abstract-glyph-form-of       daikanwa:17727   .
+            repi.daikanwa:17727
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:17727 ;
+                .
+            repi.cns11643-6:0x412F
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-6:0x412F ;
+                .
+    g.ucs_iso:0x23DA2
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x23DA2 ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x6C35 ; # 氵
+            isd:right    rep.ucs-var-002:0x3AC4   # &U-v002+3AC4;
+        ] ;
+        :subsume
+            g2.ucs_iso:0x23DA2   ;
+        .
+        g2.ucs_iso:0x23DA2
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x23DA2 ] ;
+            :subsume
+                repi.ucs_iso:0x23DA2 ,
+                rep.hanziku-5:0xA9C1 ;
             .
-    g2.ucs_iso:0x23DA2
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:iso     ;
+            repi.ucs_iso:0x23DA2
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
                                   :target     ucs:0x23DA2 ] ;
-        .
+                .
+            rep.hanziku-5:0xA9C1
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of hanziku-5:0xA9C1 ;
+                .
 
 a.ucs:0x23DA3
     a chisegg:abstract-character ;
@@ -32044,7 +32664,7 @@ rep.ucs_iso:0x23DA3
     :eq rep.daikanwa:17728        ; # &I-M-17728;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.cns11643-2:0x4B3F ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-2:0x4B3F ] ;
     :subsume
@@ -32213,10 +32833,10 @@ rep.adobe-japan1-0:01479
     :eq rep.gt-pj-1:13161         ; # &I-GT-22493;
     :eq rep.daikanwa:17748        ; # &I-M-17748;
     :eq rep.shinjigen:4263        ; # &AJ1-01479;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  a.ucs:0x6E34         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  a.ucs:0x6E34         ] ;
     :subsume
         g2.ucs_unicode:0x6E07 ;
     .
@@ -32352,8 +32972,8 @@ a.ucs:0x6E08
     :eq rep.daikanwa:17749        ; # &I-M-17749;
     :eq rep.shinjigen_1ed:4290    ; # 済
     :eq rep.shinjigen_rev:4292    ; # 済
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05526 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05526 ] ;
     :subsume
         g2.ucs_unicode:0x6E08 ;
     .
@@ -32458,8 +33078,8 @@ a.ucs:0x6E09
     :eq rep.gt-pj-1:15940         ; # &I-GT-22570;
     :eq rep.daikanwa...._.p:17749 ; # 渉
     :eq rep.jef-china3:0x56A5     ; # &I-JC3-56A5;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6D89         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6D89         ] ;
     :subsume
         g2.adobe-japan1-0:02476 ,
         g2.ucs_unicode:0x6E09 ;
@@ -32575,7 +33195,7 @@ a.ucs:0x6E0A
     :eq rep.gt-pj-1:24125         ; # &I-GT-22477;
     :eq rep.daikanwa:17750        ; # &I-M-17750;
     :eq rep.shinjigen:4259        ; # 渊
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:015504        ] ;
@@ -32680,8 +33300,8 @@ a.ucs:0x6E0B
     :eq rep.gt:22556              ; # &I-GT-22556;
     :eq rep.gt-pj-1:15682         ; # &I-GT-22556;
     :eq rep.daikanwa...._.p:17750 ; # 渋
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6F81         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6F81         ] ;
     .
     rep.adobe-japan1-0:02380
                :abstract-glyph-of adobe-japan1-0:02380   .
@@ -32915,8 +33535,8 @@ a.ucs:0x6E13
     :eq rep.gt:22516              ; # &I-GT-22516;
     :eq rep.gt-pj-1:14156         ; # &I-GT-22516;
     :eq rep.cbeta:00557           ; # &I-CB00557;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:015703        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:015703        ] ;
     :subsume
         g2.ucs_unicode:0x6E13 ;
     .
@@ -33615,8 +34235,8 @@ rep.adobe-japan1-0:02423
     :eq rep.gt:22563              ; # &I-GT-22563;
     :eq rep.gt-pj-1:15725         ; # &I-GT-22563;
     :eq rep.jef-china3:0x55AF     ; # &I-JC3-55AF;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0xFA46         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0xFA46         ] ;
     :subsume
         g2.ucs_unicode:0x6E1A ;
     .
@@ -34046,7 +34666,7 @@ rep.shinjigen_1ed:4358
     ideo:radical          85 ; # ⽔ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  rep.mj:015541        ] ;
     :subsume
         rep.ucs-var-001:0x6E1D ;
@@ -34074,7 +34694,7 @@ rep.mj:015542
     :eq rep.cns11643-1:0x6043     ; # &I-C1-6043;
     :eq rep.hanyo-denshi...ft:0x3674 ; # &I-HD-FT-3674;
     :eq rep.shinjigen_rev:4358    ; # &MJ015542;
-    :from.vulgar         [ :sources chisebib:shinjigen_rev ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_rev ;
                            :target  rep.mj:015541        ] ;
     :subsume
         g2.mj:015542         ,
@@ -35265,9 +35885,9 @@ a.ucs:0x6E29
     :eq rep.daikanwa:17774        ; # &I-M-17774;
     :eq rep.shinjigen_1ed:4318    ; # 温
     :eq rep.shinjigen_rev:4319    ; # 温
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6EAB         ] ;
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6EAB         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6EAB         ] ;
     :subsume
@@ -37562,7 +38182,7 @@ a.ucs:0x23E01
     :eq rep.cns11643-6:0x4A5D     ; # &I-C6-4A5D;
     :eq rep.daikanwa:17813        ; # &I-M-17813;
     :eq rep.shinjigen:4188        ; # 𣸁
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:015296        ] ;
@@ -38140,11 +38760,11 @@ a.ucs:0x6E4F
     :eq rep.jef-china3:0x56C9     ; # &I-JC3-56C9;
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x9808         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6CAC         ,
                                     rep.daikanwa:18254   ] ;
-    :to.mistakable       [ :sources chisebib:zihui ,
+    ideo:mistakable      [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9808         ] ;
     :subsume
@@ -38753,10 +39373,10 @@ a.ucs:0x23E08
     :eq rep.cns11643-6:0x4A5A     ; # &I-C6-4A5A;
     :eq rep.daikanwa:17839        ; # &I-M-17839;
     :eq rep.shinjigen:4388        ; # 𣸈
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  rep.mj:015713        ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  rep.mj:015713        ] ;
     :subsume
         g2.daikanwa:17839    ,
         g2.shinjigen:4388    ,
@@ -41285,7 +41905,7 @@ rep.adobe-japan1-5:19498
     :eq rep.daikanwa:17913        ; # &I-M-17913;
     :eq rep.shinjigen:4282        ; # &AJ1-19498;
     :eq rep.cbeta:05109           ; # &I-CB05109;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02409 ] ;
     :subsume
         g2.ucs_unicode:0x6E7B ;
@@ -41378,7 +41998,7 @@ rep.adobe-japan1-0:05453
     :eq rep.gt-pj-1:24144         ; # &I-GT-22692;
     :eq rep.daikanwa:17914        ; # &I-M-17914;
     :eq rep.jef-china3:0x70DD     ; # &I-JC3-70DD;
-    :from.vulgar         [ :sources chisebib:zhonghua-dazidian ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhonghua-dazidian ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-1:0x603A ] ;
     :subsume
@@ -41604,9 +42224,9 @@ rep.mj:015743
     :eq rep.gt-k:09062            ; # &I-GT-K09062;
     :eq rep.gt-pj-1:15394         ; # &I-GT-22764;
     :eq rep.daikanwa...._.p:17919 ; # &MJ015743;
-    :from.simplified     [ :context domain:misc    ;
-                           :sources chisebib:daikanwa ;
-                           :target  a.ucs:0x2F90B        ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:daikanwa ;
+                              :target  a.ucs:0x2F90B        ] ;
     :subsume
         g2.mj:015743         ,
         g2.ucs_unicode:0x6ECB ;
@@ -41791,8 +42411,8 @@ a.ucs:0x6E7E
     :eq rep.gt-pj-1:20305         ; # &I-GT-22896;
     :eq rep.daikanwa:17920        ; # &I-M-17920;
     :eq rep.shinjigen:4364        ; # 湾
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x7063         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x7063         ] ;
     :subsume
         g2.daikanwa:17920    ,
         g2.ucs_unicode:0x6E7E ,
@@ -41928,8 +42548,8 @@ a.ucs:0x6E7F
     :eq rep.gt:22768              ; # &I-GT-22768;
     :eq rep.gt-pj-1:15422         ; # &I-GT-22768;
     :eq rep.daikanwa...._.p:17920 ; # 湿
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6FD5         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6FD5         ] ;
     .
     rep.adobe-japan1-0:02282
                :abstract-glyph-of adobe-japan1-0:02282   .
@@ -41963,7 +42583,7 @@ rep.daikanwa:17921
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
     :eq rep.shinjigen:4396        ; # &M-17921;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:015755        ] ;
@@ -42021,8 +42641,8 @@ rep.adobe-japan1-0:03756
     :eq rep.gt-k:09146            ; # &I-GT-K09146;
     :eq rep.gt-pj-1:19326         ; # &I-GT-22876;
     :eq rep.daikanwa...._.p:17921 ; # &AJ1-03756;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05469 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05469 ] ;
     .
     rep.ucs_unicode:0x6E80
                :abstract-glyph-of [ :context domain:unicode ;
@@ -42174,8 +42794,8 @@ a.ucs:0x6E8C
     :eq rep.gt:22854              ; # &I-GT-22854;
     :eq rep.gt-pj-1:18478         ; # &I-GT-22854;
     :eq rep.jef-china3:0x70DA     ; # &I-JC3-70DA;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0x6F51         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0x6F51         ] ;
     :subsume
         g2.ucs_unicode:0x6E8C ;
     .
@@ -42258,6 +42878,40 @@ a.ucs:0x6E8C
             :glyph-image-of jef-china3:0x70DA ;
             .
 
+a.ucs:0x23E58
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23E58 ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x5F85   # 待
+    ] ;
+    .
+
+rep.ucs_iso:0x23E58
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23E58 ] ;
+    :denotation-of
+        a.ucs:0x23E58        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-0:02868   # &AJ1-02868;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23E58   ;
+    .
+    g2.ucs_iso:0x23E58
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23E58 ] ;
+        .
+
 a.ucs:0x6E8D
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6E8D ;
@@ -43245,8 +43899,8 @@ rep.mj:015687
     :eq rep.gt:22946              ; # &I-GT-22946;
     :eq rep.gt-pj-1:14658         ; # &I-GT-22946;
     :eq rep.jef-china3:0x57C6     ; # &I-JC3-57C6;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:015686        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:015686        ] ;
     :subsume
         g2.mj:015687         ;
     .
@@ -43627,8 +44281,8 @@ a.ucs:0x23E62
     :eq rep.cns11643-6:0x543B     ; # &I-C6-543B;
     :eq rep.daikanwa:17950        ; # &I-M-17950;
     :eq rep.shinjigen:4266        ; # 𣹢
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:05435 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:05435 ] ;
     .
     rep.cns11643-6:0x543B
                :abstract-glyph-of     cns11643-6:0x543B  .
@@ -43833,8 +44487,8 @@ rep.mj:015693
     :eq rep.gt:22900              ; # &I-GT-22900;
     :eq rep.gt-pj-1:12398         ; # &I-GT-22900;
     :eq rep.jef-china3:0x57C9     ; # &I-JC3-57C9;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:015692        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:015692        ] ;
     :subsume
         g2.mj:015693         ,
         g2.ucs_unicode:0x6EA2 ;
@@ -44053,6 +44707,8 @@ a.ucs:0x6EA4
 a.ucs:0x6EA5
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6EA5 ;
+    :from.denotational_component
+        a.ucs_component:0x6EA5 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
@@ -44100,6 +44756,19 @@ rep.mj:015697
     :eq rep.daikanwa:17957        ; # &I-M-17957;
     :eq rep.shinjigen_1ed:4398    ; # &MJ015697;
     :eq rep.shinjigen_rev:4400    ; # &MJ015697;
+    ideo:interchangeable-form-of [ :sources chisebib:daikanwa ;
+                                   :target  [ :target  rep.adobe-japan1-0:03539 ;
+                                              :sources chisebib:jiyun ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.adobe-japan1-0:01244 ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.adobe-japan1-5:17537 ;
+                                              :sources chisebib:jiyun ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.mj:013021        ;
+                                              :sources chisebib:shiwen ,
+                                                       chisebib:daikanwa ] ] ;
     :subsume
         g2.mj:015697         ,
         g2.cns11643-1:0x6467 ;
@@ -44437,40 +45106,114 @@ a.ucs:0x6EA7
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x6817   # 栗
+    ] ;
+    .
+
+rep.adobe-japan1-5:17970
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-5:17970 ;
+    :denotation-of
+        a.ucs:0x6EA7         ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-0:01792   # &AJ1-01792;
+    ] ;
+    :eq rep.ucs_unicode:0x6EA7    ; # &AJ1-17970;
+    :eq rep.gb2312:0x6460         ; # &I-G0-6460;
+    :eq rep.jis-x0212:0x482B      ; # &I-JSP-482B;
+    :eq rep.cns11643-1:0x6472     ; # &I-C1-6472;
+    :eq rep.jis-x0213-2:0x6F22    ; # &I-JX2-6F22;
     :eq a.big5:0xB7CC             ; # &I-B-B7CC;
+    :eq rep.daikanwa:17960        ; # &I-M-17960;
+    :eq rep.jef-china3:0x91F8     ; # &I-JC3-91F8;
     :subsume
-        rep.adobe-japan1-5:17970 ,
-        rep.cns11643-1:0x6472 ;
+        g2.ucs_unicode:0x6EA7 ,
+        g2.cns11643-1:0x6472 ;
     .
+    rep.ucs_unicode:0x6EA7
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x6EA7  ] .
+    rep.gb2312:0x6460
+               :abstract-glyph-of         gb2312:0x6460  .
+    rep.jis-x0212:0x482B
+               :abstract-glyph-of      jis-x0212:0x482B  .
+    rep.cns11643-1:0x6472
+               :abstract-glyph-of     cns11643-1:0x6472  .
+    rep.jis-x0213-2:0x6F22
+               :abstract-glyph-of    jis-x0213-2:0x6F22  .
     a.big5:0xB7CC
            :abstract-character-of           big5:0xB7CC  .
-    rep.adobe-japan1-5:17970
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1-5:17970 ;
-        :eq rep.ucs_unicode:0x6EA7    ; # &AJ1-17970;
-        :eq rep.gb2312:0x6460         ; # &I-G0-6460;
-        :eq rep.jis-x0212:0x482B      ; # &I-JSP-482B;
-        :eq rep.jis-x0213-2:0x6F22    ; # &I-JX2-6F22;
-        :eq rep.daikanwa:17960        ; # &I-M-17960;
-        :eq rep.jef-china3:0x91F8     ; # &I-JC3-91F8;
+    rep.daikanwa:17960
+               :abstract-glyph-of       daikanwa:17960   .
+    rep.jef-china3:0x91F8
+               :abstract-glyph-of     jef-china3:0x91F8  .
+    g2.ucs_unicode:0x6EA7
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6EA7  ] ;
+        :eq g2.adobe-japan1-5:17970   ; # &g2-AJ1-17970;
+        :eq g2.gb2312:0x6460          ; # &g2-AJ1-17970;
+        :eq g2.jis-x0212:0x482B       ; # &g2-AJ1-17970;
+        :eq g2.jis-x0213-2:0x6F22     ; # &g2-AJ1-17970;
+        :eq g2.daikanwa:17960         ; # &g2-AJ1-17970;
+        :eq g2.jef-china3:0x91F8      ; # &g2-AJ1-17970;
+        :subsume
+            repi.daikanwa:17960  ,
+            repi.jis-x0213-2:0x6F22 ,
+            repi.adobe-japan1-6:17970 ,
+            repi.ucs_unicode:0x6EA7 ,
+            repi.jef-china3:0x91F8 ;
+        .
+        g2.adobe-japan1-5:17970
+              :abstract-glyph-form-of adobe-japan1-5:17970   .
+        g2.gb2312:0x6460
+              :abstract-glyph-form-of         gb2312:0x6460  .
+        g2.jis-x0212:0x482B
+              :abstract-glyph-form-of      jis-x0212:0x482B  .
+        g2.jis-x0213-2:0x6F22
+              :abstract-glyph-form-of    jis-x0213-2:0x6F22  .
+        g2.daikanwa:17960
+              :abstract-glyph-form-of       daikanwa:17960   .
+        g2.jef-china3:0x91F8
+              :abstract-glyph-form-of     jef-china3:0x91F8  .
+        repi.daikanwa:17960
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17960 ;
+            .
+        repi.jis-x0212:0x482B
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x482B ;
+            :eq repi.jis-x0213-2:0x6F22   ; # &R-JX2-6F22;
+            .
+            repi.jis-x0213-2:0x6F22
+                          :glyph-image-of    jis-x0213-2:0x6F22  .
+        repi.adobe-japan1-5:17970
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-5:17970 ;
+            .
+        repi.ucs_unicode:0x6EA7
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6EA7  ] ;
+            .
+        repi.jef-china3:0x91F8
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x91F8 ;
+            .
+    g2.cns11643-1:0x6472
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-1:0x6472 ;
+        :eq g2.ucs_cns:0x6EA7         ; # &g2-CU+6EA7;
         .
-        rep.ucs_unicode:0x6EA7
-                   :abstract-glyph-of [ :context domain:unicode ;
+        g2.ucs_cns:0x6EA7
+              :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x6EA7  ] .
-        rep.gb2312:0x6460
-                   :abstract-glyph-of         gb2312:0x6460  .
-        rep.jis-x0212:0x482B
-                   :abstract-glyph-of      jis-x0212:0x482B  .
-        rep.jis-x0213-2:0x6F22
-                   :abstract-glyph-of    jis-x0213-2:0x6F22  .
-        rep.daikanwa:17960
-                   :abstract-glyph-of       daikanwa:17960   .
-        rep.jef-china3:0x91F8
-                   :abstract-glyph-of     jef-china3:0x91F8  .
-    rep.cns11643-1:0x6472
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-1:0x6472 ;
-        .
 
 rep.daikanwa:17961
     a chisegg:abstract-glyph ;
@@ -45868,8 +46611,8 @@ rep.mj:015724
     :eq rep.gt:23030              ; # &I-GT-23030;
     :eq rep.gt-pj-1:17710         ; # &I-GT-23030;
     :eq rep.jef-china3:0x70D6     ; # &I-JC3-70D6;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:015723        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:015723        ] ;
     :subsume
         g2.mj:015724         ;
     .
@@ -46776,12 +47519,12 @@ rep.daikanwa:18005
     ideo:total-strokes    13 ;
     :eq rep.shinjigen_1ed:4287    ; # &M-18005;
     :eq rep.shinjigen_rev:4289    ; # &M-18005;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ,
                                     chisebib:shinjigen_rev ;
                            :target  rep.adobe-japan1-0:02562 ] ;
-    :to.mistakable       [ :sources chisebib:kangxi-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:17856   ] ;
     :subsume
@@ -47482,7 +48225,7 @@ rep.daikanwa:18014
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:18013   ] ;
     .
@@ -47695,7 +48438,7 @@ rep.daikanwa:18020
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:zhengzitong ,
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6E5B         ] ;
     :subsume
@@ -49476,9 +50219,9 @@ a.ucs:0x6EDA
     :eq rep.daikanwa:18063        ; # &I-M-18063;
     :eq rep.shinjigen_1ed:4420    ; # 滚
     :eq rep.shinjigen_rev:4422    ; # 滚
-    :from.original       [ :sources chisebib:shinjigen_1ed ,
-                                    chisebib:shinjigen_rev ;
-                           :target  a.ucs:0x6EFE         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_1ed ,
+                                     chisebib:shinjigen_rev ;
+                            :target  a.ucs:0x6EFE         ] ;
     :subsume
         g2.daikanwa:18063    ,
         g2.ucs_unicode:0x6EDA ,
@@ -49547,6 +50290,10 @@ a.ucs:0x6EDB
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x4343   # 䍃
+    ] ;
     .
 
 rep.daikanwa:18065
@@ -49557,10 +50304,34 @@ rep.daikanwa:18065
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.gt-k:07305   # &GT-K07305;
+    ] ;
     :eq rep.cbeta:08893           ; # &I-CB08893;
+    :subsume
+        g2.daikanwa:18065    ;
     .
     rep.cbeta:08893
                :abstract-glyph-of          cbeta:08893   .
+    g2.daikanwa:18065
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:18065 ;
+        :eq g2.cbeta:08893            ; # &g2-M-18065;
+        :subsume
+            repi.daikanwa:18065  ,
+            repi.cbeta:08893     ;
+        .
+        g2.cbeta:08893
+              :abstract-glyph-form-of          cbeta:08893   .
+        repi.daikanwa:18065
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18065 ;
+            .
+        repi.cbeta:08893
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:08893 ;
+            .
 
 rep.cbeta:03020
     a chisegg:abstract-glyph ;
@@ -49570,7 +50341,17 @@ rep.cbeta:03020
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.jis-x0213-2:0x7461   # &JX2-7461;
+    ] ;
+    :subsume
+        g2.cbeta:03020       ;
     .
+    g2.cbeta:03020
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cbeta:03020 ;
+        .
 
 rep.cns11643-3:0x4247
     a chisegg:abstract-glyph ;
@@ -49580,11 +50361,39 @@ rep.cns11643-3:0x4247
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.gt-k:07393   # &GT-K07393;
+    ] ;
     :eq rep.ucs_unicode:0x6EDB    ; # &C3-4247;
+    :rep.ucs_JP...hanazono     rdf:nil ;
+    :subsume
+        g2.ucs_unicode:0x6EDB ;
     .
     rep.ucs_unicode:0x6EDB
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x6EDB  ] .
+    g2.ucs_unicode:0x6EDB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6EDB  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        :eq g2.cns11643-3:0x4247      ; # &g2-UU+6EDB;
+        :subsume
+            repi.cns11643-3:0x4247 ,
+            repi.ucs_unicode:0x6EDB ;
+        .
+        g2.cns11643-3:0x4247
+              :abstract-glyph-form-of     cns11643-3:0x4247  .
+        repi.cns11643-3:0x4247
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x4247 ;
+            .
+        repi.ucs_unicode:0x6EDB
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6EDB  ] ;
+            .
 
 a.ucs:0x6EDC
     a chisegg:abstract-character ;
@@ -49636,8 +50445,8 @@ rep.adobe-japan1-0:02892
     :eq rep.daikanwa:18067        ; # &I-M-18067;
     :eq rep.shinjigen_1ed:4408    ; # &AJ1-02892;
     :eq rep.shinjigen_rev:4410    ; # &AJ1-02892;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:016177        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:016177        ] ;
     :subsume
         g2.ucs_unicode:0x6EDD ;
     .
@@ -49733,8 +50542,8 @@ a.ucs:0x6EDE
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6EDE ;
     ideo:radical          85 ; # ⽔ 
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x6EEF         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x6EEF         ] ;
     .
 
 rep.adobe-japan1-0:02874
@@ -49751,8 +50560,8 @@ rep.adobe-japan1-0:02874
     :eq rep.gt:23018              ; # &I-GT-23018;
     :eq rep.gt-pj-1:16986         ; # &I-GT-23018;
     :eq rep.daikanwa...._.p:18067 ; # &AJ1-02874;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6EEF         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6EEF         ] ;
     :subsume
         g2.adobe-japan1-0:02874 ;
     .
@@ -49824,8 +50633,8 @@ rep.gb2312:0x564D
     ideo:total-strokes    12 ;
     :eq rep.ucs_unicode:0x6EDE    ; # &G0-564D;
     :rep.ucs_JP...hanazono     rdf:nil ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x6EEF         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x6EEF         ] ;
     .
     rep.ucs_unicode:0x6EDE
                :abstract-glyph-of [ :context domain:unicode ;
@@ -49877,10 +50686,10 @@ rep.adobe-japan1-0:01533
     :eq rep.gt:22918              ; # &I-GT-22918;
     :eq rep.gt-pj-1:13377         ; # &I-GT-22918;
     :eq rep.daikanwa...._.p:18068 ; # &AJ1-01533;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13332 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13332 ] ;
     :subsume
         g2.adobe-japan1-0:01533 ,
         repi.hng-khm:04140   ;
@@ -50268,6 +51077,38 @@ a.ucs:0x23E96
     ] ;
     .
 
+a.ucs:0x2ADB3
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2ADB3 ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x2B94E   # 𫥎
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x2ADB3
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2ADB3 ] ;
+    :denotation-of
+        a.ucs:0x2ADB3        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-var-001:0x2B94E   # &U-v001+2B94E;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2ADB3 ;
+    .
+    g2.ucs_JP...hanazono:0x2ADB3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2ADB3 ] ;
+        .
+
 a.ucs:0x6ECC
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6ECC ;
@@ -52605,8 +53446,8 @@ a.ucs:0x6E14
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
     :eq rep.gb2312:0x5366         ; # &I-G0-5366;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:015800        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:015800        ] ;
     .
     rep.gb2312:0x5366
                :abstract-glyph-of         gb2312:0x5366  .
@@ -54280,7 +55121,7 @@ rep.cns11643-2:0x4B3F
     :eq rep.ucs_unicode:0x6F19    ; # &C2-4B3F;
     :eq a.big5:0xE277             ; # &I-B-E277;
     :eq rep.daikanwa:18136        ; # &I-M-18136;
-    :to.mistakable       [ :sources chisebib:zihui-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:015697        ] ;
     :subsume
@@ -54327,6 +55168,8 @@ rep.ucs-itaiji-004:0x6EA5
     :abstract-glyph-of ucs-itaiji-004:0x6EA5 ;
     :denotation-of
         a.ucs:0x6F19         ;
+    :from.denotational_component
+        a.ucs_component:0x6EA5 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
@@ -54833,6 +55676,10 @@ a.ucs:0x6F20
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6F20 ;
     ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x83AB   # 莫
+    ] ;
     :eq a.big5:0xBA7A             ; # &I-B-BA7A;
     .
     a.big5:0xBA7A
@@ -54846,11 +55693,52 @@ rep.mj:015839
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.cns11643-1:0x5C7B   # &C1-5C7B;
+    ] ;
     :eq rep.ucs_cns:0x6F20        ; # &MJ015839;
     :eq rep.cns11643-1:0x6943     ; # &I-C1-6943;
     :eq rep.hanyo-denshi...ks:204670 ; # &MJ015839;
     :eq rep.daikanwa:18149        ; # &I-M-18149;
+    :form-of             [ :target  rep.mj:015838        ;
+                           :sources chisebib:koseki ] ,
+                         [ :target  rep.ucs_iso:0x21EDF  ;
+                           :sources chisebib:jiyun ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:daikanwa ;
+                                   :target  [ :target  a.ucs:0x6CCA         ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.cns11643-2:0x4932 ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.hanyo-denshi...ks:082790 ;
+                                              :sources chisebib:chuci-jizhu ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.cns11643-1:0x5C7B ;
+                                              :sources chisebib:erya-shu ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.cns11643-1:0x773E ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.mj:011822        ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.hanyo-denshi...ks:251690 ;
+                                              :sources chisebib:shuowen-tongxun-dingsheng ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  rep.mj:010898        ;
+                                              :sources chisebib:zhengzitong ,
+                                                       chisebib:daikanwa ] ,
+                                            rep.ucs_iso:0x25553  ] ;
+    ideo:interchangeable-form-of [ :context domain:ancient ;
+                                   :sources chisebib:zhengzitong ;
+                                   :target  rep.mj:010898        ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.ucs_iso:0x21EDF  ] ;
     :subsume
+        g2.daikanwa:18149    ,
         g2.mj:015839         ,
         g2.cns11643-1:0x6943 ;
     .
@@ -54863,6 +55751,10 @@ rep.mj:015839
                :abstract-glyph-of hanyo-denshi...ks:204670  .
     rep.daikanwa:18149
                :abstract-glyph-of       daikanwa:18149   .
+    g2.daikanwa:18149
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:18149 ;
+        .
     g2.mj:015839
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:015839 ;
@@ -54870,20 +55762,12 @@ rep.mj:015839
                                :target  a.ucs:0x6F20         ,
                                         a.ucs:0xE0102        ] ;
         :eq g2.hanyo-denshi...ks:204670 ; # &g2-MJ015839;
-        :eq g2.daikanwa:18149         ; # &g2-MJ015839;
         :subsume
-            repi.daikanwa:18149  ,
             repi.hanyo-denshi...ks:204670 ,
             repi.mj:015839       ;
         .
         g2.hanyo-denshi...ks:204670
               :abstract-glyph-form-of hanyo-denshi...ks:204670  .
-        g2.daikanwa:18149
-              :abstract-glyph-form-of       daikanwa:18149   .
-        repi.daikanwa:18149
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:18149 ;
-            .
         repi.hanyo-denshi...ks:204670
             a chisegg:glyph-image ;
             :glyph-image-of hanyo-denshi...ks:204670 ;
@@ -54912,6 +55796,10 @@ rep.mj:015838
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.mj:022034   # &MJ022034;
+    ] ;
     :eq rep.ucs_unicode:0x6F20    ; # &MJ015838;
     :eq rep.adobe-japan1-0:03375  ; # &I-AJ1-03375;
     :eq rep.jis-x0208:0x4779      ; # &I-J90-4779;
@@ -55366,8 +56254,8 @@ rep.mj:015844
     :eq rep.gt-k:10288            ; # &I-GT-K10288;
     :eq rep.gt-pj-1:20090         ; # &I-GT-23087;
     :eq rep.jef-china3:0x70DC     ; # &I-JC3-70DC;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:015845        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:015845        ] ;
     :subsume
         g2.mj:015844         ;
     .
@@ -55923,6 +56811,10 @@ a.ucs:0x6F2B
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x66FC   # 曼
+    ] ;
     :eq a.big5:0xBAA9             ; # &I-B-BAA9;
     .
     a.big5:0xBAA9
@@ -55936,10 +56828,15 @@ rep.mj:015854
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.mj:013499   # &MJ013499;
+    ] ;
     :eq rep.ucs_cns:0x6F2B        ; # &MJ015854;
     :eq rep.cns11643-1:0x6950     ; # &I-C1-6950;
     :eq rep.hanyo-denshi...ks:204820 ; # &MJ015854;
     :eq rep.daikanwa:18166        ; # &I-M-18166;
+    ideo:interchangeable-form-of rep.mj:010898        ;
     :subsume
         g2.mj:015854         ;
     .
@@ -56005,6 +56902,10 @@ rep.mj:015855
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.mj:013498   # &MJ013498;
+    ] ;
     :eq rep.ucs_unicode:0x6F2B    ; # &MJ015855;
     :eq rep.adobe-japan1-0:03757  ; # &I-AJ1-03757;
     :eq rep.jis-x0208:0x4C21      ; # &I-J90-4C21;
@@ -57968,15 +58869,62 @@ a.ucs:0x23EF2
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23EF2 ;
     ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs-itaiji-001:0x753E   # &A-U-i001+753E;
+    ] ;
+    .
+
+rep.ucs_iso:0x23EF2
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23EF2 ] ;
+    :denotation-of
+        a.ucs:0x23EF2        ;
+    ideo:radical          85 ; # ⽔ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
-    :eq rep.cns11643-6:0x5E3F     ; # &I-C6-5E3F;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-itaiji-002:0x753E   # &U-i002+753E;
+    ] ;
+    :eq rep.cns11643-6:0x5E3F     ; # &C6-5E3F;
     :eq rep.daikanwa:18205        ; # &I-M-18205;
+    :subsume
+        g2.ucs_iso:0x23EF2   ;
     .
     rep.cns11643-6:0x5E3F
                :abstract-glyph-of     cns11643-6:0x5E3F  .
     rep.daikanwa:18205
                :abstract-glyph-of       daikanwa:18205   .
+    g2.ucs_iso:0x23EF2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23EF2 ] ;
+        :eq g2.cns11643-6:0x5E3F      ; # &g2-M-18205;
+        :eq g2.daikanwa:18205         ; # &g2-M-18205;
+        :subsume
+            repi.daikanwa:18205  ,
+            repi.cns11643-6:0x5E3F ,
+            repi.ucs_iso:0x23EF2 ;
+        .
+        g2.cns11643-6:0x5E3F
+              :abstract-glyph-form-of     cns11643-6:0x5E3F  .
+        g2.daikanwa:18205
+              :abstract-glyph-form-of       daikanwa:18205   .
+        repi.daikanwa:18205
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18205 ;
+            .
+        repi.cns11643-6:0x5E3F
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x5E3F ;
+            .
+        repi.ucs_iso:0x23EF2
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23EF2 ] ;
+            .
 
 a.ucs:0x23F3B
     a chisegg:abstract-character ;
@@ -58215,8 +59163,8 @@ rep.adobe-japan1-0:01535
     :eq rep.gt:23121              ; # &I-GT-23121;
     :eq rep.gt-pj-1:13379         ; # &I-GT-23121;
     :eq rep.daikanwa:18216        ; # &I-M-18216;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016226        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016226        ] ;
     :subsume
         repi.daikanwa:18216  ,
         repi.jis-x0208_1990:0x3443 ,
@@ -60122,8 +61070,8 @@ a.ucs:0x6F5C
     :eq rep.gt-pj-1:16504         ; # &I-GT-23402;
     :eq rep.daikanwa:18241        ; # &I-M-18241;
     :eq rep.shinjigen:4467        ; # 潜
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:015907        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:015907        ] ;
     :subsume
         g2.ucs_unicode:0x6F5C ;
     .
@@ -60755,8 +61703,8 @@ a.ucs:0x6F97
     :eq rep.gt:23319              ; # &I-GT-23319;
     :eq rep.gt-pj-1:13378         ; # &I-GT-23319;
     :eq rep.jef-china3:0x57A6     ; # &I-JC3-57A6;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0x3D4E         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0x3D4E         ] ;
     .
     rep.adobe-japan1-0:01534
                :abstract-glyph-of adobe-japan1-0:01534   .
@@ -61886,9 +62834,9 @@ a.ucs:0x23F54
                          ] ;
     :eq rep.cns11643-7:0x2449     ; # &I-C7-2449;
     :eq rep.daikanwa:18279        ; # &I-M-18279;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.cns11643-1:0x603A ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.cns11643-1:0x603A ] ;
     :subsume
         g2.ucs_iso:0x23F54   ;
     .
@@ -62785,7 +63733,7 @@ rep.daikanwa:18294
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.ucs-var-001:0x23205   # &U-v001+23205;
     ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05505 ] ;
     :subsume
@@ -62890,35 +63838,35 @@ rep.ucs_iso:0x23F7D
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.ucs-itaiji-002:0x6614   # &U-i002+6614;
     ] ;
-    :eq rep.cns11643-7:0x2451     ; # &I-C7-2451;
-    :eq rep.daikanwa:18295        ; # &C7-2451;
+    :eq rep.cns11643-7:0x2451     ; # &C7-2451;
+    :eq rep.daikanwa:18295        ; # &I-M-18295;
     :subsume
-        g2.ucs_iso:0x23F7D   ,
+        g.ucs_iso:0x23F7D    ,
         g2.cns11643-7:0x2451 ;
     .
     rep.cns11643-7:0x2451
                :abstract-glyph-of     cns11643-7:0x2451  .
     rep.daikanwa:18295
                :abstract-glyph-of       daikanwa:18295   .
-    g2.ucs_iso:0x23F7D
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:iso     ;
-                                  :target     ucs:0x23F7D ] ;
-        :eq g2.daikanwa:18295         ; # &g2-M-18295;
+    g.ucs_iso:0x23F7D
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x23F7D ] ;
+        :eq g.daikanwa:18295          ; # &G-IU+23F7D;
         :subsume
-            repi.daikanwa:18295  ,
-            repi.ucs_iso:0x23F7D ;
+            g2.daikanwa:18295    ,
+            g2.ucs_iso:0x23F7D   ;
         .
+        g.daikanwa:18295
+                   :detailed-glyph-of       daikanwa:18295   .
         g2.daikanwa:18295
-              :abstract-glyph-form-of       daikanwa:18295   .
-        repi.daikanwa:18295
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:18295 ;
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of daikanwa:18295 ;
             .
-        repi.ucs_iso:0x23F7D
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:iso     ;
-                              :target     ucs:0x23F7D ] ;
+        g2.ucs_iso:0x23F7D
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x23F7D ] ;
             .
     g2.cns11643-7:0x2451
         a chisegg:abstract-glyph-form ;
@@ -63665,8 +64613,8 @@ o.ucs_unicode:0x6F80
         :eq rep.gt-pj-1:24360         ; # &I-GT-23696;
         :eq rep.daikanwa:18311        ; # &I-M-18311;
         :eq rep.shinjigen:4279        ; # &MJ015962;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  a.ucs:0x6F81         ] ;
+        ideo:original-form-of [ :sources chisebib:shinjigen ;
+                                :target  a.ucs:0x6F81         ] ;
         :subsume
             g2.daikanwa:18311    ,
             g2.mj:015962         ;
@@ -64979,9 +65927,9 @@ a.ucs:0x6F91
     :eq rep.daikanwa:18335        ; # &I-M-18335;
     :eq rep.shinjigen_1ed:4405    ; # 澑
     :eq rep.shinjigen_rev:4407    ; # 澑
-    :from.original       [ :sources chisebib:shinjigen_1ed ,
-                                    chisebib:shinjigen_rev ;
-                           :target  a.ucs:0x6E9C         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_1ed ,
+                                     chisebib:shinjigen_rev ;
+                            :target  a.ucs:0x6E9C         ] ;
     .
     rep.adobe-japan1-0:05516
                :abstract-glyph-of adobe-japan1-0:05516   .
@@ -65430,35 +66378,76 @@ a.ucs:0x23F6D
     rep.daikanwa:18351
                :abstract-glyph-of       daikanwa:18351   .
 
-rep.daikanwa:18352
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:18352 ;
-    :to.ucs              a.ucs:0x23F6E ; # 𣽮
-    ideo:radical          85 ; # ⽔ 
-    ideo:strokes          12 ;
-    ideo:total-strokes    15 ;
-    .
-
 a.ucs:0x23F6E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23F6E ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x5AB1   # 媱
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "iN" ) ;
+                         ] ;
+    .
 
-    :morohashi-daikanwa          (18352 0 2) ;
+rep.daikanwa:18352
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of daikanwa:18352 ;
+    :denotation-of
+        a.ucs:0x23F6E        ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-var-002:0x5AB1   # &U-v002+5AB1;
+    ] ;
+    ideo:same-as         [ :sources chisebib:kangxi ,
+                                    chisebib:daikanwa ;
+                           :target  rep.mj:015492        ,
+                                    rep.adobe-japan1-0:07135 ] ;
+    :subsume
+        g2.daikanwa:18352    ;
     .
+    g2.daikanwa:18352
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:18352 ;
+        .
 
-rep.cns11643-7:0x2466
+rep.ucs_iso:0x23F6E
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-7:0x2466 ;
-    :to.ucs              a.ucs:0x23F6E ; # 𣽮
-
-    :morohashi-daikanwa          (18352 0 3) ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23F6E ] ;
+    :denotation-of
+        a.ucs:0x23F6E        ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-var-001:0x5AB1   # &U-v001+5AB1;
+    ] ;
+    :eq rep.cns11643-7:0x2466     ; # &C7-2466;
+    :subsume
+        g2.ucs_iso:0x23F6E   ,
+        g2.cns11643-7:0x2466 ;
     .
+    rep.cns11643-7:0x2466
+               :abstract-glyph-of     cns11643-7:0x2466  .
+    g2.ucs_iso:0x23F6E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23F6E ] ;
+        .
+    g2.cns11643-7:0x2466
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x2466 ;
+        :eq g2.ucs_cns:0x23F6E        ; # &g2-CU+23F6E;
+        .
+        g2.ucs_cns:0x23F6E
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x23F6E ] .
 
 rep.daikanwa:18353
     a chisegg:abstract-glyph ;
@@ -65924,6 +66913,38 @@ a.ucs:0x23F49
     rep.cns11643-7:0x244C
                :abstract-glyph-of     cns11643-7:0x244C  .
 
+a.ucs:0x23F9B
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23F9B ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x44E7   # 䓧
+    ] ;
+    .
+
+rep.ucs_iso:0x23F9B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23F9B ] ;
+    :denotation-of
+        a.ucs:0x23F9B        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-var-001:0x44E7   # &U-v001+44E7;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23F9B   ;
+    .
+    g2.ucs_iso:0x23F9B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23F9B ] ;
+        .
+
 a.ucs:0x23FC5
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23FC5 ;
@@ -66427,8 +67448,8 @@ a.ucs:0x6FA3
     :eq rep.gt-pj-1:24373         ; # &I-GT-23525;
     :eq rep.daikanwa:18382        ; # &I-M-18382;
     :eq rep.shinjigen:4204        ; # 澣
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x6D63         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x6D63         ] ;
     .
     rep.adobe-japan1-0:05520
                :abstract-glyph-of adobe-japan1-0:05520   .
@@ -66692,7 +67713,7 @@ a.ucs:0x2400E
     ideo:total-strokes    16 ;
     :eq rep.cns11643-7:0x2F44     ; # &I-C7-2F44;
     :eq rep.daikanwa:18384        ; # &I-M-18384;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:016002        ] ;
     .
@@ -67994,11 +69015,10 @@ rep.cns11643-3:0x5158
     ] ;
     :eq rep.ucs_cns:0x6FB7        ; # &C3-5158;
     :eq rep.daikanwa:18417        ; # &I-M-18417;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:015854        ] ;
     :subsume
-        g2.daikanwa:18417    ,
         g2.cns11643-3:0x5158 ;
     .
     rep.ucs_cns:0x6FB7
@@ -68006,18 +69026,28 @@ rep.cns11643-3:0x5158
                                     :target     ucs:0x6FB7  ] .
     rep.daikanwa:18417
                :abstract-glyph-of       daikanwa:18417   .
-    g2.daikanwa:18417
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of daikanwa:18417 ;
-        .
     g2.cns11643-3:0x5158
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x5158 ;
-        :eq g2.ucs_cns:0x6FB7         ; # &g2-CU+6FB7;
+        :eq g2.ucs_cns:0x6FB7         ; # &g2-M-18417;
+        :eq g2.daikanwa:18417         ; # &g2-M-18417;
+        :subsume
+            repi.daikanwa:18417  ,
+            repi.cns11643-3:0x5158 ;
         .
         g2.ucs_cns:0x6FB7
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x6FB7  ] .
+        g2.daikanwa:18417
+              :abstract-glyph-form-of       daikanwa:18417   .
+        repi.daikanwa:18417
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18417 ;
+            .
+        repi.cns11643-3:0x5158
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x5158 ;
+            .
 
 rep.ucs_unicode:0x6FB7
     a chisegg:abstract-glyph ;
@@ -69935,22 +70965,51 @@ a.ucs:0x23FDA
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x3B9A   # 㮚
+    ] ;
+    :eq rep.cns11643-7:0x2F43     ; # &I-C7-2F43;
+    :eq rep.daikanwa:18460        ; # &I-M-18460;
+    ideo:original-form-of [ :sources chisebib:jiyun ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-5:17970 ] ;
     :subsume
-        rep.ucs_iso:0x23FDA  ,
-        rep.cns11643-7:0x2F43 ;
+        g2.ucs_iso:0x23FDA   ,
+        g2.cns11643-7:0x2F43 ;
     .
-    rep.ucs_iso:0x23FDA
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x23FDA ] ;
-        :eq rep.daikanwa:18460        ; # &M-18460;
-        .
-        rep.daikanwa:18460
-                   :abstract-glyph-of       daikanwa:18460   .
     rep.cns11643-7:0x2F43
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-7:0x2F43 ;
+               :abstract-glyph-of     cns11643-7:0x2F43  .
+    rep.daikanwa:18460
+               :abstract-glyph-of       daikanwa:18460   .
+    g2.ucs_iso:0x23FDA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23FDA ] ;
+        :eq g2.daikanwa:18460         ; # &g2-M-18460;
+        :subsume
+            repi.daikanwa:18460  ,
+            repi.ucs_iso:0x23FDA ;
+        .
+        g2.daikanwa:18460
+              :abstract-glyph-form-of       daikanwa:18460   .
+        repi.daikanwa:18460
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18460 ;
+            .
+        repi.ucs_iso:0x23FDA
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23FDA ] ;
+            .
+    g2.cns11643-7:0x2F43
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x2F43 ;
+        :eq g2.ucs_cns:0x23FDA        ; # &g2-CU+23FDA;
         .
+        g2.ucs_cns:0x23FDA
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x23FDA ] .
 
 a.ucs:0x23FDB
     a chisegg:abstract-character ;
@@ -70586,25 +71645,80 @@ a.ucs:0x23FF1
     rep.cns11643-7:0x2F2F
                :abstract-glyph-of     cns11643-7:0x2F2F  .
 
+a.ucs:0x23FFC
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23FFC ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.hanyo-denshi...tk:01062840   # &HD-TK-01062840;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23FFC   ;
+    .
+    g2.ucs_iso:0x23FFC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23FFC ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x2EA1 ; # ⺡
+            isd:right    g2.hanyo-denshi...tk:01062840   # &g2-HD-TK-01062840;
+        ] ;
+        .
+
 a.ucs:0x24011
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24011 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x5BD7   # 寗
+    ] ;
+    .
+
+rep.ucs_iso:0x24011
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24011 ] ;
+    :denotation-of
+        a.ucs:0x24011        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ks-x1001:0x523C   # &K0-523C;
+    ] ;
+    :eq rep.cns11643-4:0x5121     ; # &C4-5121;
     :subsume
-        rep.ucs_iso:0x24011  ,
-        rep.cns11643-4:0x5121 ;
+        g2.ucs_iso:0x24011   ;
     .
-    rep.ucs_iso:0x24011
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x24011 ] ;
-        .
     rep.cns11643-4:0x5121
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-4:0x5121 ;
+               :abstract-glyph-of     cns11643-4:0x5121  .
+    g2.ucs_iso:0x24011
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24011 ] ;
+        :eq g2.cns11643-4:0x5121      ; # &g2-IU-00024011;
+        :subsume
+            repi.ucs_iso:0x24011 ,
+            repi.cns11643-4:0x5121 ;
         .
+        g2.cns11643-4:0x5121
+              :abstract-glyph-form-of     cns11643-4:0x5121  .
+        repi.ucs_iso:0x24011
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24011 ] ;
+            .
+        repi.cns11643-4:0x5121
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x5121 ;
+            .
 
 rep.daikanwa:18481
     a chisegg:abstract-glyph ;
@@ -72140,22 +73254,50 @@ a.ucs:0x6FE5
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          14 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x5924   # 夤
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "iN" ) ;
+                         ] ;
+    :eq rep.cns11643-3:0x5531     ; # &I-C3-5531;
+    :eq rep.daikanwa:18509        ; # &I-M-18509;
     :subsume
-        rep.daikanwa:18509   ,
-        rep.cns11643-3:0x5531 ;
+        g2.ucs_unicode:0x6FE5 ;
     .
-    rep.daikanwa:18509
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:18509 ;
-        .
     rep.cns11643-3:0x5531
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x5531 ;
-        :eq rep.ucs_unicode:0x6FE5    ; # &C3-5531;
+               :abstract-glyph-of     cns11643-3:0x5531  .
+    rep.daikanwa:18509
+               :abstract-glyph-of       daikanwa:18509   .
+    g2.ucs_unicode:0x6FE5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6FE5  ] ;
+        :eq g2.cns11643-3:0x5531      ; # &g2-M-18509;
+        :eq g2.daikanwa:18509         ; # &g2-M-18509;
+        :subsume
+            repi.daikanwa:18509  ,
+            repi.cns11643-3:0x5531 ,
+            repi.ucs_unicode:0x6FE5 ;
         .
-        rep.ucs_unicode:0x6FE5
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x6FE5  ] .
+        g2.cns11643-3:0x5531
+              :abstract-glyph-form-of     cns11643-3:0x5531  .
+        g2.daikanwa:18509
+              :abstract-glyph-form-of       daikanwa:18509   .
+        repi.daikanwa:18509
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18509 ;
+            .
+        repi.cns11643-3:0x5531
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x5531 ;
+            .
+        repi.ucs_unicode:0x6FE5
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6FE5  ] ;
+            .
 
 a.ucs:0x6FE6
     a chisegg:abstract-character ;
@@ -72693,7 +73835,7 @@ rep.daikanwa:18519
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.adobe-japan1-5:18267   # &AJ1-18267;
     ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:18795   ] ;
     :subsume
@@ -72788,7 +73930,7 @@ rep.mj:016159
     :eq rep.daikanwa:18520        ; # &I-M-18520;
     :eq rep.shinjigen:4186        ; # &MJ016159;
     :eq rep.jef-china3:0x57B6     ; # &I-JC3-57B6;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:016161        ] ;
@@ -72874,8 +74016,8 @@ a.ucs:0x2F914
     :eq rep.gt:23701              ; # &I-GT-23701;
     :eq rep.gt-pj-1:18004         ; # &I-GT-23701;
     :eq rep.jef-china3:0x70D8     ; # &I-JC3-70D8;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016161        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016161        ] ;
     :subsume
         g2.mj:016160         ,
         g2.ucs_iso:0x2F914   ;
@@ -73254,12 +74396,47 @@ a.ucs:0x2402A
         :abstract-glyph-of cns11643-5:0x5B7B ;
         .
 
+bucs:0x6FEC
+    a chisegg:super-abstract-character ;
+    :super-abstract-character-of [ :context domain:bucs    ;
+                                   :target     ucs:0x6FEC  ] ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.daikanwa:23536   # &A-M-23536;
+    ] ;
+    :eq a.daikanwa:18524          ; # &BUCS+6FEC;
+    .
+    a.daikanwa:18524
+           :abstract-character-of       daikanwa:18524   .
+
+a.ucs_iwds-1:0x6FEC
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x6FEC  ] ;
+    :denotation-of
+        bucs:0x6FEC          ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          14 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs_iwds-1:0x777F   # &A-IWDSU+777F;
+    ] ;
+    .
+
 a.ucs:0x6FEC
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6FEC ;
+    :denotation-of
+        a.ucs_iwds-1:0x6FEC  ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          14 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x777F   # 睿
+    ] ;
     :eq rep.adobe-japan1-0:05528  ; # &I-AJ1-05528;
     :eq rep.jis-x0208:0x5F3D      ; # &I-J90-5F3D;
     :eq rep.ks-x1001:0x715F       ; # &I-K0-715F;
@@ -73271,6 +74448,8 @@ a.ucs:0x6FEC
     :eq rep.gt-pj-1:24381         ; # &I-GT-23697;
     :eq rep.daikanwa:18524        ; # &I-M-18524;
     :eq rep.shinjigen:4506        ; # 濬
+    :subsume
+        g2.ucs_unicode:0x6FEC ;
     .
     rep.adobe-japan1-0:05528
                :abstract-glyph-of adobe-japan1-0:05528   .
@@ -73294,6 +74473,143 @@ a.ucs:0x6FEC
                :abstract-glyph-of       daikanwa:18524   .
     rep.shinjigen:4506
                :abstract-glyph-of      shinjigen:4506    .
+    g2.ucs_unicode:0x6FEC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6FEC  ] ;
+        :eq g2.adobe-japan1-0:05528   ; # &g2-AJ1-05528;
+        :eq g2.ks-x1001:0x715F        ; # &g2-AJ1-05528;
+        :eq g2.iso-ir165:0x2D59       ; # &g2-AJ1-05528;
+        :eq g2.jis-x0208:0x5F3D       ; # &g2-AJ1-05528;
+        :eq g2.cns11643-1:0x742B      ; # &g2-AJ1-05528;
+        :eq g2.jis-x0213-1:0x5F3D     ; # &g2-AJ1-05528;
+        :eq g2.gt:23697               ; # &g2-AJ1-05528;
+        :eq g2.daikanwa:18524         ; # &g2-AJ1-05528;
+        :eq g2.shinjigen:4506         ; # &g2-AJ1-05528;
+        :subsume
+            repi.daikanwa:18524  ,
+            repi.jis-x0208:0x5F3D ,
+            repi.adobe-japan1-6:05528 ,
+            repi.cns11643-1:0x742B ,
+            repi.gt:23697        ,
+            repi.ks-x1001:0x715F ,
+            repi.ucs_unicode:0x6FEC ;
+        .
+        g2.adobe-japan1-0:05528
+              :abstract-glyph-form-of adobe-japan1-0:05528   .
+        g2.ks-x1001:0x715F
+              :abstract-glyph-form-of       ks-x1001:0x715F  .
+        g2.iso-ir165:0x2D59
+              :abstract-glyph-form-of      iso-ir165:0x2D59  .
+        g2.jis-x0208:0x5F3D
+              :abstract-glyph-form-of      jis-x0208:0x5F3D  .
+        g2.cns11643-1:0x742B
+              :abstract-glyph-form-of     cns11643-1:0x742B  .
+        g2.jis-x0213-1:0x5F3D
+              :abstract-glyph-form-of    jis-x0213-1:0x5F3D  .
+        g2.gt:23697
+              :abstract-glyph-form-of             gt:23697   .
+        g2.daikanwa:18524
+              :abstract-glyph-form-of       daikanwa:18524   .
+        g2.shinjigen:4506
+              :abstract-glyph-form-of      shinjigen:4506    .
+        repi.daikanwa:18524
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18524 ;
+            .
+        repi.jis-x0208:0x5F3D
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x5F3D ;
+            :eq repi.jis-x0213-1:0x5F3D   ; # &R-J0-5F3D;
+            .
+            repi.jis-x0213-1:0x5F3D
+                          :glyph-image-of    jis-x0213-1:0x5F3D  .
+        repi.adobe-japan1-0:05528
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:05528 ;
+            .
+        repi.cns11643-1:0x742B
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x742B ;
+            .
+        repi.gt:23697
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:23697 ;
+            .
+        repi.ks-x1001:0x715F
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x715F ;
+            :eq repi.ucs_ks:0x6FEC        ; # &R-K0-715F;
+            .
+            repi.ucs_ks:0x6FEC
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x6FEC  ] .
+        repi.ucs_unicode:0x6FEC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6FEC  ] ;
+            .
+
+a.ucs:0x24039
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24039 ;
+    :denotation-of
+        a.ucs_iwds-1:0x6FEC  ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          14 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x25220   # 𥈠
+    ] ;
+    :eq rep.cns11643-3:0x553A     ; # &I-C3-553A;
+    :subsume
+        g2.ucs_iso:0x24039   ;
+    .
+    rep.cns11643-3:0x553A
+               :abstract-glyph-of     cns11643-3:0x553A  .
+    g2.ucs_iso:0x24039
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24039 ] ;
+        :eq g2.cns11643-3:0x553A      ; # &g2-IU-00024039;
+        :subsume
+            repi.cns11643-3:0x553A ,
+            repi.ucs_iso:0x24039 ;
+        .
+        g2.cns11643-3:0x553A
+              :abstract-glyph-form-of     cns11643-3:0x553A  .
+        repi.cns11643-3:0x553A
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x553A ;
+            .
+        repi.ucs_iso:0x24039
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24039 ] ;
+            .
+
+a.ucs:0x23FF0
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23FF0 ;
+    :denotation-of
+        bucs:0x6FEC          ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-itaiji-001:0x777F   # &U-i001+777F;
+    ] ;
+    :from.unknown        a.ucs:0x6FEC         ;
+    :subsume
+        g2.ucs_iso:0x23FF0   ;
+    .
+    g2.ucs_iso:0x23FF0
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23FF0 ] ;
+        .
 
 a.ucs:0x6FED
     a chisegg:abstract-character ;
@@ -74166,7 +75482,7 @@ a.ucs:0x6FF5
     :eq rep.daikanwa:18538        ; # &I-M-18538;
     :eq rep.shinjigen:4236        ; # 濵
     :eq rep.jef-china3:0x57B8     ; # &I-JC3-57B8;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:016101        ] ;
@@ -74359,29 +75675,51 @@ a.ucs:0x3D79
     ] ;
     .
 
-rep.cns11643-4:0x5659
+rep.mj:002208
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-4:0x5659 ;
+    :abstract-glyph-of mj:002208 ;
     :denotation-of
         a.ucs:0x3D79         ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          14 ;
     ideo:total-strokes    17 ;
-    :eq rep.ucs_cns:0x3D79        ; # &C4-5659;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs_iso:0x21EDF   # &C4-4325;
+    ] ;
+    :eq rep.ucs_cns:0x3D79        ; # &MJ002208;
+    :eq rep.cns11643-4:0x5659     ; # &I-C4-5659;
+    :eq rep.koseki:208990         ; # &MJ002208;
     :eq rep.daikanwa:18544        ; # &I-M-18544;
+    :form-of             rep.ucs_iso:0x21EDF  ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.ucs_iso:0x21EDF  ] ;
     :subsume
         g2.daikanwa:18544    ,
+        g2.mj:002208         ,
         g2.cns11643-4:0x5659 ;
     .
     rep.ucs_cns:0x3D79
                :abstract-glyph-of [ :context domain:cns     ;
                                     :target     ucs:0x3D79  ] .
+    rep.cns11643-4:0x5659
+               :abstract-glyph-of     cns11643-4:0x5659  .
+    rep.koseki:208990
+               :abstract-glyph-of         koseki:208990  .
     rep.daikanwa:18544
                :abstract-glyph-of       daikanwa:18544   .
     g2.daikanwa:18544
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:18544 ;
         .
+    g2.mj:002208
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:002208 ;
+        :eq g2.koseki:208990          ; # &g2-MJ002208;
+        .
+        g2.koseki:208990
+              :abstract-glyph-form-of         koseki:208990  .
     g2.cns11643-4:0x5659
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x5659 ;
@@ -74400,6 +75738,10 @@ rep.ucs_unicode:0x3D79
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs_JP...hanazono:0x21EDF   # &hanaJU+21EDF;
+    ] ;
     :subsume
         g2.ucs_unicode:0x3D79 ;
     .
@@ -74473,7 +75815,7 @@ a.ucs:0x6FF6
     :eq rep.daikanwa:18547        ; # &I-M-18547;
     :eq rep.shinjigen:8832        ; # 濶
     :eq rep.cbeta:04583           ; # &I-CB04583;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x95CA         ] ;
@@ -74837,8 +76179,8 @@ rep.mj:016109
     :rep.ucs_JP...hanazono     rdf:nil ;
     :eq rep.jis-x0212:0x4927      ; # &I-JSP-4927;
     :eq rep.hanyo-denshi...jb:0x4927 ; # &I-HD-JB-4927;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016110        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016110        ] ;
     :subsume
         g2.mj:016109         ;
     .
@@ -74888,17 +76230,6 @@ rep.mj:016109
                               :target     ucs:0x6FF9  ] ;
             .
 
-a.ucs:0x24039
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x24039 ;
-    ideo:radical          85 ; # ⽔ 
-    ideo:strokes          14 ;
-    ideo:total-strokes    17 ;
-    :eq rep.cns11643-3:0x553A     ; # &I-C3-553A;
-    .
-    rep.cns11643-3:0x553A
-               :abstract-glyph-of     cns11643-3:0x553A  .
-
 a.ucs:0x2403E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2403E ;
@@ -75327,24 +76658,66 @@ a.ucs:0x24064
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24064 ;
     ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x6B4E   # 歎
+    ] ;
+    .
+
+rep.ucs_iso:0x24064
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24064 ] ;
+    :denotation-of
+        a.ucs:0x24064        ;
+    ideo:radical          85 ; # ⽔ 
     ideo:strokes          15 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.jis-x0213-1_2004:0x4337   # &HD-FT-3D30;
+    ] ;
+    :eq rep.cns11643-4:0x5B5D     ; # &C4-5B5D;
+    :eq rep.daikanwa:18567        ; # &I-M-18567;
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
+                                    chisebib:daikanwa ;
+                           :target  rep.mj:016238        ] ;
     :subsume
-        rep.ucs_iso:0x24064  ,
-        rep.cns11643-4:0x5B5D ;
+        g2.ucs_iso:0x24064   ,
+        g2.cns11643-4:0x5B5D ;
     .
-    rep.ucs_iso:0x24064
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x24064 ] ;
-        :eq rep.daikanwa:18567        ; # &M-18567;
-        .
-        rep.daikanwa:18567
-                   :abstract-glyph-of       daikanwa:18567   .
     rep.cns11643-4:0x5B5D
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-4:0x5B5D ;
+               :abstract-glyph-of     cns11643-4:0x5B5D  .
+    rep.daikanwa:18567
+               :abstract-glyph-of       daikanwa:18567   .
+    g2.ucs_iso:0x24064
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24064 ] ;
+        :eq g2.daikanwa:18567         ; # &g2-M-18567;
+        :subsume
+            repi.daikanwa:18567  ,
+            repi.ucs_iso:0x24064 ;
         .
+        g2.daikanwa:18567
+              :abstract-glyph-form-of       daikanwa:18567   .
+        repi.daikanwa:18567
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18567 ;
+            .
+        repi.ucs_iso:0x24064
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24064 ] ;
+            .
+    g2.cns11643-4:0x5B5D
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-4:0x5B5D ;
+        :eq g2.ucs_cns:0x24064        ; # &g2-CU+24064;
+        .
+        g2.ucs_cns:0x24064
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x24064 ] .
 
 a.ucs:0x24065
     a chisegg:abstract-character ;
@@ -76391,8 +77764,8 @@ rep.adobe-japan1-0:03226
     :eq rep.jis-x0213-1:0x4642    ; # &I-JX1-4642;
     :eq rep.gt:22395              ; # &I-GT-22395;
     :eq rep.gt-pj-1:17986         ; # &I-GT-22395;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07760 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07760 ] ;
     :subsume
         g2.ucs_unicode:0x6D9C ;
     .
@@ -77990,7 +79363,7 @@ rep.daikanwa:18624
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          15 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:015488        ] ;
     :subsume
@@ -78047,7 +79420,7 @@ rep.daikanwa:18625
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          15 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x483D ] ;
     :subsume
@@ -78329,6 +79702,25 @@ a.ucs:0x2408A
     rep.cns11643-5:0x624D
                :abstract-glyph-of     cns11643-5:0x624D  .
 
+a.ucs:0x24092
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24092 ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          15 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x23C99 ; # 𣲙
+        isd:below    rep.ucs-itaiji-005:0x34BC   # &U-i005+34BC;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24092   ;
+    .
+    g2.ucs_iso:0x24092
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24092 ] ;
+        .
+
 a.ucs:0x7015
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7015 ;
@@ -78493,8 +79885,8 @@ rep.mj:016144
     :eq rep.gt:23988              ; # &I-GT-23988;
     :eq rep.gt-pj-1:18766         ; # &I-GT-23988;
     :eq rep.jef-china3:0x70DB     ; # &I-JC3-70DB;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016143        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016143        ] ;
     :subsume
         g2.mj:016144         ;
     .
@@ -80219,7 +81611,7 @@ rep.daikanwa:18669
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.jis-x0213-2:0x747E   # &JX2-747E;
     ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x4836 ] ;
     :subsume
@@ -80381,8 +81773,8 @@ rep.mj:016175
     :eq rep.gt:23825              ; # &I-GT-23825;
     :eq rep.gt-pj-1:17269         ; # &I-GT-23825;
     :eq rep.jef-china3:0x70D5     ; # &I-JC3-70D5;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016176        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016176        ] ;
     :subsume
         g2.mj:016175         ;
     .
@@ -80548,7 +81940,7 @@ rep.mj:016177
     :eq rep.daikanwa:18671        ; # &I-M-18671;
     :eq rep.shinjigen_1ed:4409    ; # &MJ016177;
     :eq rep.shinjigen_rev:4411    ; # &MJ016177;
-    :from.interchangeable rep.daikanwa:17463   ;
+    ideo:interchangeable-form-of rep.daikanwa:17463   ;
     :subsume
         a.jis-x0208:0x426D   ,
         rep.mj:016178        ;
@@ -80931,8 +82323,8 @@ a.ucs:0x702C
     :eq rep.gt:23931              ; # &I-GT-23931;
     :eq rep.gt-pj-1:16421         ; # &I-GT-23931;
     :eq rep.daikanwa...._.p:18672 ; # 瀬
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-2:08534 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-2:08534 ] ;
     .
     rep.adobe-japan1-0:02633
                :abstract-glyph-of adobe-japan1-0:02633   .
@@ -81048,6 +82440,54 @@ a.ucs:0x702B
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
+a.ucs:0x240E3
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x240E3 ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          16 ;
+    ideo:total-strokes    19 ;
+    :eq rep.cns11643-7:0x4758     ; # &I-C7-4758;
+    :eq rep.daikanwa:18680        ; # &I-M-18680;
+    ideo:wrong-form-of   [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  rep.mj:016176        ] ;
+    :subsume
+        g2.ucs_iso:0x240E3   ,
+        g2.cns11643-7:0x4758 ;
+    .
+    rep.cns11643-7:0x4758
+               :abstract-glyph-of     cns11643-7:0x4758  .
+    rep.daikanwa:18680
+               :abstract-glyph-of       daikanwa:18680   .
+    g2.ucs_iso:0x240E3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x240E3 ] ;
+        :eq g2.daikanwa:18680         ; # &g2-M-18680;
+        :subsume
+            repi.daikanwa:18680  ,
+            repi.ucs_iso:0x240E3 ;
+        .
+        g2.daikanwa:18680
+              :abstract-glyph-form-of       daikanwa:18680   .
+        repi.daikanwa:18680
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18680 ;
+            .
+        repi.ucs_iso:0x240E3
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x240E3 ] ;
+            .
+    g2.cns11643-7:0x4758
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x4758 ;
+        :eq g2.ucs_cns:0x240E3        ; # &g2-CU+240E3;
+        .
+        g2.ucs_cns:0x240E3
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x240E3 ] .
+
 a.ucs:0x6FF3
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6FF3 ;
@@ -81143,6 +82583,101 @@ a.ucs:0x6FF3
                               :target     ucs:0x6FF3  ] ;
             .
 
+a.ucs:0x240DA
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x240DA ;
+    ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs-itaiji-001:0x5924   # &A-U-i001+5924;
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "iN" ) ;
+                         ] ;
+    .
+
+rep.mj:039755
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:039755 ;
+    :denotation-of
+        a.ucs:0x240DA        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          16 ;
+    ideo:total-strokes    19 ;
+    :eq rep.koseki:210520         ; # &MJ039755;
+    :eq rep.daikanwa:18685        ; # &I-M-18685;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x6FE5         ] ;
+    :subsume
+        g2.mj:039755         ;
+    .
+    rep.koseki:210520
+               :abstract-glyph-of         koseki:210520  .
+    rep.daikanwa:18685
+               :abstract-glyph-of       daikanwa:18685   .
+    g2.mj:039755
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:039755 ;
+        :eq g2.koseki:210520          ; # &g2-MJ039755;
+        :eq g2.daikanwa:18685         ; # &g2-MJ039755;
+        :subsume
+            repi.daikanwa:18685  ,
+            repi.mj:039755       ;
+        .
+        g2.koseki:210520
+              :abstract-glyph-form-of         koseki:210520  .
+        g2.daikanwa:18685
+              :abstract-glyph-form-of       daikanwa:18685   .
+        repi.daikanwa:18685
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18685 ;
+            .
+        repi.mj:039755
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:039755 ;
+            .
+
+rep.ucs_iso:0x240DA
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x240DA ] ;
+    :denotation-of
+        a.ucs:0x240DA        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          16 ;
+    ideo:total-strokes    19 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-itaiji-001:0x5924   # &U-i001+5924;
+    ] ;
+    :eq rep.cns11643-7:0x4763     ; # &C7-4763;
+    :subsume
+        g2.ucs_iso:0x240DA   ;
+    .
+    rep.cns11643-7:0x4763
+               :abstract-glyph-of     cns11643-7:0x4763  .
+    g2.ucs_iso:0x240DA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x240DA ] ;
+        :eq g2.cns11643-7:0x4763      ; # &g2-IU-000240DA;
+        :subsume
+            repi.cns11643-7:0x4763 ,
+            repi.ucs_iso:0x240DA ;
+        .
+        g2.cns11643-7:0x4763
+              :abstract-glyph-form-of     cns11643-7:0x4763  .
+        repi.cns11643-7:0x4763
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x4763 ;
+            .
+        repi.ucs_iso:0x240DA
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x240DA ] ;
+            .
+
 a.ucs:0x240D8
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x240D8 ;
@@ -81466,38 +83001,50 @@ a.ucs:0x240CA
     rep.cns11643-7:0x4761
                :abstract-glyph-of     cns11643-7:0x4761  .
 
-a.ucs:0x240D5
+a.ucs:0x240D2
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x240D5 ;
+    :abstract-character-of ucs:0x240D2 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          16 ;
     ideo:total-strokes    19 ;
-    :eq rep.cns11643-7:0x4757     ; # &I-C7-4757;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x271E9   # 𧇩
+    ] ;
     .
-    rep.cns11643-7:0x4757
-               :abstract-glyph-of     cns11643-7:0x4757  .
 
-a.ucs:0x240DA
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x240DA ;
+rep.ucs_iso:0x240D2
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x240D2 ] ;
+    :denotation-of
+        a.ucs:0x240D2        ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          16 ;
     ideo:total-strokes    19 ;
-    :eq rep.cns11643-7:0x4763     ; # &I-C7-4763;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-var-001:0x271E9   # &U-v001+271E9;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x240D2   ;
     .
-    rep.cns11643-7:0x4763
-               :abstract-glyph-of     cns11643-7:0x4763  .
+    g2.ucs_iso:0x240D2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x240D2 ] ;
+        .
 
-a.ucs:0x240E3
+a.ucs:0x240D5
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x240E3 ;
+    :abstract-character-of ucs:0x240D5 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          16 ;
     ideo:total-strokes    19 ;
-    :eq rep.cns11643-7:0x4758     ; # &I-C7-4758;
+    :eq rep.cns11643-7:0x4757     ; # &I-C7-4757;
     .
-    rep.cns11643-7:0x4758
-               :abstract-glyph-of     cns11643-7:0x4758  .
+    rep.cns11643-7:0x4757
+               :abstract-glyph-of     cns11643-7:0x4757  .
 
 a.ucs:0x702F
     a chisegg:abstract-character ;
@@ -83495,13 +85042,85 @@ a.ucs:0x24111
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          18 ;
     ideo:total-strokes    21 ;
-    :eq rep.cns11643-5:0x703F     ; # &I-C5-703F;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x23014   # 𣀔
+    ] ;
+    .
+
+rep.cns11643-5:0x703F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-5:0x703F ;
+    :denotation-of
+        a.ucs:0x24111        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          18 ;
+    ideo:total-strokes    21 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs_iso:0x23014   # &C4-5B3B;
+    ] ;
+    :eq rep.ucs_cns:0x24111       ; # &C5-703F;
     :eq rep.daikanwa:18747        ; # &I-M-18747;
+    :subsume
+        g2.cns11643-5:0x703F ;
     .
-    rep.cns11643-5:0x703F
-               :abstract-glyph-of     cns11643-5:0x703F  .
+    rep.ucs_cns:0x24111
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x24111 ] .
     rep.daikanwa:18747
                :abstract-glyph-of       daikanwa:18747   .
+    g2.cns11643-5:0x703F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x703F ;
+        :eq g2.ucs_cns:0x24111        ; # &g2-M-18747;
+        :eq g2.daikanwa:18747         ; # &g2-M-18747;
+        :subsume
+            repi.daikanwa:18747  ,
+            repi.cns11643-5:0x703F ;
+        .
+        g2.ucs_cns:0x24111
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x24111 ] .
+        g2.daikanwa:18747
+              :abstract-glyph-form-of       daikanwa:18747   .
+        repi.daikanwa:18747
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:18747 ;
+            .
+        repi.cns11643-5:0x703F
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x703F ;
+            .
+
+rep.ucs_iso:0x24111
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24111 ] ;
+    :denotation-of
+        a.ucs:0x24111        ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          18 ;
+    ideo:total-strokes    21 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.ucs-itaiji-001:0x23014   # &U-i001+23014;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24111   ;
+    .
+    g2.ucs_iso:0x24111
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24111 ] ;
+        :subsume
+            repi.ucs_iso:0x24111 ;
+        .
+        repi.ucs_iso:0x24111
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24111 ] ;
+            .
 
 a.ucs:0x3D94
     a chisegg:abstract-character ;
@@ -83934,7 +85553,7 @@ a.ucs:0x704B
     :eq rep.daikanwa:18757        ; # &I-M-18757;
     :eq rep.shinjigen:4153        ; # 灋
     :eq rep.cbeta:00402           ; # &I-CB00402;
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6CD5         ] ;
     :subsume
         g2.ucs_unicode:0x704B ;
@@ -84689,7 +86308,7 @@ rep.mj:016224
     ideo:total-strokes    21 ;
     :eq rep.hanyo-denshi...ks:211540 ; # &MJ016224;
     :eq rep.daikanwa:49237        ; # &I-M-49237;
-    :from.wrong          [ :sources chisebib:daikanwa ;
+    ideo:wrong-form-of   [ :sources chisebib:daikanwa ;
                            :target  rep.mj:016223        ] ;
     :subsume
         g2.daikanwa:49237    ,
@@ -84779,7 +86398,7 @@ a.ucs:0x2F916
     :eq rep.ucs_cns:0x2F916       ; # 㶖
     :eq rep.cns11643-7:0x5360     ; # &I-C7-5360;
     :eq rep.daikanwa:49238        ; # &I-M-49238;
-    :from.wrong          [ :sources chisebib:daikanwa ;
+    ideo:wrong-form-of   [ :sources chisebib:daikanwa ;
                            :target  rep.cns11643-4:0x6873 ] ;
     :subsume
         g2.ucs_iso:0x2F916   ,
@@ -85289,6 +86908,10 @@ a.ucs:0x7058
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7058 ;
     ideo:radical          85 ; # ⽔ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x96E3   # 難
+    ] ;
     :eq a.jis-x0208:0x4667        ; # 灘
     :eq a.jis-x0213-1:0x4667      ; # 灘
     .
@@ -85305,6 +86928,10 @@ rep.mj:016238
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          19 ;
     ideo:total-strokes    22 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0xFA68   # 難
+    ] ;
     :eq rep.ucs_unicode:0x7058    ; # &MJ016238;
     :eq rep.jis-x0208_1978:0x4667 ; # &I-J78-4667;
     :eq rep.ks-x1001:0x7728       ; # &I-K0-7728;
@@ -85427,6 +87054,10 @@ rep.mj:016237
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          18 ;
     ideo:total-strokes    21 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-0:03273   # &AJ1-03273;
+    ] ;
     :eq rep.ucs_jis...1990:0x7058 ; # &MJ016237;
     :eq rep.ucs_jis...2000:0x7058 ; # &MJ016237;
     :eq rep.adobe-japan1-0:03263  ; # &I-AJ1-03263;
@@ -85437,8 +87068,8 @@ rep.mj:016237
     :eq rep.gt:24031              ; # &I-GT-24031;
     :eq rep.gt-pj-1:18023         ; # &I-GT-24031;
     :eq rep.jef-china3:0x70D9     ; # &I-JC3-70D9;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:016238        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:016238        ] ;
     :subsume
         g2.mj:016237         ;
     .
@@ -86042,9 +87673,9 @@ a.ucs:0x2414C
     rep.daikanwa:18796
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:18796 ;
-        :from.original       [ :sources chisebib:kangxi ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x6FC3         ] ;
+        ideo:original-form-of [ :sources chisebib:kangxi ,
+                                         chisebib:daikanwa ;
+                                :target  a.ucs:0x6FC3         ] ;
         .
     rep.ucs_iso:0x2414C
         a chisegg:abstract-glyph ;
@@ -86063,9 +87694,9 @@ a.ucs:0x2415B
     ideo:total-strokes    23 ;
     :eq rep.cns11643-7:0x5B6A     ; # &I-C7-5B6A;
     :eq rep.daikanwa:18797        ; # &I-M-18797;
-    :from.original       [ :sources chisebib:zhonghua-dazidian ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x6FC3         ] ;
+    ideo:original-form-of [ :sources chisebib:zhonghua-dazidian ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x6FC3         ] ;
     .
     rep.cns11643-7:0x5B6A
                :abstract-glyph-of     cns11643-7:0x5B6A  .
@@ -86082,9 +87713,9 @@ a.ucs:0x2414D
     :eq rep.daikanwa:18798        ; # &I-M-18798;
     :eq rep.shinjigen_1ed:4431    ; # 𤅍
     :eq rep.shinjigen_rev:4433    ; # 𤅍
-    :from.original       [ :sources chisebib:shinjigen_1ed ,
-                                    chisebib:shinjigen_rev ;
-                           :target  a.ucs:0x6F15         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_1ed ,
+                                     chisebib:shinjigen_rev ;
+                            :target  a.ucs:0x6F15         ] ;
     :subsume
         g2.daikanwa:18798    ,
         g2.ucs_iso:0x2414D   ,
@@ -86179,7 +87810,7 @@ a.ucs:0x2414F
     rep.daikanwa:18801
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:18801 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:49229   ] ;
         .
@@ -86755,7 +88386,7 @@ rep.daikanwa:18821
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          21 ;
     ideo:total-strokes    24 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:18735   ] ;
     .
@@ -87056,8 +88687,8 @@ a.ucs:0x29F2A
             :abstract-glyph-of daikanwa:18827 ;
             ideo:radical          85 ; # ⽔ 
             ideo:strokes          22 ;
-            :from.original       rep.mj:015800        ;
-            :from.same           [ :sources chisebib:guangyun ,
+            ideo:original-form-of rep.mj:015800        ;
+            ideo:same-as         [ :sources chisebib:guangyun ,
                                             chisebib:daikanwa ;
                                    :target  rep.mj:015800        ] ;
             .
@@ -87066,7 +88697,7 @@ a.ucs:0x29F2A
             :abstract-glyph-of daikanwa:46574 ;
             ideo:radical         195 ; # ⿂ 
             ideo:strokes          14 ;
-            :from.same           [ :sources chisebib:shuowen ,
+            ideo:same-as         [ :sources chisebib:shuowen ,
                                             chisebib:jiyun ,
                                             chisebib:daikanwa ;
                                    :target  rep.mj:015800        ,
@@ -87390,7 +89021,7 @@ a.ucs:0x24173
     ideo:total-strokes    26 ;
     :eq rep.cns11643-5:0x7A2A     ; # &I-C5-7A2A;
     :eq rep.daikanwa:18836        ; # &I-M-18836;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-2:0x4B45 ,
                                     a.ucs:0x3CFC         ] ;
@@ -87655,3 +89286,10 @@ a.ucs:0x24180
     rep.daikanwa:18848
                :abstract-glyph-of       daikanwa:18848   .
 
+a.ucs_component:0x6EA5
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x6EA5  ] ;
+    ideo:radical          85 ; # ⽔ 
+    .
+