X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ISD-UCS-Ext-B-3.ttl;h=8092323d4ec6c5135a53de7f950345cafbf8ef9c;hb=d94b89c05ba04718a3187620694dedc9513c714d;hp=b8935269d2600c8a25ee3c84fac8bb67e3e0a87d;hpb=7bf6ebf9f4970dba6c236a8dba39e05705819806;p=chise%2Fisd.git

diff --git a/ISD-UCS-Ext-B-3.ttl b/ISD-UCS-Ext-B-3.ttl
index b893526..8092323 100644
--- a/ISD-UCS-Ext-B-3.ttl
+++ b/ISD-UCS-Ext-B-3.ttl
@@ -6,7 +6,10 @@
 @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.mj: <http://www.chise.org/est/view/character/rep.mj=> .
-@prefix rep.adobe-japan1: <http://www.chise.org/est/view/character/rep.adobe-japan1=> .
+@prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
+@prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
+@prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
+@prefix rep.adobe-japan1-6: <http://www.chise.org/est/view/character/rep.adobe-japan1-6=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
 @prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
 @prefix a.jis-x0208: <http://www.chise.org/est/view/character/a.jis-x0208=> .
@@ -24,12 +27,14 @@
 @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 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.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @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-002: <http://www.chise.org/est/view/character/a.ucs-itaiji-002=> .
+@prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 
 ucs:0x24000   # 𤀀
     :structure [ a idc:â¿° ;
@@ -607,7 +612,7 @@ ucs:0x2404A   # 𤁊
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x535D ; # 卝
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x72AE   # 犮
             ]
         ]
@@ -863,7 +868,7 @@ ucs:0x2406D   # 𤁭
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x6216 ; # 或
-                :below    rep.adobe-japan1:01455   # &AJ1-01455;
+                :below    rep.adobe-japan1-0:01455   # &AJ1-01455;
             ]
         ]
     ] .
@@ -940,17 +945,7 @@ ucs:0x24079   # 𤁹
 ucs:0x2407A   # 𤁺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x4E06 ; # 丆
-                        :filling  a.ucs:0x5DE5   # å·¥
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x2407B   # 𤁻
     :structure [ a idc:â¿° ;
@@ -1046,7 +1041,7 @@ ucs:0x24086   # 𤂆
         :right    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x5B5A ; # 孚
-                :right    rep.adobe-japan1:01931   # &AJ1-01931;
+                :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
             ]
         ]
     ] .
@@ -1916,7 +1911,7 @@ ucs:0x240ED   # 𤃭
         :left     a.ucs:0x6C35 ; # æ°µ
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x7126   # 焦
             ]
         ]
@@ -2188,18 +2183,7 @@ ucs:0x24116   # 𤄖
 ucs:0x24117   # 𤄗
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x65E5 ; # 日
-                :middle   a.ucs:0x51FA ; # 出
-                :below    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5927 ; # 大
-                        :below    a.ucs:0x7C73   # ç±³
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x3B25   # 㬥
     ] .
 ucs:0x24118   # 𤄘
     :structure [ a idc:â¿° ;
@@ -2539,7 +2523,7 @@ ucs:0x24141   # 𤅁
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:â¿» ;
-                        :underlying rep.cns11643-4:0x2474 ; # &I-C4-2474;
+                        :underlying a.ucs:0x26951 ; # 𦥑
                         :overlaying a.ucs:0x767D   # 白
                     ]
                 ] ;
@@ -2550,7 +2534,7 @@ ucs:0x24141   # 𤅁
 ucs:0x24142   # 𤅂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:05653   # &AJ1-05653;
+        :right    rep.adobe-japan1-0:05653   # &AJ1-05653;
     ] .
 ucs:0x24143   # 𤅃
     :structure [ a idc:â¿° ;
@@ -2710,7 +2694,7 @@ ucs:0x24157   # 𤅗
 ucs:0x24159   # 𤅙
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:04449   # &AJ1-04449;
+        :right    rep.adobe-japan1-0:04449   # &AJ1-04449;
     ] .
 ucs:0x2415A   # 𤅚
     :structure [ a idc:â¿° ;
@@ -2763,15 +2747,9 @@ ucs:0x24160   # 𤅠
         :right    a.ucs:0x9A40   # 驀
     ] .
 ucs:0x24161   # 𤅡
-    :structure [ a idc:⿲ ;
+    :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :middle   [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x81EA ; # 自
-                :below    a.ucs:0x20982   # 𠦂
-            ]
-        ] ;
-        :right    a.ucs:0x9801   # 頁
+        :right    a.ucs:0x2954D   # 𩕍
     ] .
 ucs:0x24162   # 𤅢
     :structure [ a idc:â¿° ;
@@ -2795,7 +2773,7 @@ ucs:0x24165   # 𤅥
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:â¿° ;
                         :left     a.ucs:0x9B2F ; # 鬯
@@ -2856,13 +2834,8 @@ ucs:0x2416A   # 𤅪
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   rep.gt:36329 ; # &GT-36329;
-                :below    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x9B2F ; # 鬯
-                        :right    a.ucs:0x5BF8   # 寸
-                    ]
-                ]
+                :middle   a.ucs:0x2EAB ; # ⺫
+                :below    rep.ucs-itaiji-001:0x21B20   # &U-i001+21B20;
             ]
         ]
     ] .
@@ -2953,7 +2926,7 @@ ucs:0x24173   # 𤅳
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x22A0B ; # 𢨋
-                :below    rep.adobe-japan1:01455   # &AJ1-01455;
+                :below    rep.adobe-japan1-0:01455   # &AJ1-01455;
             ]
         ]
     ] .
@@ -2989,7 +2962,7 @@ ucs:0x24179   # 𤅹
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.gt:36329 ; # &GT-36329;
+                        :above    a.ucs:0x2EAB ; # ⺫
                         :below    a.ucs:0x5927   # 大
                     ]
                 ] ;
@@ -2997,13 +2970,13 @@ ucs:0x24179   # 𤅹
                     :structure [ a idc:â¿° ;
                         :left     [
                             :structure [ a idc:⿱ ;
-                                :above    rep.gt:36329 ; # &GT-36329;
+                                :above    a.ucs:0x2EAB ; # ⺫
                                 :below    a.ucs:0x5927   # 大
                             ]
                         ] ;
                         :right    [
                             :structure [ a idc:⿱ ;
-                                :above    rep.gt:36329 ; # &GT-36329;
+                                :above    a.ucs:0x2EAB ; # ⺫
                                 :below    a.ucs:0x5927   # 大
                             ]
                         ]
@@ -3578,7 +3551,7 @@ ucs:0x241D6   # 𤇖
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x53B6 ; # 厶
-                :below    rep.cns11643-4:0x212D   # &I-C4-212D;
+                :below    a.ucs:0x2053C   # 𠔼
             ]
         ]
     ] .
@@ -4048,7 +4021,7 @@ ucs:0x24224   # 𤈤
 ucs:0x24225   # 𤈥
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:05786   # &AJ1-05786;
+        :right    rep.adobe-japan1-0:05786   # &AJ1-05786;
     ] .
 ucs:0x24226   # 𤈦
     :structure [ a idc:â¿° ;
@@ -4093,7 +4066,7 @@ ucs:0x2422B   # 𤈫
 ucs:0x2422C   # 𤈬
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x706B ; # 火
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x53C8   # 又
     ] .
 ucs:0x2422D   # 𤈭
@@ -5059,7 +5032,7 @@ ucs:0x242C1   # 𤋁
 ucs:0x242C2   # 𤋂
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x535D ; # 卝
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x706B   # 火
     ] .
 ucs:0x242C3   # 𤋃
@@ -5310,7 +5283,7 @@ ucs:0x242E1   # 𤋡
 ucs:0x242E2   # 𤋢
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:03839   # &AJ1-03839;
+        :right    rep.adobe-japan1-0:03839   # &AJ1-03839;
     ] .
 ucs:0x242E3   # 𤋣
     :structure [ a idc:⿱ ;
@@ -5488,7 +5461,7 @@ ucs:0x242F6   # 𤋶
 ucs:0x242F7   # 𤋷
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:02775   # &AJ1-02775;
+        :right    rep.adobe-japan1-0:02775   # &AJ1-02775;
     ] .
 ucs:0x242F8   # 𤋸
     :structure [ a idc:â¿° ;
@@ -5712,7 +5685,7 @@ ucs:0x2431B   # 𤌛
         :right    [
             :structure [ a idc:â¿» ;
                 :underlying a.ucs:0x807F ; # 聿
-                :overlaying rep.cns11643-4:0x2141   # &I-C4-2141;
+                :overlaying a.ucs:0x206AA   # 𠚪
             ]
         ]
     ] .
@@ -5944,12 +5917,7 @@ ucs:0x2433F   # 𤌿
     ] .
 ucs:0x24340   # 𤍀
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x706B ; # 火
-                :right    a.ucs:0x706B   # 火
-            ]
-        ] ;
+        :above    a.ucs:0x708F ; # 炏
         :below    a.ucs:0x5411   # 向
     ] .
 ucs:0x24341   # 𤍁
@@ -6025,7 +5993,7 @@ ucs:0x2434B   # 𤍋
 ucs:0x2434C   # 𤍌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x58F0 ; # 声
-        :right    rep.adobe-japan1:16955   # &AJ1-16955;
+        :right    rep.adobe-japan1-5:16955   # &AJ1-16955;
     ] .
 ucs:0x2434D   # 𤍍
     :structure [ a idc:⿳ ;
@@ -6051,7 +6019,7 @@ ucs:0x24350   # 𤍐
 ucs:0x24351   # 𤍑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:02356   # &AJ1-02356;
+        :right    rep.adobe-japan1-0:02356   # &AJ1-02356;
     ] .
 ucs:0x24352   # 𤍒
     :structure [ a idc:â¿° ;
@@ -6111,7 +6079,7 @@ ucs:0x24359   # 𤍙
 ucs:0x2435A   # 𤍚
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x706B ; # 火
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x8278   # 艸
     ] .
 ucs:0x2435B   # 𤍛
@@ -6290,7 +6258,7 @@ ucs:0x24370   # 𤍰
 ucs:0x24371   # 𤍱
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x96E8 ; # 雨
-        :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
+        :middle   rep.adobe-japan1-4:15391 ; # &AJ1-15391;
         :below    a.ucs:0x2EA3   # ⺣
     ] .
 ucs:0x24372   # 𤍲
@@ -6350,7 +6318,7 @@ ucs:0x2437A   # 𤍺
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:â¿» ;
-                        :underlying rep.cns11643-4:0x2535 ; # &I-C4-2535;
+                        :underlying a.ucs:0x2020C ; # 𠈌
                         :overlaying a.ucs:0x4E28   # 丨
                     ]
                 ] ;
@@ -6364,7 +6332,7 @@ ucs:0x2437C   # 𤍼
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5408 ; # 合
-                :below    rep.cns11643-6:0x2239   # &I-C6-2239;
+                :below    a.ucs:0x20541   # 𠕁
             ]
         ]
     ] .
@@ -6465,28 +6433,18 @@ ucs:0x24388   # 𤎈
         ]
     ] .
 ucs:0x24389   # 𤎉
-    :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BAE ; # &CDP-8BAE;
-        :below    [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x5382 ; # 厂
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x88BB ; # &CDP-88BB;
-                        :below    a.ucs:0x706C   # 灬
-                    ]
-                ]
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x4EA7 ; # 产
+        :filling  [
+            :structure [ a idc:⿱ ;
+                :above    rep.big5-cdp:0x88BB ; # &CDP-88BB;
+                :below    a.ucs:0x706C   # 灬
             ]
         ]
     ] .
 ucs:0x2438A   # 𤎊
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x706B ; # 火
-                :right    a.ucs:0x706B   # 火
-            ]
-        ] ;
+        :above    a.ucs:0x708F ; # 炏
         :below    a.ucs:0x675F   # 束
     ] .
 ucs:0x2438B   # 𤎋
@@ -6495,7 +6453,7 @@ ucs:0x2438B   # 𤎋
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x7FBD ; # ç¾½
-                :below    rep.big5-cdp:0x8AB3   # &I-CDP-8AB3;
+                :below    a.ucs:0x5932   # 夲
             ]
         ]
     ] .
@@ -6543,13 +6501,7 @@ ucs:0x24390   # 𤎐
 ucs:0x24391   # 𤎑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x56DF ; # 囟
-                :middle   a.ucs:0x516B ; # 八
-                :below    a.ucs:0x590A   # 夊
-            ]
-        ]
+        :right    a.ucs:0x21569   # 𡕩
     ] .
 ucs:0x24392   # 𤎒
     :structure [ a idc:â¿° ;
@@ -6559,7 +6511,7 @@ ucs:0x24392   # 𤎒
 ucs:0x24393   # 𤎓
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x9752 ; # 青
-        :right    rep.adobe-japan1:16955   # &AJ1-16955;
+        :right    rep.adobe-japan1-5:16955   # &AJ1-16955;
     ] .
 ucs:0x24394   # 𤎔
     :structure [ a idc:â¿° ;
@@ -6649,7 +6601,7 @@ ucs:0x2439F   # 𤎟
         :above    a.ucs:0x5B80 ; # 宀
         :below    [
             :structure [ a idc:â¿° ;
-                :left     rep.adobe-japan1:21334 ; # &AJ1-21334;
+                :left     rep.adobe-japan1-6:21334 ; # &AJ1-21334;
                 :right    a.ucs:0x706B   # 火
             ]
         ]
@@ -6662,7 +6614,7 @@ ucs:0x243A0   # 𤎠
 ucs:0x243A1   # 𤎡
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7099 ; # 炙
-        :right    rep.adobe-japan1:18448   # &AJ1-18448;
+        :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x243A2   # 𤎢
     :structure [ a idc:â¿° ;
@@ -6774,12 +6726,7 @@ ucs:0x243B2   # 𤎲
 ucs:0x243B3   # 𤎳
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ]
+        :right    a.ucs:0x3AFA   # 㫺
     ] .
 ucs:0x243B4   # 𤎴
     :structure [ a idc:⿳ ;
@@ -7159,7 +7106,7 @@ ucs:0x243EC   # 𤏬
 ucs:0x243ED   # 𤏭
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x708E ; # 炎
-        :right    rep.adobe-japan1:18448   # &AJ1-18448;
+        :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x243EE   # 𤏮
     :structure [ a idc:â¿° ;
@@ -7377,7 +7324,7 @@ ucs:0x24409   # 𤐉
 ucs:0x2440A   # 𤐊
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:07124   # &AJ1-07124;
+        :right    rep.adobe-japan1-0:07124   # &AJ1-07124;
     ] .
 ucs:0x2440B   # 𤐋
     :structure [ a idc:â¿° ;
@@ -7444,7 +7391,7 @@ ucs:0x24410   # 𤐐
 ucs:0x24411   # 𤐑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:18030   # &AJ1-18030;
+        :right    rep.adobe-japan1-5:18030   # &AJ1-18030;
     ] .
 ucs:0x24412   # 𤐒
     :structure [ a idc:â¿° ;
@@ -7458,12 +7405,7 @@ ucs:0x24413   # 𤐓
     ] .
 ucs:0x24414   # 𤐔
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x706B ; # 火
-                :right    a.ucs:0x706B   # 火
-            ]
-        ] ;
+        :above    a.ucs:0x708F ; # 炏
         :below    a.ucs:0x662F   # 是
     ] .
 ucs:0x24415   # 𤐕
@@ -7768,7 +7710,7 @@ ucs:0x2443E   # 𤐾
     ] .
 ucs:0x2443F   # 𤐿
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02053 ; # &AJ1-02053;
+        :above    rep.adobe-japan1-0:02053 ; # &AJ1-02053;
         :below    a.ucs:0x2EA3   # ⺣
     ] .
 ucs:0x24440   # 𤑀
@@ -8312,15 +8254,9 @@ ucs:0x24481   # 𤒁
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
         :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x65E5 ; # 日
-                :middle   a.ucs:0x51FA ; # 出
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5927 ; # 大
-                        :filling  rep.adobe-japan1:13852   # &AJ1-13852;
-                    ]
-                ]
+            :structure [ a idc:⿱ ;
+                :above    rep.gt-k:09590 ; # &GT-K09590;
+                :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
             ]
         ]
     ] .
@@ -8759,18 +8695,7 @@ ucs:0x244B9   # 𤒹
 ucs:0x244BA   # 𤒺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x65E5 ; # 日
-                :middle   a.ucs:0x51FA ; # 出
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5927 ; # 大
-                        :filling  a.ucs:0x7C73   # ç±³
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x3B25   # 㬥
     ] .
 ucs:0x244BB   # 𤒻
     :structure [ a idc:â¿° ;
@@ -8885,18 +8810,7 @@ ucs:0x244C9   # 𤓉
 ucs:0x244CA   # 𤓊
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x65E5 ; # 日
-                :middle   a.ucs:0x51FA ; # 出
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5927 ; # 大
-                        :filling  a.ucs:0x8A00   # 言
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x27B09   # 𧬉
     ] .
 ucs:0x244CB   # 𤓋
     :structure [ a idc:â¿° ;
@@ -8971,7 +8885,7 @@ ucs:0x244D1   # 𤓑
 ucs:0x244D2   # 𤓒
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    rep.adobe-japan1:07430   # &AJ1-07430;
+        :right    rep.adobe-japan1-0:07430   # &AJ1-07430;
     ] .
 ucs:0x244D3   # 𤓓
     :structure [ a idc:â¿° ;
@@ -9075,7 +8989,7 @@ ucs:0x244E1   # 𤓡
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:â¿° ;
                         :left     a.ucs:0x9B2F ; # 鬯
@@ -9169,13 +9083,7 @@ ucs:0x244EC   # 𤓬
 ucs:0x244ED   # 𤓭
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x706B ; # 火
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8AD7 ; # &I-CDP-8AD7;
-                :middle   rep.gt:36329 ; # &GT-36329;
-                :below    rep.big5-cdp:0x8D42   # &CDP-8D42;
-            ]
-        ]
+        :right    a.ucs:0x6B1D   # 欝
     ] .
 ucs:0x244EE   # 𤓮
     :structure [ a idc:⿱ ;
@@ -9526,8 +9434,8 @@ ucs:0x24526   # 𤔦
     ] .
 ucs:0x24527   # 𤔧
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-4:0x386A ; # &C4-386A;
-        :right    a.ucs:0x4E8F   # 亏
+        :left     a.ucs:0x24514 ; # 𤔔
+        :right    a.ucs_component:0x4E8F   # &A-compU+4E8F;
     ] .
 ucs:0x24528   # 𤔨
     :structure [ a idc:⿸ ;
@@ -9607,7 +9515,7 @@ ucs:0x24531   # 𤔱
     ] .
 ucs:0x24532   # 𤔲
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-4:0x386A ; # &C4-386A;
+        :left     a.ucs:0x24514 ; # 𤔔
         :right    a.ucs:0x53F8   # 司
     ] .
 ucs:0x24533   # 𤔳
@@ -9651,12 +9559,7 @@ ucs:0x24538   # 𤔸
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x2EA4 ; # ⺤
         :middle   a.ucs:0x34C1 ; # 㓁
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     rep.big5-cdp:0x8B7C ; # &CDP-8B7C;
-                :right    a.ucs:0x5BF8   # 寸
-            ]
-        ]
+        :below    a.ucs:0x21B20   # 𡬠
     ] .
 ucs:0x24539   # 𤔹
     :structure [ a idc:⿱ ;
@@ -9686,7 +9589,7 @@ ucs:0x2453A   # 𤔺
                 :middle   [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x9FB4 ; # é¾´
-                        :below    rep.cns11643-6:0x2239   # &I-C6-2239;
+                        :below    a.ucs:0x20541   # 𠕁
                     ]
                 ] ;
                 :below    a.ucs:0x5BF8   # 寸
@@ -9746,15 +9649,8 @@ ucs:0x2453F   # 𤔿
         ]
     ] .
 ucs:0x24540   # 𤕀
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x2EA4 ; # ⺤
-        :middle   [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x5E7A ; # 幺
-                :middle   a.ucs:0x5E7A ; # 幺
-                :right    a.ucs:0x5E7A   # 幺
-            ]
-        ] ;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2AE95 ; # 𪺕
         :below    a.ucs:0x5B89   # 安
     ] .
 ucs:0x24541   # 𤕁
@@ -9801,7 +9697,7 @@ ucs:0x24544   # 𤕄
     ] .
 ucs:0x24545   # 𤕅
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-4:0x386A ; # &C4-386A;
+        :left     a.ucs:0x24514 ; # 𤔔
         :right    a.ucs:0x530B   # 匋
     ] .
 ucs:0x24546   # 𤕆
@@ -9852,7 +9748,7 @@ ucs:0x2454B   # 𤕋
     ] .
 ucs:0x2454C   # 𤕌
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-4:0x386A ; # &C4-386A;
+        :left     rep.ucs_iso:0x24514 ; # &C4-386A;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x6771 ; # 東
@@ -10259,7 +10155,7 @@ ucs:0x2458A   # 𤖊
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x2E8A ; # ⺊
-                :below    rep.cns11643-5:0x2229   # &I-C5-2229;
+                :below    a.ucs:0x2057B   # 𠕻
             ]
         ]
     ] .
@@ -10715,12 +10611,12 @@ ucs:0x245CF   # 𤗏
 ucs:0x245D0   # 𤗐
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7247 ; # 片
-        :right    rep.adobe-japan1:03690   # &AJ1-03690;
+        :right    rep.adobe-japan1-0:03690   # &AJ1-03690;
     ] .
 ucs:0x245D1   # 𤗑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7247 ; # 片
-        :right    rep.adobe-japan1:01931   # &AJ1-01931;
+        :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
     ] .
 ucs:0x245D2   # 𤗒
     :structure [ a idc:â¿° ;
@@ -10876,7 +10772,7 @@ ucs:0x245E6   # 𤗦
 ucs:0x245E7   # 𤗧
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7247 ; # 片
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x245E8   # 𤗨
     :structure [ a idc:â¿° ;
@@ -11197,7 +11093,7 @@ ucs:0x24620   # 𤘠
 ucs:0x24621   # 𤘡
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x725C ; # 牜
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x24622   # 𤘢
     :structure [ a idc:â¿° ;
@@ -11277,7 +11173,7 @@ ucs:0x24630   # 𤘰
 ucs:0x24631   # 𤘱
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x725C ; # 牜
-        :right    rep.daikanwa:14416   # &M-14416;
+        :right    a.ucs:0x233B3   # 𣎳
     ] .
 ucs:0x24632   # 𤘲
     :structure [ a idc:â¿° ;
@@ -11699,20 +11595,25 @@ ucs:0x24677   # 𤙷
         :left     a.ucs:0x725C ; # 牜
         :right    a.ucs:0x5B97   # 宗
     ] .
+ucs:0x24678   # 𤙸
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x725C ; # 牜
+        :right    [
+            :structure [ a idc:⿱ ;
+                :above    a.ucs:0x58EB ; # 士
+                :below    rep.big5-cdp:0x877A   # &CDP-877A;
+            ]
+        ]
+    ] .
 ucs:0x24679   # 𤙹
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x725C ; # 牜
         :right    a.ucs:0x5FFD   # 忽
     ] .
 ucs:0x2467A   # 𤙺
-    :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :middle   rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :below    rep.jis-x0213-2:0x7468   # &I-JX2-7468;
-            ]
-        ] ;
+    :structure [ a idc:⿳ ;
+        :above    rep.big5-cdp:0x8BEC ; # &CDP-8BEC;
+        :middle   a.ucs:0x513F ; # 儿
         :below    a.ucs:0x725B   # 牛
     ] .
 ucs:0x2467B   # 𤙻
@@ -11801,7 +11702,7 @@ ucs:0x24687   # 𤚇
         :left     a.ucs:0x725C ; # 牜
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :above    a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x53C8   # 又
             ]
         ]
@@ -11955,7 +11856,7 @@ ucs:0x2469E   # 𤚞
                 :above    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x4E3F ; # 丿
-                        :below    rep.gt:36329   # &GT-36329;
+                        :below    a.ucs:0x2EAB   # ⺫
                     ]
                 ] ;
                 :below    a.ucs:0x5C71   # å±±
@@ -12744,18 +12645,7 @@ ucs:0x2470B   # 𤜋
 ucs:0x2470C   # 𤜌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x725C ; # 牜
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x65E5 ; # 日
-                :middle   a.ucs:0x51FA ; # 出
-                :below    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5927 ; # 大
-                        :filling  a.ucs:0x7C73   # ç±³
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x3B25   # 㬥
     ] .
 ucs:0x2470D   # 𤜍
     :structure [ a idc:â¿° ;
@@ -12972,7 +12862,7 @@ ucs:0x2472F   # 𤜯
 ucs:0x24730   # 𤜰
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x24731   # 𤜱
     :structure [ a idc:â¿° ;
@@ -13067,7 +12957,7 @@ ucs:0x24741   # 𤝁
 ucs:0x24742   # 𤝂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.ucs_iso:0x233B3   # &C5-2148;
+        :right    a.ucs:0x233B3   # 𣎳
     ] .
 ucs:0x24743   # 𤝃
     :structure [ a idc:â¿° ;
@@ -13359,7 +13249,7 @@ ucs:0x24776   # 𤝶
 ucs:0x24777   # 𤝷
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.adobe-japan1:17468   # &AJ1-17468;
+        :right    rep.adobe-japan1-5:17468   # &AJ1-17468;
     ] .
 ucs:0x24778   # 𤝸
     :structure [ a idc:â¿° ;
@@ -13441,7 +13331,7 @@ ucs:0x24784   # 𤞄
         :left     a.ucs:0x2EA8 ; # ⺨
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :above    a.ucs:0x4E37 ; # 丷
                 :below    a.ucs:0x65E1   # 旡
             ]
         ]
@@ -13780,7 +13670,7 @@ ucs:0x247BA   # 𤞺
 ucs:0x247BB   # 𤞻
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.adobe-japan1:01562   # &AJ1-01562;
+        :right    rep.adobe-japan1-0:01562   # &AJ1-01562;
     ] .
 ucs:0x247BC   # 𤞼
     :structure [ a idc:â¿° ;
@@ -13840,7 +13730,7 @@ ucs:0x247C4   # 𤟄
 ucs:0x247C5   # 𤟅
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.adobe-japan1:18448   # &AJ1-18448;
+        :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x247C6   # 𤟆
     :structure [ a idc:â¿° ;
@@ -13940,17 +13830,7 @@ ucs:0x247D4   # 𤟔
 ucs:0x247D5   # 𤟕
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x2EBC   # ⺼
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x247D6   # 𤟖
     :structure [ a idc:â¿° ;
@@ -14099,7 +13979,7 @@ ucs:0x247EC   # 𤟬
     ] .
 ucs:0x247ED   # 𤟭
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8CD1 ; # &CDP-8CD1;
+        :above    a.ucs:0x3C8B ; # 㲋
         :below    a.ucs:0x72AC   # 犬
     ] .
 ucs:0x247EE   # 𤟮
@@ -14393,7 +14273,7 @@ ucs:0x2481C   # 𤠜
 ucs:0x2481D   # 𤠝
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EA8 ; # ⺨
-        :right    rep.adobe-japan1:02089   # &AJ1-02089;
+        :right    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x2481E   # 𤠞
     :structure [ a idc:â¿° ;
@@ -15496,7 +15376,7 @@ ucs:0x248C8   # 𤣈
         :middle   a.ucs:0x8033 ; # 耳
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2267 ; # &I-C4-2267;
+                :above    a.ucs:0x221B6 ; # 𢆶
                 :below    a.ucs:0x4ECE   # 从
             ]
         ]
@@ -15607,7 +15487,7 @@ ucs:0x248D9   # 𤣙
         :left     a.ucs:0x2EA8 ; # ⺨
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :above    a.ucs:0x4E37 ; # 丷
                 :middle   rep.big5-cdp:0x8CD4 ; # &CDP-8CD4;
                 :below    a.ucs:0x653F   # 政
             ]
@@ -15722,7 +15602,7 @@ ucs:0x248E8   # 𤣨
 ucs:0x248EA   # 𤣪
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x4E00 ; # 一
-        :middle   rep.ucs_iso:0x233B3 ; # &C5-2148;
+        :middle   a.ucs:0x233B3 ; # 𣎳
         :below    a.ucs:0x4E00   # 一
     ] .
 ucs:0x248EB   # 𤣫
@@ -16133,12 +16013,7 @@ ucs:0x24930   # 𤤰
 ucs:0x24931   # 𤤱
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    [
-            :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                :filling  a.ucs:0x53C8   # 又
-            ]
-        ]
+        :right    a.ucs:0x20B26   # 𠬦
     ] .
 ucs:0x24932   # 𤤲
     :structure [ a idc:â¿° ;
@@ -16536,12 +16411,7 @@ ucs:0x24971   # 𤥱
         :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿵ ;
-                        :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                        :filling  a.ucs:0x3405   # 㐅
-                    ]
-                ] ;
+                :above    a.ucs:0x20B26 ; # 𠬦
                 :below    a.ucs:0x53C8   # 又
             ]
         ]
@@ -16624,13 +16494,8 @@ ucs:0x2497F   # 𤥿
     ] .
 ucs:0x24980   # 𤦀
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5F13 ; # 弓
-                :right    rep.big5-cdp:0x88C2   # &I-CDP-88C2;
-            ]
-        ] ;
-        :below    a.ucs:0x7389   # 玉
+        :above    a.ucs:0x5F25 ; # å¼¥
+        :below    a.ucs_component:0x7389   # &A-compU+7389;
     ] .
 ucs:0x24981   # 𤦁
     :structure [ a idc:⿱ ;
@@ -17188,7 +17053,7 @@ ucs:0x249D6   # 𤧖
 ucs:0x249D7   # 𤧗
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:04376   # &AJ1-04376;
+        :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
     ] .
 ucs:0x249D8   # 𤧘
     :structure [ a idc:â¿° ;
@@ -17572,7 +17437,7 @@ ucs:0x24A0B   # 𤨋
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x2EAE ; # ⺮
-                :below    rep.adobe-japan1:02067   # &AJ1-02067;
+                :below    rep.adobe-japan1-0:02067   # &AJ1-02067;
             ]
         ]
     ] .
@@ -17637,7 +17502,7 @@ ucs:0x24A14   # 𤨔
         :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:⿳ ;
                         :above    a.ucs:0x4E00 ; # 一
@@ -17787,7 +17652,7 @@ ucs:0x24A28   # 𤨨
 ucs:0x24A29   # 𤨩
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:06180   # &AJ1-06180;
+        :right    rep.adobe-japan1-0:06180   # &AJ1-06180;
     ] .
 ucs:0x24A2A   # 𤨪
     :structure [ a idc:â¿° ;
@@ -17921,7 +17786,7 @@ ucs:0x24A3A   # 𤨺
         :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.jis-x0213-2:0x7468 ; # &I-JX2-7468;
+                :above    a.ucs:0x34C1 ; # 㓁
                 :below    a.ucs:0x91C6   # 釆
             ]
         ]
@@ -18014,7 +17879,7 @@ ucs:0x24A46   # 𤩆
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2E88 ; # ⺈
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x72AE   # 犮
             ]
         ]
@@ -18127,13 +17992,7 @@ ucs:0x24A54   # 𤩔
 ucs:0x24A55   # 𤩕
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
-                :middle   rep.gt:39640 ; # &GT-39640;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :right    a.ucs:0x5584   # 善
     ] .
 ucs:0x24A56   # 𤩖
     :structure [ a idc:â¿° ;
@@ -18188,7 +18047,18 @@ ucs:0x24A5D   # 𤩝
 ucs:0x24A5E   # 𤩞
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.cns11643-6:0x3E3B   # &C6-3E3B;
+        :right    [
+            :structure [ a idc:⿱ ;
+                :above    [
+                    :structure [ a idc:⿳ ;
+                        :above    a.ucs:0x2E88 ; # ⺈
+                        :middle   a.ucs:0x56DA ; # 囚
+                        :below    a.ucs:0x513F   # 儿
+                    ]
+                ] ;
+                :below    a.ucs:0x590A   # 夊
+            ]
+        ]
     ] .
 ucs:0x24A5F   # 𤩟
     :structure [ a idc:⿱ ;
@@ -18480,7 +18350,7 @@ ucs:0x24A87   # 𤪇
     :structure [ a idc:â¿° ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2851 ; # &I-C4-2851;
+                :above    a.ucs:0x209EA ; # 𠧪
                 :below    a.ucs:0x6728   # 木
             ]
         ] ;
@@ -18750,17 +18620,7 @@ ucs:0x24AA8   # 𤪨
 ucs:0x24AA9   # 𤪩
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x4E06 ; # 丆
-                        :filling  a.ucs:0x5DE5   # å·¥
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x24AAA   # 𤪪
     :structure [ a idc:â¿° ;
@@ -19027,7 +18887,7 @@ ucs:0x24ACB   # 𤫋
                         :filling  [
                             :structure [ a idc:â¿° ;
                                 :left     a.ucs:0x248E9 ; # 𤣩
-                                :right    rep.big5-cdp:0x88C2   # &I-CDP-88C2;
+                                :right    a.ucs:0x5C14   # 尔
                             ]
                         ]
                     ]
@@ -19154,7 +19014,7 @@ ucs:0x24AD9   # 𤫙
 ucs:0x24ADA   # 𤫚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:03949   # &AJ1-03949;
+        :right    rep.adobe-japan1-0:03949   # &AJ1-03949;
     ] .
 ucs:0x24ADB   # 𤫛
     :structure [ a idc:â¿° ;
@@ -19162,7 +19022,7 @@ ucs:0x24ADB   # 𤫛
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x76EE ; # 目
-                :below    rep.adobe-japan1:06607   # &AJ1-06607;
+                :below    rep.adobe-japan1-0:06607   # &AJ1-06607;
             ]
         ]
     ] .
@@ -19239,7 +19099,7 @@ ucs:0x24AE7   # 𤫧
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x535D ; # 卝
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:⿵ ;
                         :surround a.ucs:0x5927 ; # 大
@@ -19438,7 +19298,7 @@ ucs:0x24B0A   # 𤬊
 ucs:0x24B0B   # 𤬋
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x74DC ; # 瓜
-        :right    rep.adobe-japan1:04376   # &AJ1-04376;
+        :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
     ] .
 ucs:0x24B0C   # 𤬌
     :structure [ a idc:â¿° ;
@@ -19600,6 +19460,22 @@ ucs:0x24B24   # 𤬤
             ]
         ]
     ] .
+ucs:0x24B25   # 𤬥
+    :structure [ a idc:â¿° ;
+        :left     [
+            :structure [ a idc:⿳ ;
+                :above    a.ucs:0x4EA0 ; # 亠
+                :middle   a.ucs:0x5405 ; # 吅
+                :below    a.ucs:0x7FD2   # 習
+            ]
+        ] ;
+        :right    [
+            :structure [ a idc:⿱ ;
+                :above    a.ucs:0x74DC ; # 瓜
+                :below    a.ucs:0x8863   # è¡£
+            ]
+        ]
+    ] .
 ucs:0x24B26   # 𤬦
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5196 ; # 冖
@@ -19653,11 +19529,11 @@ ucs:0x24B2E   # 𤬮
 ucs:0x24B2F   # 𤬯
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x74E6 ; # 瓦
-        :filling  rep.adobe-japan1:02067   # &AJ1-02067;
+        :filling  rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x24B30   # 𤬰
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:02067 ; # &AJ1-02067;
+        :left     rep.adobe-japan1-0:02067 ; # &AJ1-02067;
         :right    a.ucs:0x74E6   # 瓦
     ] .
 ucs:0x24B31   # 𤬱
@@ -20291,7 +20167,7 @@ ucs:0x24B9D   # 𤮝
         :left     [
             :structure [ a idc:⿸ ;
                 :surround a.ucs:0x864D ; # 虍
-                :filling  rep.adobe-japan1:01455   # &AJ1-01455;
+                :filling  rep.adobe-japan1-0:01455   # &AJ1-01455;
             ]
         ] ;
         :right    a.ucs:0x74E6   # 瓦
@@ -20316,7 +20192,7 @@ ucs:0x24BA1   # 𤮡
         :left     [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EBF ; # ⺿
-                :middle   rep.jis-x0213-2:0x7468 ; # &I-JX2-7468;
+                :middle   a.ucs:0x34C1 ; # 㓁
                 :below    a.ucs:0x74E6   # 瓦
             ]
         ] ;
@@ -20382,7 +20258,7 @@ ucs:0x24BA9   # 𤮩
 ucs:0x24BAA   # 𤮪
     :structure [ a idc:â¿° ;
         :left     rep.big5-cdp:0x88FC ; # &CDP-88FC;
-        :right    rep.big5-cdp:0x8AC1   # &CDP-8AC1;
+        :right    rep.cns11643-3:0x265F   # &C3-265F;
     ] .
 ucs:0x24BAB   # 𤮫
     :structure [ a idc:⿲ ;
@@ -20761,7 +20637,7 @@ ucs:0x24BED   # 𤯭
 ucs:0x24BEE   # 𤯮
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x751F ; # 生
-        :right    rep.adobe-japan1:01931   # &AJ1-01931;
+        :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
     ] .
 ucs:0x24BEF   # 𤯯
     :structure [ a idc:⿱ ;
@@ -20771,7 +20647,7 @@ ucs:0x24BEF   # 𤯯
 ucs:0x24BF0   # 𤯰
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x751F ; # 生
-        :right    rep.adobe-japan1:03080   # &AJ1-03080;
+        :right    rep.adobe-japan1-0:03080   # &AJ1-03080;
     ] .
 ucs:0x24BF1   # 𤯱
     :structure [ a idc:â¿° ;
@@ -20813,7 +20689,7 @@ ucs:0x24BF9   # 𤯹
     :structure [ a idc:â¿° ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :above    a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x27C28   # 𧰨
             ]
         ] ;
@@ -21466,6 +21342,16 @@ ucs:0x24C6A   # 𤱪
         :above    rep.big5-cdp:0x8BC6 ; # &CDP-8BC6;
         :below    a.ucs:0x7530   # 田
     ] .
+ucs:0x24C6B   # 𤱫
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7531 ; # 由
+        :below    [
+            :structure [ a idc:â¿° ;
+                :left     rep.big5-cdp:0x8CAC ; # &CDP-8CAC;
+                :right    a.ucs:0x4EBA   # 人
+            ]
+        ]
+    ] .
 ucs:0x24C6C   # 𤱬
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7530 ; # 田
@@ -21487,7 +21373,7 @@ ucs:0x24C70   # 𤱰
         :left     a.ucs:0x7530 ; # 田
         :right    [
             :structure [ a idc:⿸ ;
-                :surround rep.cns11643-4:0x2121 ; # &I-C4-2121;
+                :surround a.ucs:0x20086 ; # 𠂆
                 :filling  rep.big5-cdp:0x8C66   # &CDP-8C66;
             ]
         ]
@@ -22081,7 +21967,7 @@ ucs:0x24CDA   # 𤳚
         :left     a.ucs:0x7530 ; # 田
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
+                :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
                 :middle   [
                     :structure [ a idc:â¿° ;
                         :left     a.ucs:0x5DE5 ; # å·¥
@@ -22119,7 +22005,7 @@ ucs:0x24CDD   # 𤳝
     ] .
 ucs:0x24CDE   # 𤳞
     :structure [ a idc:â¿° ;
-        :left     rep.cns11643-4:0x386A ; # &C4-386A;
+        :left     a.ucs:0x24514 ; # 𤔔
         :right    a.ucs:0x7530   # 田
     ] .
 ucs:0x24CDF   # 𤳟
@@ -22245,7 +22131,7 @@ ucs:0x24CEE   # 𤳮
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x706B ; # 火
-                :middle   rep.big5-cdp:0x8AB2 ; # &I-CDP-8AB2;
+                :middle   a.ucs:0x20B1E ; # 𠬞
                 :below    a.ucs:0x7530   # 田
             ]
         ]
@@ -22261,7 +22147,7 @@ ucs:0x24CF0   # 𤳰
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5C3A ; # å°º
-                :below    rep.adobe-japan1:01384   # &AJ1-01384;
+                :below    rep.adobe-japan1-0:01384   # &AJ1-01384;
             ]
         ]
     ] .
@@ -22323,17 +22209,7 @@ ucs:0x24CF5   # 𤳵
 ucs:0x24CF6   # 𤳶
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7530 ; # 田
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x4E06 ; # 丆
-                        :filling  a.ucs:0x5DE5   # å·¥
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x24CF7   # 𤳷
     :structure [ a idc:â¿° ;
@@ -22681,7 +22557,7 @@ ucs:0x24D1D   # 𤴝
 ucs:0x24D1E   # 𤴞
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x58EB ; # 士
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x53B6 ; # 厶
@@ -22858,7 +22734,7 @@ ucs:0x24D3C   # 𤴼
 ucs:0x24D3D   # 𤴽
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.adobe-japan1:02067   # &AJ1-02067;
+        :filling  rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x24D3E   # 𤴾
     :structure [ a idc:⿸ ;
@@ -23193,7 +23069,7 @@ ucs:0x24D77   # 𤵷
 ucs:0x24D78   # 𤵸
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.adobe-japan1:17468   # &AJ1-17468;
+        :filling  rep.adobe-japan1-5:17468   # &AJ1-17468;
     ] .
 ucs:0x24D79   # 𤵹
     :structure [ a idc:⿸ ;
@@ -23490,7 +23366,7 @@ ucs:0x24DA4   # 𤶤
         :surround a.ucs:0x7592 ; # 疒
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x88C2 ; # &I-CDP-88C2;
+                :above    a.ucs:0x5C14 ; # 尔
                 :below    a.ucs:0x53C8   # 又
             ]
         ]
@@ -23598,12 +23474,7 @@ ucs:0x24DB4   # 𤶴
 ucs:0x24DB5   # 𤶵
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x52FF ; # 勿
-                :below    a.ucs:0x5C71   # å±±
-            ]
-        ]
+        :filling  a.ucs:0x21D76   # 𡵶
     ] .
 ucs:0x24DB6   # 𤶶
     :structure [ a idc:⿸ ;
@@ -23843,7 +23714,7 @@ ucs:0x24DDE   # 𤷞
                 :above    [
                     :structure [ a idc:â¿» ;
                         :underlying a.ucs:0x4E3F ; # 丿
-                        :overlaying rep.adobe-japan1:15391   # &AJ1-15391;
+                        :overlaying rep.adobe-japan1-4:15391   # &AJ1-15391;
                     ]
                 ] ;
                 :below    a.ucs:0x5FC3   # 心
@@ -23953,7 +23824,7 @@ ucs:0x24DEF   # 𤷯
 ucs:0x24DF0   # 𤷰
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.adobe-japan1:03652   # &AJ1-03652;
+        :filling  rep.adobe-japan1-0:03652   # &AJ1-03652;
     ] .
 ucs:0x24DF1   # 𤷱
     :structure [ a idc:⿸ ;
@@ -24093,7 +23964,7 @@ ucs:0x24E06   # 𤸆
 ucs:0x24E07   # 𤸇
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.big5-cdp:0x8DAF   # &CDP-8DAF;
+        :filling  rep.cns11643-3:0x2B78   # &HD-IA-2D6B;
     ] .
 ucs:0x24E08   # 𤸈
     :structure [ a idc:⿸ ;
@@ -24214,7 +24085,7 @@ ucs:0x24E19   # 𤸙
 ucs:0x24E1A   # 𤸚
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.adobe-japan1:03231   # &AJ1-03231;
+        :filling  rep.adobe-japan1-0:03231   # &AJ1-03231;
     ] .
 ucs:0x24E1B   # 𤸛
     :structure [ a idc:⿸ ;
@@ -24496,7 +24367,7 @@ ucs:0x24E45   # 𤹅
         :surround a.ucs:0x7592 ; # 疒
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2267 ; # &I-C4-2267;
+                :above    a.ucs:0x221B6 ; # 𢆶
                 :below    a.ucs:0x6728   # 木
             ]
         ]
@@ -24719,7 +24590,7 @@ ucs:0x24E65   # 𤹥
 ucs:0x24E66   # 𤹦
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  rep.adobe-japan1:21281   # &AJ1-21281;
+        :filling  rep.adobe-japan1-6:21281   # &AJ1-21281;
     ] .
 ucs:0x24E67   # 𤹧
     :structure [ a idc:⿸ ;
@@ -24869,7 +24740,7 @@ ucs:0x24E79   # 𤹹
         :filling  [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2E88 ; # ⺈
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x652F   # 支
             ]
         ]
@@ -24889,7 +24760,7 @@ ucs:0x24E7C   # 𤹼
         :surround a.ucs:0x7592 ; # 疒
         :filling  [
             :structure [ a idc:⿺ ;
-                :surround rep.adobe-japan1:01931 ; # &AJ1-01931;
+                :surround rep.adobe-japan1-0:01931 ; # &AJ1-01931;
                 :filling  a.ucs:0x5F61   # 彡
             ]
         ]
@@ -25627,17 +25498,7 @@ ucs:0x24EF7   # 𤻷
 ucs:0x24EF8   # 𤻸
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x7592 ; # 疒
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x4E06 ; # 丆
-                        :filling  a.ucs:0x5DE5   # å·¥
-                    ]
-                ]
-            ]
-        ]
+        :filling  a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x24EF9   # 𤻹
     :structure [ a idc:⿸ ;
@@ -26434,7 +26295,7 @@ ucs:0x24F7D   # 𤽽
 ucs:0x24F7E   # 𤽾
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x767D ; # 白
-        :right    rep.adobe-japan1:01931   # &AJ1-01931;
+        :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
     ] .
 ucs:0x24F7F   # 𤽿
     :structure [ a idc:â¿° ;
@@ -26459,7 +26320,7 @@ ucs:0x24F81   # 𤾁
 ucs:0x24F82   # 𤾂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x767D ; # 白
-        :right    rep.adobe-japan1:01148   # &AJ1-01148;
+        :right    rep.adobe-japan1-0:01148   # &AJ1-01148;
     ] .
 ucs:0x24F83   # 𤾃
     :structure [ a idc:â¿° ;
@@ -26572,7 +26433,7 @@ ucs:0x24F93   # 𤾓
 ucs:0x24F94   # 𤾔
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x767D ; # 白
-        :right    rep.adobe-japan1:17775   # &AJ1-17775;
+        :right    rep.adobe-japan1-5:17775   # &AJ1-17775;
     ] .
 ucs:0x24F95   # 𤾕
     :structure [ a idc:⿱ ;
@@ -26664,7 +26525,7 @@ ucs:0x24FA0   # 𤾠
 ucs:0x24FA1   # 𤾡
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x767D ; # 白
-        :right    a.ucs_component:0x7232   # &IWDS1-315;
+        :right    a.ucs_component:0x7232   # &A-compU+7232;
     ] .
 ucs:0x24FA2   # 𤾢
     :structure [ a idc:â¿° ;
@@ -26904,12 +26765,7 @@ ucs:0x24FC3   # 𤿃
         :right    [
             :structure [ a idc:⿱ ;
                 :above    rep.big5-cdp:0x8BB8 ; # &CDP-8BB8;
-                :below    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x9B2F ; # 鬯
-                        :right    a.ucs:0x5BF8   # 寸
-                    ]
-                ]
+                :below    rep.ucs-itaiji-001:0x21B20   # &U-i001+21B20;
             ]
         ]
     ] .
@@ -27215,7 +27071,7 @@ ucs:0x24FF6   # 𤿶
     ] .
 ucs:0x24FF7   # 𤿷
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:18448 ; # &AJ1-18448;
+        :left     rep.adobe-japan1-5:18448 ; # &AJ1-18448;
         :right    a.ucs:0x76AE   # 皮
     ] .
 ucs:0x24FF8   # 𤿸
@@ -27461,12 +27317,7 @@ ucs:0x2501E   # 𥀞
     ] .
 ucs:0x2501F   # 𥀟
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ] ;
+        :left     a.ucs:0x3AFA ; # 㫺
         :right    a.ucs:0x76AE   # 皮
     ] .
 ucs:0x25020   # 𥀠
@@ -27754,7 +27605,7 @@ ucs:0x2504B   # 𥁋
     ] .
 ucs:0x2504C   # 𥁌
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02067 ; # &AJ1-02067;
+        :above    rep.adobe-japan1-0:02067 ; # &AJ1-02067;
         :below    a.ucs:0x76BF   # 皿
     ] .
 ucs:0x2504D   # 𥁍
@@ -27925,7 +27776,7 @@ ucs:0x2506A   # 𥁪
     ] .
 ucs:0x2506B   # 𥁫
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x89DD ; # &CDP-89DD;
+        :above    rep.cns11643-3:0x236A ; # &C3-236A;
         :below    a.ucs:0x76BF   # 皿
     ] .
 ucs:0x2506C   # 𥁬
@@ -28085,7 +27936,7 @@ ucs:0x25083   # 𥂃
         :above    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x5F73 ; # å½³
-                :right    rep.big5-cdp:0x8D5F   # &I-CDP-8D5F;
+                :right    rep.adobe-japan1-5:17468   # &AJ1-17468;
             ]
         ] ;
         :below    a.ucs:0x76BF   # 皿
@@ -28266,7 +28117,7 @@ ucs:0x2509E   # 𥂞
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:â¿» ;
-                :underlying rep.cns11643-4:0x2474 ; # &I-C4-2474;
+                :underlying a.ucs:0x26951 ; # 𦥑
                 :overlaying [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x3405 ; # 㐅
@@ -28305,7 +28156,7 @@ ucs:0x250A0   # 𥂠
 ucs:0x250A1   # 𥂡
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x4EA0 ; # 亠
-        :middle   rep.adobe-japan1:04376 ; # &AJ1-04376;
+        :middle   rep.adobe-japan1-0:04376 ; # &AJ1-04376;
         :below    a.ucs:0x76BF   # 皿
     ] .
 ucs:0x250A2   # 𥂢
@@ -28898,7 +28749,7 @@ ucs:0x250E2   # 𥃢
     :structure [ a idc:â¿° ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8CD1 ; # &CDP-8CD1;
+                :above    a.ucs:0x3C8B ; # 㲋
                 :below    a.ucs:0x514D   # 免
             ]
         ] ;
@@ -29908,7 +29759,7 @@ ucs:0x25189   # 𥆉
 ucs:0x2518A   # 𥆊
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.big5-cdp:0x88F4   # &CDP-88F4;
+        :right    rep.cns11643-4:0x2429   # &C4-2429;
     ] .
 ucs:0x2518B   # 𥆋
     :structure [ a idc:â¿° ;
@@ -29918,7 +29769,7 @@ ucs:0x2518B   # 𥆋
 ucs:0x2518C   # 𥆌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:01455   # &AJ1-01455;
+        :right    rep.adobe-japan1-0:01455   # &AJ1-01455;
     ] .
 ucs:0x2518D   # 𥆍
     :structure [ a idc:â¿° ;
@@ -30138,12 +29989,7 @@ ucs:0x251B1   # 𥆱
 ucs:0x251B2   # 𥆲
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x52FF ; # 勿
-                :below    a.ucs:0x5C71   # å±±
-            ]
-        ]
+        :right    a.ucs:0x21D76   # 𡵶
     ] .
 ucs:0x251B3   # 𥆳
     :structure [ a idc:⿱ ;
@@ -30163,7 +30009,7 @@ ucs:0x251B4   # 𥆴
 ucs:0x251B5   # 𥆵
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.big5-cdp:0x8AC1   # &CDP-8AC1;
+        :right    rep.cns11643-3:0x265F   # &C3-265F;
     ] .
 ucs:0x251B6   # 𥆶
     :structure [ a idc:â¿° ;
@@ -30213,7 +30059,7 @@ ucs:0x251BC   # 𥆼
 ucs:0x251BD   # 𥆽
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:01755   # &AJ1-01755;
+        :right    rep.adobe-japan1-0:01755   # &AJ1-01755;
     ] .
 ucs:0x251BE   # 𥆾
     :structure [ a idc:â¿° ;
@@ -30303,7 +30149,7 @@ ucs:0x251CB   # 𥇋
 ucs:0x251CC   # 𥇌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:18448   # &AJ1-18448;
+        :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x251CD   # 𥇍
     :structure [ a idc:â¿° ;
@@ -30313,12 +30159,7 @@ ucs:0x251CD   # 𥇍
 ucs:0x251CE   # 𥇎
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5F13 ; # 弓
-                :right    rep.big5-cdp:0x88C2   # &I-CDP-88C2;
-            ]
-        ]
+        :right    a.ucs:0x5F25   # å¼¥
     ] .
 ucs:0x251CF   # 𥇏
     :structure [ a idc:â¿° ;
@@ -30678,7 +30519,7 @@ ucs:0x25201   # 𥈁
 ucs:0x25202   # 𥈂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:04109   # &AJ1-04109;
+        :right    rep.adobe-japan1-0:04109   # &AJ1-04109;
     ] .
 ucs:0x25203   # 𥈃
     :structure [ a idc:â¿° ;
@@ -30789,7 +30630,7 @@ ucs:0x25212   # 𥈒
 ucs:0x25213   # 𥈓
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:04376   # &AJ1-04376;
+        :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
     ] .
 ucs:0x25214   # 𥈔
     :structure [ a idc:â¿° ;
@@ -30915,7 +30756,7 @@ ucs:0x25223   # 𥈣
 ucs:0x25224   # 𥈤
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.ucs-itaiji-001:0x758C   # &GT-K06360;
+        :right    rep.ucs-itaiji-001:0x758C   # &U-i001+758C;
     ] .
 ucs:0x25225   # 𥈥
     :structure [ a idc:â¿° ;
@@ -31031,7 +30872,7 @@ ucs:0x25239   # 𥈹
 ucs:0x2523A   # 𥈺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.ucs-var-001:0x8200   # &GT-K06065;
+        :right    rep.ucs-var-001:0x8200   # &U-v001+8200;
     ] .
 ucs:0x2523B   # 𥈻
     :structure [ a idc:â¿° ;
@@ -31470,7 +31311,7 @@ ucs:0x25283   # 𥊃
         :above    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4ECE ; # 从
-                :below    rep.gt:36329   # &GT-36329;
+                :below    a.ucs:0x2EAB   # ⺫
             ]
         ] ;
         :below    [
@@ -31483,7 +31324,7 @@ ucs:0x25283   # 𥊃
 ucs:0x25284   # 𥊄
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x535D ; # 卝
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    [
             :structure [ a idc:⿹ ;
                 :surround a.ucs:0x52F9 ; # 勹
@@ -31635,13 +31476,7 @@ ucs:0x25298   # 𥊘
 ucs:0x25299   # 𥊙
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x56DF ; # 囟
-                :middle   a.ucs:0x516B ; # 八
-                :below    a.ucs:0x590A   # 夊
-            ]
-        ]
+        :right    a.ucs:0x21569   # 𡕩
     ] .
 ucs:0x2529A   # 𥊚
     :structure [ a idc:â¿° ;
@@ -31851,7 +31686,7 @@ ucs:0x252BE   # 𥊾
 ucs:0x252BF   # 𥊿
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x4020 ; # 䀠
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x53C8   # 又
     ] .
 ucs:0x252C0   # 𥋀
@@ -31878,7 +31713,7 @@ ucs:0x252C2   # 𥋂
                 :above    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x2E88 ; # ⺈
-                        :below    rep.gt:36329   # &GT-36329;
+                        :below    a.ucs:0x2EAB   # ⺫
                     ]
                 ] ;
                 :middle   a.ucs:0x516B ; # 八
@@ -32042,7 +31877,7 @@ ucs:0x252DA   # 𥋚
         :above    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x535D ; # 卝
-                :below    rep.gt:36329   # &GT-36329;
+                :below    a.ucs:0x2EAB   # ⺫
             ]
         ] ;
         :middle   a.ucs:0x6208 ; # 戈
@@ -32895,7 +32730,7 @@ ucs:0x25352   # 𥍒
 ucs:0x25353   # 𥍓
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
-        :right    rep.adobe-japan1:04449   # &AJ1-04449;
+        :right    rep.adobe-japan1-0:04449   # &AJ1-04449;
     ] .
 ucs:0x25354   # 𥍔
     :structure [ a idc:â¿° ;
@@ -33236,12 +33071,7 @@ ucs:0x2538E   # 𥎎
 ucs:0x2538F   # 𥎏
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77DB ; # 矛
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ]
+        :right    a.ucs:0x3AFA   # 㫺
     ] .
 ucs:0x25390   # 𥎐
     :structure [ a idc:â¿° ;
@@ -33585,17 +33415,7 @@ ucs:0x253C2   # 𥏂
 ucs:0x253C3   # 𥏃
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77E2 ; # 矢
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x53E3 ; # 口
-                :below    [
-                    :structure [ a idc:â¿» ;
-                        :underlying a.ucs:0x4E02 ; # 丂
-                        :overlaying a.ucs:0x4E00   # 一
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x23158   # 𣅘
     ] .
 ucs:0x253C4   # 𥏄
     :structure [ a idc:â¿° ;
@@ -33614,7 +33434,7 @@ ucs:0x253C6   # 𥏆
     ] .
 ucs:0x253C7   # 𥏇
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BFA ; # &CDP-8BFA;
+        :above    a.daikanwa:48931 ; # &A-M-48931;
         :below    a.ucs:0x77E2   # 矢
     ] .
 ucs:0x253C9   # 𥏉
@@ -33915,7 +33735,7 @@ ucs:0x253F9   # 𥏹
 ucs:0x253FA   # 𥏺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77E2 ; # 矢
-        :right    rep.adobe-japan1:02089   # &AJ1-02089;
+        :right    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x253FB   # 𥏻
     :structure [ a idc:â¿° ;
@@ -34064,7 +33884,7 @@ ucs:0x25411   # 𥐑
 ucs:0x25412   # 𥐒
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x77ED ; # 短
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x25413   # 𥐓
     :structure [ a idc:â¿° ;
@@ -34490,12 +34310,7 @@ ucs:0x25459   # 𥑙
 ucs:0x2545A   # 𥑚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    [
-            :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                :filling  a.ucs:0x4EBA   # 人
-            ]
-        ]
+        :right    rep.ucs-itaiji-005:0x56DF   # &U-i005+56DF;
     ] .
 ucs:0x2545B   # 𥑛
     :structure [ a idc:â¿° ;
@@ -34571,22 +34386,12 @@ ucs:0x25467   # 𥑧
 ucs:0x25468   # 𥑨
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    [
-            :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                :filling  a.ucs:0x3405   # 㐅
-            ]
-        ]
+        :right    rep.ucs-itaiji-001:0x56DF   # &U-i001+56DF;
     ] .
 ucs:0x25469   # 𥑩
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    [
-            :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                :filling  a.ucs:0x53C8   # 又
-            ]
-        ]
+        :right    a.ucs:0x20B26   # 𠬦
     ] .
 ucs:0x2546A   # 𥑪
     :structure [ a idc:â¿° ;
@@ -34821,7 +34626,7 @@ ucs:0x25493   # 𥒓
 ucs:0x25494   # 𥒔
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    rep.big5-cdp:0x88F4   # &CDP-88F4;
+        :right    rep.cns11643-4:0x2429   # &C4-2429;
     ] .
 ucs:0x25495   # 𥒕
     :structure [ a idc:â¿° ;
@@ -35231,7 +35036,7 @@ ucs:0x254D1   # 𥓑
 ucs:0x254D2   # 𥓒
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    rep.adobe-japan1:18448   # &AJ1-18448;
+        :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x254D3   # 𥓓
     :structure [ a idc:â¿° ;
@@ -35276,7 +35081,7 @@ ucs:0x254D9   # 𥓙
 ucs:0x254DA   # 𥓚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    rep.adobe-japan1:01931   # &AJ1-01931;
+        :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
     ] .
 ucs:0x254DC   # 𥓜
     :structure [ a idc:⿱ ;
@@ -35447,7 +35252,7 @@ ucs:0x254F4   # 𥓴
 ucs:0x254F5   # 𥓵
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    rep.adobe-japan1:03080   # &AJ1-03080;
+        :right    rep.adobe-japan1-0:03080   # &AJ1-03080;
     ] .
 ucs:0x254F6   # 𥓶
     :structure [ a idc:â¿° ;
@@ -36089,17 +35894,7 @@ ucs:0x25559   # 𥕙
 ucs:0x2555A   # 𥕚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:â¿° ;
-                        :left     a.ucs:0x706B ; # 火
-                        :right    a.ucs:0x706B   # 火
-                    ]
-                ] ;
-                :below    a.ucs:0x5342   # 卂
-            ]
-        ]
+        :right    a.ucs:0x3DC0   # 㷀
     ] .
 ucs:0x2555B   # 𥕛
     :structure [ a idc:â¿° ;
@@ -36199,7 +35994,7 @@ ucs:0x25569   # 𥕩
                         :below    a.ucs:0x4E36   # 丶
                     ]
                 ] ;
-                :below    rep.cns11643-6:0x2336   # &I-C6-2336;
+                :below    a.ucs:0x24D13   # 𤴓
             ]
         ]
     ] .
@@ -36230,7 +36025,7 @@ ucs:0x2556C   # 𥕬
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :below    rep.cns11643-6:0x2542   # &I-C6-2542;
+                :below    a.ucs:0x26222   # 𦈢
             ]
         ]
     ] .
@@ -36375,7 +36170,7 @@ ucs:0x25584   # 𥖄
         :left     a.ucs:0x77F3 ; # 石
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :above    a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x6B21   # 次
             ]
         ]
@@ -36401,7 +36196,7 @@ ucs:0x25588   # 𥖈
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EBF ; # ⺿
-                :middle   rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :middle   a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x51E0   # 几
             ]
         ]
@@ -36449,7 +36244,7 @@ ucs:0x2558E   # 𥖎
 ucs:0x2558F   # 𥖏
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
-        :right    rep.adobe-japan1:01551   # &AJ1-01551;
+        :right    rep.adobe-japan1-0:01551   # &AJ1-01551;
     ] .
 ucs:0x25590   # 𥖐
     :structure [ a idc:â¿° ;
@@ -36671,7 +36466,7 @@ ucs:0x255B4   # 𥖴
         :left     a.ucs:0x77F3 ; # 石
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
+                :above    a.ucs:0x2020C ; # 𠈌
                 :below    a.ucs:0x7F36   # 缶
             ]
         ]
@@ -36983,7 +36778,7 @@ ucs:0x255E2   # 𥗢
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4E1A ; # 业
-                :middle   rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :middle   a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x6B21   # 次
             ]
         ]
@@ -37130,6 +36925,21 @@ ucs:0x255F6   # 𥗶
         ] ;
         :below    a.ucs:0x77F3   # 石
     ] .
+ucs:0x255F8   # 𥗸
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x77F3 ; # 石
+        :right    [
+            :structure [ a idc:⿱ ;
+                :above    [
+                    :structure [ a idc:â¿» ;
+                        :underlying a.ucs:0x26951 ; # 𦥑
+                        :overlaying rep.ucs-itaiji-001:0x56DF   # &U-i001+56DF;
+                    ]
+                ] ;
+                :below    a.ucs:0x8FB0   # è¾°
+            ]
+        ]
+    ] .
 ucs:0x255F9   # 𥗹
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x77F3 ; # 石
@@ -37334,7 +37144,7 @@ ucs:0x2561D   # 𥘝
 ucs:0x2561E   # 𥘞
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAD ; # ⺭
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x2561F   # 𥘟
     :structure [ a idc:â¿° ;
@@ -37589,7 +37399,7 @@ ucs:0x2564B   # 𥙋
 ucs:0x2564C   # 𥙌
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x793A ; # 示
-        :right    rep.ucs_iso:0x20094   # &C5-214E;
+        :right    a.ucs:0x20094   # 𠂔
     ] .
 ucs:0x2564D   # 𥙍
     :structure [ a idc:â¿° ;
@@ -38069,7 +37879,7 @@ ucs:0x25699   # 𥚙
 ucs:0x2569A   # 𥚚
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAD ; # ⺭
-        :right    rep.adobe-japan1:01931   # &AJ1-01931;
+        :right    rep.adobe-japan1-0:01931   # &AJ1-01931;
     ] .
 ucs:0x2569B   # 𥚛
     :structure [ a idc:â¿° ;
@@ -38089,17 +37899,7 @@ ucs:0x2569C   # 𥚜
 ucs:0x2569D   # 𥚝
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAD ; # ⺭
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x2EBC   # ⺼
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x2569E   # 𥚞
     :structure [ a idc:â¿° ;
@@ -38123,12 +37923,7 @@ ucs:0x256A0   # 𥚠
     ] .
 ucs:0x256A1   # 𥚡
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x706B ; # 火
-                :right    a.ucs:0x706B   # 火
-            ]
-        ] ;
+        :above    a.ucs:0x708F ; # 炏
         :below    a.ucs:0x793A   # 示
     ] .
 ucs:0x256A2   # 𥚢
@@ -38208,7 +38003,7 @@ ucs:0x256AC   # 𥚬
         :right    [
             :structure [ a idc:⿹ ;
                 :surround a.ucs:0x52F9 ; # 勹
-                :filling  rep.cns11643-6:0x2542   # &I-C6-2542;
+                :filling  a.ucs:0x26222   # 𦈢
             ]
         ]
     ] .
@@ -38337,8 +38132,8 @@ ucs:0x256C0   # 𥛀
         :left     a.ucs:0x2EAD ; # ⺭
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                :middle   rep.jis-x0213-2:0x7468 ; # &I-JX2-7468;
+                :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                :middle   a.ucs:0x34C1 ; # 㓁
                 :below    a.ucs:0x53C8   # 又
             ]
         ]
@@ -38401,7 +38196,7 @@ ucs:0x256C9   # 𥛉
 ucs:0x256CA   # 𥛊
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAD ; # ⺭
-        :right    rep.adobe-japan1:02708   # &AJ1-02708;
+        :right    rep.adobe-japan1-0:02708   # &AJ1-02708;
     ] .
 ucs:0x256CB   # 𥛋
     :structure [ a idc:â¿° ;
@@ -38523,7 +38318,7 @@ ucs:0x256DB   # 𥛛
         :above    a.ucs:0x5196 ; # 冖
         :below    [
             :structure [ a idc:â¿° ;
-                :left     rep.adobe-japan1:21334 ; # &AJ1-21334;
+                :left     rep.adobe-japan1-6:21334 ; # &AJ1-21334;
                 :right    a.ucs:0x793A   # 示
             ]
         ]
@@ -38700,14 +38495,8 @@ ucs:0x256F5   # 𥛵
     ] .
 ucs:0x256F6   # 𥛶
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EAD ; # ⺭
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
-                :middle   rep.gt:39640 ; # &GT-39640;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :left     a.ucs_component:0x793A ; # &A-compU+793A;
+        :right    a.ucs:0x5584   # 善
     ] .
 ucs:0x256F7   # 𥛷
     :structure [ a idc:â¿° ;
@@ -38757,12 +38546,7 @@ ucs:0x256FD   # 𥛽
 ucs:0x256FE   # 𥛾
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAD ; # ⺭
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ]
+        :right    a.ucs:0x3AFA   # 㫺
     ] .
 ucs:0x256FF   # 𥛿
     :structure [ a idc:â¿° ;
@@ -39117,7 +38901,7 @@ ucs:0x2572B   # 𥜫
                     :structure [ a idc:⿳ ;
                         :above    a.ucs:0x201A2 ; # 𠆢
                         :middle   a.ucs:0x4E00 ; # 一
-                        :below    rep.cns11643-5:0x2848   # &I-C5-2848;
+                        :below    a.ucs:0x20C60   # ð ± 
                     ]
                 ] ;
                 :below    a.ucs:0x56E1   # 囡
@@ -39760,7 +39544,7 @@ ucs:0x25789   # 𥞉
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4E3F ; # 丿
-                :middle   rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :middle   a.ucs:0x4E37 ; # 丷
                 :below    a.ucs:0x4E01   # 丁
             ]
         ]
@@ -39868,7 +39652,7 @@ ucs:0x2579B   # 𥞛
 ucs:0x2579C   # 𥞜
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:17468   # &AJ1-17468;
+        :right    rep.adobe-japan1-5:17468   # &AJ1-17468;
     ] .
 ucs:0x2579D   # 𥞝
     :structure [ a idc:â¿° ;
@@ -40434,17 +40218,7 @@ ucs:0x257ED   # 𥟭
 ucs:0x257EE   # 𥟮
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x2EBC   # ⺼
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x257EF   # 𥟯
     :structure [ a idc:â¿° ;
@@ -40486,7 +40260,7 @@ ucs:0x257F2   # 𥟲
         :above    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x5F73 ; # å½³
-                :right    rep.big5-cdp:0x8A61   # &I-CDP-8A61;
+                :right    rep.cns11643-3:0x2252   # &C3-2252;
             ]
         ] ;
         :below    a.ucs:0x79BE   # 禾
@@ -40601,7 +40375,7 @@ ucs:0x25800   # 𥠀
 ucs:0x25801   # 𥠁
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:04376   # &AJ1-04376;
+        :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
     ] .
 ucs:0x25802   # 𥠂
     :structure [ a idc:â¿° ;
@@ -40737,7 +40511,7 @@ ucs:0x25813   # 𥠓
 ucs:0x25814   # 𥠔
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:02399   # &AJ1-02399;
+        :right    rep.adobe-japan1-0:02399   # &AJ1-02399;
     ] .
 ucs:0x25815   # 𥠕
     :structure [ a idc:â¿° ;
@@ -40919,7 +40693,7 @@ ucs:0x2582B   # 𥠫
 ucs:0x2582C   # 𥠬
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:02775   # &AJ1-02775;
+        :right    rep.adobe-japan1-0:02775   # &AJ1-02775;
     ] .
 ucs:0x2582D   # 𥠭
     :structure [ a idc:â¿° ;
@@ -41045,7 +40819,7 @@ ucs:0x25841   # 𥡁
 ucs:0x25842   # 𥡂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x25843   # 𥡃
     :structure [ a idc:â¿° ;
@@ -41057,7 +40831,7 @@ ucs:0x25844   # 𥡄
         :left     a.ucs:0x79BE ; # 禾
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-6:0x225D ; # &I-C6-225D;
+                :above    a.ucs:0x20BA5 ; # 𠮥
                 :below    rep.big5-cdp:0x8BE8   # &CDP-8BE8;
             ]
         ]
@@ -41073,7 +40847,7 @@ ucs:0x25846   # 𥡆
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x767D ; # 白
-                :middle   rep.cns11643-5:0x2126 ; # &I-C5-2126;
+                :middle   a.ucs:0x20087 ; # 𠂇
                 :below    a.ucs:0x5F61   # 彡
             ]
         ]
@@ -41081,7 +40855,7 @@ ucs:0x25846   # 𥡆
 ucs:0x25847   # 𥡇
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:02708   # &AJ1-02708;
+        :right    rep.adobe-japan1-0:02708   # &AJ1-02708;
     ] .
 ucs:0x25848   # 𥡈
     :structure [ a idc:â¿° ;
@@ -41337,7 +41111,7 @@ ucs:0x25867   # 𥡧
 ucs:0x25868   # 𥡨
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    rep.adobe-japan1:17729   # &AJ1-17729;
+        :right    rep.adobe-japan1-5:17729   # &AJ1-17729;
     ] .
 ucs:0x25869   # 𥡩
     :structure [ a idc:â¿° ;
@@ -42126,7 +41900,7 @@ ucs:0x258D5   # 𥣕
         :left     a.ucs:0x79BE ; # 禾
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :above    a.ucs:0x4E37 ; # 丷
                 :below    a.ucs:0x7570   # 異
             ]
         ]
@@ -42186,7 +41960,7 @@ ucs:0x258DF   # 𥣟
         :left     a.ucs:0x79BE ; # 禾
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:18448 ; # &AJ1-18448;
+                :above    rep.adobe-japan1-5:18448 ; # &AJ1-18448;
                 :below    rep.big5-cdp:0x8DBF   # &CDP-8DBF;
             ]
         ]
@@ -42267,8 +42041,8 @@ ucs:0x258E8   # 𥣨
         :left     [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x79BE ; # 禾
-                :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
-                :below    rep.adobe-japan1:15391   # &AJ1-15391;
+                :middle   rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
             ]
         ] ;
         :right    rep.big5-cdp:0x86EC   # &CDP-86EC;
@@ -42394,35 +42168,15 @@ ucs:0x258F8   # 𥣸
 ucs:0x258F9   # 𥣹
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
-        :right    [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x4EA7 ; # 产
-                :filling  [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x88BB ; # &CDP-88BB;
-                        :below    a.ucs:0x706C   # 灬
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x24389   # 𤎉
     ] .
 ucs:0x258FA   # 𥣺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x79BE ; # 禾
         :right    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.gt:39640 ; # &GT-39640;
-                        :below    rep.big5-cdp:0x88BB   # &CDP-88BB;
-                    ]
-                ] ;
-                :below    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x706C ; # 灬
-                        :below    a.ucs:0x571F   # 土
-                    ]
-                ]
+                :above    a.ucs:0x20525 ; # 𠔥
+                :below    a.ucs:0x571F   # 土
             ]
         ]
     ] .
@@ -42570,8 +42324,8 @@ ucs:0x2590F   # 𥤏
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x6728 ; # 木
-                :middle   rep.gt:36329 ; # &GT-36329;
-                :below    rep.big5-cdp:0x8D42   # &CDP-8D42;
+                :middle   a.ucs:0x2EAB ; # ⺫
+                :below    rep.ucs_iso:0x21B20   # &C6-2A69;
             ]
         ]
     ] .
@@ -42708,8 +42462,8 @@ ucs:0x25920   # 𥤠
                 :above    a.ucs:0x79BE ; # 禾
                 :middle   [
                     :structure [ a idc:⿱ ;
-                        :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                        :below    rep.adobe-japan1:15391   # &AJ1-15391;
+                        :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                        :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
                     ]
                 ] ;
                 :below    a.ucs:0x706C   # 灬
@@ -43095,7 +42849,7 @@ ucs:0x25966   # 𥥦
 ucs:0x25967   # 𥥧
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7A74 ; # ç©´
-        :below    rep.adobe-japan1:04061   # &AJ1-04061;
+        :below    rep.adobe-japan1-0:04061   # &AJ1-04061;
     ] .
 ucs:0x25968   # 𥥨
     :structure [ a idc:⿱ ;
@@ -43572,7 +43326,7 @@ ucs:0x259B5   # 𥦵
     ] .
 ucs:0x259B6   # 𥦶
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:18448 ; # &AJ1-18448;
+        :left     rep.adobe-japan1-5:18448 ; # &AJ1-18448;
         :right    a.ucs:0x7A74   # ç©´
     ] .
 ucs:0x259B7   # 𥦷
@@ -43636,13 +43390,7 @@ ucs:0x259C0   # 𥧀
 ucs:0x259C1   # 𥧁
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7A74 ; # ç©´
-        :below    [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :middle   a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5FC3   # 心
-            ]
-        ]
+        :below    a.ucs:0x603B   # 总
     ] .
 ucs:0x259C2   # 𥧂
     :structure [ a idc:⿱ ;
@@ -43902,7 +43650,7 @@ ucs:0x259E8   # 𥧨
 ucs:0x259E9   # 𥧩
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7A74 ; # ç©´
-        :below    rep.adobe-japan1:03314   # &AJ1-03314;
+        :below    rep.adobe-japan1-0:03314   # &AJ1-03314;
     ] .
 ucs:0x259EA   # 𥧪
     :structure [ a idc:â¿° ;
@@ -44340,7 +44088,7 @@ ucs:0x25A20   # 𥨠
         :below    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x571F ; # 土
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x76BF   # 皿
             ]
         ]
@@ -44518,7 +44266,7 @@ ucs:0x25A32   # 𥨲
                 :left     a.ucs:0x723F ; # 爿
                 :right    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.gt:36329 ; # &GT-36329;
+                        :above    a.ucs:0x2EAB ; # ⺫
                         :below    [
                             :structure [ a idc:⿹ ;
                                 :surround a.ucs:0x52F9 ; # 勹
@@ -44561,7 +44309,7 @@ ucs:0x25A35   # 𥨵
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x8EAB ; # 身
-                :right    rep.adobe-japan1:04376   # &AJ1-04376;
+                :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
             ]
         ]
     ] .
@@ -44592,7 +44340,7 @@ ucs:0x25A38   # 𥨸
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x8012 ; # 耒
-                :right    rep.adobe-japan1:04376   # &AJ1-04376;
+                :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
             ]
         ]
     ] .
@@ -45157,9 +44905,8 @@ ucs:0x25A87   # 𥪇
 ucs:0x25A88   # 𥪈
     :structure [ a idc:â¿° ;
         :left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :middle   rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+            :structure [ a idc:⿱ ;
+                :above    rep.big5-cdp:0x8BAE ; # &CDP-8BAE;
                 :below    rep.big5-cdp:0x88DB   # &CDP-88DB;
             ]
         ] ;
@@ -45246,7 +44993,7 @@ ucs:0x25A92   # 𥪒
         :right    [
             :structure [ a idc:⿸ ;
                 :surround a.ucs:0x5C38 ; # å°¸
-                :filling  rep.cns11643-6:0x2239   # &I-C6-2239;
+                :filling  a.ucs:0x20541   # 𠕁
             ]
         ]
     ] .
@@ -45445,13 +45192,18 @@ ucs:0x25AB3   # 𥪳
 ucs:0x25AB4   # 𥪴
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7AE0 ; # ç« 
-        :right    rep.adobe-japan1:17468   # &AJ1-17468;
+        :right    rep.adobe-japan1-5:17468   # &AJ1-17468;
     ] .
 ucs:0x25AB5   # 𥪵
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x81FF ; # 臿
         :right    a.ucs:0x59BE   # 妾
     ] .
+ucs:0x25AB6   # 𥪶
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7ACB ; # 立
+        :right    a.ucs:0x3AFA   # 㫺
+    ] .
 ucs:0x25AB7   # 𥪷
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7CA5 ; # ç²¥
@@ -45708,12 +45460,7 @@ ucs:0x25AD2   # 𥫒
 ucs:0x25AD4   # 𥫔
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7AE0 ; # ç« 
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8D5F ; # &I-CDP-8D5F;
-                :below    a.ucs:0x8C9D   # 貝
-            ]
-        ]
+        :right    rep.gt-k:11071   # &GT-K11071;
     ] .
 ucs:0x25AD5   # 𥫕
     :structure [ a idc:â¿° ;
@@ -46614,7 +46361,7 @@ ucs:0x25B6B   # 𥭫
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x5369 ; # 卩
-                :right    rep.big5-cdp:0x88C2   # &I-CDP-88C2;
+                :right    a.ucs:0x5C14   # 尔
             ]
         ]
     ] .
@@ -46919,7 +46666,7 @@ ucs:0x25B9A   # 𥮚
 ucs:0x25B9B   # 𥮛
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:18448   # &AJ1-18448;
+        :below    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x25B9C   # 𥮜
     :structure [ a idc:⿱ ;
@@ -47035,17 +46782,7 @@ ucs:0x25BA9   # 𥮩
 ucs:0x25BAA   # 𥮪
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x2EBC   # ⺼
-            ]
-        ]
+        :below    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x25BAB   # 𥮫
     :structure [ a idc:⿱ ;
@@ -47267,7 +47004,7 @@ ucs:0x25BC9   # 𥯉
 ucs:0x25BCA   # 𥯊
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:03831   # &AJ1-03831;
+        :below    rep.adobe-japan1-0:03831   # &AJ1-03831;
     ] .
 ucs:0x25BCB   # 𥯋
     :structure [ a idc:⿱ ;
@@ -47308,7 +47045,7 @@ ucs:0x25BD0   # 𥯐
 ucs:0x25BD1   # 𥯑
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:21334   # &AJ1-21334;
+        :below    rep.adobe-japan1-6:21334   # &AJ1-21334;
     ] .
 ucs:0x25BD2   # 𥯒
     :structure [ a idc:⿱ ;
@@ -47581,12 +47318,7 @@ ucs:0x25BFF   # 𥯿
 ucs:0x25C00   # 𥰀
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :middle   [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x200CA ; # 𠃊
-                :filling  a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        :middle   rep.gt-k:00724 ; # &GT-K00724;
         :below    a.ucs:0x76EE   # 目
     ] .
 ucs:0x25C01   # 𥰁
@@ -47874,7 +47606,7 @@ ucs:0x25C2C   # 𥰬
 ucs:0x25C2D   # 𥰭
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:02089   # &AJ1-02089;
+        :below    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x25C2E   # 𥰮
     :structure [ a idc:⿱ ;
@@ -48305,7 +48037,7 @@ ucs:0x25C69   # 𥱩
 ucs:0x25C6A   # 𥱪
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x25C6B   # 𥱫
     :structure [ a idc:⿱ ;
@@ -48635,8 +48367,8 @@ ucs:0x25C9D   # 𥲝
             :structure [ a idc:â¿° ;
                 :left     [
                     :structure [ a idc:⿱ ;
-                        :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                        :below    rep.adobe-japan1:15391   # &AJ1-15391;
+                        :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                        :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
                     ]
                 ] ;
                 :right    a.ucs:0x76AE   # 皮
@@ -48755,7 +48487,7 @@ ucs:0x25CAC   # 𥲬
         :above    a.ucs:0x2EAE ; # ⺮
         :below    [
             :structure [ a idc:⿸ ;
-                :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+                :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
                 :filling  a.ucs:0x2B795   # 𫞕
             ]
         ]
@@ -48811,7 +48543,7 @@ ucs:0x25CB4   # 𥲴
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x6728 ; # 木
-                :right    rep.cns11643-4:0x2472   # &I-C4-2472;
+                :right    a.ucs:0x268FB   # 𦣻
             ]
         ]
     ] .
@@ -48823,7 +48555,7 @@ ucs:0x25CB5   # 𥲵
 ucs:0x25CB6   # 𥲶
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:03652   # &AJ1-03652;
+        :below    rep.adobe-japan1-0:03652   # &AJ1-03652;
     ] .
 ucs:0x25CB7   # 𥲷
     :structure [ a idc:⿱ ;
@@ -48847,7 +48579,7 @@ ucs:0x25CB8   # 𥲸
         :below    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5927 ; # 大
-                :below    rep.adobe-japan1:13852   # &AJ1-13852;
+                :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
             ]
         ]
     ] .
@@ -49285,7 +49017,7 @@ ucs:0x25CFB   # 𥳻
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x6C35 ; # æ°µ
-                :right    rep.adobe-japan1:03231   # &AJ1-03231;
+                :right    rep.adobe-japan1-0:03231   # &AJ1-03231;
             ]
         ]
     ] .
@@ -49372,7 +49104,7 @@ ucs:0x25D09   # 𥴉
 ucs:0x25D0A   # 𥴊
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:01526   # &AJ1-01526;
+        :below    rep.adobe-japan1-0:01526   # &AJ1-01526;
     ] .
 ucs:0x25D0B   # 𥴋
     :structure [ a idc:⿱ ;
@@ -49479,7 +49211,7 @@ ucs:0x25D16   # 𥴖
 ucs:0x25D17   # 𥴗
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:03191   # &AJ1-03191;
+        :below    rep.adobe-japan1-0:03191   # &AJ1-03191;
     ] .
 ucs:0x25D18   # 𥴘
     :structure [ a idc:⿱ ;
@@ -49642,6 +49374,11 @@ ucs:0x25D35   # 𥴵
             ]
         ]
     ] .
+ucs:0x25D36   # 𥴶
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EAE ; # ⺮
+        :below    rep.gt-k:11071   # &GT-K11071;
+    ] .
 ucs:0x25D37   # 𥴷
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
@@ -49652,7 +49389,7 @@ ucs:0x25D38   # 𥴸
         :above    a.ucs:0x2EAE ; # ⺮
         :below    [
             :structure [ a idc:⿳ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :middle   a.ucs:0x5196 ; # 冖
                 :below    a.ucs:0x620D   # 戍
             ]
@@ -50086,7 +49823,7 @@ ucs:0x25D78   # 𥵸
         :middle   a.ucs:0x81EA ; # 自
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.jis-x0213-2:0x7468 ; # &I-JX2-7468;
+                :above    a.ucs:0x34C1 ; # 㓁
                 :below    [
                     :structure [ a idc:⿵ ;
                         :surround rep.big5-cdp:0x8BC0 ; # &CDP-8BC0;
@@ -50309,7 +50046,7 @@ ucs:0x25D95   # 𥶕
 ucs:0x25D96   # 𥶖
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x5261   # 剡
     ] .
 ucs:0x25D97   # 𥶗
@@ -50418,7 +50155,7 @@ ucs:0x25DA4   # 𥶤
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x8012 ; # 耒
-                :right    rep.adobe-japan1:04376   # &AJ1-04376;
+                :right    rep.adobe-japan1-0:04376   # &AJ1-04376;
             ]
         ]
     ] .
@@ -50461,17 +50198,7 @@ ucs:0x25DA9   # 𥶩
 ucs:0x25DAA   # 𥶪
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x624C ; # 扌
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                        :below    a.ucs:0x65E5   # 日
-                    ]
-                ]
-            ]
-        ]
+        :below    a.ucs:0x22D44   # 𢵄
     ] .
 ucs:0x25DAB   # 𥶫
     :structure [ a idc:⿱ ;
@@ -50510,7 +50237,7 @@ ucs:0x25DAE   # 𥶮
     ] .
 ucs:0x25DAF   # 𥶯
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :left     rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :right    a.ucs:0x7B1B   # 笛
     ] .
 ucs:0x25DB0   # 𥶰
@@ -50698,12 +50425,12 @@ ucs:0x25DCA   # 𥷊
 ucs:0x25DCB   # 𥷋
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.ucs-itaiji-002:0x7948   # &CB12143;
+        :below    rep.ucs-itaiji-002:0x7948   # &U-i002+7948;
     ] .
 ucs:0x25DCC   # 𥷌
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :middle   rep.adobe-japan1:01526 ; # &AJ1-01526;
+        :middle   rep.adobe-japan1-0:01526 ; # &AJ1-01526;
         :below    a.ucs:0x5FC3   # 心
     ] .
 ucs:0x25DCD   # 𥷍
@@ -50735,7 +50462,7 @@ ucs:0x25DD0   # 𥷐
 ucs:0x25DD1   # 𥷑
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7BB4 ; # ç®´
-        :below    rep.adobe-japan1:01455   # &AJ1-01455;
+        :below    rep.adobe-japan1-0:01455   # &AJ1-01455;
     ] .
 ucs:0x25DD2   # 𥷒
     :structure [ a idc:⿱ ;
@@ -50763,7 +50490,7 @@ ucs:0x25DD5   # 𥷕
         :below    [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x5176 ; # 其
-                :right    rep.big5-cdp:0x8CAD   # &I-CDP-8CAD;
+                :right    a.ucs:0x67BC   # 枼
             ]
         ]
     ] .
@@ -51079,17 +50806,7 @@ ucs:0x25DF7   # 𥷷
 ucs:0x25DF8   # 𥷸
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x8012 ; # 耒
-                :right    [
-                    :structure [ a idc:⿱ ;
-                        :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                        :below    a.ucs:0x65E5   # 日
-                    ]
-                ]
-            ]
-        ]
+        :below    a.ucs:0x26521   # 𦔡
     ] .
 ucs:0x25DF9   # 𥷹
     :structure [ a idc:⿱ ;
@@ -51147,32 +50864,12 @@ ucs:0x25E00   # 𥸀
 ucs:0x25E01   # 𥸁
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    rep.adobe-japan1:03273   # &AJ1-03273;
+        :below    rep.adobe-japan1-0:03273   # &AJ1-03273;
     ] .
 ucs:0x25E02   # 𥸂
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2EAE ; # ⺮
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5405 ; # 吅
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x5382 ; # 厂
-                        :filling  [
-                            :structure [ a idc:â¿° ;
-                                :left     [
-                                    :structure [ a idc:⿱ ;
-                                        :above    rep.gb2312:0x6566 ; # &G0-6566;
-                                        :below    a.ucs:0x6708   # 月
-                                    ]
-                                ] ;
-                                :right    a.ucs:0x6BB3   # 殳
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]
+        :below    a.ucs:0x210EB   # 𡃫
     ] .
 ucs:0x25E03   # 𥸃
     :structure [ a idc:⿱ ;
@@ -51264,7 +50961,7 @@ ucs:0x25E0D   # 𥸍
 ucs:0x25E0E   # 𥸎
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7AF9 ; # 竹
-        :right    rep.adobe-japan1:03205   # &AJ1-03205;
+        :right    rep.adobe-japan1-0:03205   # &AJ1-03205;
     ] .
 ucs:0x25E0F   # 𥸏
     :structure [ a idc:⿳ ;
@@ -51801,7 +51498,7 @@ ucs:0x25E69   # 𥹩
 ucs:0x25E6A   # 𥹪
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    rep.adobe-japan1:17468   # &AJ1-17468;
+        :right    rep.adobe-japan1-5:17468   # &AJ1-17468;
     ] .
 ucs:0x25E6B   # 𥹫
     :structure [ a idc:â¿° ;
@@ -52273,17 +51970,7 @@ ucs:0x25EB2   # 𥺲
 ucs:0x25EB3   # 𥺳
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    a.ucs:0x2EBC   # ⺼
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x25EB4   # 𥺴
     :structure [ a idc:â¿° ;
@@ -52328,7 +52015,7 @@ ucs:0x25EB8   # 𥺸
 ucs:0x25EB9   # 𥺹
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    rep.adobe-japan1:01148   # &AJ1-01148;
+        :right    rep.adobe-japan1-0:01148   # &AJ1-01148;
     ] .
 ucs:0x25EBA   # 𥺺
     :structure [ a idc:â¿° ;
@@ -52368,7 +52055,7 @@ ucs:0x25EBF   # 𥺿
 ucs:0x25EC0   # 𥻀
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    rep.adobe-japan1:04352   # &AJ1-04352;
+        :right    rep.adobe-japan1-0:04352   # &AJ1-04352;
     ] .
 ucs:0x25EC1   # 𥻁
     :structure [ a idc:â¿° ;
@@ -52528,7 +52215,7 @@ ucs:0x25EDA   # 𥻚
 ucs:0x25EDB   # 𥻛
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    rep.adobe-japan1:21334   # &AJ1-21334;
+        :right    rep.adobe-japan1-6:21334   # &AJ1-21334;
     ] .
 ucs:0x25EDC   # 𥻜
     :structure [ a idc:⿳ ;
@@ -52648,12 +52335,7 @@ ucs:0x25EEF   # 𥻯
         :left     a.ucs:0x7C73 ; # ç±³
         :right    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    rep.gt-k:00724 ; # &GT-K00724;
                 :below    a.ucs:0x8033   # 耳
             ]
         ]
@@ -52726,7 +52408,7 @@ ucs:0x25EFA   # 𥻺
 ucs:0x25EFB   # 𥻻
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    rep.adobe-japan1:03314   # &AJ1-03314;
+        :right    rep.adobe-japan1-0:03314   # &AJ1-03314;
     ] .
 ucs:0x25EFC   # 𥻼
     :structure [ a idc:â¿° ;
@@ -53009,7 +52691,7 @@ ucs:0x25F1F   # 𥼟
                 :above    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x4E3F ; # 丿
-                        :below    rep.gt:36329   # &GT-36329;
+                        :below    a.ucs:0x2EAB   # ⺫
                     ]
                 ] ;
                 :below    a.ucs:0x4E51   # 乑
@@ -53104,12 +52786,7 @@ ucs:0x25F29   # 𥼩
 ucs:0x25F2A   # 𥼪
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
-                :below    a.ucs:0x65E5   # 日
-            ]
-        ]
+        :right    a.ucs:0x3AFA   # 㫺
     ] .
 ucs:0x25F2B   # 𥼫
     :structure [ a idc:⿲ ;
@@ -53378,18 +53055,7 @@ ucs:0x25F55   # 𥽕
 ucs:0x25F56   # 𥽖
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x7C73 ; # ç±³
-        :right    [
-            :structure [ a idc:⿺ ;
-                :surround a.ucs:0x200CA ; # 𠃊
-                :filling  [
-                    :structure [ a idc:⿳ ;
-                        :above    rep.cns11643-4:0x2267 ; # &I-C4-2267;
-                        :middle   a.ucs:0x4E00 ; # 一
-                        :below    rep.cns11643-4:0x2267   # &I-C4-2267;
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x386D   # ã¡­
     ] .
 ucs:0x25F57   # 𥽗
     :structure [ a idc:â¿° ;
@@ -54451,7 +54117,7 @@ ucs:0x25FF9   # 𥿹
 ucs:0x25FFA   # 𥿺
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2EAF ; # ⺯
-        :right    rep.adobe-japan1:03805   # &AJ1-03805;
+        :right    rep.adobe-japan1-0:03805   # &AJ1-03805;
     ] .
 ucs:0x25FFB   # 𥿻
     :structure [ a idc:â¿° ;