Sync up with the current environment.
[chise/chiset.git] / Ideograph-R008-Lid.ttl
index bc7dbce..dd1c15a 100644 (file)
@@ -7,11 +7,15 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
+@prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
+@prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
 @prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
 @prefix g2.ucs_unicode: <http://www.chise.org/est/view/character/g2.ucs@unicode=> .
 @prefix g2.ucs_cns: <http://www.chise.org/est/view/character/g2.ucs@cns=> .
 @prefix g2.ucs_jis: <http://www.chise.org/est/view/character/g2.ucs@jis=> .
+@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 repi.ucs_ks: <http://www.chise.org/est/view/character/repi.ucs@ks=> .
 @prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
 @prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
+@prefix g.mj: <http://www.chise.org/est/view/character/g.mj=> .
 @prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
 @prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
 @prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
 @prefix g.big5-cdp: <http://www.chise.org/est/view/character/g.big5-cdp=> .
 @prefix a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
+@prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
 @prefix rep.hanyo-denshi...jb: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jb=> .
+@prefix rep.hanyo-denshi...ia: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ia=> .
 @prefix rep.hanyo-denshi...ib: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ib=> .
 @prefix rep.hanyo-denshi...jt: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jt=> .
 @prefix rep.hanyo-denshi...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
+@prefix rep.hanyo-denshi...tk: <http://www.chise.org/est/view/character/rep.hanyo-denshi...tk=> .
 @prefix g2.hanyo-denshi...ja: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ja=> .
 @prefix g2.hanyo-denshi...jb: <http://www.chise.org/est/view/character/g2.hanyo-denshi...jb=> .
+@prefix g2.hanyo-denshi...ia: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ia=> .
 @prefix g2.hanyo-denshi...ib: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ib=> .
 @prefix g2.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g2.hanyo-denshi...jt=> .
 @prefix g2.hanyo-denshi...ks: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ks=> .
+@prefix g2.hanyo-denshi...tk: <http://www.chise.org/est/view/character/g2.hanyo-denshi...tk=> .
 @prefix rep.koseki: <http://www.chise.org/est/view/character/rep.koseki=> .
 @prefix g2.koseki: <http://www.chise.org/est/view/character/g2.koseki=> .
 @prefix repi.hanyo-denshi...jb: <http://www.chise.org/est/view/character/repi.hanyo-denshi...jb=> .
+@prefix repi.hanyo-denshi...ia: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ia=> .
 @prefix repi.hanyo-denshi...ib: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ib=> .
 @prefix repi.hanyo-denshi...jt: <http://www.chise.org/est/view/character/repi.hanyo-denshi...jt=> .
 @prefix repi.hanyo-denshi...ks: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ks=> .
 @prefix rep.hanyo-denshi...ks...mf: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks...mf=> .
+@prefix rep.hanyo-denshi...tk...mf-01: <http://www.chise.org/est/view/character/rep.hanyo-denshi...tk...mf-01=> .
+@prefix g2.hanyo-denshi...tk...mf-01: <http://www.chise.org/est/view/character/g2.hanyo-denshi...tk...mf-01=> .
 @prefix repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
+@prefix o.hanyo-denshi...jt: <http://www.chise.org/est/view/character/o.hanyo-denshi...jt=> .
+@prefix g.hanyo-denshi...ia: <http://www.chise.org/est/view/character/g.hanyo-denshi...ia=> .
+@prefix g.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g.hanyo-denshi...jt=> .
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix g2.gt: <http://www.chise.org/est/view/character/g2.gt=> .
 @prefix repi.gt: <http://www.chise.org/est/view/character/repi.gt=> .
 @prefix rep.gt-pj-1: <http://www.chise.org/est/view/character/rep.gt-pj-1=> .
 @prefix rep.gt-pj-2: <http://www.chise.org/est/view/character/rep.gt-pj-2=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...ho: <http://www.chise.org/est/view/character/rep.daikanwa...ho=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
 @prefix repi.daikanwa...ho: <http://www.chise.org/est/view/character/repi.daikanwa...ho=> .
 @prefix g.daikanwa: <http://www.chise.org/est/view/character/g.daikanwa=> .
-@prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
 @prefix rep.shinjigen: <http://www.chise.org/est/view/character/rep.shinjigen=> .
 @prefix g2.shinjigen: <http://www.chise.org/est/view/character/g2.shinjigen=> .
 @prefix rep.hanziku-1: <http://www.chise.org/est/view/character/rep.hanziku-1=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
+@prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
+@prefix g2.ucs-itaiji-002: <http://www.chise.org/est/view/character/g2.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
+@prefix g2.ucs-itaiji-005: <http://www.chise.org/est/view/character/g2.ucs-itaiji-005=> .
+@prefix rep.ucs-itaiji-007: <http://www.chise.org/est/view/character/rep.ucs-itaiji-007=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
 @prefix hanyo-denshi...ja: <http://rdf.chise.org/data/ccs/hanyo-denshi...ja/code-point/> .
 @prefix hanyo-denshi...jb: <http://rdf.chise.org/data/ccs/hanyo-denshi...jb/code-point/> .
+@prefix hanyo-denshi...ia: <http://rdf.chise.org/data/ccs/hanyo-denshi...ia/code-point/> .
 @prefix hanyo-denshi...ib: <http://rdf.chise.org/data/ccs/hanyo-denshi...ib/code-point/> .
 @prefix hanyo-denshi...jt: <http://rdf.chise.org/data/ccs/hanyo-denshi...jt/code-point/> .
 @prefix hanyo-denshi...ks: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks/code-point/> .
+@prefix hanyo-denshi...tk: <http://rdf.chise.org/data/ccs/hanyo-denshi...tk/code-point/> .
 @prefix koseki: <http://rdf.chise.org/data/ccs/koseki/code-point/> .
 @prefix hanyo-denshi...ks...mf: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks...mf/code-point/> .
+@prefix hanyo-denshi...tk...mf-01: <http://rdf.chise.org/data/ccs/hanyo-denshi...tk...mf-01/code-point/> .
 @prefix gt: <http://rdf.chise.org/data/ccs/gt/code-point/> .
 @prefix gt-k: <http://rdf.chise.org/data/ccs/gt-k/code-point/> .
 @prefix gt-pj-1: <http://rdf.chise.org/data/ccs/gt-pj-1/code-point/> .
 @prefix big5-cdp-itaiji-001: <http://rdf.chise.org/data/ccs/big5-cdp-itaiji-001/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/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-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
+@prefix ucs-itaiji-007: <http://rdf.chise.org/data/ccs/ucs-itaiji-007/code-point/> .
 
-a.ucs_component:0x4EA0
+a.ucs:0x4EA0
     a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:component ;
-                             :target     ucs:0x4EA0  ] ;
+    :abstract-character-of ucs:0x4EA0 ;
+    :from.denotational_component
+        a.ucs_component:0x20089 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           0 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0x3E             ; # &IWDS1-062;
+    :eq a.iwds-1:0062             ; # 亠
     .
-    a.iwds-1:0x3E
-           :abstract-character-of         iwds-1:0x3E    .
+    a.iwds-1:0062
+           :abstract-character-of         iwds-1:0062    .
 
-a.ucs:0x4EA0
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x4EA0 ;
-    :from.denotational_component
-        a.ucs_component:0x4EA0 ;
+o.ucs_unicode:0x4EA0
+    a chisegg:unified-glyph ;
+    :unified-glyph-of [ :context domain:unicode ;
+                        :target     ucs:0x4EA0  ] ;
+    :denotation-of
+        a.ucs:0x4EA0         ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           0 ;
     ideo:total-strokes     2 ;
     :sound               [ :context domain:ja...on...kan ;
                            :target  ( "tou" ) ;
                          ] ;
-    :eq o.jis-x0208:0x5035        ; # 亠
+    :eq o.jis-x0208:0x5035        ; # &o-J0-5035;
     :subsume
         rep.gt:00375         ,
         rep.adobe-japan1-0:04110 ;
@@ -353,7 +381,7 @@ rep.mj:006462
     :eq rep.gt-k:00202            ; # &I-GT-K00202;
     :eq rep.gt-pj-k1:13123        ; # &MJ006462;
     :eq rep.daikanwa:00287        ; # &I-M-00287;
-    :eq rep.shinjigen:00090       ; # &MJ006462;
+    :eq rep.shinjigen:0090        ; # &MJ006462;
     :subsume
         g2.mj:006462         ;
     .
@@ -367,8 +395,8 @@ rep.mj:006462
                :abstract-glyph-of       gt-pj-k1:13123   .
     rep.daikanwa:00287
                :abstract-glyph-of       daikanwa:00287   .
-    rep.shinjigen:00090
-               :abstract-glyph-of      shinjigen:00090   .
+    rep.shinjigen:0090
+               :abstract-glyph-of      shinjigen:0090    .
     g2.mj:006462
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006462 ;
@@ -382,7 +410,7 @@ rep.mj:006462
         :eq g2.hanyo-denshi...ks:003470 ; # &g2-MJ006462;
         :eq g2.gt-k:00202             ; # &g2-MJ006462;
         :eq g2.daikanwa:00287         ; # &g2-MJ006462;
-        :eq g2.shinjigen:00090        ; # &g2-MJ006462;
+        :eq g2.shinjigen:0090         ; # &g2-MJ006462;
         :subsume
             repi.daikanwa:00287  ,
             repi.hanyo-denshi...ks:003470 ,
@@ -400,8 +428,8 @@ rep.mj:006462
               :abstract-glyph-form-of           gt-k:00202   .
         g2.daikanwa:00287
               :abstract-glyph-form-of       daikanwa:00287   .
-        g2.shinjigen:00090
-              :abstract-glyph-form-of      shinjigen:00090   .
+        g2.shinjigen:0090
+              :abstract-glyph-form-of      shinjigen:0090    .
         repi.daikanwa:00287
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00287 ;
@@ -454,7 +482,7 @@ rep.mj:006463
     :eq rep.gt:00378              ; # &I-GT-00378;
     :eq rep.gt-k:00201            ; # &I-GT-K00201;
     :eq rep.gt-pj-1:19252         ; # &I-GT-00378;
-    :eq rep.shinjigen:00089       ; # &MJ006463;
+    :eq rep.shinjigen:0089        ; # &MJ006463;
     :subsume
         g2.mj:006463         ,
         g2.ucs_unicode:0x4EA1 ;
@@ -482,8 +510,8 @@ rep.mj:006463
                :abstract-glyph-of           gt-k:00201   .
     rep.gt-pj-1:19252
                :abstract-glyph-of        gt-pj-1:19252   .
-    rep.shinjigen:00089
-               :abstract-glyph-of      shinjigen:00089   .
+    rep.shinjigen:0089
+               :abstract-glyph-of      shinjigen:0089    .
     g2.mj:006463
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006463 ;
@@ -504,7 +532,7 @@ rep.mj:006463
         :eq g2.hanyo-denshi...ja:0x4B34 ; # &g2-MJ006463;
         :eq g2.gt:00378               ; # &g2-MJ006463;
         :eq g2.gt-k:00201             ; # &g2-MJ006463;
-        :eq g2.shinjigen:00089        ; # &g2-MJ006463;
+        :eq g2.shinjigen:0089         ; # &g2-MJ006463;
         :subsume
             repi.jis-x0208:0x4B34 ,
             repi.adobe-japan1-6:03682 ,
@@ -538,8 +566,8 @@ rep.mj:006463
               :abstract-glyph-form-of             gt:00378   .
         g2.gt-k:00201
               :abstract-glyph-form-of           gt-k:00201   .
-        g2.shinjigen:00089
-              :abstract-glyph-form-of      shinjigen:00089   .
+        g2.shinjigen:0089
+              :abstract-glyph-form-of      shinjigen:0089    .
         repi.jis-x0208:0x4B34
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x4B34 ;
@@ -584,51 +612,35 @@ rep.mj:006463
         g2.gb2312:0x4D76
               :abstract-glyph-form-of         gb2312:0x4D76  .
 
-rep.mj:056865
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:056865 ;
-    ideo:radical           8 ; # ⼇ 
-    ideo:strokes           1 ;
-    ideo:total-strokes     3 ;
-    :eq rep.koseki:002080         ; # &MJ056865;
-    :form-of             rep.mj:006462        ;
-    :subsume
-        g2.mj:056865         ,
-        g2.koseki:002080     ;
-    .
-    rep.koseki:002080
-               :abstract-glyph-of         koseki:002080  .
-    g2.mj:056865
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of mj:056865 ;
-        :subsume
-            repi.mj:056865       ,
-            repi.hng-nkk:03300   ;
-        .
-        repi.mj:056865
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:056865 ;
-            .
-        repi.hng-nkk:03300
-            a chisegg:glyph-image ;
-            :glyph-image-of hng-nkk:03300 ;
-            .
-    g2.koseki:002080
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of koseki:002080 ;
-        .
-
 a.ucs:0x4EA2
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4EA2 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
-    ideo:hanyu-dazidian  ( 1 280 1 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    a.ucs_component:0x51E0   # &A-compU+51E0;
+    ] ;
     :sound               [ :context domain:ja...on ;
                            :target  ( "kAu" ) ;
                          ] ;
-    :eq rep.adobe-japan1-0:04111  ; # &I-AJ1-04111;
+    .
+
+rep.adobe-japan1-0:04111
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-0:04111 ;
+    :denotation-of
+        a.ucs:0x4EA2         ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     4 ;
+    ideo:hanyu-dazidian  ( 1 280 1 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    a.ucs:0x51E0   # 几
+    ] ;
+    :eq rep.ucs_unicode:0x4EA2    ; # &AJ1-04111;
     :eq rep.jis-x0208:0x5036      ; # &I-J90-5036;
     :eq rep.gb2312:0x3F3A         ; # &I-G0-3F3A;
     :eq rep.ks-x1001:0x7971       ; # &I-K0-7971;
@@ -639,13 +651,14 @@ a.ucs:0x4EA2
     :eq rep.gt-k:00508            ; # &I-GT-K00508;
     :eq rep.gt-pj-1:20534         ; # &I-GT-00379;
     :eq rep.daikanwa:00288        ; # &I-M-00288;
-    :eq rep.shinjigen:00092       ; # 亢
+    :eq rep.shinjigen:0092        ; # &AJ1-04111;
     :subsume
         g2.ucs_unicode:0x4EA2 ,
         repi.hng-kar:00060   ;
     .
-    rep.adobe-japan1-0:04111
-               :abstract-glyph-of adobe-japan1-0:04111   .
+    rep.ucs_unicode:0x4EA2
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x4EA2  ] .
     rep.jis-x0208:0x5036
                :abstract-glyph-of      jis-x0208:0x5036  .
     rep.gb2312:0x3F3A
@@ -666,8 +679,8 @@ a.ucs:0x4EA2
                :abstract-glyph-of        gt-pj-1:20534   .
     rep.daikanwa:00288
                :abstract-glyph-of       daikanwa:00288   .
-    rep.shinjigen:00092
-               :abstract-glyph-of      shinjigen:00092   .
+    rep.shinjigen:0092
+               :abstract-glyph-of      shinjigen:0092    .
     g2.ucs_unicode:0x4EA2
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -675,10 +688,10 @@ a.ucs:0x4EA2
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EA2         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:below    g2.ucs_unicode:0x51E0   # &g2-AJ1-04243;
+        ] ;
         :eq g2.adobe-japan1-0:04111   ; # &g2-AJ1-04111;
         :eq g2.gb2312:0x3F3A          ; # &g2-AJ1-04111;
         :eq g2.ks-x1001:0x7971        ; # &g2-AJ1-04111;
@@ -688,7 +701,7 @@ a.ucs:0x4EA2
         :eq g2.gt:00379               ; # &g2-AJ1-04111;
         :eq g2.gt-k:00508             ; # &g2-AJ1-04111;
         :eq g2.daikanwa:00288         ; # &g2-AJ1-04111;
-        :eq g2.shinjigen:00092        ; # &g2-AJ1-04111;
+        :eq g2.shinjigen:0092         ; # &g2-AJ1-04111;
         :subsume
             repi.daikanwa:00288  ,
             repi.jis-x0208:0x5036 ,
@@ -716,8 +729,8 @@ a.ucs:0x4EA2
               :abstract-glyph-form-of           gt-k:00508   .
         g2.daikanwa:00288
               :abstract-glyph-form-of       daikanwa:00288   .
-        g2.shinjigen:00092
-              :abstract-glyph-form-of      shinjigen:00092   .
+        g2.shinjigen:0092
+              :abstract-glyph-form-of      shinjigen:0092    .
         repi.daikanwa:00288
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00288 ;
@@ -768,34 +781,63 @@ a.ucs:0x4EA3
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
-    :subsume
-        rep.daikanwa:00289   ,
-        rep.cns11643-3:0x2147 ;
-    .
-    rep.daikanwa:00289
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00289 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    rep.big5-cdp:0x89AB   # &CDP-89AB;
-    ] ;
-        .
-    rep.cns11643-3:0x2147
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x2147 ;
-        ideo:hanyu-dazidian  ( 1 279 7 ) ;
+    ideo:hanyu-dazidian  ( 1 279 7 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    rep.big5-cdp:0x89AB   # &CDP-89AB;
     ] ;
-        :eq rep.ucs_unicode:0x4EA3    ; # &C3-2147;
-        :eq rep.hanziku-1:0xDFB1      ; # &I-HZK01-DFB1;
+    :eq rep.cns11643-3:0x2147     ; # &I-C3-2147;
+    :eq rep.daikanwa:00289        ; # &I-M-00289;
+    :from.Zhouwen        [ :sources chisebib:shuowen ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x5927         ] ;
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x4E93         ] ;
+    :subsume
+        g2.daikanwa:00289    ,
+        g2.ucs_unicode:0x4EA3 ;
+    .
+    rep.cns11643-3:0x2147
+               :abstract-glyph-of     cns11643-3:0x2147  .
+    rep.daikanwa:00289
+               :abstract-glyph-of       daikanwa:00289   .
+    g2.daikanwa:00289
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:00289 ;
+        :subsume
+            repi.daikanwa:00289  ,
+            rep.hanziku-1:0xDFB1 ;
         .
-        rep.ucs_unicode:0x4EA3
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x4EA3  ] .
+        repi.daikanwa:00289
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00289 ;
+            .
         rep.hanziku-1:0xDFB1
-                   :abstract-glyph-of      hanziku-1:0xDFB1  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xDFB1 ;
+            .
+    g2.ucs_unicode:0x4EA3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4EA3  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        :eq g2.cns11643-3:0x2147      ; # &g2-UU+4EA3;
+        :subsume
+            repi.cns11643-3:0x2147 ,
+            repi.ucs_unicode:0x4EA3 ;
+        .
+        g2.cns11643-3:0x2147
+              :abstract-glyph-form-of     cns11643-3:0x2147  .
+        repi.cns11643-3:0x2147
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2147 ;
+            .
+        repi.ucs_unicode:0x4EA3
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4EA3  ] ;
+            .
 
 a.ucs:0x20141
     a chisegg:abstract-character ;
@@ -832,21 +874,153 @@ a.ucs:0x20142
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20142 ] ;
         ideo:hanyu-dazidian  ( 1 280 2 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    rep.big5-cdp:0x865D   # &CDP-865D;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    rep.big5-cdp:0x865D   # &CDP-865D;
+        ] ;
         :eq rep.hanziku-1:0xDFCC      ; # &HZK01-DFCC;
         .
         rep.hanziku-1:0xDFCC
                    :abstract-glyph-of      hanziku-1:0xDFCC  .
 
+a.ucs:0x2CF43
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CF43 ;
+    :denotation-of
+        a.ucs_cognate:0x6C38 ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    rep.ucs-itaiji-002:0x6C34   # &U-i002+6C34;
+    ] ;
+    :eq rep.mj:056887             ; # &I-MJ056887;
+    :eq rep.koseki:003530         ; # 𬽃
+    :form-of             [ :target  rep.adobe-japan1-0:01260 ;
+                           :sources chisebib:koseki ,
+                                    chisebib:mj ] ,
+                         a.ucs:0x23C75        ;
+    :subsume
+        g2.mj:056887         ;
+    .
+    rep.mj:056887
+               :abstract-glyph-of             mj:056887  .
+    rep.koseki:003530
+               :abstract-glyph-of         koseki:003530  .
+    g2.mj:056887
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056887 ;
+        :eq g2.ucs_JP...hanazono:0x2CF43 ; # &g2-MJ056887;
+        :eq g2.koseki:003530          ; # &g2-MJ056887;
+        .
+        g2.ucs_JP...hanazono:0x2CF43
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CF43 ] .
+        g2.koseki:003530
+              :abstract-glyph-form-of         koseki:003530  .
+
 a.big5-cdp:0x8BAA
     a chisegg:abstract-character ;
     :abstract-character-of big5-cdp:0x8BAA ;
     ideo:radical           8 ; # ⼇ 
     .
 
+a.mj:000023
+    a chisegg:abstract-character ;
+    :abstract-character-of mj:000023 ;
+    :denotation-of
+        a.ucs_cognate:0x342A ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :eq o.hanyo-denshi...jt:0xC0B3 ; # &o-HD-JT-C0B3;
+    :subsume
+        rep.mj:000023        ,
+        rep.hanyo-denshi...tk:01024240 ;
+    .
+    o.hanyo-denshi...jt:0xC0B3
+                :unified-glyph-of hanyo-denshi...jt:0xC0B3  .
+    rep.mj:000023
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of mj:000023 ;
+        :from.denotational_component
+            a.ucs:0x342A         ;
+        ideo:strokes           [ :context domain:koseki  ;
+                                 :target  4 ] ;
+        ideo:total-strokes     [ :context domain:koseki  ;
+                                 :target  6 ] ;
+        ideo:strokes           [ :context domain:mj      ;
+                                 :target  3 ] ;
+        ideo:total-strokes     [ :context domain:mj      ;
+                                 :target  5 ] ;
+        isd:structure [ a idc:⿻ ;
+            isd:underlying a.ucs:0x4E00 ; # 一
+            isd:overlaying rep.big5-cdp:0x88B8   # &CDP-88B8;
+        ] ;
+        :eq rep.koseki:003600         ; # &MJ000023;
+        :eq g.hanyo-denshi...jt:0xC0B3 ; # &MJ000023;
+        :form-of             [ :sources chisebib:koseki ;
+                               :target  a.ucs:0x342A         ] ;
+        :subsume
+            g2.mj:000023         ;
+        .
+        rep.koseki:003600
+                   :abstract-glyph-of         koseki:003600  .
+        g.hanyo-denshi...jt:0xC0B3
+                   :detailed-glyph-of hanyo-denshi...jt:0xC0B3  .
+        g2.mj:000023
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:000023 ;
+            :eq g2.hanyo-denshi...jt:0xC0B3 ; # &g2-MJ000023;
+            :eq g2.koseki:003600          ; # &g2-MJ000023;
+            :subsume
+                repi.hanyo-denshi...jt:0xC0B3 ,
+                repi.mj:000023       ;
+            .
+            g2.hanyo-denshi...jt:0xC0B3
+                  :abstract-glyph-form-of hanyo-denshi...jt:0xC0B3  .
+            g2.koseki:003600
+                  :abstract-glyph-form-of         koseki:003600  .
+            repi.hanyo-denshi...jt:0xC0B3
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...jt:0xC0B3 ;
+                .
+            repi.mj:000023
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:000023 ;
+                .
+    rep.hanyo-denshi...tk:01024240
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of hanyo-denshi...tk:01024240 ;
+        isd:structure [ a idc:⿻ ;
+            isd:underlying a.ucs:0x4E3F ; # 丿
+            isd:overlaying rep.big5-cdp:0x88B8   # &CDP-88B8;
+        ] ;
+        :eq rep.hanyo-denshi...tk...mf-01:00002424 ; # &HD-TK-01024240;
+        :subsume
+            g2.hanyo-denshi...tk:01024240 ;
+        .
+        rep.hanyo-denshi...tk...mf-01:00002424
+                   :abstract-glyph-of hanyo-denshi...tk...mf-01:00002424 .
+        g2.hanyo-denshi...tk:01024240
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of hanyo-denshi...tk:01024240 ;
+            :eq g2.hanyo-denshi...tk...mf-01:00002424 ; # &g2-HD-TK-01024240;
+            .
+            g2.hanyo-denshi...tk...mf-01:00002424
+                  :abstract-glyph-form-of hanyo-denshi...tk...mf-01:00002424 .
+
+a.ucs_cognate:0x342A
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x342A  ] ;
+    ideo:radical           8 ; # ⼇ 
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "gai" ) ;
+                         ] ;
+    .
+
 rep.big5-cdp:0x8BAA
     a chisegg:abstract-glyph ;
     :abstract-glyph-of big5-cdp:0x8BAA ;
@@ -859,29 +1033,48 @@ rep.big5-cdp:0x8BAA
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    a.ucs:0x53E3   # 口
     ] ;
-    :from.simplified     [ :context domain:component...connect-below ;
-                           :target  a.ucs:0x9AD8         ] ;
+    ideo:simplified-form-of [ :context domain:component...connect-below ;
+                              :target  a.ucs:0x9AD8         ] ;
     :subsume
-        g2.big5-cdp:0x8BAA   ,
-        rep.gt-k:01444       ;
+        g.big5-cdp:0x8BAA    ;
     .
-    g2.big5-cdp:0x8BAA
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of big5-cdp:0x8BAA ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
-    ] ;
-        .
-    rep.gt-k:01444
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:01444 ;
-        :eq rep.gt-pj-k1:14125        ; # &GT-K01444;
-        :from.identical      [ :context domain:component...connect-below ;
-                               :target  rep.big5-cdp:0x8BAA  ] ;
+    g.big5-cdp:0x8BAA
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of big5-cdp:0x8BAA ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:below    a.ucs:0x53E3   # 口
+        ] ;
+        :subsume
+            g2.big5-cdp:0x8BAA   ,
+            rep.gt-k:01444       ;
         .
-        rep.gt-pj-k1:14125
-                   :abstract-glyph-of       gt-pj-k1:14125   .
+        g2.big5-cdp:0x8BAA
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of big5-cdp:0x8BAA ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+                isd:below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
+            ] ;
+            .
+        rep.gt-k:01444
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of gt-k:01444 ;
+            :eq rep.gt-pj-k1:14125        ; # &GT-K01444;
+            :from.identical      [ :context domain:component...connect-below ;
+                                   :target  g.big5-cdp:0x8BAA    ] ;
+            :subsume
+                g2.gt-k:01444        ;
+            .
+            rep.gt-pj-k1:14125
+                       :abstract-glyph-of       gt-pj-k1:14125   .
+            g2.gt-k:01444
+                a chisegg:abstract-glyph-form ;
+                :abstract-glyph-form-of gt-k:01444 ;
+                :eq g2.gt-pj-k1:14125         ; # &g2-GT-K01444;
+                .
+                g2.gt-pj-k1:14125
+                      :abstract-glyph-form-of       gt-pj-k1:14125   .
 
 a.ucs:0x4EA4
     a chisegg:abstract-character ;
@@ -931,7 +1124,7 @@ rep.mj:006467
     :eq rep.gt:00390              ; # &I-GT-00390;
     :eq rep.gt-pj-1:14450         ; # &I-GT-00390;
     :eq rep.daikanwa:00291        ; # &I-M-00291;
-    :eq rep.shinjigen:00096       ; # &MJ006467;
+    :eq rep.shinjigen:0096        ; # &MJ006467;
     :subsume
         rep.gt:00389         ,
         repi.hng-kar:05250   ,
@@ -965,18 +1158,18 @@ rep.mj:006467
                :abstract-glyph-of        gt-pj-1:14450   .
     rep.daikanwa:00291
                :abstract-glyph-of       daikanwa:00291   .
-    rep.shinjigen:00096
-               :abstract-glyph-of      shinjigen:00096   .
+    rep.shinjigen:0096
+               :abstract-glyph-of      shinjigen:0096    .
     rep.gt:00389
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00389 ;
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EA4         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    rep.gt:25336   # &GT-25336;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    rep.gt:25336   # &GT-25336;
+        ] ;
         :eq g2.ucs_ks:0x4EA4          ; # &g2-AJ1-13439;
         :eq g2.adobe-japan1-4:13439   ; # &g2-AJ1-13439;
         :eq g2.jis-x0208_1978:0x3872  ; # &g2-AJ1-13439;
@@ -985,7 +1178,7 @@ rep.mj:006467
         :eq rep.gt-k:01602            ; # &I-GT-K01602;
         :eq rep.gt-pj-2:12875         ; # &g2-AJ1-13439;
         :eq g2.daikanwa:00291         ; # &g2-AJ1-13439;
-        :eq rep.shinjigen:00097       ; # &g2-AJ1-13439;
+        :eq rep.shinjigen:0097        ; # &g2-AJ1-13439;
         :eq rep.jef-china3:0x41D6     ; # &I-JC3-41D6;
         :subsume
             repi.daikanwa:00291  ,
@@ -1015,8 +1208,8 @@ rep.mj:006467
                    :abstract-glyph-of        gt-pj-2:12875   .
         g2.daikanwa:00291
               :abstract-glyph-form-of       daikanwa:00291   .
-        rep.shinjigen:00097
-                   :abstract-glyph-of      shinjigen:00097   .
+        rep.shinjigen:0097
+                   :abstract-glyph-of      shinjigen:0097    .
         rep.jef-china3:0x41D6
                    :abstract-glyph-of     jef-china3:0x41D6  .
         repi.daikanwa:00291
@@ -1079,10 +1272,10 @@ rep.mj:006467
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EA4         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    g2.ucs_unicode:0x7236   # &g2-AJ1-03541;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    g2.ucs_unicode:0x7236   # &g2-AJ1-03541;
+        ] ;
         :eq g2.ucs_unicode:0x4EA4     ; # &g2-MJ006467;
         :eq g2.adobe-japan1-0:01958   ; # &g2-MJ006467;
         :eq g2.gb2312:0x3D3B          ; # &g2-MJ006467;
@@ -1091,7 +1284,7 @@ rep.mj:006467
         :eq g2.jis-x0213-1:0x3872     ; # &g2-MJ006467;
         :eq g2.hanyo-denshi...ja:0x3872 ; # &g2-MJ006467;
         :eq g2.gt:00390               ; # &g2-MJ006467;
-        :eq g2.shinjigen:00096        ; # &g2-MJ006467;
+        :eq g2.shinjigen:0096         ; # &g2-MJ006467;
         :subsume
             repi.jis-x0208_1990:0x3872 ,
             repi.adobe-japan1-6:01958 ,
@@ -1118,8 +1311,8 @@ rep.mj:006467
               :abstract-glyph-form-of hanyo-denshi...ja:0x3872  .
         g2.gt:00390
               :abstract-glyph-form-of             gt:00390   .
-        g2.shinjigen:00096
-              :abstract-glyph-form-of      shinjigen:00096   .
+        g2.shinjigen:0096
+              :abstract-glyph-form-of      shinjigen:0096    .
         repi.jis-x0208_1990:0x3872
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:1990    ;
@@ -1215,19 +1408,20 @@ rep.gt-k:01604
             :glyph-image-of gt-k:01604 ;
             .
 
-a.ucs:0x4EA5
+a.ucs_cognate:0x4EA5
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x4EA5 ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x4EA5  ] ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           4 ;
     ideo:total-strokes     6 ;
     .
 
-rep.mj:006470
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:006470 ;
+a.ucs:0x4EA5
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x4EA5 ;
     :denotation-of
-        a.ucs:0x4EA5         ;
+        a.ucs_cognate:0x4EA5 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           4 ;
     ideo:total-strokes     6 ;
@@ -1238,8 +1432,7 @@ rep.mj:006470
     :sound               [ :context domain:ja...on ;
                            :target  ( "gai" ) ;
                          ] ;
-    :eq a.ucs_iwds-1:0x4EA5       ; # &MJ006470;
-    :eq rep.ucs_unicode:0x4EA5    ; # &MJ006470;
+    :eq rep.mj:006470             ; # &I-MJ006470;
     :eq rep.adobe-japan1-0:01195  ; # &I-AJ1-01195;
     :eq rep.jis-x0208:0x3067      ; # &I-J90-3067;
     :eq rep.gb2312:0x3A25         ; # &I-G0-3A25;
@@ -1253,18 +1446,14 @@ rep.mj:006470
     :eq rep.gt-k:01560            ; # &I-GT-K01560;
     :eq rep.gt-pj-1:12391         ; # &I-GT-00387;
     :eq rep.daikanwa:00292        ; # &I-M-00292;
-    :eq rep.shinjigen:00094       ; # &MJ006470;
+    :eq rep.shinjigen:0094        ; # 亥
     :subsume
         rep.mj:006471        ,
         g2.mj:006470         ,
         g2.ucs_unicode:0x4EA5 ;
     .
-    a.ucs_iwds-1:0x4EA5
-           :abstract-character-of [ :context domain:iwds-1  ;
-                                    :target     ucs:0x4EA5  ] .
-    rep.ucs_unicode:0x4EA5
-               :abstract-glyph-of [ :context domain:unicode ;
-                                    :target     ucs:0x4EA5  ] .
+    rep.mj:006470
+               :abstract-glyph-of             mj:006470  .
     rep.adobe-japan1-0:01195
                :abstract-glyph-of adobe-japan1-0:01195   .
     rep.jis-x0208:0x3067
@@ -1291,22 +1480,22 @@ rep.mj:006470
                :abstract-glyph-of        gt-pj-1:12391   .
     rep.daikanwa:00292
                :abstract-glyph-of       daikanwa:00292   .
-    rep.shinjigen:00094
-               :abstract-glyph-of      shinjigen:00094   .
+    rep.shinjigen:0094
+               :abstract-glyph-of      shinjigen:0094    .
     rep.mj:006471
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:006471 ;
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EA5         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x2011E ; # 𠄞
-        isd:middle   rep.gt:00154 ; # &GT-00154;
-        isd:below    a.ucs:0x4EBA   # 人
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x2011E ; # 𠄞
+            isd:middle   rep.gt:00154 ; # &GT-00154;
+            isd:below    a.ucs:0x4EBA   # 人
+        ] ;
         :eq g2.hanyo-denshi...jt:0xAD2B ; # &MJ006471;
         :eq g2.daikanwa:00292         ; # &MJ006471;
-        :eq rep.shinjigen:00095       ; # &MJ006471;
+        :eq rep.shinjigen:0095        ; # &MJ006471;
         :eq rep.jef-china3:0x41D5     ; # &I-JC3-41D5;
         :subsume
             repi.daikanwa:00292  ,
@@ -1318,8 +1507,8 @@ rep.mj:006470
               :abstract-glyph-form-of hanyo-denshi...jt:0xAD2B  .
         g2.daikanwa:00292
               :abstract-glyph-form-of       daikanwa:00292   .
-        rep.shinjigen:00095
-                   :abstract-glyph-of      shinjigen:00095   .
+        rep.shinjigen:0095
+                   :abstract-glyph-of      shinjigen:0095    .
         rep.jef-china3:0x41D5
                    :abstract-glyph-of     jef-china3:0x41D5  .
         repi.daikanwa:00292
@@ -1347,11 +1536,11 @@ rep.mj:006470
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EA5         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   rep.gt:00154 ; # &GT-00154;
-        isd:below    a.ucs:0x4EBA   # 人
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   rep.gt:00154 ; # &GT-00154;
+            isd:below    a.ucs:0x4EBA   # 人
+        ] ;
         :eq g2.ucs_cns:0x4EA5         ; # &g2-MJ006470;
         :eq g2.ucs_jis:0x4EA5         ; # &g2-MJ006470;
         :eq g2.ucs_ks:0x4EA5          ; # &g2-MJ006470;
@@ -1363,7 +1552,7 @@ rep.mj:006470
         :eq g2.hanyo-denshi...ja:0x3067 ; # &g2-MJ006470;
         :eq g2.gt:00387               ; # &g2-MJ006470;
         :eq g2.gt-k:01560             ; # &g2-MJ006470;
-        :eq g2.shinjigen:00094        ; # &g2-MJ006470;
+        :eq g2.shinjigen:0094         ; # &g2-MJ006470;
         :subsume
             repi.jis-x0208:0x3067 ,
             repi.adobe-japan1-6:01195 ,
@@ -1397,8 +1586,8 @@ rep.mj:006470
               :abstract-glyph-form-of             gt:00387   .
         g2.gt-k:01560
               :abstract-glyph-form-of           gt-k:01560   .
-        g2.shinjigen:00094
-              :abstract-glyph-form-of      shinjigen:00094   .
+        g2.shinjigen:0094
+              :abstract-glyph-form-of      shinjigen:0094    .
         repi.jis-x0208:0x3067
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x3067 ;
@@ -1454,11 +1643,17 @@ rep.ucs-itaiji-005:0x4EA5
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-itaiji-005:0x4EA5 ;
     :denotation-of
-        a.ucs:0x4EA5         ;
+        a.ucs_cognate:0x4EA5 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           4 ;
     ideo:total-strokes     6 ;
+    :subsume
+        g2.ucs-itaiji-005:0x4EA5 ;
     .
+    g2.ucs-itaiji-005:0x4EA5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-005:0x4EA5 ;
+        .
 
 a.ucs:0x4EA6
     a chisegg:abstract-character ;
@@ -1484,10 +1679,10 @@ a.ucs:0x4EA6
     :eq rep.gt-k:01690            ; # &I-GT-K01690;
     :eq rep.gt-pj-1:19314         ; # &I-GT-00384;
     :eq rep.daikanwa:00293        ; # &I-M-00293;
-    :eq rep.shinjigen:00093       ; # 亦
-    :from.simplified     [ :context domain:CN...component ;
-                           :target  rep.adobe-japan1-5:18690 ,
-                                    a.ucs:0x9FBB         ] ;
+    :eq rep.shinjigen:0093        ; # 亦
+    ideo:simplified-form-of [ :context domain:CN...component ;
+                              :target  rep.adobe-japan1-5:18690 ,
+                                       a.ucs:0x9FBB         ] ;
     :subsume
         g2.ucs_unicode:0x4EA6 ,
         repi.hng-kak:00030   ,
@@ -1516,8 +1711,8 @@ a.ucs:0x4EA6
                :abstract-glyph-of        gt-pj-1:19314   .
     rep.daikanwa:00293
                :abstract-glyph-of       daikanwa:00293   .
-    rep.shinjigen:00093
-               :abstract-glyph-of      shinjigen:00093   .
+    rep.shinjigen:0093
+               :abstract-glyph-of      shinjigen:0093    .
     g2.ucs_unicode:0x4EA6
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -1525,10 +1720,10 @@ a.ucs:0x4EA6
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EA6         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    rep.big5-cdp:0x8CB5   # &CDP-8CB5;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    rep.big5-cdp:0x8CB5   # &CDP-8CB5;
+        ] ;
         :eq g2.adobe-japan1-0:03744   ; # &g2-AJ1-03744;
         :eq g2.gb2312:0x5260          ; # &g2-AJ1-03744;
         :eq g2.ks-x1001:0x6632        ; # &g2-AJ1-03744;
@@ -1538,7 +1733,7 @@ a.ucs:0x4EA6
         :eq g2.gt:00384               ; # &g2-AJ1-03744;
         :eq g2.gt-k:01690             ; # &g2-AJ1-03744;
         :eq g2.daikanwa:00293         ; # &g2-AJ1-03744;
-        :eq g2.shinjigen:00093        ; # &g2-AJ1-03744;
+        :eq g2.shinjigen:0093         ; # &g2-AJ1-03744;
         :subsume
             repi.daikanwa:00293  ,
             repi.jis-x0208:0x4B72 ,
@@ -1569,8 +1764,8 @@ a.ucs:0x4EA6
               :abstract-glyph-form-of           gt-k:01690   .
         g2.daikanwa:00293
               :abstract-glyph-form-of       daikanwa:00293   .
-        g2.shinjigen:00093
-              :abstract-glyph-form-of      shinjigen:00093   .
+        g2.shinjigen:0093
+              :abstract-glyph-form-of      shinjigen:0093    .
         repi.daikanwa:00293
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00293 ;
@@ -1655,10 +1850,10 @@ a.ucs:0x20143
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20143 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs:0x4ECE   # 从
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    a.ucs:0x4ECE   # 从
+        ] ;
         :eq g2.cns11643-6:0x234A      ; # &g2-M-00294;
         :eq g2.daikanwa:00294         ; # &g2-M-00294;
         :subsume
@@ -1692,6 +1887,8 @@ a.ucs:0x20143
 a.ucs:0x342B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x342B ;
+    :from.denotational_component
+        a.ucs_component:0x56DF ;
     ideo:radical           [ :context domain:ucs     ;
                              :target            8 ; # ⼇
                            ] ;
@@ -1701,64 +1898,65 @@ a.ucs:0x342B
     ideo:strokes           4 ;
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 1 283 2 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    a.ucs:0x51F6   # 凶
+    ] ;
     :eq rep.cns11643-3:0x2323     ; # &I-C3-2323;
     :eq rep.big5-cdp:0x8C5E       ; # &I-CDP-8C5E;
-    :eq rep.daikanwa...ho:00008   ; # 㐫
+    :eq rep.daikanwa...ho:0008    ; # 㐫
     :eq rep.cbeta:04846           ; # &I-CB04846;
     :eq rep.jef-china3:0x8DCD     ; # &I-JC3-8DCD;
-    :from.vulgar         [ :sources chisebib:pianhai-leibian ,
+    ideo:simplified-form-of [ :context domain:CN...component...inductive ;
+                              :target  a.ucs:0x21FFA        ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  rep.cbeta:09464      ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x51F6         ] ;
     :subsume
-        repi.daikanwa...ho:00008 ,
+        repi.daikanwa...ho:0008 ,
+        g2.cns11643-3:0x2323 ,
         g2.ucs_unicode:0x342B ;
     .
     rep.cns11643-3:0x2323
                :abstract-glyph-of     cns11643-3:0x2323  .
     rep.big5-cdp:0x8C5E
                :abstract-glyph-of       big5-cdp:0x8C5E  .
-    rep.daikanwa...ho:00008
-               :abstract-glyph-of  daikanwa...ho:00008   .
+    rep.daikanwa...ho:0008
+               :abstract-glyph-of  daikanwa...ho:0008    .
     rep.cbeta:04846
                :abstract-glyph-of          cbeta:04846   .
     rep.jef-china3:0x8DCD
                :abstract-glyph-of     jef-china3:0x8DCD  .
-    repi.daikanwa...ho:00008
+    repi.daikanwa...ho:0008
         a chisegg:glyph-image ;
-        :glyph-image-of daikanwa...ho:00008 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    g2.adobe-japan1-0:01695   # &g2-AJ1-01695;
-    ] ;
-        :eq g2.ucs_cns:0x342B         ; # &g2-CDP-8C5E;
-        :eq g2.cns11643-3:0x2323      ; # &g2-CDP-8C5E;
+        :glyph-image-of daikanwa...ho:0008 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:below    g2.adobe-japan1-0:01695   # &g2-AJ1-01695;
+        ] ;
         :eq g2.big5-cdp:0x8C5E        ; # &g2-CDP-8C5E;
-        :eq g2.daikanwa...ho:00008    ; # &g2-CDP-8C5E;
+        :eq g2.daikanwa...ho:0008     ; # &g2-CDP-8C5E;
         :eq g2.cbeta:04846            ; # &g2-CDP-8C5E;
         :eq g2.jef-china3:0x8DCD      ; # &g2-CDP-8C5E;
         :subsume
-            repi.daikanwa...ho:00008 ,
+            repi.daikanwa...ho:0008 ,
             repi.big5-cdp:0x8C5E ,
             repi.cbeta:04846     ,
-            repi.cns11643-3:0x2323 ,
             repi.jef-china3:0x8DCD ;
         .
-        g2.ucs_cns:0x342B
-              :abstract-glyph-form-of [ :context domain:cns     ;
-                                        :target     ucs:0x342B  ] .
-        g2.cns11643-3:0x2323
-              :abstract-glyph-form-of     cns11643-3:0x2323  .
         g2.big5-cdp:0x8C5E
               :abstract-glyph-form-of       big5-cdp:0x8C5E  .
-        g2.daikanwa...ho:00008
-              :abstract-glyph-form-of  daikanwa...ho:00008   .
+        g2.daikanwa...ho:0008
+              :abstract-glyph-form-of  daikanwa...ho:0008    .
         g2.cbeta:04846
               :abstract-glyph-form-of          cbeta:04846   .
         g2.jef-china3:0x8DCD
               :abstract-glyph-form-of     jef-china3:0x8DCD  .
-        repi.daikanwa...ho:00008
+        repi.daikanwa...ho:0008
             a chisegg:glyph-image ;
-            :glyph-image-of daikanwa...ho:00008 ;
+            :glyph-image-of daikanwa...ho:0008 ;
             .
         repi.big5-cdp:0x8C5E
             a chisegg:glyph-image ;
@@ -1768,24 +1966,102 @@ a.ucs:0x342B
             a chisegg:glyph-image ;
             :glyph-image-of cbeta:04846 ;
             .
-        repi.cns11643-3:0x2323
-            a chisegg:glyph-image ;
-            :glyph-image-of cns11643-3:0x2323 ;
-            .
         repi.jef-china3:0x8DCD
             a chisegg:glyph-image ;
             :glyph-image-of jef-china3:0x8DCD ;
             .
+    g2.cns11643-3:0x2323
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x2323 ;
+        :eq g2.ucs_cns:0x342B         ; # &g2-CU+342B;
+        .
+        g2.ucs_cns:0x342B
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x342B  ] .
     g2.ucs_unicode:0x342B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x342B  ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:below    g2.ucs_unicode:0x51F6   # &g2-UU+51F6;
+        ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        .
+
+a.ucs:0x342A
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x342A ;
+    :denotation-of
+        a.ucs_cognate:0x342A ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     6 ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    g2.ucs_unicode:0x51F6   # &g2-UU+51F6;
-    ] ;
-        :g2.ucs_JP...hanazono      rdf:nil ;
+        isd:below    rep.big5-cdp:0x88B8   # &CDP-88B8;
+    ] ;
+    :eq rep.mj:000022             ; # &I-MJ000022;
+    :eq rep.hanyo-denshi...ia:0x2126 ; # &I-HD-IA-2126;
+    :eq rep.hanyo-denshi...jt:0xC0B3 ; # &I-HD-JT-C0B3;
+    :eq rep.koseki:003590         ; # 㐪
+    :form-of             [ :sources chisebib:mj ;
+                           :target  a.ucs:0x4EA5         ] ;
+    :subsume
+        g.ucs_unicode:0x342A ;
+    .
+    rep.mj:000022
+               :abstract-glyph-of             mj:000022  .
+    rep.hanyo-denshi...ia:0x2126
+               :abstract-glyph-of hanyo-denshi...ia:0x2126  .
+    rep.hanyo-denshi...jt:0xC0B3
+               :abstract-glyph-of hanyo-denshi...jt:0xC0B3  .
+    rep.koseki:003590
+               :abstract-glyph-of         koseki:003590  .
+    g.ucs_unicode:0x342A
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:unicode ;
+                             :target     ucs:0x342A  ] ;
+        :eq g.mj:000022               ; # &G-MJ000022;
+        :eq g.hanyo-denshi...ia:0x2126 ; # &G-MJ000022;
+        :subsume
+            g2.mj:000022         ;
         .
+        g.mj:000022
+                   :detailed-glyph-of             mj:000022  .
+        g.hanyo-denshi...ia:0x2126
+                   :detailed-glyph-of hanyo-denshi...ia:0x2126  .
+        g2.mj:000022
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:000022 ;
+            :eq g2.ucs_unicode:0x342A     ; # &g2-MJ000022;
+            :eq g2.hanyo-denshi...ia:0x2126 ; # &g2-MJ000022;
+            :eq g2.koseki:003590          ; # &g2-MJ000022;
+            :subsume
+                repi.hanyo-denshi...ia:0x2126 ,
+                repi.mj:000022       ,
+                repi.ucs_unicode:0x342A ;
+            .
+            g2.ucs_unicode:0x342A
+                  :abstract-glyph-form-of [ :context domain:unicode ;
+                                            :target     ucs:0x342A  ] .
+            g2.hanyo-denshi...ia:0x2126
+                  :abstract-glyph-form-of hanyo-denshi...ia:0x2126  .
+            g2.koseki:003590
+                  :abstract-glyph-form-of         koseki:003590  .
+            repi.hanyo-denshi...ia:0x2126
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...ia:0x2126 ;
+                .
+            repi.mj:000022
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:000022 ;
+                .
+            repi.ucs_unicode:0x342A
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x342A  ] ;
+                .
 
 a.ucs:0x4EA7
     a chisegg:abstract-character ;
@@ -1797,42 +2073,65 @@ a.ucs:0x4EA7
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 1 283 3 ) ;
     isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :below    a.ucs:0x4E37   # 丷
-            ]
-        ] ;
+        isd:above    rep.big5-cdp:0x8BAE ; # &CDP-8BAE;
         isd:below    a.ucs:0x5382   # 厂
     ] ;
     :eq rep.gb2312:0x327A         ; # &I-G0-327A;
-    :eq rep.hanziku-1:0xE06E      ; # &I-HZK01-E06E;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x7523         ] ;
+    :eq rep.gt-k:02308            ; # &I-GT-K02308;
+    :eq rep.gt-pj-k1:14935        ; # 产
+    :eq rep.jef-china3:0x81C1     ; # &I-JC3-81C1;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x7523         ] ;
+    :subsume
+        g2.ucs_unicode:0x4EA7 ;
     .
     rep.gb2312:0x327A
                :abstract-glyph-of         gb2312:0x327A  .
-    rep.hanziku-1:0xE06E
-               :abstract-glyph-of      hanziku-1:0xE06E  .
-
-rep.gt-k:02308
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt-k:02308 ;
-    :to.ucs              a.ucs:0x4EA7 ; # 产
-    ideo:radical           8 ; # ⼇ 
-    ideo:strokes           4 ;
-    ideo:total-strokes     6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8BAE ; # &CDP-8BAE;
-        isd:below    a.ucs:0x5382   # 厂
-    ] ;
-    :eq rep.gt-pj-k1:14935        ; # &GT-K02308;
-    :eq rep.jef-china3:0x81C1     ; # &I-JC3-81C1;
-    .
+    rep.gt-k:02308
+               :abstract-glyph-of           gt-k:02308   .
     rep.gt-pj-k1:14935
                :abstract-glyph-of       gt-pj-k1:14935   .
     rep.jef-china3:0x81C1
                :abstract-glyph-of     jef-china3:0x81C1  .
+    g2.ucs_unicode:0x4EA7
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4EA7  ] ;
+        :eq g2.gb2312:0x327A          ; # &g2-GT-K02308;
+        :eq g2.gt-k:02308             ; # &g2-GT-K02308;
+        :eq g2.gt-pj-k1:14935         ; # &g2-GT-K02308;
+        :eq g2.jef-china3:0x81C1      ; # &g2-GT-K02308;
+        :subsume
+            repi.gt-k:02308      ,
+            repi.jef-china3:0x81C1 ,
+            repi.ucs_unicode:0x4EA7 ,
+            rep.hanziku-1:0xE06E ;
+        .
+        g2.gb2312:0x327A
+              :abstract-glyph-form-of         gb2312:0x327A  .
+        g2.gt-k:02308
+              :abstract-glyph-form-of           gt-k:02308   .
+        g2.gt-pj-k1:14935
+              :abstract-glyph-form-of       gt-pj-k1:14935   .
+        g2.jef-china3:0x81C1
+              :abstract-glyph-form-of     jef-china3:0x81C1  .
+        repi.gt-k:02308
+            a chisegg:glyph-image ;
+            :glyph-image-of gt-k:02308 ;
+            .
+        repi.jef-china3:0x81C1
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x81C1 ;
+            .
+        repi.ucs_unicode:0x4EA7
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4EA7  ] ;
+            .
+        rep.hanziku-1:0xE06E
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE06E ;
+            .
 
 a.ucs:0x20146
     a chisegg:abstract-character ;
@@ -1844,9 +2143,9 @@ a.ucs:0x20146
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     rep.ucs_iso:0x20088 ; # &CDP-87F5;
-                :right    rep.big5-cdp:0x85BF   # &CDP-85BF;
+            isd:structure [ a idc:⿰ ;
+                isd:left     rep.ucs_iso:0x20088 ; # &CDP-87F5;
+                isd:right    rep.big5-cdp:0x85BF   # &CDP-85BF;
             ]
         ]
     ] ;
@@ -1868,8 +2167,8 @@ rep.gt-k:02128
         isd:below    rep.big5-cdp:0x89CC   # &CDP-89CC;
     ] ;
     :eq rep.gt-pj-k2:17484        ; # &GT-K02128;
-    :from.simplified     [ :context domain:component...connect-below ;
-                           :target  a.ucs:0x9AD9         ] ;
+    ideo:simplified-form-of [ :context domain:component...connect-below ;
+                              :target  a.ucs:0x9AD9         ] ;
     :subsume
         g2.gt-k:02128        ;
     .
@@ -1920,7 +2219,7 @@ a.ucs:0x4EA8
     :eq rep.gt-k:02521            ; # &I-GT-K02521;
     :eq rep.gt-pj-1:13692         ; # &I-GT-00392;
     :eq rep.daikanwa:00295        ; # &I-M-00295;
-    :eq rep.shinjigen:00098       ; # 亨
+    :eq rep.shinjigen:0098        ; # 亨
     :subsume
         g2.ucs_unicode:0x4EA8 ;
     .
@@ -1946,8 +2245,8 @@ a.ucs:0x4EA8
                :abstract-glyph-of        gt-pj-1:13692   .
     rep.daikanwa:00295
                :abstract-glyph-of       daikanwa:00295   .
-    rep.shinjigen:00098
-               :abstract-glyph-of      shinjigen:00098   .
+    rep.shinjigen:0098
+               :abstract-glyph-of      shinjigen:0098    .
     g2.ucs_unicode:0x4EA8
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -1955,10 +2254,10 @@ a.ucs:0x4EA8
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EA8         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x4E86   # 了
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x4E86   # 了
+        ] ;
         :eq g2.adobe-japan1-0:01686   ; # &g2-AJ1-01686;
         :eq g2.gb2312:0x3A60          ; # &g2-AJ1-01686;
         :eq g2.ks-x1001:0x7A7B        ; # &g2-AJ1-01686;
@@ -1968,7 +2267,7 @@ a.ucs:0x4EA8
         :eq g2.gt:00392               ; # &g2-AJ1-01686;
         :eq g2.gt-k:02521             ; # &g2-AJ1-01686;
         :eq g2.daikanwa:00295         ; # &g2-AJ1-01686;
-        :eq g2.shinjigen:00098        ; # &g2-AJ1-01686;
+        :eq g2.shinjigen:0098         ; # &g2-AJ1-01686;
         :subsume
             repi.daikanwa:00295  ,
             repi.jis-x0208:0x357C ,
@@ -1996,8 +2295,8 @@ a.ucs:0x4EA8
               :abstract-glyph-form-of           gt-k:02521   .
         g2.daikanwa:00295
               :abstract-glyph-form-of       daikanwa:00295   .
-        g2.shinjigen:00098
-              :abstract-glyph-form-of      shinjigen:00098   .
+        g2.shinjigen:0098
+              :abstract-glyph-form-of      shinjigen:0098    .
         repi.daikanwa:00295
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00295 ;
@@ -2070,10 +2369,10 @@ a.ucs_iwds-1:0x342C
         :abstract-glyph-of adobe-japan1-5:17246 ;
         ideo:strokes           5 ;
         ideo:total-strokes     7 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.mj:031960 ; # &MJ031960;
-        isd:below    a.ucs:0x2BDA7   # 𫶧
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.mj:031960 ; # &MJ031960;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
         :eq rep.ucs_unicode:0x342C    ; # &AJ1-17246;
         :eq rep.cns11643-4:0x2337     ; # &I-C4-2337;
         :eq rep.jis-x0213-2:0x2132    ; # &I-JX2-2132;
@@ -2101,10 +2400,10 @@ a.ucs_iwds-1:0x342C
             :rep.decomposition   [ :context domain:cid     ;
                                    :target  a.ucs:0x342C         ,
                                             a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.mj:031960 ; # &MJ031960;
-        isd:below    g2.ucs_iso:0x2BDA7   # &g2-GT-10942;
-    ] ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    rep.mj:031960 ; # &MJ031960;
+                isd:below    g2.ucs_iso:0x2BDA7   # &g2-GT-10942;
+            ] ;
             :eq g2.adobe-japan1-5:17246   ; # &g2-AJ1-17246;
             :eq g2.jis-x0213-2:0x2132     ; # &g2-AJ1-17246;
             :eq g2.daikanwa:00296         ; # &g2-AJ1-17246;
@@ -2159,20 +2458,20 @@ a.ucs_iwds-1:0x342C
         ideo:strokes           4 ;
         ideo:total-strokes     6 ;
         ideo:hanyu-dazidian  ( 1 284 4 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.mj:031959 ; # &MJ031959;
-        isd:below    a.ucs:0x2BDA7   # 𫶧
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.mj:031959 ; # &MJ031959;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
         :subsume
             g2.big5-cdp:0x8C50   ;
         .
         g2.big5-cdp:0x8C50
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of big5-cdp:0x8C50 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:031959 ; # &g2-MJ031959;
-        isd:below    g2.ucs_iso:0x2BDA7   # &g2-GT-10942;
-    ] ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    g2.mj:031959 ; # &g2-MJ031959;
+                isd:below    g2.ucs_iso:0x2BDA7   # &g2-GT-10942;
+            ] ;
             .
 
 a.ucs:0x20148
@@ -2188,10 +2487,10 @@ a.ucs:0x20148
     rep.daikanwa:00297
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:00297 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    a.ucs:0x4E19   # 丙
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    a.ucs:0x4E19   # 丙
+        ] ;
         :eq rep.cbeta:01504           ; # &I-CB01504;
         .
         rep.cbeta:01504
@@ -2201,10 +2500,10 @@ a.ucs:0x20148
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20148 ] ;
         ideo:hanyu-dazidian  ( 1 284 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs:0x4E19   # 丙
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    a.ucs:0x4E19   # 丙
+        ] ;
         :eq rep.cns11643-5:0x2331     ; # &C5-2331;
         :eq rep.hanziku-1:0xE0AE      ; # &I-HZK01-E0AE;
         .
@@ -2284,8 +2583,8 @@ rep.big5-cdp:0x8C4D
     ] ;
     :eq rep.gt-k:02791            ; # &I-GT-K02791;
     :eq rep.gt-pj-k1:12876        ; # &CDP-8C4D;
-    :from.simplified     [ :context domain:component...connect-below ;
-                           :target  a.ucs:0x9AD8         ] ;
+    ideo:simplified-form-of [ :context domain:component...connect-below ;
+                              :target  a.ucs:0x9AD8         ] ;
     :subsume
         g2.gt-k:02791        ;
     .
@@ -2296,10 +2595,10 @@ rep.big5-cdp:0x8C4D
     g2.gt-k:02791
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt-k:02791 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt-k:01444 ; # &GT-K01444;
-        isd:below    g2.ucs_unicode:0x5196   # &g2-AJ1-04227;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt-k:01444 ; # &GT-K01444;
+            isd:below    g2.ucs_unicode:0x5196   # &g2-AJ1-04227;
+        ] ;
         :eq g2.big5-cdp:0x8C4D        ; # &g2-CDP-8C4D;
         .
         g2.big5-cdp:0x8C4D
@@ -2341,7 +2640,7 @@ rep.adobe-japan1-0:01687
     :eq rep.gt-k:03669            ; # &I-GT-K03669;
     :eq rep.gt-pj-1:13693         ; # &I-GT-00396;
     :eq rep.daikanwa:00298        ; # &I-M-00298;
-    :eq rep.shinjigen:00101       ; # &AJ1-01687;
+    :eq rep.shinjigen:0101        ; # &AJ1-01687;
     :subsume
         g2.ucs_unicode:0x4EAB ,
         rep.gt-k:03670       ;
@@ -2369,8 +2668,8 @@ rep.adobe-japan1-0:01687
                :abstract-glyph-of        gt-pj-1:13693   .
     rep.daikanwa:00298
                :abstract-glyph-of       daikanwa:00298   .
-    rep.shinjigen:00101
-               :abstract-glyph-of      shinjigen:00101   .
+    rep.shinjigen:0101
+               :abstract-glyph-of      shinjigen:0101    .
     g2.ucs_unicode:0x4EAB
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2378,10 +2677,10 @@ rep.adobe-japan1-0:01687
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EAB         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x5B50   # 子
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x5B50   # 子
+        ] ;
         :eq g2.adobe-japan1-0:01687   ; # &g2-AJ1-01687;
         :eq g2.gb2312:0x4F6D          ; # &g2-AJ1-01687;
         :eq g2.ks-x1001:0x7A3D        ; # &g2-AJ1-01687;
@@ -2391,7 +2690,7 @@ rep.adobe-japan1-0:01687
         :eq g2.gt:00396               ; # &g2-AJ1-01687;
         :eq g2.gt-k:03669             ; # &g2-AJ1-01687;
         :eq g2.daikanwa:00298         ; # &g2-AJ1-01687;
-        :eq g2.shinjigen:00101        ; # &g2-AJ1-01687;
+        :eq g2.shinjigen:0101         ; # &g2-AJ1-01687;
         :subsume
             repi.daikanwa:00298  ,
             repi.jis-x0208:0x357D ,
@@ -2419,8 +2718,8 @@ rep.adobe-japan1-0:01687
               :abstract-glyph-form-of           gt-k:03669   .
         g2.daikanwa:00298
               :abstract-glyph-form-of       daikanwa:00298   .
-        g2.shinjigen:00101
-              :abstract-glyph-form-of      shinjigen:00101   .
+        g2.shinjigen:0101
+              :abstract-glyph-form-of      shinjigen:0101    .
         repi.daikanwa:00298
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00298 ;
@@ -2558,7 +2857,7 @@ a.ucs:0x4EAC
     :eq rep.gt-k:03671            ; # &I-GT-K03671;
     :eq rep.gt-pj-1:13694         ; # &I-GT-00397;
     :eq rep.daikanwa:00299        ; # &I-M-00299;
-    :eq rep.shinjigen:00102       ; # 京
+    :eq rep.shinjigen:0102        ; # 京
     :subsume
         g2.ucs_unicode:0x4EAC ;
     .
@@ -2584,8 +2883,8 @@ a.ucs:0x4EAC
                :abstract-glyph-of        gt-pj-1:13694   .
     rep.daikanwa:00299
                :abstract-glyph-of       daikanwa:00299   .
-    rep.shinjigen:00102
-               :abstract-glyph-of      shinjigen:00102   .
+    rep.shinjigen:0102
+               :abstract-glyph-of      shinjigen:0102    .
     g2.ucs_unicode:0x4EAC
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2593,10 +2892,10 @@ a.ucs:0x4EAC
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EAC         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x5C0F   # 小
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x5C0F   # 小
+        ] ;
         :eq g2.adobe-japan1-0:01688   ; # &g2-AJ1-01688;
         :eq g2.gb2312:0x3E29          ; # &g2-AJ1-01688;
         :eq g2.ks-x1001:0x4C48        ; # &g2-AJ1-01688;
@@ -2606,7 +2905,7 @@ a.ucs:0x4EAC
         :eq g2.gt:00397               ; # &g2-AJ1-01688;
         :eq g2.gt-k:03671             ; # &g2-AJ1-01688;
         :eq g2.daikanwa:00299         ; # &g2-AJ1-01688;
-        :eq g2.shinjigen:00102        ; # &g2-AJ1-01688;
+        :eq g2.shinjigen:0102         ; # &g2-AJ1-01688;
         :subsume
             repi.daikanwa:00299  ,
             repi.jis-x0208:0x357E ,
@@ -2634,8 +2933,8 @@ a.ucs:0x4EAC
               :abstract-glyph-form-of           gt-k:03671   .
         g2.daikanwa:00299
               :abstract-glyph-form-of       daikanwa:00299   .
-        g2.shinjigen:00102
-              :abstract-glyph-form-of      shinjigen:00102   .
+        g2.shinjigen:0102
+              :abstract-glyph-form-of      shinjigen:0102    .
         repi.daikanwa:00299
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00299 ;
@@ -2680,6 +2979,10 @@ a.ucs:0x342D
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x342D ;
     ideo:radical           8 ; # ⼇ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    a.ucs_iwds-1:0x56DE   # &A-IWDSU+56DE;
+    ] ;
     .
 
 rep.cns11643-4:0x2534
@@ -2691,12 +2994,16 @@ rep.cns11643-4:0x2534
     ideo:strokes           6 ;
     ideo:total-strokes     8 ;
     ideo:hanyu-dazidian  ( 1 284 7 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    a.ucs:0x56DE   # 回
+    ] ;
     :eq rep.ucs_unicode:0x342D    ; # &C4-2534;
     :eq rep.big5-cdp:0x8BE5       ; # &I-CDP-8BE5;
     :eq rep.daikanwa:00300        ; # &I-M-00300;
-    :eq rep.shinjigen:02230       ; # &C4-2534;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:04756 ] ;
+    :eq rep.shinjigen:2230        ; # &C4-2534;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:04756 ] ;
     :subsume
         g2.ucs_unicode:0x342D ;
     .
@@ -2707,20 +3014,20 @@ rep.cns11643-4:0x2534
                :abstract-glyph-of       big5-cdp:0x8BE5  .
     rep.daikanwa:00300
                :abstract-glyph-of       daikanwa:00300   .
-    rep.shinjigen:02230
-               :abstract-glyph-of      shinjigen:02230   .
+    rep.shinjigen:2230
+               :abstract-glyph-of      shinjigen:2230    .
     g2.ucs_unicode:0x342D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x342D  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs:0x56DE   # 回
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    a.ucs:0x56DE   # 回
+        ] ;
         :eq g2.cns11643-4:0x2534      ; # &g2-CDP-8BE5;
         :eq g2.big5-cdp:0x8BE5        ; # &g2-CDP-8BE5;
         :eq g2.daikanwa:00300         ; # &g2-CDP-8BE5;
-        :eq g2.shinjigen:02230        ; # &g2-CDP-8BE5;
+        :eq g2.shinjigen:2230         ; # &g2-CDP-8BE5;
         :subsume
             repi.daikanwa:00300  ,
             repi.big5-cdp:0x8BE5 ,
@@ -2733,8 +3040,8 @@ rep.cns11643-4:0x2534
               :abstract-glyph-form-of       big5-cdp:0x8BE5  .
         g2.daikanwa:00300
               :abstract-glyph-form-of       daikanwa:00300   .
-        g2.shinjigen:02230
-              :abstract-glyph-form-of      shinjigen:02230   .
+        g2.shinjigen:2230
+              :abstract-glyph-form-of      shinjigen:2230    .
         repi.daikanwa:00300
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00300 ;
@@ -2780,10 +3087,10 @@ a.ucs:0x2014C
     g2.daikanwa:00301
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00301 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x5927   # 大
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x5927   # 大
+        ] ;
         .
     g2.ucs_iso:0x2014C
         a chisegg:abstract-glyph-form ;
@@ -2842,9 +3149,9 @@ rep.gt-k:04733
         isd:below    a.ucs:0x5196   # 冖
     ] ;
     :eq rep.gt-pj-k1:14650        ; # &GT-K04733;
-    :from.simplified     [ :context domain:component...connect-below ;
-                           :target  a.ucs:0x9AD9         ] ;
-    :from.vulgar         [ :context domain:component ;
+    ideo:simplified-form-of [ :context domain:component...connect-below ;
+                              :target  a.ucs:0x9AD9         ] ;
+    ideo:vulgar-form-of  [ :context domain:component ;
                            :target  rep.big5-cdp:0x8C4D  ] ;
     :subsume
         g2.gt-k:04733        ;
@@ -2854,10 +3161,10 @@ rep.gt-k:04733
     g2.gt-k:04733
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt-k:04733 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02128 ; # &g2-GT-K02128;
-        isd:below    g2.ucs_unicode:0x5196   # &g2-AJ1-04227;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02128 ; # &g2-GT-K02128;
+            isd:below    g2.ucs_unicode:0x5196   # &g2-AJ1-04227;
+        ] ;
         .
 
 a.ucs:0x4EAD
@@ -2885,7 +3192,7 @@ a.ucs:0x4EAD
     :eq rep.gt-k:05149            ; # &I-GT-K05149;
     :eq rep.gt-pj-1:17506         ; # &I-GT-00406;
     :eq rep.daikanwa:00303        ; # &I-M-00303;
-    :eq rep.shinjigen:00104       ; # 亭
+    :eq rep.shinjigen:0104        ; # 亭
     :subsume
         g2.ucs_unicode:0x4EAD ;
     .
@@ -2911,8 +3218,8 @@ a.ucs:0x4EAD
                :abstract-glyph-of        gt-pj-1:17506   .
     rep.daikanwa:00303
                :abstract-glyph-of       daikanwa:00303   .
-    rep.shinjigen:00104
-               :abstract-glyph-of      shinjigen:00104   .
+    rep.shinjigen:0104
+               :abstract-glyph-of      shinjigen:0104    .
     g2.ucs_unicode:0x4EAD
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2920,10 +3227,10 @@ a.ucs:0x4EAD
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EAD         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    a.ucs:0x4E01   # 丁
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    a.ucs:0x4E01   # 丁
+        ] ;
         :eq g2.adobe-japan1-0:03070   ; # &g2-AJ1-03070;
         :eq g2.gb2312:0x4D24          ; # &g2-AJ1-03070;
         :eq g2.ks-x1001:0x6F4D        ; # &g2-AJ1-03070;
@@ -2933,7 +3240,7 @@ a.ucs:0x4EAD
         :eq g2.gt:00406               ; # &g2-AJ1-03070;
         :eq g2.gt-k:05149             ; # &g2-AJ1-03070;
         :eq g2.daikanwa:00303         ; # &g2-AJ1-03070;
-        :eq g2.shinjigen:00104        ; # &g2-AJ1-03070;
+        :eq g2.shinjigen:0104         ; # &g2-AJ1-03070;
         :subsume
             repi.daikanwa:00303  ,
             repi.jis-x0208:0x4462 ,
@@ -2961,8 +3268,8 @@ a.ucs:0x4EAD
               :abstract-glyph-form-of           gt-k:05149   .
         g2.daikanwa:00303
               :abstract-glyph-form-of       daikanwa:00303   .
-        g2.shinjigen:00104
-              :abstract-glyph-form-of      shinjigen:00104   .
+        g2.shinjigen:0104
+              :abstract-glyph-form-of      shinjigen:0104    .
         repi.daikanwa:00303
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00303 ;
@@ -3056,7 +3363,7 @@ rep.mj:006477
     :eq rep.gt-k:05202            ; # &I-GT-K05202;
     :eq rep.gt-pj-1:20028         ; # &I-GT-00408;
     :eq rep.daikanwa:00304        ; # &I-M-00304;
-    :eq rep.shinjigen:00106       ; # &MJ006477;
+    :eq rep.shinjigen:0106        ; # &MJ006477;
     :subsume
         g2.mj:006477         ;
     .
@@ -3089,8 +3396,8 @@ rep.mj:006477
                :abstract-glyph-of        gt-pj-1:20028   .
     rep.daikanwa:00304
                :abstract-glyph-of       daikanwa:00304   .
-    rep.shinjigen:00106
-               :abstract-glyph-of      shinjigen:00106   .
+    rep.shinjigen:0106
+               :abstract-glyph-of      shinjigen:0106    .
     g2.mj:006477
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006477 ;
@@ -3100,10 +3407,10 @@ rep.mj:006477
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EAE         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    a.ucs:0x513F   # 儿
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    a.ucs:0x513F   # 儿
+        ] ;
         :eq g2.ucs_cns:0x4EAE         ; # &g2-MJ006477;
         :eq g2.ucs_jis:0x4EAE         ; # &g2-MJ006477;
         :eq g2.ucs_ks:0x4EAE          ; # &g2-MJ006477;
@@ -3116,7 +3423,7 @@ rep.mj:006477
         :eq g2.gt:00408               ; # &g2-MJ006477;
         :eq g2.gt-k:05202             ; # &g2-MJ006477;
         :eq g2.daikanwa:00304         ; # &g2-MJ006477;
-        :eq g2.shinjigen:00106        ; # &g2-MJ006477;
+        :eq g2.shinjigen:0106         ; # &g2-MJ006477;
         :subsume
             repi.daikanwa:00304  ,
             repi.jis-x0208:0x4E3C ,
@@ -3153,8 +3460,8 @@ rep.mj:006477
               :abstract-glyph-form-of           gt-k:05202   .
         g2.daikanwa:00304
               :abstract-glyph-form-of       daikanwa:00304   .
-        g2.shinjigen:00106
-              :abstract-glyph-form-of      shinjigen:00106   .
+        g2.shinjigen:0106
+              :abstract-glyph-form-of      shinjigen:0106    .
         repi.daikanwa:00304
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00304 ;
@@ -3210,8 +3517,8 @@ rep.mj:006478
     :rep.ucs_JP...hanazono     rdf:nil ;
     :eq rep.gb2312:0x4141         ; # &I-G0-4141;
     :eq rep.hanyo-denshi...ib:0x2D35 ; # &I-HD-IB-2D35;
-    :eq rep.shinjigen:00107       ; # &MJ006478;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    :eq rep.shinjigen:0107        ; # &MJ006478;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:006477        ] ;
     :subsume
         g2.mj:006478         ;
@@ -3223,23 +3530,23 @@ rep.mj:006478
                :abstract-glyph-of         gb2312:0x4141  .
     rep.hanyo-denshi...ib:0x2D35
                :abstract-glyph-of hanyo-denshi...ib:0x2D35  .
-    rep.shinjigen:00107
-               :abstract-glyph-of      shinjigen:00107   .
+    rep.shinjigen:0107
+               :abstract-glyph-of      shinjigen:0107    .
     g2.mj:006478
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006478 ;
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EAE         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    a.ucs:0x51E0   # 几
+        ] ;
         :eq g2.ucs_unicode:0x4EAE     ; # &g2-MJ006478;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x4141          ; # &g2-MJ006478;
         :eq g2.hanyo-denshi...ib:0x2D35 ; # &g2-MJ006478;
-        :eq g2.shinjigen:00107        ; # &g2-MJ006478;
+        :eq g2.shinjigen:0107         ; # &g2-MJ006478;
         :subsume
             repi.hanyo-denshi...ib:0x2D35 ,
             repi.mj:006478       ,
@@ -3252,8 +3559,8 @@ rep.mj:006478
               :abstract-glyph-form-of         gb2312:0x4141  .
         g2.hanyo-denshi...ib:0x2D35
               :abstract-glyph-form-of hanyo-denshi...ib:0x2D35  .
-        g2.shinjigen:00107
-              :abstract-glyph-form-of      shinjigen:00107   .
+        g2.shinjigen:0107
+              :abstract-glyph-form-of      shinjigen:0107    .
         repi.hanyo-denshi...ib:0x2D35
             a chisegg:glyph-image ;
             :glyph-image-of hanyo-denshi...ib:0x2D35 ;
@@ -3294,13 +3601,13 @@ rep.adobe-japan1-6:21082
     :eq rep.cns11643-3:0x2B26     ; # &I-C3-2B26;
     :eq rep.big5-cdp:0x8AA5       ; # &I-CDP-8AA5;
     :eq rep.daikanwa:00305        ; # &I-M-00305;
-    :eq rep.shinjigen:00099       ; # &AJ1-21082;
+    :eq rep.shinjigen:0099        ; # &AJ1-21082;
     :eq rep.jef-china3:0x41D8     ; # &I-JC3-41D8;
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4EA8         ] ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-0:01687 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-0:01687 ] ;
     :subsume
         g2.ucs_unicode:0x4EAF ;
     .
@@ -3315,8 +3622,8 @@ rep.adobe-japan1-6:21082
                :abstract-glyph-of       big5-cdp:0x8AA5  .
     rep.daikanwa:00305
                :abstract-glyph-of       daikanwa:00305   .
-    rep.shinjigen:00099
-               :abstract-glyph-of      shinjigen:00099   .
+    rep.shinjigen:0099
+               :abstract-glyph-of      shinjigen:0099    .
     rep.jef-china3:0x41D8
                :abstract-glyph-of     jef-china3:0x41D8  .
     g2.ucs_unicode:0x4EAF
@@ -3326,16 +3633,16 @@ rep.adobe-japan1-6:21082
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EAF         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x65E5   # 日
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq g2.adobe-japan1-6:21082   ; # &g2-AJ1-21082;
         :eq g2.jis-x0212:0x3041       ; # &g2-AJ1-21082;
         :eq g2.cns11643-3:0x2B26      ; # &g2-AJ1-21082;
         :eq g2.big5-cdp:0x8AA5        ; # &g2-AJ1-21082;
         :eq g2.daikanwa:00305         ; # &g2-AJ1-21082;
-        :eq g2.shinjigen:00099        ; # &g2-AJ1-21082;
+        :eq g2.shinjigen:0099         ; # &g2-AJ1-21082;
         :eq g2.jef-china3:0x41D8      ; # &g2-AJ1-21082;
         :subsume
             repi.daikanwa:00305  ,
@@ -3356,8 +3663,8 @@ rep.adobe-japan1-6:21082
               :abstract-glyph-form-of       big5-cdp:0x8AA5  .
         g2.daikanwa:00305
               :abstract-glyph-form-of       daikanwa:00305   .
-        g2.shinjigen:00099
-              :abstract-glyph-form-of      shinjigen:00099   .
+        g2.shinjigen:0099
+              :abstract-glyph-form-of      shinjigen:0099    .
         g2.jef-china3:0x41D8
               :abstract-glyph-form-of     jef-china3:0x41D8  .
         repi.daikanwa:00305
@@ -3396,44 +3703,60 @@ a.ucs:0x20153
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           7 ;
     ideo:total-strokes     9 ;
+    ideo:hanyu-dazidian  ( 1 287 2 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:below    rep.gt-k:03131   # &GT-K03131;
+    ] ;
+    :eq rep.cns11643-6:0x2E52     ; # &I-C6-2E52;
+    :eq rep.daikanwa:00306        ; # &I-M-00306;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  [ :target  rep.daikanwa:38981   ;
+                                      :sources chisebib:kangxi ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x2F940        ;
+                                      :sources chisebib:zihui ,
+                                               chisebib:daikanwa ] ] ;
     :subsume
-        rep.daikanwa:00306   ,
-        rep.ucs_iso:0x20153  ;
+        g2.ucs_iso:0x20153   ;
     .
+    rep.cns11643-6:0x2E52
+               :abstract-glyph-of     cns11643-6:0x2E52  .
     rep.daikanwa:00306
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00306 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x4ECC   # 仌
-            ]
-        ]
-    ] ;
-        .
-    rep.ucs_iso:0x20153
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x20153 ] ;
-        ideo:hanyu-dazidian  ( 1 287 2 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x4ECC   # 仌
-            ]
-        ]
-    ] ;
-        :eq rep.cns11643-6:0x2E52     ; # &C6-2E52;
-        :eq rep.hanziku-1:0xE150      ; # &I-HZK01-E150;
+               :abstract-glyph-of       daikanwa:00306   .
+    g2.ucs_iso:0x20153
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20153 ] ;
+        :eq g2.cns11643-6:0x2E52      ; # &g2-M-00306;
+        :eq g2.daikanwa:00306         ; # &g2-M-00306;
+        :subsume
+            repi.daikanwa:00306  ,
+            repi.cns11643-6:0x2E52 ,
+            repi.ucs_iso:0x20153 ,
+            rep.hanziku-1:0xE150 ;
         .
-        rep.cns11643-6:0x2E52
-                   :abstract-glyph-of     cns11643-6:0x2E52  .
+        g2.cns11643-6:0x2E52
+              :abstract-glyph-form-of     cns11643-6:0x2E52  .
+        g2.daikanwa:00306
+              :abstract-glyph-form-of       daikanwa:00306   .
+        repi.daikanwa:00306
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00306 ;
+            .
+        repi.cns11643-6:0x2E52
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2E52 ;
+            .
+        repi.ucs_iso:0x20153
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20153 ] ;
+            .
         rep.hanziku-1:0xE150
-                   :abstract-glyph-of      hanziku-1:0xE150  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE150 ;
+            .
 
 a.ucs:0x4EB0
     a chisegg:abstract-character ;
@@ -3459,8 +3782,8 @@ a.ucs:0x4EB0
     :eq rep.gt-k:05205            ; # &I-GT-K05205;
     :eq rep.gt-pj-1:20535         ; # &I-GT-00402;
     :eq rep.daikanwa:00307        ; # &I-M-00307;
-    :eq rep.shinjigen:00103       ; # 亰
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    :eq rep.shinjigen:0103        ; # 亰
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4EAC         ] ;
     :subsume
         g2.ucs_unicode:0x4EB0 ;
@@ -3481,8 +3804,8 @@ a.ucs:0x4EB0
                :abstract-glyph-of        gt-pj-1:20535   .
     rep.daikanwa:00307
                :abstract-glyph-of       daikanwa:00307   .
-    rep.shinjigen:00103
-               :abstract-glyph-of      shinjigen:00103   .
+    rep.shinjigen:0103
+               :abstract-glyph-of      shinjigen:0103    .
     g2.ucs_unicode:0x4EB0
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -3490,10 +3813,10 @@ a.ucs:0x4EB0
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EB0         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x23140 ; # &GT-17371;
-        isd:below    a.ucs:0x5C0F   # 小
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.ucs_iso:0x23140 ; # &GT-17371;
+            isd:below    a.ucs:0x5C0F   # 小
+        ] ;
         :eq g2.adobe-japan1-0:04112   ; # &g2-AJ1-04112;
         :eq g2.jis-x0208:0x5037       ; # &g2-AJ1-04112;
         :eq g2.cns11643-3:0x2B25      ; # &g2-AJ1-04112;
@@ -3501,7 +3824,7 @@ a.ucs:0x4EB0
         :eq g2.gt:00402               ; # &g2-AJ1-04112;
         :eq g2.gt-k:05205             ; # &g2-AJ1-04112;
         :eq g2.daikanwa:00307         ; # &g2-AJ1-04112;
-        :eq g2.shinjigen:00103        ; # &g2-AJ1-04112;
+        :eq g2.shinjigen:0103         ; # &g2-AJ1-04112;
         :subsume
             repi.daikanwa:00307  ,
             repi.jis-x0208:0x5037 ,
@@ -3525,8 +3848,8 @@ a.ucs:0x4EB0
               :abstract-glyph-form-of           gt-k:05205   .
         g2.daikanwa:00307
               :abstract-glyph-form-of       daikanwa:00307   .
-        g2.shinjigen:00103
-              :abstract-glyph-form-of      shinjigen:00103   .
+        g2.shinjigen:0103
+              :abstract-glyph-form-of      shinjigen:0103    .
         repi.daikanwa:00307
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00307 ;
@@ -3569,38 +3892,56 @@ a.ucs:0x20154
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           7 ;
     ideo:total-strokes     9 ;
+    ideo:hanyu-dazidian  ( 1 287 1 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    a.ucs:0x9091   # 邑
     ] ;
+    :eq rep.cns11643-6:0x2E51     ; # &I-C6-2E51;
+    :eq rep.daikanwa:00308        ; # &I-M-00308;
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x514B         ] ;
     :subsume
-        rep.daikanwa:00308   ,
-        rep.ucs_iso:0x20154  ;
+        g2.ucs_iso:0x20154   ;
     .
+    rep.cns11643-6:0x2E51
+               :abstract-glyph-of     cns11643-6:0x2E51  .
     rep.daikanwa:00308
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00308 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    a.ucs:0x9091   # 邑
-    ] ;
-        .
-    rep.ucs_iso:0x20154
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x20154 ] ;
-        ideo:hanyu-dazidian  ( 1 287 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    a.ucs:0x9091   # 邑
-    ] ;
-        :eq rep.cns11643-6:0x2E51     ; # &C6-2E51;
-        :eq rep.hanziku-1:0xE14F      ; # &I-HZK01-E14F;
+               :abstract-glyph-of       daikanwa:00308   .
+    g2.ucs_iso:0x20154
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20154 ] ;
+        :eq g2.cns11643-6:0x2E51      ; # &g2-M-00308;
+        :eq g2.daikanwa:00308         ; # &g2-M-00308;
+        :subsume
+            repi.daikanwa:00308  ,
+            repi.cns11643-6:0x2E51 ,
+            repi.ucs_iso:0x20154 ,
+            rep.hanziku-1:0xE14F ;
         .
-        rep.cns11643-6:0x2E51
-                   :abstract-glyph-of     cns11643-6:0x2E51  .
+        g2.cns11643-6:0x2E51
+              :abstract-glyph-form-of     cns11643-6:0x2E51  .
+        g2.daikanwa:00308
+              :abstract-glyph-form-of       daikanwa:00308   .
+        repi.daikanwa:00308
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00308 ;
+            .
+        repi.cns11643-6:0x2E51
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2E51 ;
+            .
+        repi.ucs_iso:0x20154
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20154 ] ;
+            .
         rep.hanziku-1:0xE14F
-                   :abstract-glyph-of      hanziku-1:0xE14F  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE14F ;
+            .
 
 a.ucs:0x4EB1
     a chisegg:abstract-character ;
@@ -3608,38 +3949,56 @@ a.ucs:0x4EB1
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           7 ;
     ideo:total-strokes     9 ;
+    ideo:hanyu-dazidian  ( 1 287 3 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    a.ucs:0x4F46   # 但
     ] ;
+    :eq rep.cns11643-3:0x2B27     ; # &I-C3-2B27;
+    :eq rep.daikanwa:00309        ; # &I-M-00309;
+    ideo:vulgar-form-of  [ :sources chisebib:zhonghua-dazidian ,
+                                    chisebib:daikanwa ;
+                           :target  rep.daikanwa:05763   ] ;
     :subsume
-        rep.daikanwa:00309   ,
-        rep.cns11643-3:0x2B27 ;
+        g2.ucs_unicode:0x4EB1 ;
     .
-    rep.daikanwa:00309
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00309 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    a.ucs:0x4F46   # 但
-    ] ;
-        .
     rep.cns11643-3:0x2B27
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x2B27 ;
-        ideo:hanyu-dazidian  ( 1 287 3 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    a.ucs:0x4F46   # 但
-    ] ;
-        :eq rep.ucs_unicode:0x4EB1    ; # &C3-2B27;
-        :eq rep.hanziku-1:0xE151      ; # &I-HZK01-E151;
+               :abstract-glyph-of     cns11643-3:0x2B27  .
+    rep.daikanwa:00309
+               :abstract-glyph-of       daikanwa:00309   .
+    g2.ucs_unicode:0x4EB1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4EB1  ] ;
+        :eq g2.cns11643-3:0x2B27      ; # &g2-M-00309;
+        :eq g2.daikanwa:00309         ; # &g2-M-00309;
+        :subsume
+            repi.daikanwa:00309  ,
+            repi.cns11643-3:0x2B27 ,
+            repi.ucs_unicode:0x4EB1 ,
+            rep.hanziku-1:0xE151 ;
         .
-        rep.ucs_unicode:0x4EB1
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x4EB1  ] .
+        g2.cns11643-3:0x2B27
+              :abstract-glyph-form-of     cns11643-3:0x2B27  .
+        g2.daikanwa:00309
+              :abstract-glyph-form-of       daikanwa:00309   .
+        repi.daikanwa:00309
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00309 ;
+            .
+        repi.cns11643-3:0x2B27
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2B27 ;
+            .
+        repi.ucs_unicode:0x4EB1
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4EB1  ] ;
+            .
         rep.hanziku-1:0xE151
-                   :abstract-glyph-of      hanziku-1:0xE151  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE151 ;
+            .
 
 a.ucs:0x7AD2
     a chisegg:abstract-character ;
@@ -3796,19 +4155,19 @@ a.ucs:0x4EB2
     g2.daikanwa:00311
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00311 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x7ACB ; # &g2-AJ1-03953;
-        isd:below    a.ucs:0x6728   # 木
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x7ACB ; # &g2-AJ1-03953;
+            isd:below    a.ucs:0x6728   # 木
+        ] ;
         .
     g.ucs_unicode:0x4EB2
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:unicode ;
                              :target     ucs:0x4EB2  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x7ACB ; # 立
-        isd:below    a.ucs:0x6729   # 朩
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x7ACB ; # 立
+            isd:below    a.ucs:0x6729   # 朩
+        ] ;
         :eq g.big5-cdp:0x8BA7         ; # &G-CDP-8BA7;
         :subsume
             g2.cns11643-3:0x2B24 ,
@@ -3868,16 +4227,16 @@ rep.big5-cdp:0x8DEB
     g2.big5-cdp:0x8DEB
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of big5-cdp:0x8DEB ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x5200 ; # 刀
-                :middle   a.ucs:0x4E2B ; # 丫
-                :right    rep.big5-cdp:0x89CA   # &CDP-89CA;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    [
+                isd:structure [ a idc:⿲ ;
+                    isd:left     a.ucs:0x5200 ; # 刀
+                    isd:middle   a.ucs:0x4E2B ; # 丫
+                    isd:right    rep.big5-cdp:0x89CA   # &CDP-89CA;
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :subsume
             repi.big5-cdp:0x8DEB ;
         .
@@ -3909,7 +4268,7 @@ a.ucs:0x4EB3
     :eq rep.gt:00414              ; # &I-GT-00414;
     :eq rep.gt-pj-1:20536         ; # &I-GT-00414;
     :eq rep.daikanwa:00312        ; # &I-M-00312;
-    :eq rep.shinjigen:00109       ; # 亳
+    :eq rep.shinjigen:0109        ; # 亳
     :subsume
         g2.ucs_unicode:0x4EB3 ;
     .
@@ -3931,8 +4290,8 @@ a.ucs:0x4EB3
                :abstract-glyph-of        gt-pj-1:20536   .
     rep.daikanwa:00312
                :abstract-glyph-of       daikanwa:00312   .
-    rep.shinjigen:00109
-               :abstract-glyph-of      shinjigen:00109   .
+    rep.shinjigen:0109
+               :abstract-glyph-of      shinjigen:0109    .
     g2.ucs_unicode:0x4EB3
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -3940,10 +4299,10 @@ a.ucs:0x4EB3
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4EB3         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    g2.ucs_unicode:0x4E47   # &g2-AJ1-17239;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    g2.ucs_unicode:0x4E47   # &g2-AJ1-17239;
+        ] ;
         :eq g2.adobe-japan1-0:04113   ; # &g2-AJ1-04113;
         :eq g2.gb2312:0x5971          ; # &g2-AJ1-04113;
         :eq g2.jis-x0208:0x5038       ; # &g2-AJ1-04113;
@@ -3951,7 +4310,7 @@ a.ucs:0x4EB3
         :eq g2.jis-x0213-1:0x5038     ; # &g2-AJ1-04113;
         :eq g2.gt:00414               ; # &g2-AJ1-04113;
         :eq g2.daikanwa:00312         ; # &g2-AJ1-04113;
-        :eq g2.shinjigen:00109        ; # &g2-AJ1-04113;
+        :eq g2.shinjigen:0109         ; # &g2-AJ1-04113;
         :subsume
             repi.daikanwa:00312  ,
             repi.jis-x0208:0x5038 ,
@@ -3974,8 +4333,8 @@ a.ucs:0x4EB3
               :abstract-glyph-form-of             gt:00414   .
         g2.daikanwa:00312
               :abstract-glyph-form-of       daikanwa:00312   .
-        g2.shinjigen:00109
-              :abstract-glyph-form-of      shinjigen:00109   .
+        g2.shinjigen:0109
+              :abstract-glyph-form-of      shinjigen:0109    .
         repi.daikanwa:00312
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00312 ;
@@ -4041,10 +4400,10 @@ rep.ucs_iso:0x20156
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20156 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    rep.gt-k:01160   # &GT-K01160;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    rep.gt-k:01160   # &GT-K01160;
+        ] ;
         :eq g2.cns11643-6:0x352F      ; # &g2-M-00313;
         :eq g2.daikanwa:00313         ; # &g2-M-00313;
         :subsume
@@ -4088,9 +4447,9 @@ a.ucs:0x2015E
     ] ;
     .
 
-a.daikanwa:00314
-    a chisegg:abstract-character ;
-    :abstract-character-of daikanwa:00314 ;
+rep.mj:030497
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:030497 ;
     :denotation-of
         a.ucs:0x2015E        ;
     ideo:radical           [ :context domain:ucs     ;
@@ -4103,39 +4462,75 @@ a.daikanwa:00314
     ideo:total-strokes    10 ;
     isd:structure [ a idc:⿳ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x5902 ; # 夂
-                :right    a.ucs:0x3404   # 㐄
-            ]
-        ] ;
+        isd:middle   rep.ucs-itaiji-007:0x821B ; # &U-i007+821B;
         isd:below    a.ucs:0x51E0   # 几
     ] ;
-    :eq g.daikanwa:00314          ; # &G-M-00314;
     :subsume
-        rep.daikanwa:00314   ,
-        rep.daikanwa:01783   ;
+        g2.koseki:021040     ,
+        rep.mj:030496        ;
     .
-    g.daikanwa:00314
-               :detailed-glyph-of       daikanwa:00314   .
-    rep.daikanwa:00314
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00314 ;
-        ideo:radical           8 ; # ⼇ 
-        :from.ancient        [ :sources chisebib:jiyun ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x4E58         ] ;
+    g2.koseki:021040
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of koseki:021040 ;
+        :eq g.mj:030497               ; # &KOSEKI-021040;
+        :eq rep.koseki:021040         ; # &KOSEKI-021040;
+        :subsume
+            g2.mj:030497         ;
         .
-    rep.daikanwa:01783
+        g.mj:030497
+                   :detailed-glyph-of             mj:030497  .
+        rep.koseki:021040
+                   :abstract-glyph-of         koseki:021040  .
+        g2.mj:030497
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:030497 ;
+            :eq g2.koseki:021040          ; # &g2-MJ030497;
+            :subsume
+                rep.daikanwa:01783   ,
+                rep.daikanwa:00314   ,
+                repi.mj:030497       ;
+            .
+            g2.koseki:021040
+                  :abstract-glyph-form-of         koseki:021040  .
+            rep.daikanwa:01783
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of daikanwa:01783 ;
+                ideo:radical          16 ; # ⼏ 
+                :form-of             [ :sources chisebib:jiyun ;
+                                       :target  a.ucs:0x4E58         ] ;
+                ideo:same-as         [ :sources chisebib:jiyun ,
+                                                chisebib:daikanwa ;
+                                       :target  a.ucs:0x4E58         ] ;
+                .
+            rep.daikanwa:00314
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of daikanwa:00314 ;
+                ideo:radical           8 ; # ⼇ 
+                ideo:ancient-form-of [ :sources chisebib:jiyun ,
+                                                chisebib:daikanwa ;
+                                       :target  a.ucs:0x4E58         ] ;
+                .
+            repi.mj:030497
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:030497 ;
+                .
+    rep.mj:030496
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:01783 ;
-        ideo:radical          16 ; # ⼏ 
-        :form-of             [ :sources chisebib:jiyun ;
-                               :target  a.ucs:0x4E58         ] ;
-        :from.same           [ :sources chisebib:jiyun ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x4E58         ] ;
+        :abstract-glyph-of mj:030496 ;
+        ideo:radical           8 ; # ⼇ 
+        :eq rep.koseki:003890         ; # &MJ030496;
+        :subsume
+            g2.mj:030496         ;
         .
+        rep.koseki:003890
+                   :abstract-glyph-of         koseki:003890  .
+        g2.mj:030496
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:030496 ;
+            :eq g2.koseki:003890          ; # &g2-MJ030496;
+            .
+            g2.koseki:003890
+                  :abstract-glyph-form-of         koseki:003890  .
 
 rep.ucs_iso:0x2015E
     a chisegg:abstract-glyph ;
@@ -4149,7 +4544,7 @@ rep.ucs_iso:0x2015E
     ideo:hanyu-dazidian  ( 1 287 13 ) ;
     isd:structure [ a idc:⿳ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   a.ucs:0x821B ; # 舛
+        isd:middle   rep.mj:021365 ; # &MJ021365;
         isd:below    a.ucs:0x51E0   # 几
     ] ;
     :eq rep.cns11643-6:0x3531     ; # &C6-3531;
@@ -4163,11 +4558,11 @@ rep.ucs_iso:0x2015E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2015E ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:middle   g2.mj:021365 ; # &g2-MJ021365;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:middle   g2.mj:021365 ; # &g2-MJ021365;
+            isd:below    g2.ucs_unicode:0x51E0   # &g2-AJ1-04243;
+        ] ;
         :subsume
             repi.ucs_iso:0x2015E ,
             rep.hanziku-1:0xE15B ;
@@ -4184,11 +4579,11 @@ rep.ucs_iso:0x2015E
     g2.cns11643-6:0x3531
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x3531 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:middle   g2.cns11643-1:0x4860 ; # &g2-CU+821B;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+            isd:middle   g2.cns11643-1:0x4860 ; # &g2-CU+821B;
+            isd:below    g2.ucs_unicode:0x51E0   # &g2-AJ1-04243;
+        ] ;
         :eq g2.ucs_cns:0x2015E        ; # &g2-CU+2015E;
         .
         g2.ucs_cns:0x2015E
@@ -4219,19 +4614,19 @@ a.ucs:0x2015A
     g2.daikanwa:00315
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00315 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    g2.adobe-japan1-4:13450   # &g2-AJ1-13450;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    g2.adobe-japan1-4:13450   # &g2-AJ1-13450;
+        ] ;
         .
     g2.ucs_iso:0x2015A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2015A ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    g2.ucs_unicode:0x4F7F   # &g2-AJ1-02198;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt:00375 ; # &GT-00375;
+            isd:below    g2.ucs_unicode:0x4F7F   # &g2-AJ1-02198;
+        ] ;
         .
 
 a.ucs:0x20158
@@ -4248,8 +4643,8 @@ a.ucs:0x20158
     :eq rep.adobe-japan1-5:20075  ; # &I-AJ1-20075;
     :eq rep.cns11643-4:0x2B5F     ; # &I-C4-2B5F;
     :eq rep.daikanwa:00316        ; # &I-M-00316;
-    :eq rep.shinjigen:00105       ; # 𠅘
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    :eq rep.shinjigen:0105        ; # 𠅘
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x4EAD         ] ;
@@ -4262,8 +4657,8 @@ a.ucs:0x20158
                :abstract-glyph-of     cns11643-4:0x2B5F  .
     rep.daikanwa:00316
                :abstract-glyph-of       daikanwa:00316   .
-    rep.shinjigen:00105
-               :abstract-glyph-of      shinjigen:00105   .
+    rep.shinjigen:0105
+               :abstract-glyph-of      shinjigen:0105    .
     g2.ucs_iso:0x20158
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
@@ -4271,14 +4666,14 @@ a.ucs:0x20158
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x20158        ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:04733 ; # &g2-GT-K04733;
-        isd:below    a.ucs:0x4E01   # 丁
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:04733 ; # &g2-GT-K04733;
+            isd:below    a.ucs:0x4E01   # 丁
+        ] ;
         :eq g2.adobe-japan1-5:20075   ; # &g2-AJ1-20075;
         :eq g2.cns11643-4:0x2B5F      ; # &g2-AJ1-20075;
         :eq g2.daikanwa:00316         ; # &g2-AJ1-20075;
-        :eq g2.shinjigen:00105        ; # &g2-AJ1-20075;
+        :eq g2.shinjigen:0105         ; # &g2-AJ1-20075;
         :subsume
             repi.daikanwa:00316  ,
             repi.adobe-japan1-6:20075 ,
@@ -4293,8 +4688,8 @@ a.ucs:0x20158
               :abstract-glyph-form-of     cns11643-4:0x2B5F  .
         g2.daikanwa:00316
               :abstract-glyph-form-of       daikanwa:00316   .
-        g2.shinjigen:00105
-              :abstract-glyph-form-of      shinjigen:00105   .
+        g2.shinjigen:0105
+              :abstract-glyph-form-of      shinjigen:0105    .
         repi.daikanwa:00316
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00316 ;
@@ -4334,9 +4729,9 @@ a.ucs:0x20159
     ] ;
     :eq rep.cns11643-6:0x3530     ; # &I-C6-3530;
     :eq rep.daikanwa:00317        ; # &I-M-00317;
-    :eq rep.shinjigen:00108       ; # 𠅙
+    :eq rep.shinjigen:0108        ; # 𠅙
     :eq rep.hanziku-1:0xE155      ; # &I-HZK01-E155;
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ;
                            :target  rep.mj:006477        ] ;
     :subsume
@@ -4346,21 +4741,21 @@ a.ucs:0x20159
                :abstract-glyph-of     cns11643-6:0x3530  .
     rep.daikanwa:00317
                :abstract-glyph-of       daikanwa:00317   .
-    rep.shinjigen:00108
-               :abstract-glyph-of      shinjigen:00108   .
+    rep.shinjigen:0108
+               :abstract-glyph-of      shinjigen:0108    .
     rep.hanziku-1:0xE155
                :abstract-glyph-of      hanziku-1:0xE155  .
     g2.ucs_iso:0x20159
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20159 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:04733 ; # &g2-GT-K04733;
-        isd:below    a.ucs:0x513F   # 儿
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:04733 ; # &g2-GT-K04733;
+            isd:below    a.ucs:0x513F   # 儿
+        ] ;
         :eq g2.cns11643-6:0x3530      ; # &g2-M-00317;
         :eq g2.daikanwa:00317         ; # &g2-M-00317;
-        :eq g2.shinjigen:00108        ; # &g2-M-00317;
+        :eq g2.shinjigen:0108         ; # &g2-M-00317;
         :subsume
             repi.daikanwa:00317  ,
             repi.ucs_iso:0x20159 ,
@@ -4370,8 +4765,8 @@ a.ucs:0x20159
               :abstract-glyph-form-of     cns11643-6:0x3530  .
         g2.daikanwa:00317
               :abstract-glyph-form-of       daikanwa:00317   .
-        g2.shinjigen:00108
-              :abstract-glyph-form-of      shinjigen:00108   .
+        g2.shinjigen:0108
+              :abstract-glyph-form-of      shinjigen:0108    .
         repi.daikanwa:00317
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00317 ;
@@ -4408,10 +4803,10 @@ a.ucs:0x20157
     rep.daikanwa:05775
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:05775 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E01 ; # 丁
-        isd:right    rep.daikanwa:05763   # &M-05763;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x4E01 ; # 丁
+            isd:right    rep.daikanwa:05763   # &M-05763;
+        ] ;
         .
     rep.cbeta:03754
         a chisegg:abstract-glyph ;
@@ -4422,10 +4817,10 @@ a.ucs:0x20157
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20157 ] ;
         ideo:hanyu-dazidian  ( 1 287 5 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E01 ; # 丁
-        isd:right    a.ucs:0x591C   # 夜
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x4E01 ; # 丁
+            isd:right    a.ucs:0x591C   # 夜
+        ] ;
         :eq rep.cns11643-5:0x2C66     ; # &C5-2C66;
         :eq rep.hanziku-1:0xE153      ; # &I-HZK01-E153;
         .
@@ -4437,19 +4832,36 @@ a.ucs:0x20157
 a.ucs:0x2015B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2015B ;
+    :denotation-of
+        a.ucs_component:0x221C6 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     ideo:hanyu-dazidian  ( 1 287 12 ) ;
-    isd:structure [ a idc:⿳ ;
+    isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x342B ; # 㐫
-        isd:middle   a.ucs:0x5E7A ; # 幺
-        isd:below    a.ucs:0x4E28   # 丨
+        isd:below    a.ucs:0x221AF   # 𢆯
     ] ;
-    :eq rep.hanziku-1:0xE15A      ; # &I-HZK01-E15A;
+    :subsume
+        g2.ucs_iso:0x2015B   ;
     .
-    rep.hanziku-1:0xE15A
-               :abstract-glyph-of      hanziku-1:0xE15A  .
+    g2.ucs_iso:0x2015B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2015B ] ;
+        :subsume
+            repi.ucs_iso:0x2015B ,
+            rep.hanziku-1:0xE15A ;
+        .
+        repi.ucs_iso:0x2015B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2015B ] ;
+            .
+        rep.hanziku-1:0xE15A
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE15A ;
+            .
 
 a.ucs:0x2015F
     a chisegg:abstract-character ;
@@ -4464,11 +4876,11 @@ a.ucs:0x2015F
         :abstract-glyph-of daikanwa:00318 ;
         ideo:strokes           9 ;
         ideo:total-strokes    11 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:middle   rep.big5-cdp:0x88DF ; # &CDP-88DF;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:middle   rep.big5-cdp:0x88DF ; # &CDP-88DF;
+            isd:below    a.ucs:0x51E0   # 几
+        ] ;
         .
     rep.ucs_iso:0x2015F
         a chisegg:abstract-glyph ;
@@ -4477,11 +4889,11 @@ a.ucs:0x2015F
         ideo:strokes          10 ;
         ideo:total-strokes    12 ;
         ideo:hanyu-dazidian  ( 1 288 2 ) ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   a.ucs:0x2099C ; # 𠦜
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   a.ucs:0x2099C ; # 𠦜
+            isd:below    a.ucs:0x51E0   # 几
+        ] ;
         :eq rep.cns11643-6:0x4643     ; # &C6-4643;
         :eq rep.hanziku-1:0xE170      ; # &I-HZK01-E170;
         .
@@ -4503,50 +4915,50 @@ a.ucs:0x20160
     rep.daikanwa:00319
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:00319 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    [
-            :structure [ a idc:⿶ ;
-                :surround [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x53E3 ; # 口
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x51F5 ; # 凵
-                        :below    a.ucs:0x4E85   # 亅
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    [
+                isd:structure [ a idc:⿶ ;
+                    isd:surround [
+                        isd:structure [ a idc:⿱ ;
+                            isd:above    a.ucs:0x53E3 ; # 口
+                            isd:below    a.ucs:0x53E3   # 口
+                        ]
+                    ] ;
+                    isd:filling  [
+                        isd:structure [ a idc:⿱ ;
+                            isd:above    a.ucs:0x51F5 ; # 凵
+                            isd:below    a.ucs:0x4E85   # 亅
+                        ]
                     ]
                 ]
             ]
-        ]
-    ] ;
+        ] ;
         .
     rep.ucs_iso:0x20160
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20160 ] ;
         ideo:hanyu-dazidian  ( 1 289 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    [
-            :structure [ a idc:⿶ ;
-                :surround [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x53E3 ; # 口
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x51F5 ; # 凵
-                        :below    a.ucs:0x4E85   # 亅
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    [
+                isd:structure [ a idc:⿶ ;
+                    isd:surround [
+                        isd:structure [ a idc:⿱ ;
+                            isd:above    a.ucs:0x53E3 ; # 口
+                            isd:below    a.ucs:0x53E3   # 口
+                        ]
+                    ] ;
+                    isd:filling  [
+                        isd:structure [ a idc:⿱ ;
+                            isd:above    a.ucs:0x51F5 ; # 凵
+                            isd:below    a.ucs:0x4E85   # 亅
+                        ]
                     ]
                 ]
             ]
-        ]
-    ] ;
+        ] ;
         :eq rep.cns11643-6:0x3D23     ; # &C6-3D23;
         :eq rep.hanziku-1:0xE1B1      ; # &I-HZK01-E1B1;
         .
@@ -4591,10 +5003,10 @@ rep.ucs_iso:0x20161
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20161 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
-        isd:below    a.ucs:0x21C32   # 𡰲
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:01444 ; # &g2-GT-K01444;
+            isd:below    a.ucs:0x21C32   # 𡰲
+        ] ;
         :eq g2.cns11643-6:0x3D22      ; # &g2-M-00320;
         :eq g2.daikanwa:00320         ; # &g2-M-00320;
         :subsume
@@ -4659,19 +5071,19 @@ rep.ucs_iso:0x20166
     g2.daikanwa:00321
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00321 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    g2.ucs_unicode:0xFA33   # &g2-JX1-2E63;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    g2.ucs_unicode:0xFA33   # &g2-JX1-2E63;
+        ] ;
         .
     g2.ucs_iso:0x20166
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20166 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    g2.ucs_unicode:0x52C9   # &g2-AJ1-13385;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt:00375 ; # &GT-00375;
+            isd:below    g2.ucs_unicode:0x52C9   # &g2-AJ1-13385;
+        ] ;
         .
 
 a.ucs:0x20162
@@ -4718,9 +5130,9 @@ a.ucs:0x20168
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x5148 ; # 先
-                :filling  a.ucs:0x6535   # 攵
+            isd:structure [ a idc:⿺ ;
+                isd:surround a.ucs:0x5148 ; # 先
+                isd:filling  a.ucs:0x6535   # 攵
             ]
         ]
     ] ;
@@ -4729,6 +5141,43 @@ a.ucs:0x20168
     rep.hanziku-1:0xE1D7
                :abstract-glyph-of      hanziku-1:0xE1D7  .
 
+a.gt-k:08922
+    a chisegg:abstract-character ;
+    :abstract-character-of gt-k:08922 ;
+    ideo:radical           8 ; # ⼇ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs-itaiji-001:0x23140 ; # &A-U-i001+23140;
+        isd:below    a.ucs:0x5C0F   # 小
+    ] ;
+    .
+
+rep.gt-k:08922
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:08922 ;
+    :denotation-of
+        a.gt-k:08922         ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x23140 ; # &U-i001+23140;
+        isd:below    a.ucs:0x5C0F   # 小
+    ] ;
+    :eq rep.gt-pj-k1:18555        ; # &GT-K08922;
+    :from.unknown        a.ucs:0x4EAC         ;
+    :subsume
+        g2.gt-k:08922        ;
+    .
+    rep.gt-pj-k1:18555
+               :abstract-glyph-of       gt-pj-k1:18555   .
+    g2.gt-k:08922
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:08922 ;
+        :eq g2.gt-pj-k1:18555         ; # &g2-GT-K08922;
+        .
+        g2.gt-pj-k1:18555
+              :abstract-glyph-form-of       gt-pj-k1:18555   .
+
 a.ucs:0x20169
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20169 ;
@@ -4769,10 +5218,10 @@ rep.ucs_iso:0x20169
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20169 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
-        isd:right    a.ucs:0x2F801   # 丸
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
+            isd:right    a.ucs:0x2F801   # 丸
+        ] ;
         :eq g2.cns11643-6:0x4645      ; # &g2-M-00323;
         :eq g2.daikanwa:00323         ; # &g2-M-00323;
         :subsume
@@ -4811,32 +5260,32 @@ a.ucs:0x2016A
     rep.daikanwa:00324
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:00324 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x738B ; # 王
-                :middle   a.ucs:0x51E0 ; # 几
-                :right    a.ucs:0x738B   # 王
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    [
+                isd:structure [ a idc:⿲ ;
+                    isd:left     a.ucs:0x738B ; # 王
+                    isd:middle   a.ucs:0x51E0 ; # 几
+                    isd:right    a.ucs:0x738B   # 王
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         .
     rep.ucs_iso:0x2016A
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2016A ] ;
         ideo:hanyu-dazidian  ( 1 290 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x738B ; # 王
-                :middle   a.ucs:0x51E0 ; # 几
-                :right    a.ucs:0x738B   # 王
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    [
+                isd:structure [ a idc:⿲ ;
+                    isd:left     a.ucs:0x738B ; # 王
+                    isd:middle   a.ucs:0x51E0 ; # 几
+                    isd:right    a.ucs:0x738B   # 王
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :eq rep.cns11643-6:0x4644     ; # &C6-4644;
         :eq rep.hanziku-1:0xE1D9      ; # &I-HZK01-E1D9;
         .
@@ -4858,32 +5307,32 @@ a.ucs:0x2016B
     rep.daikanwa:00325
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:00325 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x723B ; # 爻
-                :right    a.ucs:0x723B   # 爻
-            ]
+        isd:structure [ a idc:⿳ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:middle   [
+                isd:structure [ a idc:⿰ ;
+                    isd:left     a.ucs:0x723B ; # 爻
+                    isd:right    a.ucs:0x723B   # 爻
+                ]
+            ] ;
+            isd:below    a.ucs:0x51E0   # 几
         ] ;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
         .
     rep.ucs_iso:0x2016B
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2016B ] ;
-        ideo:hanyu-dazidian  ( 1 290 8 ) ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x723B ; # 爻
-                :right    a.ucs:0x723B   # 爻
-            ]
+        ideo:hanyu-dazidian  ( 1 290 8 ) ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   [
+                isd:structure [ a idc:⿰ ;
+                    isd:left     a.ucs:0x723B ; # 爻
+                    isd:right    a.ucs:0x723B   # 爻
+                ]
+            ] ;
+            isd:below    a.ucs:0x51E0   # 几
         ] ;
-        isd:below    a.ucs:0x51E0   # 几
-    ] ;
         :eq rep.cns11643-6:0x4646     ; # &C6-4646;
         :eq rep.hanziku-1:0xE1D8      ; # &I-HZK01-E1D8;
         .
@@ -4905,30 +5354,30 @@ a.ucs:0x2016C
     rep.daikanwa:00326
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:00326 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x5148 ; # 先
-                :filling  a.ucs:0x6534   # 攴
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    [
+                isd:structure [ a idc:⿺ ;
+                    isd:surround a.ucs:0x5148 ; # 先
+                    isd:filling  a.ucs:0x6534   # 攴
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         .
     rep.ucs_iso:0x2016C
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2016C ] ;
         ideo:hanyu-dazidian  ( 1 290 6 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x5148 ; # 先
-                :filling  a.ucs:0x6534   # 攴
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    [
+                isd:structure [ a idc:⿺ ;
+                    isd:surround a.ucs:0x5148 ; # 先
+                    isd:filling  a.ucs:0x6534   # 攴
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :eq rep.cns11643-4:0x362F     ; # &C4-362F;
         :eq rep.hanziku-1:0xE1D6      ; # &I-HZK01-E1D6;
         .
@@ -4971,11 +5420,11 @@ rep.ucs_unicode:0x4EB4
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4EB4  ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:middle   a.ucs:0x571F ; # 土
-        isd:below    a.ucs:0x4E5D   # 九
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:middle   a.ucs:0x571F ; # 土
+            isd:below    a.ucs:0x4E5D   # 九
+        ] ;
         :eq g2.daikanwa:00327         ; # &g2-M-00327;
         :subsume
             repi.daikanwa:00327  ,
@@ -5013,14 +5462,14 @@ rep.cns11643-4:0x362E
     rep.ucs_cns:0x4EB4
                :abstract-glyph-of [ :context domain:cns     ;
                                     :target     ucs:0x4EB4  ] .
-    g2.ucs_cns:0x4EB4
+    g2.cns11643-4:0x362E
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:cns     ;
-                                  :target     ucs:0x4EB4  ] ;
-        :eq g2.cns11643-4:0x362E      ; # &g2-CU+4EB4;
+        :abstract-glyph-form-of cns11643-4:0x362E ;
+        :eq g2.ucs_cns:0x4EB4         ; # &g2-CU+4EB4;
         .
-        g2.cns11643-4:0x362E
-              :abstract-glyph-form-of     cns11643-4:0x362E  .
+        g2.ucs_cns:0x4EB4
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x4EB4  ] .
 
 a.ucs:0x4EB5
     a chisegg:abstract-character ;
@@ -5037,83 +5486,6 @@ a.ucs:0x4EB5
     rep.hanziku-1:0xE1D2
                :abstract-glyph-of      hanziku-1:0xE1D2  .
 
-a.ucs:0x20170
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x20170 ;
-    ideo:radical           [ :context domain:ucs     ;
-                             :target            8 ; # ⼇
-                           ] ;
-    ideo:strokes           [ :context domain:ucs     ;
-                             :target  10 ] ;
-    ideo:radical           [ :context domain:cns     ;
-                             :target          111 ; # ⽮
-                           ] ;
-    ideo:strokes           [ :context domain:cns     ;
-                             :target  7 ] ;
-    ideo:total-strokes    12 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x571F ; # 土
-                :middle   a.ucs:0x77E2 ; # 矢
-                :right    a.ucs:0x5315   # 匕
-            ]
-        ]
-    ] ;
-    :subsume
-        rep.daikanwa:23981   ,
-        rep.ucs_iso:0x20170  ,
-        rep.cns11643-6:0x4C2D ;
-    .
-    rep.daikanwa:23981
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:23981 ;
-        ideo:radical         111 ; # ⽮ 
-        ideo:strokes           7 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     rep.gt-k:00199 ; # &GT-K00199;
-                :middle   rep.gt-k:01013 ; # &GT-K01013;
-                :right    a.ucs:0x5315   # 匕
-            ]
-        ]
-    ] ;
-        .
-    rep.ucs_iso:0x20170
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x20170 ] ;
-        ideo:radical           8 ; # ⼇ 
-        ideo:strokes          10 ;
-        ideo:hanyu-dazidian  ( 1 290 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     rep.gt-k:00199 ; # &GT-K00199;
-                :middle   rep.gt-k:01013 ; # &GT-K01013;
-                :right    a.ucs:0x5315   # 匕
-            ]
-        ]
-    ] ;
-        :eq rep.hanziku-1:0xE1D1      ; # &HZK01-E1D1;
-        .
-        rep.hanziku-1:0xE1D1
-                   :abstract-glyph-of      hanziku-1:0xE1D1  .
-    rep.cns11643-6:0x4C2D
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-6:0x4C2D ;
-        ideo:radical         111 ; # ⽮ 
-        ideo:strokes           7 ;
-        :eq rep.ucs_cns:0x20170       ; # &C6-4C2D;
-        .
-        rep.ucs_cns:0x20170
-                   :abstract-glyph-of [ :context domain:cns     ;
-                                        :target     ucs:0x20170 ] .
-
 a.ucs:0x20171
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20171 ;
@@ -5139,9 +5511,10 @@ a.ucs:0x4EB6
                          ] ;
     .
 
-a.jis-x0208:0x5039
-    a chisegg:abstract-character ;
-    :abstract-character-of jis-x0208:0x5039 ;
+o.ucs_unicode:0x4EB6
+    a chisegg:unified-glyph ;
+    :unified-glyph-of [ :context domain:unicode ;
+                        :target     ucs:0x4EB6  ] ;
     :denotation-of
         a.ucs:0x4EB6         ;
     ideo:radical           8 ; # ⼇ 
@@ -5149,15 +5522,11 @@ a.jis-x0208:0x5039
         isd:above    a.ucs:0x342D ; # 㐭
         isd:below    a.ucs:0x65E6   # 旦
     ] ;
-    :eq o.ucs_unicode:0x4EB6      ; # &o-J0-5039;
     :eq o.jis-x0208:0x5039        ; # &o-J0-5039;
     :eq o.jis-x0213-1:0x5039      ; # &o-J0-5039;
     :eq o.adobe-japan1-0:04114    ; # &o-J0-5039;
     :eq o.gt:00433                ; # &o-J0-5039;
     .
-    o.ucs_unicode:0x4EB6
-                :unified-glyph-of [ :context domain:unicode ;
-                                    :target     ucs:0x4EB6  ] .
     o.jis-x0208:0x5039
                 :unified-glyph-of      jis-x0208:0x5039  .
     o.jis-x0213-1:0x5039
@@ -5171,7 +5540,7 @@ rep.mj:006485
     a chisegg:abstract-glyph ;
     :abstract-glyph-of mj:006485 ;
     :denotation-of
-        a.jis-x0208:0x5039   ;
+        o.ucs_unicode:0x4EB6 ;
     ideo:radical           8 ; # ⼇ 
     ideo:strokes          11 ;
     ideo:total-strokes    13 ;
@@ -5192,7 +5561,7 @@ rep.mj:006485
     :eq rep.gt-k:10291            ; # &I-GT-K10291;
     :eq rep.gt-pj-1:20537         ; # &I-GT-00433;
     :eq rep.daikanwa:00328        ; # &I-M-00328;
-    :eq rep.shinjigen:00110       ; # &MJ006485;
+    :eq rep.shinjigen:0110        ; # &MJ006485;
     :subsume
         g2.mj:006485         ;
     .
@@ -5221,8 +5590,8 @@ rep.mj:006485
                :abstract-glyph-of        gt-pj-1:20537   .
     rep.daikanwa:00328
                :abstract-glyph-of       daikanwa:00328   .
-    rep.shinjigen:00110
-               :abstract-glyph-of      shinjigen:00110   .
+    rep.shinjigen:0110
+               :abstract-glyph-of      shinjigen:0110    .
     g2.mj:006485
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006485 ;
@@ -5232,10 +5601,10 @@ rep.mj:006485
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EB6         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x342D ; # &g2-CDP-8BE5;
-        isd:below    a.ucs:0x65E6   # 旦
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x342D ; # &g2-CDP-8BE5;
+            isd:below    a.ucs:0x65E6   # 旦
+        ] ;
         :eq g2.ucs_unicode:0x4EB6     ; # &g2-MJ006485;
         :eq g2.adobe-japan1-0:04114   ; # &g2-MJ006485;
         :eq g2.iso-ir165:0x7A38       ; # &g2-MJ006485;
@@ -5246,7 +5615,7 @@ rep.mj:006485
         :eq g2.gt:00433               ; # &g2-MJ006485;
         :eq g2.gt-k:10291             ; # &g2-MJ006485;
         :eq g2.daikanwa:00328         ; # &g2-MJ006485;
-        :eq g2.shinjigen:00110        ; # &g2-MJ006485;
+        :eq g2.shinjigen:0110         ; # &g2-MJ006485;
         :subsume
             repi.daikanwa:00328  ,
             repi.jis-x0208:0x5039 ,
@@ -5277,8 +5646,8 @@ rep.mj:006485
               :abstract-glyph-form-of           gt-k:10291   .
         g2.daikanwa:00328
               :abstract-glyph-form-of       daikanwa:00328   .
-        g2.shinjigen:00110
-              :abstract-glyph-form-of      shinjigen:00110   .
+        g2.shinjigen:0110
+              :abstract-glyph-form-of      shinjigen:0110    .
         repi.daikanwa:00328
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00328 ;
@@ -5362,10 +5731,10 @@ rep.mj:006487
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EB6         ,
                                         a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x342D ; # &g2-CDP-8BE5;
-        isd:below    a.ucs:0x4E14   # 且
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x342D ; # &g2-CDP-8BE5;
+            isd:below    a.ucs:0x4E14   # 且
+        ] ;
         :eq g2.ucs_ks:0x4EB6          ; # &g2-MJ006487;
         :eq g2.ks-x1001:0x5322        ; # &g2-MJ006487;
         :eq g2.hanyo-denshi...ib:0x2D36 ; # &g2-MJ006487;
@@ -5418,15 +5787,15 @@ rep.mj:006486
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EB6         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :below    a.ucs:0x56EC   # 囬
-            ]
+        isd:structure [ a idc:⿱ ;
+            isd:above    [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    a.ucs:0x4EA0 ; # 亠
+                    isd:below    a.ucs:0x56EC   # 囬
+                ]
+            ] ;
+            isd:below    a.ucs:0x4E14   # 且
         ] ;
-        isd:below    a.ucs:0x4E14   # 且
-    ] ;
         :eq g2.hanyo-denshi...ks:004100 ; # &g2-MJ006486;
         :subsume
             repi.hanyo-denshi...ks:004100 ,
@@ -5462,9 +5831,9 @@ a.ucs:0x342E
     :eq rep.jis-x0213-2:0x2133    ; # &I-JX2-2133;
     :eq rep.daikanwa:00329        ; # &I-M-00329;
     :eq rep.jef-china3:0x41D9     ; # &I-JC3-41D9;
-    :from.simplified     [ :context domain:misc    ;
-                           :sources chisebib:daikanwa ;
-                           :target  a.ucs:0x8944         ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:daikanwa ;
+                              :target  a.ucs:0x8944         ] ;
     :subsume
         g2.ucs_unicode:0x342E ,
         g2.cns11643-3:0x4034 ;
@@ -5586,15 +5955,15 @@ a.ucs:0x20177
     isd:structure [ a idc:⿳ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:middle   [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x53E3   # 口
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x53E3 ; # 口
+                isd:below    a.ucs:0x53E3   # 口
             ]
         ] ;
         isd:below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5341   # 十
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x53E3 ; # 口
+                isd:below    a.ucs:0x5341   # 十
             ]
         ]
     ] ;
@@ -5612,10 +5981,10 @@ a.ucs:0x20178
     ideo:hanyu-dazidian  ( 1 291 3 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :middle   a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5196   # 冖
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x4EA0 ; # 亠
+                isd:middle   a.ucs:0x53E3 ; # 口
+                isd:below    a.ucs:0x5196   # 冖
             ]
         ] ;
         isd:below    a.ucs:0x8001   # 老
@@ -5649,6 +6018,40 @@ a.ucs:0x2017D
     rep.hanziku-2:0xC455
                :abstract-glyph-of      hanziku-2:0xC455  .
 
+rep.ucs-itaiji-001:0x8C46
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x8C46 ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:middle   a.ucs:0x8089 ; # 肉
+        isd:below    a.ucs:0x361D   # 㘝
+    ] ;
+    :form-of             a.ucs:0x8C46         ;
+    .
+
+rep.ucs-itaiji-002:0x8C46
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x8C46 ;
+    ideo:radical           8 ; # ⼇ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x4EA0 ; # 亠
+        isd:middle   rep.gt-k:03131 ; # &GT-K03131;
+        isd:below    a.ucs:0x2067C   # 𠙼
+    ] ;
+    :form-of             a.ucs:0x8C46         ;
+    :subsume
+        g2.ucs-itaiji-002:0x8C46 ;
+    .
+    g2.ucs-itaiji-002:0x8C46
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x8C46 ;
+        .
+
 a.ucs:0x2017F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2017F ;
@@ -5658,10 +6061,10 @@ a.ucs:0x2017F
     ideo:hanyu-dazidian  ( 1 292 7 ) ;
     isd:structure [ a idc:⿳ ;
         isd:above    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :middle   a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5196   # 冖
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x4EA0 ; # 亠
+                isd:middle   a.ucs:0x53E3 ; # 口
+                isd:below    a.ucs:0x5196   # 冖
             ]
         ] ;
         isd:middle   a.ucs:0x4E8C ; # 二
@@ -5709,12 +6112,12 @@ rep.ucs_iso:0x20181
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20181 ] ;
         ideo:hanyu-dazidian  ( 1 292 4 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8DCA ; # &CDP-8DCA;
-        isd:below    rep.ucs-itaiji-001:0x3F0C   # &U-i001+3F0C;
-    ] ;
-        :eq rep.cns11643-5:0x4B71     ; # &I-C5-4B71;
-        :eq rep.daikanwa:00330        ; # &C5-4B71;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.big5-cdp:0x8DCA ; # &CDP-8DCA;
+            isd:below    rep.ucs-itaiji-001:0x3F0C   # &U-i001+3F0C;
+        ] ;
+        :eq rep.cns11643-5:0x4B71     ; # &C5-4B71;
+        :eq rep.daikanwa:00330        ; # &I-M-00330;
         :subsume
             g2.daikanwa:00330    ,
             g2.cns11643-5:0x4B71 ,
@@ -5789,7 +6192,7 @@ a.ucs:0x20187
     ideo:radical           8 ; # ⼇ 
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs_component:0x5967   # &BUCS+5967;
+        isd:below    a.ucs_iwds-1:0x5967   # &A-IWDSU+5967;
     ] ;
     .
 
@@ -5821,10 +6224,10 @@ rep.ucs_iso:0x20187
     g2.daikanwa:00332
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00332 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    g2.ucs_unicode:0x5967   # &g2-AJ1-04557;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    g2.ucs_unicode:0x5967   # &g2-AJ1-04557;
+        ] ;
         :subsume
             repi.daikanwa:00332  ,
             rep.hanziku-1:0xE25A ;
@@ -5841,10 +6244,10 @@ rep.ucs_iso:0x20187
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20187 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:below    g2.cns11643-1:0x635F   # &g2-CU+5967;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt:00375 ; # &GT-00375;
+            isd:below    g2.cns11643-1:0x635F   # &g2-CU+5967;
+        ] ;
         .
     g2.cns11643-7:0x2124
         a chisegg:abstract-glyph-form ;
@@ -5904,10 +6307,10 @@ rep.ucs_iso:0x2018A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2018A ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    a.ucs:0x4E9E   # 亞
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    a.ucs:0x4E9E   # 亞
+        ] ;
         :eq g2.cns11643-7:0x2146      ; # &g2-M-04326;
         :eq g2.daikanwa:04326         ; # &g2-M-04326;
         :subsume
@@ -6009,11 +6412,11 @@ a.ucs:0x20189
     rep.daikanwa:48914
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:48914 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:middle   a.ucs:0x53B6 ; # 厶
-        isd:below    rep.big5-cdp:0x856A   # &CDP-856A;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:middle   a.ucs:0x53B6 ; # 厶
+            isd:below    rep.big5-cdp:0x856A   # &CDP-856A;
+        ] ;
         .
     rep.ucs_iso:0x20189
         a chisegg:abstract-glyph ;
@@ -6043,48 +6446,58 @@ a.ucs:0x20186
     ideo:strokes           [ :context domain:cns     ;
                              :target  8 ] ;
     ideo:total-strokes    15 ;
+    ideo:hanyu-dazidian  ( 1 292 5 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x23140 ; # &U-i001+23140;
+        isd:below    a.ucs:0x2EB8   # ⺸
+    ] ;
+    :eq rep.cns11643-7:0x2679     ; # &I-C7-2679;
+    :eq rep.daikanwa:49510        ; # &I-M-49510;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  rep.ucs_iso:0x263A7  ] ;
     :subsume
-        rep.daikanwa:49510   ,
-        rep.ucs_iso:0x20186  ,
-        rep.cns11643-7:0x2679 ;
+        g2.ucs_iso:0x20186   ,
+        g2.cns11643-7:0x2679 ;
     .
+    rep.cns11643-7:0x2679
+               :abstract-glyph-of     cns11643-7:0x2679  .
     rep.daikanwa:49510
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:49510 ;
-        ideo:radical         123 ; # ⽺ 
-        ideo:strokes           8 ;
-        .
-    rep.ucs_iso:0x20186
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x20186 ] ;
-        ideo:radical           8 ; # ⼇ 
-        ideo:strokes          13 ;
-        ideo:hanyu-dazidian  ( 1 292 5 ) ;
-        :eq rep.hanziku-1:0xE256      ; # &HZK01-E256;
+               :abstract-glyph-of       daikanwa:49510   .
+    g2.ucs_iso:0x20186
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20186 ] ;
+        :eq g2.daikanwa:49510         ; # &g2-M-49510;
+        :subsume
+            repi.daikanwa:49510  ,
+            repi.ucs_iso:0x20186 ,
+            rep.hanziku-1:0xE256 ;
         .
+        g2.daikanwa:49510
+              :abstract-glyph-form-of       daikanwa:49510   .
+        repi.daikanwa:49510
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:49510 ;
+            .
+        repi.ucs_iso:0x20186
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20186 ] ;
+            .
         rep.hanziku-1:0xE256
-                   :abstract-glyph-of      hanziku-1:0xE256  .
-    rep.cns11643-7:0x2679
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-7:0x2679 ;
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE256 ;
+            .
+    g2.cns11643-7:0x2679
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x2679 ;
         ideo:radical         123 ; # ⽺ 
         ideo:strokes           8 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.gt:00375 ; # &GT-00375;
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ] ;
-        isd:below    a.ucs:0x2EB8   # ⺸
-    ] ;
+        :eq g2.ucs_cns:0x20186        ; # &g2-CU+20186;
         .
+        g2.ucs_cns:0x20186
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x20186 ] .
 
 a.ucs:0x20188
     a chisegg:abstract-character ;
@@ -6096,9 +6509,9 @@ a.ucs:0x20188
     isd:structure [ a idc:⿱ ;
         isd:above    rep.big5-cdp:0x8DEB ; # &CDP-8DEB;
         isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x5973   # 女
+            isd:structure [ a idc:⿵ ;
+                isd:surround a.ucs:0x5182 ; # 冂
+                isd:filling  a.ucs:0x5973   # 女
             ]
         ]
     ] ;
@@ -6116,14 +6529,14 @@ rep.cbeta:03716
     isd:structure [ a idc:⿱ ;
         isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
         isd:below    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x76EE ; # 目
-                        :right    a.ucs:0x76EE   # 目
+            isd:structure [ a idc:⿱ ;
+                isd:above    [
+                    isd:structure [ a idc:⿰ ;
+                        isd:left     a.ucs:0x76EE ; # 目
+                        isd:right    a.ucs:0x76EE   # 目
                     ]
                 ] ;
-                :below    a.ucs:0x5927   # 大
+                isd:below    a.ucs:0x5927   # 大
             ]
         ]
     ] ;
@@ -6138,12 +6551,12 @@ a.ucs:0x2018B
     ideo:hanyu-dazidian  ( 1 293 17 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :below    [
-                    :structure [ a idc:⿻ ;
-                        :underlying a.ucs:0x7676 ; # 癶
-                        :overlaying a.ucs:0x4E2B   # 丫
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4EA0 ; # 亠
+                isd:below    [
+                    isd:structure [ a idc:⿻ ;
+                        isd:underlying a.ucs:0x7676 ; # 癶
+                        isd:overlaying a.ucs:0x4E2B   # 丫
                     ]
                 ]
             ]
@@ -6208,11 +6621,11 @@ rep.ucs_iso:0x2018C
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2018C ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EAF ; # 亯
-        isd:middle   a.ucs:0x516B ; # 八
-        isd:below    a.ucs:0x767D   # 白
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EAF ; # 亯
+            isd:middle   a.ucs:0x516B ; # 八
+            isd:below    a.ucs:0x767D   # 白
+        ] ;
         :eq g.daikanwa:00334          ; # &G-IU+2018C;
         :subsume
             g2.ucs_iso:0x2018C   ;
@@ -6223,11 +6636,11 @@ rep.ucs_iso:0x2018C
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of [ :context domain:iso     ;
                                       :target     ucs:0x2018C ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
-        isd:middle   g2.mj:007274 ; # &g2-MJ007274;
-        isd:below    g2.ucs_unicode:0x767D   # &g2-AJ1-03368;
-    ] ;
+            isd:structure [ a idc:⿳ ;
+                isd:above    g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
+                isd:middle   g2.mj:007274 ; # &g2-MJ007274;
+                isd:below    g2.ucs_unicode:0x767D   # &g2-AJ1-03368;
+            ] ;
             :eq g2.daikanwa:00334         ; # &g2-M-00334;
             :subsume
                 repi.daikanwa:00334  ,
@@ -6248,22 +6661,22 @@ rep.ucs_iso:0x2018C
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:cns     ;
                              :target     ucs:0x2018C ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EAF ; # 亯
-        isd:middle   a.ucs:0x513F ; # 儿
-        isd:below    a.ucs:0x767D   # 白
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EAF ; # 亯
+            isd:middle   a.ucs:0x513F ; # 儿
+            isd:below    a.ucs:0x767D   # 白
+        ] ;
         :subsume
             g2.cns11643-7:0x2C3F ;
         .
         g2.cns11643-7:0x2C3F
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of cns11643-7:0x2C3F ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
-        isd:middle   a.ucs:0x513F ; # 儿
-        isd:below    a.ucs:0x767D   # 白
-    ] ;
+            isd:structure [ a idc:⿳ ;
+                isd:above    g2.ucs_unicode:0x4EAF ; # &g2-AJ1-21082;
+                isd:middle   a.ucs:0x513F ; # 儿
+                isd:below    a.ucs:0x767D   # 白
+            ] ;
             :eq g2.ucs_cns:0x2018C        ; # &g2-CU+2018C;
             .
             g2.ucs_cns:0x2018C
@@ -6296,11 +6709,11 @@ a.ucs:0x2018E
     g2.cns11643-5:0x5353
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-5:0x5353 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   g2.cns11643-1:0x5E58 ; # &g2-CU+570D;
-        isd:below    g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   g2.cns11643-1:0x5E58 ; # &g2-CU+570D;
+            isd:below    g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
+        ] ;
         :eq g2.ucs_cns:0x2018E        ; # &g2-M-00335;
         :eq g2.daikanwa:00335         ; # &g2-M-00335;
         :subsume
@@ -6324,11 +6737,11 @@ a.ucs:0x2018E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2018E ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   g2.mj:008868 ; # &g2-MJ008868;
-        isd:below    g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   g2.mj:008868 ; # &g2-MJ008868;
+            isd:below    g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
+        ] ;
         .
     rep.hanziku-1:0xE27B
         a chisegg:abstract-glyph ;
@@ -6371,32 +6784,40 @@ a.ucs:0x20191
         isd:middle   rep.big5-cdp:0x8553 ; # &CDP-8553;
         isd:below    rep.gt-k:00264   # &GT-K00264;
     ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "Au" ) ;
+                         ] ;
+    :eq rep.daikanwa:00337        ; # &I-M-00337;
     :subsume
-        rep.daikanwa:00337   ,
-        rep.ucs_iso:0x20191  ;
+        g2.ucs_iso:0x20191   ;
     .
     rep.daikanwa:00337
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:00337 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:middle   rep.big5-cdp:0x8553 ; # &CDP-8553;
-        isd:below    rep.gt-k:00264   # &GT-K00264;
-    ] ;
-        .
-    rep.ucs_iso:0x20191
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x20191 ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.gt:00375 ; # &GT-00375;
-        isd:middle   rep.big5-cdp:0x8553 ; # &CDP-8553;
-        isd:below    rep.gt-k:00264   # &GT-K00264;
-    ] ;
-        :eq rep.hanziku-1:0xE274      ; # &HZK01-E274;
+               :abstract-glyph-of       daikanwa:00337   .
+    g2.ucs_iso:0x20191
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20191 ] ;
+        :eq g2.daikanwa:00337         ; # &g2-M-00337;
+        :subsume
+            repi.daikanwa:00337  ,
+            repi.ucs_iso:0x20191 ,
+            rep.hanziku-1:0xE274 ;
         .
+        g2.daikanwa:00337
+              :abstract-glyph-form-of       daikanwa:00337   .
+        repi.daikanwa:00337
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00337 ;
+            .
+        repi.ucs_iso:0x20191
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20191 ] ;
+            .
         rep.hanziku-1:0xE274
-                   :abstract-glyph-of      hanziku-1:0xE274  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE274 ;
+            .
 
 a.ucs:0x20192
     a chisegg:abstract-character ;
@@ -6438,10 +6859,10 @@ rep.ucs_iso:0x20192
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20192 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
-        isd:below    g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.gt-k:02791 ; # &g2-CDP-8C4D;
+            isd:below    g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
+        ] ;
         :eq g2.cns11643-7:0x2C3D      ; # &g2-M-00338;
         :eq g2.daikanwa:00338         ; # &g2-M-00338;
         :subsume
@@ -6505,22 +6926,6 @@ a.ucs:0x4EB8
     rep.iso-ir165:0x2C22
                :abstract-glyph-of      iso-ir165:0x2C22  .
 
-a.ucs:0x20193
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x20193 ;
-    ideo:radical           8 ; # ⼇ 
-    ideo:strokes          14 ;
-    ideo:total-strokes    16 ;
-    ideo:hanyu-dazidian  ( 1 293 8 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4EAB ; # 享
-        isd:right    a.ucs:0x591C   # 夜
-    ] ;
-    :eq rep.hanziku-1:0xE279      ; # &I-HZK01-E279;
-    .
-    rep.hanziku-1:0xE279
-               :abstract-glyph-of      hanziku-1:0xE279  .
-
 a.ucs:0x20194
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20194 ;
@@ -6537,22 +6942,6 @@ a.ucs:0x20194
     rep.hanziku-1:0xE27A
                :abstract-glyph-of      hanziku-1:0xE27A  .
 
-a.ucs:0x20195
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x20195 ;
-    ideo:radical           8 ; # ⼇ 
-    ideo:strokes          14 ;
-    ideo:total-strokes    16 ;
-    ideo:hanyu-dazidian  ( 1 293 11 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x5E77 ; # 幷
-        isd:right    a.ucs:0x591C   # 夜
-    ] ;
-    :eq rep.hanziku-1:0xE27C      ; # &I-HZK01-E27C;
-    .
-    rep.hanziku-1:0xE27C
-               :abstract-glyph-of      hanziku-1:0xE27C  .
-
 a.ucs:0x20196
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20196 ;
@@ -6563,9 +6952,9 @@ a.ucs:0x20196
     isd:structure [ a idc:⿳ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x65B9 ; # 方
-                :right    a.ucs:0x6C0F   # 氏
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x65B9 ; # 方
+                isd:right    a.ucs:0x6C0F   # 氏
             ]
         ] ;
         isd:below    a.ucs:0x5408   # 合
@@ -6623,6 +7012,10 @@ a.ucs:0x342F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x342F ;
     ideo:radical           8 ; # ⼇ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs-itaiji-001:0x23140 ; # &A-U-i001+23140;
+        isd:below    a.ucs:0x9999   # 香
+    ] ;
     .
 
 rep.ucs_unicode:0x342F
@@ -6636,40 +7029,24 @@ rep.ucs_unicode:0x342F
     ideo:total-strokes    17 ;
     ideo:hanyu-dazidian  ( 1 294 2 ) ;
     isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    rep.gt-k:01444 ; # &GT-K01444;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        isd:above    rep.ucs-itaiji-001:0x23140 ; # &U-i001+23140;
         isd:below    a.ucs:0x9999   # 香
     ] ;
     :eq rep.daikanwa:00339        ; # &M-00339;
-    :eq rep.hanziku-1:0xE2B5      ; # &I-HZK01-E2B5;
     :subsume
         g2.ucs_unicode:0x342F ;
     .
     rep.daikanwa:00339
                :abstract-glyph-of       daikanwa:00339   .
-    rep.hanziku-1:0xE2B5
-               :abstract-glyph-of      hanziku-1:0xE2B5  .
     g2.ucs_unicode:0x342F
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x342F  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿱ ;
-                :above    g2.gt-k:01444 ; # &g2-GT-K01444;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ] ;
-        isd:below    a.ucs:0x9999   # 香
-    ] ;
         :eq g2.daikanwa:00339         ; # &g2-M-00339;
         :subsume
             repi.daikanwa:00339  ,
-            repi.ucs_unicode:0x342F ;
+            repi.ucs_unicode:0x342F ,
+            rep.hanziku-1:0xE2B5 ;
         .
         g2.daikanwa:00339
               :abstract-glyph-form-of       daikanwa:00339   .
@@ -6682,6 +7059,10 @@ rep.ucs_unicode:0x342F
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x342F  ] ;
             .
+        rep.hanziku-1:0xE2B5
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xE2B5 ;
+            .
 
 a.ucs:0x20199
     a chisegg:abstract-character ;
@@ -6748,10 +7129,10 @@ rep.ucs_iso:0x20199
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20199 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.ucs_unicode:0x4EAD ; # &g2-AJ1-03070;
-        isd:right    g2.ucs_unicode:0x591C   # &g2-AJ1-03831;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.ucs_unicode:0x4EAD ; # &g2-AJ1-03070;
+            isd:right    g2.ucs_unicode:0x591C   # &g2-AJ1-03831;
+        ] ;
         :eq g2.cbeta:00833            ; # &g2-CB00833;
         :subsume
             repi.cbeta:00833     ,
@@ -6791,11 +7172,11 @@ a.ucs:0x2019A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2019A ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:middle   a.ucs:0x4020 ; # 䀠
-        isd:below    g2.ucs_unicode:0x6B7B   # &g2-AJ1-02222;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:middle   a.ucs:0x4020 ; # 䀠
+            isd:below    g2.ucs_unicode:0x6B7B   # &g2-AJ1-02222;
+        ] ;
         :eq g2.daikanwa:00340         ; # &g2-M-00340;
         :subsume
             repi.daikanwa:00340  ,
@@ -6852,10 +7233,10 @@ a.ucs:0x2019C
         :abstract-glyph-form-of daikanwa:48577 ;
         ideo:radical         210 ; # ⿑ 
         ideo:strokes           8 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.big5-cdp:0x8DEB ; # &g2-CDP-8DEB;
-        isd:below    g2.ucs_unicode:0x59BB   # &g2-AJ1-02106;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.big5-cdp:0x8DEB ; # &g2-CDP-8DEB;
+            isd:below    g2.ucs_unicode:0x59BB   # &g2-AJ1-02106;
+        ] ;
         .
     g2.ucs_iso:0x2019C
         a chisegg:abstract-glyph-form ;
@@ -6900,10 +7281,10 @@ a.ucs:0x2019B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2019B ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4EA0 ; # 亠
-        isd:below    a.ucs:0x66BA   # 暺
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4EA0 ; # 亠
+            isd:below    a.ucs:0x66BA   # 暺
+        ] ;
         .
 
 a.ucs:0x2019D
@@ -7088,15 +7469,15 @@ rep.mj:006490
         isd:below    rep.cns11643-2:0x664D   # &C2-664D;
     ] ;
     :eq rep.hanyo-denshi...ib:0x2D39 ; # &I-HD-IB-2D39;
-    :eq rep.shinjigen:00112       ; # &MJ006490;
+    :eq rep.shinjigen:0112        ; # &MJ006490;
     :eq rep.jef-china3:0x41DB     ; # &I-JC3-41DB;
     :subsume
         g2.mj:006490         ;
     .
     rep.hanyo-denshi...ib:0x2D39
                :abstract-glyph-of hanyo-denshi...ib:0x2D39  .
-    rep.shinjigen:00112
-               :abstract-glyph-of      shinjigen:00112   .
+    rep.shinjigen:0112
+               :abstract-glyph-of      shinjigen:0112    .
     rep.jef-china3:0x41DB
                :abstract-glyph-of     jef-china3:0x41DB  .
     g2.mj:006490
@@ -7105,20 +7486,20 @@ rep.mj:006490
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4EB9         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-        isd:below    rep.cns11643-2:0x664D   # &C2-664D;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+            isd:below    rep.cns11643-2:0x664D   # &C2-664D;
+        ] ;
         :eq g2.hanyo-denshi...ib:0x2D39 ; # &g2-MJ006490;
-        :eq g2.shinjigen:00112        ; # &g2-MJ006490;
+        :eq g2.shinjigen:0112         ; # &g2-MJ006490;
         :subsume
             repi.hanyo-denshi...ib:0x2D39 ,
             repi.mj:006490       ;
         .
         g2.hanyo-denshi...ib:0x2D39
               :abstract-glyph-form-of hanyo-denshi...ib:0x2D39  .
-        g2.shinjigen:00112
-              :abstract-glyph-form-of      shinjigen:00112   .
+        g2.shinjigen:0112
+              :abstract-glyph-form-of      shinjigen:0112    .
         repi.hanyo-denshi...ib:0x2D39
             a chisegg:glyph-image ;
             :glyph-image-of hanyo-denshi...ib:0x2D39 ;
@@ -7174,15 +7555,15 @@ a.ucs:0x201A1
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4EA0 ; # 亠
         isd:below    [
-            :structure [ a idc:⿳ ;
-                :above    [
-                    :structure [ a idc:⿶ ;
-                        :surround rep.big5-cdp:0x8B64 ; # &CDP-8B64;
-                        :filling  a.ucs:0x540C   # 同
+            isd:structure [ a idc:⿳ ;
+                isd:above    [
+                    isd:structure [ a idc:⿶ ;
+                        isd:surround rep.big5-cdp:0x8B64 ; # &CDP-8B64;
+                        isd:filling  a.ucs:0x540C   # 同
                     ]
                 ] ;
-                :middle   a.ucs:0x6797 ; # 林
-                :below    a.ucs:0x706C   # 灬
+                isd:middle   a.ucs:0x6797 ; # 林
+                isd:below    a.ucs:0x706C   # 灬
             ]
         ]
     ] ;
@@ -7196,8 +7577,8 @@ a.ucs_component:0x342C
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x342C  ] ;
     ideo:radical           8 ; # ⼇ 
-    :eq a.iwds-1:0x159            ; # &IWDS1-345;
+    :eq a.iwds-1:0345             ; # &A-compU+342C;
     .
-    a.iwds-1:0x159
-           :abstract-character-of         iwds-1:0x159   .
+    a.iwds-1:0345
+           :abstract-character-of         iwds-1:0345    .