X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fisd.git;a=blobdiff_plain;f=ISD-UCS-Ext-B-1.ttl;h=72b54bfe56828d8443be130f16365c31b66c1d5a;hp=157a64e40419dcd0d79a4c55bdc4185d6e730717;hb=HEAD;hpb=ebbb339bad3e77b28975e8417b7904efab93a480

diff --git a/ISD-UCS-Ext-B-1.ttl b/ISD-UCS-Ext-B-1.ttl
index 157a64e..72b54bf 100644
--- a/ISD-UCS-Ext-B-1.ttl
+++ b/ISD-UCS-Ext-B-1.ttl
@@ -4,6 +4,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix ucs: <http://www.chise.org/est/view/character/ucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
@@ -26,23 +27,29 @@
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
 @prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
+@prefix o.big5-cdp: <http://www.chise.org/est/view/character/o.big5-cdp=> .
 @prefix a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
+@prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix rep.gt-k: <http://www.chise.org/est/view/character/rep.gt-k=> .
 @prefix a.gt-k: <http://www.chise.org/est/view/character/a.gt-k=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
-@prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
 @prefix rep.hanziku-2: <http://www.chise.org/est/view/character/rep.hanziku-2=> .
 @prefix rep.hanziku-7: <http://www.chise.org/est/view/character/rep.hanziku-7=> .
 @prefix a.cbeta: <http://www.chise.org/est/view/character/a.cbeta=> .
+@prefix rep.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
+@prefix a.ruimoku-v6: <http://www.chise.org/est/view/character/a.ruimoku-v6=> .
+@prefix rep.big5-cdp-itaiji-002: <http://www.chise.org/est/view/character/rep.big5-cdp-itaiji-002=> .
 @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-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
+@prefix a.ucs-itaiji-003: <http://www.chise.org/est/view/character/a.ucs-itaiji-003=> .
 @prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 @prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
+@prefix rep.ucs-itaiji-006: <http://www.chise.org/est/view/character/rep.ucs-itaiji-006=> .
 @prefix rep.ucs-itaiji-007: <http://www.chise.org/est/view/character/rep.ucs-itaiji-007=> .
 
 ucs:0x20001   # 𠀁
@@ -91,14 +98,9 @@ ucs:0x2000B   # 𠀋
         :filling  a.ucs:0x4E36   # 丶
     ] .
 ucs:0x2000E   # 𠀎
-    :structure [ a idc:â¿° ;
-        :left     a.ucs:0x4E09 ; # 三
-        :right    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x4E28 ; # 丨
-                :right    a.ucs:0x4E28   # 丨
-            ]
-        ]
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x4E95 ; # 井
+        :below    a.ucs:0x4E00   # 一
     ] .
 ucs:0x2000F   # 𠀏
     :structure [ a idc:⿱ ;
@@ -818,7 +820,7 @@ ucs:0x20089   # 𠂉
 ucs:0x2008A   # 𠂊
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4E3F ; # 丿
-        :right    rep.big5-cdp:0x8BA2   # &CDP-8BA2;
+        :right    a.ucs:0x31C7   # ㇇
     ] .
 ucs:0x2008B   # 𠂋
     :structure [ a idc:⿸ ;
@@ -975,8 +977,8 @@ ucs:0x200A8   # 𠂨
     ] .
 ucs:0x200A9   # 𠂩
     :structure [ a idc:â¿° ;
-        :left     rep.big5-cdp:0x8CAC ; # &CDP-8CAC;
-        :right    rep.big5-cdp:0x8CAC   # &CDP-8CAC;
+        :left     rep.gt-k:00594 ; # &GT-K00594;
+        :right    rep.gt-k:00594   # &GT-K00594;
     ] .
 ucs:0x200AA   # 𠂪
     :structure [ a idc:â¿° ;
@@ -1107,12 +1109,7 @@ ucs:0x200BB   # 𠂻
 ucs:0x200BD   # 𠂽
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7536 ; # 甶
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    rep.big5-cdp:0x8CC6   # &CDP-8CC6;
-            ]
-        ]
+        :below    rep.ucs-itaiji-001:0x5140   # &U-i001+5140;
     ] .
 ucs:0x200BE   # 𠂾
     :structure [ a idc:â¿° ;
@@ -1298,7 +1295,7 @@ ucs:0x200E3   # 𠃣
     ] .
 ucs:0x200E4   # 𠃤
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8CAC ; # &CDP-8CAC;
+        :above    a.ucs_component:0x2CF16 ; # &A-compU+2CF16;
         :below    a.ucs:0x2BDA7   # 𫶧
     ] .
 ucs:0x200E5   # 𠃥
@@ -1337,19 +1334,14 @@ ucs:0x200EB   # 𠃫
         :below    a.ucs:0x200CC   # 𠃌
     ] .
 ucs:0x200EC   # 𠃬
-    :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿹ ;
-                :surround rep.big5-cdp:0x89C8 ; # &CDP-89C8;
+    :structure [ a idc:â¿· ;
+        :surround [
+            :structure [ a idc:â¿´ ;
+                :surround a.ucs:0x5DF1 ; # å·±
                 :filling  rep.big5-cdp:0x8C78   # &CDP-8C78;
             ]
         ] ;
-        :below    [
-            :structure [ a idc:â¿· ;
-                :surround a.ucs:0x5338 ; # 匸
-                :filling  a.ucs:0x5338   # 匸
-            ]
-        ]
+        :filling  a.ucs:0x531A   # 匚
     ] .
 ucs:0x200ED   # 𠃭
     :structure [ a idc:â¿° ;
@@ -1642,7 +1634,7 @@ ucs:0x20117   # 𠄗
     ] .
 ucs:0x20118   # 𠄘
     :structure [ a idc:⿲ ;
-        :left     rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
+        :left     a.ucs:0x31C7 ; # ㇇
         :middle   [
             :structure [ a idc:â¿» ;
                 :underlying a.ucs:0x4E86 ; # 了
@@ -1753,9 +1745,9 @@ ucs:0x20127   # 𠄧
         :filling  a.ucs:0x4E8C   # 二
     ] .
 ucs:0x20128   # 𠄨
-    :structure [ a idc:â¿» ;
-        :underlying a.ucs:0x20120 ; # 𠄠
-        :overlaying rep.adobe-japan1-0:01422   # &AJ1-01422;
+    :structure [ a idc:â¿´ ;
+        :surround a.ucs_component:0x4E8C ; # &A-compU+4E8C;
+        :filling  a.ucs:0x5916   # 外
     ] .
 ucs:0x20129   # 𠄩
     :structure [ a idc:â¿° ;
@@ -2065,10 +2057,9 @@ ucs:0x2015A   # 𠅚
         :below    a.ucs:0x4F7F   # 使
     ] .
 ucs:0x2015B   # 𠅛
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    a.ucs:0x342B ; # 㐫
-        :middle   a.ucs:0x5E7A ; # 幺
-        :below    a.ucs:0x4E28   # 丨
+        :below    a.ucs:0x221AF   # 𢆯
     ] .
 ucs:0x2015C   # 𠅜
     :structure [ a idc:⿱ ;
@@ -2593,7 +2584,7 @@ ucs:0x20197   # 𠆗
 ucs:0x20198   # 𠆘
     :structure [ a idc:⿱ ;
         :above    rep.ucs-itaiji-002:0x5546 ; # &U-i002+5546;
-        :below    rep.gt-k:01369   # &GT-K01369;
+        :below    rep.ucs-itaiji-001:0x8863   # &U-i001+8863;
     ] .
 ucs:0x20199   # 𠆙
     :structure [ a idc:â¿° ;
@@ -3002,12 +2993,7 @@ ucs:0x201D8   # 𠇘
 ucs:0x201D9   # 𠇙
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E8C ; # 二
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :right    rep.big5-cdp:0x8BAA   # &CDP-8BAA;
     ] .
 ucs:0x201DA   # 𠇚
     :structure [ a idc:⿱ ;
@@ -4401,18 +4387,7 @@ ucs:0x202AE   # 𠊮
 ucs:0x202AF   # 𠊯
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5B80 ; # 宀
-                :middle   [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.gt-k:00059 ; # &GT-K00059;
-                        :below    a.ucs:0x201A2   # 𠆢
-                    ]
-                ] ;
-                :below    a.ucs:0x53C8   # 又
-            ]
-        ]
+        :right    a.ucs:0x53DC   # 叜
     ] .
 ucs:0x202B0   # 𠊰
     :structure [ a idc:â¿° ;
@@ -5114,7 +5089,7 @@ ucs:0x2030F   # 𠌏
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.adobe-japan1-4:13834 ; # &AJ1-13834;
+                        :above    a.ucs:0x2D544 ; # 𭕄
                         :below    a.ucs:0x4E00   # 一
                     ]
                 ] ;
@@ -5235,7 +5210,7 @@ ucs:0x2031C   # 𠌜
 ucs:0x2031D   # 𠌝
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    a.daikanwa:13458   # &A-M-13458;
+        :right    a.ucs_iwds-1:0x2304B   # &A-IWDSU+2304B;
     ] .
 ucs:0x2031E   # 𠌞
     :structure [ a idc:â¿° ;
@@ -5513,13 +5488,17 @@ ucs:0x2034A   # 𠍊
         :left     a.ucs:0x4EBB ; # 亻
         :right    a.ucs:0x5BBF   # 宿
     ] .
+ucs:0x2034B   # 𠍋
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.ucs-itaiji-001:0x5F37   # &U-i001+5F37;
+    ] .
 ucs:0x2034C   # 𠍌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
         :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5B80 ; # 宀
-                :middle   a.ucs:0x5FC3 ; # 心
+            :structure [ a idc:⿱ ;
+                :above    a.ucs:0x2BCBD ; # 𫲽
                 :below    a.ucs:0x5FC3   # 心
             ]
         ]
@@ -5850,27 +5829,7 @@ ucs:0x20377   # 𠍷
 ucs:0x20378   # 𠍸
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4E3F ; # 丿
-                        :below    a.ucs:0x2EAB   # ⺫
-                    ]
-                ] ;
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround [
-                            :structure [ a idc:⿹ ;
-                                :surround a.ucs:0x4EBB ; # 亻
-                                :filling  a.ucs:0x4EBA   # 人
-                            ]
-                        ] ;
-                        :filling  a.ucs:0x4EBA   # 人
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs_iwds-1:0x8846   # &A-IWDSU+8846;
     ] .
 ucs:0x20379   # 𠍹
     :structure [ a idc:â¿° ;
@@ -5878,15 +5837,10 @@ ucs:0x20379   # 𠍹
         :right    a.ucs:0x7B54   # 答
     ] .
 ucs:0x2037A   # 𠍺
-    :structure [ a idc:⿱ ;
+    :structure [ a idc:⿳ ;
         :above    rep.big5-cdp:0x8AFC ; # &CDP-8AFC;
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x2EAB ; # ⺫
-                :middle   a.ucs:0x53B6 ; # 厶
-                :below    a.ucs:0x9FB0   # é¾°
-            ]
-        ]
+        :middle   a.ucs:0x2EAB ; # ⺫
+        :below    rep.ucs-itaiji-001:0x758B   # &U-i001+758B;
     ] .
 ucs:0x2037B   # 𠍻
     :structure [ a idc:â¿° ;
@@ -6210,10 +6164,9 @@ ucs:0x203A3   # 𠎣
         ]
     ] .
 ucs:0x203A4   # 𠎤
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    rep.big5-cdp:0x8AFC ; # &CDP-8AFC;
-        :middle   a.ucs:0x5405 ; # 吅
-        :below    a.ucs:0x20541   # 𠕁
+        :below    a.ucs:0x2BAA1   # 𫪡
     ] .
 ucs:0x203A5   # 𠎥
     :structure [ a idc:â¿° ;
@@ -6223,7 +6176,7 @@ ucs:0x203A5   # 𠎥
 ucs:0x203A6   # 𠎦
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    a.ucs:0x5F3A   # 强
+        :right    a.jis-x0208:0x362F   # &J97-362F;
     ] .
 ucs:0x203A7   # 𠎧
     :structure [ a idc:â¿° ;
@@ -6907,9 +6860,8 @@ ucs:0x20404   # 𠐄
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
         :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x2053F ; # 𠔿
+            :structure [ a idc:⿱ ;
+                :above    rep.ucs-itaiji-006:0x21FFA ; # &U-i006+21FFA;
                 :below    [
                     :structure [ a idc:â¿° ;
                         :left     a.ucs:0x53F5 ; # 叵
@@ -6962,7 +6914,7 @@ ucs:0x2040C   # 𠐌
 ucs:0x2040D   # 𠐍
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    a.ucs:0x6578   # 數
+        :right    a.ucs_iwds-1:0x6578   # &A-IWDSU+6578;
     ] .
 ucs:0x2040E   # 𠐎
     :structure [ a idc:â¿° ;
@@ -7534,12 +7486,7 @@ ucs:0x20461   # 𠑡
 ucs:0x20462   # 𠑢
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EC0 ; # ⻀
-                :below    rep.cns11643-4:0x492A   # &C4-492A;
-            ]
-        ]
+        :right    a.ucs:0x85DD   # 藝
     ] .
 ucs:0x20463   # 𠑣
     :structure [ a idc:â¿° ;
@@ -7789,7 +7736,7 @@ ucs:0x20485   # 𠒅
     ] .
 ucs:0x20486   # 𠒆
     :structure [ a idc:⿱ ;
-        :above    a.ucs_component:0x56DF ; # &A-compU+56DF;
+        :above    a.ucs:0x56DF ; # 囟
         :below    a.ucs_component:0x513F   # &A-compU+513F;
     ] .
 ucs:0x20487   # 𠒇
@@ -7825,8 +7772,8 @@ ucs:0x2048A   # 𠒊
     ] .
 ucs:0x2048B   # 𠒋
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x4EA0 ; # 亠
-        :below    a.ucs:0x5147   # 兇
+        :above    a.ucs:0x342B ; # 㐫
+        :below    a.ucs_component:0x513F   # &A-compU+513F;
     ] .
 ucs:0x2048C   # 𠒌
     :structure [ a idc:⿱ ;
@@ -7952,7 +7899,7 @@ ucs:0x2049F   # 𠒟
 ucs:0x204A0   # 𠒠
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x514B ; # 克
-        :filling  a.ucs:0x53F7   # 号
+        :filling  rep.mj:057144   # &MJ057144;
     ] .
 ucs:0x204A1   # 𠒡
     :structure [ a idc:â¿° ;
@@ -8557,7 +8504,7 @@ ucs:0x20501   # 𠔁
     ] .
 ucs:0x20502   # 𠔂
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x5202 ; # 刂
+        :left     rep.big5-cdp:0x8969 ; # &CDP-8969;
         :right    a.ucs:0x516B   # 八
     ] .
 ucs:0x20503   # 𠔃
@@ -8602,12 +8549,7 @@ ucs:0x2050B   # 𠔋
     ] .
 ucs:0x2050C   # 𠔌
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿱ ;
-                :above    rep.gt-k:00059 ; # &GT-K00059;
-                :below    a.ucs:0x516B   # 八
-            ]
-        ] ;
+        :above    a.ucs:0x20501 ; # 𠔁
         :below    a.ucs:0x53E3   # 口
     ] .
 ucs:0x2050D   # 𠔍
@@ -9121,13 +9063,8 @@ ucs:0x20558   # 𠕘
     ] .
 ucs:0x20559   # 𠕙
     :structure [ a idc:⿵ ;
-        :surround a.ucs:0x5182 ; # 冂
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E8C ; # 二
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ]
+        :surround a.ucs:0x5183 ; # 冃
+        :filling  a.ucs:0x65E5   # 日
     ] .
 ucs:0x2055A   # 𠕚
     :structure [ a idc:â¿° ;
@@ -9804,7 +9741,7 @@ ucs:0x205C0   # 𠗀
     ] .
 ucs:0x205C1   # 𠗁
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2CF16 ; # 𬼖
+        :above    a.ucs_component:0x2CF16 ; # &A-compU+2CF16;
         :below    a.ucs:0x4ED2   # 仒
     ] .
 ucs:0x205C2   # 𠗂
@@ -9941,17 +9878,7 @@ ucs:0x205DA   # 𠗚
 ucs:0x205DB   # 𠗛
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x51AB ; # 冫
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4EA0 ; # 亠
-                        :below    a.ucs:0x53B6   # 厶
-                    ]
-                ] ;
-                :below    a.ucs:0x6728   # 木
-            ]
-        ]
+        :right    a.ucs:0x233CB   # 𣏋
     ] .
 ucs:0x205DC   # 𠗜
     :structure [ a idc:â¿° ;
@@ -10305,7 +10232,7 @@ ucs:0x20618   # 𠘘
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4EA0 ; # 亠
-                :below    rep.big5-cdp:0x8ADC   # &CDP-8ADC;
+                :below    a.ucs:0x25200   # 𥈀
             ]
         ]
     ] .
@@ -10522,12 +10449,7 @@ ucs:0x20642   # 𠙂
     ] .
 ucs:0x20643   # 𠙃
     :structure [ a idc:⿳ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x53B6 ; # 厶
-                :right    a.ucs:0x53B6   # 厶
-            ]
-        ] ;
+        :above    a.ucs:0x53B8 ; # 厸
         :middle   a.ucs:0x4E00 ; # 一
         :below    a.ucs:0x51E0   # 几
     ] .
@@ -11003,13 +10925,8 @@ ucs:0x2068A   # 𠚊
     ] .
 ucs:0x2068B   # 𠚋
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5DDB ; # 巛
-        :below    [
-            :structure [ a idc:⿶ ;
-                :surround a.ucs:0x51F5 ; # 凵
-                :filling  rep.big5-cdp:0x8BF1   # &CDP-8BF1;
-            ]
-        ]
+        :above    a.ucs_component:0x5DDB ; # &A-compU+5DDB;
+        :below    a.ucs_iwds-1:0x20679   # &A-IWDSU+20679;
     ] .
 ucs:0x2068C   # 𠚌
     :structure [ a idc:⿶ ;
@@ -12100,27 +12017,12 @@ ucs:0x20735   # 𠜵
     ] .
 ucs:0x20736   # 𠜶
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x6B62 ; # æ­¢
-                :below    rep.gt-k:00439   # &GT-K00439;
-            ]
-        ] ;
+        :left     a.ucs:0x23955 ; # 𣥕
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x20737   # 𠜷
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x2E8A ; # ⺊
-                        :below    a.ucs:0x65E5   # 日
-                    ]
-                ] ;
-                :below    a.ucs:0x5315   # 匕
-            ]
-        ] ;
+        :left     a.ucs:0x209E2 ; # 𠧢
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x20738   # 𠜸
@@ -12265,12 +12167,7 @@ ucs:0x2074A   # 𠝊
     ] .
 ucs:0x2074B   # 𠝋
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x5C38 ; # å°¸
-                :filling  a.ucs:0x793A   # 示
-            ]
-        ] ;
+        :left     a.ucs:0x2BD56 ; # 𫵖
         :right    a.ucs:0x5200   # 刀
     ] .
 ucs:0x2074C   # 𠝌
@@ -12315,12 +12212,7 @@ ucs:0x20750   # 𠝐
     ] .
 ucs:0x20751   # 𠝑
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x5C38 ; # å°¸
-                :filling  a.ucs:0x793A   # 示
-            ]
-        ] ;
+        :left     a.ucs:0x2BD56 ; # 𫵖
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x20752   # 𠝒
@@ -12396,18 +12288,7 @@ ucs:0x2075F   # 𠝟
     ] .
 ucs:0x20760   # 𠝠
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5B80 ; # 宀
-                :middle   [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.gt-k:00059 ; # &GT-K00059;
-                        :below    a.ucs:0x201A2   # 𠆢
-                    ]
-                ] ;
-                :below    rep.gt-k:00064   # &GT-K00064;
-            ]
-        ] ;
+        :left     a.mj:057139 ; # &A-MJ057139;
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x20761   # 𠝡
@@ -12498,7 +12379,7 @@ ucs:0x2076B   # 𠝫
     ] .
 ucs:0x2076C   # 𠝬
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x53DC ; # 叜
+        :left     rep.cns11643-3:0x2B4E ; # &C3-2B4E;
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x2076D   # 𠝭
@@ -12664,7 +12545,7 @@ ucs:0x20786   # 𠞆
     ] .
 ucs:0x20787   # 𠞇
     :structure [ a idc:â¿° ;
-        :left     rep.ucs_iso:0x23B09 ; # &C6-386A;
+        :left     a.ucs:0x23B09 ; # 𣬉
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x20788   # 𠞈
@@ -12921,12 +12802,7 @@ ucs:0x207AA   # 𠞪
     ] .
 ucs:0x207AB   # 𠞫
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5405 ; # 吅
-                :below    a.ucs:0x20541   # 𠕁
-            ]
-        ] ;
+        :left     a.ucs:0x2BAA1 ; # 𫪡
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x207AC   # 𠞬
@@ -13476,12 +13352,7 @@ ucs:0x207FC   # 𠟼
     ] .
 ucs:0x207FD   # 𠟽
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x8279 ; # 艹
-                :below    rep.cns11643-1:0x5524   # &C1-5524;
-            ]
-        ] ;
+        :left     a.ucs:0x26D6F ; # 𦵯
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x207FE   # 𠟾
@@ -13582,18 +13453,7 @@ ucs:0x2080B   # 𠠋
     ] .
 ucs:0x2080C   # 𠠌
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x9FB1 ; # é¾±
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x2E87 ; # ⺇
-                        :filling  a.ucs:0x2EA2   # ⺢
-                    ]
-                ]
-            ]
-        ] ;
+        :left     rep.ucs-itaiji-005:0x22002 ; # &U-i005+22002;
         :right    a.ucs:0x5202   # 刂
     ] .
 ucs:0x2080D   # 𠠍
@@ -13744,7 +13604,7 @@ ucs:0x20825   # ð  ¥
 ucs:0x20826   # ð  ¦
     :structure [ a idc:â¿´ ;
         :surround a.ucs:0x3F6C ; # 㽬
-        :filling  rep.adobe-japan1-4:14356   # &AJ1-14356;
+        :filling  a.ucs:0x5202   # 刂
     ] .
 ucs:0x20827   # ð  §
     :structure [ a idc:â¿° ;
@@ -14053,7 +13913,7 @@ ucs:0x20860   # ð ¡ 
     ] .
 ucs:0x20861   # ð ¡¡
     :structure [ a idc:⿱ ;
-        :above    rep.ucs_iso:0x239BC ; # &C4-244D;
+        :above    a.ucs:0x239BC ; # 𣦼
         :below    a.ucs:0x529B   # 力
     ] .
 ucs:0x20862   # ð ¡¢
@@ -14178,17 +14038,7 @@ ucs:0x20878   # 𠡸
     ] .
 ucs:0x20879   # ð ¡¹
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4E0A ; # 上
-                        :below    a.ucs:0x5915   # 夕
-                    ]
-                ] ;
-                :right    a.ucs:0x53C8   # 又
-            ]
-        ] ;
+        :above    rep.ucs-itaiji-001:0x239BC ; # &U-i001+239BC;
         :below    a.ucs:0x529B   # 力
     ] .
 ucs:0x2087A   # 𠡺
@@ -14344,12 +14194,7 @@ ucs:0x20891   # 𠢑
     ] .
 ucs:0x20892   # 𠢒
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8CAF ; # &CDP-8CAF;
-                :below    a.ucs:0x6BD4   # 比
-            ]
-        ] ;
+        :left     rep.ucs-itaiji-001:0x23B0B ; # &U-i001+23B0B;
         :right    a.ucs:0x529B   # 力
     ] .
 ucs:0x20893   # 𠢓
@@ -14997,7 +14842,7 @@ ucs:0x208F8   # 𠣸
 ucs:0x208F9   # ð £¹
     :structure [ a idc:⿹ ;
         :surround a.ucs:0x52F9 ; # 勹
-        :filling  a.ucs:0x65E2   # 既
+        :filling  a.ucs_iwds-1:0x65E3   # &A-IWDSU+65E3;
     ] .
 ucs:0x208FA   # 𠣺
     :structure [ a idc:â¿° ;
@@ -15037,7 +14882,7 @@ ucs:0x208FE   # ð £¾
 ucs:0x208FF   # 𠣿
     :structure [ a idc:⿹ ;
         :surround a.ucs:0x52F9 ; # 勹
-        :filling  rep.cns11643-4:0x384B   # &C4-384B;
+        :filling  a.ucs:0x3C83   # 㲃
     ] .
 ucs:0x20900   # 𠤀
     :structure [ a idc:â¿° ;
@@ -15161,7 +15006,7 @@ ucs:0x2090E   # 𠤎
     ] .
 ucs:0x2090F   # 𠤏
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5315 ; # 匕
+        :above    a.ucs_iwds-1:0x4E03 ; # &A-IWDSU+4E03;
         :below    a.ucs:0x5341   # 十
     ] .
 ucs:0x20910   # 𠤐
@@ -15171,7 +15016,7 @@ ucs:0x20910   # 𠤐
     ] .
 ucs:0x20911   # 𠤑
     :structure [ a idc:â¿° ;
-        :left     a.ucs_component:0x4E03 ; # &A-compU+4E03;
+        :left     a.ucs_iwds-1:0x4E03 ; # &A-IWDSU+4E03;
         :right    a.ucs:0x77E2   # 矢
     ] .
 ucs:0x20912   # 𠤒
@@ -15196,7 +15041,7 @@ ucs:0x20914   # 𠤔
     ] .
 ucs:0x20915   # 𠤕
     :structure [ a idc:⿱ ;
-        :above    a.ucs_component:0x4E03 ; # &A-compU+4E03;
+        :above    a.ucs_iwds-1:0x4E03 ; # &A-IWDSU+4E03;
         :below    a.ucs:0x77E2   # 矢
     ] .
 ucs:0x20916   # 𠤖
@@ -15207,7 +15052,7 @@ ucs:0x20916   # 𠤖
 ucs:0x20917   # 𠤗
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x20915 ; # 𠤕
-        :right    a.ucs_component:0x4E03   # &A-compU+4E03;
+        :right    a.ucs_iwds-1:0x4E03   # &A-IWDSU+4E03;
     ] .
 ucs:0x20918   # 𠤘
     :structure [ a idc:â¿° ;
@@ -15227,7 +15072,7 @@ ucs:0x2091A   # 𠤚
 ucs:0x2091C   # 𠤜
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x253A8 ; # 𥎨
-        :right    a.ucs_component:0x4E03   # &A-compU+4E03;
+        :right    a.ucs_iwds-1:0x4E03   # &A-IWDSU+4E03;
     ] .
 ucs:0x2091D   # 𠤝
     :structure [ a idc:⿱ ;
@@ -15420,7 +15265,7 @@ ucs:0x20936   # 𠤶
                 :right    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x4E28 ; # 丨
-                        :below    rep.big5-cdp:0x8BA2   # &CDP-8BA2;
+                        :below    a.ucs:0x31C7   # ㇇
                     ]
                 ]
             ]
@@ -15878,9 +15723,8 @@ ucs:0x20990   # 𠦐
         :overlaying a.ucs:0x2062C   # 𠘬
     ] .
 ucs:0x20993   # 𠦓
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x4E00 ; # 一
-        :middle   a.ucs:0x706B ; # 火
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x706D ; # 灭
         :below    a.ucs:0x5341   # 十
     ] .
 ucs:0x20994   # 𠦔
@@ -15900,12 +15744,7 @@ ucs:0x20995   # 𠦕
     ] .
 ucs:0x20996   # 𠦖
     :structure [ a idc:⿸ ;
-        :surround [
-            :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1-4:13834 ; # &AJ1-13834;
-                :below    a.ucs:0x5382   # 厂
-            ]
-        ] ;
+        :surround rep.gt-k:01442 ; # &GT-K01442;
         :filling  a.ucs:0x5341   # 十
     ] .
 ucs:0x20997   # 𠦗
@@ -16415,8 +16254,8 @@ ucs:0x209E1   # 𠧡
     ] .
 ucs:0x209E2   # 𠧢
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2E8A ; # ⺊
-        :below    a.ucs:0x3AD0   # 㫐
+        :above    rep.ucs-itaiji-002:0x5364 ; # &U-i002+5364;
+        :below    a.ucs:0x5315   # 匕
     ] .
 ucs:0x209E3   # 𠧣
     :structure [ a idc:⿱ ;
@@ -16461,12 +16300,7 @@ ucs:0x209E6   # 𠧦
 ucs:0x209E7   # 𠧧
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2E8A ; # ⺊
-        :below    [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x5902   # 夂
-            ]
-        ]
+        :below    rep.gt-k:01840   # &GT-K01840;
     ] .
 ucs:0x209E8   # 𠧨
     :structure [ a idc:â¿° ;
@@ -16514,34 +16348,14 @@ ucs:0x209EF   # 𠧯
         :below    a.ucs:0x34B7   # 㒷
     ] .
 ucs:0x209F0   # ð §°
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2E8A ; # ⺊
-        :below    [
-            :structure [ a idc:⿵ ;
-                :surround a.ucs:0x5182 ; # 冂
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4E8C ; # 二
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿵ ;
+        :surround rep.gt-k:00876 ; # &GT-K00876;
+        :filling  a.ucs-itaiji-001:0x53EA   # &A-U-i001+53EA;
     ] .
 ucs:0x209F1   # 𠧱
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x200CA ; # 𠃊
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :below    [
-                    :structure [ a idc:â¿´ ;
-                        :surround a.ucs:0x56D7 ; # 囗
-                        :filling  rep.big5-cdp:0x89D5   # &CDP-89D5;
-                    ]
-                ]
-            ]
-        ]
+        :filling  a.ucs:0x5365   # 卥
     ] .
 ucs:0x209F2   # 𠧲
     :structure [ a idc:⿱ ;
@@ -16661,28 +16475,18 @@ ucs:0x209FC   # 𠧼
     ] .
 ucs:0x209FE   # 𠧾
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :below    [
-                    :structure [ a idc:â¿´ ;
-                        :surround a.ucs:0x56D7 ; # 囗
-                        :filling  a.ucs:0x5902   # 夂
-                    ]
-                ]
-            ]
-        ] ;
-        :below    a.ucs:0x5902   # 夂
+        :above    a.ucs:0x5365 ; # 卥
+        :below    a.ucs_component:0x590A   # &A-compU+590A;
     ] .
 ucs:0x209FF   # 𠧿
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2E8A ; # ⺊
-        :below    [
+    :structure [ a idc:⿵ ;
+        :surround [
             :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8C58 ; # &CDP-8C58;
-                :filling  a.ucs:0x5931   # 失
+                :surround rep.gt-k:00876 ; # &GT-K00876;
+                :filling  a.ucs_component:0x513F   # &A-compU+513F;
             ]
-        ]
+        ] ;
+        :filling  a.ucs:0x5931   # 失
     ] .
 ucs:0x20A00   # 𠨀
     :structure [ a idc:⿱ ;
@@ -16742,22 +16546,7 @@ ucs:0x20A04   # 𠨄
 ucs:0x20A05   # 𠨅
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x200CA ; # 𠃊
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x2E8A ; # ⺊
-                        :below    a.ucs:0x65E5   # 日
-                    ]
-                ] ;
-                :below    [
-                    :structure [ a idc:â¿´ ;
-                        :surround a.ucs:0x56D7 ; # 囗
-                        :filling  a.ucs:0x5902   # 夂
-                    ]
-                ]
-            ]
-        ]
+        :filling  a.ucs-itaiji-001:0x5364   # &A-U-i001+5364;
     ] .
 ucs:0x20A06   # 𠨆
     :structure [ a idc:⿱ ;
@@ -16777,24 +16566,9 @@ ucs:0x20A06   # 𠨆
 ucs:0x20A07   # 𠨇
     :structure [ a idc:⿱ ;
         :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
-                        :filling  [
-                            :structure [ a idc:⿱ ;
-                                :above    rep.gt-k:00064 ; # &GT-K00064;
-                                :below    [
-                                    :structure [ a idc:â¿° ;
-                                        :left     rep.gt-k:00064 ; # &GT-K00064;
-                                        :right    rep.gt-k:00064   # &GT-K00064;
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
+            :structure [ a idc:⿵ ;
+                :surround rep.gt-k:00876 ; # &GT-K00876;
+                :filling  a.ucs:0x53D2   # 叒
             ]
         ] ;
         :below    a.ucs:0x6728   # 木
@@ -16842,14 +16616,9 @@ ucs:0x20A0B   # 𠨋
 ucs:0x20A0C   # 𠨌
     :structure [ a idc:⿱ ;
         :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
-                        :filling  a.ucs:0x6761   # 条
-                    ]
-                ]
+            :structure [ a idc:⿵ ;
+                :surround rep.gt-k:00876 ; # &GT-K00876;
+                :filling  a.ucs:0x6761   # 条
             ]
         ] ;
         :below    [
@@ -16876,7 +16645,7 @@ ucs:0x20A0F   # 𠨏
     ] .
 ucs:0x20A10   # 𠨐
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x5315 ; # 匕
+        :left     a.ucs_iwds-1:0x4E03 ; # &A-IWDSU+4E03;
         :right    a.ucs:0x5369   # 卩
     ] .
 ucs:0x20A11   # 𠨑
@@ -16934,7 +16703,7 @@ ucs:0x20A19   # 𠨙
         :left     [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4E36 ; # 丶
-                :below    rep.big5-cdp:0x8BA2   # &CDP-8BA2;
+                :below    a.ucs:0x31C7   # ㇇
             ]
         ] ;
         :right    a.ucs:0x5374   # 却
@@ -17232,12 +17001,7 @@ ucs:0x20A4B   # 𠩋
 ucs:0x20A4C   # 𠩌
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  rep.big5-cdp:0x89D5   # &CDP-89D5;
-            ]
-        ]
+        :filling  a.ucs-itaiji-001:0x56EA   # &A-U-i001+56EA;
     ] .
 ucs:0x20A4D   # 𠩍
     :structure [ a idc:⿸ ;
@@ -17852,7 +17616,7 @@ ucs:0x20AAC   # 𠪬
             :structure [ a idc:â¿° ;
                 :left     [
                     :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
+                        :above    a.ucs:0x31C7 ; # ㇇
                         :below    a.ucs:0x8033   # 耳
                     ]
                 ] ;
@@ -18414,7 +18178,7 @@ ucs:0x20AF4   # ð «´
 ucs:0x20AF5   # ð «µ
     :structure [ a idc:⿱ ;
         :above    rep.gt-k:01085 ; # &GT-K01085;
-        :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
+        :below    a.ucs:0x2E97   # ⺗
     ] .
 ucs:0x20AF6   # 𠫶
     :structure [ a idc:⿱ ;
@@ -19072,23 +18836,13 @@ ucs:0x20B56   # 𠭖
         :right    a.ucs:0x53C8   # 又
     ] .
 ucs:0x20B57   # 𠭗
-    :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿸ ;
-                :surround rep.gt-k:00880 ; # &GT-K00880;
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4E00 ; # 一
-                        :below    a.ucs:0x4E95   # 井
-                    ]
-                ]
-            ]
-        ] ;
-        :right    a.ucs:0x53C8   # 又
+    :structure [ a idc:⿵ ;
+        :surround rep.ucs-itaiji-002:0x239BB ; # &U-i002+239BB;
+        :filling  a.ucs:0x4E95   # 井
     ] .
 ucs:0x20B58   # 𠭘
     :structure [ a idc:⿱ ;
-        :above    rep.ucs_iso:0x239BC ; # &C4-244D;
+        :above    a.ucs:0x239BC ; # 𣦼
         :below    a.ucs:0x4E95   # 井
     ] .
 ucs:0x20B59   # 𠭙
@@ -19134,23 +18888,8 @@ ucs:0x20B5F   # 𠭟
     ] .
 ucs:0x20B60   # ð ­ 
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E88 ; # ⺈
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
-                        :filling  a.ucs:0x513F   # 儿
-                    ]
-                ]
-            ]
-        ] ;
-        :below    [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x5C38 ; # å°¸
-                :filling  a.ucs:0x53C8   # 又
-            ]
-        ]
+        :above    rep.gt-k:02232 ; # &GT-K02232;
+        :below    a.ucs:0x378B   # 㞋
     ] .
 ucs:0x20B62   # ð ­¢
     :structure [ a idc:⿱ ;
@@ -19256,17 +18995,7 @@ ucs:0x20B6D   # ð ­­
     ] .
 ucs:0x20B6E   # ð ­®
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4E0A ; # 上
-                        :below    a.ucs:0x5915   # 夕
-                    ]
-                ] ;
-                :right    a.ucs:0x53C8   # 又
-            ]
-        ] ;
+        :above    rep.ucs-itaiji-001:0x239BC ; # &U-i001+239BC;
         :below    a.ucs:0x4E95   # 井
     ] .
 ucs:0x20B6F   # ð ­¯
@@ -19428,25 +19157,9 @@ ucs:0x20B7D   # ð ­½
         ]
     ] .
 ucs:0x20B7E   # ð ­¾
-    :structure [ a idc:⿳ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     rep.gt-k:00064 ; # &GT-K00064;
-                :right    a.ucs:0x53C8   # 又
-            ]
-        ] ;
-        :middle   [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x2E88 ; # ⺈
-                :right    a.ucs:0x2E88   # ⺈
-            ]
-        ] ;
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5DFE ; # å·¾
-                :right    a.ucs:0x5DFE   # å·¾
-            ]
-        ]
+    :structure [ a idc:â¿° ;
+        :left     rep.ucs-itaiji-006:0x38C7 ; # &U-i006+38C7;
+        :right    rep.ucs-itaiji-006:0x38C7   # &U-i006+38C7;
     ] .
 ucs:0x20B7F   # ð ­¿
     :structure [ a idc:â¿° ;
@@ -19524,25 +19237,9 @@ ucs:0x20B86   # 𠮆
         :below    a.ucs:0x6557   # 敗
     ] .
 ucs:0x20B87   # 𠮇
-    :structure [ a idc:⿳ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     rep.gt-k:00064 ; # &GT-K00064;
-                :right    a.ucs:0x53C8   # 又
-            ]
-        ] ;
-        :middle   [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5902 ; # 夂
-                :right    a.ucs:0x5902   # 夂
-            ]
-        ] ;
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5DFE ; # å·¾
-                :right    a.ucs:0x5DFE   # å·¾
-            ]
-        ]
+    :structure [ a idc:â¿° ;
+        :left     rep.ucs-itaiji-007:0x38C7 ; # &U-i007+38C7;
+        :right    rep.ucs-itaiji-007:0x38C7   # &U-i007+38C7;
     ] .
 ucs:0x20B88   # 𠮈
     :structure [ a idc:â¿° ;
@@ -19952,7 +19649,7 @@ ucs:0x20BC3   # 𠯃
 ucs:0x20BC4   # 𠯄
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    a.ucs_component:0x5203   # &BUCS+5203;
+        :right    a.ucs_iwds-1:0x5203   # &A-IWDSU+5203;
     ] .
 ucs:0x20BC5   # 𠯅
     :structure [ a idc:â¿° ;
@@ -22860,12 +22557,7 @@ ucs:0x20DAB   # 𠶫
 ucs:0x20DAC   # 𠶬
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5405 ; # 吅
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x9FB7   # é¾·
-            ]
-        ]
+        :below    rep.big5-cdp:0x89F0   # &CDP-89F0;
     ] .
 ucs:0x20DAD   # ð ¶­
     :structure [ a idc:â¿° ;
@@ -23173,12 +22865,7 @@ ucs:0x20DDC   # 𠷜
 ucs:0x20DDD   # 𠷝
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x200AD   # 𠂭
-            ]
-        ]
+        :right    rep.gt-k:05805   # &GT-K05805;
     ] .
 ucs:0x20DDE   # 𠷞
     :structure [ a idc:â¿° ;
@@ -23848,7 +23535,7 @@ ucs:0x20E46   # 𠹆
 ucs:0x20E47   # 𠹇
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.ucs_iso:0x23B09   # &C6-386A;
+        :right    a.ucs:0x23B09   # 𣬉
     ] .
 ucs:0x20E48   # 𠹈
     :structure [ a idc:⿱ ;
@@ -23988,7 +23675,7 @@ ucs:0x20E5F   # 𠹟
         :above    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x5B80 ; # 宀
-                :middle   rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                :middle   a.ucs:0x2000E ; # 𠀎
                 :below    a.ucs:0x516B   # 八
             ]
         ] ;
@@ -23997,12 +23684,7 @@ ucs:0x20E5F   # 𠹟
 ucs:0x20E60   # ð ¹ 
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x81FC ; # 臼
-                :below    a.ucs:0x6728   # 木
-            ]
-        ]
+        :right    a.ruimoku-v6:0xE0E5   # &A-RUI6-E0E5;
     ] .
 ucs:0x20E61   # 𠹡
     :structure [ a idc:â¿° ;
@@ -25610,7 +25292,7 @@ ucs:0x20F54   # 𠽔
 ucs:0x20F55   # 𠽕
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    a.ucs:0x6377   # 捷
+        :right    a.ucs_iwds-1:0x6377   # &A-IWDSU+6377;
     ] .
 ucs:0x20F56   # 𠽖
     :structure [ a idc:â¿° ;
@@ -25765,12 +25447,7 @@ ucs:0x20F71   # ð ½±
 ucs:0x20F72   # ð ½²
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x91C6 ; # 釆
-                :below    a.ucs:0x76BF   # 皿
-            ]
-        ]
+        :right    rep.ruimoku-v6:0xE128   # &RUI6-E128;
     ] .
 ucs:0x20F73   # ð ½³
     :structure [ a idc:â¿° ;
@@ -25870,12 +25547,7 @@ ucs:0x20F7F   # 𠽿
 ucs:0x20F80   # 𠾀
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x80B2 ; # 育
-                :right    a.ucs:0x6535   # 攵
-            ]
-        ]
+        :right    a.cbeta:12172   # &A-CB12172;
     ] .
 ucs:0x20F82   # 𠾂
     :structure [ a idc:⿱ ;
@@ -26462,7 +26134,7 @@ ucs:0x20FD9   # 𠿙
 ucs:0x20FDA   # 𠿚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.cns11643-1:0x6634   # &C1-6634;
+        :right    rep.cns11643-1:0x6634   # &HD-JT-B9DA;
     ] .
 ucs:0x20FDB   # 𠿛
     :structure [ a idc:â¿° ;
@@ -26497,7 +26169,7 @@ ucs:0x20FDF   # 𠿟
 ucs:0x20FE0   # ð ¿ 
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.daikanwa:11617   # &M-11617;
+        :right    rep.adobe-japan1-5:16871   # &AJ1-16871;
     ] .
 ucs:0x20FE1   # ð ¿¡
     :structure [ a idc:⿱ ;
@@ -27468,7 +27140,7 @@ ucs:0x2107D   # 𡁽
 ucs:0x2107E   # 𡁾
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1-4:13880   # &AJ1-13880;
+        :right    a.ucs:0x8AAA   # 說
     ] .
 ucs:0x2107F   # 𡁿
     :structure [ a idc:â¿° ;
@@ -27608,7 +27280,7 @@ ucs:0x21095   # 𡂕
 ucs:0x21096   # 𡂖
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.mj:007965   # &MJ007965;
+        :right    a.ucs:0x53B2   # 厲
     ] .
 ucs:0x21097   # 𡂗
     :structure [ a idc:â¿° ;
@@ -27688,7 +27360,7 @@ ucs:0x210A0   # 𡂠
 ucs:0x210A1   # 𡂡
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    a.ucs:0x6578   # 數
+        :right    a.ucs_iwds-1:0x6578   # &A-IWDSU+6578;
     ] .
 ucs:0x210A2   # 𡂢
     :structure [ a idc:â¿° ;
@@ -28508,24 +28180,13 @@ ucs:0x2111A   # 𡄚
         :below    a.ucs:0x518F   # 冏
     ] .
 ucs:0x2111B   # 𡄛
-    :structure [ a idc:⿳ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
-        :middle   [
+    :structure [ a idc:â¿´ ;
+        :surround a.ucs:0x35CA ; # 㗊
+        :filling  [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x592A ; # 太
                 :right    a.ucs:0x592A   # 太
             ]
-        ] ;
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
         ]
     ] .
 ucs:0x2111C   # 𡄜
@@ -28539,7 +28200,7 @@ ucs:0x2111C   # 𡄜
         ] ;
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                :above    a.ucs:0x2000E ; # 𠀎
                 :below    rep.ucs_iso:0x27607   # &CDP-8B67;
             ]
         ]
@@ -28781,7 +28442,7 @@ ucs:0x2113F   # 𡄿
         ] ;
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                :above    a.ucs:0x2000E ; # 𠀎
                 :below    rep.ucs_iso:0x27607   # &CDP-8B67;
             ]
         ]
@@ -29123,20 +28784,9 @@ ucs:0x21170   # 𡅰
         :right    a.ucs:0x23358   # 𣍘
     ] .
 ucs:0x21171   # 𡅱
-    :structure [ a idc:⿳ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
-        :middle   rep.big5-cdp:0x8BD3 ; # &CDP-8BD3;
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ]
+    :structure [ a idc:â¿´ ;
+        :surround a.ucs:0x35CA ; # 㗊
+        :filling  rep.big5-cdp:0x8BD3   # &CDP-8BD3;
     ] .
 ucs:0x21172   # 𡅲
     :structure [ a idc:â¿° ;
@@ -29211,7 +28861,7 @@ ucs:0x2117A   # 𡅺
 ucs:0x2117B   # 𡅻
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x5405 ; # 吅
-        :middle   rep.big5-cdp:0x8DA5 ; # &CDP-8DA5;
+        :middle   rep.mj:022205 ; # &MJ022205;
         :below    a.ucs:0x5405   # 吅
     ] .
 ucs:0x2117C   # 𡅼
@@ -29224,7 +28874,7 @@ ucs:0x2117D   # 𡅽
         :left     [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5415 ; # 吕
-                :below    rep.big5-cdp:0x8DA5   # &CDP-8DA5;
+                :below    rep.mj:022205   # &MJ022205;
             ]
         ] ;
         :right    a.ucs:0x5415   # 吕
@@ -29530,7 +29180,7 @@ ucs:0x211A6   # 𡆦
 ucs:0x211A7   # 𡆧
     :structure [ a idc:â¿´ ;
         :surround a.ucs:0x56D7 ; # 囗
-        :filling  a.ucs:0x5C0F   # 小
+        :filling  a.ucs_iwds-1:0x5C0F   # &A-IWDSU+5C0F;
     ] .
 ucs:0x211A8   # 𡆨
     :structure [ a idc:⿵ ;
@@ -29700,12 +29350,7 @@ ucs:0x211C8   # 𡇈
 ucs:0x211C9   # 𡇉
     :structure [ a idc:â¿´ ;
         :surround a.ucs:0x56D7 ; # 囗
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x4E8C   # 二
-            ]
-        ]
+        :filling  a.ucs:0x20BA1   # ð ®¡
     ] .
 ucs:0x211CA   # 𡇊
     :structure [ a idc:â¿´ ;
@@ -31167,12 +30812,7 @@ ucs:0x212AD   # 𡊭
 ucs:0x212AE   # 𡊮
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x571F ; # 土
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.gt:00154 ; # &GT-00154;
-                :below    rep.big5-cdp:0x8CC6   # &CDP-8CC6;
-            ]
-        ]
+        :below    o.big5-cdp:0x8845   # &o-CDP-8845;
     ] .
 ucs:0x212AF   # 𡊯
     :structure [ a idc:â¿° ;
@@ -32204,19 +31844,9 @@ ucs:0x2134E   # 𡍎
         :right    a.ucs:0x5353   # 卓
     ] .
 ucs:0x2134F   # 𡍏
-    :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :below    [
-                    :structure [ a idc:â¿´ ;
-                        :surround a.ucs:0x56D7 ; # 囗
-                        :filling  rep.big5-cdp:0x89D5   # &CDP-89D5;
-                    ]
-                ]
-            ]
-        ] ;
-        :right    a.ucs:0x571F   # 土
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5365 ; # 卥
+        :below    a.ucs:0x571F   # 土
     ] .
 ucs:0x21350   # 𡍐
     :structure [ a idc:⿱ ;
@@ -32282,12 +31912,7 @@ ucs:0x21356   # 𡍖
 ucs:0x21357   # 𡍗
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :below    a.ucs:0x9FB1   # é¾±
-            ]
-        ]
+        :right    rep.ucs-itaiji-002:0x21FFA   # &U-i002+21FFA;
     ] .
 ucs:0x21358   # 𡍘
     :structure [ a idc:â¿° ;
@@ -32381,7 +32006,7 @@ ucs:0x21365   # 𡍥
     ] .
 ucs:0x21366   # 𡍦
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x571F ; # 土
+        :above    a.ucs_component:0x571F ; # &A-compU+571F;
         :below    a.ucs:0x8ECD   # 軍
     ] .
 ucs:0x21367   # 𡍧
@@ -32550,9 +32175,8 @@ ucs:0x2137F   # 𡍿
         ]
     ] .
 ucs:0x21380   # 𡎀
-    :structure [ a idc:⿳ ;
-        :above    rep.big5-cdp:0x8CA6 ; # &CDP-8CA6;
-        :middle   a.ucs:0x2EA3 ; # ⺣
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2DD18 ; # 𭴘
         :below    a.ucs:0x571F   # 土
     ] .
 ucs:0x21381   # 𡎁
@@ -32974,12 +32598,7 @@ ucs:0x213BC   # 𡎼
 ucs:0x213BD   # 𡎽
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x722B ; # 爫
-                :below    a.ucs:0x233BC   # 𣎼
-            ]
-        ]
+        :right    a.gt-k:07314   # &A-GT-K07314;
     ] .
 ucs:0x213BE   # 𡎾
     :structure [ a idc:â¿° ;
@@ -34180,7 +33799,7 @@ ucs:0x21461   # 𡑡
 ucs:0x21462   # 𡑢
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.cns11643-1:0x6634   # &C1-6634;
+        :right    rep.cns11643-1:0x6634   # &HD-JT-B9DA;
     ] .
 ucs:0x21463   # 𡑣
     :structure [ a idc:â¿° ;
@@ -34529,19 +34148,7 @@ ucs:0x2148E   # 𡒎
 ucs:0x2148F   # 𡒏
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x9FB1 ; # é¾±
-                :below    [
-                    :structure [ a idc:⿲ ;
-                        :left     a.ucs:0x4E3F ; # 丿
-                        :middle   a.ucs:0x2EA2 ; # ⺢
-                        :right    a.ucs:0x2E83   # ⺃
-                    ]
-                ]
-            ]
-        ]
+        :right    rep.ucs-itaiji-006:0x22002   # &U-i006+22002;
     ] .
 ucs:0x21490   # 𡒐
     :structure [ a idc:⿳ ;
@@ -35130,7 +34737,7 @@ ucs:0x214D9   # 𡓙
                         :below    a.ucs:0x53B6   # 厶
                     ]
                 ] ;
-                :middle   rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                :middle   a.ucs:0x2000E ; # 𠀎
                 :below    a.ucs:0x53CE   # 収
             ]
         ]
@@ -36193,10 +35800,9 @@ ucs:0x21561   # 𡕡
         :below    a.ucs:0x590A   # 夊
     ] .
 ucs:0x21562   # 𡕢
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x4E00 ; # 一
-        :middle   a.ucs:0x706B ; # 火
-        :below    a.ucs:0x590A   # 夊
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x706D ; # 灭
+        :below    a.ucs_component:0x590A   # &A-compU+590A;
     ] .
 ucs:0x21563   # 𡕣
     :structure [ a idc:⿳ ;
@@ -36212,7 +35818,7 @@ ucs:0x21564   # 𡕤
 ucs:0x21565   # 𡕥
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x76EE ; # 目
-        :below    a.ucs:0x590A   # 夊
+        :below    a.ucs_component:0x5902   # &A-compU+5902;
     ] .
 ucs:0x21566   # 𡕦
     :structure [ a idc:⿳ ;
@@ -36241,9 +35847,8 @@ ucs:0x2156A   # 𡕪
         :below    a.ucs:0x590A   # 夊
     ] .
 ucs:0x2156B   # 𡕫
-    :structure [ a idc:⿳ ;
-        :above    rep.big5-cdp:0x8CAF ; # &CDP-8CAF;
-        :middle   a.ucs_component:0x513F ; # &A-compU+513F;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs-itaiji-003:0x20486 ; # &A-U-i003+20486;
         :below    a.ucs_component:0x590A   # &A-compU+590A;
     ] .
 ucs:0x2156C   # 𡕬
@@ -36266,6 +35871,12 @@ ucs:0x2156F   # 𡕯
         ] ;
         :below    a.ucs:0x590A   # 夊
     ] .
+ucs:0x21570   # 𡕰
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x2068D ; # 𠚍
+        :middle   a.ucs_component:0x513F ; # &A-compU+513F;
+        :below    a.ucs_component:0x590A   # &A-compU+590A;
+    ] .
 ucs:0x21572   # 𡕲
     :structure [ a idc:⿱ ;
         :above    rep.big5-cdp:0x85AF ; # &CDP-85AF;
@@ -36901,15 +36512,9 @@ ucs:0x215C6   # 𡗆
         :right    a.ucs:0x591A   # 多
     ] .
 ucs:0x215C7   # 𡗇
-    :structure [ a idc:⿺ ;
-        :surround [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x2053F ; # 𠔿
-                :below    rep.big5-cdp:0x8D46   # &CDP-8D46;
-            ]
-        ] ;
-        :filling  a.ucs:0x5915   # 夕
+    :structure [ a idc:⿰・⿺ ;
+        :left     a.ucs:0x5DE4 ; # å·¤
+        :right    a.ucs:0x5915   # 夕
     ] .
 ucs:0x215C8   # 𡗈
     :structure [ a idc:â¿° ;
@@ -37581,7 +37186,7 @@ ucs:0x21645   # 𡙅
 ucs:0x21646   # 𡙆
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5927 ; # 大
-        :right    rep.ucs_iso:0x23D92   # &GT-00119;
+        :right    a.ucs:0x23D92   # 𣶒
     ] .
 ucs:0x21647   # 𡙇
     :structure [ a idc:â¿° ;
@@ -38938,12 +38543,7 @@ ucs:0x21722   # 𡜢
 ucs:0x21723   # 𡜣
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :below    a.ucs:0x5DE5   # å·¥
-            ]
-        ]
+        :right    rep.gt-k:02100   # &GT-K02100;
     ] .
 ucs:0x21724   # 𡜤
     :structure [ a idc:â¿° ;
@@ -38978,12 +38578,7 @@ ucs:0x21729   # 𡜩
 ucs:0x2172A   # 𡜪
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :below    a.ucs:0x5C71   # å±±
-            ]
-        ]
+        :right    a.ucs:0x2D5FC   # 𭗼
     ] .
 ucs:0x2172B   # 𡜫
     :structure [ a idc:â¿° ;
@@ -39776,7 +39371,7 @@ ucs:0x217A2   # 𡞢
         :right    a.ucs:0x524B   # 剋
     ] .
 ucs:0x217A3   # 𡞣
-    :structure [ a idc:⿱ ;
+    :structure [ a idc:⿱・⿸ ;
         :above    a.ucs:0x54B8 ; # 咸
         :below    a.ucs:0x5973   # 女
     ] .
@@ -40153,12 +39748,7 @@ ucs:0x217D7   # 𡟗
 ucs:0x217D8   # 𡟘
     :structure [ a idc:⿲ ;
         :left     a.ucs:0x5973 ; # 女
-        :middle   [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53B6 ; # 厶
-                :below    a.ucs:0x592B   # 夫
-            ]
-        ] ;
+        :middle   rep.ucs-itaiji-002:0x77E3 ; # &U-i002+77E3;
         :right    a.ucs:0x5973   # 女
     ] .
 ucs:0x217D9   # 𡟙
@@ -40244,7 +39834,7 @@ ucs:0x217E5   # 𡟥
 ucs:0x217E7   # 𡟧
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    rep.daikanwa:02873   # &M-02873;
+        :right    rep.daikanwa:02873   # &HD-JT-AE7B;
     ] .
 ucs:0x217E8   # 𡟨
     :structure [ a idc:⿱ ;
@@ -40470,7 +40060,7 @@ ucs:0x2180B   # 𡠋
 ucs:0x2180C   # 𡠌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    a.ucs:0x23B09   # 𣬉
+        :right    a.ucs_cognate:0x23B09   # &A-cgnU+23B09;
     ] .
 ucs:0x2180D   # 𡠍
     :structure [ a idc:⿱ ;
@@ -40646,11 +40236,11 @@ ucs:0x21823   # ð¡ £
 ucs:0x21824   # ð¡ ¤
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    a.ucs:0x5F3A   # 强
+        :right    a.jis-x0208:0x362F   # &J97-362F;
     ] .
 ucs:0x21825   # ð¡ ¥
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5F3A ; # 强
+        :above    a.jis-x0208:0x362F ; # &J97-362F;
         :below    a.ucs:0x5973   # 女
     ] .
 ucs:0x21826   # ð¡ ¦
@@ -40987,7 +40577,7 @@ ucs:0x2185E   # 𡡞
 ucs:0x2185F   # 𡡟
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    rep.jis-x0212:0x457C   # &JSP-457C;
+        :right    a.ucs:0x6B70   # æ­°
     ] .
 ucs:0x21860   # ð¡¡ 
     :structure [ a idc:â¿° ;
@@ -41278,13 +40868,7 @@ ucs:0x21885   # 𡢅
 ucs:0x21886   # 𡢆
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x9FB1 ; # é¾±
-                :below    a.ucs:0x5FC3   # 心
-            ]
-        ]
+        :right    rep.ucs-itaiji-001:0x60F1   # &U-i001+60F1;
     ] .
 ucs:0x21887   # 𡢇
     :structure [ a idc:â¿° ;
@@ -41614,7 +41198,7 @@ ucs:0x218AA   # 𡢪
 ucs:0x218AC   # 𡢬
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    rep.cns11643-1:0x6634   # &C1-6634;
+        :right    rep.cns11643-1:0x6634   # &HD-JT-B9DA;
     ] .
 ucs:0x218AD   # ð¡¢­
     :structure [ a idc:â¿° ;
@@ -42597,9 +42181,9 @@ ucs:0x2193F   # 𡤿
         :right    a.ucs:0x4EBA   # 人
     ] .
 ucs:0x21940   # 𡥀
-    :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
-        :below    a.ucs:0x6728   # 木
+    :structure [ a idc:â¿» ;
+        :underlying a.ucs:0x5B50 ; # 子
+        :overlaying a.ucs:0x516B   # 八
     ] .
 ucs:0x21941   # 𡥁
     :structure [ a idc:â¿° ;
@@ -42777,12 +42361,7 @@ ucs:0x2195C   # 𡥜
     ] .
 ucs:0x2195D   # 𡥝
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5E7A ; # 幺
-                :right    a.ucs:0x5E7A   # 幺
-            ]
-        ] ;
+        :above    a.ucs:0x221B6 ; # 𢆶
         :below    a.ucs:0x5B50   # 子
     ] .
 ucs:0x2195E   # 𡥞
@@ -43068,17 +42647,7 @@ ucs:0x2198A   # 𡦊
     ] .
 ucs:0x2198B   # 𡦋
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x81E3 ; # 臣
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x20089 ; # 𠂉
-                        :below    a.ucs:0x4E8C   # 二
-                    ]
-                ]
-            ]
-        ] ;
+        :above    rep.big5-cdp-itaiji-002:0x8CC9 ; # &CDP-i002-8CC9;
         :below    a.ucs:0x5B50   # 子
     ] .
 ucs:0x2198C   # 𡦌
@@ -43519,7 +43088,7 @@ ucs:0x219C7   # 𡧇
 ucs:0x219C8   # 𡧈
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    a.ucs:0x4E90   # 亐
+        :below    a.ucs_iwds-1:0x4E8F   # &A-IWDSU+4E8F;
     ] .
 ucs:0x219C9   # 𡧉
     :structure [ a idc:⿱ ;
@@ -43600,12 +43169,7 @@ ucs:0x219D5   # 𡧕
 ucs:0x219D6   # 𡧖
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
-                :below    a.ucs:0x6728   # 木
-            ]
-        ]
+        :below    a.ucs:0x21940   # 𡥀
     ] .
 ucs:0x219D7   # 𡧗
     :structure [ a idc:⿱ ;
@@ -43642,7 +43206,7 @@ ucs:0x219DD   # 𡧝
         :above    a.ucs:0x5B80 ; # 宀
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
+                :above    a.ucs:0x31C7 ; # ㇇
                 :below    [
                     :structure [ a idc:⿵ ;
                         :surround a.ucs:0x5182 ; # 冂
@@ -43765,12 +43329,7 @@ ucs:0x219EB   # 𡧫
 ucs:0x219EC   # 𡧬
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EBE ; # 亾
-                :below    a.ucs:0x2BDA7   # 𫶧
-            ]
-        ]
+        :below    a.ucs_component:0x3829   # &A-compU+3829;
     ] .
 ucs:0x219ED   # 𡧭
     :structure [ a idc:⿱ ;
@@ -43881,14 +43440,14 @@ ucs:0x219FB   # 𡧻
 ucs:0x219FD   # 𡧽
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    a.ucs:0x5DDF   # 巟
+        :below    a.ucs_component:0x342C   # &A-compU+342C;
     ] .
 ucs:0x219FE   # 𡧾
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
+                :above    a.ucs:0x31C7 ; # ㇇
                 :below    a.ucs:0x76BF   # 皿
             ]
         ]
@@ -43924,14 +43483,10 @@ ucs:0x21A03   # 𡨃
         :below    a.ucs:0x6C42   # 求
     ] .
 ucs:0x21A04   # 𡨄
-    :structure [ a idc:⿱ ;
+    :structure [ a idc:⿳ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
-                :below    a.ucs:0x516B   # 八
-            ]
-        ]
+        :middle   a.ucs:0x2000E ; # 𠀎
+        :below    a.ucs:0x516B   # 八
     ] .
 ucs:0x21A05   # 𡨅
     :structure [ a idc:⿱ ;
@@ -44006,13 +43561,8 @@ ucs:0x21A0D   # 𡨍
     ] .
 ucs:0x21A0E   # 𡨎
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x706B ; # 火
-                :below    a.ucs:0x5BF8   # 寸
-            ]
-        ]
+        :above    a.ucs:0x707E ; # 灾
+        :below    a.ucs:0x5BF8   # 寸
     ] .
 ucs:0x21A0F   # 𡨏
     :structure [ a idc:â¿° ;
@@ -44173,14 +43723,9 @@ ucs:0x21A24   # 𡨤
         :below    a.ucs:0x53D5   # 叕
     ] .
 ucs:0x21A25   # 𡨥
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x5143 ; # 元
-                :filling  a.ucs:0x6535   # 攵
-            ]
-        ]
+    :structure [ a idc:â¿· ;
+        :surround a.ucs:0x5B8C ; # 完
+        :filling  a.ucs:0x6535   # 攵
     ] .
 ucs:0x21A26   # 𡨦
     :structure [ a idc:⿱ ;
@@ -44209,13 +43754,8 @@ ucs:0x21A29   # 𡨩
     ] .
 ucs:0x21A2A   # 𡨪
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    a.ucs:0x6708   # 月
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs:0x6708   # 月
     ] .
 ucs:0x21A2B   # 𡨫
     :structure [ a idc:⿱ ;
@@ -44444,13 +43984,8 @@ ucs:0x21A48   # 𡩈
     ] .
 ucs:0x21A49   # 𡩉
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    a.ucs:0x65E6   # 旦
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs_component:0x4E14   # &A-compU+4E14;
     ] .
 ucs:0x21A4A   # 𡩊
     :structure [ a idc:⿱ ;
@@ -44459,13 +43994,8 @@ ucs:0x21A4A   # 𡩊
     ] .
 ucs:0x21A4B   # 𡩋
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    a.ucs:0x5189   # 冉
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs:0x5189   # 冉
     ] .
 ucs:0x21A4C   # 𡩌
     :structure [ a idc:⿱ ;
@@ -44660,7 +44190,7 @@ ucs:0x21A64   # 𡩤
 ucs:0x21A65   # ð¡©¥
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    rep.mj:020661   # &MJ020661;
+        :below    a.ucs:0x7FC1   # 翁
     ] .
 ucs:0x21A66   # 𡩦
     :structure [ a idc:⿱ ;
@@ -44680,28 +44210,13 @@ ucs:0x21A67   # 𡩧
     ] .
 ucs:0x21A68   # 𡩨
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x91C6 ; # 釆
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :above    a.ucs:0x5BB7 ; # å®·
+        :below    a.ucs:0x53E3   # 口
     ] .
 ucs:0x21A69   # ð¡©©
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4EA1 ; # 亡
-                        :below    a.ucs:0x53E3   # 口
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x2A9C7 ; # 𪧇
+        :filling  a.ucs:0x5402   # 吂
     ] .
 ucs:0x21A6A   # 𡩪
     :structure [ a idc:⿱ ;
@@ -44715,14 +44230,8 @@ ucs:0x21A6B   # ð¡©«
     ] .
 ucs:0x21A6C   # 𡩬
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :middle   a.ucs:0x76BF ; # 皿
-                :below    a.ucs:0x4E00   # 一
-            ]
-        ]
+        :above    a.ucs:0x5BCD ; # 寍
+        :below    a.ucs:0x4E00   # 一
     ] .
 ucs:0x21A6D   # ð¡©­
     :structure [ a idc:⿱ ;
@@ -44842,13 +44351,8 @@ ucs:0x21A7E   # ð¡©¾
     ] .
 ucs:0x21A7F   # ð¡©¿
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53D5 ; # 叕
-                :below    a.ucs:0x571F   # 土
-            ]
-        ]
+        :above    a.ucs:0x21A24 ; # 𡨤
+        :below    a.ucs:0x571F   # 土
     ] .
 ucs:0x21A80   # 𡪀
     :structure [ a idc:â¿° ;
@@ -45024,16 +44528,11 @@ ucs:0x21A94   # 𡪔
     ] .
 ucs:0x21A95   # 𡪕
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
+        :above    a.ucs:0x2BCBD ; # 𫲽
         :below    [
             :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5405 ; # 吅
-                        :below    a.ucs:0x4E00   # 一
-                    ]
-                ]
+                :above    a.ucs:0x5405 ; # 吅
+                :below    a.ucs:0x4E00   # 一
             ]
         ]
     ] .
@@ -45058,14 +44557,9 @@ ucs:0x21A97   # 𡪗
         ]
     ] .
 ucs:0x21A98   # 𡪘
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    a.ucs:0x91C7   # 采
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x2A9C7 ; # 𪧇
+        :filling  a.ucs:0x91C6   # 釆
     ] .
 ucs:0x21A99   # 𡪙
     :structure [ a idc:⿱ ;
@@ -45144,13 +44638,8 @@ ucs:0x21AA4   # 𡪤
     ] .
 ucs:0x21AA5   # 𡪥
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    a.ucs:0x209E2   # 𠧢
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs:0x209E2   # 𠧢
     ] .
 ucs:0x21AA6   # 𡪦
     :structure [ a idc:⿱ ;
@@ -45364,15 +44853,10 @@ ucs:0x21AC2   # 𡫂
         :below    a.ucs:0x7D79   # çµ¹
     ] .
 ucs:0x21AC3   # 𡫃
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :middle   a.ucs:0x2EAB ; # ⺫
-                :below    a.ucs:0x5929   # 天
-            ]
-        ]
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :middle   a.ucs:0x2EAB ; # ⺫
+        :below    a.ucs:0x5929   # 天
     ] .
 ucs:0x21AC4   # 𡫄
     :structure [ a idc:⿱ ;
@@ -45380,14 +44864,10 @@ ucs:0x21AC4   # 𡫄
         :below    a.ucs:0x6557   # 敗
     ] .
 ucs:0x21AC5   # 𡫅
-    :structure [ a idc:⿱ ;
+    :structure [ a idc:⿳ ;
         :above    a.ucs:0x5B8C ; # 完
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x76EE ; # 目
-                :below    a.ucs:0x706B   # 火
-            ]
-        ]
+        :middle   a.ucs:0x76EE ; # 目
+        :below    a.ucs:0x706B   # 火
     ] .
 ucs:0x21AC6   # 𡫆
     :structure [ a idc:⿱ ;
@@ -45396,14 +44876,8 @@ ucs:0x21AC6   # 𡫆
     ] .
 ucs:0x21AC7   # 𡫇
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :middle   a.ucs:0x76BF ; # 皿
-                :below    a.ucs:0x5FC3   # 心
-            ]
-        ]
+        :above    a.ucs:0x5BCD ; # 寍
+        :below    a.ucs:0x5FC3   # 心
     ] .
 ucs:0x21AC8   # 𡫈
     :structure [ a idc:⿱ ;
@@ -45452,13 +44926,8 @@ ucs:0x21ACC   # 𡫌
     ] .
 ucs:0x21ACD   # 𡫍
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :below    a.ucs:0x9762   # 面
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs:0x9762   # 面
     ] .
 ucs:0x21ACE   # 𡫎
     :structure [ a idc:⿱ ;
@@ -45668,13 +45137,9 @@ ucs:0x21ADE   # 𡫞
         :below    a.ucs:0x8E30   # 踰
     ] .
 ucs:0x21ADF   # 𡫟
-    :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5B80 ; # 宀
-                :below    rep.gt:11013   # &GT-11013;
-            ]
-        ] ;
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x5B80 ; # 宀
+        :middle   a.ucs:0x382D ; # ã ­
         :below    a.ucs:0x5927   # 大
     ] .
 ucs:0x21AE0   # ð¡« 
@@ -45759,7 +45224,7 @@ ucs:0x21AEA   # 𡫪
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                        :above    a.ucs:0x2000E ; # 𠀎
                         :below    [
                             :structure [ a idc:â¿» ;
                                 :underlying a.ucs:0x516B ; # 八
@@ -45844,25 +45309,10 @@ ucs:0x21AF2   # ð¡«²
         :right    a.ucs:0x5BA2   # 客
     ] .
 ucs:0x21AF3   # ð¡«³
-    :structure [ a idc:⿱ ;
+    :structure [ a idc:⿳ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x5DE5 ; # å·¥
-                        :right    a.ucs:0x5DE5   # å·¥
-                    ]
-                ] ;
-                :middle   [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x5DE5 ; # å·¥
-                        :right    a.ucs:0x5DE5   # å·¥
-                    ]
-                ] ;
-                :below    a.ucs:0x5EFE   # 廾
-            ]
-        ]
+        :middle   a.ucs:0x382D ; # ã ­
+        :below    a.ucs:0x5EFE   # 廾
     ] .
 ucs:0x21AF4   # ð¡«´
     :structure [ a idc:â¿° ;
@@ -45911,19 +45361,9 @@ ucs:0x21AF9   # ð¡«¹
         :right    a.ucs:0x54B8   # 咸
     ] .
 ucs:0x21AFA   # 𡫺
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8D60 ; # &CDP-8D60;
-                        :below    a.ucs:0x53C8   # 又
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x2A9C7 ; # 𪧇
+        :filling  a.ucs:0x26D0B   # 𦴋
     ] .
 ucs:0x21AFB   # ð¡«»
     :structure [ a idc:⿱ ;
@@ -45947,30 +45387,9 @@ ucs:0x21AFB   # ð¡«»
         ]
     ] .
 ucs:0x21AFC   # ð¡«¼
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x5DE5 ; # å·¥
-                        :right    a.ucs:0x5DE5   # å·¥
-                    ]
-                ] ;
-                :middle   [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x5DE5 ; # å·¥
-                        :right    a.ucs:0x5DE5   # å·¥
-                    ]
-                ] ;
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5927 ; # 大
-                        :filling  a.ucs:0x571F   # 土
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿵ ;
+        :surround a.ucs:0x21ADF ; # 𡫟
+        :filling  a.ucs:0x571F   # 土
     ] .
 ucs:0x21AFD   # ð¡«½
     :structure [ a idc:⿱ ;
@@ -46053,17 +45472,7 @@ ucs:0x21B00   # 𡬀
 ucs:0x21B01   # 𡬁
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x8001 ; # 老
-                :below    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x8001 ; # 老
-                        :right    a.ucs:0x8001   # 老
-                    ]
-                ]
-            ]
-        ]
+        :below    a.ucs:0x264C8   # 𦓈
     ] .
 ucs:0x21B02   # 𡬂
     :structure [ a idc:⿱ ;
@@ -46086,19 +45495,9 @@ ucs:0x21B03   # 𡬃
         ]
     ] .
 ucs:0x21B04   # 𡬄
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8D60 ; # &CDP-8D60;
-                        :below    a.ucs:0x6C34   # æ°´
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs-itaiji-001:0x3771 ; # &A-U-i001+3771;
+        :filling  a.ucs:0x6C34   # æ°´
     ] .
 ucs:0x21B05   # 𡬅
     :structure [ a idc:⿱ ;
@@ -46182,19 +45581,9 @@ ucs:0x21B0C   # 𡬌
         ]
     ] .
 ucs:0x21B0D   # 𡬍
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8D60 ; # &CDP-8D60;
-                        :below    a.ucs:0x7C73   # ç±³
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs-itaiji-001:0x3771 ; # &A-U-i001+3771;
+        :filling  a.ucs:0x7C73   # ç±³
     ] .
 ucs:0x21B0E   # 𡬎
     :structure [ a idc:⿱ ;
@@ -46247,19 +45636,9 @@ ucs:0x21B11   # 𡬑
         ]
     ] .
 ucs:0x21B12   # 𡬒
-    :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8D60 ; # &CDP-8D60;
-                        :below    a.ucs:0x81EC   # 臬
-                    ]
-                ]
-            ]
-        ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs-itaiji-001:0x3771 ; # &A-U-i001+3771;
+        :filling  a.ucs:0x81EC   # 臬
     ] .
 ucs:0x21B13   # 𡬓
     :structure [ a idc:⿱ ;
@@ -46288,19 +45667,8 @@ ucs:0x21B14   # 𡬔
     ] .
 ucs:0x21B15   # 𡬕
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5B80 ; # 宀
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5FC3 ; # 心
-                :middle   a.ucs:0x8001 ; # 老
-                :below    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x8001 ; # 老
-                        :right    a.ucs:0x8001   # 老
-                    ]
-                ]
-            ]
-        ]
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :below    a.ucs:0x264C8   # 𦓈
     ] .
 ucs:0x21B16   # 𡬖
     :structure [ a idc:⿱ ;
@@ -46324,8 +45692,8 @@ ucs:0x21B17   # 𡬗
     ] .
 ucs:0x21B18   # 𡬘
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-2:0x3841 ; # &C2-3841;
-        :right    rep.gt:09206   # &HD-JT-B038;
+        :left     a.ucs:0x7FCF ; # 翏
+        :right    a.ucs_iwds-1:0x5BEC   # &A-IWDSU+5BEC;
     ] .
 ucs:0x21B19   # 𡬙
     :structure [ a idc:⿱ ;
@@ -46352,6 +45720,22 @@ ucs:0x21B1A   # 𡬚
             ]
         ]
     ] .
+ucs:0x21B1B   # 𡬛
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x2BCBD ; # 𫲽
+        :middle   [
+            :structure [ a idc:â¿° ;
+                :left     a.ucs:0x7ACB ; # 立
+                :right    a.ucs:0x7ACB   # 立
+            ]
+        ] ;
+        :below    [
+            :structure [ a idc:â¿° ;
+                :left     a.ucs:0x866B ; # 虫
+                :right    a.ucs:0x866B   # 虫
+            ]
+        ]
+    ] .
 ucs:0x21B1C   # 𡬜
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5BD2 ; # 寒
@@ -46384,7 +45768,7 @@ ucs:0x21B1F   # 𡬟
     ] .
 ucs:0x21B20   # 𡬠
     :structure [ a idc:â¿° ;
-        :left     a.ucs_component:0x7680 ; # &A-compU+7680;
+        :left     a.ucs_iwds-1:0x7680 ; # &A-IWDSU+7680;
         :right    a.ucs:0x5BF8   # 寸
     ] .
 ucs:0x21B21   # 𡬡
@@ -46745,7 +46129,7 @@ ucs:0x21B55   # 𡭕
     ] .
 ucs:0x21B56   # 𡭖
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BA2 ; # &CDP-8BA2;
+        :above    a.ucs:0x31C7 ; # ㇇
         :below    a.ucs:0x5C0F   # 小
     ] .
 ucs:0x21B57   # 𡭗
@@ -48671,12 +48055,7 @@ ucs:0x21C95   # 𡲕
 ucs:0x21C96   # 𡲖
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5C38 ; # å°¸
-        :filling  [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x200AD   # 𠂭
-            ]
-        ]
+        :filling  rep.gt-k:05805   # &GT-K05805;
     ] .
 ucs:0x21C97   # 𡲗
     :structure [ a idc:â¿´ ;
@@ -49497,7 +48876,7 @@ ucs:0x21D04   # 𡴄
     ] .
 ucs:0x21D05   # 𡴅
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2F878 ; # 屮
+        :above    a.ucs_component:0x5C6E ; # &A-compU+5C6E;
         :below    a.ucs:0x5DFE   # å·¾
     ] .
 ucs:0x21D06   # 𡴆
@@ -50998,13 +50377,7 @@ ucs:0x21E02   # 𡸂
 ucs:0x21E03   # 𡸃
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5C71 ; # å±±
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8AFC ; # &CDP-8AFC;
-                :middle   rep.adobe-japan1-4:13834 ; # &AJ1-13834;
-                :below    a.ucs:0x4E00   # 一
-            ]
-        ]
+        :below    a.ucs:0x4F65   # ä½¥
     ] .
 ucs:0x21E04   # 𡸄
     :structure [ a idc:⿱ ;
@@ -51024,12 +50397,7 @@ ucs:0x21E05   # 𡸅
 ucs:0x21E06   # 𡸆
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5C71 ; # å±±
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.mj:006315 ; # &MJ006315;
-                :below    a.ucs:0x5C71   # å±±
-            ]
-        ]
+        :right    a.gt-k:02849   # &A-GT-K02849;
     ] .
 ucs:0x21E07   # 𡸇
     :structure [ a idc:â¿° ;
@@ -51512,12 +50880,7 @@ ucs:0x21E54   # 𡹔
 ucs:0x21E55   # 𡹕
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5C71 ; # å±±
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :below    a.ucs:0x5147   # 兇
-            ]
-        ]
+        :right    a.ucs:0x2048B   # 𠒋
     ] .
 ucs:0x21E56   # 𡹖
     :structure [ a idc:⿱ ;
@@ -52502,18 +51865,7 @@ ucs:0x21EFC   # ð¡»¼
 ucs:0x21EFD   # ð¡»½
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5C71 ; # å±±
-        :right    [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  [
-                    :structure [ a idc:⿳ ;
-                        :above    a.ucs:0x571F ; # 土
-                        :middle   rep.gt:00154 ; # &GT-00154;
-                        :below    rep.big5-cdp:0x8CC6   # &CDP-8CC6;
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x5712   # 園
     ] .
 ucs:0x21EFF   # ð¡»¿
     :structure [ a idc:⿲ ;
@@ -53368,19 +52720,14 @@ ucs:0x21F82   # 𡾂
         ]
     ] .
 ucs:0x21F83   # 𡾃
-    :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5C71 ; # å±±
-                :below    a.ucs:0x96C0   # 雀
-            ]
-        ] ;
-        :right    a.ucs:0x6208   # 戈
+    :structure [ a idc:SLR ;
+        :surround a.ucs:0x229F5 ; # 𢧵
+        :filling  a.ucs:0x5C71   # å±±
     ] .
 ucs:0x21F84   # 𡾄
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5C71 ; # å±±
-        :below    a.ucs:0x6578   # 數
+        :below    a.ucs_iwds-1:0x6578   # &A-IWDSU+6578;
     ] .
 ucs:0x21F85   # 𡾅
     :structure [ a idc:â¿° ;