update.
[chise/chiset.git] / Ideograph-R102-Field.ttl
index 645c147..299ea1c 100644 (file)
 @prefix a.ucs_iso: <http://www.chise.org/est/view/character/a.ucs@iso=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
 @prefix a.ucs_jis: <http://www.chise.org/est/view/character/a.ucs@jis=> .
+@prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
 @prefix rep.ucs_cns: <http://www.chise.org/est/view/character/rep.ucs@cns=> .
 @prefix rep.ucs_jis: <http://www.chise.org/est/view/character/rep.ucs@jis=> .
+@prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
 @prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
 @prefix g.ucs_cns: <http://www.chise.org/est/view/character/g.ucs@cns=> .
@@ -30,6 +32,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=> .
@@ -38,6 +41,7 @@
 @prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
 @prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
 @prefix rep.adobe-japan1-2: <http://www.chise.org/est/view/character/rep.adobe-japan1-2=> .
+@prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
 @prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
 @prefix rep.adobe-japan1-6: <http://www.chise.org/est/view/character/rep.adobe-japan1-6=> .
 @prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
 @prefix repi.daikanwa...._.p: <http://www.chise.org/est/view/character/repi.daikanwa...+p=> .
 @prefix repi.daikanwa...ho: <http://www.chise.org/est/view/character/repi.daikanwa...ho=> .
+@prefix g.daikanwa: <http://www.chise.org/est/view/character/g.daikanwa=> .
 @prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
 @prefix rep.shinjigen: <http://www.chise.org/est/view/character/rep.shinjigen=> .
 @prefix rep.shinjigen_1ed: <http://www.chise.org/est/view/character/rep.shinjigen@1ed=> .
 @prefix repi.hng-khi: <http://www.chise.org/est/view/character/repi.hng-khi=> .
 @prefix repi.hng-khm: <http://www.chise.org/est/view/character/repi.hng-khm=> .
 @prefix repi.hng-kar: <http://www.chise.org/est/view/character/repi.hng-kar=> .
+@prefix rep.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
+@prefix g2.cbeta: <http://www.chise.org/est/view/character/g2.cbeta=> .
+@prefix repi.cbeta: <http://www.chise.org/est/view/character/repi.cbeta=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix g2.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.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
-@prefix rep.ucs-bmp-var-006: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-006=> .
+@prefix rep.ucs-var-006: <http://www.chise.org/est/view/character/rep.ucs-var-006=> .
 @prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
+@prefix a.ucs-itaiji-003: <http://www.chise.org/est/view/character/a.ucs-itaiji-003=> .
 @prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix adobe-japan1-0: <http://rdf.chise.org/data/ccs/adobe-japan1-0/code-point/> .
 @prefix adobe-japan1-2: <http://rdf.chise.org/data/ccs/adobe-japan1-2/code-point/> .
+@prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
 @prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
 @prefix adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
 @prefix hng-khi: <http://rdf.chise.org/data/ccs/hng-khi/code-point/> .
 @prefix hng-khm: <http://rdf.chise.org/data/ccs/hng-khm/code-point/> .
 @prefix hng-kar: <http://rdf.chise.org/data/ccs/hng-kar/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 ruimoku-v6: <http://rdf.chise.org/data/ccs/ruimoku-v6/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
-@prefix ucs-bmp-var-006: <http://rdf.chise.org/data/ccs/ucs-bmp-var-006/code-point/> .
+@prefix ucs-var-006: <http://rdf.chise.org/data/ccs/ucs-var-006/code-point/> .
 @prefix ucs-itaiji-003: <http://rdf.chise.org/data/ccs/ucs-itaiji-003/code-point/> .
 @prefix ucs-itaiji-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
 
@@ -349,9 +360,23 @@ a.ucs:0x7530
                               :target     ucs:0x7530  ] ;
             .
 
+a.ucs_component:0x7531
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x7531  ] ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     5 ;
+    :eq a.iwds-1:1132             ; # &A-compU+7531;
+    .
+    a.iwds-1:1132
+           :abstract-character-of         iwds-1:1132    .
+
 a.ucs:0x7531
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7531 ;
+    :from.denotational_component
+        a.ucs_component:0x7531 ;
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           0 ;
     ideo:total-strokes     5 ;
@@ -1465,7 +1490,7 @@ a.ucs:0x753C
     :eq rep.gt:27911              ; # &I-GT-27911;
     :eq rep.gt-pj-1:24886         ; # &I-GT-27911;
     :eq rep.daikanwa...ho:0347    ; # 甼
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x753A         ] ;
     :subsume
         g2.ucs_unicode:0x753C ;
@@ -1681,10 +1706,10 @@ rep.cns11643-3:0x2A37
     :eq rep.gb2312:0x3B2D         ; # &C3-2A37;
     :eq rep.daikanwa:21739        ; # &I-M-21739;
     :eq rep.shinjigen:5026        ; # &C3-2A37;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05720 ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:05720 ] ;
     :subsume
         g2.ucs_unicode:0x753B ;
@@ -1749,8 +1774,8 @@ rep.adobe-japan1-0:01384
     :eq rep.gt-pj-1:12904         ; # &I-GT-27920;
     :eq rep.daikanwa...._.p:21739 ; # &AJ1-01384;
     :eq rep.shinjigen:5023        ; # &AJ1-01384;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05720 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05720 ] ;
     :subsume
         g2.adobe-japan1-0:01384 ;
     .
@@ -1958,10 +1983,10 @@ rep.adobe-japan1-5:18126
     :eq rep.daikanwa:21742        ; # &I-M-21742;
     :eq rep.jef-china3:0x5AC9     ; # &I-JC3-5AC9;
     :form-of             a.ucs:0x20679        ;
-    :from.wrong          [ :sources chisebib:jiyun ,
+    ideo:wrong-form-of   [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F936        ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x2F936        ] ;
     :subsume
         g2.ucs_unicode:0x753E ;
@@ -2191,6 +2216,89 @@ a.ucs:0x24C21
     rep.hanziku-7:0xB545
                :abstract-glyph-of      hanziku-7:0xB545  .
 
+rep.mj:041344
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:041344 ;
+    :denotation-of
+        a.mj:041344          ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           24 ; # ⼗
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  6 ] ;
+    ideo:radical           [ :context domain:daikanwa ;
+                             :target          102 ; # ⽥
+                           ] ;
+    ideo:strokes           [ :context domain:daikanwa ;
+                             :target  3 ] ;
+    ideo:total-strokes     8 ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "hi" ) ;
+                         ] ;
+    :eq rep.hanyo-denshi...ks:243860 ; # &MJ041344;
+    :eq rep.gt:27936              ; # &I-GT-27936;
+    :eq rep.gt-k:04290            ; # &I-GT-K04290;
+    :eq rep.gt-pj-5:13090         ; # &I-GT-27936;
+    :eq rep.daikanwa:21745        ; # &I-M-21745;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.adobe-japan1-4:13378 ] ;
+    :subsume
+        g2.mj:041344         ;
+    .
+    rep.hanyo-denshi...ks:243860
+               :abstract-glyph-of hanyo-denshi...ks:243860  .
+    rep.gt:27936
+               :abstract-glyph-of             gt:27936   .
+    rep.gt-k:04290
+               :abstract-glyph-of           gt-k:04290   .
+    rep.gt-pj-5:13090
+               :abstract-glyph-of        gt-pj-5:13090   .
+    rep.daikanwa:21745
+               :abstract-glyph-of       daikanwa:21745   .
+    g2.mj:041344
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:041344 ;
+        :eq g2.hanyo-denshi...ks:243860 ; # &g2-MJ041344;
+        :eq g2.gt:27936               ; # &g2-MJ041344;
+        :eq g2.gt-k:04290             ; # &g2-MJ041344;
+        :eq g2.daikanwa:21745         ; # &g2-MJ041344;
+        :subsume
+            repi.daikanwa:21745  ,
+            repi.hanyo-denshi...ks:243860 ,
+            repi.mj:041344       ,
+            repi.gt:27936        ;
+        .
+        g2.hanyo-denshi...ks:243860
+              :abstract-glyph-form-of hanyo-denshi...ks:243860  .
+        g2.gt:27936
+              :abstract-glyph-form-of             gt:27936   .
+        g2.gt-k:04290
+              :abstract-glyph-form-of           gt-k:04290   .
+        g2.daikanwa:21745
+              :abstract-glyph-form-of       daikanwa:21745   .
+        repi.daikanwa:21745
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:21745 ;
+            .
+        repi.hanyo-denshi...ks:243860
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...ks:243860 ;
+            :eq rep.hanyo-denshi...ks...mf:024386 ; # &R-HD-KS-243860;
+            .
+            rep.hanyo-denshi...ks...mf:024386
+                       :abstract-glyph-of hanyo-denshi...ks...mf:024386  .
+        repi.mj:041344
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:041344 ;
+            .
+        repi.gt:27936
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:27936 ;
+            :eq repi.gt-k:04290           ; # &R-GT-27936;
+            .
+            repi.gt-k:04290
+                          :glyph-image-of           gt-k:04290   .
+
 a.ucs:0x24C1F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24C1F ;
@@ -2436,6 +2544,10 @@ a.ucs:0x24C23
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           3 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7531 ; # 由
+        isd:below    a.ucs:0x2CF16   # 𬼖
+    ] ;
     .
 
 rep.ucs_iso:0x24C23
@@ -2448,37 +2560,58 @@ rep.ucs_iso:0x24C23
     ideo:strokes           3 ;
     ideo:total-strokes     8 ;
     ideo:hanyu-dazidian  ( 4 2530 4 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7531 ; # 由
+        isd:below    rep.mj:056865   # &MJ056865;
+    ] ;
     :eq rep.daikanwa:21754        ; # &M-21754;
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x754F         ] ;
     :subsume
-        g2.ucs_iso:0x24C23   ,
-        rep.hanziku-7:0xB4E7 ;
+        g.ucs_iso:0x24C23    ;
     .
     rep.daikanwa:21754
                :abstract-glyph-of       daikanwa:21754   .
-    g2.ucs_iso:0x24C23
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:iso     ;
-                                  :target     ucs:0x24C23 ] ;
-        :eq g2.daikanwa:21754         ; # &g2-M-21754;
+    g.ucs_iso:0x24C23
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x24C23 ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x7531 ; # 由
+            isd:below    rep.ucs-itaiji-003:0x722A   # &U-i003+722A;
+        ] ;
+        :eq g.daikanwa:21754          ; # &G-IU+24C23;
         :subsume
-            repi.daikanwa:21754  ,
-            repi.ucs_iso:0x24C23 ;
+            g2.ucs_iso:0x24C23   ,
+            rep.hanziku-7:0xB4E7 ;
         .
-        g2.daikanwa:21754
-              :abstract-glyph-form-of       daikanwa:21754   .
-        repi.daikanwa:21754
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:21754 ;
+        g.daikanwa:21754
+                   :detailed-glyph-of       daikanwa:21754   .
+        g2.ucs_iso:0x24C23
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x24C23 ] ;
+            :eq g2.daikanwa:21754         ; # &g2-M-21754;
+            :subsume
+                repi.daikanwa:21754  ,
+                repi.ucs_iso:0x24C23 ;
             .
-        repi.ucs_iso:0x24C23
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:iso     ;
-                              :target     ucs:0x24C23 ] ;
+            g2.daikanwa:21754
+                  :abstract-glyph-form-of       daikanwa:21754   .
+            repi.daikanwa:21754
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:21754 ;
+                .
+            repi.ucs_iso:0x24C23
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x24C23 ] ;
+                .
+        rep.hanziku-7:0xB4E7
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB4E7 ;
             .
-    rep.hanziku-7:0xB4E7
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of hanziku-7:0xB4E7 ;
-        .
 
 rep.cns11643-6:0x2D33
     a chisegg:abstract-glyph ;
@@ -2488,9 +2621,17 @@ rep.cns11643-6:0x2D33
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           3 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7531 ; # 由
+        isd:below    rep.ucs-itaiji-005:0x722A   # &U-i005+722A;
+    ] ;
+    :eq rep.ucs_cns:0x24C23       ; # &C6-2D33;
     :subsume
         g2.cns11643-6:0x2D33 ;
     .
+    rep.ucs_cns:0x24C23
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x24C23 ] .
     g2.cns11643-6:0x2D33
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x2D33 ;
@@ -2579,7 +2720,7 @@ a.ucs:0x7544
     :eq rep.gt-pj-1:24887         ; # &I-GT-27941;
     :eq rep.daikanwa:21760        ; # &I-M-21760;
     :eq rep.shinjigen:5052        ; # 畄
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:017681        ] ;
     :subsume
         g2.daikanwa:21760    ,
@@ -2674,13 +2815,69 @@ a.ucs:0x7545
 a.ucs:0x2233F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2233F ;
-    ideo:radical         102 ; # ⽥ 
-    ideo:strokes           3 ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           55 ; # ⼶
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  5 ] ;
+    ideo:radical           [ :context domain:cns     ;
+                             :target          102 ; # ⽥
+                           ] ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7530 ; # 田
+        isd:below    a.ucs:0x5EFE   # 廾
+    ] ;
+    .
+
+rep.ucs_iso:0x2233F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2233F ] ;
+    :denotation-of
+        a.ucs:0x2233F        ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           55 ; # ⼶
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  5 ] ;
+    ideo:radical           [ :context domain:cns     ;
+                             :target          102 ; # ⽥
+                           ] ;
+    ideo:strokes           [ :context domain:cns     ;
+                             :target  3 ] ;
     ideo:total-strokes     8 ;
-    :eq rep.cns11643-3:0x2A39     ; # &I-C3-2A39;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7530 ; # 田
+        isd:below    rep.mj:011120   # &MJ011120;
+    ] ;
+    :eq rep.cns11643-3:0x2A39     ; # &C3-2A39;
+    :form-of             a.ucs:0x24C1E        ,
+                         a.ucs:0x5351         ;
+    :subsume
+        g2.ucs_iso:0x2233F   ;
     .
     rep.cns11643-3:0x2A39
                :abstract-glyph-of     cns11643-3:0x2A39  .
+    g2.ucs_iso:0x2233F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2233F ] ;
+        :eq g2.cns11643-3:0x2A39      ; # &g2-IU-0002233F;
+        :subsume
+            repi.cns11643-3:0x2A39 ,
+            repi.ucs_iso:0x2233F ;
+        .
+        g2.cns11643-3:0x2A39
+              :abstract-glyph-form-of     cns11643-3:0x2A39  .
+        repi.cns11643-3:0x2A39
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2A39 ;
+            .
+        repi.ucs_iso:0x2233F
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2233F ] ;
+            .
 
 rep.ucs_iso:0x2F936
     a chisegg:abstract-glyph ;
@@ -2722,7 +2919,7 @@ rep.ucs_iso:0x2F936
                              ] ;
         :eq rep.cns11643-4:0x2A44     ; # &I-C4-2A44;
         :eq rep.daikanwa:21761        ; # &I-M-21761;
-        :from.same           [ :context domain:ucs     ;
+        ideo:same-as         [ :context domain:ucs     ;
                                :notes  ("different char") ;
                                :target  a.ucs:0x753E         ] ;
         :subsume
@@ -2806,7 +3003,7 @@ a.ucs:0x7546
     :eq rep.gt-pj-1:24892         ; # &I-GT-27975;
     :eq rep.daikanwa:21763        ; # &I-M-21763;
     :eq rep.shinjigen:5047        ; # 畆
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x755D         ] ;
     :subsume
         g2.ucs_unicode:0x7546 ;
@@ -3245,7 +3442,7 @@ a.ucs:0x24C2B
     :eq rep.cns11643-6:0x3274     ; # &I-C6-3274;
     :eq rep.daikanwa:21769        ; # &I-M-21769;
     :eq rep.hanziku-7:0xB5E9      ; # &I-HZK07-B5E9;
-    :from.ancient        [ :sources chisebib:zhengzitong ,
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026242        ] ;
     .
@@ -3835,7 +4032,7 @@ a.ucs:0x754F
     :eq rep.gt-pj-1:12378         ; # &I-GT-27943;
     :eq rep.daikanwa:21778        ; # &I-M-21778;
     :eq rep.shinjigen:5030        ; # 畏
-    :from.vulgar         a.ucs:0x200BD        ;
+    ideo:vulgar-form-of  a.ucs:0x200BD        ;
     :subsume
         g2.ucs_unicode:0x754F ,
         repi.hng-khm:04430   ,
@@ -4026,9 +4223,9 @@ a.ucs:0x24C31
         :eq rep.big5-cdp:0x86F0       ; # &I-CDP-86F0;
         :eq rep.koseki:244230         ; # &MJ041360;
         :eq rep.daikanwa:21782        ; # &I-M-21782;
-        :from.original       [ :sources chisebib:zhengzitong ,
-                                        chisebib:daikanwa ;
-                               :target  rep.cns11643-3:0x2A37 ] ;
+        ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                         chisebib:daikanwa ;
+                                :target  rep.cns11643-3:0x2A37 ] ;
         :subsume
             g2.cns11643-6:0x3277 ,
             g2.big5-cdp:0x86F0   ,
@@ -4083,8 +4280,8 @@ a.ucs:0x24C31
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x24C31 ] ;
         :eq rep.shinjigen:5025        ; # &U-00024C31;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  rep.adobe-japan1-0:05720 ] ;
+        ideo:original-form-of [ :sources chisebib:shinjigen ;
+                                :target  rep.adobe-japan1-0:05720 ] ;
         .
         rep.shinjigen:5025
                    :abstract-glyph-of      shinjigen:5025    .
@@ -4339,10 +4536,10 @@ a.ucs:0x2F935
                          ] ;
     :eq rep.cns11643-6:0x3279     ; # &I-C6-3279;
     :eq rep.daikanwa:21788        ; # &I-M-21788;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7533         ] ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :target  a.ucs:0x24C36        ] ;
     :from.unknown        rep.daikanwa:21819   ;
     .
@@ -4399,7 +4596,7 @@ a.ucs:0x20B47
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3272     ; # &I-C6-3272;
     :eq rep.daikanwa:21796        ; # &I-M-21796;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x756E         ] ;
     :subsume
@@ -4622,8 +4819,8 @@ rep.daikanwa:49332
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           4 ;
     ideo:total-strokes     9 ;
-    :from.original       [ :sources chisebib:daikanwa ;
-                           :target  rep.ucs_iso:0x22341  ] ;
+    ideo:original-form-of [ :sources chisebib:daikanwa ;
+                            :target  rep.ucs_iso:0x22341  ] ;
     .
 
 a.ucs:0x24C4C
@@ -4968,18 +5165,95 @@ a.ucs:0x7557
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7557 ;
     ideo:radical         102 ; # ⽥ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.big5-cdp:0x8BAA ; # &A-CDP-8BAA;
+        isd:below    a.ucs:0x7530   # 田
+    ] ;
+    .
+
+rep.jis-x0212:0x4D37
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of jis-x0212:0x4D37 ;
+    :denotation-of
+        a.ucs:0x7557         ;
+    ideo:radical         102 ; # ⽥ 
     ideo:strokes           5 ;
     ideo:total-strokes    10 ;
-    :eq rep.jis-x0212:0x4D37      ; # &I-JSP-4D37;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x8BAA ; # &CDP-8BAA;
+        isd:below    a.ucs:0x7530   # 田
+    ] ;
+    :eq rep.ucs_unicode:0x7557    ; # &JSP-4D37;
     :eq rep.cns11643-3:0x3250     ; # &I-C3-3250;
+    :eq rep.big5-cdp:0x8942       ; # &I-CDP-8942;
     :eq rep.daikanwa:21806        ; # &I-M-21806;
+    :eq rep.cbeta:08664           ; # &I-CB08664;
+    :subsume
+        g2.ucs_unicode:0x7557 ;
     .
-    rep.jis-x0212:0x4D37
-               :abstract-glyph-of      jis-x0212:0x4D37  .
+    rep.ucs_unicode:0x7557
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x7557  ] .
     rep.cns11643-3:0x3250
                :abstract-glyph-of     cns11643-3:0x3250  .
+    rep.big5-cdp:0x8942
+               :abstract-glyph-of       big5-cdp:0x8942  .
     rep.daikanwa:21806
                :abstract-glyph-of       daikanwa:21806   .
+    rep.cbeta:08664
+               :abstract-glyph-of          cbeta:08664   .
+    g2.ucs_unicode:0x7557
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x7557  ] ;
+        :eq g2.jis-x0212:0x4D37       ; # &g2-JSP-4D37;
+        :eq g2.cns11643-3:0x3250      ; # &g2-JSP-4D37;
+        :eq g2.big5-cdp:0x8942        ; # &g2-JSP-4D37;
+        :eq g2.daikanwa:21806         ; # &g2-JSP-4D37;
+        :eq g2.cbeta:08664            ; # &g2-JSP-4D37;
+        :subsume
+            repi.daikanwa:21806  ,
+            repi.jis-x0212:0x4D37 ,
+            repi.big5-cdp:0x8942 ,
+            repi.cbeta:08664     ,
+            repi.cns11643-3:0x3250 ,
+            repi.ucs_unicode:0x7557 ;
+        .
+        g2.jis-x0212:0x4D37
+              :abstract-glyph-form-of      jis-x0212:0x4D37  .
+        g2.cns11643-3:0x3250
+              :abstract-glyph-form-of     cns11643-3:0x3250  .
+        g2.big5-cdp:0x8942
+              :abstract-glyph-form-of       big5-cdp:0x8942  .
+        g2.daikanwa:21806
+              :abstract-glyph-form-of       daikanwa:21806   .
+        g2.cbeta:08664
+              :abstract-glyph-form-of          cbeta:08664   .
+        repi.daikanwa:21806
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:21806 ;
+            .
+        repi.jis-x0212:0x4D37
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x4D37 ;
+            .
+        repi.big5-cdp:0x8942
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8942 ;
+            .
+        repi.cbeta:08664
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:08664 ;
+            .
+        repi.cns11643-3:0x3250
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x3250 ;
+            .
+        repi.ucs_unicode:0x7557
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x7557  ] ;
+            .
 
 rep.daikanwa:21807
     a chisegg:abstract-glyph ;
@@ -5463,7 +5737,7 @@ a.ucs:0x24C4F
     ] ;
     :eq rep.cns11643-6:0x3961     ; # &I-C6-3961;
     :eq rep.daikanwa:21811        ; # &I-M-21811;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x755B         ] ;
     :subsume
@@ -5842,7 +6116,7 @@ a.ucs:0x755E
     :eq rep.cns11643-3:0x3251     ; # &I-C3-3251;
     :eq rep.daikanwa:21816        ; # &I-M-21816;
     :eq rep.shinjigen:5046        ; # 畞
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x755D         ] ;
     :subsume
         g2.adobe-japan1-5:19552 ,
@@ -6323,7 +6597,7 @@ a.ucs:0x7561
     :form-of             [ :sources chisebib:jiyun ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x5793         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5793         ] ;
     :subsume
@@ -7058,7 +7332,7 @@ rep.adobe-japan1-0:05719
     :eq rep.gt-pj-1:24896         ; # &I-GT-28049;
     :eq rep.daikanwa:21840        ; # &I-M-21840;
     :eq rep.shinjigen:5061        ; # &AJ1-05719;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:03956 ] ;
     :subsume
         g2.ucs_unicode:0x7567 ;
@@ -7150,6 +7424,126 @@ rep.adobe-japan1-0:05719
                               :target     ucs:0x7567  ] ;
             .
 
+a.ucs:0x24C6A
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24C6A ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x807F ; # 聿
+        isd:below    a.ucs:0x7530   # 田
+    ] ;
+    .
+
+rep.ucs_iso:0x24C6A
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24C6A ] ;
+    :denotation-of
+        a.ucs:0x24C6A        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    11 ;
+    ideo:hanyu-dazidian  ( 4 2542 5 ) ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.adobe-japan1-0:06227 ; # &AJ1-06227;
+        isd:below    a.ucs:0x7530   # 田
+    ] ;
+    :eq rep.cns11643-6:0x422C     ; # &C6-422C;
+    :eq rep.daikanwa:21841        ; # &I-M-21841;
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:05720 ] ;
+    :subsume
+        g2.daikanwa:21841    ,
+        g2.ucs_iso:0x24C6A   ;
+    .
+    rep.cns11643-6:0x422C
+               :abstract-glyph-of     cns11643-6:0x422C  .
+    rep.daikanwa:21841
+               :abstract-glyph-of       daikanwa:21841   .
+    g2.daikanwa:21841
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:21841 ;
+        .
+    g2.ucs_iso:0x24C6A
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24C6A ] ;
+        :eq g2.cns11643-6:0x422C      ; # &g2-IU-00024C6A;
+        :subsume
+            repi.cns11643-6:0x422C ,
+            repi.ucs_iso:0x24C6A ;
+        .
+        g2.cns11643-6:0x422C
+              :abstract-glyph-form-of     cns11643-6:0x422C  .
+        repi.cns11643-6:0x422C
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x422C ;
+            .
+        repi.ucs_iso:0x24C6A
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24C6A ] ;
+            .
+
+rep.gt:28023
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt:28023 ;
+    :denotation-of
+        a.ucs:0x24C6A        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x8BC6 ; # &CDP-8BC6;
+        isd:below    a.ucs:0x7530   # 田
+    ] ;
+    :eq rep.ucs_JP...hanazono:0x24C6A ; # &GT-28023;
+    :eq rep.gt-k:08743            ; # &I-GT-K08743;
+    :eq rep.gt-pj-5:13171         ; # &GT-28023;
+    :eq rep.cbeta:08889           ; # &I-CB08889;
+    :subsume
+        g2.gt:28023          ;
+    .
+    rep.ucs_JP...hanazono:0x24C6A
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x24C6A ] .
+    rep.gt-k:08743
+               :abstract-glyph-of           gt-k:08743   .
+    rep.gt-pj-5:13171
+               :abstract-glyph-of        gt-pj-5:13171   .
+    rep.cbeta:08889
+               :abstract-glyph-of          cbeta:08889   .
+    g2.gt:28023
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:28023 ;
+        :eq g2.ucs_JP...hanazono:0x24C6A ; # &g2-GT-28023;
+        :eq g2.cbeta:08889            ; # &g2-GT-28023;
+        :subsume
+            rep.hanziku-7:0xB76F ,
+            repi.cbeta:08889     ,
+            repi.gt:28023        ;
+        .
+        g2.ucs_JP...hanazono:0x24C6A
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x24C6A ] .
+        g2.cbeta:08889
+              :abstract-glyph-form-of          cbeta:08889   .
+        rep.hanziku-7:0xB76F
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB76F ;
+            .
+        repi.cbeta:08889
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:08889 ;
+            .
+        repi.gt:28023
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:28023 ;
+            .
+
 a.ucs:0x7566
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7566 ;
@@ -7280,11 +7674,18 @@ a.ucs:0x24C6B
     ideo:strokes           6 ;
     ideo:total-strokes    11 ;
     ideo:hanyu-dazidian  ( 1 186 1 ) ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "wi" ) ;
+                         ] ;
     :eq rep.cns11643-6:0x422F     ; # &I-C6-422F;
     :eq rep.daikanwa:21843        ; # &I-M-21843;
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:01174 ] ;
     :subsume
         g2.daikanwa:21843    ,
-        g2.ucs_iso:0x24C6B   ;
+        g2.ucs_iso:0x24C6B   ,
+        rep.hanziku-1:0xCCB2 ;
     .
     rep.cns11643-6:0x422F
                :abstract-glyph-of     cns11643-6:0x422F  .
@@ -7298,16 +7699,13 @@ a.ucs:0x24C6B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x24C6B ] ;
-        :eq g2.cns11643-6:0x422F      ; # &HZK01-CCB2;
-        :eq rep.hanziku-1:0xCCB2      ; # &HZK01-CCB2;
+        :eq g2.cns11643-6:0x422F      ; # &g2-IU-00024C6B;
         :subsume
             repi.cns11643-6:0x422F ,
             repi.ucs_iso:0x24C6B ;
         .
         g2.cns11643-6:0x422F
               :abstract-glyph-form-of     cns11643-6:0x422F  .
-        rep.hanziku-1:0xCCB2
-                   :abstract-glyph-of      hanziku-1:0xCCB2  .
         repi.cns11643-6:0x422F
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-6:0x422F ;
@@ -7317,6 +7715,67 @@ a.ucs:0x24C6B
             :glyph-image-of [ :context domain:iso     ;
                               :target     ucs:0x24C6B ] ;
             .
+    rep.hanziku-1:0xCCB2
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of hanziku-1:0xCCB2 ;
+        .
+
+a.ucs:0x24C6C
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24C6C ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    11 ;
+    ideo:hanyu-dazidian  ( 4 2541 10 ) ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    a.ucs:0x65EC   # 旬
+    ] ;
+    :eq rep.cns11643-6:0x422A     ; # &I-C6-422A;
+    :eq rep.daikanwa:21844        ; # &I-M-21844;
+    ideo:same-as         [ :sources chisebib:yupian ,
+                                    chisebib:daikanwa ;
+                           :target  rep.jis-x0212:0x4D32 ] ;
+    :subsume
+        g2.ucs_iso:0x24C6C   ;
+    .
+    rep.cns11643-6:0x422A
+               :abstract-glyph-of     cns11643-6:0x422A  .
+    rep.daikanwa:21844
+               :abstract-glyph-of       daikanwa:21844   .
+    g2.ucs_iso:0x24C6C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24C6C ] ;
+        :eq g2.cns11643-6:0x422A      ; # &g2-M-21844;
+        :eq g2.daikanwa:21844         ; # &g2-M-21844;
+        :subsume
+            repi.daikanwa:21844  ,
+            repi.cns11643-6:0x422A ,
+            repi.ucs_iso:0x24C6C ,
+            rep.hanziku-7:0xB754 ;
+        .
+        g2.cns11643-6:0x422A
+              :abstract-glyph-form-of     cns11643-6:0x422A  .
+        g2.daikanwa:21844
+              :abstract-glyph-form-of       daikanwa:21844   .
+        repi.daikanwa:21844
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:21844 ;
+            .
+        repi.cns11643-6:0x422A
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x422A ;
+            .
+        repi.ucs_iso:0x24C6C
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24C6C ] ;
+            .
+        rep.hanziku-7:0xB754
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB754 ;
+            .
 
 a.ucs:0x7570
     a chisegg:abstract-character ;
@@ -7372,9 +7831,9 @@ rep.mj:017706
     :eq rep.gt-pj-1:12379         ; # &I-GT-28020;
     :eq rep.daikanwa:21854        ; # &I-M-21854;
     :eq rep.shinjigen:5054        ; # &MJ017706;
-    :from.simplified     [ :context domain:JP...misc ;
-                           :target  a.ucs:0x2F938        ] ;
-    :from.wrong          [ :sources chisebib:pianhai ,
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :target  a.ucs:0x2F938        ] ;
+    ideo:wrong-form-of   [ :sources chisebib:pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F938        ] ;
     :subsume
@@ -7725,36 +8184,6 @@ a.ucs:0x24C69
     rep.hanziku-7:0xB752
                :abstract-glyph-of      hanziku-7:0xB752  .
 
-a.ucs:0x24C6A
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x24C6A ;
-    ideo:radical         102 ; # ⽥ 
-    ideo:strokes           6 ;
-    ideo:total-strokes    11 ;
-    ideo:hanyu-dazidian  ( 4 2542 5 ) ;
-    :eq rep.cns11643-6:0x422C     ; # &I-C6-422C;
-    :eq rep.hanziku-7:0xB76F      ; # &I-HZK07-B76F;
-    .
-    rep.cns11643-6:0x422C
-               :abstract-glyph-of     cns11643-6:0x422C  .
-    rep.hanziku-7:0xB76F
-               :abstract-glyph-of      hanziku-7:0xB76F  .
-
-a.ucs:0x24C6C
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x24C6C ;
-    ideo:radical         102 ; # ⽥ 
-    ideo:strokes           6 ;
-    ideo:total-strokes    11 ;
-    ideo:hanyu-dazidian  ( 4 2541 10 ) ;
-    :eq rep.cns11643-6:0x422A     ; # &I-C6-422A;
-    :eq rep.hanziku-7:0xB754      ; # &I-HZK07-B754;
-    .
-    rep.cns11643-6:0x422A
-               :abstract-glyph-of     cns11643-6:0x422A  .
-    rep.hanziku-7:0xB754
-               :abstract-glyph-of      hanziku-7:0xB754  .
-
 a.ucs:0x24C6D
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24C6D ;
@@ -8202,7 +8631,7 @@ rep.jef-china3:0x5ACB
     ideo:strokes           7 ;
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs-bmp-var-006:0x4F59 ; # &U-v006+4F59;
+        isd:above    rep.ucs-var-006:0x4F59 ; # &U-v006+4F59;
         isd:below    a.ucs:0x7530   # 田
     ] ;
     :subsume
@@ -8436,13 +8865,13 @@ a.ucs:0x756E
     :eq rep.cns11643-3:0x3D42     ; # &I-C3-3D42;
     :eq rep.daikanwa:21864        ; # &I-M-21864;
     :eq rep.shinjigen:5045        ; # 畮
-    :from.original       [ :context domain:shinjigen ;
-                           :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x755D         ] ;
-    :from.original       [ :context domain:shuowen ;
-                           :sources chisebib:shuowen ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x755E         ] ;
+    ideo:original-form-of [ :context domain:shinjigen ;
+                            :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x755D         ] ;
+    ideo:original-form-of [ :context domain:shuowen ;
+                            :sources chisebib:shuowen ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x755E         ] ;
     .
     rep.cns11643-3:0x3D42
                :abstract-glyph-of     cns11643-3:0x3D42  .
@@ -8636,10 +9065,10 @@ a.ucs:0x7571
     :eq rep.jis-x0213-2:0x713F    ; # &I-JX2-713F;
     :eq rep.daikanwa:21867        ; # &I-M-21867;
     :eq rep.shinjigen:5051        ; # 畱
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  rep.mj:017681        ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  rep.mj:017681        ] ;
     :subsume
         g2.ucs_unicode:0x7571 ;
     .
@@ -8864,8 +9293,8 @@ rep.adobe-japan1-0:02526
     :eq rep.gt-pj-1:15990         ; # &I-GT-28062;
     :eq rep.daikanwa...._.p:21875 ; # &AJ1-02526;
     :eq rep.shinjigen:5063        ; # &AJ1-02526;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05727 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05727 ] ;
     :subsume
         g2.ucs_unicode:0x7573 ;
     .
@@ -8971,8 +9400,8 @@ rep.ucs_iso:0x24C83
     :eq a.ucs_iwds-1:0x24C83      ; # &C6-4B57;
     :eq rep.cns11643-6:0x4B57     ; # &C6-4B57;
     :eq rep.shinjigen:5059        ; # &C6-4B57;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:03487 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:03487 ] ;
     .
     a.ucs_iwds-1:0x24C83
            :abstract-character-of [ :context domain:iwds-1  ;
@@ -9019,8 +9448,8 @@ a.ucs:0x7574
     :eq rep.jis-x0213-1:0x6147    ; # &I-JX1-6147;
     :eq rep.gt:28065              ; # &I-GT-28065;
     :eq rep.gt-pj-1:24903         ; # &I-GT-28065;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x7587         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x7587         ] ;
     :subsume
         g2.adobe-japan1-0:05726 ,
         g2.ucs_unicode:0x7574 ;
@@ -9144,8 +9573,8 @@ rep.daikanwa:21878
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
-    :from.original       [ :context domain:zhengzitong ;
-                           :target  a.ucs:0x2219F        ] ;
+    ideo:original-form-of [ :context domain:zhengzitong ;
+                            :target  a.ucs:0x2219F        ] ;
     .
 
 rep.ucs_iso:0x24C92
@@ -9197,9 +9626,9 @@ rep.daikanwa:21879
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.daikanwa:21878   ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:21878   ] ;
     .
 
 rep.ucs_iso:0x2F939
@@ -9360,7 +9789,7 @@ a.ucs:0x24C96
     :form-of             [ :context domain:p.:.tian3 ;
                            :sources chisebib:jiyun ;
                            :target  a.ucs:0x753A         ] ;
-    :from.same           [ :context domain:p.:.tian3 ;
+    ideo:same-as         [ :context domain:p.:.tian3 ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x753A         ] ;
@@ -9384,7 +9813,7 @@ a.ucs:0x3F63
     :eq rep.cns11643-3:0x427A     ; # &I-C3-427A;
     :eq rep.daikanwa:21886        ; # &I-M-21886;
     :eq rep.hanziku-7:0xB7F4      ; # &I-HZK07-B7F4;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x57DF         ] ;
     .
@@ -9924,8 +10353,8 @@ a.ucs:0x757A
     :eq rep.daikanwa:21895        ; # &I-M-21895;
     :eq rep.shinjigen:5080        ; # 畺
     :eq rep.jef-china3:0x5AD6     ; # &I-JC3-5AD6;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7586         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7586         ] ;
     :subsume
         g2.ucs_unicode:0x757A ;
     .
@@ -10116,16 +10545,43 @@ a.ucs:0x24CA8
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    a.ucs_iwds-1:0x5377   # &BUCS+5377;
+    ] ;
+    .
+
+rep.ucs_iso:0x24CA8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CA8 ] ;
+    :denotation-of
+        a.ucs:0x24CA8        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    a.ucs:0x5377   # 卷
+    ] ;
+    :eq a.ucs_iso:0x24CA8         ; # &A-IU+24CA8;
     .
+    a.ucs_iso:0x24CA8
+           :abstract-character-of [ :context domain:iso     ;
+                                    :target     ucs:0x24CA8 ] .
 
 a.mj:041434
     a chisegg:abstract-character ;
     :abstract-character-of mj:041434 ;
     :denotation-of
-        a.ucs:0x24CA8        ;
+        rep.ucs_iso:0x24CA8  ;
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    o.ucs_unicode:0x5377   # &o-HD-FT-3521;
+    ] ;
     :subsume
         rep.mj:041434        ,
         rep.hanziku-7:0xB8B6 ;
@@ -10133,6 +10589,10 @@ a.mj:041434
     rep.mj:041434
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:041434 ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x7530 ; # 田
+            isd:right    rep.mj:007897   # &MJ007897;
+        ] ;
         :eq rep.koseki:245690         ; # &MJ041434;
         :eq rep.daikanwa:21904        ; # &I-M-21904;
         :subsume
@@ -10174,10 +10634,14 @@ rep.ucs_iso:0x24CA8
     :abstract-glyph-of [ :context domain:iso     ;
                          :target     ucs:0x24CA8 ] ;
     :denotation-of
-        a.ucs:0x24CA8        ;
+        rep.ucs_iso:0x24CA8  ;
     ideo:radical         102 ; # ⽥ 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    rep.cns11643-1:0x4C3A   # &C1-4C3A;
+    ] ;
     :subsume
         g2.ucs_iso:0x24CA8   ;
     .
@@ -10281,6 +10745,13 @@ a.ucs:0x24CA3
                            ] ;
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs_component:0x7531 ; # &A-compU+7531;
+        isd:right    a.ucs:0x758C   # 疌
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "sAHu" ) ;
+                         ] ;
     .
 
 rep.ucs_iso:0x24CA3
@@ -10293,10 +10764,84 @@ rep.ucs_iso:0x24CA3
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
     ideo:hanyu-dazidian  ( 4 2546 4 ) ;
-    :eq rep.hanziku-7:0xB851      ; # &HZK07-B851;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7531 ; # 由
+        isd:right    rep.adobe-japan1-5:18136   # &AJ1-18136;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24CA3   ;
+    .
+    g2.ucs_iso:0x24CA3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CA3 ] ;
+        :subsume
+            repi.ucs_iso:0x24CA3 ,
+            rep.hanziku-7:0xB851 ;
+        .
+        repi.ucs_iso:0x24CA3
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24CA3 ] ;
+            .
+        rep.hanziku-7:0xB851
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB851 ;
+            .
+
+a.ucs:0x24CA5
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24CA5 ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    13 ;
+    .
+
+rep.ucs-var-001:0x24CA5
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x24CA5 ;
+    :denotation-of
+        a.ucs:0x24CA5        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    13 ;
     .
-    rep.hanziku-7:0xB851
-               :abstract-glyph-of      hanziku-7:0xB851  .
+
+rep.ucs_iso:0x24CA5
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CA5 ] ;
+    :denotation-of
+        a.ucs:0x24CA5        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    13 ;
+    :eq rep.big5-cdp:0x85FB       ; # &CDP-85FB;
+    :subsume
+        g2.ucs_iso:0x24CA5   ;
+    .
+    rep.big5-cdp:0x85FB
+               :abstract-glyph-of       big5-cdp:0x85FB  .
+    g2.ucs_iso:0x24CA5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CA5 ] ;
+        :eq g2.big5-cdp:0x85FB        ; # &g2-CDP-85FB;
+        :subsume
+            repi.big5-cdp:0x85FB ,
+            repi.ucs_iso:0x24CA5 ;
+        .
+        g2.big5-cdp:0x85FB
+              :abstract-glyph-form-of       big5-cdp:0x85FB  .
+        repi.big5-cdp:0x85FB
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x85FB ;
+            .
+        repi.ucs_iso:0x24CA5
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24CA5 ] ;
+            .
 
 a.ucs:0x757B
     a chisegg:abstract-character ;
@@ -10704,6 +11249,38 @@ a.ucs:0x24CAF
     rep.hanziku-7:0xB8F9
                :abstract-glyph-of      hanziku-7:0xB8F9  .
 
+a.ucs:0x24CB1
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24CB1 ;
+    ideo:radical         102 ; # ⽥ 
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs-itaiji-003:0x82F1 ; # &A-U-i003+82F1;
+        isd:filling  a.ucs:0x7530   # 田
+    ] ;
+    .
+
+rep.ucs_iso:0x24CB1
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CB1 ] ;
+    :denotation-of
+        a.ucs:0x24CB1        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.ucs-itaiji-003:0x82F1 ; # &U-i003+82F1;
+        isd:filling  a.ucs:0x7530   # 田
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24CB1   ;
+    .
+    g2.ucs_iso:0x24CB1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CB1 ] ;
+        .
+
 a.ucs:0x24CB2
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24CB2 ;
@@ -11353,6 +11930,73 @@ a.ucs:0x7580
     rep.daikanwa:21933
                :abstract-glyph-of       daikanwa:21933   .
 
+a.ucs:0x24CC9
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24CC9 ;
+    ideo:radical         102 ; # ⽥ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    a.ucs:0x26C29   # 𦰩
+    ] ;
+    .
+
+rep.ucs_iso:0x24CC9
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CC9 ] ;
+    :denotation-of
+        a.ucs:0x24CC9        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    16 ;
+    ideo:hanyu-dazidian  ( 4 2552 1 ) ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    rep.big5-cdp:0x8BD3   # &CDP-8BD3;
+    ] ;
+    :eq rep.cns11643-4:0x5143     ; # &C4-5143;
+    :eq rep.daikanwa:21935        ; # &I-M-21935;
+    :subsume
+        g2.ucs_iso:0x24CC9   ;
+    .
+    rep.cns11643-4:0x5143
+               :abstract-glyph-of     cns11643-4:0x5143  .
+    rep.daikanwa:21935
+               :abstract-glyph-of       daikanwa:21935   .
+    g2.ucs_iso:0x24CC9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CC9 ] ;
+        :eq g2.cns11643-4:0x5143      ; # &g2-M-21935;
+        :eq g2.daikanwa:21935         ; # &g2-M-21935;
+        :subsume
+            repi.daikanwa:21935  ,
+            repi.cns11643-4:0x5143 ,
+            repi.ucs_iso:0x24CC9 ,
+            rep.hanziku-7:0xB971 ;
+        .
+        g2.cns11643-4:0x5143
+              :abstract-glyph-form-of     cns11643-4:0x5143  .
+        g2.daikanwa:21935
+              :abstract-glyph-form-of       daikanwa:21935   .
+        repi.daikanwa:21935
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:21935 ;
+            .
+        repi.cns11643-4:0x5143
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x5143 ;
+            .
+        repi.ucs_iso:0x24CC9
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x24CC9 ] ;
+            .
+        rep.hanziku-7:0xB971
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB971 ;
+            .
+
 a.ucs:0x7581
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7581 ;
@@ -11478,11 +12122,11 @@ a.ucs:0x24CCA
         :eq rep.hanziku-7:0xB97E      ; # &I-HZK07-B97E;
         :form-of             [ :context domain:s.:.rice-bag ;
                                :target  rep.daikanwa:21878   ] ;
-        :from.same           [ :context domain:s.:.basket ;
+        ideo:same-as         [ :context domain:s.:.basket ;
                                :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x24CEB        ] ;
-        :from.wrong          [ :context domain:s.:.rice-bag ;
+        ideo:wrong-form-of   [ :context domain:s.:.rice-bag ;
                                :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2219F        ] ;
@@ -11585,8 +12229,8 @@ a.ucs:0x7582
     :eq rep.jis-x0213-1:0x614A    ; # &I-JX1-614A;
     :eq rep.gt:28158              ; # &I-GT-28158;
     :eq rep.gt-pj-1:24906         ; # &I-GT-28158;
-    :from.simplified     [ :context domain:JP...misc ;
-                           :target  rep.adobe-japan1-0:05727 ] ;
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :target  rep.adobe-japan1-0:05727 ] ;
     :subsume
         g2.ucs_unicode:0x7582 ;
     .
@@ -11658,21 +12302,6 @@ a.ucs:0x24CC8
     rep.hanziku-7:0xB975
                :abstract-glyph-of      hanziku-7:0xB975  .
 
-a.ucs:0x24CC9
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x24CC9 ;
-    ideo:radical         102 ; # ⽥ 
-    ideo:strokes          11 ;
-    ideo:total-strokes    16 ;
-    ideo:hanyu-dazidian  ( 4 2552 1 ) ;
-    :eq rep.cns11643-4:0x5143     ; # &I-C4-5143;
-    :eq rep.hanziku-7:0xB971      ; # &I-HZK07-B971;
-    .
-    rep.cns11643-4:0x5143
-               :abstract-glyph-of     cns11643-4:0x5143  .
-    rep.hanziku-7:0xB971
-               :abstract-glyph-of      hanziku-7:0xB971  .
-
 a.ucs:0x7583
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7583 ;
@@ -11937,6 +12566,38 @@ a.ucs:0x24CD8
         rep.hanziku-7:0xB9B6
                    :abstract-glyph-of      hanziku-7:0xB9B6  .
 
+a.ucs:0x24CD9
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x24CD9 ;
+    ideo:radical         102 ; # ⽥ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    a.ucs:0x83C0   # 菀
+    ] ;
+    .
+
+rep.ucs_iso:0x24CD9
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CD9 ] ;
+    :denotation-of
+        a.ucs:0x24CD9        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7530 ; # 田
+        isd:right    rep.cns11643-2:0x3F45   # &C2-3F45;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24CD9   ;
+    .
+    g2.ucs_iso:0x24CD9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CD9 ] ;
+        .
+
 a.ucs:0x24CDB
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x24CDB ;
@@ -11986,17 +12647,62 @@ a.ucs:0x24CDE
     ideo:radical         102 ; # ⽥ 
     ideo:strokes          12 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x24514 ; # 𤔔
+        isd:right    a.ucs:0x7530   # 田
+    ] ;
+    .
+
+rep.ucs_iso:0x24CDE
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x24CDE ] ;
+    :denotation-of
+        a.ucs:0x24CDE        ;
+    ideo:radical         102 ; # ⽥ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.ucs_iso:0x24514 ; # &C4-386A;
+        isd:right    a.ucs:0x7530   # 田
+    ] ;
+    :subsume
+        g2.ucs_iso:0x24CDE   ;
     .
+    g2.ucs_iso:0x24CDE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x24CDE ] ;
+        .
 
-rep.hanziku-12:0xEEEE
+rep.ucs_JP...hanazono:0x24CDE
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of hanziku-12:0xEEEE ;
-    :to.ucs              a.ucs:0x24CDE ; # 𤳞
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x24CDE ] ;
+    :denotation-of
+        a.ucs:0x24CDE        ;
     ideo:radical         102 ; # ⽥ 
     ideo:strokes          12 ;
     ideo:total-strokes    17 ;
     ideo:hanyu-dazidian  ( 8 31 12 ) ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.gt:25282 ; # &GT-25282;
+        isd:right    a.ucs:0x7530   # 田
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x24CDE ;
     .
+    g2.ucs_JP...hanazono:0x24CDE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x24CDE ] ;
+        :subsume
+            rep.hanziku-12:0xEEEE ;
+        .
+        rep.hanziku-12:0xEEEE
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-12:0xEEEE ;
+            .
 
 a.ucs:0x24CDF
     a chisegg:abstract-character ;
@@ -12049,7 +12755,7 @@ a.ucs:0x7585
     :eq rep.daikanwa:21956        ; # &I-M-21956;
     :eq rep.shinjigen:5082        ; # 疅
     :eq rep.jef-china3:0x5AD5     ; # &I-JC3-5AD5;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7586         ] ;
     .
     rep.jis-x0212:0x4D44
@@ -12244,7 +12950,7 @@ a.ucs:0x24CEB
     :eq rep.hanziku-7:0xB9F4      ; # &I-HZK07-B9F4;
     :form-of             [ :context domain:s.:.rice-bag ;
                            :target  rep.daikanwa:21878   ] ;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-4:0x5146 ] ;
     .
@@ -12524,27 +13230,61 @@ a.ucs:0x24CF3
 a.ucs:0x7588
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x7588 ;
+    :denotation-of
+        a.ucs_iwds-1:0x7588  ;
     ideo:radical         102 ; # ⽥ 
     ideo:strokes          15 ;
     ideo:total-strokes    20 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x3F6C ; # 㽬
+        isd:filling  rep.big5-cdp:0x8BEA   # &CDP-8BEA;
+    ] ;
+    :eq rep.cns11643-4:0x6368     ; # &I-C4-6368;
+    :eq rep.daikanwa:21971        ; # &I-M-21971;
+    :from.Zhouwen        [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x526F         ] ;
     :subsume
-        rep.daikanwa:21971   ,
-        rep.ucs_unicode:0x7588 ,
-        rep.cns11643-4:0x6368 ;
+        g2.ucs_unicode:0x7588 ,
+        g2.cns11643-4:0x6368 ;
     .
+    rep.cns11643-4:0x6368
+               :abstract-glyph-of     cns11643-4:0x6368  .
     rep.daikanwa:21971
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:21971 ;
-        .
-    rep.ucs_unicode:0x7588
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x7588  ] ;
+               :abstract-glyph-of       daikanwa:21971   .
+    g2.ucs_unicode:0x7588
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x7588  ] ;
+        :eq g2.daikanwa:21971         ; # &g2-M-21971;
+        :subsume
+            repi.daikanwa:21971  ,
+            repi.ucs_unicode:0x7588 ,
+            rep.hanziku-7:0xB9F5 ;
         .
-    rep.cns11643-4:0x6368
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-4:0x6368 ;
+        g2.daikanwa:21971
+              :abstract-glyph-form-of       daikanwa:21971   .
+        repi.daikanwa:21971
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:21971 ;
+            .
+        repi.ucs_unicode:0x7588
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x7588  ] ;
+            .
+        rep.hanziku-7:0xB9F5
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-7:0xB9F5 ;
+            .
+    g2.cns11643-4:0x6368
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-4:0x6368 ;
+        :eq g2.ucs_cns:0x7588         ; # &g2-CU+7588;
         .
+        g2.ucs_cns:0x7588
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x7588  ] .
 
 a.ucs:0x3F6E
     a chisegg:abstract-character ;
@@ -12579,9 +13319,9 @@ rep.daikanwa:21975
     :sound               [ :context domain:ja...on ;
                            :target  ( "sa" ) ;
                          ] ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.cns11643-4:0x4B29 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.cns11643-4:0x4B29 ] ;
     .
 
 g.ucs_iso:0x24CF6
@@ -12806,8 +13546,8 @@ rep.adobe-japan1-0:05728
     :eq rep.gt-pj-1:24905         ; # &I-GT-28211;
     :eq rep.daikanwa:21982        ; # &I-M-21982;
     :eq rep.shinjigen:5065        ; # &AJ1-05728;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:05727 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:05727 ] ;
     :subsume
         g2.ucs_iso:0x24D01   ;
     .