X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R005-Second.ttl;h=99d0cdda0bc06a387f4c5f00ce69bc3852e101ac;hb=cd05f4bc23b3ec0f2af9ca57b8a7737ecf5d8490;hp=b2fb759001234c35a8ba434388624212fabeea77;hpb=2ef4fa8ff4ee16f3262534a56dc7e0d5c7473443;p=chise%2Fchiset.git

diff --git a/Ideograph-R005-Second.ttl b/Ideograph-R005-Second.ttl
index b2fb759..99d0cdd 100644
--- a/Ideograph-R005-Second.ttl
+++ b/Ideograph-R005-Second.ttl
@@ -7,19 +7,24 @@
 @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_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
+@prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
 @prefix rep.ucs_cns: <http://www.chise.org/est/view/character/rep.ucs@cns=> .
 @prefix rep.ucs_jis: <http://www.chise.org/est/view/character/rep.ucs@jis=> .
 @prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
+@prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
+@prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
 @prefix g2.ucs_iso: <http://www.chise.org/est/view/character/g2.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=> .
@@ -84,21 +89,38 @@
 @prefix repi.adobe-japan1-5: <http://www.chise.org/est/view/character/repi.adobe-japan1-5=> .
 @prefix repi.adobe-japan1-6: <http://www.chise.org/est/view/character/repi.adobe-japan1-6=> .
 @prefix g2.gb12345: <http://www.chise.org/est/view/character/g2.gb12345=> .
+@prefix rep.big5-eten: <http://www.chise.org/est/view/character/rep.big5-eten=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
+@prefix 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...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
+@prefix g2.hanyo-denshi...ks: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ks=> .
+@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...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 repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
 @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 o.gt: <http://www.chise.org/est/view/character/o.gt=> .
 @prefix rep.gt-k: <http://www.chise.org/est/view/character/rep.gt-k=> .
 @prefix g2.gt-k: <http://www.chise.org/est/view/character/g2.gt-k=> .
 @prefix repi.gt-k: <http://www.chise.org/est/view/character/repi.gt-k=> .
+@prefix g.gt-k: <http://www.chise.org/est/view/character/g.gt-k=> .
+@prefix a.gt-k: <http://www.chise.org/est/view/character/a.gt-k=> .
 @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-6: <http://www.chise.org/est/view/character/rep.gt-pj-6=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
+@prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
+@prefix g2.gt-pj-k2: <http://www.chise.org/est/view/character/g2.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 g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
@@ -123,15 +145,25 @@
 @prefix repi.hng-kar: <http://www.chise.org/est/view/character/repi.hng-kar=> .
 @prefix repi.hng-hos: <http://www.chise.org/est/view/character/repi.hng-hos=> .
 @prefix repi.hng-hod: <http://www.chise.org/est/view/character/repi.hng-hod=> .
+@prefix repi.hng-nkk: <http://www.chise.org/est/view/character/repi.hng-nkk=> .
 @prefix repi.hng-kmi: <http://www.chise.org/est/view/character/repi.hng-kmi=> .
 @prefix repi.hng-doh: <http://www.chise.org/est/view/character/repi.hng-doh=> .
 @prefix repi.hng-kss: <http://www.chise.org/est/view/character/repi.hng-kss=> .
 @prefix repi.hng-smk: <http://www.chise.org/est/view/character/repi.hng-smk=> .
+@prefix rep.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
+@prefix g2.cbeta: <http://www.chise.org/est/view/character/g2.cbeta=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
+@prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
+@prefix g2.ucs-var-002: <http://www.chise.org/est/view/character/g2.ucs-var-002=> .
+@prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix g2.ucs-itaiji-001: <http://www.chise.org/est/view/character/g2.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 ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -154,7 +186,11 @@
 @prefix jis-x0213-2: <http://rdf.chise.org/data/ccs/jis-x0213-2/code-point/> .
 @prefix gb12345: <http://rdf.chise.org/data/ccs/gb12345/code-point/> .
 @prefix big5: <http://rdf.chise.org/data/ccs/big5/code-point/> .
+@prefix big5-eten: <http://rdf.chise.org/data/ccs/big5-eten/code-point/> .
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
+@prefix hanyo-denshi...ks: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks/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 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/> .
@@ -163,6 +199,7 @@
 @prefix gt-pj-9: <http://rdf.chise.org/data/ccs/gt-pj-9/code-point/> .
 @prefix gt-pj-11: <http://rdf.chise.org/data/ccs/gt-pj-11/code-point/> .
 @prefix gt-pj-k1: <http://rdf.chise.org/data/ccs/gt-pj-k1/code-point/> .
+@prefix gt-pj-k2: <http://rdf.chise.org/data/ccs/gt-pj-k2/code-point/> .
 @prefix daikanwa: <http://rdf.chise.org/data/ccs/daikanwa/code-point/> .
 @prefix daikanwa...ho: <http://rdf.chise.org/data/ccs/daikanwa...ho/code-point/> .
 @prefix shinjigen: <http://rdf.chise.org/data/ccs/shinjigen/code-point/> .
@@ -180,13 +217,19 @@
 @prefix hng-kar: <http://rdf.chise.org/data/ccs/hng-kar/code-point/> .
 @prefix hng-hos: <http://rdf.chise.org/data/ccs/hng-hos/code-point/> .
 @prefix hng-hod: <http://rdf.chise.org/data/ccs/hng-hod/code-point/> .
+@prefix hng-nkk: <http://rdf.chise.org/data/ccs/hng-nkk/code-point/> .
 @prefix hng-kmi: <http://rdf.chise.org/data/ccs/hng-kmi/code-point/> .
 @prefix hng-doh: <http://rdf.chise.org/data/ccs/hng-doh/code-point/> .
 @prefix hng-kss: <http://rdf.chise.org/data/ccs/hng-kss/code-point/> .
 @prefix hng-smk: <http://rdf.chise.org/data/ccs/hng-smk/code-point/> .
+@prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
+@prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
+@prefix ucs-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/> .
 
 a.ucs_component:0x4E59
     a chisegg:abstract-character ;
@@ -195,7 +238,7 @@ a.ucs_component:0x4E59
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           0 ;
     ideo:total-strokes     1 ;
-    :eq a.iwds-1:0340             ; # &IWDS1-340;
+    :eq a.iwds-1:0340             ; # &A-compU+4E59;
     .
     a.iwds-1:0340
            :abstract-character-of         iwds-1:0340    .
@@ -379,11 +422,13 @@ a.ucs:0x4E5A
     :eq rep.jis-x0212:0x3034      ; # &I-JSP-3034;
     :eq rep.cns11643-4:0x2124     ; # &I-C4-2124;
     :eq rep.jis-x0213-2:0x212F    ; # &I-JX2-212F;
-    :eq a.big5:0xC87B             ; # &I-B-C87B;
+    :eq rep.big5-eten:0xC87B      ; # &I-B-C87B;
     :eq rep.gt:00222              ; # &I-GT-00222;
     :eq rep.gt-k:00028            ; # &I-GT-K00028;
     :eq rep.gt-pj-2:12611         ; # &I-GT-00222;
     :eq rep.daikanwa:00163        ; # &I-M-00163;
+    :subsume
+        g2.ucs_unicode:0x4E5A ;
     .
     rep.adobe-japan1-4:14305
                :abstract-glyph-of adobe-japan1-4:14305   .
@@ -393,8 +438,8 @@ a.ucs:0x4E5A
                :abstract-glyph-of     cns11643-4:0x2124  .
     rep.jis-x0213-2:0x212F
                :abstract-glyph-of    jis-x0213-2:0x212F  .
-    a.big5:0xC87B
-           :abstract-character-of           big5:0xC87B  .
+    rep.big5-eten:0xC87B
+               :abstract-glyph-of      big5-eten:0xC87B  .
     rep.gt:00222
                :abstract-glyph-of             gt:00222   .
     rep.gt-k:00028
@@ -403,6 +448,70 @@ a.ucs:0x4E5A
                :abstract-glyph-of        gt-pj-2:12611   .
     rep.daikanwa:00163
                :abstract-glyph-of       daikanwa:00163   .
+    g2.ucs_unicode:0x4E5A
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4E5A  ] ;
+        :eq g2.adobe-japan1-4:14305   ; # &g2-AJ1-14305;
+        :eq g2.jis-x0212:0x3034       ; # &g2-AJ1-14305;
+        :eq g2.cns11643-4:0x2124      ; # &g2-AJ1-14305;
+        :eq g2.jis-x0213-2:0x212F     ; # &g2-AJ1-14305;
+        :eq g2.gt:00222               ; # &g2-AJ1-14305;
+        :eq g2.gt-k:00028             ; # &g2-AJ1-14305;
+        :eq g2.daikanwa:00163         ; # &g2-AJ1-14305;
+        :subsume
+            repi.daikanwa:00163  ,
+            repi.jis-x0213-2:0x212F ,
+            repi.adobe-japan1-6:14305 ,
+            repi.cns11643-4:0x2124 ,
+            repi.gt:00222        ,
+            repi.ucs_unicode:0x4E5A ;
+        .
+        g2.adobe-japan1-4:14305
+              :abstract-glyph-form-of adobe-japan1-4:14305   .
+        g2.jis-x0212:0x3034
+              :abstract-glyph-form-of      jis-x0212:0x3034  .
+        g2.cns11643-4:0x2124
+              :abstract-glyph-form-of     cns11643-4:0x2124  .
+        g2.jis-x0213-2:0x212F
+              :abstract-glyph-form-of    jis-x0213-2:0x212F  .
+        g2.gt:00222
+              :abstract-glyph-form-of             gt:00222   .
+        g2.gt-k:00028
+              :abstract-glyph-form-of           gt-k:00028   .
+        g2.daikanwa:00163
+              :abstract-glyph-form-of       daikanwa:00163   .
+        repi.daikanwa:00163
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00163 ;
+            .
+        repi.jis-x0212:0x3034
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x3034 ;
+            :eq repi.jis-x0213-2:0x212F   ; # &R-JX2-212F;
+            .
+            repi.jis-x0213-2:0x212F
+                          :glyph-image-of    jis-x0213-2:0x212F  .
+        repi.adobe-japan1-4:14305
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14305 ;
+            .
+        repi.cns11643-4:0x2124
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x2124 ;
+            .
+        repi.gt:00222
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00222 ;
+            :eq repi.gt-k:00028           ; # &R-GT-00222;
+            .
+            repi.gt-k:00028
+                          :glyph-image-of           gt-k:00028   .
+        repi.ucs_unicode:0x4E5A
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4E5A  ] ;
+            .
 
 a.ucs:0x200D1
     a chisegg:abstract-character ;
@@ -427,7 +536,7 @@ rep.ucs_iso:0x200D1
     :eq rep.gt:00223              ; # &GT-00223;
     :eq rep.gt-pj-2:12612         ; # &GT-00223;
     :eq rep.daikanwa:00164        ; # &I-M-00164;
-    :from.Small-Seal     [ :sources chisebib:daikanwa ;
+    ideo:Small-Seal-of   [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x4E5A         ] ;
     :to.Bopomofo         a.ucs:0x3123         ;
     :subsume
@@ -592,6 +701,80 @@ a.ucs:0x200CC
     rep.daikanwa...ho:0006
                :abstract-glyph-of  daikanwa...ho:0006    .
 
+a.ucs:0x31C7
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x31C7 ;
+    :name                 "CJK STROKE HP" ;
+    :general-category     "(symbol other)" ; # Informative Category
+    :bidi-category        "ON" ;
+    :mirrored             "nil" ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     1 ;
+    :eq rep.big5-cdp:0x8BA2       ; # &I-CDP-8BA2;
+    :eq rep.gt-k:00025            ; # &I-GT-K00025;
+    :eq rep.gt-pj-k1:12337        ; # ㇇
+    :subsume
+        a.gt-k:00025         ,
+        rep.gt-k:00022       ;
+    .
+    rep.big5-cdp:0x8BA2
+               :abstract-glyph-of       big5-cdp:0x8BA2  .
+    rep.gt-k:00025
+               :abstract-glyph-of           gt-k:00025   .
+    rep.gt-pj-k1:12337
+               :abstract-glyph-of       gt-pj-k1:12337   .
+    a.gt-k:00025
+        a chisegg:abstract-character ;
+        :abstract-character-of gt-k:00025 ;
+        :eq g.ucs_unicode:0x31C7      ; # &G-CDP-8BA2;
+        :eq g.big5-cdp:0x8BA2         ; # &G-CDP-8BA2;
+        :eq g.gt-k:00025              ; # &G-CDP-8BA2;
+        :subsume
+            g2.gt-k:00025        ,
+            g2.big5-cdp:0x8BA2   ,
+            g2.ucs_unicode:0x31C7 ;
+        .
+        g.ucs_unicode:0x31C7
+                   :detailed-glyph-of [ :context domain:unicode ;
+                                        :target     ucs:0x31C7  ] .
+        g.big5-cdp:0x8BA2
+                   :detailed-glyph-of       big5-cdp:0x8BA2  .
+        g.gt-k:00025
+                   :detailed-glyph-of           gt-k:00025   .
+        g2.gt-k:00025
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00025 ;
+            :eq g2.gt-pj-k1:12337         ; # &g2-GT-K00025;
+            .
+            g2.gt-pj-k1:12337
+                  :abstract-glyph-form-of       gt-pj-k1:12337   .
+        g2.big5-cdp:0x8BA2
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of big5-cdp:0x8BA2 ;
+            .
+        g2.ucs_unicode:0x31C7
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x31C7  ] ;
+            .
+    rep.gt-k:00022
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of gt-k:00022 ;
+        :eq rep.gt-pj-k1:12326        ; # &GT-K00022;
+        :subsume
+            g2.gt-k:00022        ;
+        .
+        rep.gt-pj-k1:12326
+                   :abstract-glyph-of       gt-pj-k1:12326   .
+        g2.gt-k:00022
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00022 ;
+            :eq g2.gt-pj-k1:12326         ; # &g2-GT-K00022;
+            .
+            g2.gt-pj-k1:12326
+                  :abstract-glyph-form-of       gt-pj-k1:12326   .
+
 a.ucs:0x4E5B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E5B ;
@@ -639,45 +822,78 @@ a.ucs:0x200CA
     ideo:total-strokes     1 ;
     ideo:hanyu-dazidian  ( 1 47 5 ) ;
     :eq rep.big5-cdp:0x8C7B       ; # &I-CDP-8C7B;
+    :eq rep.gt-k:00029            ; # &I-GT-K00029;
+    :eq rep.gt-pj-k1:12346        ; # 𠃊
     :subsume
-        rep.gt-k:00029       ,
+        a.gt-k:00029         ,
         rep.gt-k:00027       ;
     .
     rep.big5-cdp:0x8C7B
                :abstract-glyph-of       big5-cdp:0x8C7B  .
     rep.gt-k:00029
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:00029 ;
-        :eq g2.ucs_iso:0x200CA        ; # &g2-CDP-8C7B;
-        :eq g2.big5-cdp:0x8C7B        ; # &g2-CDP-8C7B;
-        :eq rep.gt-pj-k1:12346        ; # &g2-CDP-8C7B;
+               :abstract-glyph-of           gt-k:00029   .
+    rep.gt-pj-k1:12346
+               :abstract-glyph-of       gt-pj-k1:12346   .
+    a.gt-k:00029
+        a chisegg:abstract-character ;
+        :abstract-character-of gt-k:00029 ;
+        :eq g.ucs_iso:0x200CA         ; # &G-CDP-8C7B;
+        :eq g.big5-cdp:0x8C7B         ; # &G-CDP-8C7B;
+        :eq g.gt-k:00029              ; # &G-CDP-8C7B;
         :subsume
-            repi.big5-cdp:0x8C7B ,
-            repi.ucs_iso:0x200CA ;
+            g2.ucs_iso:0x200CA   ;
         .
-        g2.ucs_iso:0x200CA
-              :abstract-glyph-form-of [ :context domain:iso     ;
+        g.ucs_iso:0x200CA
+                   :detailed-glyph-of [ :context domain:iso     ;
                                         :target     ucs:0x200CA ] .
-        g2.big5-cdp:0x8C7B
-              :abstract-glyph-form-of       big5-cdp:0x8C7B  .
-        rep.gt-pj-k1:12346
-                   :abstract-glyph-of       gt-pj-k1:12346   .
-        repi.big5-cdp:0x8C7B
-            a chisegg:glyph-image ;
-            :glyph-image-of big5-cdp:0x8C7B ;
-            .
-        repi.ucs_iso:0x200CA
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:iso     ;
-                              :target     ucs:0x200CA ] ;
-            .
+        g.big5-cdp:0x8C7B
+                   :detailed-glyph-of       big5-cdp:0x8C7B  .
+        g.gt-k:00029
+                   :detailed-glyph-of           gt-k:00029   .
+        g2.ucs_iso:0x200CA
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x200CA ] ;
+            :eq g2.big5-cdp:0x8C7B        ; # &g2-CDP-8C7B;
+            :eq g2.gt-k:00029             ; # &g2-CDP-8C7B;
+            :subsume
+                repi.big5-cdp:0x8C7B ,
+                repi.ucs_iso:0x200CA ,
+                repi.gt-k:00029      ;
+            .
+            g2.big5-cdp:0x8C7B
+                  :abstract-glyph-form-of       big5-cdp:0x8C7B  .
+            g2.gt-k:00029
+                  :abstract-glyph-form-of           gt-k:00029   .
+            repi.big5-cdp:0x8C7B
+                a chisegg:glyph-image ;
+                :glyph-image-of big5-cdp:0x8C7B ;
+                .
+            repi.ucs_iso:0x200CA
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x200CA ] ;
+                .
+            repi.gt-k:00029
+                a chisegg:glyph-image ;
+                :glyph-image-of gt-k:00029 ;
+                .
     rep.gt-k:00027
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt-k:00027 ;
         :eq rep.gt-pj-k1:12330        ; # &GT-K00027;
+        :subsume
+            g2.gt-k:00027        ;
         .
         rep.gt-pj-k1:12330
                    :abstract-glyph-of       gt-pj-k1:12330   .
+        g2.gt-k:00027
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00027 ;
+            :eq g2.gt-pj-k1:12330         ; # &g2-GT-K00027;
+            .
+            g2.gt-pj-k1:12330
+                  :abstract-glyph-form-of       gt-pj-k1:12330   .
 
 a.ucs:0x200CD
     a chisegg:abstract-character ;
@@ -703,36 +919,6 @@ a.ucs:0x200CD
         g2.gt-k:00020
               :abstract-glyph-form-of           gt-k:00020   .
 
-rep.big5-cdp:0x8BA2
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of big5-cdp:0x8BA2 ;
-    ideo:radical           5 ; # ⼄ 
-    ideo:strokes           0 ;
-    ideo:total-strokes     1 ;
-    :subsume
-        g2.big5-cdp:0x8BA2   ,
-        rep.gt-k:00025       ,
-        rep.gt-k:00022       ;
-    .
-    g2.big5-cdp:0x8BA2
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of big5-cdp:0x8BA2 ;
-        .
-    rep.gt-k:00025
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:00025 ;
-        :eq rep.gt-pj-k1:12337        ; # &GT-K00025;
-        .
-        rep.gt-pj-k1:12337
-                   :abstract-glyph-of       gt-pj-k1:12337   .
-    rep.gt-k:00022
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:00022 ;
-        :eq rep.gt-pj-k1:12326        ; # &GT-K00022;
-        .
-        rep.gt-pj-k1:12326
-                   :abstract-glyph-of       gt-pj-k1:12326   .
-
 a.ucs:0x4E5C
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E5C ;
@@ -793,6 +979,7 @@ a.ucs:0x4E5D
     :abstract-character-of ucs:0x4E5D ;
     :from.denotational_component
         a.ucs_component:0x4E5D ,
+        a.ucs_iwds-1:0x4E5D  ,
         a.ucs_component:0x4E38 ;
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           1 ;
@@ -1080,16 +1267,59 @@ a.ucs:0x200D0
 a.ucs:0x9FB4
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x9FB4 ;
+    :from.denotational_component
+        a.big5-cdp:0x8A60    ;
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
     :eq rep.adobe-japan1-4:14048  ; # &I-AJ1-14048;
     :eq rep.big5-cdp:0x8B69       ; # &I-CDP-8B69;
+    :subsume
+        g2.big5-cdp:0x8B69   ,
+        g2.adobe-japan1-4:14048 ;
     .
     rep.adobe-japan1-4:14048
                :abstract-glyph-of adobe-japan1-4:14048   .
     rep.big5-cdp:0x8B69
                :abstract-glyph-of       big5-cdp:0x8B69  .
+    g2.big5-cdp:0x8B69
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8B69 ;
+        .
+    g2.adobe-japan1-4:14048
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:14048 ;
+        :eq g2.ucs_JP...hanazono:0x9FB4 ; # &g2-AJ1-14048;
+        :subsume
+            repi.adobe-japan1-6:14048 ;
+        .
+        g2.ucs_JP...hanazono:0x9FB4
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x9FB4  ] .
+        repi.adobe-japan1-4:14048
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14048 ;
+            .
+
+rep.ucs-itaiji-001:0x2008B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x2008B ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    isd:structure [ a idc:⿹ ;
+        isd:surround a.ucs:0x200CC ; # 𠃌
+        isd:filling  a.ucs:0x4E00   # 一
+    ] ;
+    :form-of             [ :context domain:flipped-horizontally ;
+                           :target  a.ucs:0x2008B        ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x2008B ;
+    .
+    g2.ucs-itaiji-001:0x2008B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2008B ;
+        .
 
 rep.big5-cdp:0x8871
     a chisegg:abstract-glyph ;
@@ -1514,8 +1744,8 @@ a.ucs:0x4E60
     :eq rep.gb2312:0x4F30         ; # &I-G0-4F30;
     :eq rep.big5-cdp:0x8973       ; # &I-CDP-8973;
     :eq rep.jef-china3:0x81C9     ; # &I-JC3-81C9;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:020683        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:020683        ] ;
     .
     rep.gb2312:0x4F30
                :abstract-glyph-of         gb2312:0x4F30  .
@@ -1533,8 +1763,8 @@ a.ucs:0x4E61
     ideo:hanyu-dazidian  ( 1 51 5 ) ;
     :eq rep.gb2312:0x4F67         ; # &I-G0-4F67;
     :eq rep.big5-cdp:0x8C51       ; # &I-CDP-8C51;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gb12345:0x4F67   ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gb12345:0x4F67   ] ;
     .
     rep.gb2312:0x4F67
                :abstract-glyph-of         gb2312:0x4F67  .
@@ -1548,8 +1778,8 @@ a.ucs:0x200D3
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
     :eq rep.big5-cdp:0x89DB       ; # &I-CDP-89DB;
-    :from.simplified     [ :context domain:CN...component ;
-                           :target  rep.adobe-japan1-0:05099 ] ;
+    ideo:simplified-form-of [ :context domain:CN...component ;
+                              :target  rep.adobe-japan1-0:05099 ] ;
     :subsume
         g2.ucs_iso:0x200D3   ,
         g2.big5-cdp:0x89DB   ;
@@ -1566,6 +1796,212 @@ a.ucs:0x200D3
         :abstract-glyph-form-of big5-cdp:0x89DB ;
         .
 
+a.ucs:0x200D4
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x200D4 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :eq rep.big5-cdp:0x88A2       ; # &I-CDP-88A2;
+    :eq rep.cbeta:04676           ; # &I-CB04676;
+    :subsume
+        g2.ucs_iso:0x200D4   ,
+        g2.big5-cdp:0x88A2   ,
+        g2.cbeta:04676       ;
+    .
+    rep.big5-cdp:0x88A2
+               :abstract-glyph-of       big5-cdp:0x88A2  .
+    rep.cbeta:04676
+               :abstract-glyph-of          cbeta:04676   .
+    g2.ucs_iso:0x200D4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x200D4 ] ;
+        .
+    g2.big5-cdp:0x88A2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x88A2 ;
+        .
+    g2.cbeta:04676
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cbeta:04676 ;
+        .
+
+a.ucs:0x2CF16
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CF16 ;
+    :from.denotational_component
+        a.ucs_component:0x2CF16 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    .
+
+rep.ucs-itaiji-001:0x2CF16
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x2CF16 ;
+    :denotation-of
+        a.ucs:0x2CF16        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :eq rep.koseki:002080         ; # &KOSEKI-002080;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.mj:006462        ] ;
+    :form-of             [ :context domain:koseki  ;
+                           :target  rep.mj:056865        ] ;
+    :subsume
+        g2.koseki:002080     ,
+        g2.ucs-itaiji-001:0x2CF16 ;
+    .
+    rep.koseki:002080
+               :abstract-glyph-of         koseki:002080  .
+    g2.koseki:002080
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of koseki:002080 ;
+        .
+    g2.ucs-itaiji-001:0x2CF16
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2CF16 ;
+        .
+
+rep.ucs-var-002:0x2CF16
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x2CF16 ;
+    :denotation-of
+        a.ucs:0x2CF16        ;
+    :from.denotational_component
+        a.gt-k:00278         ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :subsume
+        g2.ucs-var-002:0x2CF16 ;
+    .
+    g2.ucs-var-002:0x2CF16
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-var-002:0x2CF16 ;
+        .
+
+rep.mj:056865
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:056865 ;
+    :denotation-of
+        a.ucs:0x2CF16        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :eq rep.ucs_iso:0x2CF16       ; # &MJ056865;
+    :form-of             [ :sources chisebib:koseki_mj ;
+                           :target  rep.mj:006462        ] ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x722A         ] ;
+    :subsume
+        g2.mj:056865         ;
+    .
+    rep.ucs_iso:0x2CF16
+               :abstract-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x2CF16 ] .
+    g2.mj:056865
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056865 ;
+        :eq g2.ucs_iso:0x2CF16        ; # &g2-MJ056865;
+        :subsume
+            repi.mj:056865       ,
+            repi.ucs_iso:0x2CF16 ,
+            repi.hng-nkk:03300   ;
+        .
+        g2.ucs_iso:0x2CF16
+              :abstract-glyph-form-of [ :context domain:iso     ;
+                                        :target     ucs:0x2CF16 ] .
+        repi.mj:056865
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:056865 ;
+            .
+        repi.ucs_iso:0x2CF16
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2CF16 ] ;
+            .
+        repi.hng-nkk:03300
+            a chisegg:glyph-image ;
+            :glyph-image-of hng-nkk:03300 ;
+            .
+
+a.ucs:0x2CF17
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CF17 ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            5 ; # ⼄
+                           ] ;
+    ideo:radical           [ :context domain:gt      ;
+                             :target            4 ; # ⼃
+                           ] ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.big5-cdp:0x8CBD ; # &CDP-8CBD;
+        isd:filling  a.ucs:0x4E5A   # 乚
+    ] ;
+    :sound               [ :context domain:ja...kun ;
+                           :note   ("grain") ;
+                           :target  ( "gureiN" ) ;
+                         ] ;
+    .
+
+a.ucs_component:0x2CF16
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x2CF16 ] ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            5 ; # ⼄
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  2 ] ;
+    ideo:radical           [ :context domain:misc    ;
+                             :target           87 ; # ⽖
+                           ] ;
+    ideo:strokes           [ :context domain:misc    ;
+                             :target  0 ] ;
+    ideo:total-strokes     3 ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x722A         ,
+                                    a.ucs:0x4EA1         ,
+                                    a.ucs:0x5C71         ] ;
+    .
+
+rep.ucs-itaiji-001:0x4EBE
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x4EBE ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x200CA ; # 𠃊
+        isd:filling  a.ucs:0x3405   # 㐅
+    ] ;
+    :form-of             a.ucs:0x4EBE         ,
+                         a.ucs:0x5166         ,
+                         rep.mj:006462        ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x51F6         ] ;
+    .
+
+rep.big5-cdp:0x88B9
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x88B9 ;
+    :from.denotational_component
+        a.ucs_component:0x2CF16 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    ideo:mistakable      a.ucs:0x20009        ;
+    :subsume
+        g2.big5-cdp:0x88B9   ;
+    .
+    g2.big5-cdp:0x88B9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x88B9 ;
+        .
+
 a.ucs:0x200D5
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x200D5 ;
@@ -1842,8 +2278,8 @@ a.ucs:0x4E66
     :eq rep.gb2312:0x4A69         ; # &I-G0-4A69;
     :eq rep.big5-cdp:0x8A4C       ; # &I-CDP-8A4C;
     :eq rep.jef-china3:0x81CD     ; # &I-JC3-81CD;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:02427 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:02427 ] ;
     .
     rep.gb2312:0x4A69
                :abstract-glyph-of         gb2312:0x4A69  .
@@ -1887,6 +2323,73 @@ rep.big5-cdp:0x87D1
     ideo:hanyu-dazidian  ( 1 52 3 ) ;
     .
 
+rep.mj:056864
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:056864 ;
+    :denotation-of
+        a.ucs:0x2CF17        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    :eq rep.ucs_JP...hanazono:0x2CF17 ; # &MJ056864;
+    :subsume
+        g2.mj:056864         ;
+    .
+    rep.ucs_JP...hanazono:0x2CF17
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x2CF17 ] .
+    g2.mj:056864
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056864 ;
+        :eq g2.ucs_JP...hanazono:0x2CF17 ; # &g2-MJ056864;
+        .
+        g2.ucs_JP...hanazono:0x2CF17
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CF17 ] .
+
+a.gt-k:00383
+    a chisegg:abstract-character ;
+    :abstract-character-of gt-k:00383 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    :subsume
+        rep.gt-k:00383       ,
+        rep.gt-k:00299       ;
+    .
+    rep.gt-k:00383
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of gt-k:00383 ;
+        :eq rep.gt-pj-k2:16247        ; # &GT-K00383;
+        :subsume
+            g2.gt-k:00383        ;
+        .
+        rep.gt-pj-k2:16247
+                   :abstract-glyph-of       gt-pj-k2:16247   .
+        g2.gt-k:00383
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00383 ;
+            :eq g2.gt-pj-k2:16247         ; # &g2-GT-K00383;
+            .
+            g2.gt-pj-k2:16247
+                  :abstract-glyph-form-of       gt-pj-k2:16247   .
+    rep.gt-k:00299
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of gt-k:00299 ;
+        :eq rep.gt-pj-k1:14664        ; # &GT-K00299;
+        :subsume
+            g2.gt-k:00299        ;
+        .
+        rep.gt-pj-k1:14664
+                   :abstract-glyph-of       gt-pj-k1:14664   .
+        g2.gt-k:00299
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00299 ;
+            :eq g2.gt-pj-k1:14664         ; # &g2-GT-K00299;
+            .
+            g2.gt-pj-k1:14664
+                  :abstract-glyph-form-of       gt-pj-k1:14664   .
+
 a.ucs:0x340C
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x340C ;
@@ -1924,10 +2427,10 @@ a.ucs:0x340C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x340C  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20089 ; # 𠂉
-        isd:below    g2.ucs_unicode:0x4E5F   # &g2-AJ1-03829;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20089 ; # 𠂉
+            isd:below    g2.ucs_unicode:0x4E5F   # &g2-AJ1-03829;
+        ] ;
         :eq g2.big5-cdp:0x8CD8        ; # &g2-GT-00237;
         :eq g2.gt:00237               ; # &g2-GT-00237;
         :eq g2.gt-k:01428             ; # &g2-GT-00237;
@@ -1969,10 +2472,10 @@ a.ucs:0x340C
     g2.cns11643-4:0x2157
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x2157 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20089 ; # 𠂉
-        isd:below    g2.cns11643-1:0x443E   # &g2-CU+4E5F;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20089 ; # 𠂉
+            isd:below    g2.cns11643-1:0x443E   # &g2-CU+4E5F;
+        ] ;
         :eq g2.ucs_cns:0x340C         ; # &g2-CU+340C;
         .
         g2.ucs_cns:0x340C
@@ -1988,9 +2491,9 @@ a.ucs:0x200DE
     ideo:hanyu-dazidian  ( 1 52 10 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x5DDB   # 巛
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x5DDB   # 巛
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -2043,9 +2546,9 @@ a.ucs:0x200E1
     ideo:hanyu-dazidian  ( 1 53 1 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E59 ; # 乙
-                :below    a.ucs:0x4E2C   # 丬
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E59 ; # 乙
+                isd:below    a.ucs:0x4E2C   # 丬
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -2317,36 +2820,229 @@ a.ucs:0x200E4
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x2CF16 ; # &A-compU+2CF16;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    .
+
+rep.ucs_iso:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x200E4 ] ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.gt-k:00594 ; # &A-GT-K00594;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :eq o.ucs_iso:0x200E4         ; # &o-GT-00244;
+    :eq a.mj:030427               ; # &o-GT-00244;
+    :eq o.gt:00244                ; # &o-GT-00244;
     :subsume
-        rep.ucs_iso:0x200E4  ,
+        rep.mj:030427        ,
         rep.cns11643-6:0x2346 ;
     .
-    rep.ucs_iso:0x200E4
+    o.ucs_iso:0x200E4
+                :unified-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x200E4 ] .
+    a.mj:030427
+           :abstract-character-of             mj:030427  .
+    o.gt:00244
+                :unified-glyph-of             gt:00244   .
+    rep.mj:030427
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x200E4 ] ;
+        :abstract-glyph-of mj:030427 ;
         ideo:hanyu-dazidian  ( 1 38 11 ) ;
-        :eq rep.gt:00244              ; # &GT-00244;
-        :eq rep.gt-pj-2:12627         ; # &GT-00244;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt-k:00594 ; # &GT-K00594;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
+        :eq rep.ucs_iso:0x200E4       ; # &MJ030427;
+        :eq rep.hanyo-denshi...ks:002230 ; # &MJ030427;
+        :eq rep.gt:00244              ; # &I-GT-00244;
+        :eq rep.gt-pj-2:12627         ; # &I-GT-00244;
         :eq rep.daikanwa:00183        ; # &I-M-00183;
-        :eq rep.hanziku-1:0xABE1      ; # &I-HZK01-ABE1;
+        ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
+                                        chisebib:daikanwa ;
+                               :target  rep.hanyo-denshi...ks:346980 ] ;
+        :form-of             [ :sources chisebib:koseki ,
+                                        chisebib:mj ;
+                               :target  [ :target  rep.hanyo-denshi...ks:346980 ;
+                                          :sources chisebib:koseki ] ,
+                                        [ :target  rep.mj:021897        ;
+                                          :sources chisebib:koseki_mj ] ] ;
+        :subsume
+            g2.mj:030427         ;
         .
+        rep.ucs_iso:0x200E4
+                   :abstract-glyph-of [ :context domain:iso     ;
+                                        :target     ucs:0x200E4 ] .
+        rep.hanyo-denshi...ks:002230
+                   :abstract-glyph-of hanyo-denshi...ks:002230  .
         rep.gt:00244
                    :abstract-glyph-of             gt:00244   .
         rep.gt-pj-2:12627
                    :abstract-glyph-of        gt-pj-2:12627   .
         rep.daikanwa:00183
                    :abstract-glyph-of       daikanwa:00183   .
-        rep.hanziku-1:0xABE1
-                   :abstract-glyph-of      hanziku-1:0xABE1  .
+        g2.mj:030427
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:030427 ;
+            :eq g2.ucs_iso:0x200E4        ; # &g2-MJ030427;
+            :eq g2.hanyo-denshi...ks:002230 ; # &g2-MJ030427;
+            :eq g2.gt:00244               ; # &g2-MJ030427;
+            :eq g2.daikanwa:00183         ; # &g2-MJ030427;
+            :subsume
+                repi.daikanwa:00183  ,
+                repi.hanyo-denshi...ks:002230 ,
+                repi.mj:030427       ,
+                repi.gt:00244        ,
+                repi.ucs_iso:0x200E4 ,
+                rep.hanziku-1:0xABE1 ;
+            .
+            g2.ucs_iso:0x200E4
+                  :abstract-glyph-form-of [ :context domain:iso     ;
+                                            :target     ucs:0x200E4 ] .
+            g2.hanyo-denshi...ks:002230
+                  :abstract-glyph-form-of hanyo-denshi...ks:002230  .
+            g2.gt:00244
+                  :abstract-glyph-form-of             gt:00244   .
+            g2.daikanwa:00183
+                  :abstract-glyph-form-of       daikanwa:00183   .
+            repi.daikanwa:00183
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:00183 ;
+                .
+            repi.hanyo-denshi...ks:002230
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...ks:002230 ;
+                :eq rep.hanyo-denshi...ks...mf:000223 ; # &R-HD-KS-002230;
+                .
+                rep.hanyo-denshi...ks...mf:000223
+                           :abstract-glyph-of hanyo-denshi...ks...mf:000223  .
+            repi.mj:030427
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:030427 ;
+                .
+            repi.gt:00244
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:00244 ;
+                .
+            repi.ucs_iso:0x200E4
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x200E4 ] ;
+                .
+            rep.hanziku-1:0xABE1
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of hanziku-1:0xABE1 ;
+                .
     rep.cns11643-6:0x2346
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-6:0x2346 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.ucs-itaiji-002:0x20009 ; # &U-i002+20009;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
         :eq rep.ucs_cns:0x200E4       ; # &C6-2346;
+        :subsume
+            g2.cns11643-6:0x2346 ;
         .
         rep.ucs_cns:0x200E4
                    :abstract-glyph-of [ :context domain:cns     ;
                                         :target     ucs:0x200E4 ] .
+        g2.cns11643-6:0x2346
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of cns11643-6:0x2346 ;
+            :eq g2.ucs_cns:0x200E4        ; # &g2-CU+200E4;
+            .
+            g2.ucs_cns:0x200E4
+                  :abstract-glyph-form-of [ :context domain:cns     ;
+                                            :target     ucs:0x200E4 ] .
+
+rep.ucs-itaiji-001:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x200E4 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x89E3 ; # &CDP-89E3;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x200E4 ;
+    .
+    g2.ucs-itaiji-001:0x200E4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x200E4 ;
+        .
+
+rep.ucs-itaiji-002:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x200E4 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-var-002:0x2CF16 ; # &U-v002+2CF16;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :subsume
+        g2.ucs-itaiji-002:0x200E4 ;
+    .
+    g2.ucs-itaiji-002:0x200E4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x200E4 ;
+        .
+
+rep.mj:057398
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:057398 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x2CF16 ; # &KOSEKI-002080;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :eq rep.hanyo-denshi...ks:098160 ; # &MJ057398;
+    :subsume
+        g2.mj:057398         ;
+    .
+    rep.hanyo-denshi...ks:098160
+               :abstract-glyph-of hanyo-denshi...ks:098160  .
+    g2.mj:057398
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057398 ;
+        :eq g2.hanyo-denshi...ks:098160 ; # &g2-MJ057398;
+        :subsume
+            repi.hanyo-denshi...ks:098160 ,
+            repi.mj:057398       ;
+        .
+        g2.hanyo-denshi...ks:098160
+              :abstract-glyph-form-of hanyo-denshi...ks:098160  .
+        repi.hanyo-denshi...ks:098160
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...ks:098160 ;
+            :eq rep.hanyo-denshi...ks...mf:009816 ; # &R-HD-KS-098160;
+            .
+            rep.hanyo-denshi...ks...mf:009816
+                       :abstract-glyph-of hanyo-denshi...ks...mf:009816  .
+        repi.mj:057398
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:057398 ;
+            .
 
 a.ucs:0x200E5
     a chisegg:abstract-character ;
@@ -2404,10 +3100,10 @@ a.ucs:0x4E6A
     rep.gt:00246
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00246 ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround a.ucs:0x4E59 ; # 乙
-        isd:filling  a.ucs:0x7530   # 田
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround a.ucs:0x4E59 ; # 乙
+            isd:filling  a.ucs:0x7530   # 田
+        ] ;
         :eq rep.ucs_unicode:0x4E6A    ; # &GT-00246;
         :eq rep.cns11643-4:0x2228     ; # &GT-00246;
         :eq rep.gb12345:0x7C5A        ; # &GT-00246;
@@ -2429,10 +3125,10 @@ a.ucs:0x4E6A
         a chisegg:abstract-glyph ;
         :abstract-glyph-of hanziku-1:0xAEE6 ;
         ideo:hanyu-dazidian  ( 1 53 7 ) ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround a.ucs:0x2E84 ; # ⺄
-        isd:filling  a.ucs:0x7530   # 田
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround a.ucs:0x2E84 ; # ⺄
+            isd:filling  a.ucs:0x7530   # 田
+        ] ;
         .
 
 a.ucs:0x200E7
@@ -2561,8 +3257,8 @@ a.ucs:0x4E70
     :eq rep.gb2312:0x4272         ; # &I-G0-4272;
     :eq rep.hanziku-1:0xAEE9      ; # &I-HZK01-AEE9;
     :eq rep.jef-china3:0x81ED     ; # &I-JC3-81ED;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8CB7         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8CB7         ] ;
     .
     rep.gb2312:0x4272
                :abstract-glyph-of         gb2312:0x4272  .
@@ -2634,11 +3330,11 @@ a.ucs:0x4E71
     :eq rep.gt-pj-1:19824         ; # &I-GT-00251;
     :eq rep.daikanwa:00187        ; # &I-M-00187;
     :eq rep.shinjigen:0060        ; # ä¹±
-    :from.simplified     a.ucs:0x4E82         ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gt:00286         ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04101 ] ;
+    ideo:simplified-form-of a.ucs:0x4E82         ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gt:00286         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04101 ] ;
     :subsume
         g2.ucs_unicode:0x4E71 ;
     .
@@ -2770,10 +3466,10 @@ repi.hng-kyd:08690
     ideo:total-strokes    12 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   a.ucs:0x9FB4 ; # é¾´
-                :below    a.ucs:0x20541   # 𠕁
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x2EA4 ; # ⺤
+                isd:middle   a.ucs:0x9FB4 ; # é¾´
+                isd:below    a.ucs:0x20541   # 𠕁
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -2858,9 +3554,10 @@ a.ucs:0x209DD
         ideo:strokes           5 ;
         .
 
-a.ucs:0x8034
+a.ucs_component:0x8034
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x8034 ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x8034  ] ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -2874,11 +3571,11 @@ a.ucs:0x8034
     ideo:total-strokes     7 ;
     .
 
-rep.adobe-japan1-6:22250
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1-6:22250 ;
+a.ucs:0x8034
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x8034 ;
     :denotation-of
-        a.ucs:0x8034         ;
+        a.ucs_component:0x8034 ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -2890,19 +3587,25 @@ rep.adobe-japan1-6:22250
     ideo:strokes           [ :context domain:gt      ;
                              :target  6 ] ;
     ideo:total-strokes     7 ;
-    :eq rep.ucs_unicode:0x8034    ; # &AJ1-22250;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x8033 ; # 耳
+        isd:right    a.ucs:0x4E5A   # 乚
+    ] ;
+    :eq rep.adobe-japan1-6:22250  ; # &I-AJ1-22250;
     :eq rep.jis-x0212:0x555B      ; # &I-JSP-555B;
     :eq rep.cns11643-2:0x2473     ; # &I-C2-2473;
     :eq a.big5:0xCB73             ; # &I-B-CB73;
     :eq rep.daikanwa:29001        ; # &I-M-29001;
-    :eq rep.shinjigen:6375        ; # &AJ1-22250;
+    :eq rep.shinjigen:6375        ; # 耴
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
+                                    chisebib:daikanwa ;
+                           :target  rep.gt:37566         ] ;
     :subsume
         rep.gt:37567         ,
         rep.gt:00250         ;
     .
-    rep.ucs_unicode:0x8034
-               :abstract-glyph-of [ :context domain:unicode ;
-                                    :target     ucs:0x8034  ] .
+    rep.adobe-japan1-6:22250
+               :abstract-glyph-of adobe-japan1-6:22250   .
     rep.jis-x0212:0x555B
                :abstract-glyph-of      jis-x0212:0x555B  .
     rep.cns11643-2:0x2473
@@ -3013,11 +3716,11 @@ rep.adobe-japan1-6:22250
             :glyph-image-of gt:00250 ;
             .
 
-rep.gt:37568
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:37568 ;
+a.ucs:0x2652E
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2652E ;
     :denotation-of
-        a.ucs:0x8034         ;
+        a.ucs_component:0x8034 ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -3029,13 +3732,35 @@ rep.gt:37568
     ideo:strokes           [ :context domain:gt      ;
                              :target  6 ] ;
     ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x8033 ; # 耳
+        isd:filling  a.ucs:0x4E5A   # 乚
+    ] ;
+    :eq rep.gt:37568              ; # &I-GT-37568;
     :eq rep.gt-k:02776            ; # &I-GT-K02776;
-    :eq rep.gt-pj-9:19325         ; # &GT-37568;
+    :eq rep.gt-pj-9:19325         ; # &I-GT-37568;
+    :subsume
+        g2.gt:37568          ,
+        g2.ucs_iso:0x2652E   ;
     .
+    rep.gt:37568
+               :abstract-glyph-of             gt:37568   .
     rep.gt-k:02776
                :abstract-glyph-of           gt-k:02776   .
     rep.gt-pj-9:19325
                :abstract-glyph-of        gt-pj-9:19325   .
+    g2.gt:37568
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:37568 ;
+        :eq g2.gt-k:02776             ; # &g2-GT-37568;
+        .
+        g2.gt-k:02776
+              :abstract-glyph-form-of           gt-k:02776   .
+    g2.ucs_iso:0x2652E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2652E ] ;
+        .
 
 a.ucs:0x4E72
     a chisegg:abstract-character ;
@@ -3075,10 +3800,80 @@ a.ucs:0x200EC
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
     ideo:hanyu-dazidian  ( 1 53 16 ) ;
+    isd:structure [ a idc:â¿· ;
+        isd:surround [
+            isd:structure [ a idc:â¿´ ;
+                isd:surround a.ucs:0x5DF1 ; # å·±
+                isd:filling  rep.big5-cdp:0x8C78   # &CDP-8C78;
+            ]
+        ] ;
+        isd:filling  a.ucs:0x531A   # 匚
+    ] ;
     :eq rep.big5-cdp:0x88E3       ; # &I-CDP-88E3;
+    :subsume
+        g2.ucs_iso:0x200EC   ;
     .
     rep.big5-cdp:0x88E3
                :abstract-glyph-of       big5-cdp:0x88E3  .
+    g2.ucs_iso:0x200EC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x200EC ] ;
+        :eq g2.big5-cdp:0x88E3        ; # &g2-CDP-88E3;
+        :subsume
+            repi.big5-cdp:0x88E3 ,
+            repi.ucs_iso:0x200EC ;
+        .
+        g2.big5-cdp:0x88E3
+              :abstract-glyph-form-of       big5-cdp:0x88E3  .
+        repi.big5-cdp:0x88E3
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x88E3 ;
+            .
+        repi.ucs_iso:0x200EC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x200EC ] ;
+            .
+
+a.gt-k:03520
+    a chisegg:abstract-character ;
+    :abstract-character-of gt-k:03520 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿶ ;
+        isd:surround a.gt-k:00383 ; # &A-GT-K00383;
+        isd:filling  a.ucs:0x4ECC   # 仌
+    ] ;
+    :subsume
+        rep.gt-k:03520       ;
+    .
+    rep.gt-k:03520
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of gt-k:03520 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    [
+                isd:structure [ a idc:â¿° ;
+                    isd:left     a.ucs:0x4ECC ; # 仌
+                    isd:right    a.ucs:0x4E28   # 丨
+                ]
+            ] ;
+            isd:below    a.ucs:0x4E06   # 丆
+        ] ;
+        :eq rep.gt-pj-k1:23640        ; # &GT-K03520;
+        :subsume
+            g2.gt-k:03520        ;
+        .
+        rep.gt-pj-k1:23640
+                   :abstract-glyph-of       gt-pj-k1:23640   .
+        g2.gt-k:03520
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:03520 ;
+            :eq g2.gt-pj-k1:23640         ; # &g2-GT-K03520;
+            .
+            g2.gt-pj-k1:23640
+                  :abstract-glyph-form-of       gt-pj-k1:23640   .
 
 a.ucs:0x4E73
     a chisegg:abstract-character ;
@@ -3154,10 +3949,10 @@ rep.adobe-japan1-4:13968
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4E73         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:02694 ; # &GT-K02694;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.gt-k:02694 ; # &GT-K02694;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :eq g2.ucs_ks:0x4E73          ; # &g2-AJ1-13968;
         :eq g2.ks-x1001:0x6A61        ; # &g2-AJ1-13968;
         :eq g2.gt:00257               ; # &g2-AJ1-13968;
@@ -3402,10 +4197,10 @@ a.ucs:0x4E75
             :rep.decomposition   [ :context domain:cid     ;
                                    :target  a.ucs:0x4E75         ,
                                             a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.ucs_unicode:0x8F9B ; # &g2-AJ1-02575;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+            isd:structure [ a idc:â¿° ;
+                isd:left     g2.ucs_unicode:0x8F9B ; # &g2-AJ1-02575;
+                isd:right    a.ucs:0x4E5A   # 乚
+            ] ;
             :eq g2.adobe-japan1-6:21080   ; # &g2-AJ1-21080;
             :eq g2.jis-x0212:0x303A       ; # &g2-AJ1-21080;
             :eq g2.cns11643-4:0x2530      ; # &g2-AJ1-21080;
@@ -3454,10 +4249,10 @@ a.ucs:0x4E75
     rep.gt:00252
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00252 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:02585 ; # &GT-K02585;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.gt-k:02585 ; # &GT-K02585;
+            isd:right    a.ucs:0x4E5A   # 乚
+        ] ;
         :eq rep.gt-pj-2:12635         ; # &GT-00252;
         :eq rep.jef-china3:0x41C3     ; # &I-JC3-41C3;
         :subsume
@@ -3506,9 +4301,9 @@ rep.ucs_iso:0x200ED
     ideo:hanyu-dazidian  ( 1 55 2 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.jis-x0213-2:0x702A ; # &GT-25225;
-                :below    a.ucs:0x53E3   # 口
+            isd:structure [ a idc:⿱ ;
+                isd:above    rep.jis-x0213-2:0x702A ; # &GT-25225;
+                isd:below    a.ucs:0x53E3   # 口
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -3517,7 +4312,7 @@ rep.ucs_iso:0x200ED
     :eq rep.gt:00253              ; # &I-GT-00253;
     :eq rep.gt-pj-2:12636         ; # &I-GT-00253;
     :eq rep.daikanwa:00193        ; # &I-M-00193;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x59CB         ] ;
     :subsume
@@ -3536,15 +4331,15 @@ rep.ucs_iso:0x200ED
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x200ED ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    g2.cns11643-4:0x2151 ; # &g2-CU+722B;
-                :below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
-            ]
+        isd:structure [ a idc:â¿° ;
+            isd:left     [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    g2.cns11643-4:0x2151 ; # &g2-CU+722B;
+                    isd:below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
+                ]
+            ] ;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
         ] ;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
         :eq g2.cns11643-6:0x293F      ; # &g2-M-00193;
         :eq g2.daikanwa:00193         ; # &g2-M-00193;
         :subsume
@@ -3572,15 +4367,15 @@ rep.ucs_iso:0x200ED
     g2.gt:00253
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00253 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    g2.ucs_jis:0x722B ; # &g2-GT-25225;
-                :below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
-            ]
+        isd:structure [ a idc:â¿° ;
+            isd:left     [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    g2.ucs_jis:0x722B ; # &g2-GT-25225;
+                    isd:below    g2.ucs_unicode:0x53E3   # &g2-AJ1-01969;
+                ]
+            ] ;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
         ] ;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
         :subsume
             repi.gt:00253        ,
             rep.hanziku-1:0xAF62 ;
@@ -3604,9 +4399,9 @@ rep.gt:00254
     ideo:total-strokes     8 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    a.ucs:0x53E3   # 口
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x2EA4 ; # ⺤
+                isd:below    a.ucs:0x53E3   # 口
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -3684,10 +4479,10 @@ a.ucs:0x4E77
     g2.ks-x1001:0x5F2D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of ks-x1001:0x5F2D ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.adobe-japan1-0:02091 ; # &g2-AJ1-02091;
-        isd:below    a.ucs:0x4E59   # 乙
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.adobe-japan1-0:02091 ; # &g2-AJ1-02091;
+            isd:below    a.ucs:0x4E59   # 乙
+        ] ;
         :eq g2.ucs_ks:0x4E77          ; # &g2-K0-5F2D;
         .
         g2.ucs_ks:0x4E77
@@ -3697,10 +4492,10 @@ a.ucs:0x4E77
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E77  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x6C99 ; # &g2-UU+6C99;
-        isd:below    a.ucs:0x4E59   # 乙
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x6C99 ; # &g2-UU+6C99;
+            isd:below    a.ucs:0x4E59   # 乙
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -3733,15 +4528,15 @@ a.ucs:0x200F0
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x200F0 ] ;
         ideo:hanyu-dazidian  ( 1 55 3 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:â¿° ;
-                :left     rep.big5-cdp:0x89C2 ; # &CDP-89C2;
-                :right    rep.big5-cdp:0x89C7   # &CDP-89C7;
-            ]
+        isd:structure [ a idc:⿱ ;
+            isd:above    [
+                isd:structure [ a idc:â¿° ;
+                    isd:left     rep.big5-cdp:0x89C2 ; # &CDP-89C2;
+                    isd:right    rep.big5-cdp:0x89C7   # &CDP-89C7;
+                ]
+            ] ;
+            isd:below    a.ucs:0x7528   # 用
         ] ;
-        isd:below    a.ucs:0x7528   # 用
-    ] ;
         :eq rep.cns11643-6:0x2D2C     ; # &C6-2D2C;
         :eq rep.hanziku-1:0xAF63      ; # &I-HZK01-AF63;
         .
@@ -3826,7 +4621,7 @@ a.ucs:0x4E79
     :eq rep.shinjigen:0065        ; # ä¹¹
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x4E7E         ] ;
-    :from.vulgar         [ :sources chisebib:jiyun ,
+    ideo:vulgar-form-of  [ :sources chisebib:jiyun ,
                                     chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
@@ -3954,7 +4749,7 @@ a.ucs:0x341C
     :eq rep.daikanwa:00195        ; # &I-M-00195;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  a.ucs:0x4EC7         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4EC7         ] ;
     :subsume
@@ -3972,10 +4767,10 @@ a.ucs:0x341C
     g2.gt:00260
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00260 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:02519 ; # &GT-K02519;
-        isd:right    a.ucs:0x4E5D   # 九
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.gt-k:02519 ; # &GT-K02519;
+            isd:right    a.ucs:0x4E5D   # 九
+        ] ;
         :eq g2.ucs_cns:0x341C         ; # &g2-GT-00260;
         :eq g2.cns11643-4:0x2835      ; # &g2-GT-00260;
         :eq g2.daikanwa:00195         ; # &g2-GT-00260;
@@ -4037,7 +4832,7 @@ a.ucs:0x200F2
     :eq rep.gt-pj-2:12639         ; # &I-GT-00263;
     :eq rep.daikanwa:00196        ; # &I-M-00196;
     :eq rep.hanziku-1:0xAFA6      ; # &I-HZK01-AFA6;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x622A         ] ;
     :subsume
@@ -4204,10 +4999,10 @@ a.ucs:0x4E7C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E7C  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x6CE8 ; # &g2-AJ1-02987;
-        isd:below    a.ucs:0x4E59   # 乙
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x6CE8 ; # &g2-AJ1-02987;
+            isd:below    a.ucs:0x4E59   # 乙
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb12345:0x7D5B         ; # &g2-UU+4E7C;
         .
@@ -4358,9 +5153,9 @@ a.ucs:0x200F9
     ideo:total-strokes    10 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    a.ucs:0x53E4   # 古
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x2EA4 ; # ⺤
+                isd:below    a.ucs:0x53E4   # 古
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -4377,9 +5172,9 @@ rep.hanziku-1:0xAFAA
     ideo:hanyu-dazidian  ( 1 56 8 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA5 ; # ⺥
-                :below    a.ucs:0x53E4   # 古
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x2EA5 ; # ⺥
+                isd:below    a.ucs:0x53E4   # 古
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -4579,14 +5374,15 @@ a.ucs:0x4E7F
     ideo:total-strokes    11 ;
     ideo:hanyu-dazidian  ( 1 57 4 ) ;
     isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x722B ; # 爫
-                :below    a.ucs:0x7CF8   # 糸
-            ]
-        ] ;
+        isd:left     a.gt-k:07307 ; # &A-GT-K07307;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "di" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "ti" ) ;
+                         ] ;
     :eq a.big5:0xD44B             ; # &I-B-D44B;
     .
     a.big5:0xD44B
@@ -4601,12 +5397,7 @@ rep.adobe-japan1-4:14306
     ideo:strokes          10 ;
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.jis-x0213-2:0x702A ; # &GT-25225;
-                :below    a.ucs:0x7CF8   # 糸
-            ]
-        ] ;
+        isd:left     rep.ucs-itaiji-005:0x24514 ; # &U-i005+24514;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
     :eq rep.ucs_jis:0x4E7F        ; # &AJ1-14306;
@@ -4644,10 +5435,10 @@ rep.adobe-japan1-4:14306
         :eq g2.jef-china3:0x41C5      ; # &g2-AJ1-14306;
         :subsume
             repi.daikanwa:00205  ,
-            repi.jis-x0212:0x303C ,
-            repi.adobe-japan1-6:14306 ,
             repi.jef-china3:0x41C5 ,
-            repi.gt:00276        ;
+            repi.gt:00276        ,
+            repi.jis-x0212:0x303C ,
+            repi.adobe-japan1-6:14306 ;
         .
         g2.ucs_jis:0x4E7F
               :abstract-glyph-form-of [ :context domain:jis     ;
@@ -4664,14 +5455,6 @@ rep.adobe-japan1-4:14306
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00205 ;
             .
-        repi.jis-x0212:0x303C
-            a chisegg:glyph-image ;
-            :glyph-image-of jis-x0212:0x303C ;
-            .
-        repi.adobe-japan1-4:14306
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-4:14306 ;
-            .
         repi.jef-china3:0x41C5
             a chisegg:glyph-image ;
             :glyph-image-of jef-china3:0x41C5 ;
@@ -4680,6 +5463,14 @@ rep.adobe-japan1-4:14306
             a chisegg:glyph-image ;
             :glyph-image-of gt:00276 ;
             .
+        repi.jis-x0212:0x303C
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x303C ;
+            .
+        repi.adobe-japan1-4:14306
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14306 ;
+            .
 
 rep.gt:00277
     a chisegg:abstract-glyph ;
@@ -4690,12 +5481,7 @@ rep.gt:00277
     ideo:strokes          10 ;
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    a.ucs:0x7CF8   # 糸
-            ]
-        ] ;
+        isd:left     rep.gt-k:07395 ; # &GT-K07395;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
     :eq rep.ucs_unicode:0x4E7F    ; # &GT-00277;
@@ -4716,15 +5502,6 @@ rep.gt:00277
     g2.gt:00277
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00277 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    g2.gt:35079   # &g2-GT-35079;
-            ]
-        ] ;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
         :eq g2.ucs_cns:0x4E7F         ; # &g2-GT-00277;
         :eq g2.cns11643-2:0x334E      ; # &g2-GT-00277;
         :subsume
@@ -4748,15 +5525,6 @@ rep.gt:00277
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E7F  ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    g2.ucs_unicode:0x7CF8   # &g2-UU+7CF8;
-            ]
-        ] ;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -4840,7 +5608,7 @@ rep.gt:00270
     :eq rep.daikanwa:00207        ; # &I-M-00207;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.daikanwa:11041   ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:11041   ] ;
     :subsume
@@ -4854,10 +5622,10 @@ rep.gt:00270
     g2.gt:00270
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00270 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.ks-x1001:0x683A ; # &g2-GT-36863;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.ks-x1001:0x683A ; # &g2-GT-36863;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :eq g2.daikanwa:00207         ; # &g2-GT-00270;
         :subsume
             repi.daikanwa:00207  ,
@@ -4909,18 +5677,18 @@ rep.ucs_iso:0x200FD
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x200FD ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.gt:36864 ; # &g2-GT-36864;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.mj:020661 ; # &g2-MJ020661;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         .
     g2.cns11643-5:0x3073
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-5:0x3073 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.cns11643-1:0x5751 ; # &g2-CU+7FC1;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.cns11643-1:0x5751 ; # &g2-CU+7FC1;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :eq g2.ucs_cns:0x200FD        ; # &g2-CU+200FD;
         .
         g2.ucs_cns:0x200FD
@@ -4929,10 +5697,10 @@ rep.ucs_iso:0x200FD
     g2.gt:00271
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00271 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.mj:020660 ; # &g2-MJ020660;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.mj:020660 ; # &g2-MJ020660;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         .
 
 a.ucs:0x3421
@@ -5027,7 +5795,7 @@ a.ucs:0x4E80
     :eq rep.daikanwa:00210        ; # &I-M-00210;
     :eq rep.shinjigen_1ed:9917    ; # 亀
     :eq rep.shinjigen_rev:9916    ; # 亀
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07472 ] ;
     :subsume
         g2.ucs_unicode:0x4E80 ;
@@ -5153,9 +5921,9 @@ a.ucs:0x200FF
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x722B ; # 爫
-                :below    a.ucs:0x5B88   # 守
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x722B ; # 爫
+                isd:below    a.ucs:0x5B88   # 守
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -5173,9 +5941,9 @@ rep.ucs_iso:0x200FF
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    a.ucs:0x5B88   # 守
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x2EA4 ; # ⺤
+                isd:below    a.ucs:0x5B88   # 守
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
@@ -5187,15 +5955,15 @@ rep.ucs_iso:0x200FF
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x200FF ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    g2.ucs_unicode:0x5B88   # &g2-AJ1-02325;
-            ]
+        isd:structure [ a idc:â¿° ;
+            isd:left     [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    a.ucs:0x2EA4 ; # ⺤
+                    isd:below    g2.ucs_unicode:0x5B88   # &g2-AJ1-02325;
+                ]
+            ] ;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
         ] ;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
         .
 
 rep.hanziku-1:0xAFC5
@@ -5209,15 +5977,39 @@ rep.hanziku-1:0xAFC5
     ideo:hanyu-dazidian  ( 1 57 3 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.jis-x0213-2:0x702A ; # &GT-25225;
-                :below    a.ucs:0x5B88   # 守
+            isd:structure [ a idc:⿱ ;
+                isd:above    rep.jis-x0213-2:0x702A ; # &GT-25225;
+                isd:below    a.ucs:0x5B88   # 守
             ]
         ] ;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
     .
 
+rep.ucs-itaiji-001:0x200EC
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x200EC ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    [
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x4E5B ; # 乛
+                isd:middle   rep.adobe-japan1-0:01979 ; # &AJ1-01979;
+                isd:below    a.ucs:0x4E00   # 一
+            ]
+        ] ;
+        isd:below    a.ucs:0x540B   # 吋
+    ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x200EC ;
+    .
+    g2.ucs-itaiji-001:0x200EC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x200EC ;
+        .
+
 a.ucs:0x3424
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3424 ;
@@ -5337,9 +6129,9 @@ rep.gt:00278
     ideo:hanyu-dazidian  ( 1 57 7 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5341 ; # 十
-                :below    a.ucs:0x65F1   # 旱
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x5341 ; # 十
+                isd:below    a.ucs:0x65F1   # 旱
             ]
         ] ;
         isd:right    a.ucs:0x4E5E   # 乞
@@ -5369,10 +6161,10 @@ rep.cns11643-3:0x396E
     ideo:total-strokes    12 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5341 ; # 十
-                :middle   a.ucs:0x65E5 ; # 日
-                :below    a.ucs:0x5343   # 千
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x5341 ; # 十
+                isd:middle   a.ucs:0x65E5 ; # 日
+                isd:below    a.ucs:0x5343   # 千
             ]
         ] ;
         isd:right    a.ucs:0x4E5E   # 乞
@@ -5446,6 +6238,7 @@ rep.adobe-japan1-0:04101
     :eq rep.gt-pj-1:20524         ; # &I-GT-00285;
     :eq rep.daikanwa:00214        ; # &I-M-00214;
     :eq rep.shinjigen:0061        ; # &AJ1-04101;
+    ideo:interchangeable-form-of rep.mj:037396        ;
     :subsume
         g2.adobe-japan1-0:04101 ,
         repi.hng-kar:05130   ;
@@ -5566,6 +6359,10 @@ rep.gt:00286
     ideo:radical           5 ; # ⼄ 
     ideo:strokes          12 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     rep.ucs_iso:0x24514 ; # &C4-386A;
+        isd:right    a.ucs:0x4E5A   # 乚
+    ] ;
     :eq rep.ucs_unicode:0x4E82    ; # &GT-00286;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :eq rep.cns11643-1:0x632A     ; # &GT-00286;
@@ -5591,10 +6388,10 @@ rep.gt:00286
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E82  ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.ucs_iso:0x24514 ; # &GT-K09372;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.ucs_iso:0x24514 ; # &g2-GT-K09372;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb12345:0x4252         ; # &g2-GT-00286;
         :eq g2.gt:00286               ; # &g2-GT-00286;
@@ -5629,10 +6426,10 @@ rep.gt:00286
     g2.cns11643-1:0x632A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-1:0x632A ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.cns11643-4:0x386A ; # &C4-386A;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.cns11643-4:0x386A ; # &g2-CDP-8C7D;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :eq g2.ucs_cns:0x4E82         ; # &g2-CU+4E82;
         .
         g2.ucs_cns:0x4E82
@@ -5775,9 +6572,9 @@ a.ucs:0x20103
     ideo:hanyu-dazidian  ( 1 57 9 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x6773 ; # 杳
-                :below    a.ucs:0x4E02   # 丂
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x6773 ; # 杳
+                isd:below    a.ucs:0x4E02   # 丂
             ]
         ] ;
         isd:right    a.ucs:0x4E5E   # 乞
@@ -5841,10 +6638,10 @@ a.ucs:0x20105
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20105 ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.cns11643-1:0x6446 ; # &g2-CU+696D;
-        isd:right    a.ucs:0x4E5A   # 乚
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.cns11643-1:0x6446 ; # &g2-CU+696D;
+            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
+        ] ;
         :eq g2.cns11643-5:0x4455      ; # &g2-IU-00020105;
         :subsume
             repi.cns11643-5:0x4455 ,
@@ -5995,10 +6792,10 @@ a.ucs:0x2010A
     ideo:hanyu-dazidian  ( 1 58 7 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x857B ; # &CDP-857B;
-                :middle   a.ucs:0x65E5 ; # 日
-                :below    a.ucs:0x4E02   # 丂
+            isd:structure [ a idc:⿳ ;
+                isd:above    rep.big5-cdp:0x857B ; # &CDP-857B;
+                isd:middle   a.ucs:0x65E5 ; # 日
+                isd:below    a.ucs:0x4E02   # 丂
             ]
         ] ;
         isd:right    a.ucs:0x4E5E   # 乞
@@ -6029,10 +6826,10 @@ a.ucs:0x2010B
     ideo:hanyu-dazidian  ( 1 58 8 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x855E ; # &CDP-855E;
-                :middle   a.ucs:0x65E5 ; # 日
-                :below    a.ucs:0x4E02   # 丂
+            isd:structure [ a idc:⿳ ;
+                isd:above    rep.big5-cdp:0x855E ; # &CDP-855E;
+                isd:middle   a.ucs:0x65E5 ; # 日
+                isd:below    a.ucs:0x4E02   # 丂
             ]
         ] ;
         isd:right    a.ucs:0x4E5E   # 乞
@@ -6059,7 +6856,7 @@ a.ucs_component:0x4E38
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E38  ] ;
     ideo:radical           5 ; # ⼄ 
-    :eq a.iwds-1:0249             ; # &IWDS1-249;
+    :eq a.iwds-1:0249             ; # &A-compU+4E38;
     .
     a.iwds-1:0249
            :abstract-character-of         iwds-1:0249    .
@@ -6069,7 +6866,14 @@ a.ucs_component:0x4E5D
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E5D  ] ;
     ideo:radical           5 ; # ⼄ 
-    :eq a.iwds-1:0203             ; # &IWDS1-203;
+    .
+
+a.ucs_iwds-1:0x4E5D
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x4E5D  ] ;
+    ideo:radical           5 ; # ⼄ 
+    :eq a.iwds-1:0203             ; # &A-IWDSU+4E5D;
     .
     a.iwds-1:0203
            :abstract-character-of         iwds-1:0203    .