Sync up with the current environment.
[chise/chiset.git] / Ideograph-R001-One.ttl
index e150ac9..e16fa30 100644 (file)
 @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 bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @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 o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
+@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_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
+@prefix rep.ucs_big5: <http://www.chise.org/est/view/character/rep.ucs@big5=> .
+@prefix 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=> .
+@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 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 g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
+@prefix g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
+@prefix g2.adobe-japan1-5: <http://www.chise.org/est/view/character/g2.adobe-japan1-5=> .
 @prefix rep.jis-x0208: <http://www.chise.org/est/view/character/rep.jis-x0208=> .
+@prefix g2.jis-x0208_1978: <http://www.chise.org/est/view/character/g2.jis-x0208@1978=> .
+@prefix repi.jis-x0208_1978: <http://www.chise.org/est/view/character/repi.jis-x0208@1978=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
+@prefix g2.gb2312: <http://www.chise.org/est/view/character/g2.gb2312=> .
+@prefix g2.jis-x0208_1983: <http://www.chise.org/est/view/character/g2.jis-x0208@1983=> .
+@prefix repi.jis-x0208_1983: <http://www.chise.org/est/view/character/repi.jis-x0208@1983=> .
 @prefix rep.ks-x1001: <http://www.chise.org/est/view/character/rep.ks-x1001=> .
+@prefix g2.ks-x1001: <http://www.chise.org/est/view/character/g2.ks-x1001=> .
+@prefix repi.ks-x1001: <http://www.chise.org/est/view/character/repi.ks-x1001=> .
+@prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
+@prefix g2.jis-x0212: <http://www.chise.org/est/view/character/g2.jis-x0212=> .
+@prefix repi.jis-x0212: <http://www.chise.org/est/view/character/repi.jis-x0212=> .
+@prefix rep.iso-ir165: <http://www.chise.org/est/view/character/rep.iso-ir165=> .
+@prefix g2.iso-ir165: <http://www.chise.org/est/view/character/g2.iso-ir165=> .
+@prefix g2.jis-x0208: <http://www.chise.org/est/view/character/g2.jis-x0208=> .
+@prefix g2.jis-x0208_1990: <http://www.chise.org/est/view/character/g2.jis-x0208@1990=> .
+@prefix repi.jis-x0208: <http://www.chise.org/est/view/character/repi.jis-x0208=> .
+@prefix repi.jis-x0208_1990: <http://www.chise.org/est/view/character/repi.jis-x0208@1990=> .
+@prefix a.jis-x0208: <http://www.chise.org/est/view/character/a.jis-x0208=> .
 @prefix rep.cns11643-1: <http://www.chise.org/est/view/character/rep.cns11643-1=> .
+@prefix g2.cns11643-1: <http://www.chise.org/est/view/character/g2.cns11643-1=> .
+@prefix repi.cns11643-1: <http://www.chise.org/est/view/character/repi.cns11643-1=> .
+@prefix rep.cns11643-2: <http://www.chise.org/est/view/character/rep.cns11643-2=> .
+@prefix g2.cns11643-2: <http://www.chise.org/est/view/character/g2.cns11643-2=> .
+@prefix repi.cns11643-2: <http://www.chise.org/est/view/character/repi.cns11643-2=> .
+@prefix rep.cns11643-3: <http://www.chise.org/est/view/character/rep.cns11643-3=> .
+@prefix g2.cns11643-3: <http://www.chise.org/est/view/character/g2.cns11643-3=> .
+@prefix repi.cns11643-3: <http://www.chise.org/est/view/character/repi.cns11643-3=> .
+@prefix rep.cns11643-4: <http://www.chise.org/est/view/character/rep.cns11643-4=> .
+@prefix g2.cns11643-4: <http://www.chise.org/est/view/character/g2.cns11643-4=> .
+@prefix repi.cns11643-4: <http://www.chise.org/est/view/character/repi.cns11643-4=> .
+@prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
+@prefix g2.cns11643-5: <http://www.chise.org/est/view/character/g2.cns11643-5=> .
+@prefix repi.cns11643-5: <http://www.chise.org/est/view/character/repi.cns11643-5=> .
+@prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
+@prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
+@prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
+@prefix rep.cns11643-7: <http://www.chise.org/est/view/character/rep.cns11643-7=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
+@prefix g2.jis-x0213-1: <http://www.chise.org/est/view/character/g2.jis-x0213-1=> .
+@prefix repi.jis-x0213-1: <http://www.chise.org/est/view/character/repi.jis-x0213-1=> .
+@prefix a.jis-x0213-1: <http://www.chise.org/est/view/character/a.jis-x0213-1=> .
+@prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
+@prefix g2.jis-x0213-2: <http://www.chise.org/est/view/character/g2.jis-x0213-2=> .
+@prefix repi.jis-x0213-2: <http://www.chise.org/est/view/character/repi.jis-x0213-2=> .
+@prefix rep.gb12345: <http://www.chise.org/est/view/character/rep.gb12345=> .
 @prefix a.big5: <http://www.chise.org/est/view/character/rep.big5=> .
+@prefix repi.adobe-japan1-0: <http://www.chise.org/est/view/character/repi.adobe-japan1-0=> .
+@prefix repi.adobe-japan1-4: <http://www.chise.org/est/view/character/repi.adobe-japan1-4=> .
+@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 o.adobe-japan1-5: <http://www.chise.org/est/view/character/o.adobe-japan1-5=> .
+@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 rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
+@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...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...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 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-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
+@prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
+@prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
+@prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
-@prefix rep.shinjigen: <http://www.chise.org/est/view/character/rep.shinjigen=> .
-@prefix g2.ucs_unicode: <http://www.chise.org/est/view/character/g2.ucs@unicode=> .
-@prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
-@prefix g2.gb2312: <http://www.chise.org/est/view/character/g2.gb2312=> .
-@prefix g2.ks-x1001: <http://www.chise.org/est/view/character/g2.ks-x1001=> .
-@prefix g2.jis-x0208: <http://www.chise.org/est/view/character/g2.jis-x0208=> .
-@prefix g2.cns11643-1: <http://www.chise.org/est/view/character/g2.cns11643-1=> .
-@prefix g2.jis-x0213-1: <http://www.chise.org/est/view/character/g2.jis-x0213-1=> .
-@prefix g2.gt: <http://www.chise.org/est/view/character/g2.gt=> .
-@prefix g2.gt-k: <http://www.chise.org/est/view/character/g2.gt-k=> .
+@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=> .
-@prefix g2.shinjigen: <http://www.chise.org/est/view/character/g2.shinjigen=> .
+@prefix g2.daikanwa...ho: <http://www.chise.org/est/view/character/g2.daikanwa...ho=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
-@prefix repi.jis-x0208: <http://www.chise.org/est/view/character/repi.jis-x0208=> .
-@prefix repi.adobe-japan1-6: <http://www.chise.org/est/view/character/repi.adobe-japan1-6=> .
-@prefix repi.cns11643-1: <http://www.chise.org/est/view/character/repi.cns11643-1=> .
-@prefix repi.gt: <http://www.chise.org/est/view/character/repi.gt=> .
-@prefix repi.ks-x1001: <http://www.chise.org/est/view/character/repi.ks-x1001=> .
-@prefix repi.ucs_unicode: <http://www.chise.org/est/view/character/repi.ucs@unicode=> .
+@prefix repi.daikanwa...ho: <http://www.chise.org/est/view/character/repi.daikanwa...ho=> .
+@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 rep.hanziku-2: <http://www.chise.org/est/view/character/rep.hanziku-2=> .
+@prefix rep.hanziku-4: <http://www.chise.org/est/view/character/rep.hanziku-4=> .
+@prefix rep.hanziku-7: <http://www.chise.org/est/view/character/rep.hanziku-7=> .
+@prefix rep.hanziku-12: <http://www.chise.org/est/view/character/rep.hanziku-12=> .
 @prefix repi.hng-jou: <http://www.chise.org/est/view/character/repi.hng-jou=> .
 @prefix repi.hng-mam: <http://www.chise.org/est/view/character/repi.hng-mam=> .
 @prefix repi.hng-kgk: <http://www.chise.org/est/view/character/repi.hng-kgk=> .
 @prefix repi.hng-ksk: <http://www.chise.org/est/view/character/repi.hng-ksk=> .
 @prefix repi.hng-wan: <http://www.chise.org/est/view/character/repi.hng-wan=> .
 @prefix repi.hng-kyo: <http://www.chise.org/est/view/character/repi.hng-kyo=> .
-@prefix repi.jis-x0213-1: <http://www.chise.org/est/view/character/repi.jis-x0213-1=> .
-@prefix repi.adobe-japan1-0: <http://www.chise.org/est/view/character/repi.adobe-japan1-0=> .
-@prefix repi.gt-k: <http://www.chise.org/est/view/character/repi.gt-k=> .
-@prefix repi.ucs_ks: <http://www.chise.org/est/view/character/repi.ucs@ks=> .
-@prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
-@prefix rep.adobe-japan1: <http://www.chise.org/est/view/character/rep.adobe-japan1=> .
-@prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
-@prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
-@prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
-@prefix rep.cns11643-4: <http://www.chise.org/est/view/character/rep.cns11643-4=> .
-@prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
-@prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
-@prefix rep.gt-pj-2: <http://www.chise.org/est/view/character/rep.gt-pj-2=> .
+@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 repi.cbeta: <http://www.chise.org/est/view/character/repi.cbeta=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
-@prefix g2.adobe-japan1-5: <http://www.chise.org/est/view/character/g2.adobe-japan1-5=> .
-@prefix g2.jis-x0212: <http://www.chise.org/est/view/character/g2.jis-x0212=> .
-@prefix g2.cns11643-4: <http://www.chise.org/est/view/character/g2.cns11643-4=> .
-@prefix g2.jis-x0213-2: <http://www.chise.org/est/view/character/g2.jis-x0213-2=> .
-@prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
-@prefix repi.jis-x0213-2: <http://www.chise.org/est/view/character/repi.jis-x0213-2=> .
-@prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
-@prefix repi.cns11643-4: <http://www.chise.org/est/view/character/repi.cns11643-4=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
-@prefix repi.jis-x0212: <http://www.chise.org/est/view/character/repi.jis-x0212=> .
-@prefix repi.adobe-japan1-5: <http://www.chise.org/est/view/character/repi.adobe-japan1-5=> .
-@prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
-@prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
-@prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
+@prefix rep.big5-cdp-var-001: <http://www.chise.org/est/view/character/rep.big5-cdp-var-001=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
-@prefix g2.ucs_cns: <http://www.chise.org/est/view/character/g2.ucs@cns=> .
-@prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
-@prefix rep.cns11643-3: <http://www.chise.org/est/view/character/rep.cns11643-3=> .
-@prefix rep.gb12345: <http://www.chise.org/est/view/character/rep.gb12345=> .
-@prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
-@prefix g2.ucs_iso: <http://www.chise.org/est/view/character/g2.ucs@iso=> .
-@prefix repi.ucs_iso: <http://www.chise.org/est/view/character/repi.ucs@iso=> .
-@prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
+@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-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
-@prefix rep.cns11643-2: <http://www.chise.org/est/view/character/rep.cns11643-2=> .
-@prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
-@prefix g2.cns11643-2: <http://www.chise.org/est/view/character/g2.cns11643-2=> .
-@prefix repi.cns11643-2: <http://www.chise.org/est/view/character/repi.cns11643-2=> .
-@prefix g2.ucs_ks: <http://www.chise.org/est/view/character/g2.ucs@ks=> .
-@prefix g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
-@prefix g2.jis-x0208_1978: <http://www.chise.org/est/view/character/g2.jis-x0208@1978=> .
-@prefix g2.jis-x0208_1983: <http://www.chise.org/est/view/character/g2.jis-x0208@1983=> .
-@prefix repi.jis-x0208_1983: <http://www.chise.org/est/view/character/repi.jis-x0208@1983=> .
-@prefix repi.jis-x0208_1978: <http://www.chise.org/est/view/character/repi.jis-x0208@1978=> .
-@prefix repi.adobe-japan1-4: <http://www.chise.org/est/view/character/repi.adobe-japan1-4=> .
-@prefix g2.jis-x0208_1990: <http://www.chise.org/est/view/character/g2.jis-x0208@1990=> .
-@prefix repi.jis-x0208_1990: <http://www.chise.org/est/view/character/repi.jis-x0208@1990=> .
-@prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
-@prefix rep.koseki: <http://www.chise.org/est/view/character/rep.koseki=> .
-@prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
-@prefix g.big5-cdp: <http://www.chise.org/est/view/character/g.big5-cdp=> .
-@prefix g2.koseki: <http://www.chise.org/est/view/character/g2.koseki=> .
-@prefix repi.mj-0: <http://www.chise.org/est/view/character/repi.mj-0=> .
-@prefix repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
-@prefix g.gt-k: <http://www.chise.org/est/view/character/g.gt-k=> .
-@prefix a.jis-x0208: <http://www.chise.org/est/view/character/a.jis-x0208=> .
-@prefix a.jis-x0213-1: <http://www.chise.org/est/view/character/a.jis-x0213-1=> .
-@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.hanyo-denshi...ks...mf: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks...mf=> .
-@prefix repi.hanyo-denshi...ks: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ks=> .
-@prefix rep.ucs_jis: <http://www.chise.org/est/view/character/rep.ucs@jis=> .
-@prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
-@prefix g2.ucs_jis: <http://www.chise.org/est/view/character/g2.ucs@jis=> .
-@prefix g2.hanyo-denshi...ja: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ja=> .
-@prefix rep.iso-ir165: <http://www.chise.org/est/view/character/rep.iso-ir165=> .
-@prefix g2.iso-ir165: <http://www.chise.org/est/view/character/g2.iso-ir165=> .
-@prefix rep.ucs_cns: <http://www.chise.org/est/view/character/rep.ucs@cns=> .
-@prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
-@prefix rep.hanyo-denshi...jt: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jt=> .
-@prefix rep.hanziku-1: <http://www.chise.org/est/view/character/rep.hanziku-1=> .
-@prefix g2.cns11643-3: <http://www.chise.org/est/view/character/g2.cns11643-3=> .
-@prefix repi.cns11643-3: <http://www.chise.org/est/view/character/repi.cns11643-3=> .
-@prefix g2.ucs-bmp-cjk_JP...hanazono: <http://www.chise.org/est/view/character/g2.ucs-bmp-cjk@JP...hanazono=> .
-@prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
-@prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
-@prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
-@prefix rep.ucs_big5: <http://www.chise.org/est/view/character/rep.ucs@big5=> .
-@prefix rep.hanziku-2: <http://www.chise.org/est/view/character/rep.hanziku-2=> .
-@prefix rep.daikanwa...ho: <http://www.chise.org/est/view/character/rep.daikanwa...ho=> .
-@prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
-@prefix g2.daikanwa...ho: <http://www.chise.org/est/view/character/g2.daikanwa...ho=> .
-@prefix repi.daikanwa...ho: <http://www.chise.org/est/view/character/repi.daikanwa...ho=> .
-@prefix rep.hanziku-12: <http://www.chise.org/est/view/character/rep.hanziku-12=> .
-@prefix g2.cns11643-5: <http://www.chise.org/est/view/character/g2.cns11643-5=> .
-@prefix repi.cns11643-5: <http://www.chise.org/est/view/character/repi.cns11643-5=> .
-@prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
+@prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
-@prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
-@prefix o.adobe-japan1-5: <http://www.chise.org/est/view/character/o.adobe-japan1-5=> .
-@prefix o.gt: <http://www.chise.org/est/view/character/o.gt=> .
-@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 repi.cbeta: <http://www.chise.org/est/view/character/repi.cbeta=> .
-@prefix rep.hanyo-denshi...tk: <http://www.chise.org/est/view/character/rep.hanyo-denshi...tk=> .
-@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: <http://www.chise.org/est/view/character/g2.hanyo-denshi...tk=> .
-@prefix g2.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g2.hanyo-denshi...jt=> .
-@prefix repi.hanyo-denshi...jt: <http://www.chise.org/est/view/character/repi.hanyo-denshi...jt=> .
-@prefix rep.cns11643-7: <http://www.chise.org/est/view/character/rep.cns11643-7=> .
-@prefix rep.hanziku-7: <http://www.chise.org/est/view/character/rep.hanziku-7=> .
-@prefix rep.hanziku-4: <http://www.chise.org/est/view/character/rep.hanziku-4=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
+@prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix adobe-japan1-0: <http://rdf.chise.org/data/ccs/adobe-japan1-0/code-point/> .
+@prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
+@prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
 @prefix gb2312: <http://rdf.chise.org/data/ccs/gb2312/code-point/> .
 @prefix ks-x1001: <http://rdf.chise.org/data/ccs/ks-x1001/code-point/> .
+@prefix jis-x0212: <http://rdf.chise.org/data/ccs/jis-x0212/code-point/> .
+@prefix iso-ir165: <http://rdf.chise.org/data/ccs/iso-ir165/code-point/> .
 @prefix cns11643-1: <http://rdf.chise.org/data/ccs/cns11643-1/code-point/> .
+@prefix cns11643-2: <http://rdf.chise.org/data/ccs/cns11643-2/code-point/> .
+@prefix cns11643-3: <http://rdf.chise.org/data/ccs/cns11643-3/code-point/> .
+@prefix cns11643-4: <http://rdf.chise.org/data/ccs/cns11643-4/code-point/> .
+@prefix cns11643-5: <http://rdf.chise.org/data/ccs/cns11643-5/code-point/> .
+@prefix cns11643-6: <http://rdf.chise.org/data/ccs/cns11643-6/code-point/> .
+@prefix cns11643-7: <http://rdf.chise.org/data/ccs/cns11643-7/code-point/> .
 @prefix jis-x0213-1: <http://rdf.chise.org/data/ccs/jis-x0213-1/code-point/> .
+@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 adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/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...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 gt-pj-2: <http://rdf.chise.org/data/ccs/gt-pj-2/code-point/> .
+@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/> .
-@prefix adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/code-point/> .
+@prefix hanziku-1: <http://rdf.chise.org/data/ccs/hanziku-1/code-point/> .
+@prefix hanziku-2: <http://rdf.chise.org/data/ccs/hanziku-2/code-point/> .
+@prefix hanziku-4: <http://rdf.chise.org/data/ccs/hanziku-4/code-point/> .
+@prefix hanziku-7: <http://rdf.chise.org/data/ccs/hanziku-7/code-point/> .
+@prefix hanziku-12: <http://rdf.chise.org/data/ccs/hanziku-12/code-point/> .
 @prefix hng-jou: <http://rdf.chise.org/data/ccs/hng-jou/code-point/> .
 @prefix hng-mam: <http://rdf.chise.org/data/ccs/hng-mam/code-point/> .
 @prefix hng-kgk: <http://rdf.chise.org/data/ccs/hng-kgk/code-point/> .
 @prefix hng-ksk: <http://rdf.chise.org/data/ccs/hng-ksk/code-point/> .
 @prefix hng-wan: <http://rdf.chise.org/data/ccs/hng-wan/code-point/> .
 @prefix hng-kyo: <http://rdf.chise.org/data/ccs/hng-kyo/code-point/> .
-@prefix gt-pj-k1: <http://rdf.chise.org/data/ccs/gt-pj-k1/code-point/> .
-@prefix adobe-japan1: <http://rdf.chise.org/data/ccs/adobe-japan1/code-point/> .
-@prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
-@prefix jis-x0212: <http://rdf.chise.org/data/ccs/jis-x0212/code-point/> .
-@prefix cns11643-4: <http://rdf.chise.org/data/ccs/cns11643-4/code-point/> .
-@prefix jis-x0213-2: <http://rdf.chise.org/data/ccs/jis-x0213-2/code-point/> .
-@prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
-@prefix gt-pj-2: <http://rdf.chise.org/data/ccs/gt-pj-2/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 cns11643-5: <http://rdf.chise.org/data/ccs/cns11643-5/code-point/> .
+@prefix big5-cdp-var-001: <http://rdf.chise.org/data/ccs/big5-cdp-var-001/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
-@prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
-@prefix cns11643-3: <http://rdf.chise.org/data/ccs/cns11643-3/code-point/> .
-@prefix gb12345: <http://rdf.chise.org/data/ccs/gb12345/code-point/> .
-@prefix gt-pj-k2: <http://rdf.chise.org/data/ccs/gt-pj-k2/code-point/> .
-@prefix gt-pj-9: <http://rdf.chise.org/data/ccs/gt-pj-9/code-point/> .
+@prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
+@prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
-@prefix cns11643-2: <http://rdf.chise.org/data/ccs/cns11643-2/code-point/> .
-@prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
-@prefix cns11643-6: <http://rdf.chise.org/data/ccs/cns11643-6/code-point/> .
-@prefix koseki: <http://rdf.chise.org/data/ccs/koseki/code-point/> .
-@prefix mj-0: <http://rdf.chise.org/data/ccs/mj-0/code-point/> .
-@prefix hanyo-denshi...ks: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks/code-point/> .
-@prefix hanyo-denshi...ks...mf: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks...mf/code-point/> .
-@prefix hanyo-denshi...ja: <http://rdf.chise.org/data/ccs/hanyo-denshi...ja/code-point/> .
-@prefix iso-ir165: <http://rdf.chise.org/data/ccs/iso-ir165/code-point/> .
-@prefix hanyo-denshi...jt: <http://rdf.chise.org/data/ccs/hanyo-denshi...jt/code-point/> .
-@prefix hanziku-1: <http://rdf.chise.org/data/ccs/hanziku-1/code-point/> .
-@prefix ucs-bmp-cjk: <http://rdf.chise.org/data/ccs/ucs-bmp-cjk/code-point/> .
-@prefix hanziku-2: <http://rdf.chise.org/data/ccs/hanziku-2/code-point/> .
-@prefix daikanwa...ho: <http://rdf.chise.org/data/ccs/daikanwa...ho/code-point/> .
-@prefix gt-pj-11: <http://rdf.chise.org/data/ccs/gt-pj-11/code-point/> .
-@prefix hanziku-12: <http://rdf.chise.org/data/ccs/hanziku-12/code-point/> .
+@prefix ucs-itaiji-002: <http://rdf.chise.org/data/ccs/ucs-itaiji-002/code-point/> .
 @prefix ucs-itaiji-004: <http://rdf.chise.org/data/ccs/ucs-itaiji-004/code-point/> .
-@prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
-@prefix hanyo-denshi...tk: <http://rdf.chise.org/data/ccs/hanyo-denshi...tk/code-point/> .
-@prefix hanyo-denshi...tk...mf-01: <http://rdf.chise.org/data/ccs/hanyo-denshi...tk...mf-01/code-point/> .
-@prefix cns11643-7: <http://rdf.chise.org/data/ccs/cns11643-7/code-point/> .
-@prefix hanziku-7: <http://rdf.chise.org/data/ccs/hanziku-7/code-point/> .
-@prefix hanziku-4: <http://rdf.chise.org/data/ccs/hanziku-4/code-point/> .
 
 bucs:0x4E00
     a chisegg:super-abstract-character ;
     :super-abstract-character-of [ :context domain:bucs    ;
                                    :target     ucs:0x4E00  ] ;
     ideo:radical           1 ; # ⼀ 
-    :from.HNG            a.ucs:0x4E00         ,
-                         a.ucs:0x5F0C         ;
     .
 
 a.ucs:0x4E00
@@ -280,7 +289,7 @@ a.ucs:0x4E00
     :eq rep.gt-k:00001            ; # &I-GT-K00001;
     :eq rep.gt-pj-1:12396         ; # &I-GT-00001;
     :eq rep.daikanwa:00001        ; # &I-M-00001;
-    :eq rep.shinjigen:00001       ; # 一
+    :eq rep.shinjigen:0001        ; # 一
     :subsume
         g2.ucs_unicode:0x4E00 ;
     .
@@ -306,8 +315,8 @@ a.ucs:0x4E00
                :abstract-glyph-of        gt-pj-1:12396   .
     rep.daikanwa:00001
                :abstract-glyph-of       daikanwa:00001   .
-    rep.shinjigen:00001
-               :abstract-glyph-of      shinjigen:00001   .
+    rep.shinjigen:0001
+               :abstract-glyph-of      shinjigen:0001    .
     g2.ucs_unicode:0x4E00
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -324,9 +333,7 @@ a.ucs:0x4E00
         :eq g2.gt:00001               ; # &g2-AJ1-01200;
         :eq g2.gt-k:00001             ; # &g2-AJ1-01200;
         :eq g2.daikanwa:00001         ; # &g2-AJ1-01200;
-        :eq g2.shinjigen:00001        ; # &g2-AJ1-01200;
-        :from.HNG            a.ucs:0x4E00         ,
-                             a.ucs:0x5F0C         ;
+        :eq g2.shinjigen:0001         ; # &g2-AJ1-01200;
         :subsume
             repi.daikanwa:00001  ,
             repi.jis-x0208:0x306C ,
@@ -370,8 +377,8 @@ a.ucs:0x4E00
               :abstract-glyph-form-of           gt-k:00001   .
         g2.daikanwa:00001
               :abstract-glyph-form-of       daikanwa:00001   .
-        g2.shinjigen:00001
-              :abstract-glyph-form-of      shinjigen:00001   .
+        g2.shinjigen:0001
+              :abstract-glyph-form-of      shinjigen:0001    .
         repi.daikanwa:00001
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00001 ;
@@ -418,12 +425,10 @@ a.ucs:0x4E00
         repi.hng-mam:03700
             a chisegg:glyph-image ;
             :glyph-image-of hng-mam:03700 ;
-            :from.HNG            a.ucs:0x4E01         ;
             .
         repi.hng-kgk:02770
             a chisegg:glyph-image ;
             :glyph-image-of hng-kgk:02770 ;
-            :from.HNG            a.ucs:0x4E01         ;
             .
         repi.hng-khi:02150
             a chisegg:glyph-image ;
@@ -520,7 +525,7 @@ a.ucs:0x4E01
     :eq rep.gt-k:00051            ; # &I-GT-K00051;
     :eq rep.gt-pj-1:17274         ; # &I-GT-00007;
     :eq rep.daikanwa:00002        ; # &I-M-00002;
-    :eq rep.shinjigen:00004       ; # 丁
+    :eq rep.shinjigen:0004        ; # 丁
     :subsume
         g2.ucs_unicode:0x4E01 ;
     .
@@ -546,8 +551,8 @@ a.ucs:0x4E01
                :abstract-glyph-of        gt-pj-1:17274   .
     rep.daikanwa:00002
                :abstract-glyph-of       daikanwa:00002   .
-    rep.shinjigen:00004
-               :abstract-glyph-of      shinjigen:00004   .
+    rep.shinjigen:0004
+               :abstract-glyph-of      shinjigen:0004    .
     g2.ucs_unicode:0x4E01
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -564,7 +569,7 @@ a.ucs:0x4E01
         :eq g2.gt:00007               ; # &g2-AJ1-03000;
         :eq g2.gt-k:00051             ; # &g2-AJ1-03000;
         :eq g2.daikanwa:00002         ; # &g2-AJ1-03000;
-        :eq g2.shinjigen:00004        ; # &g2-AJ1-03000;
+        :eq g2.shinjigen:0004         ; # &g2-AJ1-03000;
         :subsume
             repi.daikanwa:00002  ,
             repi.jis-x0208:0x437A ,
@@ -594,8 +599,8 @@ a.ucs:0x4E01
               :abstract-glyph-form-of           gt-k:00051   .
         g2.daikanwa:00002
               :abstract-glyph-form-of       daikanwa:00002   .
-        g2.shinjigen:00004
-              :abstract-glyph-form-of      shinjigen:00004   .
+        g2.shinjigen:0004
+              :abstract-glyph-form-of      shinjigen:0004    .
         repi.daikanwa:00002
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00002 ;
@@ -626,7 +631,6 @@ a.ucs:0x4E01
             a chisegg:glyph-image ;
             :glyph-image-of ks-x1001:0x6F4B ;
             :eq repi.ucs_ks:0x4E01        ; # &R-K0-6F4B;
-            :from.HNG            a.ucs:0x4E03         ;
             .
             repi.ucs_ks:0x4E01
                           :glyph-image-of [ :context domain:ks      ;
@@ -635,39 +639,50 @@ a.ucs:0x4E01
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x4E01  ] ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.hng-tsu:04320
             a chisegg:glyph-image ;
             :glyph-image-of hng-tsu:04320 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.hng-nkm:04200
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:04200 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
 
-a.ucs:0x4E02
+a.ucs_component:0x4E02
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x4E02  ] ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    .
+
+a.ucs_cognate:0x4E02
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x4E02 ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x4E02  ] ;
+    :from.denotational_component
+        a.ucs_component:0x4E02 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :to.Bopomofo         a.ucs:0x310E         ;
     .
 
-rep.adobe-japan1:17234
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1:17234 ;
+a.ucs:0x4E02
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x4E02 ;
     :denotation-of
-        a.ucs:0x4E02         ;
+        a.ucs_cognate:0x4E02 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
     ideo:hanyu-dazidian  ( 1 4 1 ) ;
-    :eq rep.ucs_unicode:0x4E02    ; # &AJ1-17234;
-    :eq rep.adobe-japan1-5:17234  ; # &AJ1-17234;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4E00 ; # 一
+        isd:below    rep.big5-cdp:0x88CD   # &CDP-88CD;
+    ] ;
+    :eq rep.adobe-japan1-5:17234  ; # &I-AJ1-17234;
     :eq rep.jis-x0212:0x3021      ; # &I-JSP-3021;
     :eq rep.cns11643-4:0x2126     ; # &I-C4-2126;
     :eq rep.jis-x0213-2:0x2122    ; # &I-JX2-2122;
@@ -676,12 +691,10 @@ rep.adobe-japan1:17234
     :eq rep.gt-pj-2:12321         ; # &I-GT-00003;
     :eq rep.daikanwa:00003        ; # &I-M-00003;
     :eq rep.jef-china3:0x41A1     ; # &I-JC3-41A1;
+    :to.Bopomofo         a.ucs:0x310E         ;
     :subsume
         g2.ucs_unicode:0x4E02 ;
     .
-    rep.ucs_unicode:0x4E02
-               :abstract-glyph-of [ :context domain:unicode ;
-                                    :target     ucs:0x4E02  ] .
     rep.adobe-japan1-5:17234
                :abstract-glyph-of adobe-japan1-5:17234   .
     rep.jis-x0212:0x3021
@@ -712,7 +725,6 @@ rep.adobe-japan1:17234
         :eq g2.gt:00003               ; # &g2-AJ1-17234;
         :eq g2.daikanwa:00003         ; # &g2-AJ1-17234;
         :eq g2.jef-china3:0x41A1      ; # &g2-AJ1-17234;
-        :from.HNG            a.ucs:0x4E03         ;
         :subsume
             repi.daikanwa:00003  ,
             repi.jis-x0213-2:0x2122 ,
@@ -742,40 +754,33 @@ rep.adobe-japan1:17234
         repi.daikanwa:00003
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00003 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.jis-x0212:0x3021
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0212:0x3021 ;
             :eq repi.jis-x0213-2:0x2122   ; # &R-JX2-2122;
-            :from.HNG            a.ucs:0x4E03         ;
             .
             repi.jis-x0213-2:0x2122
                           :glyph-image-of    jis-x0213-2:0x2122  .
         repi.adobe-japan1-5:17234
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-5:17234 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.big5-cdp:0x8BCD
             a chisegg:glyph-image ;
             :glyph-image-of big5-cdp:0x8BCD ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.cns11643-4:0x2126
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-4:0x2126 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.gt:00003
             a chisegg:glyph-image ;
             :glyph-image-of gt:00003 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.jef-china3:0x41A1
             a chisegg:glyph-image ;
             :glyph-image-of jef-china3:0x41A1 ;
-            :from.HNG            a.ucs:0x4E03         ;
             .
         repi.ucs_unicode:0x4E02
             a chisegg:glyph-image ;
@@ -787,12 +792,12 @@ rep.big5-cdp:0x8BBF
     a chisegg:abstract-glyph ;
     :abstract-glyph-of big5-cdp:0x8BBF ;
     :denotation-of
-        a.ucs:0x4E02         ;
+        a.ucs_cognate:0x4E02 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
     :form-of             [ :context domain:component ;
-                           :target  rep.adobe-japan1:17234 ] ;
+                           :target  a.ucs:0x4E02         ] ;
     :subsume
         g2.big5-cdp:0x8BBF   ,
         rep.gt-k:00125       ;
@@ -805,9 +810,54 @@ rep.big5-cdp:0x8BBF
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt-k:00125 ;
         :eq rep.gt-pj-k1:25137        ; # &GT-K00125;
+        :subsume
+            g2.gt-k:00125        ;
         .
         rep.gt-pj-k1:25137
                    :abstract-glyph-of       gt-pj-k1:25137   .
+        g2.gt-k:00125
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00125 ;
+            :eq g2.gt-pj-k1:25137         ; # &g2-GT-K00125;
+            .
+            g2.gt-pj-k1:25137
+                  :abstract-glyph-form-of       gt-pj-k1:25137   .
+
+a.ucs:0x20001
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x20001 ;
+    :from.denotational_component
+        a.ucs_component:0x4E02 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    ideo:hanyu-dazidian  ( 1 4 2 ) ;
+    :eq rep.big5-cdp:0x88CC       ; # &I-CDP-88CC;
+    :subsume
+        g2.ucs_iso:0x20001   ;
+    .
+    rep.big5-cdp:0x88CC
+               :abstract-glyph-of       big5-cdp:0x88CC  .
+    g2.ucs_iso:0x20001
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20001 ] ;
+        :eq g2.big5-cdp:0x88CC        ; # &g2-CDP-88CC;
+        :subsume
+            repi.big5-cdp:0x88CC ,
+            repi.ucs_iso:0x20001 ;
+        .
+        g2.big5-cdp:0x88CC
+              :abstract-glyph-form-of       big5-cdp:0x88CC  .
+        repi.big5-cdp:0x88CC
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x88CC ;
+            .
+        repi.ucs_iso:0x20001
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20001 ] ;
+            .
 
 a.ucs:0x20000
     a chisegg:abstract-character ;
@@ -884,10 +934,10 @@ a.ucs_component:0x4E03
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0x8D             ; # &IWDS1-141;
+    :eq a.iwds-1:0141             ; # &A-compU+4E03;
     .
-    a.iwds-1:0x8D
-           :abstract-character-of         iwds-1:0x8D    .
+    a.iwds-1:0141
+           :abstract-character-of         iwds-1:0141    .
 
 a.ucs:0x4E03
     a chisegg:abstract-character ;
@@ -919,7 +969,7 @@ a.ucs:0x4E03
     :eq rep.gt-k:00046            ; # &I-GT-K00046;
     :eq rep.gt-pj-1:15415         ; # &I-GT-00004;
     :eq rep.daikanwa:00006        ; # &I-M-00006;
-    :eq rep.shinjigen:00003       ; # 七
+    :eq rep.shinjigen:0003        ; # 七
     :subsume
         g2.ucs_unicode:0x4E03 ,
         repi.hng-jou:00010   ,
@@ -959,8 +1009,8 @@ a.ucs:0x4E03
                :abstract-glyph-of        gt-pj-1:15415   .
     rep.daikanwa:00006
                :abstract-glyph-of       daikanwa:00006   .
-    rep.shinjigen:00003
-               :abstract-glyph-of      shinjigen:00003   .
+    rep.shinjigen:0003
+               :abstract-glyph-of      shinjigen:0003    .
     g2.ucs_unicode:0x4E03
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -977,7 +1027,7 @@ a.ucs:0x4E03
         :eq g2.gt:00004               ; # &g2-AJ1-02275;
         :eq g2.gt-k:00046             ; # &g2-AJ1-02275;
         :eq g2.daikanwa:00006         ; # &g2-AJ1-02275;
-        :eq g2.shinjigen:00003        ; # &g2-AJ1-02275;
+        :eq g2.shinjigen:0003         ; # &g2-AJ1-02275;
         :subsume
             repi.daikanwa:00006  ,
             repi.jis-x0208:0x3C37 ,
@@ -1006,8 +1056,8 @@ a.ucs:0x4E03
               :abstract-glyph-form-of           gt-k:00046   .
         g2.daikanwa:00006
               :abstract-glyph-form-of       daikanwa:00006   .
-        g2.shinjigen:00003
-              :abstract-glyph-form-of      shinjigen:00003   .
+        g2.shinjigen:0003
+              :abstract-glyph-form-of      shinjigen:0003    .
         repi.daikanwa:00006
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00006 ;
@@ -1090,14 +1140,10 @@ a.ucs:0x4E03
     repi.hng-wan:01520
         a chisegg:glyph-image ;
         :glyph-image-of hng-wan:01520 ;
-        :from.HNG            a.ucs:0x842C         ,
-                             a.ucs:0x4E07         ;
         .
     repi.hng-kyo:01910
         a chisegg:glyph-image ;
         :glyph-image-of hng-kyo:01910 ;
-        :from.HNG            a.ucs:0x842C         ,
-                             a.ucs:0x4E07         ;
         .
     g2.cns11643-1:0x4424
         a chisegg:abstract-glyph-form ;
@@ -1218,48 +1264,6 @@ a.ucs:0x4E06
     rep.gt-pj-k2:16959
                :abstract-glyph-of       gt-pj-k2:16959   .
 
-a.ucs:0x20001
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x20001 ;
-    ideo:radical           1 ; # ⼀ 
-    ideo:strokes           1 ;
-    ideo:total-strokes     2 ;
-    ideo:hanyu-dazidian  ( 1 4 2 ) ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying a.ucs:0x4E00 ; # 一
-        isd:overlaying rep.big5-cdp:0x88CD   # &CDP-88CD;
-    ] ;
-    :eq rep.big5-cdp:0x88CC       ; # &I-CDP-88CC;
-    :subsume
-        g2.ucs_unicode:0x20001 ;
-    .
-    rep.big5-cdp:0x88CC
-               :abstract-glyph-of       big5-cdp:0x88CC  .
-    g2.ucs_unicode:0x20001
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x20001 ] ;
-        :eq g2.ucs_iso:0x20001        ; # &g2-CDP-88CC;
-        :eq g2.big5-cdp:0x88CC        ; # &g2-CDP-88CC;
-        :subsume
-            repi.big5-cdp:0x88CC ,
-            repi.ucs_iso:0x20001 ;
-        .
-        g2.ucs_iso:0x20001
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20001 ] .
-        g2.big5-cdp:0x88CC
-              :abstract-glyph-form-of       big5-cdp:0x88CC  .
-        repi.big5-cdp:0x88CC
-            a chisegg:glyph-image ;
-            :glyph-image-of big5-cdp:0x88CC ;
-            .
-        repi.ucs_iso:0x20001
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:iso     ;
-                              :target     ucs:0x20001 ] ;
-            .
-
 a.ucs:0x20089
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20089 ;
@@ -1279,10 +1283,6 @@ a.ucs:0x20089
     ideo:strokes           [ :context domain:misc    ;
                              :target  0 ] ;
     ideo:total-strokes     2 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E3F ; # 丿
-        isd:right    a.ucs:0x4E00   # 一
-    ] ;
     :eq rep.adobe-japan1-5:17233  ; # &I-AJ1-17233;
     :eq rep.jis-x0213-2:0x2121    ; # &I-JX2-2121;
     :eq rep.big5-cdp:0x8B4A       ; # &I-CDP-8B4A;
@@ -1290,7 +1290,7 @@ a.ucs:0x20089
     :eq rep.gt-pj-9:19786         ; # &I-GT-00008;
     :eq rep.jef-china3:0x71FC     ; # &I-JC3-71FC;
     :subsume
-        g2.ucs_unicode:0x20089 ;
+        g2.ucs_iso:0x20089   ;
     .
     rep.adobe-japan1-5:17233
                :abstract-glyph-of adobe-japan1-5:17233   .
@@ -1304,11 +1304,10 @@ a.ucs:0x20089
                :abstract-glyph-of        gt-pj-9:19786   .
     rep.jef-china3:0x71FC
                :abstract-glyph-of     jef-china3:0x71FC  .
-    g2.ucs_unicode:0x20089
+    g2.ucs_iso:0x20089
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20089 ] ;
-        :eq g2.ucs_iso:0x20089        ; # &g2-AJ1-17233;
         :eq g2.adobe-japan1-5:17233   ; # &g2-AJ1-17233;
         :eq g2.jis-x0213-2:0x2121     ; # &g2-AJ1-17233;
         :eq g2.big5-cdp:0x8B4A        ; # &g2-AJ1-17233;
@@ -1322,9 +1321,6 @@ a.ucs:0x20089
             repi.jef-china3:0x71FC ,
             repi.ucs_iso:0x20089 ;
         .
-        g2.ucs_iso:0x20089
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20089 ] .
         g2.adobe-japan1-5:17233
               :abstract-glyph-form-of adobe-japan1-5:17233   .
         g2.jis-x0213-2:0x2121
@@ -1342,28 +1338,23 @@ a.ucs:0x20089
         repi.adobe-japan1-5:17233
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-5:17233 ;
-            :from.HNG            a.ucs:0x4E08         ;
             .
         repi.big5-cdp:0x8B4A
             a chisegg:glyph-image ;
             :glyph-image-of big5-cdp:0x8B4A ;
-            :from.HNG            a.ucs:0x4E08         ;
             .
         repi.gt:00008
             a chisegg:glyph-image ;
             :glyph-image-of gt:00008 ;
-            :from.HNG            a.ucs:0x4E08         ;
             .
         repi.jef-china3:0x71FC
             a chisegg:glyph-image ;
             :glyph-image-of jef-china3:0x71FC ;
-            :from.HNG            a.ucs:0x4E08         ;
             .
         repi.ucs_iso:0x20089
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:iso     ;
                               :target     ucs:0x20089 ] ;
-            :from.HNG            a.ucs:0x4E08         ;
             .
 
 a.ucs_component:0x4E06
@@ -1373,10 +1364,10 @@ a.ucs_component:0x4E06
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0x96             ; # &IWDS1-150;
+    :eq a.iwds-1:0150             ; # &A-compU+4E06;
     .
-    a.iwds-1:0x96
-           :abstract-character-of         iwds-1:0x96    .
+    a.iwds-1:0150
+           :abstract-character-of         iwds-1:0150    .
 
 rep.ucs-itaiji-001:0x21D6F
     a chisegg:abstract-glyph ;
@@ -1420,13 +1411,13 @@ a.ucs:0x4E07
     :eq rep.gt-k:00204            ; # &I-GT-K00204;
     :eq rep.gt-pj-1:19324         ; # &I-GT-00021;
     :eq rep.daikanwa:00010        ; # &I-M-00010;
-    :eq rep.shinjigen:00012       ; # 万
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:022254        ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:022254        ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x842C         ] ;
+    :eq rep.shinjigen:0012        ; # 万
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:022254        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:022254        ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x842C         ] ;
     :subsume
         g2.ucs_unicode:0x4E07 ;
     .
@@ -1452,8 +1443,8 @@ a.ucs:0x4E07
                :abstract-glyph-of        gt-pj-1:19324   .
     rep.daikanwa:00010
                :abstract-glyph-of       daikanwa:00010   .
-    rep.shinjigen:00012
-               :abstract-glyph-of      shinjigen:00012   .
+    rep.shinjigen:0012
+               :abstract-glyph-of      shinjigen:0012    .
     g2.ucs_unicode:0x4E07
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -1467,7 +1458,7 @@ a.ucs:0x4E07
         :eq g2.gt:00021               ; # &g2-AJ1-03754;
         :eq g2.gt-k:00204             ; # &g2-AJ1-03754;
         :eq g2.daikanwa:00010         ; # &g2-AJ1-03754;
-        :eq g2.shinjigen:00012        ; # &g2-AJ1-03754;
+        :eq g2.shinjigen:0012         ; # &g2-AJ1-03754;
         :subsume
             repi.daikanwa:00010  ,
             repi.jis-x0208:0x4B7C ,
@@ -1497,8 +1488,8 @@ a.ucs:0x4E07
               :abstract-glyph-form-of           gt-k:00204   .
         g2.daikanwa:00010
               :abstract-glyph-form-of       daikanwa:00010   .
-        g2.shinjigen:00012
-              :abstract-glyph-form-of      shinjigen:00012   .
+        g2.shinjigen:0012
+              :abstract-glyph-form-of      shinjigen:0012    .
         repi.daikanwa:00010
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00010 ;
@@ -1547,25 +1538,30 @@ a.ucs:0x4E07
             :glyph-image-of hng-khm:01620 ;
             .
 
-a.ucs_component:0x4E08
+bucs:0x4E08
+    a chisegg:super-abstract-character ;
+    :super-abstract-character-of [ :context domain:bucs    ;
+                                   :target     ucs:0x4E08  ] ;
+    ideo:radical           1 ; # ⼀ 
+    .
+
+a.ucs_iwds-1:0x4E08
     a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:component ;
+    :abstract-character-of [ :context domain:iwds-1  ;
                              :target     ucs:0x4E08  ] ;
+    :denotation-of
+        bucs:0x4E08          ;
     ideo:radical           1 ; # ⼀ 
-    :eq bucs:0x4E08               ; # &BUCS+4E08;
-    :eq a.iwds-1:0xF8             ; # &BUCS+4E08;
+    :eq a.iwds-1:0248             ; # &A-IWDSU+4E08;
     .
-    bucs:0x4E08
-        :super-abstract-character-of [ :context domain:bucs    ;
-                                       :target     ucs:0x4E08  ] .
-    a.iwds-1:0xF8
-           :abstract-character-of         iwds-1:0xF8    .
+    a.iwds-1:0248
+           :abstract-character-of         iwds-1:0248    .
 
 a.ucs:0x4E08
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E08 ;
     :denotation-of
-        a.ucs_component:0x4E08 ;
+        a.ucs_iwds-1:0x4E08  ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
@@ -1590,7 +1586,7 @@ a.ucs:0x4E08
     :eq rep.gt:00020              ; # &I-GT-00020;
     :eq rep.gt-pj-1:15974         ; # &I-GT-00020;
     :eq rep.daikanwa:00011        ; # &I-M-00011;
-    :eq rep.shinjigen:00009       ; # 丈
+    :eq rep.shinjigen:0009        ; # 丈
     :subsume
         rep.gt:00018         ,
         repi.hng-mam:03750   ,
@@ -1618,8 +1614,8 @@ a.ucs:0x4E08
                :abstract-glyph-of        gt-pj-1:15974   .
     rep.daikanwa:00011
                :abstract-glyph-of       daikanwa:00011   .
-    rep.shinjigen:00009
-               :abstract-glyph-of      shinjigen:00009   .
+    rep.shinjigen:0009
+               :abstract-glyph-of      shinjigen:0009    .
     rep.gt:00018
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00018 ;
@@ -1634,7 +1630,7 @@ a.ucs:0x4E08
         :eq rep.gt-k:00189            ; # &I-GT-K00189;
         :eq rep.gt-pj-2:12327         ; # &g2-AJ1-13463;
         :eq g2.daikanwa:00011         ; # &g2-AJ1-13463;
-        :eq rep.shinjigen:00010       ; # &g2-AJ1-13463;
+        :eq rep.shinjigen:0010        ; # &g2-AJ1-13463;
         :eq rep.jef-china3:0x41A5     ; # &I-JC3-41A5;
         :subsume
             repi.daikanwa:00011  ,
@@ -1667,8 +1663,8 @@ a.ucs:0x4E08
                    :abstract-glyph-of        gt-pj-2:12327   .
         g2.daikanwa:00011
               :abstract-glyph-form-of       daikanwa:00011   .
-        rep.shinjigen:00010
-                   :abstract-glyph-of      shinjigen:00010   .
+        rep.shinjigen:0010
+                   :abstract-glyph-of      shinjigen:0010    .
         rep.jef-china3:0x41A5
                    :abstract-glyph-of     jef-china3:0x41A5  .
         repi.daikanwa:00011
@@ -1688,52 +1684,44 @@ a.ucs:0x4E08
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-4:13463 ;
             .
-        repi.ucs_ks:0x4E08
+        repi.ks-x1001:0x6D5B
             a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:ks      ;
-                              :target     ucs:0x4E08  ] ;
-            :eq repi.ks-x1001:0x6D5B      ; # &R-K0-6D5B;
-            :from.HNG            a.ucs:0x4E09         ;
+            :glyph-image-of ks-x1001:0x6D5B ;
+            :eq repi.ucs_ks:0x4E08        ; # &R-K0-6D5B;
             .
-            repi.ks-x1001:0x6D5B
-                          :glyph-image-of       ks-x1001:0x6D5B  .
+            repi.ucs_ks:0x4E08
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x4E08  ] .
         repi.gt:00018
             a chisegg:glyph-image ;
             :glyph-image-of gt:00018 ;
             :eq repi.gt-k:00189           ; # &R-GT-00018;
-            :from.HNG            a.ucs:0x4E09         ;
             .
             repi.gt-k:00189
                           :glyph-image-of           gt-k:00189   .
         repi.jef-china3:0x41A5
             a chisegg:glyph-image ;
             :glyph-image-of jef-china3:0x41A5 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.hng-kar:04730
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:04730 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.hng-tsu:00010
             a chisegg:glyph-image ;
             :glyph-image-of hng-tsu:00010 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.hng-nkm:04260
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:04260 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.hng-kbk:03770
             a chisegg:glyph-image ;
             :glyph-image-of hng-kbk:03770 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
     repi.hng-mam:03750
         a chisegg:glyph-image ;
         :glyph-image-of hng-mam:03750 ;
-        :from.HNG            a.ucs:0x4E09         ;
         .
     g2.ucs_unicode:0x4E08
         a chisegg:abstract-glyph-form ;
@@ -1748,8 +1736,7 @@ a.ucs:0x4E08
         :eq g2.cns11643-1:0x4437      ; # &g2-AJ1-02510;
         :eq g2.jis-x0213-1:0x3E66     ; # &g2-AJ1-02510;
         :eq g2.gt:00020               ; # &g2-AJ1-02510;
-        :eq g2.shinjigen:00009        ; # &g2-AJ1-02510;
-        :from.HNG            a.ucs:0x4E09         ;
+        :eq g2.shinjigen:0009         ; # &g2-AJ1-02510;
         :subsume
             repi.jis-x0208_1990:0x3E66 ,
             repi.adobe-japan1-6:02510 ,
@@ -1770,37 +1757,32 @@ a.ucs:0x4E08
               :abstract-glyph-form-of    jis-x0213-1:0x3E66  .
         g2.gt:00020
               :abstract-glyph-form-of             gt:00020   .
-        g2.shinjigen:00009
-              :abstract-glyph-form-of      shinjigen:00009   .
+        g2.shinjigen:0009
+              :abstract-glyph-form-of      shinjigen:0009    .
         repi.jis-x0208_1990:0x3E66
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:1990    ;
                               :target jis-x0208:0x3E66  ] ;
             :eq repi.jis-x0213-1:0x3E66   ; # &R-J90-3E66;
-            :from.HNG            a.ucs:0x4E09         ;
             .
             repi.jis-x0213-1:0x3E66
                           :glyph-image-of    jis-x0213-1:0x3E66  .
         repi.adobe-japan1-0:02510
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-0:02510 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.ucs_unicode:0x4E08
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x4E08  ] ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.cns11643-1:0x4437
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-1:0x4437 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
         repi.gt:00020
             a chisegg:glyph-image ;
             :glyph-image-of gt:00020 ;
-            :from.HNG            a.ucs:0x4E09         ;
             .
 
 bucs:0x4E09
@@ -1808,7 +1790,6 @@ bucs:0x4E09
     :super-abstract-character-of [ :context domain:bucs    ;
                                    :target     ucs:0x4E09  ] ;
     ideo:radical           1 ; # ⼀ 
-    :from.HNG            a.ucs:0x4E09         ;
     .
 
 a.ucs:0x4E09
@@ -1843,7 +1824,7 @@ a.ucs:0x4E09
     :eq rep.gt-k:00177            ; # &I-GT-K00177;
     :eq rep.gt-pj-1:15152         ; # &I-GT-00017;
     :eq rep.daikanwa:00012        ; # &I-M-00012;
-    :eq rep.shinjigen:00006       ; # 三
+    :eq rep.shinjigen:0006        ; # 三
     :subsume
         g2.ucs_unicode:0x4E09 ;
     .
@@ -1869,8 +1850,8 @@ a.ucs:0x4E09
                :abstract-glyph-of        gt-pj-1:15152   .
     rep.daikanwa:00012
                :abstract-glyph-of       daikanwa:00012   .
-    rep.shinjigen:00006
-               :abstract-glyph-of      shinjigen:00006   .
+    rep.shinjigen:0006
+               :abstract-glyph-of      shinjigen:0006    .
     g2.ucs_unicode:0x4E09
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -1887,8 +1868,7 @@ a.ucs:0x4E09
         :eq g2.gt:00017               ; # &g2-AJ1-02174;
         :eq g2.gt-k:00177             ; # &g2-AJ1-02174;
         :eq g2.daikanwa:00012         ; # &g2-AJ1-02174;
-        :eq g2.shinjigen:00006        ; # &g2-AJ1-02174;
-        :from.HNG            a.ucs:0x4E09         ;
+        :eq g2.shinjigen:0006         ; # &g2-AJ1-02174;
         :subsume
             repi.daikanwa:00012  ,
             repi.jis-x0208:0x3B30 ,
@@ -1932,8 +1912,8 @@ a.ucs:0x4E09
               :abstract-glyph-form-of           gt-k:00177   .
         g2.daikanwa:00012
               :abstract-glyph-form-of       daikanwa:00012   .
-        g2.shinjigen:00006
-              :abstract-glyph-form-of      shinjigen:00006   .
+        g2.shinjigen:0006
+              :abstract-glyph-form-of      shinjigen:0006    .
         repi.daikanwa:00012
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00012 ;
@@ -1980,77 +1960,62 @@ a.ucs:0x4E09
         repi.hng-mam:03710
             a chisegg:glyph-image ;
             :glyph-image-of hng-mam:03710 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-kgk:02850
             a chisegg:glyph-image ;
             :glyph-image-of hng-kgk:02850 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-khi:02160
             a chisegg:glyph-image ;
             :glyph-image-of hng-khi:02160 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-khm:01610
             a chisegg:glyph-image ;
             :glyph-image-of hng-khm:01610 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-sok:01270
             a chisegg:glyph-image ;
             :glyph-image-of hng-sok:01270 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-kak:02590
             a chisegg:glyph-image ;
             :glyph-image-of hng-kak:02590 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-kar:04740
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:04740 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-tsu:04280
             a chisegg:glyph-image ;
             :glyph-image-of hng-tsu:04280 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-nkm:04170
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:04170 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-kbk:03750
             a chisegg:glyph-image ;
             :glyph-image-of hng-kbk:03750 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-sik:01290
             a chisegg:glyph-image ;
             :glyph-image-of hng-sik:01290 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-skk:01470
             a chisegg:glyph-image ;
             :glyph-image-of hng-skk:01470 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-ksk:01280
             a chisegg:glyph-image ;
             :glyph-image-of hng-ksk:01280 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-wan:01510
             a chisegg:glyph-image ;
             :glyph-image-of hng-wan:01510 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
         repi.hng-kyo:01920
             a chisegg:glyph-image ;
             :glyph-image-of hng-kyo:01920 ;
-            :from.HNG            a.ucs:0x4E0A         ;
             .
 
 a.ucs:0x4E0A
@@ -2081,7 +2046,7 @@ a.ucs:0x4E0A
     :eq rep.gt-k:00188            ; # &I-GT-K00188;
     :eq rep.gt-pj-1:15973         ; # &I-GT-00019;
     :eq rep.daikanwa:00013        ; # &I-M-00013;
-    :eq rep.shinjigen:00008       ; # 上
+    :eq rep.shinjigen:0008        ; # 上
     :subsume
         g2.ucs_unicode:0x4E0A ;
     .
@@ -2107,8 +2072,8 @@ a.ucs:0x4E0A
                :abstract-glyph-of        gt-pj-1:15973   .
     rep.daikanwa:00013
                :abstract-glyph-of       daikanwa:00013   .
-    rep.shinjigen:00008
-               :abstract-glyph-of      shinjigen:00008   .
+    rep.shinjigen:0008
+               :abstract-glyph-of      shinjigen:0008    .
     g2.ucs_unicode:0x4E0A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2125,8 +2090,7 @@ a.ucs:0x4E0A
         :eq g2.gt:00019               ; # &g2-AJ1-02509;
         :eq g2.gt-k:00188             ; # &g2-AJ1-02509;
         :eq g2.daikanwa:00013         ; # &g2-AJ1-02509;
-        :eq g2.shinjigen:00008        ; # &g2-AJ1-02509;
-        :from.HNG            a.ucs:0x4E0A         ;
+        :eq g2.shinjigen:0008         ; # &g2-AJ1-02509;
         :subsume
             repi.daikanwa:00013  ,
             repi.jis-x0208:0x3E65 ,
@@ -2170,8 +2134,8 @@ a.ucs:0x4E0A
               :abstract-glyph-form-of           gt-k:00188   .
         g2.daikanwa:00013
               :abstract-glyph-form-of       daikanwa:00013   .
-        g2.shinjigen:00008
-              :abstract-glyph-form-of      shinjigen:00008   .
+        g2.shinjigen:0008
+              :abstract-glyph-form-of      shinjigen:0008    .
         repi.daikanwa:00013
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00013 ;
@@ -2218,77 +2182,62 @@ a.ucs:0x4E0A
         repi.hng-mam:03770
             a chisegg:glyph-image ;
             :glyph-image-of hng-mam:03770 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-kgk:02810
             a chisegg:glyph-image ;
             :glyph-image-of hng-kgk:02810 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-khi:02170
             a chisegg:glyph-image ;
             :glyph-image-of hng-khi:02170 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-khm:01560
             a chisegg:glyph-image ;
             :glyph-image-of hng-khm:01560 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-sok:01250
             a chisegg:glyph-image ;
             :glyph-image-of hng-sok:01250 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-kak:02560
             a chisegg:glyph-image ;
             :glyph-image-of hng-kak:02560 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-kar:04760
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:04760 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-tsu:04330
             a chisegg:glyph-image ;
             :glyph-image-of hng-tsu:04330 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-nkm:04210
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:04210 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-kbk:03710
             a chisegg:glyph-image ;
             :glyph-image-of hng-kbk:03710 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-sik:01360
             a chisegg:glyph-image ;
             :glyph-image-of hng-sik:01360 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-skk:01430
             a chisegg:glyph-image ;
             :glyph-image-of hng-skk:01430 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-ksk:01270
             a chisegg:glyph-image ;
             :glyph-image-of hng-ksk:01270 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-wan:01500
             a chisegg:glyph-image ;
             :glyph-image-of hng-wan:01500 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
         repi.hng-kyo:01930
             a chisegg:glyph-image ;
             :glyph-image-of hng-kyo:01930 ;
-            :from.HNG            a.ucs:0x4E0B         ;
             .
 
 a.ucs:0x4E0B
@@ -2320,7 +2269,7 @@ a.ucs:0x4E0B
     :eq rep.gt-k:00159            ; # &I-GT-K00159;
     :eq rep.gt-pj-1:12860         ; # &I-GT-00011;
     :eq rep.daikanwa:00014        ; # &I-M-00014;
-    :eq rep.shinjigen:00005       ; # 下
+    :eq rep.shinjigen:0005        ; # 下
     :subsume
         g2.ucs_unicode:0x4E0B ,
         repi.hng-jou:01930   ,
@@ -2353,8 +2302,8 @@ a.ucs:0x4E0B
                :abstract-glyph-of        gt-pj-1:12860   .
     rep.daikanwa:00014
                :abstract-glyph-of       daikanwa:00014   .
-    rep.shinjigen:00005
-               :abstract-glyph-of      shinjigen:00005   .
+    rep.shinjigen:0005
+               :abstract-glyph-of      shinjigen:0005    .
     g2.ucs_unicode:0x4E0B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2371,7 +2320,7 @@ a.ucs:0x4E0B
         :eq g2.gt:00011               ; # &g2-AJ1-01340;
         :eq g2.gt-k:00159             ; # &g2-AJ1-01340;
         :eq g2.daikanwa:00014         ; # &g2-AJ1-01340;
-        :eq g2.shinjigen:00005        ; # &g2-AJ1-01340;
+        :eq g2.shinjigen:0005         ; # &g2-AJ1-01340;
         :subsume
             repi.daikanwa:00014  ,
             repi.jis-x0208:0x323C ,
@@ -2407,8 +2356,8 @@ a.ucs:0x4E0B
               :abstract-glyph-form-of           gt-k:00159   .
         g2.daikanwa:00014
               :abstract-glyph-form-of       daikanwa:00014   .
-        g2.shinjigen:00005
-              :abstract-glyph-form-of      shinjigen:00005   .
+        g2.shinjigen:0005
+              :abstract-glyph-form-of      shinjigen:0005    .
         repi.daikanwa:00014
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00014 ;
@@ -2526,6 +2475,8 @@ a.ucs:0x4E0C
     :eq rep.gt:00015              ; # &I-GT-00015;
     :eq rep.gt-pj-2:12328         ; # &I-GT-00015;
     :eq rep.daikanwa:00015        ; # &I-M-00015;
+    :from.mistakable     [ :context domain:component ;
+                           :target  rep.gt-k:00264       ] ;
     :subsume
         g2.ucs_unicode:0x4E0C ;
     .
@@ -2555,7 +2506,6 @@ a.ucs:0x4E0C
         :eq g2.cns11643-2:0x2127      ; # &g2-AJ1-19140;
         :eq g2.gt:00015               ; # &g2-AJ1-19140;
         :eq g2.daikanwa:00015         ; # &g2-AJ1-19140;
-        :from.HNG            a.ucs:0x4E0D         ;
         :subsume
             repi.daikanwa:00015  ,
             repi.jis-x0212:0x3024 ,
@@ -2579,33 +2529,27 @@ a.ucs:0x4E0C
         repi.daikanwa:00015
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00015 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.jis-x0212:0x3024
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0212:0x3024 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.adobe-japan1-5:19140
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-5:19140 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.cns11643-2:0x2127
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-2:0x2127 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.gt:00015
             a chisegg:glyph-image ;
             :glyph-image-of gt:00015 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.ucs_unicode:0x4E0C
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x4E0C  ] ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
 
 a.ucs:0x20003
@@ -2615,10 +2559,6 @@ a.ucs:0x20003
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
     ideo:hanyu-dazidian  ( 1 8 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
     :eq rep.cns11643-6:0x212F     ; # &I-C6-212F;
     :eq rep.big5-cdp:0x87F8       ; # &I-CDP-87F8;
     :eq rep.gt:00016              ; # &I-GT-00016;
@@ -2662,10 +2602,6 @@ a.ucs:0x20004
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E5B ; # 乛
-        isd:below    a.ucs:0x4E04   # 丄
-    ] ;
     :eq rep.cns11643-6:0x212D     ; # &I-C6-212D;
     .
     rep.cns11643-6:0x212D
@@ -2678,10 +2614,6 @@ a.ucs:0x20005
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
     ideo:hanyu-dazidian  ( 1 10 1 ) ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying a.ucs:0x4E02 ; # 丂
-        isd:overlaying a.ucs:0x4E3F   # 丿
-    ] ;
     :eq rep.cns11643-6:0x212E     ; # &I-C6-212E;
     :eq rep.big5-cdp:0x87F7       ; # &I-CDP-87F7;
     :eq rep.gt:00012              ; # &I-GT-00012;
@@ -2705,10 +2637,6 @@ a.ucs:0x20006
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying a.ucs:0x5341 ; # 十
-        isd:overlaying a.ucs:0x4E3F   # 丿
-    ] ;
     .
 
 rep.ucs_iso:0x20006
@@ -2720,24 +2648,14 @@ rep.ucs_iso:0x20006
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying a.ucs:0x5341 ; # 十
-        isd:overlaying a.ucs:0x4E3F   # 丿
-    ] ;
-    :from.HNG            a.ucs:0x4E0D         ;
     :subsume
-        g2.ucs_unicode:0x20006 ;
+        g2.ucs_iso:0x20006   ;
     .
-    g2.ucs_unicode:0x20006
+    g2.ucs_iso:0x20006
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20006 ] ;
-        :eq g2.ucs_iso:0x20006        ; # &g2-IU-00020006;
-        :from.HNG            a.ucs:0x4E0D         ;
         .
-        g2.ucs_iso:0x20006
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20006 ] .
 
 a.ucs:0x2B740
     a chisegg:abstract-character ;
@@ -2758,7 +2676,7 @@ a.ucs:0x2B740
                            :target  a.ucs:0x6B62         ] ;
     :subsume
         g2.mj:056880         ,
-        g.big5-cdp:0x8DEC    ;
+        a.gt-k:00378         ;
     .
     rep.mj:056880
                :abstract-glyph-of             mj:056880  .
@@ -2771,9 +2689,8 @@ a.ucs:0x2B740
         :abstract-glyph-form-of mj:056880 ;
         :eq g2.ucs_iso:0x2B740        ; # &g2-MJ056880;
         :eq g2.koseki:003060          ; # &g2-MJ056880;
-        :from.HNG            a.ucs:0x4E0D         ;
         :subsume
-            repi.mj-0:056880     ,
+            repi.mj:056880       ,
             repi.ucs_iso:0x2B740 ;
         .
         g2.ucs_iso:0x2B740
@@ -2784,29 +2701,28 @@ a.ucs:0x2B740
         repi.mj:056880
             a chisegg:glyph-image ;
             :glyph-image-of mj:056880 ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         repi.ucs_iso:0x2B740
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:iso     ;
                               :target     ucs:0x2B740 ] ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
-    g.big5-cdp:0x8DEC
-        a chisegg:detailed-glyph ;
-        :detailed-glyph-of big5-cdp:0x8DEC ;
+    a.gt-k:00378
+        a chisegg:abstract-character ;
+        :abstract-character-of gt-k:00378 ;
+        :eq g.big5-cdp:0x8DEC         ; # &G-CDP-8DEC;
         :eq g.gt-k:00378              ; # &G-CDP-8DEC;
-        :from.HNG            a.ucs:0x4E0D         ;
         :subsume
             g2.big5-cdp:0x8DEC   ,
             rep.gt-k:00378       ;
         .
+        g.big5-cdp:0x8DEC
+                   :detailed-glyph-of       big5-cdp:0x8DEC  .
         g.gt-k:00378
                    :detailed-glyph-of           gt-k:00378   .
         g2.big5-cdp:0x8DEC
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of big5-cdp:0x8DEC ;
-            :from.HNG            a.ucs:0x4E0D         ;
             .
         rep.gt-k:00378
             a chisegg:abstract-glyph ;
@@ -2860,22 +2776,18 @@ rep.gt:00014
     ] ;
     :eq rep.gt-pj-9:14120         ; # &GT-00014;
     :subsume
-        repi.gt:00014        ;
+        g2.gt:00014          ;
     .
     rep.gt-pj-9:14120
                :abstract-glyph-of        gt-pj-9:14120   .
-    repi.gt:00014
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00014 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x53C8 ; # &g2-AJ1-03746;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
-        :eq g2.gt:00014               ; # &g2-GT-00014;
-        :from.HNG            a.ucs:0x4E0D         ;
+    g2.gt:00014
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00014 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x53C8 ; # &g2-AJ1-03746;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
-        g2.gt:00014
-              :abstract-glyph-form-of             gt:00014   .
 
 rep.gt:00022
     a chisegg:abstract-glyph ;
@@ -2916,7 +2828,7 @@ a.ucs:0x4E0D
     :eq rep.gt-k:00480            ; # &I-GT-K00480;
     :eq rep.gt-pj-1:18772         ; # &I-GT-00036;
     :eq rep.daikanwa:00019        ; # &I-M-00019;
-    :eq rep.shinjigen:00018       ; # 不
+    :eq rep.shinjigen:0018        ; # 不
     :subsume
         g2.ucs_unicode:0x4E0D ,
         repi.hng-jou:01860   ,
@@ -2944,8 +2856,8 @@ a.ucs:0x4E0D
                :abstract-glyph-of        gt-pj-1:18772   .
     rep.daikanwa:00019
                :abstract-glyph-of       daikanwa:00019   .
-    rep.shinjigen:00018
-               :abstract-glyph-of      shinjigen:00018   .
+    rep.shinjigen:0018
+               :abstract-glyph-of      shinjigen:0018    .
     g2.ucs_unicode:0x4E0D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2962,7 +2874,7 @@ a.ucs:0x4E0D
         :eq g2.gt:00036               ; # &g2-AJ1-03526;
         :eq g2.gt-k:00480             ; # &g2-AJ1-03526;
         :eq g2.daikanwa:00019         ; # &g2-AJ1-03526;
-        :eq g2.shinjigen:00018        ; # &g2-AJ1-03526;
+        :eq g2.shinjigen:0018         ; # &g2-AJ1-03526;
         :subsume
             repi.daikanwa:00019  ,
             repi.jis-x0208:0x4954 ,
@@ -3005,8 +2917,8 @@ a.ucs:0x4E0D
               :abstract-glyph-form-of           gt-k:00480   .
         g2.daikanwa:00019
               :abstract-glyph-form-of       daikanwa:00019   .
-        g2.shinjigen:00018
-              :abstract-glyph-form-of      shinjigen:00018   .
+        g2.shinjigen:0018
+              :abstract-glyph-form-of      shinjigen:0018    .
         repi.daikanwa:00019
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00019 ;
@@ -3123,10 +3035,6 @@ a.ucs:0x4E0E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E0E ;
     ideo:radical           1 ; # ⼀ 
-    isd:structure [ a idc:⿹ ;
-        isd:surround rep.big5-cdp:0x8BBF ; # &CDP-8BBF;
-        isd:filling  a.ucs:0x4E00   # 一
-    ] ;
     :sound               [ :context domain:ja...kun ;
                            :target  ( "ata-H+eru" "kumi+suru" "azuka+r5" ) ;
                          ] ;
@@ -3135,8 +3043,8 @@ a.ucs:0x4E0E
                          ] ;
     :eq a.jis-x0208:0x4D3F        ; # 与
     :eq a.jis-x0213-1:0x4D3F      ; # 与
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x8207         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x8207         ] ;
     .
     a.jis-x0208:0x4D3F
            :abstract-character-of      jis-x0208:0x4D3F  .
@@ -3174,8 +3082,8 @@ rep.mj:006311
     :eq rep.gt-pj-2:12332         ; # &I-GT-00023;
     :eq rep.daikanwa:00020        ; # &I-M-00020;
     :eq rep.jef-china3:0x82A6     ; # &I-JC3-82A6;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8207         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8207         ] ;
     :subsume
         g2.mj:006311         ;
     .
@@ -3223,8 +3131,8 @@ rep.mj:006311
         :subsume
             repi.daikanwa:00020  ,
             repi.adobe-japan1-6:20073 ,
-            repi.mj-0:006311     ,
-            rep.hanyo-denshi...ks...mf:000026 ,
+            repi.mj:006311       ,
+            repi.hanyo-denshi...ks:000260 ,
             repi.ucs_unicode:0x4E0E ,
             repi.cns11643-2:0x212F ,
             repi.gt:00023        ;
@@ -3298,9 +3206,9 @@ rep.mj:006310
     :eq rep.gt:00024              ; # &I-GT-00024;
     :eq rep.gt-k:00208            ; # &I-GT-K00208;
     :eq rep.gt-pj-1:19775         ; # &I-GT-00024;
-    :eq rep.shinjigen:06625       ; # &MJ006310;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x8207         ] ;
+    :eq rep.shinjigen:6625        ; # &MJ006310;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x8207         ] ;
     :subsume
         g2.mj:006310         ;
     .
@@ -3321,8 +3229,8 @@ rep.mj:006310
                :abstract-glyph-of           gt-k:00208   .
     rep.gt-pj-1:19775
                :abstract-glyph-of        gt-pj-1:19775   .
-    rep.shinjigen:06625
-               :abstract-glyph-of      shinjigen:06625   .
+    rep.shinjigen:6625
+               :abstract-glyph-of      shinjigen:6625    .
     g2.mj:006310
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006310 ;
@@ -3339,11 +3247,11 @@ rep.mj:006310
         :eq g2.hanyo-denshi...ja:0x4D3F ; # &g2-MJ006310;
         :eq g2.gt:00024               ; # &g2-MJ006310;
         :eq g2.gt-k:00208             ; # &g2-MJ006310;
-        :eq g2.shinjigen:06625        ; # &g2-MJ006310;
+        :eq g2.shinjigen:6625         ; # &g2-MJ006310;
         :subsume
             repi.jis-x0208:0x4D3F ,
             repi.adobe-japan1-6:03881 ,
-            repi.mj-0:006310     ,
+            repi.mj:006310       ,
             repi.gt:00024        ;
         .
         g2.ucs_jis:0x4E0E
@@ -3361,8 +3269,8 @@ rep.mj:006310
               :abstract-glyph-form-of             gt:00024   .
         g2.gt-k:00208
               :abstract-glyph-form-of           gt-k:00208   .
-        g2.shinjigen:06625
-              :abstract-glyph-form-of      shinjigen:06625   .
+        g2.shinjigen:6625
+              :abstract-glyph-form-of      shinjigen:6625    .
         repi.jis-x0208:0x4D3F
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x4D3F ;
@@ -3386,6 +3294,66 @@ rep.mj:006310
             repi.gt-k:00208
                           :glyph-image-of           gt-k:00208   .
 
+a.big5-cdp:0x8BC2
+    a chisegg:abstract-character ;
+    :abstract-character-of big5-cdp:0x8BC2 ;
+    :denotation-of
+        a.ucs:0x4E0E         ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    .
+
+rep.ucs-var-004:0x4E0E
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-004:0x4E0E ;
+    :denotation-of
+        a.big5-cdp:0x8BC2    ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    .
+
+rep.ucs-var-002:0x4E0E
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x4E0E ;
+    :denotation-of
+        a.big5-cdp:0x8BC2    ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿹ ;
+        isd:surround rep.big5-cdp:0x8BBF ; # &CDP-8BBF;
+        isd:filling  a.ucs:0x4E28   # 丨
+    ] ;
+    :subsume
+        g2.ucs-var-002:0x4E0E ;
+    .
+    g2.ucs-var-002:0x4E0E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-var-002:0x4E0E ;
+        .
+
+rep.big5-cdp:0x8BC2
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x8BC2 ;
+    :denotation-of
+        a.big5-cdp:0x8BC2    ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿹ ;
+        isd:surround rep.big5-cdp:0x8BBF ; # &CDP-8BBF;
+        isd:filling  a.ucs:0x4E3F   # 丿
+    ] ;
+    :subsume
+        g2.big5-cdp:0x8BC2   ;
+    .
+    g2.big5-cdp:0x8BC2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8BC2 ;
+        .
+
 a.ucs_component:0x4E0F
     a chisegg:abstract-character ;
     :abstract-character-of [ :context domain:component ;
@@ -3393,10 +3361,10 @@ a.ucs_component:0x4E0F
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
-    :eq a.iwds-1:0x146            ; # &IWDS1-326;
+    :eq a.iwds-1:0326             ; # &A-compU+4E0F;
     .
-    a.iwds-1:0x146
-           :abstract-character-of         iwds-1:0x146   .
+    a.iwds-1:0326
+           :abstract-character-of         iwds-1:0326    .
 
 a.ucs:0x4E0F
     a chisegg:abstract-character ;
@@ -3421,9 +3389,9 @@ a.ucs:0x4E0F
     :eq rep.gt:00037              ; # &I-GT-00037;
     :eq rep.gt-pj-2:12333         ; # &I-GT-00037;
     :eq rep.daikanwa:00021        ; # &I-M-00021;
-    :eq rep.shinjigen:00019       ; # 丏
+    :eq rep.shinjigen:0019        ; # 丏
     :eq rep.jef-china3:0x97C5     ; # &I-JC3-97C5;
-    :to.mistakable       [ :sources chisebib:zihui-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4E10         ] ;
     :subsume
@@ -3445,8 +3413,8 @@ a.ucs:0x4E0F
                :abstract-glyph-of        gt-pj-2:12333   .
     rep.daikanwa:00021
                :abstract-glyph-of       daikanwa:00021   .
-    rep.shinjigen:00019
-               :abstract-glyph-of      shinjigen:00019   .
+    rep.shinjigen:0019
+               :abstract-glyph-of      shinjigen:0019    .
     rep.jef-china3:0x97C5
                :abstract-glyph-of     jef-china3:0x97C5  .
     g2.ucs_unicode:0x4E0F
@@ -3459,7 +3427,7 @@ a.ucs:0x4E0F
         :eq g2.jis-x0213-2:0x2123     ; # &g2-AJ1-17235;
         :eq g2.gt:00037               ; # &g2-AJ1-17235;
         :eq g2.daikanwa:00021         ; # &g2-AJ1-17235;
-        :eq g2.shinjigen:00019        ; # &g2-AJ1-17235;
+        :eq g2.shinjigen:0019         ; # &g2-AJ1-17235;
         :eq g2.jef-china3:0x97C5      ; # &g2-AJ1-17235;
         :subsume
             repi.daikanwa:00021  ,
@@ -3482,8 +3450,8 @@ a.ucs:0x4E0F
               :abstract-glyph-form-of             gt:00037   .
         g2.daikanwa:00021
               :abstract-glyph-form-of       daikanwa:00021   .
-        g2.shinjigen:00019
-              :abstract-glyph-form-of      shinjigen:00019   .
+        g2.shinjigen:0019
+              :abstract-glyph-form-of      shinjigen:0019    .
         g2.jef-china3:0x97C5
               :abstract-glyph-form-of     jef-china3:0x97C5  .
         repi.daikanwa:00021
@@ -3544,7 +3512,14 @@ a.ucs:0x4E10
     :eq rep.gt-k:00507            ; # &I-GT-K00507;
     :eq rep.gt-pj-1:20514         ; # &I-GT-00027;
     :eq rep.daikanwa:00022        ; # &I-M-00022;
-    :eq rep.shinjigen:00015       ; # 丐
+    :eq rep.shinjigen:0015        ; # 丐
+    :form-of             rep.ucs_iso:0x208CF  ;
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-5:19201 ] ;
+    ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x4E0F         ] ;
     :subsume
         g2.ucs_unicode:0x4E10 ;
     .
@@ -3568,8 +3543,8 @@ a.ucs:0x4E10
                :abstract-glyph-of        gt-pj-1:20514   .
     rep.daikanwa:00022
                :abstract-glyph-of       daikanwa:00022   .
-    rep.shinjigen:00015
-               :abstract-glyph-of      shinjigen:00015   .
+    rep.shinjigen:0015
+               :abstract-glyph-of      shinjigen:0015    .
     g2.ucs_unicode:0x4E10
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -3582,7 +3557,7 @@ a.ucs:0x4E10
         :eq g2.gt:00027               ; # &g2-AJ1-04091;
         :eq g2.gt-k:00507             ; # &g2-AJ1-04091;
         :eq g2.daikanwa:00022         ; # &g2-AJ1-04091;
-        :eq g2.shinjigen:00015        ; # &g2-AJ1-04091;
+        :eq g2.shinjigen:0015         ; # &g2-AJ1-04091;
         :subsume
             repi.daikanwa:00022  ,
             repi.jis-x0208:0x5022 ,
@@ -3607,8 +3582,8 @@ a.ucs:0x4E10
               :abstract-glyph-form-of           gt-k:00507   .
         g2.daikanwa:00022
               :abstract-glyph-form-of       daikanwa:00022   .
-        g2.shinjigen:00015
-              :abstract-glyph-form-of      shinjigen:00015   .
+        g2.shinjigen:0015
+              :abstract-glyph-form-of      shinjigen:0015    .
         repi.daikanwa:00022
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00022 ;
@@ -3684,7 +3659,7 @@ rep.mj:006315
     :eq rep.gt-k:00398            ; # &I-GT-K00398;
     :eq rep.gt-pj-1:12591         ; # &I-GT-00033;
     :eq rep.daikanwa:00023        ; # &I-M-00023;
-    :eq rep.shinjigen:00016       ; # &MJ006315;
+    :eq rep.shinjigen:0016        ; # &MJ006315;
     :subsume
         g2.mj:006315         ;
     .
@@ -3717,8 +3692,8 @@ rep.mj:006315
                :abstract-glyph-of        gt-pj-1:12591   .
     rep.daikanwa:00023
                :abstract-glyph-of       daikanwa:00023   .
-    rep.shinjigen:00016
-               :abstract-glyph-of      shinjigen:00016   .
+    rep.shinjigen:0016
+               :abstract-glyph-of      shinjigen:0016    .
     g2.mj:006315
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006315 ;
@@ -3740,7 +3715,7 @@ rep.mj:006315
         :eq g2.gt:00033               ; # &g2-MJ006315;
         :eq g2.gt-k:00398             ; # &g2-MJ006315;
         :eq g2.daikanwa:00023         ; # &g2-MJ006315;
-        :eq g2.shinjigen:00016        ; # &g2-MJ006315;
+        :eq g2.shinjigen:0016         ; # &g2-MJ006315;
         :subsume
             repi.daikanwa:00023  ,
             repi.ks-x1001:0x7564 ,
@@ -3748,7 +3723,7 @@ rep.mj:006315
             repi.cns11643-1:0x4460 ,
             repi.jis-x0208:0x312F ,
             repi.adobe-japan1-6:01233 ,
-            repi.mj-0:006315     ;
+            repi.mj:006315       ;
         .
         g2.ucs_cns:0x4E11
               :abstract-glyph-form-of [ :context domain:cns     ;
@@ -3777,21 +3752,20 @@ rep.mj:006315
               :abstract-glyph-form-of           gt-k:00398   .
         g2.daikanwa:00023
               :abstract-glyph-form-of       daikanwa:00023   .
-        g2.shinjigen:00016
-              :abstract-glyph-form-of      shinjigen:00016   .
+        g2.shinjigen:0016
+              :abstract-glyph-form-of      shinjigen:0016    .
         repi.daikanwa:00023
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00023 ;
-            :from.HNG            a.ucs:0x4E11         ;
             .
-        repi.ucs_ks:0x4E11
+        repi.ks-x1001:0x7564
             a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:ks      ;
-                              :target     ucs:0x4E11  ] ;
-            :eq repi.ks-x1001:0x7564      ; # &R-K0-7564;
+            :glyph-image-of ks-x1001:0x7564 ;
+            :eq repi.ucs_ks:0x4E11        ; # &R-K0-7564;
             .
-            repi.ks-x1001:0x7564
-                          :glyph-image-of       ks-x1001:0x7564  .
+            repi.ucs_ks:0x4E11
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x4E11  ] .
         repi.gt:00033
             a chisegg:glyph-image ;
             :glyph-image-of gt:00033 ;
@@ -3819,21 +3793,15 @@ rep.mj:006315
             :glyph-image-of mj:006315 ;
             .
 
-rep.mj:006318
+rep.ucs-var-002:0x4E11
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:006318 ;
+    :abstract-glyph-of ucs-var-002:0x4E11 ;
     :denotation-of
         a.ucs:0x4E11         ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
-    :rep.decomposition   [ :context domain:hanyo-denshi ;
-                           :target  a.ucs:0x4E11         ,
-                                    a.ucs:0xE0102        ] ;
-    :eq rep.hanyo-denshi...jt:0xAD08 ; # &I-HD-JT-AD08;
     .
-    rep.hanyo-denshi...jt:0xAD08
-               :abstract-glyph-of hanyo-denshi...jt:0xAD08  .
 
 rep.gt:00035
     a chisegg:abstract-glyph ;
@@ -3848,10 +3816,10 @@ rep.gt:00035
     :eq rep.gb2312:0x3373         ; # &GT-00035;
     :eq rep.big5-cdp:0x89D2       ; # &I-CDP-89D2;
     :eq rep.gt-pj-9:19235         ; # &I-GT-00035;
-    :eq rep.shinjigen:00017       ; # &GT-00035;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x919C ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    :eq rep.shinjigen:0017        ; # &GT-00035;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x919C ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:006315        ] ;
     .
     rep.ucs_unicode:0x4E11
@@ -3863,8 +3831,44 @@ rep.gt:00035
                :abstract-glyph-of       big5-cdp:0x89D2  .
     rep.gt-pj-9:19235
                :abstract-glyph-of        gt-pj-9:19235   .
-    rep.shinjigen:00017
-               :abstract-glyph-of      shinjigen:00017   .
+    rep.shinjigen:0017
+               :abstract-glyph-of      shinjigen:0017    .
+
+rep.mj:006318
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:006318 ;
+    :denotation-of
+        a.ucs:0x4E11         ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    :eq rep.hanyo-denshi...jt:0xAD08 ; # &I-HD-JT-AD08;
+    :subsume
+        g2.mj:006318         ;
+    .
+    rep.hanyo-denshi...jt:0xAD08
+               :abstract-glyph-of hanyo-denshi...jt:0xAD08  .
+    g2.mj:006318
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:006318 ;
+        :rep.decomposition   [ :context domain:hanyo-denshi ;
+                               :target  a.ucs:0x4E11         ,
+                                        a.ucs:0xE0102        ] ;
+        :eq g2.hanyo-denshi...jt:0xAD08 ; # &g2-MJ006318;
+        :subsume
+            repi.hanyo-denshi...jt:0xAD08 ,
+            repi.mj:006318       ;
+        .
+        g2.hanyo-denshi...jt:0xAD08
+              :abstract-glyph-form-of hanyo-denshi...jt:0xAD08  .
+        repi.hanyo-denshi...jt:0xAD08
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...jt:0xAD08 ;
+            .
+        repi.mj:006318
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:006318 ;
+            .
 
 a.ucs:0x20007
     a chisegg:abstract-character ;
@@ -3873,15 +3877,6 @@ a.ucs:0x20007
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
     ideo:hanyu-dazidian  ( 1 11 4 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿻ ;
-                :underlying rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
-                :overlaying a.ucs:0x4E00   # 一
-            ]
-        ] ;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
     :eq rep.cns11643-6:0x2142     ; # &I-C6-2142;
     :eq rep.big5-cdp:0x8862       ; # &I-CDP-8862;
     :eq rep.gt:00030              ; # &I-GT-00030;
@@ -3930,7 +3925,7 @@ a.ucs:0x2000B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2000B ;
     :denotation-of
-        a.ucs_component:0x4E08 ;
+        a.ucs_iwds-1:0x4E08  ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
@@ -3943,9 +3938,9 @@ a.ucs:0x2000B
     :eq rep.cns11643-3:0x2144     ; # &I-C3-2144;
     :eq rep.jis-x0213-1:0x2E22    ; # &I-JX1-2E22;
     :eq rep.daikanwa:00026        ; # &I-M-00026;
-    :eq rep.shinjigen:00011       ; # 𠀋
+    :eq rep.shinjigen:0011        ; # 𠀋
     :eq rep.hanziku-1:0xA6AC      ; # &I-HZK01-A6AC;
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x4E08         ] ;
     :subsume
@@ -3960,17 +3955,17 @@ a.ucs:0x2000B
                :abstract-glyph-of    jis-x0213-1:0x2E22  .
     rep.daikanwa:00026
                :abstract-glyph-of       daikanwa:00026   .
-    rep.shinjigen:00011
-               :abstract-glyph-of      shinjigen:00011   .
+    rep.shinjigen:0011
+               :abstract-glyph-of      shinjigen:0011    .
     rep.hanziku-1:0xA6AC
                :abstract-glyph-of      hanziku-1:0xA6AC  .
     rep.gt:00031
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00031 ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround rep.gt:00018 ; # &g2-AJ1-13463;
-        isd:filling  a.ucs:0x4E36   # 丶
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround rep.gt:00018 ; # &g2-AJ1-13463;
+            isd:filling  a.ucs:0x4E36   # 丶
+        ] ;
         :eq g2.ucs_jis:0x2000B        ; # &GT-00031;
         :eq g2.jis-x0213-1:0x2E22     ; # &GT-00031;
         :eq rep.gt-pj-2:12336         ; # &GT-00031;
@@ -4007,15 +4002,15 @@ a.ucs:0x2000B
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x2000B        ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround g2.ucs_unicode:0x4E08 ; # &g2-AJ1-02510;
-        isd:filling  a.ucs:0x4E36   # 丶
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround g2.ucs_unicode:0x4E08 ; # &g2-AJ1-02510;
+            isd:filling  a.ucs:0x4E36   # 丶
+        ] ;
         :eq g2.ucs_iso:0x2000B        ; # &g2-AJ1-13839;
         :eq g2.adobe-japan1-4:13839   ; # &g2-AJ1-13839;
         :eq g2.cns11643-3:0x2144      ; # &g2-AJ1-13839;
         :eq rep.gt-pj-9:19236         ; # &g2-AJ1-13839;
-        :eq g2.shinjigen:00011        ; # &g2-AJ1-13839;
+        :eq g2.shinjigen:0011         ; # &g2-AJ1-13839;
         :subsume
             repi.adobe-japan1-6:13839 ,
             repi.ucs_iso:0x2000B ,
@@ -4031,8 +4026,8 @@ a.ucs:0x2000B
               :abstract-glyph-form-of     cns11643-3:0x2144  .
         rep.gt-pj-9:19236
                    :abstract-glyph-of        gt-pj-9:19236   .
-        g2.shinjigen:00011
-              :abstract-glyph-form-of      shinjigen:00011   .
+        g2.shinjigen:0011
+              :abstract-glyph-form-of      shinjigen:0011    .
         repi.adobe-japan1-4:13839
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-4:13839 ;
@@ -4041,17 +4036,14 @@ a.ucs:0x2000B
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:iso     ;
                               :target     ucs:0x2000B ] ;
-            :from.HNG            a.ucs:0x4E14         ;
             .
         repi.cns11643-3:0x2144
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-3:0x2144 ;
-            :from.HNG            a.ucs:0x4E14         ;
             .
         repi.gt:00032
             a chisegg:glyph-image ;
             :glyph-image-of gt:00032 ;
-            :from.HNG            a.ucs:0x4E14         ;
             .
 
 a.ucs:0x20009
@@ -4080,15 +4072,11 @@ a.ucs:0x4E12
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x2F81E ; # 刃
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
     .
 
-rep.adobe-japan1:17236
+rep.adobe-japan1-5:17236
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1:17236 ;
+    :abstract-glyph-of adobe-japan1-5:17236 ;
     :denotation-of
         a.ucs:0x4E12         ;
     ideo:radical           1 ; # ⼀ 
@@ -4096,32 +4084,29 @@ rep.adobe-japan1:17236
     ideo:total-strokes     4 ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿹ ;
-                :surround a.ucs:0x200CC ; # 𠃌
-                :filling  a.ucs:0x3405   # 㐅
+            isd:structure [ a idc:⿹ ;
+                isd:surround a.ucs:0x200CC ; # 𠃌
+                isd:filling  a.ucs:0x3405   # 㐅
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
     ] ;
     :eq rep.ucs_jis:0x4E12        ; # &AJ1-17236;
-    :eq rep.adobe-japan1-5:17236  ; # &AJ1-17236;
     :eq rep.jis-x0212:0x3025      ; # &I-JSP-3025;
     :eq rep.jis-x0213-2:0x2124    ; # &I-JX2-2124;
     :eq rep.gt:00034              ; # &I-GT-00034;
     :eq rep.gt-pj-2:12338         ; # &I-GT-00034;
     :eq rep.daikanwa:00028        ; # &I-M-00028;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  rep.mj:006315        ] ;
     :subsume
         g2.daikanwa:00028    ,
-        repi.gt:00034        ,
-        g2.ucs-bmp-cjk_JP...hanazono:0x4E12 ;
+        g2.gt:00034          ,
+        g2.adobe-japan1-5:17236 ;
     .
     rep.ucs_jis:0x4E12
                :abstract-glyph-of [ :context domain:jis     ;
                                     :target     ucs:0x4E12  ] .
-    rep.adobe-japan1-5:17236
-               :abstract-glyph-of adobe-japan1-5:17236   .
     rep.jis-x0212:0x3025
                :abstract-glyph-of      jis-x0212:0x3025  .
     rep.jis-x0213-2:0x2124
@@ -4135,33 +4120,27 @@ rep.adobe-japan1:17236
     g2.daikanwa:00028
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:00028 ;
-        :from.HNG            a.ucs:0x4E14         ;
         .
-    repi.gt:00034
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00034 ;
-        :eq g2.gt:00034               ; # &g2-GT-00034;
-        :from.HNG            a.ucs:0x4E14         ;
+    g2.gt:00034
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00034 ;
         .
-        g2.gt:00034
-              :abstract-glyph-form-of             gt:00034   .
-    g2.ucs_jis:0x4E12
+    g2.adobe-japan1-5:17236
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:jis     ;
-                                  :target     ucs:0x4E12  ] ;
+        :abstract-glyph-form-of adobe-japan1-5:17236 ;
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4E12         ,
                                         a.ucs:0xE0100        ] ;
-        :eq g2.adobe-japan1-5:17236   ; # &g2-AJ1-17236;
+        :eq g2.ucs_jis:0x4E12         ; # &g2-AJ1-17236;
         :eq g2.jis-x0212:0x3025       ; # &g2-AJ1-17236;
         :eq g2.jis-x0213-2:0x2124     ; # &g2-AJ1-17236;
-        :from.HNG            a.ucs:0x4E14         ;
         :subsume
             repi.jis-x0213-2:0x2124 ,
             repi.adobe-japan1-6:17236 ;
         .
-        g2.adobe-japan1-5:17236
-              :abstract-glyph-form-of adobe-japan1-5:17236   .
+        g2.ucs_jis:0x4E12
+              :abstract-glyph-form-of [ :context domain:jis     ;
+                                        :target     ucs:0x4E12  ] .
         g2.jis-x0212:0x3025
               :abstract-glyph-form-of      jis-x0212:0x3025  .
         g2.jis-x0213-2:0x2124
@@ -4170,7 +4149,6 @@ rep.adobe-japan1:17236
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0212:0x3025 ;
             :eq repi.jis-x0213-2:0x2124   ; # &R-JX2-2124;
-            :from.HNG            a.ucs:0x4E14         ;
             .
             repi.jis-x0213-2:0x2124
                           :glyph-image-of    jis-x0213-2:0x2124  .
@@ -4250,28 +4228,80 @@ a.ucs:0x20503
                            ] ;
     ideo:strokes           [ :context domain:daikanwa ;
                              :target  3 ] ;
+    ideo:radical           [ :context domain:gt      ;
+                             :target            1 ; # ⼀
+                           ] ;
+    ideo:strokes           [ :context domain:gt      ;
+                             :target  4 ] ;
+    ideo:total-strokes     [ :context domain:gt      ;
+                             :target  5 ] ;
     ideo:total-strokes     4 ;
     ideo:hanyu-dazidian  ( 1 241 5 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E37 ; # 丷
-        isd:below    a.ucs:0x4E02   # 丂
-    ] ;
     :eq rep.cns11643-6:0x2141     ; # &I-C6-2141;
+    :eq rep.gt:00043              ; # &I-GT-00043;
+    :eq rep.gt-pj-2:12339         ; # &I-GT-00043;
     :eq rep.daikanwa:48904        ; # &I-M-48904;
-    :eq rep.shinjigen:00492       ; # 𠔃
-    :eq rep.hanziku-1:0xD7D7      ; # &I-HZK01-D7D7;
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    :eq rep.shinjigen:0492        ; # 𠔃
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x516E         ] ;
+    :subsume
+        g2.ucs_iso:0x20503   ;
     .
     rep.cns11643-6:0x2141
                :abstract-glyph-of     cns11643-6:0x2141  .
+    rep.gt:00043
+               :abstract-glyph-of             gt:00043   .
+    rep.gt-pj-2:12339
+               :abstract-glyph-of        gt-pj-2:12339   .
     rep.daikanwa:48904
                :abstract-glyph-of       daikanwa:48904   .
-    rep.shinjigen:00492
-               :abstract-glyph-of      shinjigen:00492   .
-    rep.hanziku-1:0xD7D7
-               :abstract-glyph-of      hanziku-1:0xD7D7  .
+    rep.shinjigen:0492
+               :abstract-glyph-of      shinjigen:0492    .
+    g2.ucs_iso:0x20503
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20503 ] ;
+        :eq g2.cns11643-6:0x2141      ; # &g2-GT-00043;
+        :eq g2.gt:00043               ; # &g2-GT-00043;
+        :eq g2.daikanwa:48904         ; # &g2-GT-00043;
+        :eq g2.shinjigen:0492         ; # &g2-GT-00043;
+        :subsume
+            repi.daikanwa:48904  ,
+            repi.cns11643-6:0x2141 ,
+            repi.gt:00043        ,
+            repi.ucs_iso:0x20503 ,
+            rep.hanziku-1:0xD7D7 ;
+        .
+        g2.cns11643-6:0x2141
+              :abstract-glyph-form-of     cns11643-6:0x2141  .
+        g2.gt:00043
+              :abstract-glyph-form-of             gt:00043   .
+        g2.daikanwa:48904
+              :abstract-glyph-form-of       daikanwa:48904   .
+        g2.shinjigen:0492
+              :abstract-glyph-form-of      shinjigen:0492    .
+        repi.daikanwa:48904
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:48904 ;
+            .
+        repi.cns11643-6:0x2141
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2141 ;
+            .
+        repi.gt:00043
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00043 ;
+            .
+        repi.ucs_iso:0x20503
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20503 ] ;
+            .
+        rep.hanziku-1:0xD7D7
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xD7D7 ;
+            .
 
 a.ucs:0x4E13
     a chisegg:abstract-character ;
@@ -4285,8 +4315,8 @@ a.ucs:0x4E13
     :eq rep.gb2312:0x5728         ; # &I-G0-5728;
     :eq rep.big5-cdp:0x89F9       ; # &I-CDP-89F9;
     :eq rep.jef-china3:0x81D9     ; # &I-JC3-81D9;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1:04642 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04642 ] ;
     .
     rep.gb2312:0x5728
                :abstract-glyph-of         gb2312:0x5728  .
@@ -4310,10 +4340,6 @@ a.ucs:0x5187
                              :target  3 ] ;
     ideo:total-strokes     4 ;
     ideo:hanyu-dazidian  ( 1 96 17 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20087 ; # 𠂇
-        isd:below    a.ucs:0x5182   # 冂
-    ] ;
     :eq a.big5:0xC94E             ; # &I-B-C94E;
     :subsume
         rep.ucs_unicode:0x5187 ,
@@ -4327,10 +4353,10 @@ a.ucs:0x5187
                              :target     ucs:0x5187  ] ;
         ideo:radical          13 ; # ⼌ 
         ideo:strokes           2 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20087 ; # 𠂇
-        isd:below    a.ucs:0x2E86   # ⺆
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20087 ; # 𠂇
+            isd:below    a.ucs:0x2E86   # ⺆
+        ] ;
         :eq rep.iso-ir165:0x7A29      ; # &EGB-7A29;
         .
         rep.iso-ir165:0x7A29
@@ -4340,10 +4366,10 @@ a.ucs:0x5187
         :abstract-glyph-of cns11643-2:0x212E ;
         ideo:radical           1 ; # ⼀ 
         ideo:strokes           3 ;
-    isd:structure [ a idc:⿸ ;
-        isd:surround a.ucs:0x20087 ; # 𠂇
-        isd:filling  rep.big5-cdp:0x8BF2   # &CDP-8BF2;
-    ] ;
+        isd:structure [ a idc:⿸ ;
+            isd:surround a.ucs:0x20087 ; # 𠂇
+            isd:filling  rep.big5-cdp:0x8BF2   # &CDP-8BF2;
+        ] ;
         :eq rep.ucs_cns:0x5187        ; # &C2-212E;
         .
         rep.ucs_cns:0x5187
@@ -4376,6 +4402,51 @@ rep.big5-cdp:0x88C7
                                     a.ucs:0x793A         ] ;
     .
 
+a.ucs:0x2CEB6
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEB6 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4E00 ; # 一
+        isd:below    rep.ucs-itaiji-001:0x5C71   # &U-i001+5C71;
+    ] ;
+    :eq rep.mj:056825             ; # &I-MJ056825;
+    :eq rep.koseki:000390         ; # 𬺶
+    :form-of             [ :sources chisebib:mj ;
+                           :target  a.ucs:0x4E10         ] ;
+    :subsume
+        g2.mj:056825         ;
+    .
+    rep.mj:056825
+               :abstract-glyph-of             mj:056825  .
+    rep.koseki:000390
+               :abstract-glyph-of         koseki:000390  .
+    g2.mj:056825
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056825 ;
+        :eq g2.ucs_iso:0x2CEB6        ; # &g2-MJ056825;
+        :eq g2.koseki:000390          ; # &g2-MJ056825;
+        :subsume
+            repi.mj:056825       ,
+            repi.ucs_iso:0x2CEB6 ;
+        .
+        g2.ucs_iso:0x2CEB6
+              :abstract-glyph-form-of [ :context domain:iso     ;
+                                        :target     ucs:0x2CEB6 ] .
+        g2.koseki:000390
+              :abstract-glyph-form-of         koseki:000390  .
+        repi.mj:056825
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:056825 ;
+            .
+        repi.ucs_iso:0x2CEB6
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2CEB6 ] ;
+            .
+
 rep.ucs-itaiji-001:0x4E11
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-itaiji-001:0x4E11 ;
@@ -4387,12 +4458,31 @@ rep.ucs-itaiji-001:0x4E11
     :from.unknown        a.ucs:0x4E11         ;
     .
 
+rep.ucs-itaiji-002:0x20003
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x20003 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿻ ;
+        isd:underlying rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
+        isd:overlaying a.ucs:0x4E04   # 丄
+    ] ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x4E14         ,
+                                    a.ucs:0x20003        ] ;
+    .
+
 rep.gt:00025
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00025 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿹ ;
+        isd:surround rep.big5-cdp:0x89D9 ; # &CDP-89D9;
+        isd:filling  a.ucs:0x4E00   # 一
+    ] ;
     :eq rep.gt-pj-9:15427         ; # &GT-00025;
     .
     rep.gt-pj-9:15427
@@ -4407,9 +4497,9 @@ rep.gt-k:00615
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E00   # 一
+            isd:structure [ a idc:⿵ ;
+                isd:surround a.ucs:0x5182 ; # 冂
+                isd:filling  a.ucs:0x4E00   # 一
             ]
         ]
     ] ;
@@ -4427,9 +4517,9 @@ rep.gt-k:00616
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E36   # 丶
+            isd:structure [ a idc:⿵ ;
+                isd:surround a.ucs:0x5182 ; # 冂
+                isd:filling  a.ucs:0x4E36   # 丶
             ]
         ]
     ] ;
@@ -4445,10 +4535,10 @@ a.ucs_component:0x4E14
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :eq a.iwds-1:0x72             ; # &IWDS1-114;
+    :eq a.iwds-1:0114             ; # &A-compU+4E14;
     .
-    a.iwds-1:0x72
-           :abstract-character-of         iwds-1:0x72    .
+    a.iwds-1:0114
+           :abstract-character-of         iwds-1:0114    .
 
 a.ucs:0x4E14
     a chisegg:abstract-character ;
@@ -4479,7 +4569,7 @@ a.ucs:0x4E14
     :eq rep.gt-k:00904            ; # &I-GT-K00904;
     :eq rep.gt-pj-1:13166         ; # &I-GT-00045;
     :eq rep.daikanwa:00029        ; # &I-M-00029;
-    :eq rep.shinjigen:00022       ; # 且
+    :eq rep.shinjigen:0022        ; # 且
     :subsume
         g2.ucs_unicode:0x4E14 ,
         repi.hng-kbk:03760   ;
@@ -4506,8 +4596,8 @@ a.ucs:0x4E14
                :abstract-glyph-of        gt-pj-1:13166   .
     rep.daikanwa:00029
                :abstract-glyph-of       daikanwa:00029   .
-    rep.shinjigen:00022
-               :abstract-glyph-of      shinjigen:00022   .
+    rep.shinjigen:0022
+               :abstract-glyph-of      shinjigen:0022    .
     g2.ucs_unicode:0x4E14
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -4524,7 +4614,7 @@ a.ucs:0x4E14
         :eq g2.gt:00045               ; # &g2-AJ1-01484;
         :eq g2.gt-k:00904             ; # &g2-AJ1-01484;
         :eq g2.daikanwa:00029         ; # &g2-AJ1-01484;
-        :eq g2.shinjigen:00022        ; # &g2-AJ1-01484;
+        :eq g2.shinjigen:0022         ; # &g2-AJ1-01484;
         :subsume
             repi.daikanwa:00029  ,
             repi.jis-x0208:0x336E ,
@@ -4558,8 +4648,8 @@ a.ucs:0x4E14
               :abstract-glyph-form-of           gt-k:00904   .
         g2.daikanwa:00029
               :abstract-glyph-form-of       daikanwa:00029   .
-        g2.shinjigen:00022
-              :abstract-glyph-form-of      shinjigen:00022   .
+        g2.shinjigen:0022
+              :abstract-glyph-form-of      shinjigen:0022    .
         repi.daikanwa:00029
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00029 ;
@@ -4602,44 +4692,30 @@ a.ucs:0x4E14
         repi.hng-mam:00010
             a chisegg:glyph-image ;
             :glyph-image-of hng-mam:00010 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-kgk:00010
             a chisegg:glyph-image ;
             :glyph-image-of hng-kgk:00010 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-kak:02610
             a chisegg:glyph-image ;
             :glyph-image-of hng-kak:02610 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-kar:04870
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:04870 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-tsu:04360
             a chisegg:glyph-image ;
             :glyph-image-of hng-tsu:04360 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-nkm:04250
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:04250 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
     repi.hng-kbk:03760
         a chisegg:glyph-image ;
         :glyph-image-of hng-kbk:03760 ;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
         .
 
 a.ucs:0x4E15
@@ -4667,7 +4743,7 @@ a.ucs:0x4E15
     :eq rep.gt-k:01025            ; # &I-GT-K01025;
     :eq rep.gt-pj-1:20515         ; # &I-GT-00050;
     :eq rep.daikanwa:00030        ; # &I-M-00030;
-    :eq rep.shinjigen:00026       ; # 丕
+    :eq rep.shinjigen:0026        ; # 丕
     :subsume
         g2.ucs_unicode:0x4E15 ;
     .
@@ -4693,8 +4769,8 @@ a.ucs:0x4E15
                :abstract-glyph-of        gt-pj-1:20515   .
     rep.daikanwa:00030
                :abstract-glyph-of       daikanwa:00030   .
-    rep.shinjigen:00026
-               :abstract-glyph-of      shinjigen:00026   .
+    rep.shinjigen:0026
+               :abstract-glyph-of      shinjigen:0026    .
     g2.ucs_unicode:0x4E15
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -4708,9 +4784,7 @@ a.ucs:0x4E15
         :eq g2.gt:00050               ; # &g2-AJ1-04092;
         :eq g2.gt-k:01025             ; # &g2-AJ1-04092;
         :eq g2.daikanwa:00030         ; # &g2-AJ1-04092;
-        :eq g2.shinjigen:00026        ; # &g2-AJ1-04092;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
+        :eq g2.shinjigen:0026         ; # &g2-AJ1-04092;
         :subsume
             repi.daikanwa:00030  ,
             repi.jis-x0208:0x5023 ,
@@ -4738,20 +4812,16 @@ a.ucs:0x4E15
               :abstract-glyph-form-of           gt-k:01025   .
         g2.daikanwa:00030
               :abstract-glyph-form-of       daikanwa:00030   .
-        g2.shinjigen:00026
-              :abstract-glyph-form-of      shinjigen:00026   .
+        g2.shinjigen:0026
+              :abstract-glyph-form-of      shinjigen:0026    .
         repi.daikanwa:00030
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00030 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.jis-x0208:0x5023
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x5023 ;
             :eq repi.jis-x0213-1:0x5023   ; # &R-J0-5023;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
             repi.jis-x0213-1:0x5023
                           :glyph-image-of    jis-x0213-1:0x5023  .
@@ -4823,7 +4893,7 @@ a.ucs:0x4E16
     :eq rep.gt-k:00961            ; # &I-GT-K00961;
     :eq rep.gt-pj-1:16420         ; # &I-GT-00046;
     :eq rep.daikanwa:00031        ; # &I-M-00031;
-    :eq rep.shinjigen:00023       ; # 世
+    :eq rep.shinjigen:0023        ; # 世
     :subsume
         g2.ucs_unicode:0x4E16 ,
         repi.hng-jou:01920   ,
@@ -4852,8 +4922,8 @@ a.ucs:0x4E16
                :abstract-glyph-of        gt-pj-1:16420   .
     rep.daikanwa:00031
                :abstract-glyph-of       daikanwa:00031   .
-    rep.shinjigen:00023
-               :abstract-glyph-of      shinjigen:00023   .
+    rep.shinjigen:0023
+               :abstract-glyph-of      shinjigen:0023    .
     g2.ucs_unicode:0x4E16
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -4870,9 +4940,7 @@ a.ucs:0x4E16
         :eq g2.gt:00046               ; # &g2-AJ1-02632;
         :eq g2.gt-k:00961             ; # &g2-AJ1-02632;
         :eq g2.daikanwa:00031         ; # &g2-AJ1-02632;
-        :eq g2.shinjigen:00023        ; # &g2-AJ1-02632;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
+        :eq g2.shinjigen:0023         ; # &g2-AJ1-02632;
         :subsume
             repi.daikanwa:00031  ,
             repi.jis-x0208:0x4024 ,
@@ -4907,41 +4975,31 @@ a.ucs:0x4E16
               :abstract-glyph-form-of           gt-k:00961   .
         g2.daikanwa:00031
               :abstract-glyph-form-of       daikanwa:00031   .
-        g2.shinjigen:00023
-              :abstract-glyph-form-of      shinjigen:00023   .
+        g2.shinjigen:0023
+              :abstract-glyph-form-of      shinjigen:0023    .
         repi.daikanwa:00031
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00031 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.jis-x0208:0x4024
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x4024 ;
             :eq repi.jis-x0213-1:0x4024   ; # &R-J0-4024;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
             repi.jis-x0213-1:0x4024
                           :glyph-image-of    jis-x0213-1:0x4024  .
         repi.adobe-japan1-0:02632
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-0:02632 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.cns11643-1:0x4560
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-1:0x4560 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.gt:00046
             a chisegg:glyph-image ;
             :glyph-image-of gt:00046 ;
             :eq repi.gt-k:00961           ; # &R-GT-00046;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
             repi.gt-k:00961
                           :glyph-image-of           gt-k:00961   .
@@ -4949,8 +5007,6 @@ a.ucs:0x4E16
             a chisegg:glyph-image ;
             :glyph-image-of ks-x1001:0x6126 ;
             :eq repi.ucs_ks:0x4E16        ; # &R-K0-6126;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
             repi.ucs_ks:0x4E16
                           :glyph-image-of [ :context domain:ks      ;
@@ -4983,8 +5039,6 @@ a.ucs:0x4E16
         repi.hng-nkm:10632
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:10632 ;
-            :from.HNG            a.ucs:0x4E16         ,
-                                 a.ucs:0x4E17         ;
             .
         repi.hng-kyo:01970
             a chisegg:glyph-image ;
@@ -4993,20 +5047,14 @@ a.ucs:0x4E16
     repi.hng-jou:01920
         a chisegg:glyph-image ;
         :glyph-image-of hng-jou:01920 ;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
         .
     repi.hng-kbk:03780
         a chisegg:glyph-image ;
         :glyph-image-of hng-kbk:03780 ;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
         .
     repi.hng-wan:01492
         a chisegg:glyph-image ;
         :glyph-image-of hng-wan:01492 ;
-        :from.HNG            a.ucs:0x4E16         ,
-                             a.ucs:0x4E17         ;
         .
 
 a.jis-x0208:0x5242
@@ -5015,17 +5063,17 @@ a.jis-x0208:0x5242
     :denotation-of
         bucs:0x4E16          ;
     ideo:radical           1 ; # ⼀ 
-    :eq a.ucs_component:0x4E17    ; # &J97-5242;
+    :eq a.ucs_iwds-1:0x4E17       ; # &J97-5242;
     :eq a.jis-x0213-1:0x5242      ; # &J97-5242;
-    :eq a.iwds-1:0x90             ; # &J97-5242;
+    :eq a.iwds-1:0144             ; # &J97-5242;
     .
-    a.ucs_component:0x4E17
-           :abstract-character-of [ :context domain:component ;
+    a.ucs_iwds-1:0x4E17
+           :abstract-character-of [ :context domain:iwds-1  ;
                                     :target     ucs:0x4E17  ] .
     a.jis-x0213-1:0x5242
            :abstract-character-of    jis-x0213-1:0x5242  .
-    a.iwds-1:0x90
-           :abstract-character-of         iwds-1:0x90    .
+    a.iwds-1:0144
+           :abstract-character-of         iwds-1:0144    .
 
 a.ucs:0x2000D
     a chisegg:abstract-character ;
@@ -5047,13 +5095,13 @@ a.ucs:0x2000D
     :eq rep.gt-k:00962            ; # &I-GT-K00962;
     :eq rep.gt-pj-2:12340         ; # &I-GT-00047;
     :eq rep.daikanwa:00032        ; # &I-M-00032;
-    :from.ancient        [ :sources chisebib:zhengzitong ;
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ;
                            :target  a.ucs:0x4E16         ] ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4E16         ] ;
     :subsume
-        g2.ucs_unicode:0x2000D ;
+        g2.ucs_iso:0x2000D   ;
     .
     rep.big5-cdp:0x87F1
                :abstract-glyph-of       big5-cdp:0x87F1  .
@@ -5065,11 +5113,10 @@ a.ucs:0x2000D
                :abstract-glyph-of        gt-pj-2:12340   .
     rep.daikanwa:00032
                :abstract-glyph-of       daikanwa:00032   .
-    g2.ucs_unicode:0x2000D
+    g2.ucs_iso:0x2000D
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2000D ] ;
-        :eq g2.ucs_iso:0x2000D        ; # &g2-GT-00047;
         :eq g2.big5-cdp:0x87F1        ; # &g2-GT-00047;
         :eq g2.gt:00047               ; # &g2-GT-00047;
         :eq g2.gt-k:00962             ; # &g2-GT-00047;
@@ -5087,9 +5134,6 @@ a.ucs:0x2000D
             repi.hng-sik:01330   ,
             repi.hng-skk:01410   ;
         .
-        g2.ucs_iso:0x2000D
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x2000D ] .
         g2.big5-cdp:0x87F1
               :abstract-glyph-form-of       big5-cdp:0x87F1  .
         g2.gt:00047
@@ -5129,27 +5173,22 @@ a.ucs:0x2000D
         repi.hng-sok:01221
             a chisegg:glyph-image ;
             :glyph-image-of hng-sok:01221 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.hng-kar:04880
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:04880 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.hng-nkm:10631
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkm:10631 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.hng-sik:01330
             a chisegg:glyph-image ;
             :glyph-image-of hng-sik:01330 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.hng-skk:01410
             a chisegg:glyph-image ;
             :glyph-image-of hng-skk:01410 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
 
 a.ucs:0x4E17
@@ -5171,9 +5210,9 @@ a.ucs:0x4E17
                          ] ;
     .
 
-rep.adobe-japan1:04311
+rep.adobe-japan1-0:04311
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1:04311 ;
+    :abstract-glyph-of adobe-japan1-0:04311 ;
     :denotation-of
         a.ucs:0x4E17         ;
     ideo:radical           1 ; # ⼀ 
@@ -5184,15 +5223,14 @@ rep.adobe-japan1:04311
                                     a.ucs:0xE0100        ] ;
     ideo:hanyu-dazidian  ( 1 14 5 ) ;
     :eq rep.ucs_unicode:0x4E17    ; # &AJ1-04311;
-    :eq rep.adobe-japan1-0:04311  ; # &AJ1-04311;
     :eq rep.jis-x0208:0x5242      ; # &I-J90-5242;
     :eq rep.jis-x0213-1:0x5242    ; # &I-JX1-5242;
     :eq rep.big5-cdp:0x89D8       ; # &I-CDP-89D8;
     :eq rep.gt:00048              ; # &I-GT-00048;
     :eq rep.gt-k:01035            ; # &I-GT-K01035;
     :eq rep.gt-pj-1:21058         ; # &I-GT-00048;
-    :eq rep.shinjigen:00024       ; # &AJ1-04311;
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    :eq rep.shinjigen:0024        ; # &AJ1-04311;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4E16         ] ;
     :subsume
         g2.ucs_unicode:0x4E17 ;
@@ -5200,8 +5238,6 @@ rep.adobe-japan1:04311
     rep.ucs_unicode:0x4E17
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x4E17  ] .
-    rep.adobe-japan1-0:04311
-               :abstract-glyph-of adobe-japan1-0:04311   .
     rep.jis-x0208:0x5242
                :abstract-glyph-of      jis-x0208:0x5242  .
     rep.jis-x0213-1:0x5242
@@ -5214,8 +5250,8 @@ rep.adobe-japan1:04311
                :abstract-glyph-of           gt-k:01035   .
     rep.gt-pj-1:21058
                :abstract-glyph-of        gt-pj-1:21058   .
-    rep.shinjigen:00024
-               :abstract-glyph-of      shinjigen:00024   .
+    rep.shinjigen:0024
+               :abstract-glyph-of      shinjigen:0024    .
     g2.ucs_unicode:0x4E17
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -5229,8 +5265,7 @@ rep.adobe-japan1:04311
         :eq g2.big5-cdp:0x89D8        ; # &g2-AJ1-04311;
         :eq g2.gt:00048               ; # &g2-AJ1-04311;
         :eq g2.gt-k:01035             ; # &g2-AJ1-04311;
-        :eq g2.shinjigen:00024        ; # &g2-AJ1-04311;
-        :from.HNG            a.ucs:0x4E18         ;
+        :eq g2.shinjigen:0024         ; # &g2-AJ1-04311;
         :subsume
             repi.jis-x0208:0x5242 ,
             repi.adobe-japan1-6:04311 ,
@@ -5251,25 +5286,22 @@ rep.adobe-japan1:04311
               :abstract-glyph-form-of             gt:00048   .
         g2.gt-k:01035
               :abstract-glyph-form-of           gt-k:01035   .
-        g2.shinjigen:00024
-              :abstract-glyph-form-of      shinjigen:00024   .
+        g2.shinjigen:0024
+              :abstract-glyph-form-of      shinjigen:0024    .
         repi.jis-x0208:0x5242
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x5242 ;
             :eq repi.jis-x0213-1:0x5242   ; # &R-J0-5242;
-            :from.HNG            a.ucs:0x4E18         ;
             .
             repi.jis-x0213-1:0x5242
                           :glyph-image-of    jis-x0213-1:0x5242  .
         repi.adobe-japan1-0:04311
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-0:04311 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.big5-cdp:0x89D8
             a chisegg:glyph-image ;
             :glyph-image-of big5-cdp:0x89D8 ;
-            :from.HNG            a.ucs:0x4E18         ;
             .
         repi.gt:00048
             a chisegg:glyph-image ;
@@ -5310,14 +5342,14 @@ rep.cns11643-4:0x2155
     rep.ucs_cns:0x4E17
                :abstract-glyph-of [ :context domain:cns     ;
                                     :target     ucs:0x4E17  ] .
-    g2.ucs_cns:0x4E17
+    g2.cns11643-4:0x2155
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:cns     ;
-                                  :target     ucs:0x4E17  ] ;
-        :eq g2.cns11643-4:0x2155      ; # &g2-CU+4E17;
+        :abstract-glyph-form-of cns11643-4:0x2155 ;
+        :eq g2.ucs_cns:0x4E17         ; # &g2-CU+4E17;
         .
-        g2.cns11643-4:0x2155
-              :abstract-glyph-form-of     cns11643-4:0x2155  .
+        g2.ucs_cns:0x4E17
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x4E17  ] .
     repi.hng-tsu:04350
         a chisegg:glyph-image ;
         :glyph-image-of hng-tsu:04350 ;
@@ -5355,7 +5387,7 @@ a.ucs:0x4E18
     :eq rep.gt-k:00909            ; # &I-GT-K00909;
     :eq rep.gt-pj-1:13654         ; # &I-GT-00040;
     :eq rep.daikanwa:00033        ; # &I-M-00033;
-    :eq rep.shinjigen:00020       ; # 丘
+    :eq rep.shinjigen:0020        ; # 丘
     :subsume
         g2.ucs_unicode:0x4E18 ,
         repi.hng-khi:02200   ,
@@ -5384,8 +5416,8 @@ a.ucs:0x4E18
                :abstract-glyph-of        gt-pj-1:13654   .
     rep.daikanwa:00033
                :abstract-glyph-of       daikanwa:00033   .
-    rep.shinjigen:00020
-               :abstract-glyph-of      shinjigen:00020   .
+    rep.shinjigen:0020
+               :abstract-glyph-of      shinjigen:0020    .
     g2.ucs_unicode:0x4E18
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -5402,7 +5434,7 @@ a.ucs:0x4E18
         :eq g2.gt:00040               ; # &g2-AJ1-01648;
         :eq g2.gt-k:00909             ; # &g2-AJ1-01648;
         :eq g2.daikanwa:00033         ; # &g2-AJ1-01648;
-        :eq g2.shinjigen:00020        ; # &g2-AJ1-01648;
+        :eq g2.shinjigen:0020         ; # &g2-AJ1-01648;
         :subsume
             repi.daikanwa:00033  ,
             repi.jis-x0208:0x3556 ,
@@ -5436,8 +5468,8 @@ a.ucs:0x4E18
               :abstract-glyph-form-of           gt-k:00909   .
         g2.daikanwa:00033
               :abstract-glyph-form-of       daikanwa:00033   .
-        g2.shinjigen:00020
-              :abstract-glyph-form-of      shinjigen:00020   .
+        g2.shinjigen:0020
+              :abstract-glyph-form-of      shinjigen:0020    .
         repi.daikanwa:00033
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00033 ;
@@ -5484,7 +5516,6 @@ a.ucs:0x4E18
         repi.hng-kgk:02790
             a chisegg:glyph-image ;
             :glyph-image-of hng-kgk:02790 ;
-            :from.HNG            a.ucs:0x4E19         ;
             .
         repi.hng-khm:01630
             a chisegg:glyph-image ;
@@ -5530,7 +5561,7 @@ a.ucs:0x3400
     :eq rep.gt:00041              ; # &I-GT-00041;
     :eq rep.gt-pj-2:12341         ; # &I-GT-00041;
     :eq rep.daikanwa:00034        ; # &I-M-00034;
-    :eq rep.shinjigen:00021       ; # 㐀
+    :eq rep.shinjigen:0021        ; # 㐀
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4E18         ] ;
     :subsume
@@ -5544,8 +5575,8 @@ a.ucs:0x3400
                :abstract-glyph-of        gt-pj-2:12341   .
     rep.daikanwa:00034
                :abstract-glyph-of       daikanwa:00034   .
-    rep.shinjigen:00021
-               :abstract-glyph-of      shinjigen:00021   .
+    rep.shinjigen:0021
+               :abstract-glyph-of      shinjigen:0021    .
     g2.ucs_unicode:0x3400
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -5553,7 +5584,7 @@ a.ucs:0x3400
         :eq g2.cns11643-6:0x222C      ; # &g2-GT-00041;
         :eq g2.gt:00041               ; # &g2-GT-00041;
         :eq g2.daikanwa:00034         ; # &g2-GT-00041;
-        :eq g2.shinjigen:00021        ; # &g2-GT-00041;
+        :eq g2.shinjigen:0021         ; # &g2-GT-00041;
         :subsume
             repi.daikanwa:00034  ,
             repi.cns11643-6:0x222C ,
@@ -5567,8 +5598,8 @@ a.ucs:0x3400
               :abstract-glyph-form-of             gt:00041   .
         g2.daikanwa:00034
               :abstract-glyph-form-of       daikanwa:00034   .
-        g2.shinjigen:00021
-              :abstract-glyph-form-of      shinjigen:00021   .
+        g2.shinjigen:0021
+              :abstract-glyph-form-of      shinjigen:0021    .
         repi.daikanwa:00034
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00034 ;
@@ -5589,10 +5620,6 @@ a.ucs:0x3400
         rep.hanziku-1:0xA74B
             a chisegg:abstract-glyph ;
             :abstract-glyph-of hanziku-1:0xA74B ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x535D ; # 卝
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
             .
 
 a.ucs:0x4E19
@@ -5639,7 +5666,7 @@ rep.mj:006327
     :eq rep.gt-k:00997            ; # &I-GT-K00997;
     :eq rep.gt-pj-1:19002         ; # &I-GT-00051;
     :eq rep.daikanwa:00035        ; # &I-M-00035;
-    :eq rep.shinjigen:00027       ; # &MJ006327;
+    :eq rep.shinjigen:0027        ; # &MJ006327;
     :subsume
         g2.mj:006327         ,
         rep.jef-china3:0x41A2 ;
@@ -5671,8 +5698,8 @@ rep.mj:006327
                :abstract-glyph-of        gt-pj-1:19002   .
     rep.daikanwa:00035
                :abstract-glyph-of       daikanwa:00035   .
-    rep.shinjigen:00027
-               :abstract-glyph-of      shinjigen:00027   .
+    rep.shinjigen:0027
+               :abstract-glyph-of      shinjigen:0027    .
     g2.mj:006327
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006327 ;
@@ -5682,10 +5709,10 @@ rep.mj:006327
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4E19         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.ucs_unicode:0x5185   # &g2-AJ1-03258;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.ucs_unicode:0x5185   # &g2-AJ1-03258;
+        ] ;
         :eq g2.ucs_unicode:0x4E19     ; # &g2-MJ006327;
         :eq g2.adobe-japan1-0:03594   ; # &g2-MJ006327;
         :eq g2.gb2312:0x317B          ; # &g2-MJ006327;
@@ -5697,12 +5724,12 @@ rep.mj:006327
         :eq g2.gt:00051               ; # &g2-MJ006327;
         :eq repi.gt-k:00997           ; # &g2-MJ006327;
         :eq g2.daikanwa:00035         ; # &g2-MJ006327;
-        :eq g2.shinjigen:00027        ; # &g2-MJ006327;
+        :eq g2.shinjigen:0027         ; # &g2-MJ006327;
         :subsume
             repi.daikanwa:00035  ,
             repi.jis-x0208:0x4A3A ,
             repi.adobe-japan1-6:03594 ,
-            repi.mj-0:006327     ,
+            repi.mj:006327       ,
             repi.ks-x1001:0x5C30 ,
             repi.ucs_unicode:0x4E19 ,
             repi.cns11643-1:0x455F ,
@@ -5732,8 +5759,8 @@ rep.mj:006327
                       :glyph-image-of           gt-k:00997   .
         g2.daikanwa:00035
               :abstract-glyph-form-of       daikanwa:00035   .
-        g2.shinjigen:00027
-              :abstract-glyph-form-of      shinjigen:00027   .
+        g2.shinjigen:0027
+              :abstract-glyph-form-of      shinjigen:0027    .
         repi.daikanwa:00035
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00035 ;
@@ -5742,14 +5769,12 @@ rep.mj:006327
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x4A3A ;
             :eq repi.jis-x0213-1:0x4A3A   ; # &R-J0-4A3A;
-            :from.HNG            a.ucs:0x4E1E         ;
             .
             repi.jis-x0213-1:0x4A3A
                           :glyph-image-of    jis-x0213-1:0x4A3A  .
         repi.adobe-japan1-0:03594
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-0:03594 ;
-            :from.HNG            a.ucs:0x4E1E         ;
             .
         repi.mj:006327
             a chisegg:glyph-image ;
@@ -5783,14 +5808,14 @@ rep.mj:006327
     rep.jef-china3:0x41A2
         a chisegg:abstract-glyph ;
         :abstract-glyph-of jef-china3:0x41A2 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    a.ucs:0x2F814   # 內
-    ] ;
-        :eq rep.shinjigen:00028       ; # &JC3-41A2;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    a.ucs:0x2F814   # 內
+        ] ;
+        :eq rep.shinjigen:0028        ; # &JC3-41A2;
         .
-        rep.shinjigen:00028
-                   :abstract-glyph-of      shinjigen:00028   .
+        rep.shinjigen:0028
+                   :abstract-glyph-of      shinjigen:0028    .
 
 rep.mj:006328
     a chisegg:abstract-glyph ;
@@ -5826,8 +5851,8 @@ rep.mj:006328
         :eq g2.hanyo-denshi...ks:000540 ; # &g2-MJ006328;
         :subsume
             repi.adobe-japan1-6:14009 ,
-            rep.hanyo-denshi...ks...mf:000054 ,
-            repi.mj-0:006328     ;
+            repi.hanyo-denshi...ks:000540 ,
+            repi.mj:006328       ;
         .
         g2.adobe-japan1-4:14009
               :abstract-glyph-form-of adobe-japan1-4:14009   .
@@ -5907,15 +5932,6 @@ a.ucs:0x200E0
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x200E0 ;
     ideo:total-strokes     5 ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying rep.adobe-japan1:15391 ; # &AJ1-15391;
-        isd:overlaying [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E36 ; # 丶
-                :below    a.ucs:0x4E36   # 丶
-            ]
-        ]
-    ] ;
     :subsume
         rep.gt:00049         ,
         rep.ucs_iso:0x200E0  ;
@@ -5947,15 +5963,6 @@ a.ucs:0x200E0
         ideo:strokes           [ :context domain:cns     ;
                                  :target  4 ] ;
         ideo:hanyu-dazidian  ( 1 52 9 ) ;
-    isd:structure [ a idc:⿻ ;
-        isd:underlying rep.gb2312:0x6566 ; # &G0-6566;
-        isd:overlaying [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E36 ; # 丶
-                :below    a.ucs:0x4E36   # 丶
-            ]
-        ]
-    ] ;
         :eq rep.cns11643-6:0x222A     ; # &C6-222A;
         :eq rep.big5-cdp:0x87CF       ; # &I-CDP-87CF;
         .
@@ -6009,8 +6016,8 @@ rep.gb2312:0x5235
     ideo:hanyu-dazidian  ( 1 15 4 ) ;
     :eq rep.ucs_unicode:0x4E1A    ; # &G0-5235;
     :eq rep.big5-cdp:0x8B60       ; # &I-CDP-8B60;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x696D         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x696D         ] ;
     :subsume
         g2.ucs_unicode:0x4E1A ;
     .
@@ -6058,8 +6065,8 @@ a.ucs:0x4E1B
     ] ;
     :eq rep.gb2312:0x3454         ; # &I-G0-3454;
     :eq rep.hanziku-1:0xA7AD      ; # &I-HZK01-A7AD;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x53E2         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x53E2         ] ;
     .
     rep.gb2312:0x3454
                :abstract-glyph-of         gb2312:0x3454  .
@@ -6073,8 +6080,8 @@ a.ucs:0x4E1C
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
     :eq rep.gb2312:0x362B         ; # &I-G0-362B;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x6771         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x6771         ] ;
     .
     rep.gb2312:0x362B
                :abstract-glyph-of         gb2312:0x362B  .
@@ -6098,17 +6105,17 @@ a.ucs:0x4E1D
     ideo:hanyu-dazidian  ( 1 17 8 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x895C ; # &CDP-895C;
-                :right    rep.big5-cdp:0x895C   # &CDP-895C;
+            isd:structure [ a idc:⿰ ;
+                isd:left     rep.big5-cdp:0x895C ; # &CDP-895C;
+                isd:right    rep.big5-cdp:0x895C   # &CDP-895C;
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
     ] ;
     :eq rep.gb2312:0x4B3F         ; # &I-G0-4B3F;
     :eq rep.hanziku-1:0xA7B2      ; # &I-HZK01-A7B2;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x7D72         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x7D72         ] ;
     .
     rep.gb2312:0x4B3F
                :abstract-glyph-of         gb2312:0x4B3F  .
@@ -6133,15 +6140,6 @@ a.ucs:0x2000E
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E09 ; # 三
-        isd:right    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E28 ; # 丨
-                :right    a.ucs:0x4E28   # 丨
-            ]
-        ]
-    ] ;
     .
 
 rep.big5-cdp:0x86B1
@@ -6169,38 +6167,25 @@ rep.ucs_iso:0x2000E
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E09 ; # 三
-        isd:right    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E28 ; # 丨
-                :right    a.ucs:0x4E28   # 丨
-            ]
-        ]
-    ] ;
     :eq a.ucs_iwds-1:0x2000E      ; # &CDP-8BB7;
     :eq rep.big5-cdp:0x8BB7       ; # &CDP-8BB7;
     :subsume
-        g2.ucs_unicode:0x2000E ;
+        g2.ucs_iso:0x2000E   ;
     .
     a.ucs_iwds-1:0x2000E
            :abstract-character-of [ :context domain:iwds-1  ;
                                     :target     ucs:0x2000E ] .
     rep.big5-cdp:0x8BB7
                :abstract-glyph-of       big5-cdp:0x8BB7  .
-    g2.ucs_unicode:0x2000E
+    g2.ucs_iso:0x2000E
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2000E ] ;
-        :eq g2.ucs_iso:0x2000E        ; # &g2-CDP-8BB7;
         :eq g2.big5-cdp:0x8BB7        ; # &g2-CDP-8BB7;
         :subsume
             repi.big5-cdp:0x8BB7 ,
             repi.ucs_iso:0x2000E ;
         .
-        g2.ucs_iso:0x2000E
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x2000E ] .
         g2.big5-cdp:0x8BB7
               :abstract-glyph-form-of       big5-cdp:0x8BB7  .
         repi.big5-cdp:0x8BB7
@@ -6256,36 +6241,145 @@ a.ucs:0x20015
     rep.hanziku-1:0xA7B1
                :abstract-glyph-of      hanziku-1:0xA7B1  .
 
-rep.ucs-itaiji-001:0x4E1A
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of ucs-itaiji-001:0x4E1A ;
+a.ucs:0x20017
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x20017 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :from.unknown        a.ucs:0x4E1A         ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x9FB7 ; # 龷
+        isd:below    a.ucs:0x4E3F   # 丿
+    ] ;
+    :eq rep.big5-cdp:0x8C72       ; # &I-CDP-8C72;
+    :subsume
+        g2.ucs_iso:0x20017   ,
+        g2.big5-cdp:0x8C72   ;
     .
+    rep.big5-cdp:0x8C72
+               :abstract-glyph-of       big5-cdp:0x8C72  .
+    g2.ucs_iso:0x20017
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20017 ] ;
+        .
+    g2.big5-cdp:0x8C72
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8C72 ;
+        .
 
-rep.gt:00039
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:00039 ;
+a.ucs:0x2AB49
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2AB49 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :eq rep.gt-pj-9:16936         ; # &GT-00039;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x6208 ; # 戈
+        isd:below    a.ucs:0x4E00   # 一
+    ] ;
+    :eq rep.gt:00039              ; # &I-GT-00039;
+    :eq rep.gt-pj-9:16936         ; # &I-GT-00039;
+    :subsume
+        g2.ucs_JP...hanazono:0x2AB49 ,
+        g2.gt:00039          ;
     .
+    rep.gt:00039
+               :abstract-glyph-of             gt:00039   .
     rep.gt-pj-9:16936
                :abstract-glyph-of        gt-pj-9:16936   .
+    g2.ucs_JP...hanazono:0x2AB49
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2AB49 ] ;
+        .
+    g2.gt:00039
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00039 ;
+        .
+
+a.ucs:0x2B823
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2B823 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     5 ;
+    :eq rep.big5-cdp:0x89BA       ; # &I-CDP-89BA;
+    :subsume
+        g2.ucs_JP...hanazono:0x2B823 ;
+    .
+    rep.big5-cdp:0x89BA
+               :abstract-glyph-of       big5-cdp:0x89BA  .
+    g2.ucs_JP...hanazono:0x2B823
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2B823 ] ;
+        :eq g2.big5-cdp:0x89BA        ; # &g2-CDP-89BA;
+        :subsume
+            repi.big5-cdp:0x89BA ;
+        .
+        g2.big5-cdp:0x89BA
+              :abstract-glyph-form-of       big5-cdp:0x89BA  .
+        repi.big5-cdp:0x89BA
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x89BA ;
+            .
+
+a.ucs:0x2CEBB
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEBB ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     5 ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "si" ) ;
+                         ] ;
+    :eq rep.mj:056829             ; # &I-MJ056829;
+    :eq rep.big5-cdp:0x88DB       ; # &I-CDP-88DB;
+    :eq rep.koseki:000570         ; # 𬺻
+    :subsume
+        g2.mj:056829         ;
+    .
+    rep.mj:056829
+               :abstract-glyph-of             mj:056829  .
+    rep.big5-cdp:0x88DB
+               :abstract-glyph-of       big5-cdp:0x88DB  .
+    rep.koseki:000570
+               :abstract-glyph-of         koseki:000570  .
+    g2.mj:056829
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056829 ;
+        :eq g2.ucs_JP...hanazono:0x2CEBB ; # &g2-MJ056829;
+        :eq g2.big5-cdp:0x88DB        ; # &g2-MJ056829;
+        :eq g2.koseki:000570          ; # &g2-MJ056829;
+        :subsume
+            repi.mj:056829       ,
+            repi.big5-cdp:0x88DB ;
+        .
+        g2.ucs_JP...hanazono:0x2CEBB
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CEBB ] .
+        g2.big5-cdp:0x88DB
+              :abstract-glyph-form-of       big5-cdp:0x88DB  .
+        g2.koseki:000570
+              :abstract-glyph-form-of         koseki:000570  .
+        repi.mj:056829
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:056829 ;
+            .
+        repi.big5-cdp:0x88DB
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x88DB ;
+            .
 
-rep.gt:00043
+rep.ucs-itaiji-001:0x4E1A
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:00043 ;
+    :abstract-glyph-of ucs-itaiji-001:0x4E1A ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :eq rep.gt-pj-2:12339         ; # &GT-00043;
+    :from.unknown        a.ucs:0x4E1A         ;
     .
-    rep.gt-pj-2:12339
-               :abstract-glyph-of        gt-pj-2:12339   .
 
 rep.gt:00053
     a chisegg:abstract-glyph ;
@@ -6350,7 +6444,7 @@ a.ucs:0x4E1E
     :eq rep.gt-k:01645            ; # &I-GT-K01645;
     :eq rep.gt-pj-1:15975         ; # &I-GT-00059;
     :eq rep.daikanwa:00040        ; # &I-M-00040;
-    :eq rep.shinjigen:00029       ; # 丞
+    :eq rep.shinjigen:0029        ; # 丞
     :subsume
         g2.ucs_unicode:0x4E1E ,
         repi.hng-tsu:04300   ;
@@ -6377,8 +6471,8 @@ a.ucs:0x4E1E
                :abstract-glyph-of        gt-pj-1:15975   .
     rep.daikanwa:00040
                :abstract-glyph-of       daikanwa:00040   .
-    rep.shinjigen:00029
-               :abstract-glyph-of      shinjigen:00029   .
+    rep.shinjigen:0029
+               :abstract-glyph-of      shinjigen:0029    .
     g2.ucs_unicode:0x4E1E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -6395,7 +6489,7 @@ a.ucs:0x4E1E
         :eq g2.gt:00059               ; # &g2-AJ1-02511;
         :eq g2.gt-k:01645             ; # &g2-AJ1-02511;
         :eq g2.daikanwa:00040         ; # &g2-AJ1-02511;
-        :eq g2.shinjigen:00029        ; # &g2-AJ1-02511;
+        :eq g2.shinjigen:0029         ; # &g2-AJ1-02511;
         :subsume
             repi.daikanwa:00040  ,
             repi.jis-x0208:0x3E67 ,
@@ -6424,8 +6518,8 @@ a.ucs:0x4E1E
               :abstract-glyph-form-of           gt-k:01645   .
         g2.daikanwa:00040
               :abstract-glyph-form-of       daikanwa:00040   .
-        g2.shinjigen:00029
-              :abstract-glyph-form-of      shinjigen:00029   .
+        g2.shinjigen:0029
+              :abstract-glyph-form-of      shinjigen:0029    .
         repi.daikanwa:00040
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00040 ;
@@ -6531,10 +6625,6 @@ a.ucs:0x20018
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 1 552 8 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x5140 ; # 兀
-        isd:below    a.ucs:0x5140   # 兀
-    ] ;
     :eq rep.cns11643-6:0x2340     ; # &I-C6-2340;
     :eq rep.gt:00063              ; # &I-GT-00063;
     :eq rep.gt-pj-2:12348         ; # &I-GT-00063;
@@ -6561,15 +6651,15 @@ a.ucs:0x20019
     ideo:hanyu-dazidian  ( 1 18 2 ) ;
     isd:structure [ a idc:⿰ ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x5182   # 冂
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x5182   # 冂
             ]
         ] ;
         isd:right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x5182   # 冂
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x5182   # 冂
             ]
         ]
     ] ;
@@ -6596,10 +6686,6 @@ a.ucs:0x2001A
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20AD4 ; # 𠫔
-        isd:below    rep.big5-cdp:0x8665   # &CDP-8665;
-    ] ;
     :subsume
         rep.ucs_iso:0x2001A  ,
         rep.cns11643-6:0x233F ;
@@ -6609,10 +6695,10 @@ a.ucs:0x2001A
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2001A ] ;
         ideo:hanyu-dazidian  ( 1 19 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20AD4 ; # 𠫔
-        isd:below    rep.big5-cdp:0x8665   # &CDP-8665;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20AD4 ; # 𠫔
+            isd:below    rep.big5-cdp:0x8665   # &CDP-8665;
+        ] ;
         :eq rep.gt:00064              ; # &GT-00064;
         :eq rep.gt-pj-2:12350         ; # &GT-00064;
         :eq rep.daikanwa:00044        ; # &I-M-00044;
@@ -6629,10 +6715,10 @@ a.ucs:0x2001A
     rep.cns11643-6:0x233F
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-6:0x233F ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20AD4 ; # 𠫔
-        isd:below    a.ucs:0x5C0F   # 小
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20AD4 ; # 𠫔
+            isd:below    a.ucs:0x5C0F   # 小
+        ] ;
         :eq rep.ucs_cns:0x2001A       ; # &C6-233F;
         .
         rep.ucs_cns:0x2001A
@@ -6676,10 +6762,10 @@ a.ucs:0x4E20
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E20  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         :eq g2.gt:00058               ; # &g2-GT-00058;
         :eq g2.gt-k:02006             ; # &g2-GT-00058;
         :eq g2.daikanwa:00045         ; # &g2-GT-00058;
@@ -6713,10 +6799,10 @@ a.ucs:0x4E20
     g2.cns11643-3:0x2262
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x2262 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         :eq g2.ucs_cns:0x4E20         ; # &g2-CU+4E20;
         .
         g2.ucs_cns:0x4E20
@@ -6743,9 +6829,9 @@ a.ucs:0x4E21
     :eq rep.gt-k:01705            ; # &I-GT-K01705;
     :eq rep.gt-pj-1:20030         ; # &I-GT-00065;
     :eq rep.daikanwa:00046        ; # &I-M-00046;
-    :eq rep.shinjigen:00483       ; # 両
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1:04215 ] ;
+    :eq rep.shinjigen:0483        ; # 両
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04215 ] ;
     :subsume
         g2.ucs_unicode:0x4E21 ;
     .
@@ -6765,8 +6851,8 @@ a.ucs:0x4E21
                :abstract-glyph-of        gt-pj-1:20030   .
     rep.daikanwa:00046
                :abstract-glyph-of       daikanwa:00046   .
-    rep.shinjigen:00483
-               :abstract-glyph-of      shinjigen:00483   .
+    rep.shinjigen:0483
+               :abstract-glyph-of      shinjigen:0483    .
     g2.ucs_unicode:0x4E21
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -6778,7 +6864,7 @@ a.ucs:0x4E21
         :eq g2.gt:00065               ; # &g2-AJ1-03974;
         :eq g2.gt-k:01705             ; # &g2-AJ1-03974;
         :eq g2.daikanwa:00046         ; # &g2-AJ1-03974;
-        :eq g2.shinjigen:00483        ; # &g2-AJ1-03974;
+        :eq g2.shinjigen:0483         ; # &g2-AJ1-03974;
         :subsume
             repi.daikanwa:00046  ,
             repi.jis-x0208:0x4E3E ,
@@ -6801,8 +6887,8 @@ a.ucs:0x4E21
               :abstract-glyph-form-of           gt-k:01705   .
         g2.daikanwa:00046
               :abstract-glyph-form-of       daikanwa:00046   .
-        g2.shinjigen:00483
-              :abstract-glyph-form-of      shinjigen:00483   .
+        g2.shinjigen:0483
+              :abstract-glyph-form-of      shinjigen:0483    .
         repi.daikanwa:00046
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00046 ;
@@ -6893,10 +6979,6 @@ a.ucs:0x2001B
     ideo:strokes           [ :context domain:daikanwa ;
                              :target  3 ] ;
     ideo:total-strokes     6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    a.ucs:0x215DA   # 𡗚
-    ] ;
     :subsume
         rep.daikanwa:05861   ,
         rep.ucs_iso:0x2001B  ;
@@ -6904,20 +6986,20 @@ a.ucs:0x2001B
     rep.daikanwa:05861
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:05861 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.daikanwa:05847   # &M-05847;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    rep.daikanwa:05847   # &M-05847;
+        ] ;
         .
     rep.ucs_iso:0x2001B
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2001B ] ;
         ideo:hanyu-dazidian  ( 1 17 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.ucs_iso:0x215DA   # &CDP-877C;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    rep.ucs_iso:0x215DA   # &CDP-877C;
+        ] ;
         :eq rep.big5-cdp:0x87EE       ; # &CDP-87EE;
         :eq rep.hanziku-1:0xA7B3      ; # &I-HZK01-A7B3;
         .
@@ -6977,7 +7059,7 @@ a.ucs:0x223AE
     ] ;
     :eq rep.daikanwa:09727        ; # &I-M-09727;
     :eq rep.hanziku-1:0xA7F1      ; # &I-HZK01-A7F1;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0213-1:0x764F ] ;
     .
@@ -6989,80 +7071,60 @@ a.ucs:0x223AE
 a.ucs:0x3402
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3402 ;
+    :denotation-of
+        bucs:0x559C          ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E03 ; # 七
-        isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E03 ; # 七
-                :right    a.ucs:0x4E03   # 七
-            ]
-        ]
-    ] ;
     .
 
-rep.adobe-japan1:13698
+rep.adobe-japan1-4:13698
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1:13698 ;
+    :abstract-glyph-of adobe-japan1-4:13698 ;
     :denotation-of
         a.ucs:0x3402         ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E03 ; # 七
-        isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E03 ; # 七
-                :right    a.ucs:0x4E03   # 七
-            ]
-        ]
-    ] ;
     :eq rep.ucs_unicode:0x3402    ; # &AJ1-13698;
-    :eq rep.adobe-japan1-4:13698  ; # &AJ1-13698;
     :eq rep.jis-x0213-1:0x2E23    ; # &I-JX1-2E23;
-    :eq rep.daikanwa...ho:00001   ; # &AJ1-13698;
+    :eq rep.daikanwa...ho:0001    ; # &AJ1-13698;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:01578 ] ;
     :subsume
-        rep.adobe-japan1:13699 ,
+        rep.adobe-japan1-4:13699 ,
         rep.gt:00056         ;
     .
     rep.ucs_unicode:0x3402
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x3402  ] .
-    rep.adobe-japan1-4:13698
-               :abstract-glyph-of adobe-japan1-4:13698   .
     rep.jis-x0213-1:0x2E23
                :abstract-glyph-of    jis-x0213-1:0x2E23  .
-    rep.daikanwa...ho:00001
-               :abstract-glyph-of  daikanwa...ho:00001   .
-    rep.adobe-japan1:13699
+    rep.daikanwa...ho:0001
+               :abstract-glyph-of  daikanwa...ho:0001    .
+    rep.adobe-japan1-4:13699
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1:13699 ;
+        :abstract-glyph-of adobe-japan1-4:13699 ;
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x3402         ,
                                         a.ucs:0xE0102        ] ;
-        :eq rep.adobe-japan1-4:13699  ; # &AJ1-13699;
         :eq rep.gt:00057              ; # &I-GT-00057;
         :eq rep.gt-pj-11:21102        ; # &I-GT-00057;
-        :eq g2.daikanwa...ho:00001    ; # &AJ1-13699;
+        :eq g2.daikanwa...ho:0001     ; # &AJ1-13699;
         :subsume
-            repi.daikanwa...ho:00001 ,
+            repi.daikanwa...ho:0001 ,
             repi.adobe-japan1-6:13699 ,
             repi.gt:00057        ;
         .
-        rep.adobe-japan1-4:13699
-                   :abstract-glyph-of adobe-japan1-4:13699   .
         rep.gt:00057
                    :abstract-glyph-of             gt:00057   .
         rep.gt-pj-11:21102
                    :abstract-glyph-of       gt-pj-11:21102   .
-        g2.daikanwa...ho:00001
-              :abstract-glyph-form-of  daikanwa...ho:00001   .
-        repi.daikanwa...ho:00001
+        g2.daikanwa...ho:0001
+              :abstract-glyph-form-of  daikanwa...ho:0001    .
+        repi.daikanwa...ho:0001
             a chisegg:glyph-image ;
-            :glyph-image-of daikanwa...ho:00001 ;
+            :glyph-image-of daikanwa...ho:0001 ;
             .
         repi.adobe-japan1-6:13699
             a chisegg:glyph-image ;
@@ -7118,9 +7180,9 @@ rep.adobe-japan1:13698
                               :target     ucs:0x3402  ] ;
             .
 
-rep.adobe-japan1:13697
+rep.adobe-japan1-4:13697
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1:13697 ;
+    :abstract-glyph-of adobe-japan1-4:13697 ;
     :denotation-of
         a.ucs:0x3402         ;
     ideo:radical           [ :context domain:ucs     ;
@@ -7134,13 +7196,16 @@ rep.adobe-japan1:13697
     ideo:strokes           [ :context domain:misc    ;
                              :target  4 ] ;
     ideo:total-strokes     6 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x3402         ,
-                                    a.ucs:0xE0101        ] ;
-    :eq rep.adobe-japan1-4:13697  ; # &AJ1-13697;
+    :subsume
+        g2.adobe-japan1-4:13697 ;
     .
-    rep.adobe-japan1-4:13697
-               :abstract-glyph-of adobe-japan1-4:13697   .
+    g2.adobe-japan1-4:13697
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:13697 ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x3402         ,
+                                        a.ucs:0xE0101        ] ;
+        .
 
 rep.big5-cdp:0x8D6B
     a chisegg:abstract-glyph ;
@@ -7161,11 +7226,6 @@ a.ucs:0x2001C
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 1 17 13 ) ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:middle   rep.big5-cdp:0x89BB ; # &CDP-89BB;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
     :eq rep.big5-cdp:0x87ED       ; # &I-CDP-87ED;
     .
     rep.big5-cdp:0x87ED
@@ -7194,20 +7254,6 @@ a.ucs:0x2001E
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 8 7 3 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x20061   # 𠁡
-            ]
-        ] ;
-        isd:right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x20061   # 𠁡
-            ]
-        ]
-    ] ;
     :eq rep.hanziku-12:0xEB42     ; # &I-HZK12-EB42;
     .
     rep.hanziku-12:0xEB42
@@ -7249,9 +7295,101 @@ a.ucs:0x22330
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 8 7 2 ) ;
     :eq rep.big5-cdp:0x86A3       ; # &I-CDP-86A3;
+    :subsume
+        g2.ucs_iso:0x22330   ;
     .
     rep.big5-cdp:0x86A3
                :abstract-glyph-of       big5-cdp:0x86A3  .
+    g2.ucs_iso:0x22330
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x22330 ] ;
+        :eq g2.big5-cdp:0x86A3        ; # &g2-CDP-86A3;
+        :subsume
+            repi.big5-cdp:0x86A3 ,
+            repi.ucs_iso:0x22330 ;
+        .
+        g2.big5-cdp:0x86A3
+              :abstract-glyph-form-of       big5-cdp:0x86A3  .
+        repi.big5-cdp:0x86A3
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x86A3 ;
+            .
+        repi.ucs_iso:0x22330
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x22330 ] ;
+            .
+
+a.ucs:0x2CEC0
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEC0 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x30B5 ; # サ
+        isd:below    a.ucs:0x30B5   # サ
+    ] ;
+    :sound               [ :context domain:ja...kun ;
+                           :target  ( "bosatu" ) ;
+                         ] ;
+    :eq rep.mj:046311             ; # &I-MJ046311;
+    :eq rep.koseki:000680         ; # 𬻀
+    ideo:same-as         rep.ucs_iso:0x26B20  ;
+    ideo:simplified-form-of [ :context domain:JP...buddhism ;
+                              :target  ideocomb:菩薩          ] ;
+    :subsume
+        g2.mj:046311         ;
+    .
+    rep.mj:046311
+               :abstract-glyph-of             mj:046311  .
+    rep.koseki:000680
+               :abstract-glyph-of         koseki:000680  .
+    g2.mj:046311
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:046311 ;
+        :eq g2.ucs_JP...hanazono:0x2CEC0 ; # &g2-MJ046311;
+        :eq g2.koseki:000680          ; # &g2-MJ046311;
+        .
+        g2.ucs_JP...hanazono:0x2CEC0
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CEC0 ] .
+        g2.koseki:000680
+              :abstract-glyph-form-of         koseki:000680  .
+
+a.ucs:0x2CEC8
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEC8 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp-var-001:0x88B3 ; # &CDP-v001-88B3;
+        isd:below    rep.big5-cdp-var-001:0x88B3   # &CDP-v001-88B3;
+    ] ;
+    :eq rep.mj:057474             ; # &I-MJ057474;
+    :eq rep.koseki:112080         ; # 𬻈
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  a.ucs:0x82BB         ] ;
+    :subsume
+        g2.mj:057474         ;
+    .
+    rep.mj:057474
+               :abstract-glyph-of             mj:057474  .
+    rep.koseki:112080
+               :abstract-glyph-of         koseki:112080  .
+    g2.mj:057474
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057474 ;
+        :eq g2.ucs_JP...hanazono:0x2CEC8 ; # &g2-MJ057474;
+        :eq g2.koseki:112080          ; # &g2-MJ057474;
+        .
+        g2.ucs_JP...hanazono:0x2CEC8
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CEC8 ] .
+        g2.koseki:112080
+              :abstract-glyph-form-of         koseki:112080  .
 
 rep.gt:00054
     a chisegg:abstract-glyph ;
@@ -7306,8 +7444,8 @@ a.ucs:0x20022
     :eq rep.gt-pj-2:12352         ; # &I-GT-00070;
     :eq rep.daikanwa:00047        ; # &I-M-00047;
     :subsume
-        repi.gt:00070        ,
-        g2.ucs_unicode:0x20022 ;
+        g2.gt:00070          ,
+        g2.ucs_iso:0x20022   ;
     .
     rep.cns11643-5:0x232F
                :abstract-glyph-of     cns11643-5:0x232F  .
@@ -7317,22 +7455,19 @@ a.ucs:0x20022
                :abstract-glyph-of        gt-pj-2:12352   .
     rep.daikanwa:00047
                :abstract-glyph-of       daikanwa:00047   .
-    repi.gt:00070
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00070 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.ucs_unicode:0x6B64   # &g2-AJ1-02065;
-    ] ;
-        :eq g2.gt:00070               ; # &g2-GT-00070;
+    g2.gt:00070
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00070 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.ucs_unicode:0x6B64   # &g2-AJ1-02065;
+        ] ;
         :eq g2.daikanwa:00047         ; # &g2-GT-00070;
         :subsume
             repi.daikanwa:00047  ,
             repi.gt:00070        ,
             rep.hanziku-1:0xA7F6 ;
         .
-        g2.gt:00070
-              :abstract-glyph-form-of             gt:00070   .
         g2.daikanwa:00047
               :abstract-glyph-form-of       daikanwa:00047   .
         repi.daikanwa:00047
@@ -7342,34 +7477,24 @@ a.ucs:0x20022
         repi.gt:00070
             a chisegg:glyph-image ;
             :glyph-image-of gt:00070 ;
-            :from.HNG            a.ucs:0x6240         ;
             .
         rep.hanziku-1:0xA7F6
             a chisegg:abstract-glyph ;
             :abstract-glyph-of hanziku-1:0xA7F6 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.adobe-japan1:02065   # &AJ1-02065;
-    ] ;
             .
-    g2.ucs_unicode:0x20022
+    g2.ucs_iso:0x20022
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20022 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.cns11643-1:0x483A   # &g2-CU+6B64;
-    ] ;
-        :eq g2.ucs_iso:0x20022        ; # &g2-IU-00020022;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.cns11643-1:0x483A   # &g2-CU+6B64;
+        ] ;
         :eq g2.cns11643-5:0x232F      ; # &g2-IU-00020022;
-        :from.HNG            a.ucs:0x6240         ;
         :subsume
             repi.cns11643-5:0x232F ,
             repi.ucs_iso:0x20022 ;
         .
-        g2.ucs_iso:0x20022
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20022 ] .
         g2.cns11643-5:0x232F
               :abstract-glyph-form-of     cns11643-5:0x232F  .
         repi.cns11643-5:0x232F
@@ -7396,9 +7521,9 @@ a.ucs:0x4E23
     :eq rep.gt:00076              ; # &I-GT-00076;
     :eq rep.gt-pj-2:12353         ; # &I-GT-00076;
     :eq rep.daikanwa:00048        ; # &I-M-00048;
-    :from.ancient        [ :sources chisebib:daikanwa ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x9149         ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x623C         ] ;
     :subsume
         g2.ucs_unicode:0x4E23 ;
@@ -7562,8 +7687,8 @@ a.ucs:0x4E24
     :eq rep.gt-pj-2:12356         ; # &I-GT-00077;
     :eq rep.daikanwa:00051        ; # &I-M-00051;
     :eq rep.jef-china3:0x41A3     ; # &I-JC3-41A3;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1:04215 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04215 ] ;
     :subsume
         g2.ucs_unicode:0x4E24 ;
     .
@@ -7673,16 +7798,6 @@ a.ucs:0x2B826
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x4E28 ; # 丨
-                :middle   rep.big5-cdp:0x8BEA ; # &CDP-8BEA;
-                :right    a.ucs:0x4E87   # 亇
-            ]
-        ]
-    ] ;
     .
 
 rep.ucs_iso:0x2B826
@@ -7694,26 +7809,16 @@ rep.ucs_iso:0x2B826
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x4E28 ; # 丨
-                :middle   a.ucs:0x5202 ; # 刂
-                :right    rep.ucs_unicode:0x4E87   # &UU+4E87;
-            ]
-        ]
-    ] ;
     :eq a.ucs_iwds-1:0x2B826      ; # &GT-00073;
     :eq rep.gt:00073              ; # &GT-00073;
     :eq rep.gt-pj-2:12357         ; # &GT-00073;
     :eq rep.daikanwa:00052        ; # &I-M-00052;
-    :from.vulgar         [ :sources chisebib:guangyun ,
+    ideo:vulgar-form-of  [ :sources chisebib:guangyun ,
                                     chisebib:daikanwa ;
                            :target  rep.gt:14778         ] ;
     :subsume
-        repi.gt:00073        ,
-        g2.ucs_unicode:0x2B826 ;
+        g2.gt:00073          ,
+        g2.ucs_iso:0x2B826   ;
     .
     a.ucs_iwds-1:0x2B826
            :abstract-character-of [ :context domain:iwds-1  ;
@@ -7724,40 +7829,29 @@ rep.ucs_iso:0x2B826
                :abstract-glyph-of        gt-pj-2:12357   .
     rep.daikanwa:00052
                :abstract-glyph-of       daikanwa:00052   .
-    repi.gt:00073
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00073 ;
-        :eq g2.gt:00073               ; # &g2-GT-00073;
+    g2.gt:00073
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00073 ;
         :eq g2.daikanwa:00052         ; # &g2-GT-00073;
-        :from.HNG            a.ucs:0x7ADD         ,
-                             a.ucs:0x4E26         ;
         :subsume
             repi.daikanwa:00052  ,
             repi.gt:00073        ;
         .
-        g2.gt:00073
-              :abstract-glyph-form-of             gt:00073   .
         g2.daikanwa:00052
               :abstract-glyph-form-of       daikanwa:00052   .
         repi.daikanwa:00052
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00052 ;
-            :from.HNG            a.ucs:0x7ADD         ,
-                                 a.ucs:0x4E26         ;
             .
         repi.gt:00073
             a chisegg:glyph-image ;
             :glyph-image-of gt:00073 ;
             .
-    g2.ucs_unicode:0x2B826
+    g2.ucs_iso:0x2B826
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2B826 ] ;
-        :eq g2.ucs_iso:0x2B826        ; # &g2-IU-0002B826;
         .
-        g2.ucs_iso:0x2B826
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x2B826 ] .
 
 repi.hng-khi:03960
     a chisegg:glyph-image ;
@@ -7793,40 +7887,22 @@ a.ucs:0x20A44
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
-    isd:structure [ a idc:⿸ ;
-        isd:surround a.ucs:0x5382 ; # 厂
-        isd:filling  [
-            :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8BEA ; # &CDP-8BEA;
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x20089 ; # 𠂉
-                        :below    a.ucs:0x4E85   # 亅
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     :eq rep.cns11643-6:0x255E     ; # &I-C6-255E;
-    :from.same           a.ucs:0x2B826        ;
+    ideo:same-as         a.ucs:0x2B826        ;
     :subsume
-        g2.ucs_unicode:0x20A44 ;
+        g2.ucs_iso:0x20A44   ;
     .
     rep.cns11643-6:0x255E
                :abstract-glyph-of     cns11643-6:0x255E  .
-    g2.ucs_unicode:0x20A44
+    g2.ucs_iso:0x20A44
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20A44 ] ;
-        :eq g2.ucs_iso:0x20A44        ; # &g2-IU-00020A44;
         :eq g2.cns11643-6:0x255E      ; # &g2-IU-00020A44;
         :subsume
             repi.cns11643-6:0x255E ,
             repi.ucs_iso:0x20A44 ;
         .
-        g2.ucs_iso:0x20A44
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20A44 ] .
         g2.cns11643-6:0x255E
               :abstract-glyph-form-of     cns11643-6:0x255E  .
         repi.cns11643-6:0x255E
@@ -7853,15 +7929,6 @@ a.ucs:0x20029
     ideo:strokes           [ :context domain:cns     ;
                              :target  6 ] ;
     ideo:total-strokes     7 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5140 ; # 兀
-                :below    a.ucs:0x4E02   # 丂
-            ]
-        ] ;
-        isd:right    a.ucs:0x4E01   # 丁
-    ] ;
     :subsume
         rep.ucs_iso:0x20029  ,
         rep.hanziku-2:0xC1C0 ;
@@ -7870,15 +7937,6 @@ a.ucs:0x20029
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20029 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:04209 ; # &AJ1-04209;
-                :below    rep.adobe-japan1:17234   # &AJ1-17234;
-            ]
-        ] ;
-        isd:right    a.ucs:0x4E01   # 丁
-    ] ;
         :eq rep.cns11643-6:0x2563     ; # &C6-2563;
         :eq rep.daikanwa:00239        ; # &I-M-00239;
         .
@@ -7903,8 +7961,8 @@ a.ucs:0x4E25
     ideo:hanyu-dazidian  ( 1 19 10 ) ;
     :eq rep.gb2312:0x514F         ; # &I-G0-514F;
     :eq rep.big5-cdp:0x8A6C       ; # &I-CDP-8A6C;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x56B4 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x56B4 ] ;
     .
     rep.gb2312:0x514F
                :abstract-glyph-of         gb2312:0x514F  .
@@ -7920,9 +7978,9 @@ a.ucs:0x20024
     ideo:hanyu-dazidian  ( 1 19 11 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x5927 ; # 大
-                :right    a.ucs:0x5927   # 大
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x5927 ; # 大
+                isd:right    a.ucs:0x5927   # 大
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
@@ -7946,21 +8004,18 @@ rep.gt:00074
     ] ;
     :eq rep.gt-pj-9:15169         ; # &GT-00074;
     :subsume
-        repi.gt:00074        ;
+        g2.gt:00074          ;
     .
     rep.gt-pj-9:15169
                :abstract-glyph-of        gt-pj-9:15169   .
-    repi.gt:00074
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00074 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    repi.gt:46803 ; # &g2-AJ1-02658;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
-        :eq g2.gt:00074               ; # &g2-GT-00074;
+    g2.gt:00074
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00074 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.adobe-japan1-0:02658 ; # &g2-AJ1-02658;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
-        g2.gt:00074
-              :abstract-glyph-form-of             gt:00074   .
 
 a.ucs:0x2A7D7
     a chisegg:abstract-character ;
@@ -7988,6 +8043,47 @@ a.ucs:0x2A7D7
     rep.gt-pj-9:16471
                :abstract-glyph-of        gt-pj-9:16471   .
 
+a.ucs:0x2CED1
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CED1 ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            1 ; # ⼀
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  6 ] ;
+    ideo:radical           [ :context domain:mj      ;
+                             :target           58 ; # ⼹
+                           ] ;
+    ideo:strokes           [ :context domain:mj      ;
+                             :target  4 ] ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x206A4 ; # 𠚤
+        isd:below    rep.ucs-var-002:0x4E11   # &U-v002+4E11;
+    ] ;
+    :eq rep.mj:057476             ; # &I-MJ057476;
+    :eq rep.koseki:112110         ; # 𬻑
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  a.ucs:0x82BB         ] ;
+    :subsume
+        g2.mj:057476         ;
+    .
+    rep.mj:057476
+               :abstract-glyph-of             mj:057476  .
+    rep.koseki:112110
+               :abstract-glyph-of         koseki:112110  .
+    g2.mj:057476
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057476 ;
+        :eq g2.ucs_JP...hanazono:0x2CED1 ; # &g2-MJ057476;
+        :eq g2.koseki:112110          ; # &g2-MJ057476;
+        .
+        g2.ucs_JP...hanazono:0x2CED1
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CED1 ] .
+        g2.koseki:112110
+              :abstract-glyph-form-of         koseki:112110  .
+
 rep.gt:00067
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00067 ;
@@ -8051,10 +8147,6 @@ a.ucs:0x4E26
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E26 ;
     ideo:radical           1 ; # ⼀ 
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4491 ; # 䒑
-        isd:below    a.ucs:0x4E1A   # 业
-    ] ;
     .
 
 o.ucs_unicode:0xFA70
@@ -8091,7 +8183,7 @@ o.ucs_unicode:0xFA70
         :eq rep.gt-k:06059            ; # &I-GT-K06059;
         :eq rep.gt-pj-2:12358         ; # &I-GT-00089;
         :eq rep.daikanwa:00053        ; # &I-M-00053;
-        :eq rep.shinjigen:05734       ; # &MJ006340;
+        :eq rep.shinjigen:5734        ; # &MJ006340;
         :form-of             [ :sources chisebib:shinjigen ;
                                :target  rep.mj:006341        ] ;
         :subsume
@@ -8109,8 +8201,8 @@ o.ucs_unicode:0xFA70
                    :abstract-glyph-of        gt-pj-2:12358   .
         rep.daikanwa:00053
                    :abstract-glyph-of       daikanwa:00053   .
-        rep.shinjigen:05734
-                   :abstract-glyph-of      shinjigen:05734   .
+        rep.shinjigen:5734
+                   :abstract-glyph-of      shinjigen:5734    .
         g2.mj:006340
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of mj:006340 ;
@@ -8125,12 +8217,12 @@ o.ucs_unicode:0xFA70
             :eq g2.gt:00089               ; # &g2-MJ006340;
             :eq g2.gt-k:06059             ; # &g2-MJ006340;
             :eq g2.daikanwa:00053         ; # &g2-MJ006340;
-            :eq g2.shinjigen:05734        ; # &g2-MJ006340;
+            :eq g2.shinjigen:5734         ; # &g2-MJ006340;
             :subsume
                 repi.daikanwa:00053  ,
                 repi.adobe-japan1-6:20074 ,
-                rep.hanyo-denshi...ks...mf:000082 ,
-                repi.mj-0:006340     ,
+                repi.hanyo-denshi...ks:000820 ,
+                repi.mj:006340       ,
                 repi.gt:00089        ;
             .
             g2.adobe-japan1-5:20074
@@ -8143,8 +8235,8 @@ o.ucs_unicode:0xFA70
                   :abstract-glyph-form-of           gt-k:06059   .
             g2.daikanwa:00053
                   :abstract-glyph-form-of       daikanwa:00053   .
-            g2.shinjigen:05734
-                  :abstract-glyph-form-of      shinjigen:05734   .
+            g2.shinjigen:5734
+                  :abstract-glyph-form-of      shinjigen:5734    .
             repi.daikanwa:00053
                 a chisegg:glyph-image ;
                 :glyph-image-of daikanwa:00053 ;
@@ -8208,11 +8300,11 @@ rep.mj:006341
     :eq rep.gt-k:03817            ; # &I-GT-K03817;
     :eq rep.gt-pj-1:19010         ; # &I-GT-00084;
     :eq rep.daikanwa:00054        ; # &I-M-00054;
-    :eq rep.shinjigen:05732       ; # &MJ006341;
+    :eq rep.shinjigen:5732        ; # &MJ006341;
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x7ADD         ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x7ADD         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x7ADD         ] ;
     :subsume
         g2.mj:006341         ;
     .
@@ -8241,8 +8333,8 @@ rep.mj:006341
                :abstract-glyph-of        gt-pj-1:19010   .
     rep.daikanwa:00054
                :abstract-glyph-of       daikanwa:00054   .
-    rep.shinjigen:05732
-               :abstract-glyph-of      shinjigen:05732   .
+    rep.shinjigen:5732
+               :abstract-glyph-of      shinjigen:5732    .
     g2.mj:006341
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006341 ;
@@ -8262,12 +8354,12 @@ rep.mj:006341
         :eq g2.gt:00084               ; # &g2-MJ006341;
         :eq g2.gt-k:03817             ; # &g2-MJ006341;
         :eq g2.daikanwa:00054         ; # &g2-MJ006341;
-        :eq g2.shinjigen:05732        ; # &g2-MJ006341;
+        :eq g2.shinjigen:5732         ; # &g2-MJ006341;
         :subsume
             repi.daikanwa:00054  ,
             repi.jis-x0208:0x4A42 ,
             repi.adobe-japan1-6:03602 ,
-            repi.mj-0:006341     ,
+            repi.mj:006341       ,
             repi.cns11643-1:0x4B64 ,
             repi.gt:00084        ,
             repi.ucs_unicode:0x4E26 ,
@@ -8295,8 +8387,8 @@ rep.mj:006341
               :abstract-glyph-form-of           gt-k:03817   .
         g2.daikanwa:00054
               :abstract-glyph-form-of       daikanwa:00054   .
-        g2.shinjigen:05732
-              :abstract-glyph-form-of      shinjigen:05732   .
+        g2.shinjigen:5732
+              :abstract-glyph-form-of      shinjigen:5732    .
         repi.daikanwa:00054
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00054 ;
@@ -8364,20 +8456,6 @@ a.ucs:0x2160B
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           7 ;
     ideo:total-strokes     8 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5927 ; # 大
-                :filling  a.ucs:0x4E00   # 一
-            ]
-        ] ;
-        isd:right    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5927 ; # 大
-                :filling  a.ucs:0x4E00   # 一
-            ]
-        ]
-    ] ;
     :eq rep.cns11643-6:0x2939     ; # &I-C6-2939;
     .
     rep.cns11643-6:0x2939
@@ -8456,9 +8534,9 @@ a.ucs:0x2002E
         isd:above    a.ucs:0x4E00 ; # 一
         isd:middle   a.ucs:0x516B ; # 八
         isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x3405   # 㐅
+            isd:structure [ a idc:⿴ ;
+                isd:surround a.ucs:0x56D7 ; # 囗
+                isd:filling  a.ucs:0x3405   # 㐅
             ]
         ]
     ] ;
@@ -8488,25 +8566,6 @@ a.ucs:0x4E3D
     ideo:radical           [ :context domain:cns     ;
                              :target            1 ; # ⼀
                            ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x4E36   # 丶
-                    ]
-                ] ;
-                :right    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x4E36   # 丶
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     .
 
 a.ucs:0x2F800
@@ -8526,9 +8585,9 @@ a.ucs:0x2F800
     :eq rep.gt:00087              ; # &I-GT-00087;
     :eq rep.gt-pj-2:12363         ; # &I-GT-00087;
     :eq rep.daikanwa:00059        ; # &I-M-00059;
-    :from.ancient        [ :sources chisebib:daikanwa ;
-                           :target  rep.adobe-japan1:04023 ] ;
-    :from.same           rep.gt:00145         ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:04023 ] ;
+    ideo:same-as         rep.gt:00145         ;
     .
     rep.cns11643-6:0x2936
                :abstract-glyph-of     cns11643-6:0x2936  .
@@ -8553,10 +8612,6 @@ a.ucs:0x2233D
     ideo:strokes           [ :context domain:gt      ;
                              :target  7 ] ;
     ideo:total-strokes     8 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x5345 ; # 卅
-        isd:below    a.ucs:0x5345   # 卅
-    ] ;
     :eq rep.cns11643-5:0x262E     ; # &I-C5-262E;
     :eq rep.gt:00083              ; # &I-GT-00083;
     :eq rep.gt-pj-2:12364         ; # &I-GT-00083;
@@ -8584,10 +8639,6 @@ a.ucs:0x2233D
         :abstract-glyph-of daikanwa:09608 ;
         ideo:radical          55 ; # ⼶ 
         ideo:strokes           5 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x5345 ; # 卅
-        isd:below    a.ucs:0x5345   # 卅
-    ] ;
         .
 
 a.ucs:0x20030
@@ -8603,58 +8654,51 @@ a.ucs:0x20030
     ] ;
     :eq rep.gt:00081              ; # &I-GT-00081;
     :eq rep.gt-pj-11:17225        ; # &I-GT-00081;
-    :eq rep.daikanwa...ho:00002   ; # 𠀰
+    :eq rep.daikanwa...ho:0002    ; # 𠀰
     :subsume
-        repi.gt:00081        ,
-        g2.ucs_unicode:0x20030 ;
+        g2.gt:00081          ,
+        g2.ucs_iso:0x20030   ;
     .
     rep.gt:00081
                :abstract-glyph-of             gt:00081   .
     rep.gt-pj-11:17225
                :abstract-glyph-of       gt-pj-11:17225   .
-    rep.daikanwa...ho:00002
-               :abstract-glyph-of  daikanwa...ho:00002   .
-    repi.gt:00081
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00081 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    repi.gt:09425   # &g2-AJ1-02455;
-    ] ;
-        :eq g2.gt:00081               ; # &g2-GT-00081;
-        :eq g2.daikanwa...ho:00002    ; # &g2-GT-00081;
+    rep.daikanwa...ho:0002
+               :abstract-glyph-of  daikanwa...ho:0002    .
+    g2.gt:00081
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00081 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E0D ; # 不
+            isd:below    g2.adobe-japan1-0:02455   # &g2-AJ1-02455;
+        ] ;
+        :eq g2.daikanwa...ho:0002     ; # &g2-GT-00081;
         :subsume
-            repi.daikanwa...ho:00002 ,
+            repi.daikanwa...ho:0002 ,
             repi.gt:00081        ;
         .
-        g2.gt:00081
-              :abstract-glyph-form-of             gt:00081   .
-        g2.daikanwa...ho:00002
-              :abstract-glyph-form-of  daikanwa...ho:00002   .
-        repi.daikanwa...ho:00002
+        g2.daikanwa...ho:0002
+              :abstract-glyph-form-of  daikanwa...ho:0002    .
+        repi.daikanwa...ho:0002
             a chisegg:glyph-image ;
-            :glyph-image-of daikanwa...ho:00002 ;
+            :glyph-image-of daikanwa...ho:0002 ;
             .
         repi.gt:00081
             a chisegg:glyph-image ;
             :glyph-image-of gt:00081 ;
             .
-    g2.ucs_unicode:0x20030
+    g2.ucs_iso:0x20030
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20030 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    g2.ucs_unicode:0x5C11   # &g2-UU+5C11;
-    ] ;
-        :eq g2.ucs_iso:0x20030        ; # &g2-IU-00020030;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E0D ; # 不
+            isd:below    g2.ucs_unicode:0x5C11   # &g2-UU+5C11;
+        ] ;
         :subsume
             repi.ucs_iso:0x20030 ,
             rep.hanziku-1:0xA8F3 ;
         .
-        g2.ucs_iso:0x20030
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20030 ] .
         repi.ucs_iso:0x20030
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:iso     ;
@@ -8663,10 +8707,6 @@ a.ucs:0x20030
         rep.hanziku-1:0xA8F3
             a chisegg:abstract-glyph ;
             :abstract-glyph-of hanziku-1:0xA8F3 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    rep.adobe-japan1:02455   # &AJ1-02455;
-    ] ;
             .
 
 a.ucs:0x4E27
@@ -8684,8 +8724,8 @@ a.ucs:0x4E27
     ] ;
     :eq rep.gb2312:0x4925         ; # &I-G0-4925;
     :eq rep.hanziku-1:0xA8AE      ; # &I-HZK01-A8AE;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x55AA         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x55AA         ] ;
     .
     rep.gb2312:0x4925
                :abstract-glyph-of         gb2312:0x4925  .
@@ -8718,9 +8758,9 @@ rep.gt:00145
     :eq rep.big5-cdp:0x8CB7       ; # &I-CDP-8CB7;
     :eq rep.gt-pj-2:12401         ; # &I-GT-00145;
     :eq rep.daikanwa:00104        ; # &I-M-00104;
-    :from.ancient        [ :sources chisebib:daikanwa ;
-                           :target  rep.adobe-japan1:04023 ] ;
-    :from.same           a.ucs:0x2F800        ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:04023 ] ;
+    ideo:same-as         a.ucs:0x2F800        ;
     .
     rep.ucs_cns:0x4E3D
                :abstract-glyph-of [ :context domain:cns     ;
@@ -8750,6 +8790,54 @@ a.ucs:0x20031
     rep.hanziku-1:0xA94F
                :abstract-glyph-of      hanziku-1:0xA94F  .
 
+a.ucs:0x2CED4
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CED4 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           7 ;
+    ideo:total-strokes     8 ;
+    :subsume
+        g2.ucs_iso:0x2CED4   ;
+    .
+    g2.ucs_iso:0x2CED4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2CED4 ] ;
+        .
+
+a.ucs:0x2CED8
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CED8 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           7 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-var-002:0x4E11 ; # &U-v002+4E11;
+        isd:below    rep.ucs-var-002:0x4E11   # &U-v002+4E11;
+    ] ;
+    :eq rep.mj:057477             ; # &I-MJ057477;
+    :eq rep.koseki:112180         ; # 𬻘
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  a.ucs:0x82BB         ] ;
+    :subsume
+        g2.mj:057477         ;
+    .
+    rep.mj:057477
+               :abstract-glyph-of             mj:057477  .
+    rep.koseki:112180
+               :abstract-glyph-of         koseki:112180  .
+    g2.mj:057477
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057477 ;
+        :eq g2.ucs_JP...hanazono:0x2CED8 ; # &g2-MJ057477;
+        :eq g2.koseki:112180          ; # &g2-MJ057477;
+        .
+        g2.ucs_JP...hanazono:0x2CED8
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CED8 ] .
+        g2.koseki:112180
+              :abstract-glyph-form-of         koseki:112180  .
+
 rep.gt:00078
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00078 ;
@@ -8781,14 +8869,14 @@ a.ucs:0x20038
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x5902   # 夂
+            isd:structure [ a idc:⿰ ;
+                isd:left     [
+                    isd:structure [ a idc:⿵ ;
+                        isd:surround a.ucs:0x5182 ; # 冂
+                        isd:filling  a.ucs:0x5902   # 夂
                     ]
                 ] ;
-                :right    a.ucs:0x4E5E   # 乞
+                isd:right    a.ucs:0x4E5E   # 乞
             ]
         ]
     ] ;
@@ -8800,20 +8888,6 @@ a.ucs:0x20038
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20038 ] ;
         ideo:hanyu-dazidian  ( 1 25 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x5902   # 夂
-                    ]
-                ] ;
-                :right    rep.adobe-japan1:01956   # &AJ1-01956;
-            ]
-        ]
-    ] ;
         :eq rep.gt:00090              ; # &GT-00090;
         :eq rep.gt-pj-2:12365         ; # &GT-00090;
         :eq rep.daikanwa:00061        ; # &I-M-00061;
@@ -8841,62 +8915,51 @@ a.ucs:0x2003C
     ] ;
     :eq rep.gt:00088              ; # &I-GT-00088;
     :eq rep.gt-pj-11:17240        ; # &I-GT-00088;
-    :eq rep.daikanwa...ho:00003   ; # 𠀼
+    :eq rep.daikanwa...ho:0003    ; # 𠀼
     :subsume
-        repi.gt:00088        ,
-        g2.ucs_unicode:0x2003C ;
+        g2.gt:00088          ,
+        g2.ucs_iso:0x2003C   ;
     .
     rep.gt:00088
                :abstract-glyph-of             gt:00088   .
     rep.gt-pj-11:17240
                :abstract-glyph-of       gt-pj-11:17240   .
-    rep.daikanwa...ho:00003
-               :abstract-glyph-of  daikanwa...ho:00003   .
-    repi.gt:00088
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00088 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x268FB ; # 𦣻
-        isd:below    repi.gt:00153   # &g2-AJ1-04098;
-    ] ;
-        :eq g2.gt:00088               ; # &g2-GT-00088;
-        :eq g2.daikanwa...ho:00003    ; # &g2-GT-00088;
+    rep.daikanwa...ho:0003
+               :abstract-glyph-of  daikanwa...ho:0003    .
+    g2.gt:00088
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00088 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x268FB ; # 𦣻
+            isd:below    g2.adobe-japan1-0:04098   # &g2-AJ1-04098;
+        ] ;
+        :eq g2.daikanwa...ho:0003     ; # &g2-GT-00088;
         :subsume
-            repi.daikanwa...ho:00003 ,
+            repi.daikanwa...ho:0003 ,
             repi.gt:00088        ;
         .
-        g2.gt:00088
-              :abstract-glyph-form-of             gt:00088   .
-        g2.daikanwa...ho:00003
-              :abstract-glyph-form-of  daikanwa...ho:00003   .
-        repi.daikanwa...ho:00003
+        g2.daikanwa...ho:0003
+              :abstract-glyph-form-of  daikanwa...ho:0003    .
+        repi.daikanwa...ho:0003
             a chisegg:glyph-image ;
-            :glyph-image-of daikanwa...ho:00003 ;
-            :from.HNG            a.ucs:0x8655         ,
-                                 a.ucs:0x51E6         ;
+            :glyph-image-of daikanwa...ho:0003 ;
             .
         repi.gt:00088
             a chisegg:glyph-image ;
             :glyph-image-of gt:00088 ;
             .
-    g2.ucs_unicode:0x2003C
+    g2.ucs_iso:0x2003C
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2003C ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x268FB ; # 𦣻
-        isd:below    g2.ucs_unicode:0x4E42   # &g2-UU+4E42;
-    ] ;
-        :eq g2.ucs_iso:0x2003C        ; # &g2-IU-0002003C;
-        :from.HNG            a.ucs:0x865B         ,
-                             a.ucs:0x865A         ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x268FB ; # 𦣻
+            isd:below    g2.ucs_unicode:0x4E42   # &g2-UU+4E42;
+        ] ;
         :subsume
             repi.ucs_iso:0x2003C ,
             rep.hanziku-1:0xA958 ;
         .
-        g2.ucs_iso:0x2003C
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x2003C ] .
         repi.ucs_iso:0x2003C
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:iso     ;
@@ -8905,10 +8968,6 @@ a.ucs:0x2003C
         rep.hanziku-1:0xA958
             a chisegg:abstract-glyph ;
             :abstract-glyph-of hanziku-1:0xA958 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x268FB ; # 𦣻
-        isd:below    a.ucs:0x4E42   # 乂
-    ] ;
             .
 
 a.ucs:0x2002F
@@ -8929,10 +8988,6 @@ a.ucs:0x2002F
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2002F ] ;
         ideo:hanyu-dazidian  ( 1 24 3 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    a.ucs:0x56E6   # 囦
-    ] ;
         :eq rep.hanziku-1:0xA8F0      ; # &HZK01-A8F0;
         .
         rep.hanziku-1:0xA8F0
@@ -8978,20 +9033,6 @@ a.ucs:0x2003A
     ideo:strokes           8 ;
     ideo:total-strokes     9 ;
     ideo:hanyu-dazidian  ( 1 26 1 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x4E28 ; # 丨
-                :overlaying [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x2E87 ; # ⺇
-                        :filling  rep.big5-cdp:0x8CF0   # &CDP-8CF0;
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     :eq rep.big5-cdp:0x87E8       ; # &I-CDP-87E8;
     .
     rep.big5-cdp:0x87E8
@@ -9014,7 +9055,7 @@ a.ucs:0x20922
     :eq rep.daikanwa:00062        ; # &I-M-00062;
     :eq rep.hanziku-1:0xDC50      ; # &I-HZK01-DC50;
     :subsume
-        g2.ucs_unicode:0x20922 ,
+        g2.ucs_iso:0x20922   ,
         g2.cns11643-6:0x3524 ;
     .
     rep.cns11643-6:0x3524
@@ -9027,15 +9068,14 @@ a.ucs:0x20922
                :abstract-glyph-of       daikanwa:00062   .
     rep.hanziku-1:0xDC50
                :abstract-glyph-of      hanziku-1:0xDC50  .
-    g2.ucs_unicode:0x20922
+    g2.ucs_iso:0x20922
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20922 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
-        isd:below    a.ucs:0x4E18   # 丘
-    ] ;
-        :eq g2.ucs_iso:0x20922        ; # &g2-GT-00091;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
+            isd:below    a.ucs:0x4E18   # 丘
+        ] ;
         :eq g2.gt:00091               ; # &g2-GT-00091;
         :eq g2.daikanwa:00062         ; # &g2-GT-00091;
         :subsume
@@ -9043,9 +9083,6 @@ a.ucs:0x20922
             repi.ucs_iso:0x20922 ,
             repi.gt:00091        ;
         .
-        g2.ucs_iso:0x20922
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20922 ] .
         g2.gt:00091
               :abstract-glyph-form-of             gt:00091   .
         g2.daikanwa:00062
@@ -9066,10 +9103,10 @@ a.ucs:0x20922
     g2.cns11643-6:0x3524
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x3524 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
-        isd:below    a.ucs:0x4E18   # 丘
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
+            isd:below    a.ucs:0x4E18   # 丘
+        ] ;
         :eq g2.ucs_cns:0x20922        ; # &g2-CU+20922;
         .
         g2.ucs_cns:0x20922
@@ -9082,15 +9119,48 @@ a.ucs:0x2003D
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           9 ;
     ideo:total-strokes    10 ;
-    ideo:hanyu-dazidian  ( 1 26 5 ) ;
     isd:structure [ a idc:⿰ ;
-        isd:left     rep.big5-cdp:0x88E0 ; # &CDP-88E0;
+        isd:left     a.ucs:0x2AA72 ; # 𪩲
         isd:right    a.ucs:0x72AE   # 犮
     ] ;
-    :eq rep.hanziku-1:0xA973      ; # &I-HZK01-A973;
     .
-    rep.hanziku-1:0xA973
-               :abstract-glyph-of      hanziku-1:0xA973  .
+
+rep.ucs_iso:0x2003D
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2003D ] ;
+    :denotation-of
+        a.ucs:0x2003D        ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x2AA72 ; # 𪩲
+        isd:right    rep.big5-cdp:0x8A66   # &CDP-8A66;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2003D   ;
+    .
+    g2.ucs_iso:0x2003D
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2003D ] ;
+        .
+
+rep.hanziku-1:0xA973
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of hanziku-1:0xA973 ;
+    :denotation-of
+        a.ucs:0x2003D        ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    10 ;
+    ideo:hanyu-dazidian  ( 1 26 5 ) ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x2AA72 ; # 𪩲
+        isd:right    rep.adobe-japan1-5:18056   # &AJ1-18056;
+    ] ;
+    .
 
 a.ucs:0x20041
     a chisegg:abstract-character ;
@@ -9115,7 +9185,7 @@ rep.ucs_iso:0x20041
     :eq rep.daikanwa:00063        ; # &I-M-00063;
     :eq rep.cbeta:07403           ; # &I-CB07403;
     :subsume
-        g2.ucs_unicode:0x20041 ;
+        g2.ucs_iso:0x20041   ;
     .
     rep.cns11643-5:0x3072
                :abstract-glyph-of     cns11643-5:0x3072  .
@@ -9129,11 +9199,10 @@ rep.ucs_iso:0x20041
                :abstract-glyph-of       daikanwa:00063   .
     rep.cbeta:07403
                :abstract-glyph-of          cbeta:07403   .
-    g2.ucs_unicode:0x20041
+    g2.ucs_iso:0x20041
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20041 ] ;
-        :eq g2.ucs_iso:0x20041        ; # &g2-GT-00094;
         :eq g2.cns11643-5:0x3072      ; # &g2-GT-00094;
         :eq g2.big5-cdp:0x8DE7        ; # &g2-GT-00094;
         :eq g2.gt:00094               ; # &g2-GT-00094;
@@ -9147,9 +9216,6 @@ rep.ucs_iso:0x20041
             repi.ucs_iso:0x20041 ,
             repi.cbeta:07403     ;
         .
-        g2.ucs_iso:0x20041
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20041 ] .
         g2.cns11643-5:0x3072
               :abstract-glyph-form-of     cns11643-5:0x3072  .
         g2.big5-cdp:0x8DE7
@@ -9207,8 +9273,8 @@ rep.mj:056846
         :abstract-glyph-form-of mj:056846 ;
         :eq g2.hanyo-denshi...ks:001000 ; # &g2-MJ056846;
         :subsume
-            rep.hanyo-denshi...ks...mf:000100 ,
-            repi.mj-0:056846     ;
+            repi.hanyo-denshi...ks:001000 ,
+            repi.mj:056846       ;
         .
         g2.hanyo-denshi...ks:001000
               :abstract-glyph-form-of hanyo-denshi...ks:001000  .
@@ -9261,8 +9327,8 @@ rep.mj:030346
         :abstract-glyph-form-of mj:030346 ;
         :eq g2.hanyo-denshi...ks:001010 ; # &g2-MJ030346;
         :subsume
-            rep.hanyo-denshi...ks...mf:000101 ,
-            repi.mj-0:030346     ;
+            repi.hanyo-denshi...ks:001010 ,
+            repi.mj:030346       ;
         .
         g2.hanyo-denshi...ks:001010
               :abstract-glyph-form-of hanyo-denshi...ks:001010  .
@@ -9297,8 +9363,8 @@ rep.mj:056847
         :abstract-glyph-form-of mj:056847 ;
         :eq g2.hanyo-denshi...ks:001020 ; # &g2-MJ056847;
         :subsume
-            rep.hanyo-denshi...ks...mf:000102 ,
-            repi.mj-0:056847     ;
+            repi.hanyo-denshi...ks:001020 ,
+            repi.mj:056847       ;
         .
         g2.hanyo-denshi...ks:001020
               :abstract-glyph-form-of hanyo-denshi...ks:001020  .
@@ -9350,10 +9416,6 @@ a.ucs:0x20045
     ideo:radical           1 ; # ⼀ 
     ideo:strokes          10 ;
     ideo:total-strokes    11 ;
-    isd:structure [ a idc:⿸ ;
-        isd:surround rep.big5-cdp:0x88BC ; # &CDP-88BC;
-        isd:filling  a.ucs:0x5306   # 匆
-    ] ;
     .
 
 rep.mj:058590
@@ -9389,8 +9451,8 @@ rep.mj:058590
         :eq g2.ucs_iso:0x20045        ; # &g2-MJ058590;
         :eq g2.hanyo-denshi...ks:372080 ; # &g2-MJ058590;
         :subsume
-            rep.hanyo-denshi...ks...mf:037208 ,
-            repi.mj-0:058590     ,
+            repi.hanyo-denshi...ks:372080 ,
+            repi.mj:058590       ,
             repi.ucs_iso:0x20045 ,
             rep.hanziku-12:0xEB45 ;
         .
@@ -9428,6 +9490,35 @@ rep.mj:058590
         :glyph-image-of hng-khi:05530 ;
         .
 
+a.ucs:0x2CEE5
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEE5 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    11 ;
+    :eq rep.mj:057479             ; # &I-MJ057479;
+    :eq rep.koseki:112340         ; # 𬻥
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.mj:011236        ] ;
+    :subsume
+        g2.mj:057479         ;
+    .
+    rep.mj:057479
+               :abstract-glyph-of             mj:057479  .
+    rep.koseki:112340
+               :abstract-glyph-of         koseki:112340  .
+    g2.mj:057479
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057479 ;
+        :eq g2.ucs_JP...hanazono:0x2CEE5 ; # &g2-MJ057479;
+        :eq g2.koseki:112340          ; # &g2-MJ057479;
+        .
+        g2.ucs_JP...hanazono:0x2CEE5
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CEE5 ] .
+        g2.koseki:112340
+              :abstract-glyph-form-of         koseki:112340  .
+
 rep.gt:00092
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00092 ;
@@ -9444,7 +9535,7 @@ rep.gt:00092
                            :target  a.ucs:0x865A         ,
                                     a.ucs:0x865B         ] ;
     :subsume
-        repi.gt:00092        ,
+        g2.gt:00092          ,
         repi.hng-khm:01170   ,
         repi.hng-khi:05540   ;
     .
@@ -9452,14 +9543,11 @@ rep.gt:00092
                :abstract-glyph-of           gt-k:08114   .
     rep.gt-pj-11:18556
                :abstract-glyph-of       gt-pj-11:18556   .
-    repi.gt:00092
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00092 ;
-        :eq g2.gt:00092               ; # &g2-GT-00092;
+    g2.gt:00092
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00092 ;
         :eq g2.gt-k:08114             ; # &g2-GT-00092;
         .
-        g2.gt:00092
-              :abstract-glyph-form-of             gt:00092   .
         g2.gt-k:08114
               :abstract-glyph-form-of           gt-k:08114   .
     repi.hng-khm:01170
@@ -9499,20 +9587,6 @@ a.ucs:0x20048
     ideo:strokes           [ :context domain:daikanwa ;
                              :target  9 ] ;
     ideo:total-strokes    12 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E05 ; # 丅
-        isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x2E87 ; # ⺇
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5E73 ; # 平
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     .
 
 rep.ucs_iso:0x20048
@@ -9537,12 +9611,12 @@ rep.ucs_iso:0x20048
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E05 ; # 丅
         isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x2E87 ; # ⺇
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5E73 ; # 平
-                        :below    a.ucs:0x53E3   # 口
+            isd:structure [ a idc:⿴ ;
+                isd:surround a.ucs:0x2E87 ; # ⺇
+                isd:filling  [
+                    isd:structure [ a idc:⿱ ;
+                        isd:above    a.ucs:0x5E73 ; # 平
+                        isd:below    a.ucs:0x53E3   # 口
                     ]
                 ]
             ]
@@ -9551,29 +9625,25 @@ rep.ucs_iso:0x20048
     :eq rep.daikanwa:04020        ; # &M-04020;
     :form-of             [ :context domain:Zetian  ;
                            :sources chisebib:jiyun ;
-                           :target  rep.adobe-japan1:01797 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+                           :target  rep.adobe-japan1-0:01797 ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
-                           :target  rep.adobe-japan1:01797 ] ;
+                           :target  rep.adobe-japan1-0:01797 ] ;
     :subsume
-        g2.ucs_unicode:0x20048 ;
+        g2.ucs_iso:0x20048   ;
     .
     rep.daikanwa:04020
                :abstract-glyph-of       daikanwa:04020   .
-    g2.ucs_unicode:0x20048
+    g2.ucs_iso:0x20048
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20048 ] ;
-        :eq g2.ucs_iso:0x20048        ; # &g2-M-04020;
         :eq g2.daikanwa:04020         ; # &g2-M-04020;
         :subsume
             repi.daikanwa:04020  ,
             repi.ucs_iso:0x20048 ,
             rep.hanziku-1:0xA979 ;
         .
-        g2.ucs_iso:0x20048
-              :abstract-glyph-form-of [ :context domain:iso     ;
-                                        :target     ucs:0x20048 ] .
         g2.daikanwa:04020
               :abstract-glyph-form-of       daikanwa:04020   .
         repi.daikanwa:04020
@@ -9598,9 +9668,48 @@ a.ucs:0x2004A
     ideo:total-strokes    12 ;
     ideo:hanyu-dazidian  ( 8 7 7 ) ;
     :eq rep.big5-cdp:0x8566       ; # &I-CDP-8566;
+    :subsume
+        g2.ucs_iso:0x2004A   ;
     .
     rep.big5-cdp:0x8566
                :abstract-glyph-of       big5-cdp:0x8566  .
+    g2.ucs_iso:0x2004A
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2004A ] ;
+        :eq g2.big5-cdp:0x8566        ; # &g2-CDP-8566;
+        :subsume
+            repi.big5-cdp:0x8566 ,
+            repi.ucs_iso:0x2004A ;
+        .
+        g2.big5-cdp:0x8566
+              :abstract-glyph-form-of       big5-cdp:0x8566  .
+        repi.big5-cdp:0x8566
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8566 ;
+            .
+        repi.ucs_iso:0x2004A
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2004A ] ;
+            .
+
+a.ucs:0x2CEEB
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CEEB ;
+    :denotation-of
+        bucs:0x58FA          ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    13 ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2CEEB ;
+    .
+    g2.ucs_JP...hanazono:0x2CEEB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2CEEB ] ;
+        .
 
 a.ucs:0x20050
     a chisegg:abstract-character ;
@@ -9608,15 +9717,6 @@ a.ucs:0x20050
     ideo:radical           1 ; # ⼀ 
     ideo:strokes          13 ;
     ideo:total-strokes    14 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20B9B ; # 𠮛
-        isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E9E   # 亞
-            ]
-        ]
-    ] ;
     :subsume
         rep.ucs_iso:0x20050  ,
         rep.gt:00096         ;
@@ -9626,20 +9726,11 @@ a.ucs:0x20050
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20050 ] ;
         ideo:hanyu-dazidian  ( 8 7 8 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x20B9B ; # &C4-2147;
-        isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E9E   # 亞
-            ]
-        ]
-    ] ;
-        :eq rep.daikanwa...ho:00004   ; # &M-H0004;
+        :eq rep.daikanwa...ho:0004    ; # &M-H0004;
         :eq rep.hanziku-12:0xEB47     ; # &M-H0004;
         .
-        rep.daikanwa...ho:00004
-                   :abstract-glyph-of  daikanwa...ho:00004   .
+        rep.daikanwa...ho:0004
+                   :abstract-glyph-of  daikanwa...ho:0004    .
         rep.hanziku-12:0xEB47
                    :abstract-glyph-of     hanziku-12:0xEB47  .
     rep.gt:00096
@@ -9673,20 +9764,6 @@ a.ucs:0x2B743
     ideo:radical           1 ; # ⼀ 
     ideo:strokes          13 ;
     ideo:total-strokes    14 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x2E8C ; # ⺌
-                :overlaying [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x2020C   # 𠈌
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     :form-of             a.ucs:0x723E         ;
     .
 
@@ -9699,7 +9776,7 @@ rep.hanyo-denshi...tk:01056730
     ideo:strokes          13 ;
     ideo:total-strokes    14 ;
     :subsume
-        rep.hanyo-denshi...tk...mf-01:00005673 ;
+        g2.hanyo-denshi...tk:01056730 ;
     .
     g2.hanyo-denshi...tk:01056730
         a chisegg:abstract-glyph-form ;
@@ -9717,20 +9794,6 @@ rep.mj:058020
     ideo:radical           1 ; # ⼀ 
     ideo:strokes          13 ;
     ideo:total-strokes    14 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x2E8C ; # ⺌
-                :overlaying [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x2020C   # 𠈌
-                    ]
-                ]
-            ]
-        ]
-    ] ;
     :eq rep.ucs_iso:0x2B743       ; # &MJ058020;
     :eq rep.hanyo-denshi...jt:0xADA4 ; # &I-HD-JT-ADA4;
     :eq rep.koseki:222440         ; # &MJ058020;
@@ -9754,7 +9817,7 @@ rep.mj:058020
         :eq g2.koseki:222440          ; # &g2-MJ058020;
         :subsume
             repi.hanyo-denshi...jt:0xADA4 ,
-            repi.mj-0:058020     ,
+            repi.mj:058020       ,
             repi.ucs_iso:0x2B743 ;
         .
         g2.ucs_iso:0x2B743
@@ -9842,10 +9905,6 @@ a.ucs:0x24CCF
                              :target  15 ] ;
     ideo:total-strokes    16 ;
     ideo:hanyu-dazidian  ( 4 2552 4 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x757E ; # 畾
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
     :eq rep.cns11643-7:0x2C3B     ; # &I-C7-2C3B;
     :eq rep.gt:00098              ; # &I-GT-00098;
     :eq rep.gt-pj-2:12369         ; # &I-GT-00098;
@@ -9878,20 +9937,6 @@ a.ucs:0x20057
                              :target  13 ] ;
     ideo:total-strokes    16 ;
     ideo:hanyu-dazidian  ( 1 27 3 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x5341 ; # 十
-                :overlaying [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x767E ; # 百
-                        :right    a.ucs:0x767E   # 百
-                    ]
-                ]
-            ]
-        ] ;
-        isd:below    a.ucs:0x5927   # 大
-    ] ;
     :eq rep.cns11643-4:0x4F7C     ; # &I-C4-4F7C;
     :eq rep.big5-cdp:0x85A3       ; # &I-CDP-85A3;
     :eq rep.daikanwa:49012        ; # &I-M-49012;
@@ -9922,10 +9967,6 @@ a.ucs:0x2005C
     ideo:strokes          15 ;
     ideo:total-strokes    16 ;
     ideo:hanyu-dazidian  ( 8 9 19 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x4E26 ; # 並
-        isd:right    a.ucs:0x52C7   # 勇
-    ] ;
     :eq rep.hanziku-12:0xEBA2     ; # &I-HZK12-EBA2;
     .
     rep.hanziku-12:0xEBA2
@@ -9938,10 +9979,6 @@ a.ucs:0x21B4B
     ideo:strokes          15 ;
     ideo:total-strokes    16 ;
     ideo:hanyu-dazidian  ( 1 513 2 ) ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x3401 ; # 㐁
-        isd:right    a.ucs:0x8FB1   # 辱
-    ] ;
     :eq rep.cns11643-5:0x5352     ; # &I-C5-5352;
     :eq rep.hanziku-2:0xB9A5      ; # &I-HZK02-B9A5;
     .
@@ -9957,10 +9994,6 @@ a.ucs:0x2005E
     ideo:strokes          16 ;
     ideo:total-strokes    17 ;
     ideo:hanyu-dazidian  ( 2 1538 2 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    a.ucs:0x6703   # 會
-    ] ;
     :eq rep.hanziku-4:0xE6CA      ; # &I-HZK04-E6CA;
     .
     rep.hanziku-4:0xE6CA
@@ -9975,15 +10008,15 @@ rep.gt:00099
     ideo:total-strokes    20 ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ] ;
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ]
     ] ;
@@ -10006,15 +10039,15 @@ a.ucs:0x20060
     ideo:hanyu-dazidian  ( 1 28 1 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ] ;
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ]
     ] ;
@@ -10039,8 +10072,8 @@ a.ucs_component:0x4E0C
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E0C  ] ;
     ideo:radical           1 ; # ⼀ 
-    :eq a.iwds-1:0xDD             ; # &IWDS1-221;
+    :eq a.iwds-1:0221             ; # &A-compU+4E0C;
     .
-    a.iwds-1:0xDD
-           :abstract-character-of         iwds-1:0xDD    .
+    a.iwds-1:0221
+           :abstract-character-of         iwds-1:0221    .