Sync up with the current environment.
[chise/chiset.git] / Ideograph-R162-Walk.ttl
index f2d5d1d..e709106 100644 (file)
 @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_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 a.ucs_jis: <http://www.chise.org/est/view/character/a.ucs@jis=> .
 @prefix a.ucs_ks: <http://www.chise.org/est/view/character/a.ucs@ks=> .
 @prefix a.ucs_cns: <http://www.chise.org/est/view/character/a.ucs@cns=> .
+@prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
+@prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
 @prefix o.ucs_jis: <http://www.chise.org/est/view/character/o.ucs@jis=> .
 @prefix o.ucs_ks: <http://www.chise.org/est/view/character/o.ucs@ks=> .
 @prefix o.ucs_cns: <http://www.chise.org/est/view/character/o.ucs@cns=> .
@@ -30,6 +33,7 @@
 @prefix rep.ucs_jis...1990: <http://www.chise.org/est/view/character/rep.ucs@jis...1990=> .
 @prefix rep.ucs_jis...2000: <http://www.chise.org/est/view/character/rep.ucs@jis...2000=> .
 @prefix rep.ucs_jis...2004: <http://www.chise.org/est/view/character/rep.ucs@jis...2004=> .
+@prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
 @prefix rep.ucs_big5: <http://www.chise.org/est/view/character/rep.ucs@big5=> .
 @prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
@@ -41,6 +45,7 @@
 @prefix g2.ucs_jis...1990: <http://www.chise.org/est/view/character/g2.ucs@jis...1990=> .
 @prefix g2.ucs_jis...2000: <http://www.chise.org/est/view/character/g2.ucs@jis...2000=> .
 @prefix g2.ucs_jis...2004: <http://www.chise.org/est/view/character/g2.ucs@jis...2004=> .
+@prefix g2.ucs_JP...hanazono: <http://www.chise.org/est/view/character/g2.ucs@JP...hanazono=> .
 @prefix g2.ucs_ks: <http://www.chise.org/est/view/character/g2.ucs@ks=> .
 @prefix repi.ucs_iso: <http://www.chise.org/est/view/character/repi.ucs@iso=> .
 @prefix repi.ucs_unicode: <http://www.chise.org/est/view/character/repi.ucs@unicode=> .
 @prefix a.ruimoku-v6: <http://www.chise.org/est/view/character/a.ruimoku-v6=> .
 @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-bmp-var-008: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-008=> .
+@prefix rep.ucs-var-008: <http://www.chise.org/est/view/character/rep.ucs-var-008=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.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 rep.ucs-itaiji-008: <http://www.chise.org/est/view/character/rep.ucs-itaiji-008=> .
-@prefix rep.ucs-bmp-itaiji-008: <http://www.chise.org/est/view/character/rep.ucs-bmp-itaiji-008=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix ruimoku-v6: <http://rdf.chise.org/data/ccs/ruimoku-v6/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-bmp-var-008: <http://rdf.chise.org/data/ccs/ucs-bmp-var-008/code-point/> .
+@prefix ucs-var-008: <http://rdf.chise.org/data/ccs/ucs-var-008/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/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/> .
 @prefix ucs-itaiji-008: <http://rdf.chise.org/data/ccs/ucs-itaiji-008/code-point/> .
-@prefix ucs-bmp-itaiji-008: <http://rdf.chise.org/data/ccs/ucs-bmp-itaiji-008/code-point/> .
 
 a.ucs:0x8FB5
     a chisegg:abstract-character ;
@@ -300,7 +303,7 @@ a.ucs:0x8FB5
     :eq rep.big5-cdp:0x8A74       ; # &I-CDP-8A74;
     :eq rep.daikanwa:38700        ; # &I-M-38700;
     :eq rep.jef-china3:0x67A4     ; # &I-JC3-67A4;
-    :from.same           [ :sources chisebib:liushuzhengyi ,
+    ideo:same-as         [ :sources chisebib:liushuzhengyi ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2ECD         ] ;
     .
@@ -338,7 +341,7 @@ a.ucs:0x20507
     ideo:hanyu-dazidian  ( 1 242 3 ) ;
     :eq rep.cns11643-6:0x233B     ; # &I-C6-233B;
     :eq rep.daikanwa:38701        ; # &I-M-38701;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:03309 ] ;
     :subsume
@@ -451,8 +454,8 @@ a.ucs:0x2ECE
     :eq rep.ucs_cns:0x8FB6        ; # ⻎
     :eq rep.cns11643-4:0x2154     ; # &I-C4-2154;
     :eq rep.big5-cdp:0x8AF7       ; # &I-CDP-8AF7;
-    :from.simplified     [ :context domain:component ;
-                           :target  a.ucs:0x2ECD         ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x2ECD         ] ;
     .
     rep.ucs_cns:0x8FB6
                :abstract-glyph-of [ :context domain:cns     ;
@@ -481,8 +484,8 @@ a.ucs:0x2ECC
     :eq rep.jis-x0213-2:0x7969    ; # &I-JX2-7969;
     :eq rep.big5-cdp:0x8966       ; # &I-CDP-8966;
     :eq rep.jef-china3:0x67A3     ; # &I-JC3-67A3;
-    :from.simplified     [ :context domain:component ;
-                           :target  a.ucs:0x2ECD         ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x2ECD         ] ;
     :subsume
         a.ucs:0xFA66         ;
     .
@@ -742,7 +745,7 @@ rep.daikanwa:38704
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8ECC         ] ;
     .
@@ -786,7 +789,7 @@ rep.adobe-japan1-6:22659
     :eq rep.ucs_jis:0x8FB8        ; # &AJ1-22659;
     :eq rep.jis-x0212:0x6135      ; # &I-JSP-6135;
     :eq rep.daikanwa:38705        ; # &I-M-38705;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x209DF        ] ;
     :subsume
@@ -889,7 +892,7 @@ rep.daikanwa:38706
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025778        ] ;
     .
@@ -930,7 +933,7 @@ rep.daikanwa:38707
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:44151   ] ;
     .
@@ -969,6 +972,10 @@ a.ucs:0x8FB9
     :abstract-character-of ucs:0x8FB9 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x529B   # 力
+    ] ;
     .
 
 rep.daikanwa:38709
@@ -979,10 +986,20 @@ rep.daikanwa:38709
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
-    :from.vulgar         [ :sources chisebib:songyuanyilai-suzipu ,
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x529B   # 力
+    ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:songyuanyilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026200        ] ;
+    :subsume
+        g2.daikanwa:38709    ;
     .
+    g2.daikanwa:38709
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:38709 ;
+        .
 
 rep.gb2312:0x315F
     a chisegg:abstract-glyph ;
@@ -993,10 +1010,42 @@ rep.gb2312:0x315F
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
     :eq rep.ucs_unicode:0x8FB9    ; # &G0-315F;
+    :rep.ucs_JP...hanazono     rdf:nil ;
+    :eq rep.jef-china3:0x81FC     ; # &I-JC3-81FC;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-4:14237 ] ;
+    :subsume
+        g2.ucs_unicode:0x8FB9 ;
     .
     rep.ucs_unicode:0x8FB9
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x8FB9  ] .
+    rep.jef-china3:0x81FC
+               :abstract-glyph-of     jef-china3:0x81FC  .
+    g2.ucs_unicode:0x8FB9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x8FB9  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        :eq g2.gb2312:0x315F          ; # &g2-UU+8FB9;
+        :eq g2.jef-china3:0x81FC      ; # &g2-UU+8FB9;
+        :subsume
+            repi.ucs_unicode:0x8FB9 ,
+            repi.jef-china3:0x81FC ;
+        .
+        g2.gb2312:0x315F
+              :abstract-glyph-form-of         gb2312:0x315F  .
+        g2.jef-china3:0x81FC
+              :abstract-glyph-form-of     jef-china3:0x81FC  .
+        repi.ucs_unicode:0x8FB9
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x8FB9  ] ;
+            .
+        repi.jef-china3:0x81FC
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x81FC ;
+            .
 
 rep.cns11643-3:0x243B
     a chisegg:abstract-glyph ;
@@ -1006,7 +1055,21 @@ rep.cns11643-3:0x243B
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
+    :eq rep.ucs_cns:0x8FB9        ; # &C3-243B;
+    :subsume
+        g2.cns11643-3:0x243B ;
     .
+    rep.ucs_cns:0x8FB9
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x8FB9  ] .
+    g2.cns11643-3:0x243B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x243B ;
+        :eq g2.ucs_cns:0x8FB9         ; # &g2-CU+8FB9;
+        .
+        g2.ucs_cns:0x8FB9
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x8FB9  ] .
 
 a.ucs:0x8FBA
     a chisegg:abstract-character ;
@@ -1023,9 +1086,9 @@ rep.daikanwa:38710
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           2 ;
     ideo:total-strokes     6 ;
-    :from.simplified     [ :context domain:JP      ;
-                           :sources chisebib:daikanwa ;
-                           :target  rep.mj:026200        ] ;
+    ideo:simplified-form-of [ :context domain:JP      ;
+                              :sources chisebib:daikanwa ;
+                              :target  rep.mj:026200        ] ;
     .
 
 rep.mj:025758
@@ -1045,10 +1108,10 @@ rep.mj:025758
     :eq rep.gt-k:00998            ; # &I-GT-K00998;
     :eq rep.gt-pj-1:19029         ; # &I-GT-51654;
     :eq rep.daikanwa...._.p:38710 ; # &MJ025758;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:JP...Jouyou ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:026200        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:JP...Jouyou ,
+                                       chisebib:daikanwa ;
+                              :target  rep.mj:026200        ] ;
     :subsume
         g2.mj:025758         ;
     .
@@ -1279,8 +1342,8 @@ rep.mj:025760
     :eq rep.hanyo-denshi...ja:0x4454 ; # &I-HD-JA-4454;
     :eq rep.gt:51653              ; # &I-GT-51653;
     :eq rep.gt-pj-1:17492         ; # &I-GT-51653;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025761        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025761        ] ;
     :subsume
         g2.mj:025760         ;
     .
@@ -1559,7 +1622,7 @@ rep.daikanwa:38713
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           3 ;
     ideo:total-strokes     7 ;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x64AB         ] ;
     .
@@ -1601,10 +1664,10 @@ rep.daikanwa:38714
     ideo:strokes           3 ;
     ideo:total-strokes     7 ;
     :eq rep.shinjigen:2359        ; # &M-38714;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  a.ucs:0x5F92         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x5F92         ] ;
     .
     rep.shinjigen:2359
                :abstract-glyph-of      shinjigen:2359    .
@@ -1638,9 +1701,9 @@ a.ucs:0x28461
     ideo:total-strokes    10 ;
     :eq rep.cns11643-6:0x3C4B     ; # &I-C6-3C4B;
     :eq rep.daikanwa:38715        ; # &I-M-38715;
-    :from.original       [ :sources chisebib:zihui-bu ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:38714   ] ;
+    ideo:original-form-of [ :sources chisebib:zihui-bu ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:38714   ] ;
     .
     rep.cns11643-6:0x3C4B
                :abstract-glyph-of     cns11643-6:0x3C4B  .
@@ -1662,7 +1725,7 @@ rep.daikanwa:38716
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           3 ;
     ideo:total-strokes     7 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14076 ] ;
     :subsume
@@ -1714,7 +1777,7 @@ rep.jis-x0212:0x6136
     :eq rep.daikanwa:38717        ; # &I-M-38717;
     :form-of             [ :sources chisebib:shuowen ;
                            :target  rep.adobe-japan1-4:13912 ] ;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:01179   ,
@@ -1920,8 +1983,8 @@ rep.mj:025767
     :eq rep.gt:51679              ; # &I-GT-51679;
     :eq rep.gt-pj-1:17193         ; # &I-GT-51679;
     :eq rep.jef-china3:0x70F6     ; # &I-JC3-70F6;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025768        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025768        ] ;
     :subsume
         g2.mj:025767         ;
     .
@@ -2163,7 +2226,7 @@ rep.jis-x0213-2:0x796C
     :eq rep.ucs_jis:0x8FC1        ; # &JX2-796C;
     :eq rep.jis-x0212:0x6138      ; # &JX2-796C;
     :eq rep.daikanwa:38721        ; # &I-M-38721;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -2266,12 +2329,12 @@ rep.mj:025773
     :eq rep.jis-x0213-1_2004:0x312A ; # &I-JX3-312A;
     :eq rep.hanyo-denshi...ft:0x3158 ; # &I-HD-FT-3158;
     :eq rep.daikanwa:38722        ; # &I-M-38722;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:shuowen-zhu ,
-                                    chisebib:zhonghua-dazidian ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:38723   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:shuowen-zhu ,
+                                     chisebib:zhonghua-dazidian ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:38723   ] ;
     :subsume
         g2.mj:025773         ;
     .
@@ -2390,8 +2453,8 @@ rep.mj:025772
     :eq rep.gt:51658              ; # &I-GT-51658;
     :eq rep.gt-pj-1:12586         ; # &I-GT-51658;
     :eq rep.jef-china3:0x70EE     ; # &I-JC3-70EE;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025773        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025773        ] ;
     :subsume
         g2.mj:025772         ;
     .
@@ -2553,9 +2616,9 @@ rep.daikanwa:38723
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           3 ;
     ideo:total-strokes     7 ;
-    :from.original       [ :sources chisebib:zhonghua-dazidian ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:025773        ] ;
+    ideo:original-form-of [ :sources chisebib:zhonghua-dazidian ,
+                                     chisebib:daikanwa ;
+                            :target  rep.mj:025773        ] ;
     :subsume
         g2.daikanwa:38723    ;
     .
@@ -2714,8 +2777,8 @@ rep.mj:025777
     :eq rep.gt-k:01691            ; # &I-GT-K01691;
     :eq rep.gt-pj-1:19320         ; # &I-GT-51666;
     :eq rep.jef-china3:0x70F4     ; # &I-JC3-70F4;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025778        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025778        ] ;
     :subsume
         g2.mj:025777         ;
     .
@@ -2887,7 +2950,7 @@ rep.daikanwa:38725
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           3 ;
     ideo:total-strokes     7 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F9D7        ] ;
     .
@@ -2926,7 +2989,7 @@ a.ucs:0x28454
     rep.daikanwa:38726
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:38726 ;
-        :from.ancient        [ :sources chisebib:kangxi ,
+        ideo:ancient-form-of [ :sources chisebib:kangxi ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2F9D7        ] ;
         .
@@ -2946,7 +3009,7 @@ a.ucs:0x8FC5
     ideo:strokes           3 ;
     isd:structure [ a idc:⿺ ;
         isd:surround a.ucs:0x8FB6 ; # 辶
-        isd:filling  a.ucs:0x5342   # 卂
+        isd:filling  a.ucs_component:0x5342   # &A-compU+5342;
     ] ;
     :eq a.big5:0xA8B3             ; # &I-B-A8B3;
     .
@@ -2964,7 +3027,7 @@ o.ucs_ks:0x8FC5
     ideo:total-strokes     7 ;
     isd:structure [ a idc:⿺ ;
         isd:surround a.ucs:0x2ECD ; # ⻍
-        isd:filling  a.ucs_iwds-1:0x5342   # &A-IWDSU+5342;
+        isd:filling  a.ucs:0x5342   # 卂
     ] ;
     :eq o.adobe-japan1-4:13862    ; # &o-AJ1-20228;
     :eq o.adobe-japan1-5:20228    ; # &o-AJ1-20228;
@@ -2986,7 +3049,7 @@ o.ucs_ks:0x8FC5
         ] ;
         :eq rep.daikanwa:38727        ; # &I-M-38727;
         :eq rep.jef-china3:0x67A8     ; # &I-JC3-67A8;
-        :from.same           [ :sources chisebib:liezi ,
+        ideo:same-as         [ :sources chisebib:liezi ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-4:13899 ] ;
         :subsume
@@ -3268,7 +3331,7 @@ rep.mj:025782
     :eq rep.hanyo-denshi...jb:0x6139 ; # &I-HD-JB-6139;
     :eq rep.daikanwa:38728        ; # &I-M-38728;
     :eq rep.jef-china3:0x67A9     ; # &I-JC3-67A9;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025826        ] ;
     :subsume
@@ -3485,7 +3548,7 @@ rep.daikanwa:38733
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  rep.adobe-japan1-0:02631   # &AJ1-02631;
     ] ;
-    :from.vulgar         [ :sources chisebib:songyuanyilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuanyilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13669 ] ;
     :subsume
@@ -3509,8 +3572,8 @@ rep.gb2312:0x397D
         isd:filling  rep.adobe-japan1-0:02631   # &AJ1-02631;
     ] ;
     :eq rep.ucs_unicode:0x8FC7    ; # &G0-397D;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x904E ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x904E ] ;
     .
     rep.ucs_unicode:0x8FC7
                :abstract-glyph-of [ :context domain:unicode ;
@@ -3725,7 +3788,7 @@ a.ucs:0x28462
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x4550     ; # &I-C6-4550;
     :eq rep.daikanwa:38734        ; # &I-M-38734;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:011321        ] ;
     .
@@ -3871,7 +3934,7 @@ rep.adobe-japan1-6:22662
     :eq rep.ucs_jis:0x8FCB        ; # &AJ1-22662;
     :eq rep.jis-x0212:0x613B      ; # &I-JSP-613B;
     :eq rep.daikanwa:38737        ; # &I-M-38737;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38955   ] ;
     :subsume
@@ -4081,7 +4144,7 @@ rep.daikanwa:38741
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F90         ] ;
     .
@@ -4293,7 +4356,7 @@ rep.adobe-japan1-5:18762
     :eq rep.jis-x0212:0x613C      ; # &I-JSP-613C;
     :eq rep.jis-x0213-2:0x7970    ; # &I-JX2-7970;
     :eq rep.daikanwa:38747        ; # &I-M-38747;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:03246 ] ;
     :subsume
@@ -4529,7 +4592,7 @@ rep.daikanwa:38749
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x6136 ] ;
     .
@@ -4994,7 +5057,7 @@ rep.daikanwa:38754
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22665 ] ;
     .
@@ -5129,7 +5192,7 @@ rep.jis-x0213-2:0x7971
     :eq rep.ucs_jis:0x8FD3        ; # &JX2-7971;
     :eq rep.jis-x0212:0x613F      ; # &JX2-7971;
     :eq rep.daikanwa:38756        ; # &I-M-38756;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:shangshu ,
                                     chisebib:shangshu-zhuan ,
                                     chisebib:shangshu-caizhuan ,
@@ -5186,8 +5249,8 @@ rep.daikanwa:38757
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
     :eq rep.shinjigen:2361        ; # &M-38757;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:04795 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:04795 ] ;
     .
     rep.shinjigen:2361
                :abstract-glyph-of      shinjigen:2361    .
@@ -5233,7 +5296,7 @@ rep.ks-x1001:0x5A77
     ideo:total-strokes     8 ;
     :eq rep.ucs_ks:0x8FD4         ; # &M-38758;
     :eq rep.daikanwa:38758        ; # &I-M-38758;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x224C9        ] ;
     :subsume
@@ -5438,7 +5501,7 @@ rep.jis-x0213-2:0x7972
     :eq rep.daikanwa:38759        ; # &I-M-38759;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.daikanwa:38894   ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38894   ] ;
     .
@@ -5519,22 +5582,65 @@ a.ucs:0x2847C
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x221B0   # 𢆰
+    ] ;
+    .
+
+rep.daikanwa:38761
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of daikanwa:38761 ;
+    :denotation-of
+        a.ucs:0x2847C        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x221B0   # 𢆰
+    ] ;
     :subsume
-        rep.daikanwa:38761   ,
-        rep.ucs_iso:0x2847C  ;
+        g2.daikanwa:38761    ;
     .
-    rep.daikanwa:38761
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:38761 ;
+    g2.daikanwa:38761
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:38761 ;
         .
-    rep.ucs_iso:0x2847C
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x2847C ] ;
-        :eq rep.cns11643-5:0x276E     ; # &C5-276E;
+
+rep.ucs_iso:0x2847C
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2847C ] ;
+    :denotation-of
+        a.ucs:0x2847C        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x221B0   # 𢆰
+    ] ;
+    :eq rep.cns11643-5:0x276E     ; # &C5-276E;
+    :subsume
+        g2.cns11643-5:0x276E ,
+        g2.ucs_iso:0x2847C   ;
+    .
+    rep.cns11643-5:0x276E
+               :abstract-glyph-of     cns11643-5:0x276E  .
+    g2.cns11643-5:0x276E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x276E ;
+        :eq g2.ucs_cns:0x2847C        ; # &g2-CU+2847C;
+        .
+        g2.ucs_cns:0x2847C
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x2847C ] .
+    g2.ucs_iso:0x2847C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2847C ] ;
         .
-        rep.cns11643-5:0x276E
-                   :abstract-glyph-of     cns11643-5:0x276E  .
 
 rep.daikanwa:38762
     a chisegg:abstract-glyph ;
@@ -5678,7 +5784,7 @@ rep.daikanwa:38765
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4ECE         ] ;
     .
@@ -5757,7 +5863,7 @@ rep.daikanwa:38767
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13862 ] ;
     :subsume
@@ -5804,7 +5910,7 @@ rep.daikanwa:38768
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025778        ] ;
     .
@@ -5848,7 +5954,7 @@ rep.daikanwa:38769
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x6136 ] ;
     .
@@ -5901,7 +6007,7 @@ rep.daikanwa:38770
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  a.ucs:0x6C34   # 水
     ] ;
-    :from.wrong          [ :sources chisebib:zihui-bu ,
+    ideo:wrong-form-of   [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:010768        ] ;
     .
@@ -5980,7 +6086,7 @@ rep.daikanwa:38771
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.vulgar         [ :sources chisebib:pianhai ,
+    ideo:vulgar-form-of  [ :sources chisebib:pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13692 ] ;
     :subsume
@@ -6083,7 +6189,7 @@ rep.daikanwa:38772
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
-    :from.vulgar         [ :sources chisebib:songyuanyilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuanyilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025931        ] ;
     :subsume
@@ -6286,11 +6392,59 @@ a.ucs:0x8FDB
     :abstract-character-of ucs:0x8FDB ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           4 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x4E95   # 井
+    ] ;
+    .
+
+rep.gb2312:0x3D78
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gb2312:0x3D78 ;
+    :denotation-of
+        a.ucs:0x8FDB         ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
     ideo:total-strokes     7 ;
-    :eq rep.gb2312:0x3D78         ; # &I-G0-3D78;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  a.ucs:0x4E95   # 井
+    ] ;
+    :eq rep.ucs_unicode:0x8FDB    ; # &G0-3D78;
+    :eq rep.jef-china3:0x81D3     ; # &I-JC3-81D3;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:025979        ] ;
+    :subsume
+        g2.ucs_unicode:0x8FDB ;
     .
-    rep.gb2312:0x3D78
-               :abstract-glyph-of         gb2312:0x3D78  .
+    rep.ucs_unicode:0x8FDB
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x8FDB  ] .
+    rep.jef-china3:0x81D3
+               :abstract-glyph-of     jef-china3:0x81D3  .
+    g2.ucs_unicode:0x8FDB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x8FDB  ] ;
+        :eq g2.gb2312:0x3D78          ; # &g2-UU+8FDB;
+        :eq g2.jef-china3:0x81D3      ; # &g2-UU+8FDB;
+        :subsume
+            repi.ucs_unicode:0x8FDB ,
+            repi.jef-china3:0x81D3 ;
+        .
+        g2.gb2312:0x3D78
+              :abstract-glyph-form-of         gb2312:0x3D78  .
+        g2.jef-china3:0x81D3
+              :abstract-glyph-form-of     jef-china3:0x81D3  .
+        repi.ucs_unicode:0x8FDB
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x8FDB  ] ;
+            .
+        repi.jef-china3:0x81D3
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x81D3 ;
+            .
 
 a.ucs:0x8FDC
     a chisegg:abstract-character ;
@@ -6412,6 +6566,89 @@ rep.adobe-japan1-5:18760
                                         a.ucs:0xE0100        ] ;
         .
 
+a.ucs:0x28473
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28473 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs_component:0x2123C   # &A-compU+2123C;
+    ] ;
+    .
+
+rep.ucs_iso:0x28473
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28473 ] ;
+    :denotation-of
+        a.ucs:0x28473        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x2123C   # 𡈼
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28473   ;
+    .
+    g2.ucs_iso:0x28473
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28473 ] ;
+        .
+
+a.ucs:0x2E785
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E785 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x27607   # 𧘇
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "eN" ) ;
+                         ] ;
+    .
+
+rep.mj:058844
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:058844 ;
+    :denotation-of
+        a.ucs:0x2E785        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.big5-cdp:0x8C66   # &CDP-8C66;
+    ] ;
+    :eq rep.ucs_JP...hanazono:0x2E785 ; # &MJ058844;
+    :eq rep.koseki:438260         ; # &MJ058844;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.adobe-japan1-4:13654 ] ;
+    :subsume
+        g2.mj:058844         ;
+    .
+    rep.ucs_JP...hanazono:0x2E785
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x2E785 ] .
+    rep.koseki:438260
+               :abstract-glyph-of         koseki:438260  .
+    g2.mj:058844
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:058844 ;
+        :eq g2.ucs_JP...hanazono:0x2E785 ; # &g2-MJ058844;
+        :eq g2.koseki:438260          ; # &g2-MJ058844;
+        .
+        g2.ucs_JP...hanazono:0x2E785
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2E785 ] .
+        g2.koseki:438260
+              :abstract-glyph-form-of         koseki:438260  .
+
 a.ucs:0x28483
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x28483 ;
@@ -6513,7 +6750,7 @@ rep.daikanwa:38776
     :form-of             [ :sources chisebib:jiyun ,
                                     chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x5F82         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F82         ] ;
     .
@@ -6566,7 +6803,7 @@ rep.mj:025818
     :eq rep.jis-x0213-2:0x7973    ; # &I-JX2-7973;
     :eq rep.hanyo-denshi...jb:0x6141 ; # &I-HD-JB-6141;
     :eq rep.daikanwa:38777        ; # &I-M-38777;
-    :from.wrong          [ :context domain:JP      ;
+    ideo:wrong-form-of   [ :context domain:JP      ;
                            :sources chisebib:daikanwa ;
                            :target  rep.mj:025778        ] ;
     :subsume
@@ -6736,7 +6973,7 @@ rep.daikanwa:38778
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026127        ] ;
     .
@@ -6873,7 +7110,7 @@ rep.mj:025822
     :eq rep.gt-pj-1:28011         ; # &I-GT-51909;
     :eq rep.daikanwa:38781        ; # &I-M-38781;
     :eq rep.shinjigen:8243        ; # &MJ025822;
-    :from.same           [ :sources chisebib:shuowen-xinfukao ,
+    ideo:same-as         [ :sources chisebib:shuowen-xinfukao ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8D85         ] ;
     :subsume
@@ -7101,10 +7338,10 @@ rep.adobe-japan1-6:22665
     :eq rep.ucs_jis:0x8FE3        ; # &AJ1-22665;
     :eq rep.jis-x0212:0x6142      ; # &I-JSP-6142;
     :eq rep.daikanwa:38783        ; # &I-M-38783;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22666 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8DC7         ] ;
     :subsume
@@ -7185,7 +7422,7 @@ rep.daikanwa:38784
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026127        ] ;
     .
@@ -7236,7 +7473,7 @@ rep.mj:025826
     :eq rep.daikanwa:38785        ; # &I-M-38785;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.adobe-japan1-5:18765 ] ;
-    :from.same           [ :context domain:p3      ;
+    ideo:same-as         [ :context domain:p3      ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:18765 ] ;
@@ -7545,7 +7782,7 @@ rep.daikanwa:38787
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026017        ] ;
     .
@@ -7632,7 +7869,7 @@ rep.mj:025830
     :eq rep.daikanwa:38789        ; # &I-M-38789;
     :form-of             rep.daikanwa:38987   ,
                          rep.adobe-japan1-0:06925 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38987   ] ;
     :subsume
@@ -7757,8 +7994,8 @@ rep.mj:025829
     :eq rep.gt-k:03654            ; # &I-GT-K03654;
     :eq rep.gt-pj-1:12896         ; # &I-GT-51758;
     :eq rep.jef-china3:0x70EF     ; # &I-JC3-70EF;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025830        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025830        ] ;
     :subsume
         g2.mj:025829         ;
     .
@@ -7929,7 +8166,7 @@ rep.daikanwa:38790
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9673         ] ;
     .
@@ -8141,7 +8378,7 @@ rep.daikanwa:38793
         isd:filling  a.ucs:0x5C14   # 尔
     ] ;
     :form-of             rep.mj:026186        ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026186        ] ;
     :subsume
@@ -8953,7 +9190,7 @@ rep.daikanwa:38798
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22665 ] ;
     .
@@ -8994,7 +9231,7 @@ rep.daikanwa:38799
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F80         ] ;
     .
@@ -9237,7 +9474,7 @@ rep.mj:025847
     :eq rep.jis-x0213-1:0x7C56    ; # &I-JX1-7C56;
     :eq rep.hanyo-denshi...jb:0x6145 ; # &I-HD-JB-6145;
     :eq rep.daikanwa:38801        ; # &I-M-38801;
-    :from.vulgar         [ :sources chisebib:shuowen-tongxundingsheng ,
+    ideo:vulgar-form-of  [ :sources chisebib:shuowen-tongxundingsheng ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A84         ] ;
     :subsume
@@ -9350,7 +9587,7 @@ rep.mj:025848
     :eq rep.gt-pj-1:28013         ; # &I-GT-51920;
     :eq rep.daikanwa:38802        ; # &I-M-38802;
     :eq rep.shinjigen:8263        ; # &MJ025848;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ;
                            :target  rep.adobe-japan1-4:13959 ] ;
@@ -9528,7 +9765,7 @@ rep.adobe-japan1-4:13822
     :eq rep.ks-x1001:0x627B       ; # &I-K0-627B;
     :eq rep.daikanwa:38803        ; # &I-M-38803;
     :eq rep.jef-china3:0x67B7     ; # &I-JC3-67B7;
-    :from.ancient        [ :sources chisebib:erya ,
+    ideo:ancient-form-of [ :sources chisebib:erya ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:19893 ] ;
     :subsume
@@ -9863,7 +10100,7 @@ rep.daikanwa:38805
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026022        ] ;
     .
@@ -9904,7 +10141,7 @@ rep.daikanwa:38806
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025866        ] ;
     .
@@ -10026,7 +10263,7 @@ rep.daikanwa:38809
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x27EBC        ] ;
     .
@@ -10067,7 +10304,7 @@ rep.daikanwa:38810
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38776   ] ;
     .
@@ -10145,7 +10382,7 @@ rep.daikanwa:38813
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38745   ] ;
     .
@@ -10238,6 +10475,10 @@ a.ucs:0x28491
     :abstract-character-of ucs:0x28491 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x5DE8   # 巨
+    ] ;
     .
 
 a.mj:050826
@@ -10248,6 +10489,10 @@ a.mj:050826
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x5DE8   # 巨
+    ] ;
     :subsume
         rep.mj:050826        ,
         rep.hanziku-10:0xC255 ;
@@ -10255,6 +10500,10 @@ a.mj:050826
     rep.mj:050826
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:050826 ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround a.ucs:0x2ECD ; # ⻍
+            isd:filling  rep.mj:010776   # &MJ010776;
+        ] ;
         :eq rep.koseki:439260         ; # &MJ050826;
         :eq rep.daikanwa:38816        ; # &I-M-38816;
         :subsume
@@ -10288,6 +10537,10 @@ a.mj:050826
     rep.hanziku-10:0xC255
         a chisegg:abstract-glyph ;
         :abstract-glyph-of hanziku-10:0xC255 ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround a.ucs:0x2ECD ; # ⻍
+            isd:filling  rep.mj:010777   # &MJ010777;
+        ] ;
         .
 
 rep.ucs_iso:0x28491
@@ -10299,6 +10552,10 @@ rep.ucs_iso:0x28491
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.mj:010777   # &MJ010777;
+    ] ;
     :subsume
         g2.ucs_iso:0x28491   ;
     .
@@ -10365,7 +10622,7 @@ rep.shinjigen:2338
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  a.ucs:0x5723   # 圣
     ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5F91         ] ;
     :subsume
         g2.shinjigen:2338    ;
@@ -10397,6 +10654,53 @@ rep.gb2312:0x6549
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x8FF3  ] .
 
+a.ucs:0x2B423
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2B423 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           5 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x4E19   # 丙
+    ] ;
+    .
+
+rep.ucs-var-002:0x2B423
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x2B423 ;
+    :denotation-of
+        a.ucs:0x2B423        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.mj:006327   # &MJ006327;
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x2B423
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2B423 ] ;
+    :denotation-of
+        a.ucs:0x2B423        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.mj:006327   # &MJ006327;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2B423 ;
+    .
+    g2.ucs_JP...hanazono:0x2B423
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2B423 ] ;
+        .
+
 a.ucs:0x284A5
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x284A5 ;
@@ -10413,7 +10717,7 @@ rep.daikanwa:38817
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:011302        ] ;
     .
@@ -10923,7 +11227,7 @@ rep.daikanwa:38824
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22665 ] ;
     .
@@ -11231,9 +11535,9 @@ rep.mj:025866
     :eq rep.gt-pj-1:28017         ; # &I-GT-51996;
     :eq rep.daikanwa:38827        ; # &I-M-38827;
     :eq rep.shinjigen:8003        ; # &MJ025866;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x8DE1         ] ;
-    :from.same           [ :sources chisebib:maoshi ,
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x8DE1         ] ;
+    ideo:same-as         [ :sources chisebib:maoshi ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8DE1         ] ;
     :subsume
@@ -11459,10 +11763,10 @@ rep.daikanwa:38828
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025866        ] ;
-    :to.mistakable       [ :sources chisebib:zihui ,
+    ideo:mistakable      [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13899 ] ;
     .
@@ -11866,7 +12170,7 @@ rep.daikanwa:38834
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8D8C         ] ;
     .
@@ -11944,7 +12248,7 @@ rep.adobe-japan1-4:13938
     :eq rep.ks-x1001:0x755A       ; # &I-K0-755A;
     :eq rep.daikanwa:38836        ; # &I-M-38836;
     :eq rep.jef-china3:0x67BA     ; # &I-JC3-67BA;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:027689        ] ;
     :subsume
@@ -12301,7 +12605,7 @@ rep.adobe-japan1-4:13905
     :eq rep.ks-x1001:0x775C       ; # &I-K0-775C;
     :eq rep.daikanwa:38839        ; # &I-M-38839;
     :eq rep.jef-china3:0x67BB     ; # &I-JC3-67BB;
-    :from.same           [ :context domain:p2      ;
+    ideo:same-as         [ :context domain:p2      ;
                            :sources chisebib:zhengzitong ,
                                     chisebib:daojing ,
                                     chisebib:daikanwa ;
@@ -13380,7 +13684,7 @@ rep.daikanwa:38846
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13959 ] ;
     :subsume
@@ -13433,7 +13737,7 @@ rep.jis-x0212:0x614C
     :eq rep.ucs_jis:0x9004        ; # &JSP-614C;
     :eq rep.ucs_ks:0x9004         ; # &JSP-614C;
     :eq rep.daikanwa:38847        ; # &I-M-38847;
-    :to.mistakable       [ :sources chisebib:zihui ,
+    ideo:mistakable      [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025952        ] ;
     :subsume
@@ -13564,7 +13868,7 @@ rep.mj:025890
     :eq rep.daikanwa:38848        ; # &I-M-38848;
     :eq rep.shinjigen_1ed:8360    ; # &MJ025890;
     :eq rep.shinjigen_rev:8361    ; # &MJ025890;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ,
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ,
                                     chisebib:shinjigen_rev ;
                            :target  rep.adobe-japan1-0:07873 ] ;
     :subsume
@@ -14030,7 +14334,7 @@ rep.daikanwa:38850
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:011539        ] ;
     .
@@ -14071,7 +14375,7 @@ rep.daikanwa:38851
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x5F50 ] ;
     .
@@ -14112,7 +14416,7 @@ rep.daikanwa:38852
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6E38         ] ;
     :subsume
@@ -14188,7 +14492,7 @@ rep.daikanwa:38853
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  a.ucs:0x8278   # 艸
     ] ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  rep.ks-x1001:0x7063  ] ;
@@ -14255,27 +14559,75 @@ a.ucs:0x284BE
     :abstract-character-of ucs:0x284BE ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  rep.gt-k:02281   # &GT-K02281;
+    ] ;
+    .
+
+rep.daikanwa:38854
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of daikanwa:38854 ;
+    :denotation-of
+        a.ucs:0x284BE        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.gt-k:02281   # &GT-K02281;
+    ] ;
+    .
+
+rep.ucs_iso:0x284BE
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x284BE ] ;
+    :denotation-of
+        a.ucs:0x284BE        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.gt-k:02281   # &GT-K02281;
+    ] ;
     :subsume
-        rep.daikanwa:38854   ,
-        rep.cns11643-5:0x3058 ,
-        rep.ucs_iso:0x284BE  ;
+        g2.ucs_iso:0x284BE   ;
     .
-    rep.daikanwa:38854
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:38854 ;
-        ideo:total-strokes    10 ;
-        .
-    rep.cns11643-5:0x3058
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-5:0x3058 ;
-        ideo:total-strokes    10 ;
+    g2.ucs_iso:0x284BE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x284BE ] ;
         .
-    rep.ucs_iso:0x284BE
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x284BE ] ;
-        ideo:total-strokes     9 ;
+
+rep.cns11643-5:0x3058
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-5:0x3058 ;
+    :denotation-of
+        a.ucs:0x284BE        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.gt-k:02281   # &GT-K02281;
+    ] ;
+    :eq rep.ucs_cns:0x284BE       ; # &C5-3058;
+    :subsume
+        g2.cns11643-5:0x3058 ;
+    .
+    rep.ucs_cns:0x284BE
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x284BE ] .
+    g2.cns11643-5:0x3058
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x3058 ;
+        :eq g2.ucs_cns:0x284BE        ; # &g2-CU+284BE;
         .
+        g2.ucs_cns:0x284BE
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x284BE ] .
 
 a.ucs:0x284BF
     a chisegg:abstract-character ;
@@ -14292,7 +14644,7 @@ rep.daikanwa:38855
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -14372,7 +14724,7 @@ rep.daikanwa:38857
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.gt:11748         ] ;
     .
@@ -14403,6 +14755,10 @@ a.ucs:0x284C1
     :abstract-character-of ucs:0x284C1 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x221B6   # 𢆶
+    ] ;
     .
 
 rep.daikanwa:38858
@@ -14413,7 +14769,11 @@ rep.daikanwa:38858
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x221B6   # 𢆶
+    ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39055   ] ;
     .
@@ -14427,7 +14787,18 @@ rep.ucs_iso:0x284C1
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  a.ucs:0x221B6   # 𢆶
+    ] ;
+    :subsume
+        g2.ucs_iso:0x284C1   ;
     .
+    g2.ucs_iso:0x284C1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x284C1 ] ;
+        .
 
 rep.cns11643-5:0x305C
     a chisegg:abstract-glyph ;
@@ -14437,7 +14808,25 @@ rep.cns11643-5:0x305C
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x221B6   # 𢆶
+    ] ;
+    :eq rep.ucs_cns:0x284C1       ; # &C5-305C;
+    :subsume
+        g2.cns11643-5:0x305C ;
     .
+    rep.ucs_cns:0x284C1
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x284C1 ] .
+    g2.cns11643-5:0x305C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x305C ;
+        :eq g2.ucs_cns:0x284C1        ; # &g2-CU+284C1;
+        .
+        g2.ucs_cns:0x284C1
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x284C1 ] .
 
 a.ucs:0x284C2
     a chisegg:abstract-character ;
@@ -14534,7 +14923,7 @@ rep.daikanwa:38861
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:kangxi ,
+    ideo:same-as         [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22665 ] ;
     .
@@ -14575,7 +14964,7 @@ rep.daikanwa:38862
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5352         ] ;
     .
@@ -14624,7 +15013,7 @@ rep.daikanwa:38863
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  a.ucs:0x6731   # 朱
     ] ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.ks-x1001:0x5A3B  ] ;
     :subsume
@@ -14715,7 +15104,7 @@ rep.adobe-japan1-0:06909
     :eq rep.gt-pj-1:28030         ; # &I-GT-52041;
     :eq rep.daikanwa:38867        ; # &I-M-38867;
     :eq rep.shinjigen:8312        ; # &AJ1-06909;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-4:15190 ] ;
@@ -14837,7 +15226,7 @@ rep.mj:025894
     :eq rep.hanyo-denshi...jb:0x614D ; # &I-HD-JB-614D;
     :eq rep.daikanwa:38868        ; # &I-M-38868;
     :eq rep.jef-china3:0x67C0     ; # &I-JC3-67C0;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025828        ] ;
     :subsume
@@ -15043,7 +15432,7 @@ rep.daikanwa:38869
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7683         ] ;
     .
@@ -15272,7 +15661,7 @@ rep.mj:025900
     :eq rep.jis-x0213-2:0x7978    ; # &I-JX2-7978;
     :eq rep.hanyo-denshi...jb:0x614E ; # &I-HD-JB-614E;
     :eq rep.daikanwa:38872        ; # &I-M-38872;
-    :from.ancient        [ :context domain:s3      ;
+    ideo:ancient-form-of [ :context domain:s3      ;
                            :sources chisebib:zihui-bu ,
                                     chisebib:liuxiang-xinxu ,
                                     chisebib:daikanwa ;
@@ -15648,11 +16037,11 @@ rep.mj:025905
     :eq rep.gt-pj-1:28197         ; # &I-GT-52098;
     :eq rep.daikanwa:38874        ; # &I-M-38874;
     :eq rep.shinjigen:8327        ; # &MJ025905;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026053        ] ;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.mj:026053        ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.mj:026053        ] ;
     :subsume
         g2.adobe-japan1-4:13608 ,
         g2.mj:025905         ;
@@ -16020,7 +16409,7 @@ rep.ks-x1001:0x756F
     ideo:total-strokes    11 ;
     :eq rep.ucs_ks:0x9010         ; # &M-38877;
     :eq rep.daikanwa:38877        ; # &I-M-38877;
-    :from.same           [ :sources chisebib:shuowen-tongxundingsheng ,
+    ideo:same-as         [ :sources chisebib:shuowen-tongxundingsheng ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0213-1:0x7E51 ] ;
     :subsume
@@ -16229,13 +16618,13 @@ rep.mj:025914
     :eq rep.gt-pj-1:28019         ; # &I-GT-52080;
     :eq rep.daikanwa:38878        ; # &I-M-38878;
     :eq rep.shinjigen:8267        ; # &MJ025914;
-    :from.interchangeable [ :sources chisebib:shuowen ,
-                                     chisebib:shuowen-zhu ,
-                                     chisebib:shuowen-tongxundingsheng ,
-                                     chisebib:maoshi ,
-                                     chisebib:maoshi-zhuan ,
-                                     chisebib:daikanwa ;
-                            :target  a.ucs:0x4EC7         ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:shuowen ,
+                                            chisebib:shuowen-zhu ,
+                                            chisebib:shuowen-tongxundingsheng ,
+                                            chisebib:maoshi ,
+                                            chisebib:maoshi-zhuan ,
+                                            chisebib:daikanwa ;
+                                   :target  a.ucs:0x4EC7         ] ;
     :subsume
         g2.mj:025914         ,
         g2.ks-x1001:0x4F47   ,
@@ -16424,7 +16813,7 @@ rep.daikanwa:38879
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22664 ] ;
     :subsume
@@ -16486,7 +16875,7 @@ rep.daikanwa:38880
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026083        ] ;
     .
@@ -16530,7 +16919,7 @@ rep.daikanwa:38881
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026083        ] ;
     .
@@ -16561,8 +16950,8 @@ rep.mj:025917
     :eq rep.gt:52016              ; # &I-GT-52016;
     :eq rep.gt-pj-1:17534         ; # &I-GT-52016;
     :eq rep.daikanwa...._.p:38881 ; # &MJ025917;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:026083        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:026083        ] ;
     :subsume
         g2.mj:025917         ;
     .
@@ -16891,7 +17280,7 @@ rep.mj:025922
     :eq rep.shinjigen:2337        ; # &MJ025922;
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5F91         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F91         ] ;
     :subsume
@@ -17126,9 +17515,9 @@ rep.daikanwa:38885
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:025883        ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.mj:025883        ] ;
     .
 
 rep.ucs_iso:0x284C8
@@ -17431,8 +17820,8 @@ rep.mj:025926
     :eq rep.gt:51992              ; # &I-GT-51992;
     :eq rep.gt-pj-1:16224         ; # &I-GT-51992;
     :eq rep.jef-china3:0x70F0     ; # &I-JC3-70F0;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025927        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025927        ] ;
     :subsume
         g2.mj:025926         ;
     .
@@ -17589,7 +17978,7 @@ rep.adobe-japan1-6:22667
     :eq rep.jis-x0212:0x614F      ; # &I-JSP-614F;
     :eq rep.daikanwa:38888        ; # &I-M-38888;
     :eq rep.jef-china3:0x67C5     ; # &I-JC3-67C5;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7AE2         ] ;
     :subsume
@@ -17851,8 +18240,8 @@ rep.mj:025930
     :eq rep.gt-k:06528            ; # &I-GT-K06528;
     :eq rep.gt-pj-1:18279         ; # &I-GT-51972;
     :eq rep.jef-china3:0x70F2     ; # &I-JC3-70F2;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025931        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025931        ] ;
     :subsume
         g2.mj:025930         ,
         g2.ucs_unicode:0x9019 ;
@@ -18342,7 +18731,7 @@ rep.jis-x0212:0x6150
     :eq rep.daikanwa:38893        ; # &I-M-38893;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.adobe-japan1-6:22662 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22662 ] ;
     .
@@ -18395,7 +18784,7 @@ rep.daikanwa:38894
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:erya ,
+    ideo:same-as         [ :sources chisebib:erya ,
                                     chisebib:erya-guopu-zhu ,
                                     chisebib:guangyun ,
                                     chisebib:zhengzitong ,
@@ -18762,7 +19151,7 @@ o.ucs_ks:0x901E
         :eq rep.ks-x1001:0x5641       ; # &I-K0-5641;
         :eq rep.hanyo-denshi...ib:0x2422 ; # &I-HD-IB-2422;
         :eq rep.daikanwa:38896        ; # &I-M-38896;
-        :from.original       rep.mj:008132        ;
+        ideo:original-form-of rep.mj:008132        ;
         :subsume
             g2.mj:025940         ,
             g2.ks-x1001:0x5641   ;
@@ -19597,7 +19986,7 @@ rep.daikanwa:38899
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:zhanguoce ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:03113   ] ;
@@ -19834,7 +20223,7 @@ rep.daikanwa:38900
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:014032        ] ;
     .
@@ -20047,8 +20436,8 @@ rep.mj:025951
     :eq rep.gt:52042              ; # &I-GT-52042;
     :eq rep.gt-k:06727            ; # &I-GT-K06727;
     :eq rep.gt-pj-1:12329         ; # &I-GT-52042;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:025952        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:025952        ] ;
     :subsume
         g2.adobe-japan1-4:13408 ,
         g2.ucs_unicode:0x9022 ,
@@ -20533,7 +20922,7 @@ rep.daikanwa:38905
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
     :eq rep.shinjigen:8238        ; # &M-38905;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:025828        ] ;
@@ -20609,7 +20998,7 @@ rep.daikanwa:38906
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.ancient        [ :sources chisebib:kangxi ,
+    ideo:ancient-form-of [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14076 ] ;
     :subsume
@@ -20713,7 +21102,7 @@ rep.daikanwa:38910
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026074        ] ;
     .
@@ -20822,7 +21211,7 @@ rep.daikanwa:38913
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:pianhai-leibian ,
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025900        ] ;
     .
@@ -20863,7 +21252,7 @@ rep.daikanwa:38914
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13939 ] ;
     :subsume
@@ -20910,7 +21299,7 @@ rep.daikanwa:38915
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38881   ] ;
     .
@@ -20951,7 +21340,7 @@ rep.daikanwa:38916
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:xiyun ,
+    ideo:same-as         [ :sources chisebib:xiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13959 ] ;
     :subsume
@@ -20998,7 +21387,7 @@ rep.daikanwa:38917
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.same           [ :sources chisebib:sauzhenyujing ,
+    ideo:same-as         [ :sources chisebib:sauzhenyujing ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38890   ] ;
     .
@@ -21039,7 +21428,7 @@ rep.daikanwa:38918
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
-    :from.wrong          [ :sources chisebib:zihui-bu ,
+    ideo:wrong-form-of   [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025900        ] ;
     .
@@ -21070,6 +21459,10 @@ a.ucs:0x284EB
     :abstract-character-of ucs:0x284EB ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x233CB   # 𣏋
+    ] ;
     .
 
 rep.daikanwa:38921
@@ -21080,28 +21473,61 @@ rep.daikanwa:38921
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.ucs_iso:0x233CB   # &C5-2446;
+    ] ;
     .
 
-rep.ucs_iso:0x284EB
+rep.cns11643-6:0x4551
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of [ :context domain:iso     ;
-                         :target     ucs:0x284EB ] ;
+    :abstract-glyph-of cns11643-6:0x4551 ;
     :denotation-of
         a.ucs:0x284EB        ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           7 ;
-    ideo:total-strokes    10 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.ucs_iso:0x233CB   # &C5-2446;
+    ] ;
+    :eq rep.ucs_cns:0x284EB       ; # &C6-4551;
+    :subsume
+        g2.cns11643-6:0x4551 ;
     .
+    rep.ucs_cns:0x284EB
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x284EB ] .
+    g2.cns11643-6:0x4551
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x4551 ;
+        :eq g2.ucs_cns:0x284EB        ; # &g2-CU+284EB;
+        .
+        g2.ucs_cns:0x284EB
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x284EB ] .
 
-rep.cns11643-6:0x4551
+rep.ucs_iso:0x284EB
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-6:0x4551 ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x284EB ] ;
     :denotation-of
         a.ucs:0x284EB        ;
     ideo:radical         162 ; # ⾡ 
-    ideo:strokes           7 ;
+    ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.mj:037935   # &MJ037935;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x284EB   ;
     .
+    g2.ucs_iso:0x284EB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x284EB ] ;
+        .
 
 a.ucs:0x9025
     a chisegg:abstract-character ;
@@ -21306,7 +21732,7 @@ rep.adobe-japan1-6:22668
     :eq rep.ucs_jis:0x9028        ; # &AJ1-22668;
     :eq rep.jis-x0212:0x6151      ; # &I-JSP-6151;
     :eq rep.daikanwa:38922        ; # &I-M-38922;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17326 ] ;
     :subsume
@@ -21511,7 +21937,7 @@ rep.jis-x0212:0x6153
     ideo:total-strokes    12 ;
     :eq rep.ucs_jis:0x902F        ; # &JSP-6153;
     :eq rep.daikanwa:38924        ; # &I-M-38924;
-    :from.ancient        [ :context domain:jiyun   ;
+    ideo:ancient-form-of [ :context domain:jiyun   ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13906 ] ;
@@ -21779,7 +22205,7 @@ rep.daikanwa:38927
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026081        ] ;
     .
@@ -21811,6 +22237,10 @@ a.ucs:0x284ED
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x53D6   # 取
+    ] ;
     .
 
 rep.daikanwa:38928
@@ -21832,6 +22262,10 @@ rep.ucs_iso:0x284ED
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x53D6   # 取
+    ] ;
     :eq rep.cns11643-5:0x3C72     ; # &C5-3C72;
     :subsume
         g2.cns11643-5:0x3C72 ,
@@ -21874,7 +22308,7 @@ rep.adobe-japan1-4:15190
     :eq rep.jis-x0212:0x6155      ; # &I-JSP-6155;
     :eq rep.daikanwa:38929        ; # &I-M-38929;
     :eq rep.shinjigen:8311        ; # &AJ1-15190;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F9DC        ] ;
     :subsume
@@ -22129,7 +22563,7 @@ rep.adobe-japan1-4:13906
     :eq rep.ks-x1001:0x7475       ; # &I-K0-7475;
     :eq rep.daikanwa:38931        ; # &I-M-38931;
     :eq rep.jef-china3:0x67CF     ; # &I-JC3-67CF;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025834        ] ;
     :subsume
@@ -22336,7 +22770,7 @@ rep.daikanwa:38932
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13906 ] ;
     .
@@ -22392,7 +22826,7 @@ rep.daikanwa:38933
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14076 ] ;
     :subsume
@@ -22571,7 +23005,7 @@ rep.ks-x1001:0x714E
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
     :eq rep.daikanwa:38937        ; # &I-M-38937;
-    :from.vulgar         [ :sources chisebib:jiyun ,
+    ideo:vulgar-form-of  [ :sources chisebib:jiyun ,
                                     chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F83F        ] ;
@@ -22636,7 +23070,7 @@ rep.daikanwa:38938
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13959 ] ;
     :subsume
@@ -22675,7 +23109,7 @@ rep.daikanwa:38939
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6106         ] ;
     .
@@ -22768,7 +23202,7 @@ rep.daikanwa:38942
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:014849        ] ;
     .
@@ -22824,7 +23258,7 @@ rep.adobe-japan1-4:13855
     :eq rep.ks-x1001:0x7264       ; # &I-K0-7264;
     :eq rep.daikanwa:38943        ; # &I-M-38943;
     :eq rep.jef-china3:0x67D1     ; # &I-JC3-67D1;
-    :from.wrong          [ :sources chisebib:liji ,
+    ideo:wrong-form-of   [ :sources chisebib:liji ,
                                     chisebib:liji-zhu ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x6854 ] ;
@@ -23057,26 +23491,62 @@ a.ucs:0x284F5
     :abstract-character-of ucs:0x284F5 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x2022A   # 𠈪
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "sou" ) ;
+                         ] ;
     .
 
-rep.daikanwa:38944
+rep.mj:050908
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:38944 ;
+    :abstract-glyph-of mj:050908 ;
     :denotation-of
         a.ucs:0x284F5        ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.ucs_iso:0x2022A   # &C5-2524;
+    ] ;
+    :eq rep.koseki:441290         ; # &MJ050908;
+    :eq rep.daikanwa:38944        ; # &I-M-38944;
     :from.Large-Seal     [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13895 ] ;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.adobe-japan1-4:13895 ] ;
     :subsume
-        g2.daikanwa:38944    ;
+        g2.mj:050908         ;
     .
-    g2.daikanwa:38944
+    rep.koseki:441290
+               :abstract-glyph-of         koseki:441290  .
+    rep.daikanwa:38944
+               :abstract-glyph-of       daikanwa:38944   .
+    g2.mj:050908
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of daikanwa:38944 ;
+        :abstract-glyph-form-of mj:050908 ;
+        :eq g2.koseki:441290          ; # &g2-MJ050908;
+        :eq g2.daikanwa:38944         ; # &g2-MJ050908;
+        :subsume
+            repi.daikanwa:38944  ,
+            repi.mj:050908       ;
         .
+        g2.koseki:441290
+              :abstract-glyph-form-of         koseki:441290  .
+        g2.daikanwa:38944
+              :abstract-glyph-form-of       daikanwa:38944   .
+        repi.daikanwa:38944
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:38944 ;
+            .
+        repi.mj:050908
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:050908 ;
+            .
 
 rep.ucs_iso:0x284F5
     a chisegg:abstract-glyph ;
@@ -23087,7 +23557,18 @@ rep.ucs_iso:0x284F5
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.ucs_iso:0x2022A   # &C5-2524;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x284F5   ;
     .
+    g2.ucs_iso:0x284F5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x284F5 ] ;
+        .
 
 rep.cns11643-6:0x4F52
     a chisegg:abstract-glyph ;
@@ -23097,7 +23578,25 @@ rep.cns11643-6:0x4F52
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.ucs_iso:0x2022A   # &C5-2524;
+    ] ;
+    :eq rep.ucs_cns:0x284F5       ; # &C6-4F52;
+    :subsume
+        g2.cns11643-6:0x4F52 ;
     .
+    rep.ucs_cns:0x284F5
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x284F5 ] .
+    g2.cns11643-6:0x4F52
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x4F52 ;
+        :eq g2.ucs_cns:0x284F5        ; # &g2-CU+284F5;
+        .
+        g2.ucs_cns:0x284F5
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x284F5 ] .
 
 a.ucs:0x489D
     a chisegg:abstract-character ;
@@ -23259,7 +23758,7 @@ rep.mj:025985
     :eq rep.gt-pj-1:28028         ; # &I-GT-52206;
     :eq rep.daikanwa:38948        ; # &I-M-38948;
     :eq rep.shinjigen:8303        ; # &MJ025985;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9997         ] ;
     :subsume
@@ -23661,7 +24160,7 @@ rep.adobe-japan1-5:18769
     :eq rep.jis-x0213-2:0x7979    ; # &I-JX2-7979;
     :eq rep.daikanwa:38950        ; # &I-M-38950;
     :eq rep.jef-china3:0x67D4     ; # &I-JC3-67D4;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:erya ,
                                     chisebib:maoshi ,
                                     chisebib:daikanwa ;
@@ -23923,7 +24422,7 @@ repi.hng-kar:13350
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿺ ;
         isd:surround a.ucs:0x2ECE ; # ⻎
-        isd:filling  rep.ucs-bmp-var-008:0x5154   # &U-v008+5154;
+        isd:filling  rep.ucs-var-008:0x5154   # &U-v008+5154;
     ] ;
     .
 
@@ -24046,9 +24545,9 @@ a.ucs:0xFA25
                               :target     ucs:0xFA25  ] ;
             .
 
-a.jis-x0213-1:0x306F
+a.ucs:0x284DC
     a chisegg:abstract-character ;
-    :abstract-character-of jis-x0213-1:0x306F ;
+    :abstract-character-of ucs:0x284DC ;
     :denotation-of
         a.ucs:0x9038         ;
     ideo:radical         162 ; # ⾡ 
@@ -24056,29 +24555,45 @@ a.jis-x0213-1:0x306F
         isd:surround a.ucs:0x8FB6 ; # 辶
         isd:filling  a.ucs:0x514D   # 免
     ] ;
-    :eq a.ucs_jis:0x9038          ; # &A-JX1-306F;
-    :eq a.gt:52065                ; # &A-JX1-306F;
+    :eq a.ucs_jis:0x9038          ; # 𨓜
+    :eq a.jis-x0213-1:0x306F      ; # 𨓜
+    :eq a.gt:52065                ; # 𨓜
     .
     a.ucs_jis:0x9038
            :abstract-character-of [ :context domain:jis     ;
                                     :target     ucs:0x9038  ] .
+    a.jis-x0213-1:0x306F
+           :abstract-character-of    jis-x0213-1:0x306F  .
     a.gt:52065
            :abstract-character-of             gt:52065   .
 
-o.ucs_jis:0x9038
-    a chisegg:unified-glyph ;
-    :unified-glyph-of [ :context domain:jis     ;
-                        :target     ucs:0x9038  ] ;
+rep.ucs_iso:0x284DC
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x284DC ] ;
     :denotation-of
-        a.jis-x0213-1:0x306F ;
+        a.ucs:0x284DC        ;
     ideo:radical         162 ; # ⾡ 
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  o.ucs_unicode:0x514D   # &o-J0-4C48;
+    ] ;
+    :eq o.ucs_iso:0x284DC         ; # &o-J0-306F;
+    :eq o.ucs_jis:0x9038          ; # &o-J0-306F;
     :eq o.jis-x0208:0x306F        ; # &o-J0-306F;
     :eq o.jis-x0213-1:0x306F      ; # &o-J0-306F;
     :eq o.adobe-japan1-0:01203    ; # &o-J0-306F;
     :eq o.gt:52065                ; # &o-J0-306F;
     :subsume
-        rep.mj:025993        ;
+        rep.mj:025993        ,
+        rep.ucs_iso:0x284DC  ;
     .
+    o.ucs_iso:0x284DC
+                :unified-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x284DC ] .
+    o.ucs_jis:0x9038
+                :unified-glyph-of [ :context domain:jis     ;
+                                    :target     ucs:0x9038  ] .
     o.jis-x0208:0x306F
                 :unified-glyph-of      jis-x0208:0x306F  .
     o.jis-x0213-1:0x306F
@@ -24105,8 +24620,8 @@ o.ucs_jis:0x9038
         :eq rep.gt-pj-1:12399         ; # &I-GT-52065;
         :eq rep.daikanwa...._.p:38951 ; # &MJ025993;
         :eq rep.shinjigen:8300        ; # &MJ025993;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  a.ucs:0xFA67         ] ;
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  a.ucs:0xFA67         ] ;
         :subsume
             g2.mj:025993         ;
         .
@@ -24193,12 +24708,28 @@ o.ucs_jis:0x9038
                 a chisegg:glyph-image ;
                 :glyph-image-of gt:52065 ;
                 .
+    rep.ucs_iso:0x284DC
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x284DC ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround a.ucs:0x2ECC ; # ⻌
+            isd:filling  rep.mj:007229   # &MJ007229;
+        ] ;
+        :subsume
+            g2.ucs_iso:0x284DC   ;
+        .
+        g2.ucs_iso:0x284DC
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x284DC ] ;
+            .
 
 repi.hng-khi:05860
     a chisegg:glyph-image ;
     :glyph-image-of hng-khi:05860 ;
     :denotation-of
-        a.jis-x0213-1:0x306F ;
+        a.ucs:0x284DC        ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
@@ -24206,6 +24737,8 @@ repi.hng-khi:05860
         isd:surround a.ucs:0x2ECE ; # ⻎
         isd:filling  rep.mj:007230   # &MJ007230;
     ] ;
+    :from.HNG            [ :context domain:chise   ;
+                           :target  a.ucs:0x284DC        ] ;
     .
 
 a.ucs:0x284F6
@@ -24248,7 +24781,7 @@ rep.daikanwa:38953
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.ancient        a.ucs:0x8F15         ;
+    ideo:ancient-form-of a.ucs:0x8F15         ;
     .
 
 rep.ucs_iso:0x284F7
@@ -24288,7 +24821,7 @@ rep.daikanwa:38954
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026017        ] ;
     .
@@ -24329,7 +24862,7 @@ rep.daikanwa:38955
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F80         ] ;
     .
@@ -24370,7 +24903,7 @@ rep.daikanwa:38956
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.vulgar         [ :sources chisebib:kangxi ,
+    ideo:vulgar-form-of  [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13669 ] ;
     :subsume
@@ -24616,6 +25149,10 @@ a.ucs:0x28503
     :abstract-character-of ucs:0x28503 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x20209   # 𠈉
+    ] ;
     .
 
 rep.daikanwa:38964
@@ -24626,6 +25163,10 @@ rep.daikanwa:38964
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x20209   # 𠈉
+    ] ;
     .
 
 rep.ucs_iso:0x28503
@@ -24637,7 +25178,18 @@ rep.ucs_iso:0x28503
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  a.ucs:0x20209   # 𠈉
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28503   ;
     .
+    g2.ucs_iso:0x28503
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28503 ] ;
+        .
 
 rep.cns11643-6:0x4F54
     a chisegg:abstract-glyph ;
@@ -24647,7 +25199,25 @@ rep.cns11643-6:0x4F54
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x20209   # 𠈉
+    ] ;
+    :eq rep.ucs_cns:0x28503       ; # &C6-4F54;
+    :subsume
+        g2.cns11643-6:0x4F54 ;
     .
+    rep.ucs_cns:0x28503
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28503 ] .
+    g2.cns11643-6:0x4F54
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x4F54 ;
+        :eq g2.ucs_cns:0x28503        ; # &g2-CU+28503;
+        .
+        g2.ucs_cns:0x28503
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x28503 ] .
 
 a.ucs:0x28500
     a chisegg:abstract-character ;
@@ -24664,7 +25234,7 @@ rep.daikanwa:38965
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38757   ] ;
     .
@@ -24747,7 +25317,7 @@ rep.daikanwa:38967
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  a.ucs:0x9751   # 靑
     ] ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6DF8         ] ;
     :subsume
@@ -24835,7 +25405,7 @@ rep.daikanwa:38968
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7531         ] ;
     .
@@ -24876,7 +25446,7 @@ rep.daikanwa:38969
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:pianhai-leibian ,
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025839        ] ;
     :subsume
@@ -24923,7 +25493,7 @@ rep.daikanwa:38970
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13895 ] ;
     :subsume
@@ -25333,6 +25903,38 @@ rep.cns11643-3:0x3F57
     ideo:total-strokes    12 ;
     .
 
+a.ucs:0x2E7A5
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E7A5 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  rep.ucs-itaiji-001:0x8C9D   # &U-i001+8C9D;
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x2E7A5
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2E7A5 ] ;
+    :denotation-of
+        a.ucs:0x2E7A5        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes           8 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.ucs-itaiji-001:0x8C9D   # &U-i001+8C9D;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2E7A5 ;
+    .
+    g2.ucs_JP...hanazono:0x2E7A5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2E7A5 ] ;
+        .
+
 a.gt-k:09344
     a chisegg:abstract-character ;
     :abstract-character-of gt-k:09344 ;
@@ -25504,8 +26106,8 @@ rep.mj:026002
     :eq rep.gt:52281              ; # &I-GT-52281;
     :eq rep.gt-pj-1:18735         ; # &I-GT-52281;
     :eq rep.jef-china3:0x70F3     ; # &I-JC3-70F3;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:026003        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:026003        ] ;
     :subsume
         g2.mj:026002         ;
     .
@@ -25658,7 +26260,7 @@ rep.daikanwa:38974
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x52D5         ] ;
     .
@@ -25699,7 +26301,7 @@ rep.daikanwa:38975
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13963 ] ;
     :subsume
@@ -26126,7 +26728,7 @@ rep.daikanwa:38979
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38787   ] ;
     .
@@ -26175,7 +26777,7 @@ rep.daikanwa:38980
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  rep.big5-cdp:0x8CA9   # &CDP-8CA9;
     ] ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:027689        ] ;
     :subsume
@@ -26262,7 +26864,7 @@ rep.daikanwa:38981
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
     :form-of             rep.mj:025900        ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025900        ] ;
     .
@@ -26315,7 +26917,7 @@ rep.mj:026013
     :eq rep.jis-x0213-1_2004:0x465B ; # &I-JX3-465B;
     :eq rep.hanyo-denshi...hg:0x3055 ; # &I-HD-HG-3055;
     :eq rep.daikanwa:38982        ; # &I-M-38982;
-    :from.same           [ :sources chisebib:jinshu-yinyi ,
+    ideo:same-as         [ :sources chisebib:jinshu-yinyi ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38983   ] ;
     :subsume
@@ -26450,8 +27052,8 @@ rep.mj:026012
     :eq rep.gt-k:09118            ; # &I-GT-K09118;
     :eq rep.gt-pj-1:18011         ; # &I-GT-52278;
     :eq rep.jef-china3:0x70F5     ; # &I-JC3-70F5;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:026013        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:026013        ] ;
     :subsume
         g2.mj:026012         ;
     .
@@ -26612,7 +27214,7 @@ rep.daikanwa:38983
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:37692   ] ;
     .
@@ -26643,6 +27245,10 @@ a.ucs:0x28522
     :abstract-character-of ucs:0x28522 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x2722A   # 𧈪
+    ] ;
     .
 
 rep.daikanwa:38984
@@ -26653,7 +27259,7 @@ rep.daikanwa:38984
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.ucs_unicode:0x389F ] ;
     .
@@ -26667,7 +27273,18 @@ rep.ucs_iso:0x28522
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.ucs_iso:0x2722A   # &GT-44361;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28522   ;
     .
+    g2.ucs_iso:0x28522
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28522 ] ;
+        .
 
 rep.cns11643-4:0x4131
     a chisegg:abstract-glyph ;
@@ -26677,7 +27294,21 @@ rep.cns11643-4:0x4131
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    :eq rep.ucs_cns:0x28522       ; # &C4-4131;
+    :subsume
+        g2.cns11643-4:0x4131 ;
     .
+    rep.ucs_cns:0x28522
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28522 ] .
+    g2.cns11643-4:0x4131
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-4:0x4131 ;
+        :eq g2.ucs_cns:0x28522        ; # &g2-CU+28522;
+        .
+        g2.ucs_cns:0x28522
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x28522 ] .
 
 a.ucs:0x9042
     a chisegg:abstract-character ;
@@ -27396,7 +28027,7 @@ rep.daikanwa:38989
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026127        ] ;
     .
@@ -27429,11 +28060,11 @@ rep.mj:026023
     :eq rep.gt-pj-1:17241         ; # &I-GT-52258;
     :eq rep.daikanwa...._.p:38989 ; # &MJ026023;
     :eq rep.shinjigen:8336        ; # &MJ026023;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:zihui ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  rep.mj:026127        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:zihui ,
+                                       chisebib:daikanwa ,
+                                       chisebib:shinjigen ;
+                              :target  rep.mj:026127        ] ;
     :subsume
         g2.mj:026023         ;
     .
@@ -27863,7 +28494,7 @@ rep.mj:026031
     :eq rep.gt-pj-1:28198         ; # &I-GT-52377;
     :eq rep.daikanwa:38993        ; # &I-M-38993;
     :eq rep.shinjigen:8339        ; # &MJ026031;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5075         ] ;
     :subsume
@@ -28045,7 +28676,7 @@ rep.adobe-japan1-4:14076
     :eq rep.ks-x1001:0x6B34       ; # &I-K0-6B34;
     :eq rep.daikanwa:38994        ; # &I-M-38994;
     :eq rep.jef-china3:0x67DB     ; # &I-JC3-67DB;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:shuowen-zhu ,
                                     chisebib:shuowen-zhujian ,
                                     chisebib:shuowen-guanjian ,
@@ -28271,7 +28902,7 @@ rep.daikanwa:38995
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39079   ] ;
     .
@@ -28316,10 +28947,10 @@ rep.daikanwa:38996
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:015296        ] ;
-    :from.same           [ :sources chisebib:kangxi ,
+    ideo:same-as         [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39056   ] ;
     .
@@ -28616,7 +29247,7 @@ rep.daikanwa:38999
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13649 ] ;
     :subsume
@@ -28674,7 +29305,7 @@ rep.adobe-japan1-5:19889
     :eq rep.ucs_jis:0x904C        ; # &AJ1-19889;
     :eq rep.jis-x0212:0x615D      ; # &I-JSP-615D;
     :eq rep.daikanwa:39000        ; # &I-M-39000;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39136   ] ;
     :subsume
@@ -28775,6 +29406,10 @@ a.ucs:0x904D
     :abstract-character-of ucs:0x904D ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x6241   # 扁
+    ] ;
     :eq a.big5:0xB94D             ; # &I-B-B94D;
     .
     a.big5:0xB94D
@@ -28788,23 +29423,71 @@ rep.adobe-japan1-4:14017
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x904D         ,
-                                    a.ucs:0xE0101        ] ;
+    :eq rep.ucs_ks:0x904D         ; # &AJ1-14017;
     :eq rep.ks-x1001:0x783C       ; # &I-K0-783C;
     :eq rep.daikanwa:39001        ; # &I-M-39001;
     :eq rep.jef-china3:0x67DD     ; # &I-JC3-67DD;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:yinkeng-shi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14526 ] ;
+    :subsume
+        g2.adobe-japan1-4:14017 ;
     .
+    rep.ucs_ks:0x904D
+               :abstract-glyph-of [ :context domain:ks      ;
+                                    :target     ucs:0x904D  ] .
     rep.ks-x1001:0x783C
                :abstract-glyph-of       ks-x1001:0x783C  .
     rep.daikanwa:39001
                :abstract-glyph-of       daikanwa:39001   .
     rep.jef-china3:0x67DD
                :abstract-glyph-of     jef-china3:0x67DD  .
+    g2.adobe-japan1-4:14017
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:14017 ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x904D         ,
+                                        a.ucs:0xE0101        ] ;
+        :eq g2.ucs_ks:0x904D          ; # &g2-AJ1-14017;
+        :eq g2.ks-x1001:0x783C        ; # &g2-AJ1-14017;
+        :eq g2.daikanwa:39001         ; # &g2-AJ1-14017;
+        :eq g2.jef-china3:0x67DD      ; # &g2-AJ1-14017;
+        :subsume
+            repi.daikanwa:39001  ,
+            repi.adobe-japan1-6:14017 ,
+            repi.jef-china3:0x67DD ,
+            repi.ks-x1001:0x783C ;
+        .
+        g2.ucs_ks:0x904D
+              :abstract-glyph-form-of [ :context domain:ks      ;
+                                        :target     ucs:0x904D  ] .
+        g2.ks-x1001:0x783C
+              :abstract-glyph-form-of       ks-x1001:0x783C  .
+        g2.daikanwa:39001
+              :abstract-glyph-form-of       daikanwa:39001   .
+        g2.jef-china3:0x67DD
+              :abstract-glyph-form-of     jef-china3:0x67DD  .
+        repi.daikanwa:39001
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:39001 ;
+            .
+        repi.adobe-japan1-4:14017
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14017 ;
+            .
+        repi.jef-china3:0x67DD
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x67DD ;
+            .
+        repi.ks-x1001:0x783C
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x783C ;
+            :eq repi.ucs_ks:0x904D        ; # &R-K0-783C;
+            .
+            repi.ucs_ks:0x904D
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x904D  ] .
 
 repi.hng-khi:05840
     a chisegg:glyph-image ;
@@ -28824,7 +29507,21 @@ rep.cns11643-1:0x6735
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    :eq rep.ucs_cns:0x904D        ; # &C1-6735;
+    :subsume
+        g2.cns11643-1:0x6735 ;
     .
+    rep.ucs_cns:0x904D
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x904D  ] .
+    g2.cns11643-1:0x6735
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-1:0x6735 ;
+        :eq g2.ucs_cns:0x904D         ; # &g2-CU+904D;
+        .
+        g2.ucs_cns:0x904D
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x904D  ] .
 
 rep.mj:026039
     a chisegg:abstract-glyph ;
@@ -29325,7 +30022,7 @@ rep.daikanwa:39003
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:15190 ] ;
     .
@@ -29582,7 +30279,7 @@ rep.shinjigen:8314
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  rep.mj:013489   # &MJ013489;
     ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:026045        ] ;
     .
 
@@ -30088,7 +30785,7 @@ rep.daikanwa:39007
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:10180   ] ;
     .
@@ -30142,7 +30839,7 @@ rep.mj:026053
     :eq rep.gt-pj-1:28196         ; # &I-GT-52341;
     :eq rep.daikanwa:39008        ; # &I-M-39008;
     :eq rep.shinjigen:8326        ; # &MJ026053;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:guangya ,
                                     chisebib:chuci ,
                                     chisebib:chuci-zhu ,
@@ -30725,7 +31422,7 @@ rep.adobe-japan1-4:13912
     :eq rep.ks-x1001:0x5339       ; # &I-K0-5339;
     :eq rep.daikanwa:39011        ; # &I-M-39011;
     :eq rep.jef-china3:0x67E0     ; # &I-JC3-67E0;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:01179   ] ;
     :subsume
@@ -30970,8 +31667,8 @@ rep.daikanwa:39012
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.original       rep.adobe-japan1-4:13912 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:original-form-of rep.adobe-japan1-4:13912 ;
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13912 ] ;
     :subsume
@@ -31177,7 +31874,7 @@ rep.daikanwa:39015
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22666 ] ;
     .
@@ -31207,27 +31904,60 @@ a.ucs:0x2852E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2852E ;
     ideo:radical         162 ; # ⾡ 
-    ideo:strokes           9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x345E   # 㑞
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "sou" ) ;
+                         ] ;
     .
 
-rep.daikanwa:39016
+rep.mj:050955
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:39016 ;
+    :abstract-glyph-of mj:050955 ;
     :denotation-of
         a.ucs:0x2852E        ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.cns11643-4:0x2837   # &C4-2837;
+    ] ;
+    :eq rep.koseki:442410         ; # &MJ050955;
+    :eq rep.daikanwa:39016        ; # &I-M-39016;
     :from.Large-Seal     [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13895 ] ;
     :subsume
-        g2.daikanwa:39016    ;
+        g2.mj:050955         ;
     .
-    g2.daikanwa:39016
+    rep.koseki:442410
+               :abstract-glyph-of         koseki:442410  .
+    rep.daikanwa:39016
+               :abstract-glyph-of       daikanwa:39016   .
+    g2.mj:050955
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of daikanwa:39016 ;
+        :abstract-glyph-form-of mj:050955 ;
+        :eq g2.koseki:442410          ; # &g2-MJ050955;
+        :eq g2.daikanwa:39016         ; # &g2-MJ050955;
+        :subsume
+            repi.daikanwa:39016  ,
+            repi.mj:050955       ;
         .
+        g2.koseki:442410
+              :abstract-glyph-form-of         koseki:442410  .
+        g2.daikanwa:39016
+              :abstract-glyph-form-of       daikanwa:39016   .
+        repi.daikanwa:39016
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:39016 ;
+            .
+        repi.mj:050955
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:050955 ;
+            .
 
 rep.ucs_iso:0x2852E
     a chisegg:abstract-glyph ;
@@ -31238,7 +31968,18 @@ rep.ucs_iso:0x2852E
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.cns11643-4:0x2837   # &C4-2837;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2852E   ;
     .
+    g2.ucs_iso:0x2852E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2852E ] ;
+        .
 
 rep.cns11643-6:0x5942
     a chisegg:abstract-glyph ;
@@ -31248,7 +31989,25 @@ rep.cns11643-6:0x5942
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.cns11643-4:0x2837   # &C4-2837;
+    ] ;
+    :eq rep.ucs_cns:0x2852E       ; # &C6-5942;
+    :subsume
+        g2.cns11643-6:0x5942 ;
     .
+    rep.ucs_cns:0x2852E
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x2852E ] .
+    g2.cns11643-6:0x5942
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x5942 ;
+        :eq g2.ucs_cns:0x2852E        ; # &g2-CU+2852E;
+        .
+        g2.ucs_cns:0x2852E
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x2852E ] .
 
 a.ucs:0x2852F
     a chisegg:abstract-character ;
@@ -31264,7 +32023,7 @@ rep.daikanwa:39017
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:xiyun ,
+    ideo:same-as         [ :sources chisebib:xiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14526 ] ;
     .
@@ -31304,7 +32063,7 @@ rep.daikanwa:39018
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -31366,7 +32125,7 @@ rep.daikanwa:39019
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026017        ] ;
     .
@@ -31407,7 +32166,7 @@ rep.daikanwa:39020
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026017        ] ;
     .
@@ -31516,7 +32275,7 @@ rep.daikanwa:39024
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13692 ] ;
     :subsume
@@ -31584,7 +32343,7 @@ rep.daikanwa:39025
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04559 ] ;
     .
@@ -31626,7 +32385,7 @@ rep.daikanwa:39026
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026083        ] ;
     .
@@ -31660,7 +32419,7 @@ rep.daikanwa:39027
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8D74         ] ;
     .
@@ -32015,6 +32774,10 @@ a.ucs:0x28556
     :abstract-character-of ucs:0x28556 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x38B2   # 㢲
+    ] ;
     .
 
 rep.daikanwa:49767
@@ -32025,6 +32788,10 @@ rep.daikanwa:49767
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.cns11643-3:0x2C4E   # &C3-2C4E;
+    ] ;
     .
 
 rep.ucs_iso:0x28556
@@ -32036,7 +32803,18 @@ rep.ucs_iso:0x28556
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.cns11643-3:0x2C4E   # &C3-2C4E;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28556   ;
     .
+    g2.ucs_iso:0x28556
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28556 ] ;
+        .
 
 rep.cns11643-6:0x592F
     a chisegg:abstract-glyph ;
@@ -32046,7 +32824,25 @@ rep.cns11643-6:0x592F
     ideo:radical         162 ; # ⾡ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.cns11643-3:0x2C4E   # &C3-2C4E;
+    ] ;
+    :eq rep.ucs_cns:0x28556       ; # &C6-592F;
+    :subsume
+        g2.cns11643-6:0x592F ;
     .
+    rep.ucs_cns:0x28556
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28556 ] .
+    g2.cns11643-6:0x592F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x592F ;
+        :eq g2.ucs_cns:0x28556        ; # &g2-CU+28556;
+        .
+        g2.ucs_cns:0x28556
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x28556 ] .
 
 a.ucs:0x28550
     a chisegg:abstract-character ;
@@ -32422,7 +33218,7 @@ rep.daikanwa:39033
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -32805,8 +33601,8 @@ rep.mj:026096
     :eq rep.gt-pj-1:19802         ; # &I-GT-52297;
     :eq rep.shinjigen_rev:8352    ; # &MJ026096;
     :eq rep.jef-china3:0x70EB     ; # &I-JC3-70EB;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:026074        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:026074        ] ;
     :subsume
         g2.mj:026096         ;
     .
@@ -32994,7 +33790,7 @@ rep.adobe-japan1-5:19890
     :eq rep.jis-x0212:0x615E      ; # &I-JSP-615E;
     :eq rep.daikanwa:39037        ; # &I-M-39037;
     :eq rep.jef-china3:0x67E2     ; # &I-JC3-67E2;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39126   ] ;
     :subsume
@@ -33264,8 +34060,8 @@ rep.mj:026078
     :eq rep.gt-k:10240            ; # &I-GT-K10240;
     :eq rep.gt-pj-1:16957         ; # &I-GT-52366;
     :eq rep.jef-china3:0x70F7     ; # &I-JC3-70F7;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:026079        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:026079        ] ;
     :subsume
         g2.mj:026078         ,
         g2.ucs_unicode:0x905C ;
@@ -33406,7 +34202,7 @@ rep.daikanwa:39039
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5EC1         ] ;
     :subsume
@@ -33454,7 +34250,7 @@ rep.daikanwa:39040
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025847        ] ;
     .
@@ -33496,7 +34292,7 @@ rep.daikanwa:39041
         isd:filling  rep.gt:40452   # &GT-40452;
     ] ;
     :form-of             rep.ks-x1001:0x7063  ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.ks-x1001:0x7063  ] ;
     :subsume
@@ -33603,7 +34399,7 @@ rep.daikanwa:39043
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39136   ] ;
     .
@@ -33863,10 +34659,10 @@ rep.mj:026083
     :eq rep.shinjigen:8284        ; # &MJ026083;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.mj:025938        ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025938        ] ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38891   ] ;
     :subsume
@@ -34090,7 +34886,7 @@ rep.daikanwa:39046
     :from.Large-Seal     [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026127        ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:07716   ] ;
     :subsume
@@ -34426,7 +35222,7 @@ rep.mj:026090
     :eq rep.jis-x0213-1_2004:0x414C ; # &I-JX3-414C;
     :eq rep.hanyo-denshi...ft:0x324B ; # &I-HD-FT-324B;
     :eq rep.daikanwa:39048        ; # &I-M-39048;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:fangyan ,
                                     chisebib:maoshi ,
                                     chisebib:maoshi-zhuan ,
@@ -34551,8 +35347,8 @@ rep.mj:026089
     :eq rep.gt:52360              ; # &I-GT-52360;
     :eq rep.gt-pj-1:16716         ; # &I-GT-52360;
     :eq rep.jef-china3:0x70F1     ; # &I-JC3-70F1;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:026090        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:026090        ] ;
     :subsume
         g2.mj:026089         ;
     .
@@ -34885,7 +35681,7 @@ rep.daikanwa:39051
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.ancient        [ :sources chisebib:guangyun ,
+    ideo:ancient-form-of [ :sources chisebib:guangyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:007989        ] ;
     .
@@ -35155,7 +35951,7 @@ rep.daikanwa:39053
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.ancient        [ :sources chisebib:kangxi ,
+    ideo:ancient-form-of [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13963 ] ;
     :subsume
@@ -35229,7 +36025,7 @@ rep.daikanwa:39055
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38858   ] ;
     .
@@ -35270,7 +36066,7 @@ rep.daikanwa:39056
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38996   ] ;
     .
@@ -35301,6 +36097,10 @@ a.ucs:0x28569
     :abstract-character-of ucs:0x28569 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  rep.ucs-itaiji-001:0x345E   # &U-i001+345E;
+    ] ;
     .
 
 rep.daikanwa:39057
@@ -35311,6 +36111,10 @@ rep.daikanwa:39057
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  rep.ucs-itaiji-001:0x345E   # &U-i001+345E;
+    ] ;
     .
 
 rep.ucs_iso:0x28569
@@ -35322,7 +36126,18 @@ rep.ucs_iso:0x28569
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  rep.ucs-itaiji-001:0x345E   # &U-i001+345E;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28569   ;
     .
+    g2.ucs_iso:0x28569
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28569 ] ;
+        .
 
 rep.cns11643-6:0x633B
     a chisegg:abstract-glyph ;
@@ -35332,7 +36147,25 @@ rep.cns11643-6:0x633B
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  rep.ucs-itaiji-001:0x345E   # &U-i001+345E;
+    ] ;
+    :eq rep.ucs_cns:0x28569       ; # &C6-633B;
+    :subsume
+        g2.cns11643-6:0x633B ;
     .
+    rep.ucs_cns:0x28569
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28569 ] .
+    g2.cns11643-6:0x633B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x633B ;
+        :eq g2.ucs_cns:0x28569        ; # &g2-CU+28569;
+        .
+        g2.ucs_cns:0x28569
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x28569 ] .
 
 a.ucs:0x2856A
     a chisegg:abstract-character ;
@@ -35342,7 +36175,7 @@ a.ucs:0x2856A
     ideo:total-strokes    17 ;
     :eq rep.cns11643-7:0x3C55     ; # &I-C7-3C55;
     :eq rep.daikanwa:39058        ; # &I-M-39058;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13895 ] ;
     :subsume
@@ -35429,7 +36262,7 @@ rep.daikanwa:39060
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.wrong          [ :sources chisebib:jiyun ,
+    ideo:wrong-form-of   [ :sources chisebib:jiyun ,
                                     chisebib:wuyin-jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:09579   ] ;
@@ -35471,7 +36304,7 @@ rep.daikanwa:39061
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13641 ] ;
     :subsume
@@ -35521,7 +36354,7 @@ rep.ucs_iso:0x2857D
     ideo:strokes          10 ;
     ideo:total-strokes    17 ;
     :eq rep.daikanwa:39063        ; # &M-39063;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8DF2         ] ;
     :subsume
@@ -35589,7 +36422,7 @@ rep.adobe-japan1-6:22675
     :eq rep.ucs_jis:0x9066        ; # &AJ1-22675;
     :eq rep.jis-x0212:0x6161      ; # &I-JSP-6161;
     :eq rep.daikanwa:39068        ; # &I-M-39068;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x645C         ] ;
@@ -35639,7 +36472,7 @@ rep.daikanwa:39069
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:shuowen-zhu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:017115        ] ;
@@ -35732,7 +36565,7 @@ rep.daikanwa:39071
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026022        ] ;
     .
@@ -35860,7 +36693,7 @@ rep.adobe-japan1-0:06920
     :eq rep.gt-pj-1:28203         ; # &I-GT-52518;
     :eq rep.daikanwa:39073        ; # &I-M-39073;
     :eq rep.shinjigen:8365        ; # &AJ1-06920;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:jiyun ,
                                     chisebib:maoshi ,
                                     chisebib:houhanshu ,
@@ -36035,7 +36868,7 @@ rep.daikanwa:39075
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026074        ] ;
     .
@@ -36100,9 +36933,9 @@ rep.adobe-japan1-4:13946
     :eq rep.gt-pj-7:22647         ; # &I-GT-52561;
     :eq rep.daikanwa:39076        ; # &I-M-39076;
     :eq rep.jef-china3:0x67E6     ; # &I-JC3-67E6;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39140   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39140   ] ;
     :subsume
         g2.ks-x1001:0x6E6A   ,
         g2.adobe-japan1-4:13946 ;
@@ -36377,7 +37210,7 @@ rep.daikanwa:39077
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39192   ] ;
     .
@@ -36610,7 +37443,7 @@ rep.daikanwa:39081
     ideo:total-strokes    15 ;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.mj:025866        ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025866        ] ;
     .
@@ -36675,12 +37508,12 @@ rep.adobe-japan1-4:13896
     :eq rep.ks-x1001:0x7064       ; # &I-K0-7064;
     :eq rep.daikanwa:39082        ; # &I-M-39082;
     :eq rep.jef-china3:0x67E7     ; # &I-JC3-67E7;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:liji ,
-                                    chisebib:shiji ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39263   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:liji ,
+                                     chisebib:shiji ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39263   ] ;
     :subsume
         g2.adobe-japan1-4:13896 ;
     .
@@ -36912,7 +37745,7 @@ rep.daikanwa:39085
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:shiguwen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01382 ] ;
@@ -37231,7 +38064,7 @@ rep.daikanwa:39088
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x22529        ] ;
     .
@@ -37627,10 +38460,10 @@ rep.daikanwa:39092
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39160   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39160   ] ;
     .
 
 rep.ucs_iso:0x2858F
@@ -37751,7 +38584,7 @@ rep.daikanwa:39095
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:shiguwen ,
                                     chisebib:guwenyuan-zhu ,
                                     chisebib:daikanwa ;
@@ -37795,7 +38628,7 @@ rep.daikanwa:39096
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:03651 ] ;
     .
@@ -37830,7 +38663,7 @@ rep.daikanwa:39097
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13912 ] ;
     :subsume
@@ -37959,7 +38792,7 @@ rep.daikanwa:39100
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:09538   ] ;
     .
@@ -38064,7 +38897,7 @@ rep.daikanwa:39103
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026166        ] ;
     .
@@ -38105,7 +38938,7 @@ rep.daikanwa:39104
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:chuanpian ,
+    ideo:same-as         [ :sources chisebib:chuanpian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026013        ] ;
     .
@@ -38145,7 +38978,7 @@ a.ucs:0x285A4
     rep.daikanwa:39105
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:39105 ;
-        :from.same           [ :sources chisebib:longkanshoujian ,
+        ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:38757   ] ;
         .
@@ -38175,7 +39008,7 @@ rep.daikanwa:39106
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13692 ] ;
     :subsume
@@ -38265,6 +39098,10 @@ a.ucs:0x285A5
     :abstract-character-of ucs:0x285A5 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x22256   # 𢉖
+    ] ;
     .
 
 rep.daikanwa:39108
@@ -38275,7 +39112,11 @@ rep.daikanwa:39108
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECD ; # ⻍
+        isd:filling  a.ucs:0x22256   # 𢉖
+    ] ;
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026116        ] ;
     :subsume
@@ -38295,7 +39136,18 @@ rep.ucs_iso:0x285A5
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  a.ucs:0x22256   # 𢉖
+    ] ;
+    :subsume
+        g2.ucs_iso:0x285A5   ;
     .
+    g2.ucs_iso:0x285A5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x285A5 ] ;
+        .
 
 rep.cns11643-7:0x2968
     a chisegg:abstract-glyph ;
@@ -38305,7 +39157,25 @@ rep.cns11643-7:0x2968
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x22256   # 𢉖
+    ] ;
+    :eq rep.ucs_cns:0x285A5       ; # &C7-2968;
+    :subsume
+        g2.cns11643-7:0x2968 ;
     .
+    rep.ucs_cns:0x285A5
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x285A5 ] .
+    g2.cns11643-7:0x2968
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x2968 ;
+        :eq g2.ucs_cns:0x285A5        ; # &g2-CU+285A5;
+        .
+        g2.ucs_cns:0x285A5
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x285A5 ] .
 
 a.ucs:0x285A3
     a chisegg:abstract-character ;
@@ -38322,7 +39192,7 @@ rep.daikanwa:39109
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6BBC         ] ;
     .
@@ -38363,7 +39233,7 @@ rep.daikanwa:39110
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :from.wrong          [ :sources chisebib:zihui-bu ,
+    ideo:wrong-form-of   [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9706         ] ;
     .
@@ -38476,6 +39346,64 @@ a.ucs:0x28599
     rep.cns11643-5:0x516D
                :abstract-glyph-of     cns11643-5:0x516D  .
 
+a.ucs:0x2859B
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2859B ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          11 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x29079   # 𩁹
+    ] ;
+    .
+
+rep.ucs_iso:0x2859B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2859B ] ;
+    :denotation-of
+        a.ucs:0x2859B        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECC ; # ⻌
+        isd:filling  a.ucs:0x29079   # 𩁹
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2859B   ;
+    .
+    g2.ucs_iso:0x2859B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2859B ] ;
+        .
+
+a.ucs:0x285A2
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x285A2 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          11 ;
+    .
+
+rep.ucs_iso:0x285A2
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x285A2 ] ;
+    :denotation-of
+        a.ucs:0x285A2        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    :subsume
+        g2.ucs_iso:0x285A2   ;
+    .
+    g2.ucs_iso:0x285A2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x285A2 ] ;
+        .
+
 a.ucs:0x9072
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x9072 ;
@@ -38508,7 +39436,7 @@ rep.mj:026127
     :from.Large-Seal     [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39046   ] ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:18776 ] ;
     :to.ideographic-variants [ :sources chisebib:shinjigen ;
@@ -38714,7 +39642,7 @@ rep.daikanwa:39114
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:37582   ] ;
     .
@@ -38830,11 +39758,11 @@ rep.adobe-japan1-5:19892
     :eq rep.jis-x0212:0x6165      ; # &I-JSP-6165;
     :eq rep.daikanwa:39117        ; # &I-M-39117;
     :eq rep.jef-china3:0x67E8     ; # &I-JC3-67E8;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:guangya ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39192   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:guangya ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39192   ] ;
     :subsume
         g2.daikanwa:39117    ,
         g2.ucs_jis:0x9074    ,
@@ -39199,9 +40127,9 @@ rep.daikanwa:39119
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.original       [ :sources chisebib:zhonghua-dazidian ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:026137        ] ;
+    ideo:original-form-of [ :sources chisebib:zhonghua-dazidian ,
+                                     chisebib:daikanwa ;
+                            :target  rep.mj:026137        ] ;
     .
 
 rep.ucs_iso:0x285D5
@@ -39287,7 +40215,7 @@ rep.daikanwa:39121
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13658 ] ;
     :subsume
@@ -39533,9 +40461,9 @@ rep.adobe-japan1-4:13888
         isd:filling  rep.ucs-var-001:0x4674   # &U-v001+4674;
     ] ;
     :eq rep.daikanwa:39123        ; # &I-M-39123;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39257   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39257   ] ;
     :subsume
         g2.adobe-japan1-4:13888 ;
     .
@@ -39877,7 +40805,7 @@ rep.daikanwa:39124
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026186        ] ;
     .
@@ -40403,7 +41331,7 @@ rep.daikanwa:39131
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6A47         ] ;
     .
@@ -40461,7 +41389,7 @@ rep.daikanwa:39132
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13642 ] ;
     :subsume
@@ -40502,7 +41430,7 @@ rep.daikanwa:39133
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:yuwen ,
+    ideo:same-as         [ :sources chisebib:yuwen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13642 ] ;
     :subsume
@@ -40837,7 +41765,7 @@ rep.mj:026156
     :eq rep.ks-x1001:0x5721       ; # &I-K0-5721;
     :eq rep.hanyo-denshi...ft:0x3344 ; # &I-HD-FT-3344;
     :eq rep.daikanwa:39137        ; # &I-M-39137;
-    :from.interchangeable a.ucs:0x52DE         ;
+    ideo:interchangeable-form-of a.ucs:0x52DE         ;
     :subsume
         g2.mj:026156         ;
     .
@@ -41094,7 +42022,7 @@ rep.daikanwa:39138
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:kangxi ,
+    ideo:same-as         [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025990        ] ;
     .
@@ -41136,7 +42064,7 @@ rep.daikanwa:39139
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
     :form-of             rep.adobe-japan1-6:22670 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-6:22670 ] ;
     .
@@ -41177,9 +42105,9 @@ rep.daikanwa:39140
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-4:13946 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-4:13946 ] ;
     .
 
 rep.cns11643-7:0x3439
@@ -41247,7 +42175,7 @@ rep.daikanwa:39141
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01586 ] ;
     .
@@ -41290,7 +42218,7 @@ a.ucs:0x285C3
     ideo:total-strokes    19 ;
     :eq rep.cns11643-7:0x4A77     ; # &I-C7-4A77;
     :eq rep.daikanwa:39142        ; # &I-M-39142;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13855 ] ;
     .
@@ -41314,7 +42242,7 @@ rep.daikanwa:39143
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:19892 ] ;
     .
@@ -41467,6 +42395,10 @@ a.ucs:0x285D2
     :abstract-character-of ucs:0x285D2 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x96E8 ; # 雨
+        isd:below    a.ucs:0x28473   # 𨑳
+    ] ;
     .
 
 rep.daikanwa:39148
@@ -41477,7 +42409,7 @@ rep.daikanwa:39148
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:wuyin-jiyun ,
+    ideo:same-as         [ :sources chisebib:wuyin-jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9706         ] ;
     .
@@ -41491,7 +42423,14 @@ rep.ucs_iso:0x285D2
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    :subsume
+        g2.ucs_iso:0x285D2   ;
     .
+    g2.ucs_iso:0x285D2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x285D2 ] ;
+        .
 
 a.ucs:0x2F9E0
     a chisegg:abstract-character ;
@@ -41502,10 +42441,36 @@ a.ucs:0x2F9E0
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x96E8 ; # 雨
+        isd:below    rep.ucs_iso:0x28473   # &U-00028473;
+    ] ;
     :eq rep.cns11643-4:0x5437     ; # &I-C4-5437;
+    :subsume
+        g2.ucs_iso:0x2F9E0   ;
     .
     rep.cns11643-4:0x5437
                :abstract-glyph-of     cns11643-4:0x5437  .
+    g2.ucs_iso:0x2F9E0
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2F9E0 ] ;
+        :eq g2.cns11643-4:0x5437      ; # &g2-IU-0002F9E0;
+        :subsume
+            repi.cns11643-4:0x5437 ,
+            repi.ucs_iso:0x2F9E0 ;
+        .
+        g2.cns11643-4:0x5437
+              :abstract-glyph-form-of     cns11643-4:0x5437  .
+        repi.cns11643-4:0x5437
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x5437 ;
+            .
+        repi.ucs_iso:0x2F9E0
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2F9E0 ] ;
+            .
 
 a.ucs:0x285E1
     a chisegg:abstract-character ;
@@ -41563,7 +42528,7 @@ rep.daikanwa:39150
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:027689        ] ;
     :subsume
@@ -41634,7 +42599,7 @@ rep.daikanwa:39151
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -41696,7 +42661,7 @@ rep.daikanwa:39154
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:06904 ] ;
     .
@@ -41738,7 +42703,7 @@ rep.daikanwa:39155
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:pianhai-leibian ,
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39078   ] ;
     .
@@ -41780,7 +42745,7 @@ rep.daikanwa:39156
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5FB7         ] ;
     .
@@ -41814,7 +42779,7 @@ rep.daikanwa:39157
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38858   ] ;
     .
@@ -41855,7 +42820,7 @@ rep.daikanwa:39158
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13896 ] ;
     .
@@ -41896,7 +42861,7 @@ rep.daikanwa:39159
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -41944,9 +42909,9 @@ rep.daikanwa:39160
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39092   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39092   ] ;
     .
 
 rep.ucs_iso:0x285CB
@@ -42038,7 +43003,7 @@ rep.mj:026158
     :eq rep.gt-pj-1:28209         ; # &I-GT-52687;
     :eq rep.daikanwa:39161        ; # &I-M-39161;
     :eq rep.shinjigen:8392        ; # &MJ026158;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:32509   ] ;
     :subsume
@@ -42512,7 +43477,7 @@ rep.daikanwa:39166
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:10259   ] ;
     .
@@ -43046,7 +44011,7 @@ rep.daikanwa:39171
     :from.different      [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39093   ] ;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07059 ] ;
     .
@@ -43308,9 +44273,9 @@ rep.adobe-japan1-4:13692
     :eq rep.ks-x1001:0x7C3D       ; # &I-K0-7C3D;
     :eq rep.daikanwa:39174        ; # &I-M-39174;
     :eq rep.jef-china3:0x67EE     ; # &I-JC3-67EE;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39222   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39222   ] ;
     :subsume
         g2.adobe-japan1-4:13692 ;
     .
@@ -43598,7 +44563,7 @@ rep.jis-x0213-2:0x7A22
     :eq rep.ucs_jis:0x9085        ; # &JX2-7A22;
     :eq rep.jis-x0212:0x6167      ; # &JX2-7A22;
     :eq rep.daikanwa:39175        ; # &I-M-39175;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:37315   ] ;
     .
@@ -43669,7 +44634,7 @@ rep.daikanwa:39176
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.wrong          [ :sources chisebib:jiyun ,
+    ideo:wrong-form-of   [ :sources chisebib:jiyun ,
                                     chisebib:jiyun-jiaozheng ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:42369   ] ;
@@ -43733,7 +44698,7 @@ rep.daikanwa:39178
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:011890        ] ;
     .
@@ -43767,7 +44732,7 @@ a.ucs:0x285EC
     ideo:total-strokes    20 ;
     :eq rep.cns11643-7:0x5057     ; # &I-C7-5057;
     :eq rep.daikanwa:39179        ; # &I-M-39179;
-    :from.ancient        [ :sources chisebib:wuyin-jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:wuyin-jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04795 ] ;
     :subsume
@@ -43822,7 +44787,7 @@ rep.daikanwa:39180
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13642 ] ;
     :subsume
@@ -43863,7 +44828,7 @@ rep.daikanwa:39181
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13642 ] ;
     :subsume
@@ -43920,7 +44885,7 @@ rep.daikanwa:39182
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:06920 ] ;
     .
@@ -44166,7 +45131,7 @@ rep.daikanwa:39188
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
@@ -44213,7 +45178,7 @@ rep.daikanwa:39189
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13906 ] ;
     :subsume
@@ -44254,7 +45219,7 @@ rep.daikanwa:39190
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :from.same           [ :sources chisebib:pianhai-leibian ,
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5E36         ] ;
     .
@@ -44278,6 +45243,10 @@ a.ucs:0x285FD
     :abstract-character-of ucs:0x285FD ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x9065 ; # 遥
+        isd:filling  a.ucs:0x6708   # 月
+    ] ;
     .
 
 rep.gt:52732
@@ -44304,7 +45273,17 @@ rep.cns11643-7:0x3C63
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
+    :subsume
+        g2.cns11643-7:0x3C63 ;
     .
+    g2.cns11643-7:0x3C63
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x3C63 ;
+        :eq g2.ucs_cns:0x285FD        ; # &g2-CU+285FD;
+        .
+        g2.ucs_cns:0x285FD
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x285FD ] .
 
 rep.ucs_iso:0x285FD
     a chisegg:abstract-glyph ;
@@ -44315,13 +45294,39 @@ rep.ucs_iso:0x285FD
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.mj:026096 ; # &MJ026096;
+        isd:filling  a.ucs:0x6708   # 月
+    ] ;
     :eq rep.gt:52669              ; # &GT-52669;
     :eq rep.gt-pj-10:16745        ; # &GT-52669;
+    :subsume
+        g2.ucs_iso:0x285FD   ;
     .
     rep.gt:52669
                :abstract-glyph-of             gt:52669   .
     rep.gt-pj-10:16745
                :abstract-glyph-of       gt-pj-10:16745   .
+    g2.ucs_iso:0x285FD
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x285FD ] ;
+        :eq g2.gt:52669               ; # &g2-GT-52669;
+        :subsume
+            repi.gt:52669        ,
+            repi.ucs_iso:0x285FD ;
+        .
+        g2.gt:52669
+              :abstract-glyph-form-of             gt:52669   .
+        repi.gt:52669
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:52669 ;
+            .
+        repi.ucs_iso:0x285FD
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x285FD ] ;
+            .
 
 a.ucs:0x2857C
     a chisegg:abstract-character ;
@@ -44329,24 +45334,38 @@ a.ucs:0x2857C
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB5 ; # 辵
+        isd:filling  rep.ucs-itaiji-001:0x345E   # &U-i001+345E;
+    ] ;
+    :eq rep.cns11643-7:0x3C56     ; # &I-C7-3C56;
+    :eq rep.daikanwa:49770        ; # &I-M-49770;
     :subsume
-        rep.daikanwa:49770   ,
-        rep.ucs_iso:0x2857C  ,
-        rep.cns11643-7:0x3C56 ;
+        g2.daikanwa:49770    ,
+        g2.ucs_iso:0x2857C   ,
+        g2.cns11643-7:0x3C56 ;
     .
+    rep.cns11643-7:0x3C56
+               :abstract-glyph-of     cns11643-7:0x3C56  .
     rep.daikanwa:49770
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:49770 ;
+               :abstract-glyph-of       daikanwa:49770   .
+    g2.daikanwa:49770
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:49770 ;
         .
-    rep.ucs_iso:0x2857C
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x2857C ] ;
+    g2.ucs_iso:0x2857C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2857C ] ;
         .
-    rep.cns11643-7:0x3C56
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-7:0x3C56 ;
+    g2.cns11643-7:0x3C56
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x3C56 ;
+        :eq g2.ucs_cns:0x2857C        ; # &g2-CU+2857C;
         .
+        g2.ucs_cns:0x2857C
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x2857C ] .
 
 a.ucs:0x28581
     a chisegg:abstract-character ;
@@ -44362,16 +45381,81 @@ a.ucs:0x28581
     rep.daikanwa:49771
                :abstract-glyph-of       daikanwa:49771   .
 
+a.ucs:0x28600
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28600 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          13 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x8FB6 ; # 辶
+        isd:filling  a.ucs:0x980A   # 頊
+    ] ;
+    .
+
+rep.ucs_iso:0x28600
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28600 ] ;
+    :denotation-of
+        a.ucs:0x28600        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x2ECE ; # ⻎
+        isd:filling  a.ucs:0x980A   # 頊
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28600   ;
+    .
+    g2.ucs_iso:0x28600
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28600 ] ;
+        .
+
 a.ucs:0x28605
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x28605 ;
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          13 ;
+    .
+
+rep.ucs_iso:0x28605
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28605 ] ;
+    :denotation-of
+        a.ucs:0x28605        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          13 ;
     ideo:total-strokes    17 ;
-    :eq rep.cns11643-7:0x3C5A     ; # &I-C7-3C5A;
+    :eq rep.cns11643-7:0x3C5A     ; # &C7-3C5A;
+    :subsume
+        g2.ucs_iso:0x28605   ;
     .
     rep.cns11643-7:0x3C5A
                :abstract-glyph-of     cns11643-7:0x3C5A  .
+    g2.ucs_iso:0x28605
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28605 ] ;
+        :eq g2.cns11643-7:0x3C5A      ; # &g2-IU-00028605;
+        :subsume
+            repi.cns11643-7:0x3C5A ,
+            repi.ucs_iso:0x28605 ;
+        .
+        g2.cns11643-7:0x3C5A
+              :abstract-glyph-form-of     cns11643-7:0x3C5A  .
+        repi.cns11643-7:0x3C5A
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x3C5A ;
+            .
+        repi.ucs_iso:0x28605
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x28605 ] ;
+            .
 
 a.ucs:0x9083
     a chisegg:abstract-character ;
@@ -44393,7 +45477,7 @@ rep.ks-x1001:0x6245
     ideo:total-strokes    18 ;
     :eq rep.ucs_ks:0x9083         ; # &M-39191;
     :eq rep.daikanwa:39191        ; # &I-M-39191;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:25448   ] ;
     :subsume
@@ -44570,9 +45654,9 @@ rep.daikanwa:39192
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-5:19892 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-5:19892 ] ;
     .
 
 rep.ucs_unicode:0x48AF
@@ -44634,7 +45718,7 @@ rep.mj:026186
     :eq rep.gt-pj-1:28014         ; # &I-GT-52751;
     :eq rep.daikanwa:39193        ; # &I-M-39193;
     :eq rep.shinjigen:8399        ; # &MJ026186;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39124   ] ;
@@ -45011,7 +46095,7 @@ rep.daikanwa:39197
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:38936   ] ;
     .
@@ -45062,7 +46146,7 @@ rep.adobe-japan1-4:15192
     :eq rep.jis-x0213-1:0x7C5A    ; # &I-JX1-7C5A;
     :eq rep.daikanwa:39198        ; # &I-M-39198;
     :eq rep.jef-china3:0x67F1     ; # &I-JC3-67F1;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:shuowen_daxuben ,
                                     chisebib:zhengyun ,
                                     chisebib:chuci ,
@@ -45193,7 +46277,7 @@ rep.daikanwa:39199
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026137        ] ;
     .
@@ -45274,7 +46358,7 @@ rep.daikanwa:39201
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:019778        ] ;
     .
@@ -45356,7 +46440,7 @@ rep.daikanwa:39203
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6EEF         ] ;
     .
@@ -45397,7 +46481,7 @@ rep.daikanwa:39204
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13896 ] ;
     .
@@ -45523,7 +46607,7 @@ rep.daikanwa:39208
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14097 ] ;
     :subsume
@@ -45571,7 +46655,7 @@ rep.daikanwa:39209
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39091   ] ;
     .
@@ -45606,7 +46690,7 @@ rep.daikanwa:39210
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x64F7         ] ;
     .
@@ -45641,7 +46725,7 @@ rep.daikanwa:39212
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13905 ] ;
     .
@@ -45694,7 +46778,7 @@ rep.adobe-japan1-4:14250
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
     :eq rep.daikanwa:39214        ; # &I-M-39214;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026200        ] ;
     :subsume
@@ -46167,13 +47251,13 @@ rep.mj:026200
     :eq rep.gt-pj-1:28212         ; # &I-GT-52803;
     :eq rep.daikanwa:39216        ; # &I-M-39216;
     :eq rep.shinjigen:8209        ; # &MJ026200;
-    :from.ancient        [ :sources chisebib:kangxi ,
+    ideo:ancient-form-of [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:28423   ] ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39217   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39217   ] ;
     :subsume
         g2.mj:026200         ,
         g2.adobe-japan1-4:14235 ;
@@ -46423,18 +47507,15 @@ rep.mj:026201
     ideo:total-strokes    18 ;
     :eq rep.hanyo-denshi...jt:0xBD5E ; # &I-HD-JT-BD5E;
     :subsume
-        rep.ucs-bmp-itaiji-008:0x908A ,
+        rep.ucs-itaiji-008:0x908A ,
         g2.mj:026201         ;
     .
     rep.hanyo-denshi...jt:0xBD5E
                :abstract-glyph-of hanyo-denshi...jt:0xBD5E  .
-    rep.ucs-bmp-itaiji-008:0x908A
+    rep.ucs-itaiji-008:0x908A
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of ucs-bmp-itaiji-008:0x908A ;
-        :eq rep.ucs-itaiji-008:0x908A ; # &U-i008+908A;
+        :abstract-glyph-of ucs-itaiji-008:0x908A ;
         .
-        rep.ucs-itaiji-008:0x908A
-                   :abstract-glyph-of ucs-itaiji-008:0x908A  .
     g2.mj:026201
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:026201 ;
@@ -46676,9 +47757,9 @@ rep.daikanwa:39217
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:026200        ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.mj:026200        ] ;
     .
 
 rep.ucs_iso:0x28622
@@ -46829,7 +47910,7 @@ rep.adobe-japan1-5:18776
     :eq rep.jis-x0212:0x616A      ; # &I-JSP-616A;
     :eq rep.jis-x0213-2:0x7A23    ; # &I-JX2-7A23;
     :eq rep.daikanwa:39219        ; # &I-M-39219;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026127        ] ;
     :subsume
@@ -46951,7 +48032,7 @@ rep.daikanwa:39221
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x539F         ] ;
     .
@@ -46993,9 +48074,9 @@ rep.daikanwa:39222
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.original       [ :sources chisebib:zihui-bu ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-4:13692 ] ;
+    ideo:original-form-of [ :sources chisebib:zihui-bu ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-4:13692 ] ;
     :subsume
         g2.daikanwa:39222    ;
     .
@@ -47153,7 +48234,7 @@ rep.daikanwa:39227
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:009368        ] ;
     .
@@ -47194,7 +48275,7 @@ rep.daikanwa:39228
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026121        ] ;
     .
@@ -47235,7 +48316,7 @@ rep.daikanwa:39229
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026083        ] ;
     .
@@ -47276,7 +48357,7 @@ rep.daikanwa:39230
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:025985        ] ;
     .
@@ -47317,7 +48398,7 @@ rep.daikanwa:39231
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8F26         ] ;
     .
@@ -47478,7 +48559,7 @@ rep.daikanwa:39235
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          16 ;
     ideo:total-strokes    20 ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:15192 ] ;
     .
@@ -47512,7 +48593,7 @@ a.ucs:0x28641
     ideo:total-strokes    23 ;
     :eq rep.cns11643-7:0x5D22     ; # &I-C7-5D22;
     :eq rep.daikanwa:39236        ; # &I-M-39236;
-    :from.same           [ :sources chisebib:shuowen-changjian ,
+    ideo:same-as         [ :sources chisebib:shuowen-changjian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:15192 ] ;
     .
@@ -47577,7 +48658,7 @@ rep.daikanwa:39238
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          16 ;
     ideo:total-strokes    20 ;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026121        ] ;
     .
@@ -47656,7 +48737,7 @@ rep.daikanwa:39240
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          16 ;
     ideo:total-strokes    20 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x96A4         ] ;
     .
@@ -47697,10 +48778,10 @@ rep.daikanwa:39242
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:shuowen ,
-                                    chisebib:daikanwa ;
-                           :target  rep.jis-x0212:0x616B ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:shuowen ,
+                                     chisebib:daikanwa ;
+                            :target  rep.jis-x0212:0x616B ] ;
     .
 
 rep.ucs_iso:0x28642
@@ -47740,7 +48821,7 @@ rep.daikanwa:39243
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39242   ] ;
     .
@@ -47815,9 +48896,9 @@ rep.daikanwa:39245
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39234   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39234   ] ;
     .
 
 rep.ucs_iso:0x28645
@@ -47856,7 +48937,7 @@ rep.daikanwa:39246
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.ancient        [ :sources chisebib:wuyin-jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:wuyin-jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026013        ] ;
     .
@@ -47970,7 +49051,7 @@ rep.daikanwa:39249
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5331         ] ;
     .
@@ -48006,7 +49087,7 @@ rep.jis-x0212:0x616B
     ideo:total-strokes    22 ;
     :eq rep.ucs_jis:0x908E        ; # &JSP-616B;
     :eq rep.daikanwa:39250        ; # &I-M-39250;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39242   ] ;
     .
@@ -48075,7 +49156,7 @@ rep.daikanwa:39251
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          17 ;
     ideo:total-strokes    21 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:37358   ] ;
     .
@@ -48182,7 +49263,7 @@ rep.daikanwa:39254
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          18 ;
     ideo:total-strokes    22 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17150 ] ;
     .
@@ -48216,7 +49297,7 @@ rep.daikanwa:39255
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          18 ;
     ideo:total-strokes    22 ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39169   ] ;
     .
@@ -48313,9 +49394,9 @@ rep.daikanwa:39257
         isd:surround a.ucs:0x2ECD ; # ⻍
         isd:filling  rep.mj:057416   # &MJ057416;
     ] ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-4:13888 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-4:13888 ] ;
     :subsume
         g2.daikanwa:39257    ;
     .
@@ -48390,7 +49471,7 @@ rep.daikanwa:39258
     ideo:strokes          19 ;
     ideo:total-strokes    23 ;
     :form-of             rep.daikanwa:39169   ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:39169   ] ;
     .
@@ -48445,7 +49526,7 @@ rep.mj:026218
     :eq rep.gt-pj-1:28214         ; # &I-GT-52869;
     :eq rep.daikanwa:39259        ; # &I-M-39259;
     :eq rep.shinjigen:8404        ; # &MJ026218;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7F85         ] ;
     :subsume
@@ -48883,7 +49964,7 @@ rep.daikanwa:39262
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          20 ;
     ideo:total-strokes    24 ;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13855 ] ;
     .
@@ -48924,9 +50005,9 @@ rep.daikanwa:39263
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          20 ;
     ideo:total-strokes    24 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-4:13896 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-4:13896 ] ;
     .
 
 rep.ucs_iso:0x28660
@@ -48972,6 +50053,30 @@ a.ucs:0x28663
     rep.cns11643-5:0x783D
                :abstract-glyph-of     cns11643-5:0x783D  .
 
+a.ucs:0x28662
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28662 ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          20 ;
+    .
+
+rep.ucs_iso:0x28662
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28662 ] ;
+    :denotation-of
+        a.ucs:0x28662        ;
+    ideo:radical         162 ; # ⾡ 
+    ideo:strokes          20 ;
+    :subsume
+        g2.ucs_iso:0x28662   ;
+    .
+    g2.ucs_iso:0x28662
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28662 ] ;
+        .
+
 a.ucs:0x28664
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x28664 ;
@@ -48987,7 +50092,7 @@ rep.daikanwa:39266
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          21 ;
     ideo:total-strokes    25 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-2:0x7146 ] ;
     .
@@ -49028,9 +50133,9 @@ rep.daikanwa:39267
     ideo:radical         162 ; # ⾡ 
     ideo:strokes          22 ;
     ideo:total-strokes    26 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:39253   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:39253   ] ;
     .
 
 rep.ucs_iso:0x28666
@@ -49062,7 +50167,7 @@ a.ucs:0x28667
     ideo:total-strokes    30 ;
     :eq rep.cns11643-7:0x6568     ; # &I-C7-6568;
     :eq rep.daikanwa:39268        ; # &I-M-39268;
-    :from.same           [ :sources chisebib:shuowen-changjian ,
+    ideo:same-as         [ :sources chisebib:shuowen-changjian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9DF8         ] ;
     :subsume