Sync up with the current environment.
[chise/chiset.git] / Ideograph-R001-One.ttl
index 84673f2..eb1378f 100644 (file)
@@ -7,6 +7,7 @@
 @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/> .
@@ -14,6 +15,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix 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=> .
@@ -26,6 +28,7 @@
 @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=> .
@@ -95,6 +98,7 @@
 @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.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
+@prefix g2.gt-pj-k2: <http://www.chise.org/est/view/character/g2.gt-pj-k2=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...ho: <http://www.chise.org/est/view/character/rep.daikanwa...ho=> .
 @prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
+@prefix rep.big5-cdp-var-001: <http://www.chise.org/est/view/character/rep.big5-cdp-var-001=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
+@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.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 ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix hng-kyo: <http://rdf.chise.org/data/ccs/hng-kyo/code-point/> .
 @prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
+@prefix big5-cdp-var-001: <http://rdf.chise.org/data/ccs/big5-cdp-var-001/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/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 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/> .
 
 bucs:0x4E00
@@ -635,25 +650,40 @@ a.ucs:0x4E01
             :glyph-image-of hng-nkm:04200 ;
             .
 
-a.ucs:0x4E02
+a.ucs_component:0x4E02
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x4E02 ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x4E02  ] ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :to.Bopomofo         a.ucs:0x310E         ;
     .
 
-rep.adobe-japan1-5:17234
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1-5:17234 ;
+a.ucs_cognate:0x4E02
+    a chisegg:abstract-character ;
+    :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 ;
+    .
+
+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;
+    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;
@@ -662,12 +692,12 @@ rep.adobe-japan1-5: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
                :abstract-glyph-of      jis-x0212:0x3021  .
     rep.cns11643-4:0x2126
@@ -763,12 +793,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-5:17234 ] ;
+                           :target  a.ucs:0x4E02         ] ;
     :subsume
         g2.big5-cdp:0x8BBF   ,
         rep.gt-k:00125       ;
@@ -781,9 +811,18 @@ 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:0x20000
     a chisegg:abstract-character ;
@@ -860,7 +899,19 @@ a.ucs_component:0x4E03
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0141             ; # &IWDS1-141;
+    .
+
+a.ucs_iwds-1:0x4E03
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x4E03  ] ;
+    :from.denotational_component
+        a.ucs_component:0x4E03 ,
+        a.ucs_component:0x5341 ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    :eq a.iwds-1:0141             ; # &A-IWDSU+4E03;
     .
     a.iwds-1:0141
            :abstract-character-of         iwds-1:0141    .
@@ -869,7 +920,7 @@ a.ucs:0x4E03
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E03 ;
     :from.denotational_component
-        a.ucs_component:0x4E03 ;
+        a.ucs_iwds-1:0x4E03  ;
     :decimal-digit-value   7 ;
     :digit-value          7 ;
     :numeric-value        7 ;
@@ -1146,22 +1197,129 @@ a.ucs:0x4E05
     rep.daikanwa:00008
                :abstract-glyph-of       daikanwa:00008   .
 
-rep.gt:00005
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:00005 ;
+a.ucs_component:0x20001
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x20001 ] ;
+    :from.denotational_component
+        a.ucs_component:0x4E02 ;
+    ideo:radical           1 ; # ⼀ 
+    .
+
+a.ucs:0x20001
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x20001 ;
+    :denotation-of
+        a.ucs_component:0x20001 ;
     :script              ( script:Ideograph ) ;
-    :to.ucs              a.ucs:0x3118 ; # ㄘ
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
+    ideo:hanyu-dazidian  ( 1 4 2 ) ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "situ" ) ;
+                         ] ;
+    :eq rep.mj:030314             ; # &I-MJ030314;
+    :eq rep.big5-cdp:0x88CC       ; # &I-CDP-88CC;
+    :eq rep.koseki:000090         ; # 𠀁
+    :eq rep.gt:00005              ; # &GT-00005;
     :eq rep.gt-pj-2:12326         ; # &GT-00005;
     :eq rep.daikanwa:00009        ; # &I-M-00009;
+    ideo:Small-Seal-of   [ :sources chisebib:zhengzitong ;
+                           :target  a.ucs:0x4E03         ] ;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  a.ucs:0x4E03         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x4E03         ] ;
     :to.Bopomofo         a.ucs:0x3118         ;
+    :subsume
+        g2.mj:030314         ,
+        g2.big5-cdp:0x88CC   ;
     .
+    rep.mj:030314
+               :abstract-glyph-of             mj:030314  .
+    rep.big5-cdp:0x88CC
+               :abstract-glyph-of       big5-cdp:0x88CC  .
+    rep.koseki:000090
+               :abstract-glyph-of         koseki:000090  .
+    rep.gt:00005
+               :abstract-glyph-of             gt:00005   .
     rep.gt-pj-2:12326
                :abstract-glyph-of        gt-pj-2:12326   .
     rep.daikanwa:00009
                :abstract-glyph-of       daikanwa:00009   .
+    g2.mj:030314
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:030314 ;
+        :eq g2.ucs_iso:0x20001        ; # &g2-MJ030314;
+        :eq g2.koseki:000090          ; # &g2-MJ030314;
+        :eq g2.gt:00005               ; # &g2-MJ030314;
+        :eq g2.daikanwa:00009         ; # &g2-MJ030314;
+        :subsume
+            repi.daikanwa:00009  ,
+            repi.mj:030314       ,
+            repi.gt:00005        ,
+            repi.ucs_iso:0x20001 ;
+        .
+        g2.ucs_iso:0x20001
+              :abstract-glyph-form-of [ :context domain:iso     ;
+                                        :target     ucs:0x20001 ] .
+        g2.koseki:000090
+              :abstract-glyph-form-of         koseki:000090  .
+        g2.gt:00005
+              :abstract-glyph-form-of             gt:00005   .
+        g2.daikanwa:00009
+              :abstract-glyph-form-of       daikanwa:00009   .
+        repi.daikanwa:00009
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00009 ;
+            .
+        repi.mj:030314
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:030314 ;
+            .
+        repi.gt:00005
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00005 ;
+            .
+        repi.ucs_iso:0x20001
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20001 ] ;
+            .
+    g2.big5-cdp:0x88CC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x88CC ;
+        .
+
+rep.gt-k:00363
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:00363 ;
+    :denotation-of
+        a.ucs_component:0x20001 ;
+    :from.denotational_component
+        a.ucs:0x4E8F         ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    o.ucs_unicode:0x4EA0 ; # &o-J0-5035;
+        isd:below    rep.big5-cdp:0x88CD   # &CDP-88CD;
+    ] ;
+    :eq rep.gt-pj-k2:13870        ; # &GT-K00363;
+    :subsume
+        g2.gt-k:00363        ;
+    .
+    rep.gt-pj-k2:13870
+               :abstract-glyph-of       gt-pj-k2:13870   .
+    g2.gt-k:00363
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:00363 ;
+        :eq g2.gt-pj-k2:13870         ; # &g2-GT-K00363;
+        .
+        g2.gt-pj-k2:13870
+              :abstract-glyph-form-of       gt-pj-k2:13870   .
 
 a.ucs:0x4E06
     a chisegg:abstract-character ;
@@ -1190,43 +1348,11 @@ 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 ) ;
-    :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:0x20089
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20089 ;
+    :from.denotational_component
+        a.ucs_component:0x20089 ;
     ideo:radical           [ :context domain:ucs     ;
                              :target            4 ; # ⼃
                            ] ;
@@ -1321,14 +1447,25 @@ a.ucs_component:0x4E06
     a chisegg:abstract-character ;
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E06  ] ;
+    :from.denotational_component
+        a.ucs_component:0x20087 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0150             ; # &IWDS1-150;
+    :eq a.iwds-1:0150             ; # &A-compU+4E06;
     .
     a.iwds-1:0150
            :abstract-character-of         iwds-1:0150    .
 
+a.ucs_component:0x20089
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x20089 ] ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    .
+
 rep.ucs-itaiji-001:0x21D6F
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-itaiji-001:0x21D6F ;
@@ -1372,12 +1509,12 @@ a.ucs:0x4E07
     :eq rep.gt-pj-1:19324         ; # &I-GT-00021;
     :eq rep.daikanwa:00010        ; # &I-M-00010;
     :eq rep.shinjigen:0012        ; # 万
-    :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         ] ;
+    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 ;
     .
@@ -1498,17 +1635,22 @@ 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:0248             ; # &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:0248
            :abstract-character-of         iwds-1:0248    .
 
@@ -1516,7 +1658,7 @@ 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 ;
@@ -1976,6 +2118,8 @@ a.ucs:0x4E09
 a.ucs:0x4E0A
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E0A ;
+    :from.denotational_component
+        a.ucs_component:0x4E0A ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
@@ -2430,6 +2574,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 ;
     .
@@ -2736,10 +2882,10 @@ rep.gt:00014
     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   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x53C8 ; # &g2-AJ1-03746;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
 
 rep.gt:00022
@@ -2996,8 +3142,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  .
@@ -3035,8 +3181,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         ;
     .
@@ -3160,8 +3306,8 @@ rep.mj:006310
     :eq rep.gt-k:00208            ; # &I-GT-K00208;
     :eq rep.gt-pj-1:19775         ; # &I-GT-00024;
     :eq rep.shinjigen:6625        ; # &MJ006310;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x8207         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x8207         ] ;
     :subsume
         g2.mj:006310         ;
     .
@@ -3247,6 +3393,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 ;
@@ -3254,7 +3460,7 @@ a.ucs_component:0x4E0F
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
-    :eq a.iwds-1:0326             ; # &IWDS1-326;
+    :eq a.iwds-1:0326             ; # &A-compU+4E0F;
     .
     a.iwds-1:0326
            :abstract-character-of         iwds-1:0326    .
@@ -3284,7 +3490,7 @@ a.ucs:0x4E0F
     :eq rep.daikanwa:00021        ; # &I-M-00021;
     :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
@@ -3406,6 +3612,13 @@ a.ucs:0x4E10
     :eq rep.gt-pj-1:20514         ; # &I-GT-00027;
     :eq rep.daikanwa:00022        ; # &I-M-00022;
     :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 ;
     .
@@ -3679,6 +3892,16 @@ rep.mj:006315
             :glyph-image-of mj:006315 ;
             .
 
+rep.ucs-var-002:0x4E11
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x4E11 ;
+    :denotation-of
+        a.ucs:0x4E11         ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    .
+
 rep.gt:00035
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00035 ;
@@ -3693,9 +3916,9 @@ rep.gt:00035
     :eq rep.big5-cdp:0x89D2       ; # &I-CDP-89D2;
     :eq rep.gt-pj-9:19235         ; # &I-GT-00035;
     :eq rep.shinjigen:0017        ; # &GT-00035;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x919C ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    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
@@ -3801,7 +4024,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 ;
@@ -3816,7 +4039,7 @@ a.ucs:0x2000B
     :eq rep.daikanwa:00026        ; # &I-M-00026;
     :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
@@ -3838,10 +4061,10 @@ a.ucs:0x2000B
     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;
@@ -3878,10 +4101,10 @@ 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;
@@ -3925,6 +4148,8 @@ a.ucs:0x2000B
 a.ucs:0x20009
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20009 ;
+    :from.denotational_component
+        a.ucs_component:0x2CF16 ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
@@ -3932,6 +4157,12 @@ a.ucs:0x20009
     :eq rep.gt:00029              ; # &I-GT-00029;
     :eq rep.gt-pj-2:12337         ; # &I-GT-00029;
     :eq rep.daikanwa:00027        ; # &I-M-00027;
+    :from.avoiding-taboo [ :sources chisebib:cihai ,
+                                    chisebib:shijiazhai-yangxin-lu ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x4E18         ] ;
+    :subsume
+        g2.ucs_iso:0x20009   ;
     .
     rep.cns11643-5:0x2133
                :abstract-glyph-of     cns11643-5:0x2133  .
@@ -3941,6 +4172,42 @@ a.ucs:0x20009
                :abstract-glyph-of        gt-pj-2:12337   .
     rep.daikanwa:00027
                :abstract-glyph-of       daikanwa:00027   .
+    g2.ucs_iso:0x20009
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20009 ] ;
+        :eq g2.cns11643-5:0x2133      ; # &g2-GT-00029;
+        :eq g2.gt:00029               ; # &g2-GT-00029;
+        :eq g2.daikanwa:00027         ; # &g2-GT-00029;
+        :subsume
+            repi.daikanwa:00027  ,
+            repi.cns11643-5:0x2133 ,
+            repi.gt:00029        ,
+            repi.ucs_iso:0x20009 ;
+        .
+        g2.cns11643-5:0x2133
+              :abstract-glyph-form-of     cns11643-5:0x2133  .
+        g2.gt:00029
+              :abstract-glyph-form-of             gt:00029   .
+        g2.daikanwa:00027
+              :abstract-glyph-form-of       daikanwa:00027   .
+        repi.daikanwa:00027
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00027 ;
+            .
+        repi.cns11643-5:0x2133
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x2133 ;
+            .
+        repi.gt:00029
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00029 ;
+            .
+        repi.ucs_iso:0x20009
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20009 ] ;
+            .
 
 a.ucs:0x4E12
     a chisegg:abstract-character ;
@@ -3960,9 +4227,9 @@ rep.adobe-japan1-5: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   # 一
@@ -3973,7 +4240,7 @@ rep.adobe-japan1-5:17236
     :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    ,
@@ -4104,24 +4371,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 ) ;
     :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:0492        ; # 𠔃
-    :eq rep.hanziku-1:0xD7D7      ; # &I-HZK01-D7D7;
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    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:0492
                :abstract-glyph-of      shinjigen:0492    .
-    rep.hanziku-1:0xD7D7
-               :abstract-glyph-of      hanziku-1:0xD7D7  .
+    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 ;
@@ -4135,8 +4458,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-0:04642 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04642 ] ;
     .
     rep.gb2312:0x5728
                :abstract-glyph-of         gb2312:0x5728  .
@@ -4173,10 +4496,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
@@ -4186,10 +4509,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
@@ -4222,6 +4545,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 ;
@@ -4233,12 +4601,31 @@ rep.ucs-itaiji-001:0x4E11
     :from.unknown        a.ucs:0x4E11         ;
     .
 
-rep.gt:00025
+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
@@ -4253,9 +4640,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   # 一
             ]
         ]
     ] ;
@@ -4273,9 +4660,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   # 丶
             ]
         ]
     ] ;
@@ -4291,7 +4678,7 @@ a.ucs_component:0x4E14
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :eq a.iwds-1:0114             ; # &IWDS1-114;
+    :eq a.iwds-1:0114             ; # &A-compU+4E14;
     .
     a.iwds-1:0114
            :abstract-character-of         iwds-1:0114    .
@@ -4819,12 +5206,12 @@ 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: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  .
@@ -4851,9 +5238,9 @@ 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
@@ -4986,7 +5373,7 @@ rep.adobe-japan1-0:04311
     :eq rep.gt-k:01035            ; # &I-GT-K01035;
     :eq rep.gt-pj-1:21058         ; # &I-GT-00048;
     :eq rep.shinjigen:0024        ; # &AJ1-04311;
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4E16         ] ;
     :subsume
         g2.ucs_unicode:0x4E17 ;
@@ -5465,10 +5852,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;
@@ -5564,10 +5951,10 @@ 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   # 內
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    a.ucs:0x2F814   # 內
+        ] ;
         :eq rep.shinjigen:0028        ; # &JC3-41A2;
         .
         rep.shinjigen:0028
@@ -5772,8 +6159,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 ;
     .
@@ -5821,8 +6208,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  .
@@ -5836,8 +6223,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  .
@@ -5861,17 +6248,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  .
@@ -5893,44 +6280,19 @@ a.ucs:0x2000C
 a.ucs:0x2000E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2000E ;
-    ideo:radical           1 ; # ⼀ 
-    ideo:strokes           4 ;
-    ideo:total-strokes     5 ;
-    .
-
-rep.big5-cdp:0x86B1
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of big5-cdp:0x86B1 ;
-    :denotation-of
-        a.ucs:0x2000E        ;
-    ideo:radical           1 ; # ⼀ 
-    ideo:strokes           4 ;
-    ideo:total-strokes     5 ;
-    :subsume
-        g2.big5-cdp:0x86B1   ;
-    .
-    g2.big5-cdp:0x86B1
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of big5-cdp:0x86B1 ;
-        .
-
-rep.ucs_iso:0x2000E
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of [ :context domain:iso     ;
-                         :target     ucs:0x2000E ] ;
     :denotation-of
-        a.ucs:0x2000E        ;
+        a.ucs_component:0x2000E ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           4 ;
     ideo:total-strokes     5 ;
-    :eq a.ucs_iwds-1:0x2000E      ; # &CDP-8BB7;
-    :eq rep.big5-cdp:0x8BB7       ; # &CDP-8BB7;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4E95 ; # 井
+        isd:below    a.ucs:0x4E00   # 一
+    ] ;
+    :eq rep.big5-cdp:0x8BB7       ; # &I-CDP-8BB7;
     :subsume
         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_iso:0x2000E
@@ -5997,36 +6359,154 @@ 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
+a.ucs_component:0x2000E
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x2000E ] ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     5 ;
+    .
+
+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 ;
@@ -6039,6 +6519,42 @@ rep.gt:00053
     rep.gt-pj-9:14168
                :abstract-glyph-of        gt-pj-9:14168   .
 
+rep.big5-cdp:0x86B1
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x86B1 ;
+    :denotation-of
+        a.ucs_component:0x2000E ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     5 ;
+    :subsume
+        g2.big5-cdp:0x86B1   ;
+    .
+    g2.big5-cdp:0x86B1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x86B1 ;
+        .
+
+rep.big5-cdp:0x89F0
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x89F0 ;
+    :denotation-of
+        a.ucs_component:0x2000E ;
+    ideo:radical           1 ; # ⼀ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     5 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4E00 ; # 一
+        isd:below    a.ucs:0x9FB7   # 龷
+    ] ;
+    :subsume
+        g2.big5-cdp:0x89F0   ;
+    .
+    g2.big5-cdp:0x89F0
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x89F0 ;
+        .
+
 a.ucs:0x3401
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3401 ;
@@ -6220,8 +6736,17 @@ bucs:0x4E1F
     :super-abstract-character-of [ :context domain:bucs    ;
                                    :target     ucs:0x4E1F  ] ;
     ideo:radical           1 ; # ⼀ 
-    :eq rep.ucs_big5:0x4E1F       ; # &BUCS+4E1F;
-    :eq a.big5:0xA5E1             ; # &BUCS+4E1F;
+    .
+
+a.ucs_iwds-1:0x4E1F
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x4E1F  ] ;
+    :denotation-of
+        bucs:0x4E1F          ;
+    ideo:radical           1 ; # ⼀ 
+    :eq rep.ucs_big5:0x4E1F       ; # &A-IWDSU+4E1F;
+    :eq a.big5:0xA5E1             ; # &A-IWDSU+4E1F;
     .
     rep.ucs_big5:0x4E1F
                :abstract-glyph-of [ :context domain:big5    ;
@@ -6233,7 +6758,7 @@ a.ucs:0x4E1F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E1F ;
     :denotation-of
-        bucs:0x4E1F          ;
+        a.ucs_iwds-1:0x4E1F  ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
@@ -6249,6 +6774,8 @@ a.ucs:0x4E1F
     :eq rep.gt-k:02153            ; # &I-GT-K02153;
     :eq rep.gt-pj-2:12347         ; # &I-GT-00061;
     :eq rep.daikanwa:00041        ; # &I-M-00041;
+    :subsume
+        g2.ucs_unicode:0x4E1F ;
     .
     rep.adobe-japan1-4:14298
                :abstract-glyph-of adobe-japan1-4:14298   .
@@ -6264,6 +6791,64 @@ a.ucs:0x4E1F
                :abstract-glyph-of        gt-pj-2:12347   .
     rep.daikanwa:00041
                :abstract-glyph-of       daikanwa:00041   .
+    g2.ucs_unicode:0x4E1F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4E1F  ] ;
+        :eq g2.adobe-japan1-4:14298   ; # &g2-AJ1-14298;
+        :eq g2.jis-x0212:0x3026       ; # &g2-AJ1-14298;
+        :eq g2.cns11643-1:0x4723      ; # &g2-AJ1-14298;
+        :eq g2.gt:00061               ; # &g2-AJ1-14298;
+        :eq g2.gt-k:02153             ; # &g2-AJ1-14298;
+        :eq g2.daikanwa:00041         ; # &g2-AJ1-14298;
+        :subsume
+            repi.daikanwa:00041  ,
+            repi.jis-x0212:0x3026 ,
+            repi.adobe-japan1-6:14298 ,
+            repi.cns11643-1:0x4723 ,
+            repi.gt:00061        ,
+            repi.ucs_unicode:0x4E1F ;
+        .
+        g2.adobe-japan1-4:14298
+              :abstract-glyph-form-of adobe-japan1-4:14298   .
+        g2.jis-x0212:0x3026
+              :abstract-glyph-form-of      jis-x0212:0x3026  .
+        g2.cns11643-1:0x4723
+              :abstract-glyph-form-of     cns11643-1:0x4723  .
+        g2.gt:00061
+              :abstract-glyph-form-of             gt:00061   .
+        g2.gt-k:02153
+              :abstract-glyph-form-of           gt-k:02153   .
+        g2.daikanwa:00041
+              :abstract-glyph-form-of       daikanwa:00041   .
+        repi.daikanwa:00041
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00041 ;
+            .
+        repi.jis-x0212:0x3026
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x3026 ;
+            .
+        repi.adobe-japan1-4:14298
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14298 ;
+            .
+        repi.cns11643-1:0x4723
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x4723 ;
+            .
+        repi.gt:00061
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00061 ;
+            :eq repi.gt-k:02153           ; # &R-GT-00061;
+            .
+            repi.gt-k:02153
+                          :glyph-image-of           gt-k:02153   .
+        repi.ucs_unicode:0x4E1F
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4E1F  ] ;
+            .
 
 a.ucs:0x20018
     a chisegg:abstract-character ;
@@ -6298,15 +6883,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   # 冂
             ]
         ]
     ] ;
@@ -6342,10 +6927,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;
@@ -6362,10 +6947,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
@@ -6409,10 +6994,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;
@@ -6446,10 +7031,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
@@ -6477,8 +7062,8 @@ a.ucs:0x4E21
     :eq rep.gt-pj-1:20030         ; # &I-GT-00065;
     :eq rep.daikanwa:00046        ; # &I-M-00046;
     :eq rep.shinjigen:0483        ; # 両
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04215 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04215 ] ;
     :subsume
         g2.ucs_unicode:0x4E21 ;
     .
@@ -6572,7 +7157,7 @@ a.ucs:0x4E22
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E22 ;
     :denotation-of
-        bucs:0x4E1F          ;
+        a.ucs_iwds-1:0x4E1F  ;
     ideo:radical           [ :context domain:ucs     ;
                              :target            1 ; # ⼀
                            ] ;
@@ -6592,8 +7177,9 @@ a.ucs:0x4E22
     :eq rep.gt-k:02131            ; # &I-GT-K02131;
     :eq rep.gt-pj-2:12594         ; # &I-GT-00193;
     :eq rep.daikanwa:00144        ; # &I-M-00144;
-    :eq rep.hanziku-1:0xF56D      ; # &I-HZK01-F56D;
     :eq rep.jef-china3:0x41BA     ; # &I-JC3-41BA;
+    :subsume
+        g2.ucs_unicode:0x4E22 ;
     .
     rep.gb2312:0x362A
                :abstract-glyph-of         gb2312:0x362A  .
@@ -6607,10 +7193,66 @@ a.ucs:0x4E22
                :abstract-glyph-of        gt-pj-2:12594   .
     rep.daikanwa:00144
                :abstract-glyph-of       daikanwa:00144   .
-    rep.hanziku-1:0xF56D
-               :abstract-glyph-of      hanziku-1:0xF56D  .
     rep.jef-china3:0x41BA
                :abstract-glyph-of     jef-china3:0x41BA  .
+    g2.ucs_unicode:0x4E22
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x4E22  ] ;
+        :eq g2.gb2312:0x362A          ; # &g2-GT-00193;
+        :eq g2.cns11643-3:0x2263      ; # &g2-GT-00193;
+        :eq g2.gt:00193               ; # &g2-GT-00193;
+        :eq g2.gt-k:02131             ; # &g2-GT-00193;
+        :eq g2.daikanwa:00144         ; # &g2-GT-00193;
+        :eq g2.jef-china3:0x41BA      ; # &g2-GT-00193;
+        :subsume
+            repi.daikanwa:00144  ,
+            repi.cns11643-3:0x2263 ,
+            repi.gt:00193        ,
+            repi.jef-china3:0x41BA ,
+            repi.ucs_unicode:0x4E22 ,
+            rep.hanziku-1:0xF56D ;
+        .
+        g2.gb2312:0x362A
+              :abstract-glyph-form-of         gb2312:0x362A  .
+        g2.cns11643-3:0x2263
+              :abstract-glyph-form-of     cns11643-3:0x2263  .
+        g2.gt:00193
+              :abstract-glyph-form-of             gt:00193   .
+        g2.gt-k:02131
+              :abstract-glyph-form-of           gt-k:02131   .
+        g2.daikanwa:00144
+              :abstract-glyph-form-of       daikanwa:00144   .
+        g2.jef-china3:0x41BA
+              :abstract-glyph-form-of     jef-china3:0x41BA  .
+        repi.daikanwa:00144
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00144 ;
+            .
+        repi.cns11643-3:0x2263
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2263 ;
+            .
+        repi.gt:00193
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00193 ;
+            :eq repi.gt-k:02131           ; # &R-GT-00193;
+            .
+            repi.gt-k:02131
+                          :glyph-image-of           gt-k:02131   .
+        repi.jef-china3:0x41BA
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x41BA ;
+            .
+        repi.ucs_unicode:0x4E22
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x4E22  ] ;
+            .
+        rep.hanziku-1:0xF56D
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xF56D ;
+            .
 
 a.ucs:0x2001B
     a chisegg:abstract-character ;
@@ -6633,20 +7275,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;
         .
@@ -6706,7 +7348,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 ] ;
     .
@@ -6718,6 +7360,8 @@ 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 ;
@@ -6734,6 +7378,8 @@ rep.adobe-japan1-4:13698
     :eq rep.ucs_unicode:0x3402    ; # &AJ1-13698;
     :eq rep.jis-x0213-1:0x2E23    ; # &I-JX1-2E23;
     :eq rep.daikanwa...ho:0001    ; # &AJ1-13698;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:01578 ] ;
     :subsume
         rep.adobe-japan1-4:13699 ,
         rep.gt:00056         ;
@@ -6839,10 +7485,16 @@ rep.adobe-japan1-4:13697
     ideo:strokes           [ :context domain:misc    ;
                              :target  4 ] ;
     ideo:total-strokes     6 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x3402         ,
-                                    a.ucs:0xE0101        ] ;
+    :subsume
+        g2.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 ;
@@ -6932,9 +7584,103 @@ 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 ;
+    :from.denotational_component
+        a.ucs_iwds-1:0x26B07 ;
+    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 ;
@@ -7003,10 +7749,10 @@ a.ucs:0x20022
     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;
-    ] ;
+        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  ,
@@ -7031,10 +7777,10 @@ a.ucs:0x20022
         a chisegg:abstract-glyph-form ;
         :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;
-    ] ;
+        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;
         :subsume
             repi.cns11643-5:0x232F ,
@@ -7066,9 +7812,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 ;
@@ -7232,8 +7978,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-0:04215 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04215 ] ;
     :subsume
         g2.ucs_unicode:0x4E24 ;
     .
@@ -7358,7 +8104,7 @@ rep.ucs_iso:0x2B826
     :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
@@ -7433,7 +8179,7 @@ a.ucs:0x20A44
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
     :eq rep.cns11643-6:0x255E     ; # &I-C6-255E;
-    :from.same           a.ucs:0x2B826        ;
+    ideo:same-as         a.ucs:0x2B826        ;
     :subsume
         g2.ucs_iso:0x20A44   ;
     .
@@ -7506,8 +8252,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  .
@@ -7523,9 +8269,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   # 一
@@ -7556,10 +8302,10 @@ rep.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   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.adobe-japan1-0:02658 ; # &g2-AJ1-02658;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
 
 a.ucs:0x2A7D7
@@ -7588,6 +8334,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 ;
@@ -7807,8 +8594,8 @@ rep.mj:006341
     :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         ;
     .
@@ -8038,9 +8825,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   # 㐅
             ]
         ]
     ] ;
@@ -8089,9 +8876,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 ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04023 ] ;
-    :from.same           rep.gt:00145         ;
+    ideo:same-as         rep.gt:00145         ;
     .
     rep.cns11643-6:0x2936
                :abstract-glyph-of     cns11643-6:0x2936  .
@@ -8172,10 +8959,10 @@ a.ucs:0x20030
     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;
-    ] ;
+        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:0002 ,
@@ -8195,10 +8982,10 @@ a.ucs:0x20030
         a chisegg:abstract-glyph-form ;
         :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;
-    ] ;
+        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 ;
@@ -8228,8 +9015,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  .
@@ -8262,9 +9049,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 ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04023 ] ;
-    :from.same           a.ucs:0x2F800        ;
+    ideo:same-as         a.ucs:0x2F800        ;
     .
     rep.ucs_cns:0x4E3D
                :abstract-glyph-of [ :context domain:cns     ;
@@ -8294,6 +9081,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 ;
@@ -8325,14 +9160,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   # 乞
             ]
         ]
     ] ;
@@ -8385,10 +9220,10 @@ a.ucs:0x2003C
     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;
-    ] ;
+        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:0003 ,
@@ -8408,10 +9243,10 @@ a.ucs:0x2003C
         a chisegg:abstract-glyph-form ;
         :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;
-    ] ;
+        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 ;
@@ -8528,10 +9363,10 @@ a.ucs:0x20922
         a chisegg:abstract-glyph-form ;
         :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   # 丘
-    ] ;
+        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
@@ -8559,10 +9394,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
@@ -8575,15 +9410,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 ;
@@ -8839,6 +9707,10 @@ 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
@@ -8852,7 +9724,7 @@ rep.mj:058590
     ideo:hanyu-dazidian  ( 8 7 6 ) ;
     isd:structure [ a idc:⿸ ;
         isd:surround rep.big5-cdp:0x88BC ; # &CDP-88BC;
-        isd:filling  a.ucs:0x5306   # 匆
+        isd:filling  a.ucs:0x2F82A   # 匆
     ] ;
     :eq rep.ucs_iso:0x20045       ; # &MJ058590;
     :eq rep.hanyo-denshi...ks:372080 ; # &MJ058590;
@@ -8913,6 +9785,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 ;
@@ -9005,12 +9906,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   # 口
                     ]
                 ]
             ]
@@ -9020,7 +9921,7 @@ rep.ucs_iso:0x20048
     :form-of             [ :context domain:Zetian  ;
                            :sources chisebib:jiyun ;
                            :target  rep.adobe-japan1-0:01797 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01797 ] ;
     :subsume
@@ -9062,9 +9963,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 ;
@@ -9116,6 +10056,8 @@ a.ucs:0x2004F
 a.ucs:0x2B743
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2B743 ;
+    :denotation-of
+        a.ucs_cognate:0x723E ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes          13 ;
     ideo:total-strokes    14 ;
@@ -9363,15 +10305,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   # 且
             ]
         ]
     ] ;
@@ -9394,15 +10336,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   # 且
             ]
         ]
     ] ;
@@ -9422,12 +10364,19 @@ rep.gt:00100
     rep.gt-pj-9:19051
                :abstract-glyph-of        gt-pj-9:19051   .
 
+a.ucs_component:0x4E0A
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x4E0A  ] ;
+    ideo:radical           1 ; # ⼀ 
+    .
+
 a.ucs_component:0x4E0C
     a chisegg:abstract-character ;
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E0C  ] ;
     ideo:radical           1 ; # ⼀ 
-    :eq a.iwds-1:0221             ; # &IWDS1-221;
+    :eq a.iwds-1:0221             ; # &A-compU+4E0C;
     .
     a.iwds-1:0221
            :abstract-character-of         iwds-1:0221    .