projects / chise / chiset.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reformatted.
[chise/chiset.git] / Ideograph-R031-Enclosure.ttl
diff --git a/Ideograph-R031-Enclosure.ttl b/Ideograph-R031-Enclosure.ttl
index cac098c..c992b60 100644 (file)
--- a/Ideograph-R031-Enclosure.ttl
+++ b/Ideograph-R031-Enclosure.ttl
@@ -7,6 +7,7 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
 @prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
@@ -171,6 +172,7 @@
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
 @prefix rep.ucs-bmp-var-005: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-005=> .
+@prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -222,6 +224,7 @@
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
 @prefix ucs-bmp-var-005: <http://rdf.chise.org/data/ccs/ucs-bmp-var-005/code-point/> .
+@prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
 
 a.ucs:0x56D7
     a chisegg:abstract-character ;
@@ -463,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
@@ -484,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
@@ -1432,10 +1435,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;
@@ -1474,10 +1477,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
@@ -1767,10 +1770,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;
@@ -1788,10 +1791,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;
@@ -1838,10 +1841,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;
@@ -2018,10 +2021,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;
@@ -2042,10 +2045,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;
@@ -2084,10 +2087,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
@@ -2531,10 +2534,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;
@@ -2571,10 +2574,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
@@ -2814,8 +2817,10 @@ a.ucs:0x211B6
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x211B6 ;
     ideo:radical          31 ; # ⼞ 
-    ideo:strokes           4 ;
-    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  a.ucs:0x65E0   # 无
+    ] ;
     .
 
 rep.ucs_iso:0x211B6
@@ -2828,6 +2833,10 @@ rep.ucs_iso:0x211B6
     ideo:strokes           4 ;
     ideo:total-strokes     7 ;
     ideo:hanyu-dazidian  ( 1 714 3 ) ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  rep.adobe-japan1-0:05088   # &AJ1-05088;
+    ] ;
     :eq rep.daikanwa:04718        ; # &M-04718;
     :subsume
         g2.daikanwa:04718    ,
@@ -2865,9 +2874,17 @@ rep.cns11643-6:0x2A3E
     ideo:radical          31 ; # ⼞ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  rep.ucs-itaiji-001:0x65E0   # &U-i001+65E0;
+    ] ;
+    :eq rep.ucs_cns:0x211B6       ; # &C6-2A3E;
     :subsume
         g2.cns11643-6:0x2A3E ;
     .
+    rep.ucs_cns:0x211B6
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x211B6 ] .
     g2.cns11643-6:0x2A3E
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x2A3E ;
@@ -3555,11 +3572,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 ;
@@ -3969,10 +3986,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;
@@ -4036,10 +4053,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
@@ -4049,10 +4066,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;
         .
@@ -4606,10 +4623,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;
@@ -4665,10 +4682,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
@@ -4775,15 +4792,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;
@@ -4819,15 +4836,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;
@@ -4896,15 +4913,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 ;
         .
@@ -5181,10 +5198,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;
@@ -5224,10 +5241,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
@@ -5304,10 +5321,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;
@@ -5338,10 +5355,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
@@ -5643,15 +5660,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;
@@ -6065,10 +6082,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         ;
@@ -6099,10 +6116,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;
@@ -6256,10 +6273,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;
@@ -6314,10 +6331,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;
@@ -6455,10 +6472,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;
@@ -6529,10 +6546,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;
         .
@@ -6541,10 +6558,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
@@ -6950,20 +6967,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          ,
@@ -6997,10 +7014,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;
@@ -7135,10 +7152,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         ;
@@ -7151,10 +7168,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.adobe-japan1-0:07171   # &g2-AJ1-07171;
-    ] ;
+            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 ,
@@ -7497,10 +7514,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;
@@ -7581,10 +7598,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
@@ -7625,9 +7642,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   # 方
             ]
         ]
     ] ;
@@ -7691,10 +7708,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;
@@ -7735,10 +7752,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
@@ -8333,23 +8350,55 @@ a.ucs:0x21213
     ideo:total-strokes    14 ;
     .
 
-rep.daikanwa:04828
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:04828 ;
+a.mj:032900
+    a chisegg:abstract-character ;
+    :abstract-character-of mj:032900 ;
     :denotation-of
         a.ucs:0x21213        ;
     ideo:radical          31 ; # ⼞ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  a.ucs:0x771E   # 眞
+    ] ;
+    .
+
+rep.mj:032900
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:032900 ;
+    :denotation-of
+        a.mj:032900          ;
+    ideo:radical          31 ; # ⼞ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
     ideo:hanyu-dazidian  ( 1 724 11 ) ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  rep.mj:018170   # &MJ018170;
+    ] ;
+    :eq rep.koseki:055090         ; # &MJ032900;
+    :eq rep.daikanwa:04828        ; # &I-M-04828;
     :subsume
         g2.daikanwa:04828    ,
+        g2.mj:032900         ,
         rep.hanziku-2:0xE74E ;
     .
+    rep.koseki:055090
+               :abstract-glyph-of         koseki:055090  .
+    rep.daikanwa:04828
+               :abstract-glyph-of       daikanwa:04828   .
     g2.daikanwa:04828
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:04828 ;
         .
+    g2.mj:032900
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:032900 ;
+        :eq g2.koseki:055090          ; # &g2-MJ032900;
+        .
+        g2.koseki:055090
+              :abstract-glyph-form-of         koseki:055090  .
     rep.hanziku-2:0xE74E
         a chisegg:abstract-glyph ;
         :abstract-glyph-of hanziku-2:0xE74E ;
@@ -8364,6 +8413,10 @@ rep.ucs_iso:0x21213
     ideo:radical          31 ; # ⼞ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  rep.cns11643-1:0x5678   # &C1-5678;
+    ] ;
     :subsume
         g2.ucs_iso:0x21213   ;
     .
@@ -8408,6 +8461,10 @@ a.ucs:0x21215
     ideo:radical          31 ; # ⼞ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  a.ucs:0x7737   # 眷
+    ] ;
     .
 
 a.mj:032901
@@ -8425,6 +8482,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;
+        ] ;
         :eq rep.koseki:055130         ; # &MJ032901;
         :eq rep.daikanwa:04831        ; # &I-M-04831;
         :subsume
@@ -8470,6 +8531,10 @@ rep.ucs_iso:0x21215
     ideo:radical          31 ; # ⼞ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿴ ;
+        isd:surround a.ucs:0x56D7 ; # 囗
+        isd:filling  rep.cns11643-1:0x5C37   # &C1-5C37;
+    ] ;
     :eq rep.cns11643-6:0x5B54     ; # &C6-5B54;
     :subsume
         g2.ucs_iso:0x21215   ;
@@ -8588,10 +8653,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;
@@ -9379,10 +9444,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   # 囬
             ]
         ]
     ] ;
@@ -9481,10 +9546,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;
@@ -9516,10 +9581,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;
@@ -9744,7 +9809,7 @@ a.ucs:0x2122D
     :from.vulgar         [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7344         ] ;
     :subsume
-        g2.shinjigen:7639    ,
+        g2.daikanwa:04855    ,
         g2.ucs_iso:0x2122D   ,
         g2.cns11643-7:0x373C ,
         rep.hanziku-2:0xE7C9 ;
@@ -9755,13 +9820,13 @@ a.ucs:0x2122D
                :abstract-glyph-of       daikanwa:04855   .
     rep.shinjigen:7639
                :abstract-glyph-of      shinjigen:7639    .
-    g2.shinjigen:7639
+    g2.daikanwa:04855
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:7639 ;
-        :eq g2.daikanwa:04855         ; # &g2-M-04855;
+        :abstract-glyph-form-of daikanwa:04855 ;
+        :eq g2.shinjigen:7639         ; # &g2-M-04855;
         .
-        g2.daikanwa:04855
-              :abstract-glyph-form-of       daikanwa:04855   .
+        g2.shinjigen:7639
+              :abstract-glyph-form-of      shinjigen:7639    .
     g2.ucs_iso:0x2122D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
@@ -10037,10 +10102,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;
@@ -10098,10 +10163,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
@@ -10115,10 +10180,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 ;
         .
 
@@ -10156,10 +10221,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 ,
@@ -10179,19 +10244,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