- Fix prefixes used in subtrees of `isd:structure'.

- Sync up with the current environment.

diff --git a/Ideograph-R001-One.ttl b/Ideograph-R001-One.ttl
index dda1dde..6d4d0f4 100644 (file)
--- a/Ideograph-R001-One.ttl
+++ b/Ideograph-R001-One.ttl
@@ -2737,10 +2737,10 @@ rep.gt:00014
     g2.gt:00014
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00014 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x53C8 ; # &g2-AJ1-03746;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x53C8 ; # &g2-AJ1-03746;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
 
 rep.gt:00022
@@ -3839,10 +3839,10 @@ a.ucs:0x2000B
     rep.gt:00031
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00031 ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround rep.gt:00018 ; # &g2-AJ1-13463;
-        isd:filling  a.ucs:0x4E36   # 丶
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround rep.gt:00018 ; # &g2-AJ1-13463;
+            isd:filling  a.ucs:0x4E36   # 丶
+        ] ;
         :eq g2.ucs_jis:0x2000B        ; # &GT-00031;
         :eq g2.jis-x0213-1:0x2E22     ; # &GT-00031;
         :eq rep.gt-pj-2:12336         ; # &GT-00031;
@@ -3879,10 +3879,10 @@ a.ucs:0x2000B
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x2000B        ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿺ ;
-        isd:surround g2.ucs_unicode:0x4E08 ; # &g2-AJ1-02510;
-        isd:filling  a.ucs:0x4E36   # 丶
-    ] ;
+        isd:structure [ a idc:⿺ ;
+            isd:surround g2.ucs_unicode:0x4E08 ; # &g2-AJ1-02510;
+            isd:filling  a.ucs:0x4E36   # 丶
+        ] ;
         :eq g2.ucs_iso:0x2000B        ; # &g2-AJ1-13839;
         :eq g2.adobe-japan1-4:13839   ; # &g2-AJ1-13839;
         :eq g2.cns11643-3:0x2144      ; # &g2-AJ1-13839;
@@ -3961,9 +3961,9 @@ rep.adobe-japan1-5:17236
     ideo:total-strokes     4 ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿹ ;
-                :surround a.ucs:0x200CC ; # 𠃌
-                :filling  a.ucs:0x3405   # 㐅
+            isd:structure [ a idc:⿹ ;
+                isd:surround a.ucs:0x200CC ; # 𠃌
+                isd:filling  a.ucs:0x3405   # 㐅
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
@@ -4174,10 +4174,10 @@ a.ucs:0x5187
                              :target     ucs:0x5187  ] ;
         ideo:radical          13 ; # ⼌ 
         ideo:strokes           2 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20087 ; # 𠂇
-        isd:below    a.ucs:0x2E86   # ⺆
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20087 ; # 𠂇
+            isd:below    a.ucs:0x2E86   # ⺆
+        ] ;
         :eq rep.iso-ir165:0x7A29      ; # &EGB-7A29;
         .
         rep.iso-ir165:0x7A29
@@ -4187,10 +4187,10 @@ a.ucs:0x5187
         :abstract-glyph-of cns11643-2:0x212E ;
         ideo:radical           1 ; # ⼀ 
         ideo:strokes           3 ;
-    isd:structure [ a idc:⿸ ;
-        isd:surround a.ucs:0x20087 ; # 𠂇
-        isd:filling  rep.big5-cdp:0x8BF2   # &CDP-8BF2;
-    ] ;
+        isd:structure [ a idc:⿸ ;
+            isd:surround a.ucs:0x20087 ; # 𠂇
+            isd:filling  rep.big5-cdp:0x8BF2   # &CDP-8BF2;
+        ] ;
         :eq rep.ucs_cns:0x5187        ; # &C2-212E;
         .
         rep.ucs_cns:0x5187
@@ -4254,9 +4254,9 @@ rep.gt-k:00615
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E00   # 一
+            isd:structure [ a idc:⿵ ;
+                isd:surround a.ucs:0x5182 ; # 冂
+                isd:filling  a.ucs:0x4E00   # 一
             ]
         ]
     ] ;
@@ -4274,9 +4274,9 @@ rep.gt-k:00616
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  a.ucs:0x4E36   # 丶
+            isd:structure [ a idc:⿵ ;
+                isd:surround a.ucs:0x5182 ; # 冂
+                isd:filling  a.ucs:0x4E36   # 丶
             ]
         ]
     ] ;
@@ -5466,10 +5466,10 @@ rep.mj:006327
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4E19         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.ucs_unicode:0x5185   # &g2-AJ1-03258;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.ucs_unicode:0x5185   # &g2-AJ1-03258;
+        ] ;
         :eq g2.ucs_unicode:0x4E19     ; # &g2-MJ006327;
         :eq g2.adobe-japan1-0:03594   ; # &g2-MJ006327;
         :eq g2.gb2312:0x317B          ; # &g2-MJ006327;
@@ -5565,10 +5565,10 @@ rep.mj:006327
     rep.jef-china3:0x41A2
         a chisegg:abstract-glyph ;
         :abstract-glyph-of jef-china3:0x41A2 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    a.ucs:0x2F814   # 內
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    a.ucs:0x2F814   # 內
+        ] ;
         :eq rep.shinjigen:0028        ; # &JC3-41A2;
         .
         rep.shinjigen:0028
@@ -5862,9 +5862,9 @@ a.ucs:0x4E1D
     ideo:hanyu-dazidian  ( 1 17 8 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x895C ; # &CDP-895C;
-                :right    rep.big5-cdp:0x895C   # &CDP-895C;
+            isd:structure [ a idc:⿰ ;
+                isd:left     rep.big5-cdp:0x895C ; # &CDP-895C;
+                isd:right    rep.big5-cdp:0x895C   # &CDP-895C;
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
@@ -6299,15 +6299,15 @@ a.ucs:0x20019
     ideo:hanyu-dazidian  ( 1 18 2 ) ;
     isd:structure [ a idc:⿰ ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x5182   # 冂
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x5182   # 冂
             ]
         ] ;
         isd:right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x5182   # 冂
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x5182   # 冂
             ]
         ]
     ] ;
@@ -6343,10 +6343,10 @@ a.ucs:0x2001A
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2001A ] ;
         ideo:hanyu-dazidian  ( 1 19 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20AD4 ; # 𠫔
-        isd:below    rep.big5-cdp:0x8665   # &CDP-8665;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20AD4 ; # 𠫔
+            isd:below    rep.big5-cdp:0x8665   # &CDP-8665;
+        ] ;
         :eq rep.gt:00064              ; # &GT-00064;
         :eq rep.gt-pj-2:12350         ; # &GT-00064;
         :eq rep.daikanwa:00044        ; # &I-M-00044;
@@ -6363,10 +6363,10 @@ a.ucs:0x2001A
     rep.cns11643-6:0x233F
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-6:0x233F ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x20AD4 ; # 𠫔
-        isd:below    a.ucs:0x5C0F   # 小
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x20AD4 ; # 𠫔
+            isd:below    a.ucs:0x5C0F   # 小
+        ] ;
         :eq rep.ucs_cns:0x2001A       ; # &C6-233F;
         .
         rep.ucs_cns:0x2001A
@@ -6410,10 +6410,10 @@ a.ucs:0x4E20
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E20  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         :eq g2.gt:00058               ; # &g2-GT-00058;
         :eq g2.gt-k:02006             ; # &g2-GT-00058;
         :eq g2.daikanwa:00045         ; # &g2-GT-00058;
@@ -6447,10 +6447,10 @@ a.ucs:0x4E20
     g2.cns11643-3:0x2262
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x2262 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         :eq g2.ucs_cns:0x4E20         ; # &g2-CU+4E20;
         .
         g2.ucs_cns:0x4E20
@@ -6634,20 +6634,20 @@ a.ucs:0x2001B
     rep.daikanwa:05861
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:05861 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.daikanwa:05847   # &M-05847;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    rep.daikanwa:05847   # &M-05847;
+        ] ;
         .
     rep.ucs_iso:0x2001B
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2001B ] ;
         ideo:hanyu-dazidian  ( 1 17 9 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.ucs_iso:0x215DA   # &CDP-877C;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    rep.ucs_iso:0x215DA   # &CDP-877C;
+        ] ;
         :eq rep.big5-cdp:0x87EE       ; # &CDP-87EE;
         :eq rep.hanziku-1:0xA7B3      ; # &I-HZK01-A7B3;
         .
@@ -6719,6 +6719,8 @@ a.ucs:0x223AE
 a.ucs:0x3402
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3402 ;
+    :denotation-of
+        bucs:0x559C          ;
     ideo:radical           1 ; # ⼀ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
@@ -6735,6 +6737,8 @@ rep.adobe-japan1-4:13698
     :eq rep.ucs_unicode:0x3402    ; # &AJ1-13698;
     :eq rep.jis-x0213-1:0x2E23    ; # &I-JX1-2E23;
     :eq rep.daikanwa...ho:0001    ; # &AJ1-13698;
+    :from.vulgar         [ :sources chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:01578 ] ;
     :subsume
         rep.adobe-japan1-4:13699 ,
         rep.gt:00056         ;
@@ -6840,10 +6844,16 @@ rep.adobe-japan1-4:13697
     ideo:strokes           [ :context domain:misc    ;
                              :target  4 ] ;
     ideo:total-strokes     6 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x3402         ,
-                                    a.ucs:0xE0101        ] ;
+    :subsume
+        g2.adobe-japan1-4:13697 ;
     .
+    g2.adobe-japan1-4:13697
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:13697 ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x3402         ,
+                                        a.ucs:0xE0101        ] ;
+        .
 
 rep.big5-cdp:0x8D6B
     a chisegg:abstract-glyph ;
@@ -7004,10 +7014,10 @@ a.ucs:0x20022
     g2.gt:00070
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00070 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.ucs_unicode:0x6B64   # &g2-AJ1-02065;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.ucs_unicode:0x6B64   # &g2-AJ1-02065;
+        ] ;
         :eq g2.daikanwa:00047         ; # &g2-GT-00070;
         :subsume
             repi.daikanwa:00047  ,
@@ -7032,10 +7042,10 @@ a.ucs:0x20022
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20022 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    g2.cns11643-1:0x483A   # &g2-CU+6B64;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    g2.cns11643-1:0x483A   # &g2-CU+6B64;
+        ] ;
         :eq g2.cns11643-5:0x232F      ; # &g2-IU-00020022;
         :subsume
             repi.cns11643-5:0x232F ,
@@ -7524,9 +7534,9 @@ a.ucs:0x20024
     ideo:hanyu-dazidian  ( 1 19 11 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x5927 ; # 大
-                :right    a.ucs:0x5927   # 大
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x5927 ; # 大
+                isd:right    a.ucs:0x5927   # 大
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
@@ -7557,10 +7567,10 @@ rep.gt:00074
     g2.gt:00074
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00074 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.adobe-japan1-0:02658 ; # &g2-AJ1-02658;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.adobe-japan1-0:02658 ; # &g2-AJ1-02658;
+            isd:below    a.ucs:0x4E00   # 一
+        ] ;
         .
 
 a.ucs:0x2A7D7
@@ -8039,9 +8049,9 @@ a.ucs:0x2002E
         isd:above    a.ucs:0x4E00 ; # 一
         isd:middle   a.ucs:0x516B ; # 八
         isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x3405   # 㐅
+            isd:structure [ a idc:⿴ ;
+                isd:surround a.ucs:0x56D7 ; # 囗
+                isd:filling  a.ucs:0x3405   # 㐅
             ]
         ]
     ] ;
@@ -8173,10 +8183,10 @@ a.ucs:0x20030
     g2.gt:00081
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00081 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    g2.adobe-japan1-0:02455   # &g2-AJ1-02455;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E0D ; # 不
+            isd:below    g2.adobe-japan1-0:02455   # &g2-AJ1-02455;
+        ] ;
         :eq g2.daikanwa...ho:0002     ; # &g2-GT-00081;
         :subsume
             repi.daikanwa...ho:0002 ,
@@ -8196,10 +8206,10 @@ a.ucs:0x20030
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20030 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E0D ; # 不
-        isd:below    g2.ucs_unicode:0x5C11   # &g2-UU+5C11;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E0D ; # 不
+            isd:below    g2.ucs_unicode:0x5C11   # &g2-UU+5C11;
+        ] ;
         :subsume
             repi.ucs_iso:0x20030 ,
             rep.hanziku-1:0xA8F3 ;
@@ -8326,14 +8336,14 @@ a.ucs:0x20038
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x5902   # 夂
+            isd:structure [ a idc:⿰ ;
+                isd:left     [
+                    isd:structure [ a idc:⿵ ;
+                        isd:surround a.ucs:0x5182 ; # 冂
+                        isd:filling  a.ucs:0x5902   # 夂
                     ]
                 ] ;
-                :right    a.ucs:0x4E5E   # 乞
+                isd:right    a.ucs:0x4E5E   # 乞
             ]
         ]
     ] ;
@@ -8386,10 +8396,10 @@ a.ucs:0x2003C
     g2.gt:00088
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00088 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x268FB ; # 𦣻
-        isd:below    g2.adobe-japan1-0:04098   # &g2-AJ1-04098;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x268FB ; # 𦣻
+            isd:below    g2.adobe-japan1-0:04098   # &g2-AJ1-04098;
+        ] ;
         :eq g2.daikanwa...ho:0003     ; # &g2-GT-00088;
         :subsume
             repi.daikanwa...ho:0003 ,
@@ -8409,10 +8419,10 @@ a.ucs:0x2003C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2003C ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x268FB ; # 𦣻
-        isd:below    g2.ucs_unicode:0x4E42   # &g2-UU+4E42;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x268FB ; # 𦣻
+            isd:below    g2.ucs_unicode:0x4E42   # &g2-UU+4E42;
+        ] ;
         :subsume
             repi.ucs_iso:0x2003C ,
             rep.hanziku-1:0xA958 ;
@@ -8529,10 +8539,10 @@ a.ucs:0x20922
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x20922 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
-        isd:below    a.ucs:0x4E18   # 丘
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5317 ; # &g2-AJ1-03706;
+            isd:below    a.ucs:0x4E18   # 丘
+        ] ;
         :eq g2.gt:00091               ; # &g2-GT-00091;
         :eq g2.daikanwa:00062         ; # &g2-GT-00091;
         :subsume
@@ -8560,10 +8570,10 @@ a.ucs:0x20922
     g2.cns11643-6:0x3524
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x3524 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
-        isd:below    a.ucs:0x4E18   # 丘
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x4621 ; # &g2-CU+5317;
+            isd:below    a.ucs:0x4E18   # 丘
+        ] ;
         :eq g2.ucs_cns:0x20922        ; # &g2-CU+20922;
         .
         g2.ucs_cns:0x20922
@@ -9006,12 +9016,12 @@ rep.ucs_iso:0x20048
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E05 ; # 丅
         isd:below    [
-            :structure [ a idc:⿴ ;
-                :surround a.ucs:0x2E87 ; # ⺇
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5E73 ; # 平
-                        :below    a.ucs:0x53E3   # 口
+            isd:structure [ a idc:⿴ ;
+                isd:surround a.ucs:0x2E87 ; # ⺇
+                isd:filling  [
+                    isd:structure [ a idc:⿱ ;
+                        isd:above    a.ucs:0x5E73 ; # 平
+                        isd:below    a.ucs:0x53E3   # 口
                     ]
                 ]
             ]
@@ -9364,15 +9374,15 @@ rep.gt:00099
     ideo:total-strokes    20 ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ] ;
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ]
     ] ;
@@ -9395,15 +9405,15 @@ a.ucs:0x20060
     ideo:hanyu-dazidian  ( 1 28 1 ) ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ] ;
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x4E14 ; # 且
-                :right    a.ucs:0x4E14   # 且
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x4E14 ; # 且
+                isd:right    a.ucs:0x4E14   # 且
             ]
         ]
     ] ;