X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R115-Grain.ttl;h=f56c8fbf47c6819f504abce44281d87d18394be1;hb=537f1a6631d7e644f8e84eca8f2d48cd7ab60453;hp=5a23c5e51ea4db2c1ccd796c5de76abbecdac4a7;hpb=df4a50df82863c9a3c14947cf98853225ff9d513;p=chise%2Fchiset.git

diff --git a/Ideograph-R115-Grain.ttl b/Ideograph-R115-Grain.ttl
index 5a23c5e..f56c8fb 100644
--- a/Ideograph-R115-Grain.ttl
+++ b/Ideograph-R115-Grain.ttl
@@ -13,7 +13,9 @@
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
+@prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
 @prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
 @prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
@@ -39,6 +41,7 @@
 @prefix g2.ucs_jis...1990: <http://www.chise.org/est/view/character/g2.ucs@jis...1990=> .
 @prefix g2.ucs_jis...2000: <http://www.chise.org/est/view/character/g2.ucs@jis...2000=> .
 @prefix g2.ucs_jis...2004: <http://www.chise.org/est/view/character/g2.ucs@jis...2004=> .
+@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=> .
@@ -46,6 +49,7 @@
 @prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
 @prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
 @prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
+@prefix rep.adobe-japan1-2: <http://www.chise.org/est/view/character/rep.adobe-japan1-2=> .
 @prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
 @prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
 @prefix g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
@@ -118,6 +122,8 @@
 @prefix o.adobe-japan1-5: <http://www.chise.org/est/view/character/o.adobe-japan1-5=> .
 @prefix g2.gb12345: <http://www.chise.org/est/view/character/g2.gb12345=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
+@prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
+@prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
 @prefix rep.hanyo-denshi...jb: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jb=> .
 @prefix rep.hanyo-denshi...jd: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jd=> .
@@ -151,6 +157,7 @@
 @prefix rep.gt-pj-1: <http://www.chise.org/est/view/character/rep.gt-pj-1=> .
 @prefix rep.gt-pj-5: <http://www.chise.org/est/view/character/rep.gt-pj-5=> .
 @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.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...._.p: <http://www.chise.org/est/view/character/rep.daikanwa...+p=> .
 @prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
@@ -178,10 +185,13 @@
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
+@prefix rep.ucs-itaiji-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-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
 @prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
@@ -229,6 +239,7 @@
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
 @prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
+@prefix ucs-itaiji-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
 
 a.ucs:0x79BE
     a chisegg:abstract-character ;
@@ -358,19 +369,6 @@ a.ucs:0x79BE
                               :target     ucs:0x79BE  ] ;
             .
 
-rep.gt-k:00899
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt-k:00899 ;
-    :denotation-of
-        a.ucs:0x79BE         ;
-    ideo:radical         115 ; # â½² 
-    ideo:strokes           0 ;
-    ideo:total-strokes     5 ;
-    :eq rep.gt-pj-k1:13407        ; # &GT-K00899;
-    .
-    rep.gt-pj-k1:13407
-               :abstract-glyph-of       gt-pj-k1:13407   .
-
 a.ucs:0x2574C
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2574C ;
@@ -385,13 +383,39 @@ a.ucs:0x2574C
     rep.daikanwa:24907
                :abstract-glyph-of       daikanwa:24907   .
 
-rep.daikanwa:24908
+rep.gt-k:00899
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:24908 ;
+    :abstract-glyph-of gt-k:00899 ;
+    :denotation-of
+        a.ucs:0x79BE         ;
     ideo:radical         115 ; # â½² 
     ideo:strokes           0 ;
     ideo:total-strokes     5 ;
+    :eq rep.gt-pj-k1:13407        ; # &M-24908;
+    :eq rep.daikanwa:24908        ; # &I-M-24908;
+    :form-of             [ :context domain:component...connect-right ;
+                           :target  a.ucs:0x79BE         ] ;
+    :subsume
+        g2.daikanwa:24908    ,
+        g2.gt-k:00899        ;
     .
+    rep.gt-pj-k1:13407
+               :abstract-glyph-of       gt-pj-k1:13407   .
+    rep.daikanwa:24908
+               :abstract-glyph-of       daikanwa:24908   .
+    g2.daikanwa:24908
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:24908 ;
+        .
+    g2.gt-k:00899
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:00899 ;
+        :eq g2.gt-pj-k1:13407         ; # &g2-GT-K00899;
+        :from.identical      [ :context domain:component...connect-right ;
+                               :target  rep.gt-k:00899       ] ;
+        .
+        g2.gt-pj-k1:13407
+              :abstract-glyph-form-of       gt-pj-k1:13407   .
 
 a.ucs:0x2574D
     a chisegg:abstract-character ;
@@ -407,12 +431,43 @@ a.ucs:0x2574D
     rep.daikanwa:24909
                :abstract-glyph-of       daikanwa:24909   .
 
+bucs:0x79BF
+    a chisegg:super-abstract-character ;
+    :super-abstract-character-of [ :context domain:bucs    ;
+                                   :target     ucs:0x79BF  ] ;
+    ideo:radical         115 ; # â½² 
+    .
+
+a.ucs_iwds-1:0x79BF
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x79BF  ] ;
+    :denotation-of
+        bucs:0x79BF          ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           2 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x79BE ; # 禾
+        isd:below    a.ucs_component:0x51E0   # &A-compU+51E0;
+    ] ;
+    .
+
 a.ucs:0x79BF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x79BF ;
+    :denotation-of
+        a.ucs_iwds-1:0x79BF  ;
     ideo:radical         115 ; # â½² 
     ideo:strokes           2 ;
     ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x79BE ; # 禾
+        isd:below    a.ucs:0x513F   # 儿
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "toku" ) ;
+                         ] ;
     :eq rep.adobe-japan1-0:03229  ; # &I-AJ1-03229;
     :eq rep.jis-x0208:0x4645      ; # &I-J90-4645;
     :eq rep.ks-x1001:0x543E       ; # &I-K0-543E;
@@ -423,7 +478,9 @@ a.ucs:0x79BF
     :eq rep.gt-k:02621            ; # &I-GT-K02621;
     :eq rep.gt-pj-1:17989         ; # &I-GT-32132;
     :eq rep.daikanwa:24910        ; # &I-M-24910;
-    :eq rep.shinjigen_rev:5591    ; # 禿
+    :eq rep.shinjigen:5591        ; # 禿
+    :subsume
+        g2.ucs_unicode:0x79BF ;
     .
     rep.adobe-japan1-0:03229
                :abstract-glyph-of adobe-japan1-0:03229   .
@@ -445,9 +502,137 @@ a.ucs:0x79BF
                :abstract-glyph-of        gt-pj-1:17989   .
     rep.daikanwa:24910
                :abstract-glyph-of       daikanwa:24910   .
-    rep.shinjigen_rev:5591
-               :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:5591    ] .
+    rep.shinjigen:5591
+               :abstract-glyph-of      shinjigen:5591    .
+    g2.ucs_unicode:0x79BF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x79BF  ] ;
+        :eq g2.adobe-japan1-0:03229   ; # &g2-AJ1-03229;
+        :eq g2.ks-x1001:0x543E        ; # &g2-AJ1-03229;
+        :eq g2.jis-x0208:0x4645       ; # &g2-AJ1-03229;
+        :eq g2.cns11643-1:0x4B35      ; # &g2-AJ1-03229;
+        :eq g2.jis-x0213-1:0x4645     ; # &g2-AJ1-03229;
+        :eq g2.gt:32132               ; # &g2-AJ1-03229;
+        :eq g2.gt-k:02621             ; # &g2-AJ1-03229;
+        :eq g2.daikanwa:24910         ; # &g2-AJ1-03229;
+        :eq g2.shinjigen:5591         ; # &g2-AJ1-03229;
+        :subsume
+            repi.daikanwa:24910  ,
+            repi.jis-x0208:0x4645 ,
+            repi.adobe-japan1-6:03229 ,
+            repi.cns11643-1:0x4B35 ,
+            repi.gt:32132        ,
+            repi.ks-x1001:0x543E ,
+            repi.ucs_unicode:0x79BF ;
+        .
+        g2.adobe-japan1-0:03229
+              :abstract-glyph-form-of adobe-japan1-0:03229   .
+        g2.ks-x1001:0x543E
+              :abstract-glyph-form-of       ks-x1001:0x543E  .
+        g2.jis-x0208:0x4645
+              :abstract-glyph-form-of      jis-x0208:0x4645  .
+        g2.cns11643-1:0x4B35
+              :abstract-glyph-form-of     cns11643-1:0x4B35  .
+        g2.jis-x0213-1:0x4645
+              :abstract-glyph-form-of    jis-x0213-1:0x4645  .
+        g2.gt:32132
+              :abstract-glyph-form-of             gt:32132   .
+        g2.gt-k:02621
+              :abstract-glyph-form-of           gt-k:02621   .
+        g2.daikanwa:24910
+              :abstract-glyph-form-of       daikanwa:24910   .
+        g2.shinjigen:5591
+              :abstract-glyph-form-of      shinjigen:5591    .
+        repi.daikanwa:24910
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:24910 ;
+            .
+        repi.jis-x0208:0x4645
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x4645 ;
+            :eq repi.jis-x0213-1:0x4645   ; # &R-J0-4645;
+            .
+            repi.jis-x0213-1:0x4645
+                          :glyph-image-of    jis-x0213-1:0x4645  .
+        repi.adobe-japan1-0:03229
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:03229 ;
+            .
+        repi.cns11643-1:0x4B35
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x4B35 ;
+            .
+        repi.gt:32132
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:32132 ;
+            :eq repi.gt-k:02621           ; # &R-GT-32132;
+            .
+            repi.gt-k:02621
+                          :glyph-image-of           gt-k:02621   .
+        repi.ks-x1001:0x543E
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x543E ;
+            :eq repi.ucs_ks:0x79BF        ; # &R-K0-543E;
+            .
+            repi.ucs_ks:0x79BF
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x79BF  ] .
+        repi.ucs_unicode:0x79BF
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x79BF  ] ;
+            .
+
+a.ucs:0x79C3
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x79C3 ;
+    :denotation-of
+        a.ucs_iwds-1:0x79BF  ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           [ :context domain:cns     ;
+                             :target  3 ] ;
+    ideo:total-strokes     [ :context domain:cns     ;
+                             :target  8 ] ;
+    ideo:strokes           2 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x79BE ; # 禾
+        isd:below    a.ucs:0x51E0   # 几
+    ] ;
+    :eq rep.gb2312:0x4D3A         ; # &I-G0-4D3A;
+    :eq rep.cns11643-3:0x2A3E     ; # &I-C3-2A3E;
+    :subsume
+        g2.ucs_unicode:0x79C3 ,
+        g2.cns11643-3:0x2A3E ;
+    .
+    rep.gb2312:0x4D3A
+               :abstract-glyph-of         gb2312:0x4D3A  .
+    rep.cns11643-3:0x2A3E
+               :abstract-glyph-of     cns11643-3:0x2A3E  .
+    g2.ucs_unicode:0x79C3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x79C3  ] ;
+        :eq g2.gb2312:0x4D3A          ; # &g2-UU+79C3;
+        :subsume
+            repi.ucs_unicode:0x79C3 ;
+        .
+        g2.gb2312:0x4D3A
+              :abstract-glyph-form-of         gb2312:0x4D3A  .
+        repi.ucs_unicode:0x79C3
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x79C3  ] ;
+            .
+    g2.cns11643-3:0x2A3E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x2A3E ;
+        :eq g2.ucs_cns:0x79C3         ; # &g2-CU+79C3;
+        .
+        g2.ucs_cns:0x79C3
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x79C3  ] .
 
 a.ucs:0x79C0
     a chisegg:abstract-character ;
@@ -832,17 +1017,6 @@ a.ucs:0x4127
     rep.cns11643-3:0x267D
                :abstract-glyph-of     cns11643-3:0x267D  .
 
-a.ucs:0x79C3
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x79C3 ;
-    ideo:radical         115 ; # â½² 
-    ideo:strokes           2 ;
-    ideo:total-strokes     7 ;
-    :eq rep.gb2312:0x4D3A         ; # &I-G0-4D3A;
-    .
-    rep.gb2312:0x4D3A
-               :abstract-glyph-of         gb2312:0x4D3A  .
-
 a.ucs:0x25750
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x25750 ;
@@ -969,7 +1143,7 @@ a.ucs:0x79C6
     :eq rep.shinjigen:5620        ; # 秆
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7A08         ] ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A08         ] ;
     .
@@ -1319,10 +1493,10 @@ a.ucs:0x79CA
         :eq rep.hanziku-7:0xC16F      ; # &I-HZK07-C16F;
         :eq rep.cbeta:05383           ; # &I-CB05383;
         :eq rep.jef-china3:0x4CB1     ; # &I-JC3-4CB1;
-        :from.original       [ :sources chisebib:zhengzitong ,
-                                        chisebib:daikanwa ,
-                                        chisebib:shinjigen ;
-                               :target  rep.adobe-japan1-0:03301 ] ;
+        ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                         chisebib:daikanwa ,
+                                         chisebib:shinjigen ;
+                                :target  rep.adobe-japan1-0:03301 ] ;
         .
         rep.ucs_unicode:0x79CA
                    :abstract-glyph-of [ :context domain:unicode ;
@@ -1424,7 +1598,7 @@ a.ucs:0x412C
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x412C  ] ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.ucs_unicode:0x4E5F   # &g2-AJ1-03829;
         ] ;
         :eq g2.daikanwa:24935         ; # &g2-M-24935;
@@ -1447,7 +1621,7 @@ a.ucs:0x412C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x2A41 ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.cns11643-1:0x443E   # &g2-CU+4E5F;
         ] ;
         :eq g2.ucs_cns:0x412C         ; # &g2-CU+412C;
@@ -1531,15 +1705,6 @@ a.ucs:0x412B
     rep.cns11643-3:0x2A40
                :abstract-glyph-of     cns11643-3:0x2A40  .
 
-rep.cns11643-3:0x2A3E
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-3:0x2A3E ;
-    :to.ucs		  a.ucs:0x79C3 ; # 秃
-    ideo:radical         115 ; # â½² 
-    ideo:strokes           3 ;
-    ideo:total-strokes     8 ;
-    .
-
 a.ucs:0x25754
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x25754 ;
@@ -1718,8 +1883,8 @@ a.ucs:0x79CC
     :eq rep.daikanwa:24941        ; # &I-M-24941;
     :eq rep.shinjigen:5596        ; # 秌
     :eq rep.jef-china3:0x5CF5     ; # &I-JC3-5CF5;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x79CB         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x79CB         ] ;
     :subsume
         g2.ucs_unicode:0x79CC ,
         g2.jef-china3:0x5CF5 ,
@@ -2239,8 +2404,8 @@ a.ucs:0x79D4
     :eq rep.shinjigen:5920        ; # 秔
     :eq rep.cbeta:00271           ; # &I-CB00271;
     :eq rep.jef-china3:0x5CF9     ; # &I-JC3-5CF9;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7CB3         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7CB3         ] ;
     :subsume
         g2.ucs_unicode:0x79D4 ;
     .
@@ -2570,7 +2735,7 @@ a.ucs:0x2576F
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2576F ] ;
         :eq rep.daikanwa:24968        ; # &M-24968;
-        :from.same           [ :sources chisebib:yupian ,
+        ideo:same-as         [ :sources chisebib:yupian ,
                                         chisebib:kangxi ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xFA7F         ] ;
@@ -2590,7 +2755,7 @@ a.ucs:0x2577A
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3355     ; # &I-C6-3355;
     :eq rep.daikanwa:24969        ; # &I-M-24969;
-    :from.same           [ :sources chisebib:chuanpian ,
+    ideo:same-as         [ :sources chisebib:chuanpian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A73         ] ;
     .
@@ -2607,7 +2772,7 @@ a.ucs:0x2577B
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3353     ; # &I-C6-3353;
     :eq rep.daikanwa:24970        ; # &I-M-24970;
-    :from.same           [ :sources chisebib:yuwen ,
+    ideo:same-as         [ :sources chisebib:yuwen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0xFA54         ] ;
     :subsume
@@ -2867,9 +3032,9 @@ a.ucs:0x25771
     rep.jis-x0213-1:0x7947
                :abstract-glyph-of    jis-x0213-1:0x7947  .
 
-rep.cbeta:08298
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of cbeta:08298 ;
+a.ucs:0x2E0B1
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E0B1 ;
     ideo:radical         115 ; # â½² 
     ideo:strokes           4 ;
     ideo:total-strokes     9 ;
@@ -2877,13 +3042,20 @@ rep.cbeta:08298
         isd:left     a.ucs:0x79BE ; # 禾
         isd:right    a.ucs:0x5C24   # å°¤
     ] ;
+    :eq rep.cbeta:08298           ; # &I-CB08298;
     :subsume
-        g2.cbeta:08298       ;
+        g2.ucs_JP...hanazono:0x2E0B1 ;
     .
-    g2.cbeta:08298
+    rep.cbeta:08298
+               :abstract-glyph-of          cbeta:08298   .
+    g2.ucs_JP...hanazono:0x2E0B1
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of cbeta:08298 ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2E0B1 ] ;
+        :eq g2.cbeta:08298            ; # &g2-CB08298;
         .
+        g2.cbeta:08298
+              :abstract-glyph-form-of          cbeta:08298   .
 
 a.ucs:0x2577E
     a chisegg:abstract-character ;
@@ -2940,8 +3112,8 @@ a.ucs:0x79D8
     :eq rep.gt-pj-1:18539         ; # &I-GT-32244;
     :eq rep.daikanwa:24977        ; # &I-M-24977;
     :eq rep.shinjigen:5536        ; # 秘
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05891 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05891 ] ;
     .
     rep.adobe-japan1-0:03455
                :abstract-glyph-of adobe-japan1-0:03455   .
@@ -3584,8 +3756,8 @@ rep.adobe-japan1-0:03359
     :eq rep.gt:32226              ; # &I-GT-32226;
     :eq rep.gt-pj-1:18281         ; # &I-GT-32226;
     :eq rep.jef-china3:0x5DC6     ; # &I-JC3-5DC6;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.jis-x0213-1_2004:0x4769 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.jis-x0213-1_2004:0x4769 ] ;
     :subsume
         g2.ucs_unicode:0x79E4 ;
     .
@@ -4717,8 +4889,8 @@ rep.adobe-japan1-0:02486
     :eq rep.gt-pj-1:15950         ; # &I-GT-32225;
     :eq rep.daikanwa...._.p:25016 ; # &AJ1-02486;
     :eq rep.cbeta:00379           ; # &I-CB00379;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05917 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05917 ] ;
     :subsume
         g2.adobe-japan1-0:02486 ;
     .
@@ -4860,6 +5032,38 @@ a.ucs:0x25783
     rep.cns11643-5:0x2F3E
                :abstract-glyph-of     cns11643-5:0x2F3E  .
 
+a.ucs:0x257A4
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x257A4 ;
+    ideo:radical         115 ; # â½² 
+    .
+
+rep.gt-k:07493
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:07493 ;
+    :denotation-of
+        a.ucs:0x257A4        ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           5 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x8D44 ; # &CDP-8D44;
+        isd:below    a.ucs:0x6728   # 木
+    ] ;
+    :eq rep.gt-pj-k1:21286        ; # &GT-K07493;
+    :subsume
+        g2.gt-k:07493        ;
+    .
+    rep.gt-pj-k1:21286
+               :abstract-glyph-of       gt-pj-k1:21286   .
+    g2.gt-k:07493
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:07493 ;
+        :eq g2.gt-pj-k1:21286         ; # &g2-GT-K07493;
+        .
+        g2.gt-pj-k1:21286
+              :abstract-glyph-form-of       gt-pj-k1:21286   .
+
 a.ucs:0x79F1
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x79F1 ;
@@ -5248,7 +5452,13 @@ o.ucs_cns:0x4143
     rep.daikanwa:25040
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:25040 ;
+        :subsume
+            g2.daikanwa:25040    ;
         .
+        g2.daikanwa:25040
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of daikanwa:25040 ;
+            .
     rep.cns11643-4:0x336B
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-4:0x336B ;
@@ -5691,7 +5901,7 @@ a.ucs:0x2F958
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x4267     ; # &I-C6-4267;
     :eq rep.daikanwa:49407        ; # &I-M-49407;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.daikanwa:09184   ] ;
     .
     rep.cns11643-6:0x4267
@@ -5856,6 +6066,46 @@ a.ucs:0x2579E
     rep.cns11643-5:0x3437
                :abstract-glyph-of     cns11643-5:0x3437  .
 
+rep.ucs_iso:0x257A4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x257A4 ] ;
+    :denotation-of
+        a.ucs:0x257A4        ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           6 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x8D44 ; # &CDP-8D44;
+        isd:below    a.ucs:0x79BE   # 禾
+    ] ;
+    :eq rep.big5-cdp:0x8D78       ; # &CDP-8D78;
+    :subsume
+        g2.ucs_iso:0x257A4   ;
+    .
+    rep.big5-cdp:0x8D78
+               :abstract-glyph-of       big5-cdp:0x8D78  .
+    g2.ucs_iso:0x257A4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x257A4 ] ;
+        :eq g2.big5-cdp:0x8D78        ; # &g2-CDP-8D78;
+        :subsume
+            repi.big5-cdp:0x8D78 ,
+            repi.ucs_iso:0x257A4 ;
+        .
+        g2.big5-cdp:0x8D78
+              :abstract-glyph-form-of       big5-cdp:0x8D78  .
+        repi.big5-cdp:0x8D78
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8D78 ;
+            .
+        repi.ucs_iso:0x257A4
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x257A4 ] ;
+            .
+
 a.ucs:0x257AF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x257AF ;
@@ -6389,6 +6639,16 @@ a.ucs:0x7A04
     ideo:radical         115 ; # â½² 
     ideo:strokes           7 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    a.ucs:0x590B   # 夋
+    ] ;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "siki" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "syoku" ) ;
+                         ] ;
     :eq a.big5:0xDADA             ; # &I-B-DADA;
     .
     a.big5:0xDADA
@@ -6402,6 +6662,10 @@ rep.cns11643-2:0x3E5E
     ideo:radical         115 ; # â½² 
     ideo:strokes           7 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.cns11643-2:0x2623   # &C2-2623;
+    ] ;
     :eq rep.ucs_cns:0x7A04        ; # &C2-3E5E;
     :eq rep.daikanwa:25069        ; # &I-M-25069;
     :subsume
@@ -6435,6 +6699,10 @@ rep.ucs_unicode:0x7A04
     ideo:radical         115 ; # â½² 
     ideo:strokes           7 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.adobe-japan1-2:08425   # &AJ1-08425;
+    ] ;
     :subsume
         g2.ucs_unicode:0x7A04 ;
     .
@@ -6512,10 +6780,10 @@ a.ucs:0x7A0E
     :eq rep.gt:32336              ; # &I-GT-32336;
     :eq rep.gt-pj-1:16455         ; # &I-GT-32336;
     :eq rep.daikanwa...._.p:25070 ; # 税
-    :from.same           [ :sources chisebib:daikanwa ;
-                           :target  rep.ks-x1001:0x612A  ] ;
-    :from.simplified     [ :context domain:JP...misc ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.ks-x1001:0x612A  ] ;
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :target  rep.ks-x1001:0x612A  ] ;
     .
     rep.adobe-japan1-0:02667
                :abstract-glyph-of adobe-japan1-0:02667   .
@@ -6979,7 +7247,7 @@ rep.cns11643-1:0x6123
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:25081 ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.mj:008132   # &g2-MJ008132;
         ] ;
         .
@@ -6995,7 +7263,7 @@ rep.cns11643-1:0x6123
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of jef-china3:0x5DAC ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.adobe-japan1-4:13942   # &g2-AJ1-13942;
         ] ;
         .
@@ -8082,8 +8350,8 @@ rep.adobe-japan1-0:03477
     :eq rep.gt-k:11165            ; # &I-GT-K11165;
     :eq rep.gt-pj-1:18723         ; # &I-GT-32477;
     :eq rep.jef-china3:0x5DC7     ; # &I-JC3-5DC7;
-    :from.simplified     [ :context domain:JP...extra...design ;
-                           :target  rep.jis-x0213-1_2004:0x4923 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra...design ;
+                              :target  rep.jis-x0213-1_2004:0x4923 ] ;
     .
     rep.ucs_jis...1990:0x7A17
                :abstract-glyph-of [ :context domain:jis...1990 ;
@@ -8877,24 +9145,58 @@ a.ucs:0x257D4
     ideo:radical         115 ; # â½² 
     ideo:strokes           8 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    a.ucs:0x23173   # 𣅳
+    ] ;
+    .
+
+rep.ucs_iso:0x257D4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x257D4 ] ;
+    :denotation-of
+        a.ucs:0x257D4        ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           8 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.ucs_iso:0x23173   # &C6-2B72;
+    ] ;
+    :eq rep.cns11643-5:0x4132     ; # &C5-4132;
+    :eq rep.daikanwa:25128        ; # &I-M-25128;
+    :form-of             [ :sources chisebib:guangyun ;
+                           :target  rep.cns11643-2:0x3E5E ] ;
+    ideo:same-as         [ :sources chisebib:guangyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-2:0x3E5E ] ;
     :subsume
-        rep.daikanwa:25128   ,
-        rep.ucs_iso:0x257D4  ,
-        rep.cns11643-5:0x4132 ;
+        g2.daikanwa:25128    ,
+        g2.ucs_iso:0x257D4   ,
+        g2.cns11643-5:0x4132 ;
     .
+    rep.cns11643-5:0x4132
+               :abstract-glyph-of     cns11643-5:0x4132  .
     rep.daikanwa:25128
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:25128 ;
+               :abstract-glyph-of       daikanwa:25128   .
+    g2.daikanwa:25128
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:25128 ;
         .
-    rep.ucs_iso:0x257D4
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x257D4 ] ;
+    g2.ucs_iso:0x257D4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x257D4 ] ;
         .
-    rep.cns11643-5:0x4132
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-5:0x4132 ;
+    g2.cns11643-5:0x4132
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x4132 ;
+        :eq g2.ucs_cns:0x257D4        ; # &g2-CU+257D4;
         .
+        g2.ucs_cns:0x257D4
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x257D4 ] .
 
 a.ucs:0x257D5
     a chisegg:abstract-character ;
@@ -9208,7 +9510,7 @@ rep.daikanwa:25135
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:25135 ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.adobe-japan1-5:19346   # &g2-AJ1-19346;
         ] ;
         .
@@ -9828,7 +10130,7 @@ rep.ucs_unicode:0x7A28
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x7A28  ] ;
         isd:structure [ a idc:â¿° ;
-            isd:left     rep.gt-k:00899 ; # &GT-K00899;
+            isd:left     g2.gt-k:00899 ; # &g2-GT-K00899;
             isd:right    g2.ucs_unicode:0x6241   # &g2-UU+6241;
         ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
@@ -10911,7 +11213,7 @@ rep.adobe-japan1-0:01204
     ideo:total-strokes    14 ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x79BE ; # 禾
-        isd:below    rep.ucs-var-001:0x8200   # &GT-K06065;
+        isd:below    rep.ucs-var-001:0x8200   # &U-v001+8200;
     ] ;
     :eq rep.ucs_unicode:0x7A32    ; # &AJ1-01204;
     :eq rep.jis-x0208:0x3070      ; # &I-J90-3070;
@@ -10920,8 +11222,8 @@ rep.adobe-japan1-0:01204
     :eq rep.gt:32476              ; # &I-GT-32476;
     :eq rep.gt-pj-1:12400         ; # &I-GT-32476;
     :eq rep.daikanwa...._.p:25187 ; # &AJ1-01204;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05918 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05918 ] ;
     :subsume
         g2.ucs_unicode:0x7A32 ;
     .
@@ -11041,8 +11343,8 @@ a.ucs:0x2F959
     :eq rep.gt-k:11664            ; # &I-GT-K11664;
     :eq rep.gt-pj-1:14706         ; # &I-GT-32448;
     :eq rep.daikanwa...._.p:25188 ; # 穀
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA54         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA54         ] ;
     :subsume
         g2.adobe-japan1-0:02052 ,
         g2.ucs_iso:0x2F959   ,
@@ -11142,6 +11444,20 @@ a.ucs:0x2F959
         :glyph-image-of hng-kar:11340 ;
         .
 
+rep.ucs-itaiji-001:0x7A40
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x7A40 ;
+    :denotation-of
+        a.ucs:0x7A40         ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes           9 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     rep.gt-k:07493 ; # &GT-K07493;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
 a.ucs:0x25822
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x25822 ;
@@ -12375,8 +12691,8 @@ a.ucs:0x7A3A
     :eq rep.cns11643-3:0x4D56     ; # &I-C3-4D56;
     :eq rep.daikanwa:25213        ; # &I-M-25213;
     :eq rep.shinjigen:5635        ; # 稺
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7A1A         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7A1A         ] ;
     :subsume
         g2.ucs_unicode:0x7A3A ;
     .
@@ -13718,8 +14034,8 @@ rep.adobe-japan1-0:03638
     :eq rep.gt:32528              ; # &I-GT-32528;
     :eq rep.gt-pj-1:19046         ; # &I-GT-32528;
     :eq rep.daikanwa...._.p:25236 ; # &AJ1-03638;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05922 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05922 ] ;
     :subsume
         g2.ucs_unicode:0x7A42 ;
     .
@@ -13886,32 +14202,39 @@ a.ucs:0x25845
     rep.cns11643-4:0x4B6A
                :abstract-glyph-of     cns11643-4:0x4B6A  .
 
-rep.mj:058231
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:058231 ;
+a.ucs:0x2E0DB
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E0DB ;
     ideo:radical         115 ; # â½² 
     ideo:strokes          10 ;
     ideo:total-strokes    15 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.cbeta:08298 ; # &CB08298;
+        isd:above    a.ucs:0x2E0B1 ; # 𮂱
         isd:below    a.ucs:0x23140   # 𣅀
     ] ;
-    :eq rep.koseki:282550         ; # &MJ058231;
+    :eq rep.mj:058231             ; # &I-MJ058231;
+    :eq rep.koseki:282550         ; # 𮃛
     :form-of             a.ucs:0x25874        ,
                          a.ucs:0x7A3D         ;
     :subsume
         g2.mj:058231         ;
     .
+    rep.mj:058231
+               :abstract-glyph-of             mj:058231  .
     rep.koseki:282550
                :abstract-glyph-of         koseki:282550  .
     g2.mj:058231
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:058231 ;
+        :eq g2.ucs_JP...hanazono:0x2E0DB ; # &g2-MJ058231;
         :eq g2.koseki:282550          ; # &g2-MJ058231;
         :subsume
             repi.hng-khm:01020   ,
             repi.mj:058231       ;
         .
+        g2.ucs_JP...hanazono:0x2E0DB
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2E0DB ] .
         g2.koseki:282550
               :abstract-glyph-form-of         koseki:282550  .
         repi.hng-khm:01020
@@ -15516,7 +15839,7 @@ rep.daikanwa:25280
     ideo:radical         115 ; # â½² 
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05926 ] ;
     .
@@ -15551,8 +15874,8 @@ rep.adobe-japan1-0:01338
     :eq rep.gt:32561              ; # &I-GT-32561;
     :eq rep.gt-pj-1:12858         ; # &I-GT-32561;
     :eq rep.daikanwa...._.p:25280 ; # &AJ1-01338;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05926 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05926 ] ;
     :subsume
         g2.ucs_unicode:0x7A4F ;
     .
@@ -15779,7 +16102,7 @@ rep.ucs-var-001:0x2585E
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.cbeta:08298 ; # &CB08298;
+        isd:above    a.ucs:0x2E0B1 ; # 𮂱
         isd:below    a.ucs:0x65E8   # 旨
     ] ;
     :form-of             a.ucs:0x7A3D         ;
@@ -15794,7 +16117,7 @@ rep.hanyo-denshi...tk:01040730
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.cbeta:08298 ; # &CB08298;
+        isd:above    a.ucs:0x2E0B1 ; # 𮂱
         isd:below    a.ucs:0x3AD6   # 㫖
     ] ;
     :eq rep.cbeta:02596           ; # &HD-TK-01040730;
@@ -15932,9 +16255,43 @@ a.ucs:0x25869
     rep.cns11643-7:0x3064
                :abstract-glyph-of     cns11643-7:0x3064  .
 
-rep.mj:058233
+a.ucs:0x25884
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x25884 ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes          11 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    a.ucs-itaiji-001:0x21569   # &A-U-i001+21569;
+    ] ;
+    .
+
+rep.ucs_iso:0x25884
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:058233 ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x25884 ] ;
+    :denotation-of
+        a.ucs:0x25884        ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes          11 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.ucs-itaiji-001:0x21569   # &U-i001+21569;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x25884   ;
+    .
+    g2.ucs_iso:0x25884
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x25884 ] ;
+        .
+
+a.ucs:0x2E0E3
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E0E3 ;
     ideo:radical         115 ; # â½² 
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
@@ -15945,21 +16302,34 @@ rep.mj:058233
     :sound               [ :context domain:ja...on ;
                            :target  ( "so" ) ;
                          ] ;
-    :eq rep.koseki:283040         ; # &MJ058233;
+    :eq rep.mj:058233             ; # &I-MJ058233;
+    :eq rep.koseki:283040         ; # 𮃣
     :form-of             [ :sources chisebib:koseki ;
                            :target  a.ucs:0x7A4C         ] ;
     :subsume
         g2.mj:058233         ;
     .
+    rep.mj:058233
+               :abstract-glyph-of             mj:058233  .
     rep.koseki:283040
                :abstract-glyph-of         koseki:283040  .
     g2.mj:058233
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:058233 ;
+        :eq g2.ucs_JP...hanazono:0x2E0E3 ; # &g2-MJ058233;
         :eq g2.koseki:283040          ; # &g2-MJ058233;
+        :subsume
+            repi.mj:058233       ;
         .
+        g2.ucs_JP...hanazono:0x2E0E3
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2E0E3 ] .
         g2.koseki:283040
               :abstract-glyph-form-of         koseki:283040  .
+        repi.mj:058233
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:058233 ;
+            .
 
 a.ucs:0x7A49
     a chisegg:abstract-character ;
@@ -18651,10 +19021,13 @@ rep.cns11643-1:0x7857
     ideo:radical         115 ; # â½² 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.gt:42188   # &GT-42188;
+    ] ;
     :eq rep.ucs_cns:0x7A6B        ; # &C1-7857;
     :eq rep.daikanwa:25346        ; # &I-M-25346;
     :subsume
-        g2.daikanwa:25346    ,
         g2.cns11643-1:0x7857 ;
     .
     rep.ucs_cns:0x7A6B
@@ -18662,18 +19035,28 @@ rep.cns11643-1:0x7857
                                     :target     ucs:0x7A6B  ] .
     rep.daikanwa:25346
                :abstract-glyph-of       daikanwa:25346   .
-    g2.daikanwa:25346
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of daikanwa:25346 ;
-        .
     g2.cns11643-1:0x7857
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-1:0x7857 ;
-        :eq g2.ucs_cns:0x7A6B         ; # &g2-CU+7A6B;
+        :eq g2.ucs_cns:0x7A6B         ; # &g2-M-25346;
+        :eq g2.daikanwa:25346         ; # &g2-M-25346;
+        :subsume
+            repi.daikanwa:25346  ,
+            repi.cns11643-1:0x7857 ;
         .
         g2.ucs_cns:0x7A6B
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x7A6B  ] .
+        g2.daikanwa:25346
+              :abstract-glyph-form-of       daikanwa:25346   .
+        repi.daikanwa:25346
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:25346 ;
+            .
+        repi.cns11643-1:0x7857
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x7857 ;
+            .
 
 a.ucs:0x258D9
     a chisegg:abstract-character ;
@@ -18801,6 +19184,10 @@ a.ucs:0x258DE
     ideo:radical         115 ; # â½² 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    a.ucs:0x7FDF   # 翟
+    ] ;
     .
 
 rep.daikanwa:25352
@@ -18811,7 +19198,18 @@ rep.daikanwa:25352
     ideo:radical         115 ; # â½² 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.jis-x0213-1:0x7A40   # &JX1-7A40;
+    ] ;
+    :form-of             rep.daikanwa:27172   ;
+    :subsume
+        g2.daikanwa:25352    ;
     .
+    g2.daikanwa:25352
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:25352 ;
+        .
 
 rep.ucs_iso:0x258DE
     a chisegg:abstract-glyph ;
@@ -18822,10 +19220,36 @@ rep.ucs_iso:0x258DE
     ideo:radical         115 ; # â½² 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.cns11643-1:0x6A4B   # &C1-6A4B;
+    ] ;
     :eq rep.cns11643-4:0x6046     ; # &C4-6046;
+    :subsume
+        g2.ucs_iso:0x258DE   ;
     .
     rep.cns11643-4:0x6046
                :abstract-glyph-of     cns11643-4:0x6046  .
+    g2.ucs_iso:0x258DE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x258DE ] ;
+        :eq g2.cns11643-4:0x6046      ; # &g2-IU-000258DE;
+        :subsume
+            repi.cns11643-4:0x6046 ,
+            repi.ucs_iso:0x258DE ;
+        .
+        g2.cns11643-4:0x6046
+              :abstract-glyph-form-of     cns11643-4:0x6046  .
+        repi.cns11643-4:0x6046
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x6046 ;
+            .
+        repi.ucs_iso:0x258DE
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x258DE ] ;
+            .
 
 a.ucs:0x258DF
     a chisegg:abstract-character ;
@@ -19023,7 +19447,7 @@ rep.daikanwa:25361
     :sound               [ :context domain:ja...on ;
                            :target  ( "ti" ) ;
                          ] ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A3A         ] ;
     :subsume
@@ -19461,7 +19885,7 @@ a.ucs:0x258F7
         :abstract-glyph-of daikanwa:40149 ;
         ideo:radical         166 ; # â¾¥ 
         ideo:strokes          12 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x7CE7         ] ;
         .
@@ -19664,7 +20088,7 @@ rep.adobe-japan1-0:05927
     :eq rep.gt:32753              ; # &I-GT-32753;
     :eq rep.gt-pj-1:25428         ; # &I-GT-32753;
     :eq rep.shinjigen:5597        ; # &AJ1-05927;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen_rev ;
                            :target  a.ucs:0x79CB         ] ;
@@ -19793,7 +20217,7 @@ rep.cns11643-3:0x5E47
     ] ;
     :eq rep.ucs_cns:0x9F9D        ; # &C3-5E47;
     :eq rep.shinjigen_1ed:5595    ; # &C3-5E47;
-    :from.ancient        [ :sources chisebib:shinjigen_1ed ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x79CB         ] ;
     :subsume
         g2.cns11643-3:0x5E47 ,
@@ -20544,6 +20968,20 @@ rep.ucs_iso:0x25913
     ideo:total-strokes    23 ;
     .
 
+rep.ucs-itaiji-001:0x9F9D
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x9F9D ;
+    ideo:radical         115 ; # â½² 
+    ideo:strokes          19 ;
+    ideo:total-strokes    24 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.ucs-itaiji-005:0x9F9C   # &U-i005+9F9C;
+    ] ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x9F9D         ] ;
+    .
+
 a.ucs:0x25917
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x25917 ;
@@ -20665,7 +21103,7 @@ rep.ucs_iso:0x2591B
     ] ;
     :eq rep.daikanwa:25401        ; # &M-25401;
     :eq rep.shinjigen:5598        ; # &M-25401;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x79CB         ] ;