X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R031-Enclosure.ttl;h=6597f9b33a6912c45a1cdcdce75a2d352fc9cd47;hb=3a3dd359b344b03c50f6bf798a45ad4fee39ea62;hp=d3cf13ea9e5fb9bb266a2eed94a94b5f20d7d1b4;hpb=02441cca8a4ac337a340e491f7e016aeed00a664;p=chise%2Fchiset.git

diff --git a/Ideograph-R031-Enclosure.ttl b/Ideograph-R031-Enclosure.ttl
index d3cf13e..6597f9b 100644
--- a/Ideograph-R031-Enclosure.ttl
+++ b/Ideograph-R031-Enclosure.ttl
@@ -423,7 +423,7 @@ a.ucs:0x56D9
     :eq rep.big5-cdp:0x8DE5       ; # &I-CDP-8DE5;
     :eq rep.daikanwa:04678        ; # &I-M-04678;
     :eq rep.shinjigen:1301        ; # 囙
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x56E0         ] ;
     .
     rep.adobe-japan1-5:19270
@@ -466,18 +466,18 @@ a.ucs:0x361D
     g2.daikanwa:04679
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:04679 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  rep.gt-k:00065   # &g2-M-03115;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  rep.gt-k:00065   # &g2-M-03115;
+        ] ;
         .
     g2.cns11643-3:0x2232
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x2232 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x53C8   # &g2-AJ1-03746;
+        ] ;
         :eq g2.ucs_cns:0x361D         ; # &g2-CU+361D;
         .
         g2.ucs_cns:0x361D
@@ -487,10 +487,10 @@ a.ucs:0x361D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x361D  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  rep.gt-k:00064   # &GT-K00064;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  rep.gt-k:00064   # &GT-K00064;
+        ] ;
         .
 
 a.ucs:0x56DA
@@ -1117,43 +1117,86 @@ a.ucs:0x56DF
         isd:surround rep.big5-cdp:0x8CC8 ; # &CDP-8CC8;
         isd:filling  a.ucs:0x3405   # 㐅
     ] ;
+    :eq rep.adobe-japan1-5:17410  ; # &I-AJ1-17410;
+    :eq rep.gb2312:0x5836         ; # &I-G0-5836;
+    :eq rep.jis-x0212:0x3675      ; # &I-JSP-3675;
+    :eq rep.cns11643-2:0x2227     ; # &I-C2-2227;
+    :eq rep.jis-x0213-2:0x2455    ; # &I-JX2-2455;
     :eq a.big5:0xC9C7             ; # &I-B-C9C7;
+    :eq rep.daikanwa:04691        ; # &I-M-04691;
     :subsume
-        rep.adobe-japan1-5:17410 ,
-        rep.cns11643-2:0x2227 ;
+        g2.ucs_unicode:0x56DF ,
+        g2.cns11643-2:0x2227 ;
     .
+    rep.adobe-japan1-5:17410
+               :abstract-glyph-of adobe-japan1-5:17410   .
+    rep.gb2312:0x5836
+               :abstract-glyph-of         gb2312:0x5836  .
+    rep.jis-x0212:0x3675
+               :abstract-glyph-of      jis-x0212:0x3675  .
+    rep.cns11643-2:0x2227
+               :abstract-glyph-of     cns11643-2:0x2227  .
+    rep.jis-x0213-2:0x2455
+               :abstract-glyph-of    jis-x0213-2:0x2455  .
     a.big5:0xC9C7
            :abstract-character-of           big5:0xC9C7  .
-    rep.adobe-japan1-5:17410
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1-5:17410 ;
+    rep.daikanwa:04691
+               :abstract-glyph-of       daikanwa:04691   .
+    g2.ucs_unicode:0x56DF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x56DF  ] ;
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56DF         ,
                                         a.ucs:0xE0100        ] ;
-        :eq rep.ucs_unicode:0x56DF    ; # &AJ1-17410;
-        :eq rep.gb2312:0x5836         ; # &I-G0-5836;
-        :eq rep.jis-x0212:0x3675      ; # &I-JSP-3675;
-        :eq rep.jis-x0213-2:0x2455    ; # &I-JX2-2455;
-        :eq rep.daikanwa:04691        ; # &I-M-04691;
+        :eq g2.adobe-japan1-5:17410   ; # &g2-AJ1-17410;
+        :eq g2.gb2312:0x5836          ; # &g2-AJ1-17410;
+        :eq g2.jis-x0212:0x3675       ; # &g2-AJ1-17410;
+        :eq g2.jis-x0213-2:0x2455     ; # &g2-AJ1-17410;
+        :eq g2.daikanwa:04691         ; # &g2-AJ1-17410;
+        :subsume
+            repi.daikanwa:04691  ,
+            repi.jis-x0213-2:0x2455 ,
+            repi.adobe-japan1-6:17410 ,
+            repi.ucs_unicode:0x56DF ;
         .
-        rep.ucs_unicode:0x56DF
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x56DF  ] .
-        rep.gb2312:0x5836
-                   :abstract-glyph-of         gb2312:0x5836  .
-        rep.jis-x0212:0x3675
-                   :abstract-glyph-of      jis-x0212:0x3675  .
-        rep.jis-x0213-2:0x2455
-                   :abstract-glyph-of    jis-x0213-2:0x2455  .
-        rep.daikanwa:04691
-                   :abstract-glyph-of       daikanwa:04691   .
-    rep.cns11643-2:0x2227
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-2:0x2227 ;
-        :eq rep.ucs_cns:0x56DF        ; # &C2-2227;
+        g2.adobe-japan1-5:17410
+              :abstract-glyph-form-of adobe-japan1-5:17410   .
+        g2.gb2312:0x5836
+              :abstract-glyph-form-of         gb2312:0x5836  .
+        g2.jis-x0212:0x3675
+              :abstract-glyph-form-of      jis-x0212:0x3675  .
+        g2.jis-x0213-2:0x2455
+              :abstract-glyph-form-of    jis-x0213-2:0x2455  .
+        g2.daikanwa:04691
+              :abstract-glyph-form-of       daikanwa:04691   .
+        repi.daikanwa:04691
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:04691 ;
+            .
+        repi.jis-x0212:0x3675
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x3675 ;
+            :eq repi.jis-x0213-2:0x2455   ; # &R-JX2-2455;
+            .
+            repi.jis-x0213-2:0x2455
+                          :glyph-image-of    jis-x0213-2:0x2455  .
+        repi.adobe-japan1-5:17410
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-5:17410 ;
+            .
+        repi.ucs_unicode:0x56DF
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x56DF  ] ;
+            .
+    g2.cns11643-2:0x2227
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-2:0x2227 ;
+        :eq g2.ucs_cns:0x56DF         ; # &g2-CU+56DF;
         .
-        rep.ucs_cns:0x56DF
-                   :abstract-glyph-of [ :context domain:cns     ;
+        g2.ucs_cns:0x56DF
+              :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x56DF  ] .
 
 rep.cns11643-6:0x2430
@@ -1435,10 +1478,10 @@ a.ucs:0x56E1
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56E1         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x5973   # &g2-AJ1-02433;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x5973   # &g2-AJ1-02433;
+        ] ;
         :eq g2.adobe-japan1-5:19271   ; # &g2-AJ1-19271;
         :eq g2.gb2312:0x606F          ; # &g2-AJ1-19271;
         :eq g2.jis-x0212:0x3676       ; # &g2-AJ1-19271;
@@ -1477,10 +1520,10 @@ a.ucs:0x56E1
     g2.cns11643-2:0x2226
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x2226 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-1:0x444C   # &g2-CU+5973;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-1:0x444C   # &g2-CU+5973;
+        ] ;
         :eq g2.ucs_cns:0x56E1         ; # &g2-CU+56E1;
         .
         g2.ucs_cns:0x56E1
@@ -1668,8 +1711,8 @@ a.ucs:0x56E3
     :eq rep.gt:05918              ; # &I-GT-05918;
     :eq rep.gt-pj-1:17220         ; # &I-GT-05918;
     :eq rep.daikanwa...._.p:04703 ; # 団
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5718         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5718         ] ;
     :subsume
         g2.ucs_unicode:0x56E3 ;
     .
@@ -1770,10 +1813,10 @@ a.ucs:0x56E4
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56E4         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.adobe-japan1-0:03246   # &AJ1-03246;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.adobe-japan1-0:03246   # &AJ1-03246;
+        ] ;
         :eq rep.ucs_jis:0x56E4        ; # &AJ1-14416;
         :eq rep.jis-x0212:0x3677      ; # &I-JSP-3677;
         :eq rep.daikanwa:04704        ; # &I-M-04704;
@@ -1791,10 +1834,10 @@ a.ucs:0x56E4
     rep.cns11643-1:0x495B
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-1:0x495B ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.cns11643-1:0x453A   # &C1-453A;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.cns11643-1:0x453A   # &C1-453A;
+        ] ;
         :eq rep.ucs_unicode:0x56E4    ; # &C1-495B;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :eq rep.gb2312:0x365A         ; # &C1-495B;
@@ -1841,10 +1884,10 @@ a.ucs:0x56E5
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56E5         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x4EA2   # &g2-AJ1-04111;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x4EA2   # &g2-AJ1-04111;
+        ] ;
         :eq g2.adobe-japan1-6:21314   ; # &g2-AJ1-21314;
         :eq g2.jis-x0212:0x3678       ; # &g2-AJ1-21314;
         :eq g2.cns11643-2:0x2349      ; # &g2-AJ1-21314;
@@ -2021,10 +2064,10 @@ a.ucs:0x56E7
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:jis     ;
                              :target     ucs:0x56E7  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56DB ; # 四
-        isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56DB ; # 四
+            isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
+        ] ;
         :eq g.ucs_cns:0x56E7          ; # &G-AJ1-21316;
         :eq g.adobe-japan1-6:21316    ; # &G-AJ1-21316;
         :eq g.daikanwa:04707          ; # &G-AJ1-21316;
@@ -2045,10 +2088,10 @@ a.ucs:0x56E7
             :rep.decomposition   [ :context domain:cid     ;
                                    :target  a.ucs:0x56E7         ,
                                             a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.adobe-japan1-0:02203 ; # &g2-AJ1-02203;
-        isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround g2.adobe-japan1-0:02203 ; # &g2-AJ1-02203;
+                isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
+            ] ;
             :eq g2.ucs_jis:0x56E7         ; # &g2-AJ1-21316;
             :eq g2.jis-x0212:0x367A       ; # &g2-AJ1-21316;
             :eq g2.daikanwa:04707         ; # &g2-AJ1-21316;
@@ -2087,10 +2130,10 @@ a.ucs:0x56E7
         g2.cns11643-2:0x2348
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of cns11643-2:0x2348 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.cns11643-1:0x463E ; # &g2-CU+56DB;
-        isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround g2.cns11643-1:0x463E ; # &g2-CU+56DB;
+                isd:filling  rep.big5-cdp:0x8BC0   # &CDP-8BC0;
+            ] ;
             :eq g2.ucs_cns:0x56E7         ; # &g2-CU+56E7;
             .
             g2.ucs_cns:0x56E7
@@ -2162,9 +2205,9 @@ a.ucs_component:0x56F1
     ideo:radical          31 ; # ⼞ 
     ideo:strokes           4 ;
     ideo:total-strokes     7 ;
-    :eq rep.ucs_big5:0x56EA       ; # &IWDS1-361;
+    :eq rep.ucs_big5:0x56EA       ; # &A-compU+56F1;
     :eq a.big5:0xA777             ; # &I-B-A777;
-    :eq a.iwds-1:0361             ; # &IWDS1-361;
+    :eq a.iwds-1:0361             ; # &A-compU+56F1;
     .
     rep.ucs_big5:0x56EA
                :abstract-glyph-of [ :context domain:big5    ;
@@ -2326,7 +2369,7 @@ a.ucs:0x56EC
     :eq rep.daikanwa:04713        ; # &I-M-04713;
     :eq rep.shinjigen_1ed:1304    ; # 囬
     :eq rep.hanziku-2:0xE55E      ; # &I-HZK02-E55E;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x56DE         ] ;
     .
     rep.cns11643-3:0x252B
@@ -2368,14 +2411,14 @@ a.ucs:0x56ED
                                        :sources chisebib:zhuangzi-jijie ,
                                                 chisebib:daikanwa ] ,
                                      a.ucs:0x5718         ] ;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  [ :target  a.ucs:0x5213         ;
                                       :sources chisebib:guangyun ,
                                                chisebib:daikanwa ] ,
                                     [ :target  a.ucs:0x5718         ;
                                       :sources chisebib:jiyun ,
                                                chisebib:daikanwa ] ] ;
-    :to.mistakable       [ :sources chisebib:kangxi-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  rep.ucs_iso:0x211B6  ] ;
     :subsume
@@ -2534,10 +2577,10 @@ rep.adobe-japan1-0:04460
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56EE         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-0:01341   # &g2-AJ1-01341;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-0:01341   # &g2-AJ1-01341;
+        ] ;
         :eq g2.ucs_jis:0x56EE         ; # &g2-AJ1-04460;
         :eq g2.jis-x0208:0x5379       ; # &g2-AJ1-04460;
         :eq g2.jis-x0213-1:0x5379     ; # &g2-AJ1-04460;
@@ -2574,10 +2617,10 @@ rep.adobe-japan1-0:04460
     g2.cns11643-2:0x2347
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x2347 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-1:0x4527   # &g2-CU+5316;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-1:0x4527   # &g2-CU+5316;
+        ] ;
         :eq g2.ucs_cns:0x56EE         ; # &g2-CU+56EE;
         .
         g2.ucs_cns:0x56EE
@@ -2650,7 +2693,7 @@ a.ucs:0x56EF
     :eq rep.daikanwa:04716        ; # &I-M-04716;
     :eq rep.shinjigen_1ed:1321    ; # 囯
     :eq rep.hanziku-2:0xE4E6      ; # &I-HZK02-E4E6;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  rep.adobe-japan1-0:04467 ] ;
     .
     rep.cns11643-3:0x2529
@@ -2976,8 +3019,8 @@ a.ucs:0x56F2
     :eq rep.gt-pj-1:12367         ; # &I-GT-05925;
     :eq rep.daikanwa:04722        ; # &I-M-04722;
     :eq rep.shinjigen:1308        ; # 囲
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:008868        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:008868        ] ;
     :subsume
         g2.ucs_unicode:0x56F2 ;
     .
@@ -3360,8 +3403,8 @@ a.ucs:0x56F3
         :eq rep.gt:05950              ; # &I-GT-05950;
         :eq rep.gt-pj-1:16222         ; # &I-GT-05950;
         :eq rep.daikanwa...._.p:04734 ; # &AJ1-02596;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  rep.mj:008880        ] ;
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  rep.mj:008880        ] ;
         :subsume
             g2.adobe-japan1-0:02596 ;
         .
@@ -3515,8 +3558,8 @@ a.ucs:0x56F5
     ] ;
     :eq rep.gb2312:0x6070         ; # &I-G0-6070;
     :eq rep.hanziku-2:0xE565      ; # &I-HZK02-E565;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5707         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5707         ] ;
     .
     rep.gb2312:0x6070
                :abstract-glyph-of         gb2312:0x6070  .
@@ -3572,11 +3615,11 @@ g.ucs_unicode:0x56F6
     ideo:radical          31 ; # ⼞ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
-    :eq g.mj:008843               ; # &G-AJ1-17412;
-    :eq g.adobe-japan1-5:17412    ; # &G-AJ1-17412;
-    :eq g.jis-x0213-2:0x2457      ; # &G-AJ1-17412;
-    :eq g.hanyo-denshi...jb:0x3721 ; # &G-AJ1-17412;
-    :eq g.daikanwa:04735          ; # &G-AJ1-17412;
+    :eq g.mj:008843               ; # &G-MJ008843;
+    :eq g.adobe-japan1-5:17412    ; # &G-MJ008843;
+    :eq g.jis-x0213-2:0x2457      ; # &G-MJ008843;
+    :eq g.hanyo-denshi...jb:0x3721 ; # &G-MJ008843;
+    :eq g.daikanwa:04735          ; # &G-MJ008843;
     :subsume
         g2.mj:008843         ,
         g2.ucs_unicode:0x56F6 ;
@@ -3986,10 +4029,10 @@ a.ucs:0x56F9
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56F9         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-0:04009   # &g2-AJ1-04009;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-0:04009   # &g2-AJ1-04009;
+        ] ;
         :eq g2.ucs_jis:0x56F9         ; # &g2-AJ1-04461;
         :eq g2.ucs_ks:0x56F9          ; # &g2-AJ1-04461;
         :eq g2.ks-x1001:0x5637        ; # &g2-AJ1-04461;
@@ -4053,10 +4096,10 @@ a.ucs:0x56F9
     g2.cns11643-2:0x2571
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x2571 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  rep.gt-k:01023   # &GT-K01023;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  rep.gt-k:01023   # &GT-K01023;
+        ] ;
         :eq g2.ucs_cns:0x56F9         ; # &g2-CU+56F9;
         .
         g2.ucs_cns:0x56F9
@@ -4066,10 +4109,10 @@ a.ucs:0x56F9
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x56F9  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  rep.gt-k:01022   # &GT-K01022;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  rep.gt-k:01022   # &GT-K01022;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x6072          ; # &g2-UU+56F9;
         .
@@ -4383,12 +4426,12 @@ a.ucs:0x56FD
     :eq rep.gt-pj-1:14705         ; # &I-GT-05968;
     :eq rep.daikanwa:04752        ; # &I-M-04752;
     :eq rep.shinjigen:1318        ; # 国
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
     :subsume
         g2.ucs_unicode:0x56FD ;
     .
@@ -4623,10 +4666,10 @@ a.ucs:0x56FF
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x56FF         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.mj:013521   # &g2-MJ013521;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.mj:013521   # &g2-MJ013521;
+        ] ;
         :eq g2.adobe-japan1-0:04463   ; # &g2-AJ1-04463;
         :eq g2.gb2312:0x6073          ; # &g2-AJ1-04463;
         :eq g2.jis-x0208:0x537C       ; # &g2-AJ1-04463;
@@ -4682,10 +4725,10 @@ a.ucs:0x56FF
     g2.cns11643-1:0x504C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-1:0x504C ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-1:0x4834   # &g2-CU+6709;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-1:0x4834   # &g2-CU+6709;
+        ] ;
         :eq g2.ucs_cns:0x56FF         ; # &g2-CU+56FF;
         .
         g2.ucs_cns:0x56FF
@@ -4792,15 +4835,15 @@ a.ucs:0x5700
     a.jis-x0208:0x537B
         a chisegg:abstract-character ;
         :abstract-character-of jis-x0208:0x537B ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x513F   # 儿
-            ]
+        isd:structure [ a idc:â¿´ ;
+            isd:surround [
+                isd:structure [ a idc:â¿´ ;
+                    isd:surround a.ucs:0x56D7 ; # 囗
+                    isd:filling  a.ucs:0x513F   # 儿
+                ]
+            ] ;
+            isd:filling  a.ucs:0x65B9   # 方
         ] ;
-        isd:filling  a.ucs:0x65B9   # 方
-    ] ;
         :eq g.ucs_jis:0x5700          ; # &G-AJ1-04462;
         :eq g.ucs_cns:0x5700          ; # &G-AJ1-04462;
         :eq g.adobe-japan1-0:04462    ; # &G-AJ1-04462;
@@ -4836,15 +4879,15 @@ a.ucs:0x5700
             :rep.decomposition   [ :context domain:cid     ;
                                    :target  a.ucs:0x5700         ,
                                             a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x513F   # 儿
-            ]
-        ] ;
-        isd:filling  g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround [
+                    isd:structure [ a idc:â¿´ ;
+                        isd:surround a.ucs:0x56D7 ; # 囗
+                        isd:filling  a.ucs:0x513F   # 儿
+                    ]
+                ] ;
+                isd:filling  g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
+            ] ;
             :eq g2.ucs_cns:0x5700         ; # &g2-AJ1-04462;
             :eq g2.ucs_jis:0x5700         ; # &g2-AJ1-04462;
             :eq g2.jis-x0208:0x537B       ; # &g2-AJ1-04462;
@@ -4913,15 +4956,15 @@ a.ucs:0x5700
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:unicode ;
                              :target     ucs:0x5700  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  [
-            :structure [ a idc:⿱ ;
-                :above    rep.gt-k:00059 ; # &GT-K00059;
-                :below    a.ucs:0x65B9   # 方
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    rep.gt-k:00059 ; # &GT-K00059;
+                    isd:below    a.ucs:0x65B9   # 方
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :subsume
             g2.ucs_unicode:0x5700 ;
         .
@@ -5198,10 +5241,10 @@ a.ucs:0x5701
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5701         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-0:01908   # &g2-AJ1-01908;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-0:01908   # &g2-AJ1-01908;
+        ] ;
         :eq g2.ucs_jis:0x5701         ; # &g2-AJ1-21317;
         :eq g2.jis-x0212:0x3723       ; # &g2-AJ1-21317;
         :eq g2.daikanwa:04772         ; # &g2-AJ1-21317;
@@ -5241,10 +5284,10 @@ a.ucs:0x5701
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x5701  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x8A00   # &g2-UU+8A00;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x8A00   # &g2-UU+8A00;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-2:0x2E4A      ; # &g2-UU+5701;
         :subsume
@@ -5321,10 +5364,10 @@ a.ucs:0x5702
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5702         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.mj:024906   # &g2-MJ024906;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.mj:024906   # &g2-MJ024906;
+        ] ;
         :eq g2.ucs_jis:0x5702         ; # &g2-AJ1-21318;
         :eq g2.jis-x0212:0x3724       ; # &g2-AJ1-21318;
         :eq g2.daikanwa:04773         ; # &g2-AJ1-21318;
@@ -5355,10 +5398,10 @@ a.ucs:0x5702
     g2.cns11643-2:0x2E4B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x2E4B ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.mj:024907   # &g2-MJ024907;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.mj:024907   # &g2-MJ024907;
+        ] ;
         :eq g2.ucs_cns:0x5702         ; # &g2-CU+5702;
         :eq g2.jef-china3:0x47C3      ; # &g2-CU+5702;
         :subsume
@@ -5660,15 +5703,15 @@ a.ucs:0x5705
     rep.cns11643-3:0x3027
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-3:0x3027 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x9FB4 ; # é¾´
-        isd:below    [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x22189   # 𢆉
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x9FB4 ; # é¾´
+            isd:below    [
+                isd:structure [ a idc:â¿´ ;
+                    isd:surround a.ucs:0x56D7 ; # 囗
+                    isd:filling  a.ucs:0x22189   # 𢆉
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :eq rep.ucs_unicode:0x5705    ; # &C3-3027;
         :eq rep.daikanwa:04776        ; # &I-M-04776;
         :eq rep.cbeta:05585           ; # &I-CB05585;
@@ -6082,10 +6125,10 @@ o.ucs_unicode:0x5708
     rep.mj:008862
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:008862 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.mj:007900   # &MJ007900;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.mj:007900   # &MJ007900;
+        ] ;
         :eq rep.hanyo-denshi...ft:0x353A ; # &I-HD-FT-353A;
         :subsume
             g2.mj:008862         ;
@@ -6116,10 +6159,10 @@ o.ucs_unicode:0x5708
     rep.cns11643-1:0x594E
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-1:0x594E ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.cns11643-1:0x4C3A   # &C1-4C3A;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.cns11643-1:0x4C3A   # &C1-4C3A;
+        ] ;
         :eq rep.ucs_unicode:0x5708    ; # &C1-594E;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :eq rep.gb2312:0x4826         ; # &C1-594E;
@@ -6273,10 +6316,10 @@ a.ucs:0x5709
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5709         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-0:01982   # &g2-AJ1-01982;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-0:01982   # &g2-AJ1-01982;
+        ] ;
         :eq g2.ucs_jis:0x5709         ; # &g2-AJ1-04465;
         :eq g2.jis-x0208:0x537E       ; # &g2-AJ1-04465;
         :eq g2.jis-x0213-1:0x537E     ; # &g2-AJ1-04465;
@@ -6331,10 +6374,10 @@ a.ucs:0x5709
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x5709  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x5E78   # &g2-UU+5E78;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x5E78   # &g2-UU+5E78;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x6076          ; # &g2-UU+5709;
         :eq g2.cns11643-1:0x5950      ; # &g2-UU+5709;
@@ -6472,10 +6515,10 @@ rep.adobe-japan1-4:14417
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x570A         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x9751   # &g2-AJ1-08695;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x9751   # &g2-AJ1-08695;
+        ] ;
         :eq g2.ucs_jis:0x570A         ; # &g2-AJ1-14417;
         :eq g2.jis-x0212:0x3726       ; # &g2-AJ1-14417;
         :eq g2.jis-x0213-1:0x2F41     ; # &g2-AJ1-14417;
@@ -6546,10 +6589,10 @@ rep.cns11643-2:0x342E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x570A  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x9752   # &g2-AJ1-02664;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x9752   # &g2-AJ1-02664;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x6075          ; # &g2-UU+570A;
         .
@@ -6558,10 +6601,10 @@ rep.cns11643-2:0x342E
     g2.cns11643-2:0x342E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x342E ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-1:0x4F65   # &g2-CU+9752;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-1:0x4F65   # &g2-CU+9752;
+        ] ;
         :eq g2.ucs_cns:0x570A         ; # &g2-CU+570A;
         .
         g2.ucs_cns:0x570A
@@ -6967,20 +7010,20 @@ rep.mj:008868
     a.jis-x0208:0x5423
         a chisegg:abstract-character ;
         :abstract-character-of jis-x0208:0x5423 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.gt:57812   # &GT-57812;
-    ] ;
-        :eq g.ucs_unicode:0x570D      ; # &G-AJ1-13528;
-        :eq g.mj:008868               ; # &G-AJ1-13528;
-        :eq g.adobe-japan1-0:04468    ; # &G-AJ1-13528;
-        :eq g.adobe-japan1-4:13528    ; # &G-AJ1-13528;
-        :eq g.jis-x0208:0x5423        ; # &G-AJ1-13528;
-        :eq g.jis-x0213-1:0x5423      ; # &G-AJ1-13528;
-        :eq g.hanyo-denshi...ja:0x5423 ; # &G-AJ1-13528;
-        :eq g.gt:06038                ; # &G-AJ1-13528;
-        :eq g.gt-k:09174              ; # &G-AJ1-13528;
-        :eq g.daikanwa:04806          ; # &G-AJ1-13528;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.gt:57812   # &GT-57812;
+        ] ;
+        :eq g.ucs_unicode:0x570D      ; # &G-MJ008868;
+        :eq g.mj:008868               ; # &G-MJ008868;
+        :eq g.adobe-japan1-0:04468    ; # &G-MJ008868;
+        :eq g.adobe-japan1-4:13528    ; # &G-MJ008868;
+        :eq g.jis-x0208:0x5423        ; # &G-MJ008868;
+        :eq g.jis-x0213-1:0x5423      ; # &G-MJ008868;
+        :eq g.hanyo-denshi...ja:0x5423 ; # &G-MJ008868;
+        :eq g.gt:06038                ; # &G-MJ008868;
+        :eq g.gt-k:09174              ; # &G-MJ008868;
+        :eq g.daikanwa:04806          ; # &G-MJ008868;
         :subsume
             g2.adobe-japan1-4:13528 ,
             g2.gt:06038          ,
@@ -7014,10 +7057,10 @@ rep.mj:008868
             :rep.decomposition   [ :context domain:cid     ;
                                    :target  a.ucs:0x570D         ,
                                             a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x97CB   # &g2-GT-57812;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+                isd:filling  g2.ucs_unicode:0x97CB   # &g2-GT-57812;
+            ] ;
             :eq g2.ucs_ks:0x570D          ; # &g2-AJ1-13528;
             :eq g2.jis-x0208_1978:0x5423  ; # &g2-AJ1-13528;
             :eq g2.jis-x0208_1983:0x5423  ; # &g2-AJ1-13528;
@@ -7152,10 +7195,10 @@ rep.mj:008868
     rep.mj:008869
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:008869 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  a.jis-x0208:0x706A   # &G-AJ1-07171;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  a.jis-x0208:0x706A   # &G-MJ028060;
+        ] ;
         :eq g.hanyo-denshi...ft:0x3C6A ; # &MJ008869;
         :subsume
             g2.mj:008869         ;
@@ -7168,10 +7211,10 @@ rep.mj:008868
             :rep.decomposition   [ :context domain:hanyo-denshi ;
                                    :target  a.ucs:0x570D         ,
                                             a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.mj:028060   # &g2-MJ028060;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+                isd:filling  g2.mj:028060   # &g2-MJ028060;
+            ] ;
             :eq g2.hanyo-denshi...ft:0x3C6A ; # &g2-MJ008869;
             :subsume
                 repi.hanyo-denshi...ft:0x3C6A ,
@@ -7392,7 +7435,7 @@ a.ucs:0x570E
     :eq rep.daikanwa:04813        ; # &I-M-04813;
     :eq rep.shinjigen_1ed:1333    ; # 圎
     :eq rep.jef-china3:0x8FB5     ; # &I-JC3-8FB5;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x5713         ] ;
     :subsume
         g2.ucs_unicode:0x570E ;
@@ -7514,10 +7557,10 @@ a.ucs:0x570F
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x570F         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.mj:010798   # &MJ010798;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.mj:010798   # &MJ010798;
+        ] ;
         :eq rep.ucs_jis:0x570F        ; # &AJ1-01869;
         :eq rep.jis-x0208:0x3777      ; # &I-J90-3777;
         :eq rep.jis-x0213-1:0x3777    ; # &I-JX1-3777;
@@ -7525,8 +7568,8 @@ a.ucs:0x570F
         :eq rep.gt-k:09046            ; # &I-GT-K09046;
         :eq rep.gt-pj-1:14199         ; # &I-GT-06048;
         :eq rep.daikanwa...._.p:04815 ; # &AJ1-01869;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  rep.mj:008861        ] ;
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  rep.mj:008861        ] ;
         :subsume
             g2.adobe-japan1-0:01869 ;
         .
@@ -7598,10 +7641,10 @@ a.ucs:0x570F
     rep.cns11643-3:0x3A43
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-3:0x3A43 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.cns11643-3:0x2C44   # &C3-2C44;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.cns11643-3:0x2C44   # &C3-2C44;
+        ] ;
         :eq rep.ucs_unicode:0x570F    ; # &C3-3A43;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :subsume
@@ -7642,9 +7685,9 @@ a.ucs:0x5710
     isd:structure [ a idc:â¿´ ;
         isd:surround a.ucs:0x56D7 ; # 囗
         isd:filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x7F52 ; # 罒
-                :below    a.ucs:0x65B9   # 方
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x7F52 ; # 罒
+                isd:below    a.ucs:0x65B9   # 方
             ]
         ]
     ] ;
@@ -7708,10 +7751,10 @@ rep.adobe-japan1-6:21319
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5711         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x5C03   # &g2-AJ1-17537;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x5C03   # &g2-AJ1-17537;
+        ] ;
         :eq g2.adobe-japan1-6:21319   ; # &g2-AJ1-21319;
         :eq g2.jis-x0212:0x3728       ; # &g2-AJ1-21319;
         :eq g2.daikanwa:04816         ; # &g2-AJ1-21319;
@@ -7752,10 +7795,10 @@ rep.adobe-japan1-6:21319
     g2.cns11643-4:0x3C52
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x3C52 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-2:0x2E6B   # &g2-CU+5C03;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-2:0x2E6B   # &g2-CU+5C03;
+        ] ;
         :eq g2.ucs_cns:0x5711         ; # &g2-CU+5711;
         .
         g2.ucs_cns:0x5711
@@ -8482,10 +8525,10 @@ a.mj:032901
     rep.mj:032901
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:032901 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x56D7 ; # 囗
-        isd:filling  rep.mj:018201   # &MJ018201;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x56D7 ; # 囗
+            isd:filling  rep.mj:018201   # &MJ018201;
+        ] ;
         :eq rep.koseki:055130         ; # &MJ032901;
         :eq rep.daikanwa:04831        ; # &I-M-04831;
         :subsume
@@ -8653,10 +8696,10 @@ rep.mj:008880
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x5716         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-6:21281   # &g2-AJ1-21281;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-6:21281   # &g2-AJ1-21281;
+        ] ;
         :eq g2.ucs_cns:0x5716         ; # &g2-MJ008880;
         :eq g2.ucs_jis:0x5716         ; # &g2-MJ008880;
         :eq g2.ucs_ks:0x5716          ; # &g2-MJ008880;
@@ -8894,7 +8937,7 @@ g.ucs_unicode:0x5717
         :abstract-glyph-of [ :context domain:unicode ;
                              :target     ucs:0x5717  ] ;
         :eq rep.daikanwa:04833        ; # &M-04833;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.mj:008880        ] ;
         .
@@ -8907,7 +8950,7 @@ g.ucs_unicode:0x5717
         :eq rep.ucs_cns:0x5717        ; # &C3-4637;
         :eq rep.shinjigen_1ed:1315    ; # &C3-4637;
         :eq rep.hanziku-2:0xE7AC      ; # &I-HZK02-E7AC;
-        :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                                :target  rep.mj:008880        ] ;
         .
         rep.ucs_cns:0x5717
@@ -8942,7 +8985,7 @@ a.ucs:0x5718
     :eq rep.gt-pj-1:21541         ; # &I-GT-06086;
     :eq rep.daikanwa:04834        ; # &I-M-04834;
     :eq rep.shinjigen:1307        ; # 團
-    :from.ancient        rep.adobe-japan1-0:04894 ;
+    ideo:ancient-form-of rep.adobe-japan1-0:04894 ;
     :form-of             [ :sources chisebib:maoshi ;
                            :target  rep.cns11643-2:0x4B3F ] ;
     :from.interchangeable [ :sources chisebib:maoshi ,
@@ -9243,7 +9286,7 @@ a.ucs:0x2F84D
     :eq rep.gt:06085              ; # &I-GT-06085;
     :eq rep.gt-pj-2:23844         ; # &I-GT-06085;
     :eq rep.daikanwa...._.p:04841 ; # 圗
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:008880        ] ;
     :subsume
@@ -9444,10 +9487,10 @@ rep.daikanwa:04846
     isd:structure [ a idc:â¿´ ;
         isd:surround a.ucs:0x56D7 ; # 囗
         isd:filling  [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x53E3 ; # 口
-                :middle   rep.adobe-japan1-0:04110 ; # &AJ1-04110;
-                :below    a.ucs:0x56EC   # 囬
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x53E3 ; # 口
+                isd:middle   rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+                isd:below    a.ucs:0x56EC   # 囬
             ]
         ]
     ] ;
@@ -9546,10 +9589,10 @@ a.ucs:0x571B
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x571B         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_jis:0x776A   # &g2-JSP-4F23;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_jis:0x776A   # &g2-JSP-4F23;
+        ] ;
         :eq g2.ucs_jis:0x571B         ; # &g2-AJ1-19278;
         :eq g2.jis-x0212:0x372B       ; # &g2-AJ1-19278;
         :eq g2.daikanwa:04850         ; # &g2-AJ1-19278;
@@ -9581,10 +9624,10 @@ a.ucs:0x571B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x571B  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x776A   # &g2-M-23466;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x776A   # &g2-M-23466;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-2:0x5652      ; # &g2-UU+571B;
         :eq g2.jef-china3:0x47C7      ; # &g2-UU+571B;
@@ -9806,7 +9849,7 @@ a.ucs:0x2122D
     :eq rep.cns11643-7:0x373C     ; # &I-C7-373C;
     :eq rep.daikanwa:04855        ; # &I-M-04855;
     :eq rep.shinjigen:7639        ; # 𡈭
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7344         ] ;
     :subsume
         g2.daikanwa:04855    ,
@@ -10072,7 +10115,7 @@ rep.adobe-japan1-5:19279
     :eq rep.daikanwa:04866        ; # &I-M-04866;
     :eq rep.shinjigen:3895        ; # &AJ1-19279;
     :eq rep.cbeta:01402           ; # &I-CB01402;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6B12         ] ;
     :subsume
         g2.adobe-japan1-5:19279 ,
@@ -10102,10 +10145,10 @@ rep.adobe-japan1-5:19279
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x571D         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-5:18690   # &g2-AJ1-18690;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-5:18690   # &g2-AJ1-18690;
+        ] ;
         :eq g2.ucs_jis:0x571D         ; # &g2-AJ1-19279;
         :eq g2.jis-x0212:0x372C       ; # &g2-AJ1-19279;
         :eq g2.gt:06120               ; # &g2-AJ1-19279;
@@ -10163,10 +10206,10 @@ rep.adobe-japan1-5:19279
         g2.cns11643-3:0x5F41
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of cns11643-3:0x5F41 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  rep.ucs-bmp-var-005:0x470C   # &U-v005+470C;
-    ] ;
+            isd:structure [ a idc:â¿´ ;
+                isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+                isd:filling  rep.ucs-bmp-var-005:0x470C   # &U-v005+470C;
+            ] ;
             :eq g2.ucs_cns:0x571D         ; # &g2-CU+571D;
             .
             g2.ucs_cns:0x571D
@@ -10180,10 +10223,10 @@ rep.adobe-japan1-5:19279
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x571D  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x470C   # &g2-UU+470C;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x470C   # &g2-UU+470C;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -10221,10 +10264,10 @@ a.ucs:0x571E
     g2.gt:06121
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:06121 ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.adobe-japan1-0:05330   # &g2-AJ1-05330;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.adobe-japan1-0:05330   # &g2-AJ1-05330;
+        ] ;
         :eq g2.daikanwa...._.p:04866  ; # &g2-GT-06121;
         :subsume
             repi.daikanwa...._.p:04866 ,
@@ -10244,19 +10287,19 @@ a.ucs:0x571E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x571E  ] ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.ucs_unicode:0x6B12   # &g2-UU+6B12;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.ucs_unicode:0x6B12   # &g2-UU+6B12;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
     g2.cns11643-2:0x715A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x715A ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
-        isd:filling  g2.cns11643-2:0x6F30   # &g2-CU+6B12;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround g2.ucs_unicode:0x56D7 ; # &g2-AJ1-04459;
+            isd:filling  g2.cns11643-2:0x6F30   # &g2-CU+6B12;
+        ] ;
         :eq g2.ucs_cns:0x571E         ; # &g2-CU+571E;
         .
         g2.ucs_cns:0x571E