Sync up with the current environment.

[chise/isd.git] / ISD-UCS-Ext-B-5.ttl

diff --git a/ISD-UCS-Ext-B-5.ttl b/ISD-UCS-Ext-B-5.ttl
index 84fecdb..87682d8 100644 (file)
--- a/ISD-UCS-Ext-B-5.ttl
+++ b/ISD-UCS-Ext-B-5.ttl
@@ -6,7 +6,11 @@
 @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 rep.cns11643-1: <http://www.chise.org/est/view/character/rep.cns11643-1=> .
 @prefix rep.cns11643-2: <http://www.chise.org/est/view/character/rep.cns11643-2=> .
@@ -16,16 +20,17 @@
 @prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
 @prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
-@prefix a.mj-0: <http://www.chise.org/est/view/character/a.mj-0=> .
+@prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix rep.gt-k: <http://www.chise.org/est/view/character/rep.gt-k=> .
+@prefix a.gt-k: <http://www.chise.org/est/view/character/a.gt-k=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.hanziku-2: <http://www.chise.org/est/view/character/rep.hanziku-2=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
-@prefix a.ucs-itaiji-005: <http://www.chise.org/est/view/character/a.ucs-itaiji-005=> .
+@prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 
 ucs:0x28000   # 𨀀
     :structure [ a idc:⿰ ;
@@ -119,7 +124,7 @@ ucs:0x28010   # 𨀐
     ] .
 ucs:0x28011   # 𨀑
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01422 ; # &AJ1-01422;
+        :above    rep.adobe-japan1-0:01422 ; # &AJ1-01422;
         :below    a.ucs:0x8DB3   # 足
     ] .
 ucs:0x28012   # 𨀒
@@ -942,7 +947,7 @@ ucs:0x2809A   # 𨂚
         :left     a.ucs:0x2ECA ; # ⻊
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :above    a.ucs:0x4E37 ; # 丷
                 :below    a.ucs:0x5171   # 共
             ]
         ]
@@ -978,7 +983,7 @@ ucs:0x2809F   # 𨂟
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x20089 ; # 𠂉
-                :middle   rep.cns11643-4:0x2148 ; # &I-C4-2148;
+                :middle   a.ucs:0x2123C ; # 𡈼
                 :below    a.ucs:0x513F   # 儿
             ]
         ]
@@ -1155,7 +1160,7 @@ ucs:0x280BA   # 𨂺
 ucs:0x280BB   # 𨂻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.ucs-var-001:0x8200   # &GT-K06065;
+        :right    rep.ucs-var-001:0x8200   # &U-v001+8200;
     ] .
 ucs:0x280BC   # 𨂼
     :structure [ a idc:⿰ ;
@@ -1416,7 +1421,7 @@ ucs:0x280E8   # 𨃨
 ucs:0x280E9   # 𨃩
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:02708   # &AJ1-02708;
+        :right    rep.adobe-japan1-0:02708   # &AJ1-02708;
     ] .
 ucs:0x280EA   # 𨃪
     :structure [ a idc:⿰ ;
@@ -1481,7 +1486,7 @@ ucs:0x280F3   # 𨃳
 ucs:0x280F4   # 𨃴
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:02062   # &AJ1-02062;
+        :right    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x280F5   # 𨃵
     :structure [ a idc:⿰ ;
@@ -1511,7 +1516,7 @@ ucs:0x280F9   # 𨃹
 ucs:0x280FA   # 𨃺
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:03314   # &AJ1-03314;
+        :right    rep.adobe-japan1-0:03314   # &AJ1-03314;
     ] .
 ucs:0x280FB   # 𨃻
     :structure [ a idc:⿰ ;
@@ -1535,18 +1540,8 @@ ucs:0x280FE   # 𨃾
     ] .
 ucs:0x280FF   # 𨃿
     :structure [ a idc:⿰ ;
-        :left     a.ucs:0x2ECA ; # ⻊
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x5DF3 ; # 巳
-                        :right    a.ucs:0x5DF3   # 巳
-                    ]
-                ] ;
-                :below    rep.big5-cdp:0x8B6F   # &I-CDP-8B6F;
-            ]
-        ]
+        :left     a.ucs:0x27FB7 ; # 𧾷
+        :right    a.ucs:0x22045   # 𢁅
     ] .
 ucs:0x28100   # 𨄀
     :structure [ a idc:⿰ ;
@@ -1594,7 +1589,7 @@ ucs:0x28107   # 𨄇
         :right    [
             :structure [ a idc:⿱ ;
                 :above    rep.big5-cdp:0x8BFA ; # &CDP-8BFA;
-                :below    rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :below    a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
@@ -1936,7 +1931,7 @@ ucs:0x2813E   # 𨄾
 ucs:0x2813F   # 𨄿
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:02356   # &AJ1-02356;
+        :right    rep.adobe-japan1-0:02356   # &AJ1-02356;
     ] .
 ucs:0x28140   # 𨅀
     :structure [ a idc:⿰ ;
@@ -2211,7 +2206,7 @@ ucs:0x28169   # 𨅩
         :above    a.ucs:0x8DE3 ; # 跣
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :below    a.ucs:0x65E5   # 日
             ]
         ]
@@ -2260,7 +2255,7 @@ ucs:0x2816F   # 𨅯
 ucs:0x28170   # 𨅰
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:01731   # &AJ1-01731;
+        :right    rep.adobe-japan1-0:01731   # &AJ1-01731;
     ] .
 ucs:0x28171   # 𨅱
     :structure [ a idc:⿰ ;
@@ -2304,8 +2299,8 @@ ucs:0x28175   # 𨅵
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:⿰ ;
-                        :left     rep.big5-cdp:0x897C ; # &CDP-897C;
-                        :right    rep.big5-cdp:0x897C   # &CDP-897C;
+                        :left     rep.gb2312:0x6566 ; # &G0-6566;
+                        :right    rep.gb2312:0x6566   # &G0-6566;
                     ]
                 ] ;
                 :below    a.ucs:0x7FBD   # 羽
@@ -2335,7 +2330,7 @@ ucs:0x28179   # 𨅹
 ucs:0x2817A   # 𨅺
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:01526   # &AJ1-01526;
+        :right    rep.adobe-japan1-0:01526   # &AJ1-01526;
     ] .
 ucs:0x2817B   # 𨅻
     :structure [ a idc:⿰ ;
@@ -2520,7 +2515,7 @@ ucs:0x2819A   # 𨆚
                 :above    [
                     :structure [ a idc:⿵ ;
                         :surround a.ucs:0x5927 ; # 大
-                        :filling  rep.big5-cdp:0x8B53   # &I-CDP-8B53;
+                        :filling  rep.ucs_iso:0x20B9B   # &C4-2147;
                     ]
                 ] ;
                 :below    a.ucs:0x7FBD   # 羽
@@ -2748,7 +2743,7 @@ ucs:0x281BD   # 𨆽
         :left     a.ucs:0x2ECA ; # ⻊
         :right    [
             :structure [ a idc:⿸ ;
-                :surround rep.adobe-japan1:03729 ; # &AJ1-03729;
+                :surround rep.adobe-japan1-0:03729 ; # &AJ1-03729;
                 :filling  a.ucs:0x4E48   # 么
             ]
         ]
@@ -2852,7 +2847,7 @@ ucs:0x281CB   # 𨇋
             :structure [ a idc:⿱ ;
                 :above    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.cns11643-5:0x2B67 ; # &I-C5-2B67;
+                        :above    a.ucs:0x200B9 ; # 𠂹
                         :below    a.ucs:0x4E00   # 一
                     ]
                 ] ;
@@ -2888,17 +2883,7 @@ ucs:0x281CE   # 𨇎
 ucs:0x281CF   # 𨇏
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround rep.big5-cdp:0x896C ; # &I-CDP-896C;
-                        :filling  a.ucs:0x5DE5   # 工
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x281D0   # 𨇐
     :structure [ a idc:⿱ ;
@@ -3205,7 +3190,7 @@ ucs:0x281FA   # 𨇺
 ucs:0x281FB   # 𨇻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ECA ; # ⻊
-        :right    rep.adobe-japan1:07430   # &AJ1-07430;
+        :right    rep.adobe-japan1-0:07430   # &AJ1-07430;
     ] .
 ucs:0x281FC   # 𨇼
     :structure [ a idc:⿰ ;
@@ -3426,12 +3411,7 @@ ucs:0x28225   # 𨈥
 ucs:0x28226   # 𨈦
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8EAB ; # 身
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EBA ; # 人
-                :below    a.ucs:0x4EBA   # 人
-            ]
-        ]
+        :right    a.ucs:0x4ECC   # 仌
     ] .
 ucs:0x28227   # 𨈧
     :structure [ a idc:⿰ ;
@@ -3511,12 +3491,7 @@ ucs:0x28233   # 𨈳
 ucs:0x28234   # 𨈴
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8EAB ; # 身
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :below    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :right    a.ucs:0x20BA6   # 𠮦
     ] .
 ucs:0x28235   # 𨈵
     :structure [ a idc:⿰ ;
@@ -3826,7 +3801,7 @@ ucs:0x28265   # 𨉥
 ucs:0x28266   # 𨉦
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8EAB ; # 身
-        :right    rep.adobe-japan1:02062   # &AJ1-02062;
+        :right    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x28267   # 𨉧
     :structure [ a idc:⿰ ;
@@ -4587,12 +4562,7 @@ ucs:0x282E5   # 𨋥
 ucs:0x282E6   # 𨋦
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8ECA ; # 車
-        :right    [
-            :structure [ a idc:⿵ ;
-                :surround rep.big5-cdp:0x8BD6 ; # &CDP-8BD6;
-                :filling  a.ucs:0x53C8   # 又
-            ]
-        ]
+        :right    a.ucs:0x20B26   # 𠬦
     ] .
 ucs:0x282E7   # 𨋧
     :structure [ a idc:⿱ ;
@@ -4807,7 +4777,7 @@ ucs:0x2830A   # 𨌊
 ucs:0x2830B   # 𨌋
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8ECA ; # 車
-        :right    rep.adobe-japan1:21253   # &AJ1-21253;
+        :right    rep.adobe-japan1-6:21253   # &AJ1-21253;
     ] .
 ucs:0x2830C   # 𨌌
     :structure [ a idc:⿰ ;
@@ -4961,7 +4931,7 @@ ucs:0x28323   # 𨌣
     ] .
 ucs:0x28324   # 𨌤
     :structure [ a idc:⿳ ;
-        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
         :middle   a.ucs:0x821B ; # 舛
         :below    a.ucs:0x8ECA   # 車
     ] .
@@ -5161,12 +5131,7 @@ ucs:0x28341   # 𨍁
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x4EBA ; # 人
-                        :below    a.ucs:0x4EBA   # 人
-                    ]
-                ] ;
+                :left     a.ucs:0x4ECC ; # 仌
                 :right    a.ucs:0x6B20   # 欠
             ]
         ] ;
@@ -5362,7 +5327,7 @@ ucs:0x2835A   # 𨍚
 ucs:0x2835B   # 𨍛
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8ECA ; # 車
-        :right    rep.adobe-japan1:03231   # &AJ1-03231;
+        :right    rep.adobe-japan1-0:03231   # &AJ1-03231;
     ] .
 ucs:0x2835C   # 𨍜
     :structure [ a idc:⿰ ;
@@ -5399,7 +5364,7 @@ ucs:0x28361   # 𨍡
         :left     a.ucs:0x8ECA ; # 車
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :below    rep.big5-cdp:0x8CED   # &CDP-8CED;
             ]
         ]
@@ -5647,7 +5612,7 @@ ucs:0x28385   # 𨎅
         :left     a.ucs:0x8ECA ; # 車
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x65E6   # 旦
             ]
         ]
@@ -5809,7 +5774,7 @@ ucs:0x28399   # 𨎙
         :left     a.ucs:0x8ECA ; # 車
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :middle   [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x53E3 ; # 口
@@ -5866,7 +5831,7 @@ ucs:0x283A1   # 𨎡
         :left     a.ucs:0x8ECA ; # 車
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :below    [
                     :structure [ a idc:⿸ ;
                         :surround a.ucs:0x5C38 ; # 尸
@@ -5968,7 +5933,7 @@ ucs:0x283B1   # 𨎱
                 :left     a.ucs:0x8ECA ; # 車
                 :right    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                         :below    a.ucs:0x591A   # 多
                     ]
                 ]
@@ -6024,7 +5989,7 @@ ucs:0x283B9   # 𨎹
 ucs:0x283BA   # 𨎺
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8ECA ; # 車
-        :right    rep.adobe-japan1:05916   # &AJ1-05916;
+        :right    rep.adobe-japan1-0:05916   # &AJ1-05916;
     ] .
 ucs:0x283BB   # 𨎻
     :structure [ a idc:⿰ ;
@@ -6128,7 +6093,7 @@ ucs:0x283C7   # 𨏇
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-5:0x2B67 ; # &I-C5-2B67;
+                :above    a.ucs:0x200B9 ; # 𠂹
                 :below    a.ucs:0x4E00   # 一
             ]
         ] ;
@@ -6295,7 +6260,7 @@ ucs:0x283DB   # 𨏛
         :left     a.ucs:0x8ECA ; # 車
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :middle   [
                     :structure [ a idc:⿰ ;
                         :left     a.ucs:0x53B6 ; # 厶
@@ -6304,8 +6269,8 @@ ucs:0x283DB   # 𨏛
                 ] ;
                 :below    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
-                        :below    rep.big5-cdp:0x8B67   # &CDP-8B67;
+                        :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+                        :below    rep.ucs_iso:0x27607   # &CDP-8B67;
                     ]
                 ]
             ]
@@ -6486,7 +6451,7 @@ ucs:0x283EE   # 𨏮
     ] .
 ucs:0x283EF   # 𨏯
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
         :below    a.ucs:0x8F61   # 轡
     ] .
 ucs:0x283F0   # 𨏰
@@ -6558,13 +6523,8 @@ ucs:0x283F8   # 𨏸
             :structure [ a idc:⿳ ;
                 :above    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
-                        :below    [
-                            :structure [ a idc:⿰ ;
-                                :left     a.ucs:0x53E3 ; # 口
-                                :right    a.ucs:0x53E3   # 口
-                            ]
-                        ]
+                        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
+                        :below    a.ucs:0x5405   # 吅
                     ]
                 ] ;
                 :middle   a.ucs:0x56DE ; # 回
@@ -6739,7 +6699,7 @@ ucs:0x2840A   # 𨐊
     ] .
 ucs:0x2840B   # 𨐋
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
         :below    a.ucs:0x22189   # 𢆉
     ] .
 ucs:0x2840C   # 𨐌
@@ -6796,8 +6756,8 @@ ucs:0x28415   # 𨐕
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x897C ; # &CDP-897C;
-                :below    rep.big5-cdp:0x897C   # &CDP-897C;
+                :above    rep.gb2312:0x6566 ; # &G0-6566;
+                :below    rep.gb2312:0x6566   # &G0-6566;
             ]
         ] ;
         :right    a.ucs:0x8F9B   # 辛
@@ -7000,7 +6960,7 @@ ucs:0x28433   # 𨐳
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8ABD ; # &I-CDP-8ABD;
+                :above    rep.adobe-japan1-6:21253 ; # &AJ1-21253;
                 :below    a.ucs:0x5206   # 分
             ]
         ] ;
@@ -8319,7 +8279,7 @@ ucs:0x284F6   # 𨓶
         :surround a.ucs:0x8FB5 ; # 辵
         :filling  [
             :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x897C ; # &CDP-897C;
+                :above    rep.gb2312:0x6566 ; # &G0-6566;
                 :middle   a.ucs:0x4E00 ; # 一
                 :below    a.ucs:0x706B   # 火
             ]
@@ -8371,8 +8331,8 @@ ucs:0x284FB   # 𨓻
         :surround a.ucs:0x2ECE ; # ⻎
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                :below    rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                :below    a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
@@ -8555,7 +8515,7 @@ ucs:0x2850F   # 𨔏
 ucs:0x28510   # 𨔐
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x2ECE ; # ⻎
-        :filling  rep.adobe-japan1:03652   # &AJ1-03652;
+        :filling  rep.adobe-japan1-0:03652   # &AJ1-03652;
     ] .
 ucs:0x28511   # 𨔑
     :structure [ a idc:⿺ ;
@@ -8819,7 +8779,7 @@ ucs:0x2852F   # 𨔯
         :filling  [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x65E5 ; # 日
-                :below    rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :below    a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
@@ -8884,7 +8844,7 @@ ucs:0x28538   # 𨔸
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
+                :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
                 :below    a.ucs:0x5184   # 冄
             ]
         ]
@@ -9131,12 +9091,7 @@ ucs:0x28553   # 𨕓
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    a.ucs:0x5405 ; # 吅
                 :below    a.ucs:0x4E8E   # 于
             ]
         ]
@@ -9262,12 +9217,7 @@ ucs:0x28563   # 𨕣
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    a.ucs:0x5405 ; # 吅
                 :below    a.ucs:0x5348   # 午
             ]
         ]
@@ -9337,7 +9287,7 @@ ucs:0x28569   # 𨕩
                 :right    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x706B ; # 火
-                        :below    rep.big5-cdp:0x8AB2   # &I-CDP-8AB2;
+                        :below    a.ucs:0x20B1E   # 𠬞
                     ]
                 ]
             ]
@@ -9490,7 +9440,7 @@ ucs:0x2857C   # 𨕼
                 :right    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x706B ; # 火
-                        :below    rep.big5-cdp:0x8AB2   # &I-CDP-8AB2;
+                        :below    a.ucs:0x20B1E   # 𠬞
                     ]
                 ]
             ]
@@ -9781,7 +9731,7 @@ ucs:0x2859E   # 𨖞
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿳ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :middle   a.ucs:0x4E8C ; # 二
                 :below    a.ucs:0x65E5   # 日
             ]
@@ -10033,7 +9983,7 @@ ucs:0x285BC   # 𨖼
                 :above    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x4E3F ; # 丿
-                        :below    rep.gt:36329   # &GT-36329;
+                        :below    a.ucs:0x2EAB   # ⺫
                     ]
                 ] ;
                 :below    a.ucs:0x4E51   # 乑
@@ -10391,7 +10341,7 @@ ucs:0x285EB   # 𨗫
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿳ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :middle   a.ucs:0x53CB ; # 友
                 :below    a.ucs:0x5FC3   # 心
             ]
@@ -10405,7 +10355,7 @@ ucs:0x285ED   # 𨗭
                 :above    [
                     :structure [ a idc:⿻ ;
                         :underlying a.ucs:0x4EBA ; # 人
-                        :overlaying rep.cns11643-4:0x2474   # &I-C4-2474;
+                        :overlaying a.ucs:0x26951   # 𦥑
                     ]
                 ] ;
                 :below    a.ucs:0x571F   # 土
@@ -10471,7 +10421,7 @@ ucs:0x285F2   # 𨗲
 ucs:0x285F3   # 𨗳
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9053 ; # 道
-        :below    rep.adobe-japan1:13852   # &AJ1-13852;
+        :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
     ] .
 ucs:0x285F4   # 𨗴
     :structure [ a idc:⿺ ;
@@ -10848,7 +10798,7 @@ ucs:0x2861B   # 𨘛
         :surround a.ucs:0x2ECC ; # ⻌
         :filling  [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+                :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
                 :middle   a.ucs:0x2099C ; # 𠦜
                 :below    [
                     :structure [ a idc:⿱ ;
@@ -10893,7 +10843,7 @@ ucs:0x2861E   # 𨘞
                 ] ;
                 :below    [
                     :structure [ a idc:⿱ ;
-                        :above    rep.gt:36329 ; # &GT-36329;
+                        :above    a.ucs:0x2EAB ; # ⺫
                         :below    a.ucs:0x5E72   # 干
                     ]
                 ]
@@ -11201,12 +11151,7 @@ ucs:0x2863F   # 𨘿
         :filling  [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4EA0 ; # 亠
-                :middle   [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :middle   a.ucs:0x5405 ; # 吅
                 :below    a.ucs:0x96B9   # 隹
             ]
         ]
@@ -11684,7 +11629,7 @@ ucs:0x2867C   # 𨙼
     ] .
 ucs:0x2867D   # 𨙽
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02067 ; # &AJ1-02067;
+        :left     rep.adobe-japan1-0:02067 ; # &AJ1-02067;
         :right    a.ucs:0x2ECF   # ⻏
     ] .
 ucs:0x2867E   # 𨙾
@@ -11867,12 +11812,7 @@ ucs:0x2869B   # 𨚛
         :left     [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5315 ; # 匕
-                :below    [
-                    :structure [ a idc:⿻ ;
-                        :underlying a.ucs:0x4E02 ; # 丂
-                        :overlaying a.ucs:0x4E00   # 一
-                    ]
-                ]
+                :below    a.ucs:0x4E90   # 亐
             ]
         ] ;
         :right    a.ucs:0x2ECF   # ⻏
@@ -12107,8 +12047,8 @@ ucs:0x286C3   # 𨛃
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x897C ; # &CDP-897C;
-                :below    rep.big5-cdp:0x897C   # &CDP-897C;
+                :above    rep.gb2312:0x6566 ; # &G0-6566;
+                :below    rep.gb2312:0x6566   # &G0-6566;
             ]
         ] ;
         :right    a.ucs:0x2ECF   # ⻏
@@ -12420,12 +12360,7 @@ ucs:0x286F6   # 𨛶
     ] .
 ucs:0x286F7   # 𨛷
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x6B62 ; # 止
-                :below    rep.big5-cdp:0x8B67   # &CDP-8B67;
-            ]
-        ] ;
+        :left     a.ucs:0x2394F ; # 𣥏
         :right    a.ucs:0x9091   # 邑
     ] .
 ucs:0x286F8   # 𨛸
@@ -12733,12 +12668,7 @@ ucs:0x28724   # 𨜤
     ] .
 ucs:0x28725   # 𨜥
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B53 ; # &I-CDP-8B53;
-                :below    a.ucs:0x20541   # 𠕁
-            ]
-        ] ;
+        :left     a.ucs:0x20037 ; # 𠀷
         :right    a.ucs:0x2ECF   # ⻏
     ] .
 ucs:0x28726   # 𨜦
@@ -12946,7 +12876,7 @@ ucs:0x28744   # 𨝄
 ucs:0x28745   # 𨝅
     :structure [ a idc:⿲ ;
         :left     a.ucs:0x4E61 ; # 乡
-        :middle   rep.adobe-japan1:05786 ; # &AJ1-05786;
+        :middle   rep.adobe-japan1-0:05786 ; # &AJ1-05786;
         :right    a.ucs:0x9091   # 邑
     ] .
 ucs:0x28746   # 𨝆
@@ -13222,7 +13152,7 @@ ucs:0x2876A   # 𨝪
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x26222   # 𦈢
             ]
         ] ;
@@ -13280,12 +13210,7 @@ ucs:0x28774   # 𨝴
     ] .
 ucs:0x28775   # 𨝵
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x6797 ; # 林
-                :below    a.ucs:0x6708   # 月
-            ]
-        ] ;
+        :left     a.ucs-itaiji-001:0x6614 ; # &A-U-i001+6614;
         :right    a.ucs:0x2ECF   # ⻏
     ] .
 ucs:0x28776   # 𨝶
@@ -13295,12 +13220,7 @@ ucs:0x28776   # 𨝶
                 :above    [
                     :structure [ a idc:⿳ ;
                         :above    a.ucs:0x4E00 ; # 一
-                        :middle   [
-                            :structure [ a idc:⿰ ;
-                                :left     a.ucs:0x53E3 ; # 口
-                                :right    a.ucs:0x53E3   # 口
-                            ]
-                        ] ;
+                        :middle   a.ucs:0x5405 ; # 吅
                         :below    a.ucs:0x4E00   # 一
                     ]
                 ] ;
@@ -13486,12 +13406,7 @@ ucs:0x2878D   # 𨞍
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿳ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    a.ucs:0x5405 ; # 吅
                 :middle   [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x5C6E ; # 屮
@@ -13823,7 +13738,7 @@ ucs:0x287B7   # 𨞷
 ucs:0x287B8   # 𨞸
     :structure [ a idc:⿲ ;
         :left     a.ucs:0x9091 ; # 邑
-        :middle   rep.adobe-japan1:05786 ; # &AJ1-05786;
+        :middle   rep.adobe-japan1-0:05786 ; # &AJ1-05786;
         :right    a.ucs:0x9091   # 邑
     ] .
 ucs:0x287B9   # 𨞹
@@ -13948,13 +13863,8 @@ ucs:0x287CC   # 𨟌
         :left     a.ucs:0x5F61 ; # 彡
         :middle   [
             :structure [ a idc:⿳ ;
-                :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                :middle   [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                :middle   a.ucs:0x5405 ; # 吅
                 :below    a.ucs:0x5BF8   # 寸
             ]
         ] ;
@@ -14281,7 +14191,7 @@ ucs:0x287F8   # 𨟸
 ucs:0x287F9   # 𨟹
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9149 ; # 酉
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x287FA   # 𨟺
     :structure [ a idc:⿰ ;
@@ -14630,7 +14540,7 @@ ucs:0x28839   # 𨠹
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5927 ; # 大
-                :below    rep.big5-cdp:0x8956   # &I-CDP-8956;
+                :below    a.ucs:0x6729   # 朩
             ]
         ]
     ] .
@@ -14727,17 +14637,7 @@ ucs:0x28848   # 𨡈
 ucs:0x28849   # 𨡉
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9149 ; # 酉
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5F50 ; # 彐
-                :below    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5196 ; # 冖
-                        :below    a.ucs:0x53C8   # 又
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x20B36   # 𠬶
     ] .
 ucs:0x2884A   # 𨡊
     :structure [ a idc:⿰ ;
@@ -14787,7 +14687,7 @@ ucs:0x28851   # 𨡑
 ucs:0x28852   # 𨡒
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9149 ; # 酉
-        :right    a.mj-0:0xDEFA   # &A-MJ057082;
+        :right    a.mj:057082   # &A-MJ057082;
     ] .
 ucs:0x28853   # 𨡓
     :structure [ a idc:⿱ ;
@@ -14888,17 +14788,7 @@ ucs:0x2885F   # 𨡟
 ucs:0x28860   # 𨡠
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9149 ; # 酉
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    rep.gt:37857   # &GT-37857;
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x28861   # 𨡡
     :structure [ a idc:⿱ ;
@@ -14914,7 +14804,7 @@ ucs:0x28862   # 𨡢
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:⿰ ;
-                :left     rep.adobe-japan1:02067 ; # &AJ1-02067;
+                :left     rep.adobe-japan1-0:02067 ; # &AJ1-02067;
                 :right    a.ucs:0x6B20   # 欠
             ]
         ] ;
@@ -15234,7 +15124,7 @@ ucs:0x2888F   # 𨢏
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:⿰ ;
-                :left     rep.gt:37857 ; # &GT-37857;
+                :left     a.ucs:0x2EBC ; # ⺼
                 :right    a.ucs:0x5211   # 刑
             ]
         ] ;
@@ -15540,13 +15430,7 @@ ucs:0x288BB   # 𨢻
 ucs:0x288BC   # 𨢼
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9149 ; # 酉
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x56DF ; # 囟
-                :middle   a.ucs:0x516B ; # 八
-                :below    a.ucs:0x590A   # 夊
-            ]
-        ]
+        :right    a.ucs:0x21569   # 𡕩
     ] .
 ucs:0x288BD   # 𨢽
     :structure [ a idc:⿰ ;
@@ -15788,7 +15672,7 @@ ucs:0x288E0   # 𨣠
         :left     a.ucs:0x9149 ; # 酉
         :right    [
             :structure [ a idc:⿳ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :middle   a.ucs:0x215DC ; # 𡗜
                 :below    a.ucs:0x5E72   # 干
             ]
@@ -15809,7 +15693,7 @@ ucs:0x288E3   # 𨣣
         :left     a.ucs:0x9149 ; # 酉
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x2535 ; # &I-C4-2535;
+                :above    a.ucs:0x2020C ; # 𠈌
                 :below    a.ucs:0x5DE6   # 左
             ]
         ]
@@ -16079,7 +15963,7 @@ ucs:0x2890A   # 𨤊
         :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 ; # 鬯
@@ -16510,13 +16394,13 @@ ucs:0x28952   # 𨥒
     ] .
 ucs:0x28953   # 𨥓
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02686 ; # &AJ1-02686;
+        :above    rep.adobe-japan1-0:02686 ; # &AJ1-02686;
         :below    a.ucs:0x91D1   # 金
     ] .
 ucs:0x28954   # 𨥔
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:02686   # &AJ1-02686;
+        :right    rep.adobe-japan1-0:02686   # &AJ1-02686;
     ] .
 ucs:0x28955   # 𨥕
     :structure [ a idc:⿰ ;
@@ -16820,7 +16704,7 @@ ucs:0x28984   # 𨦄
         :right    [
             :structure [ a idc:⿸ ;
                 :surround a.ucs:0x5382 ; # 厂
-                :filling  rep.adobe-japan1:02067   # &AJ1-02067;
+                :filling  rep.adobe-japan1-0:02067   # &AJ1-02067;
             ]
         ]
     ] .
@@ -17252,7 +17136,7 @@ ucs:0x289C2   # 𨧂
             :structure [ a idc:⿰ ;
                 :left     [
                     :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                        :above    a.ucs:0x4E37 ; # 丷
                         :below    a.ucs:0x5EFE   # 廾
                     ]
                 ] ;
@@ -17484,7 +17368,7 @@ ucs:0x289E2   # 𨧢
 ucs:0x289E3   # 𨧣
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:17466   # &AJ1-17466;
+        :right    rep.adobe-japan1-5:17466   # &AJ1-17466;
     ] .
 ucs:0x289E4   # 𨧤
     :structure [ a idc:⿰ ;
@@ -18146,7 +18030,7 @@ ucs:0x28A42   # 𨩂
 ucs:0x28A43   # 𨩃
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:02399   # &AJ1-02399;
+        :right    rep.adobe-japan1-0:02399   # &AJ1-02399;
     ] .
 ucs:0x28A44   # 𨩄
     :structure [ a idc:⿰ ;
@@ -18310,7 +18194,7 @@ ucs:0x28A5D   # 𨩝
         :right    [
             :structure [ a idc:⿸ ;
                 :surround a.ucs:0x864D ; # 虍
-                :filling  rep.adobe-japan1:15391   # &AJ1-15391;
+                :filling  rep.adobe-japan1-4:15391   # &AJ1-15391;
             ]
         ]
     ] .
@@ -18442,7 +18326,7 @@ ucs:0x28A6F   # 𨩯
 ucs:0x28A70   # 𨩰
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.big5-cdp:0x8DAF   # &CDP-8DAF;
+        :right    rep.cns11643-3:0x2B78   # &HD-IA-2D6B;
     ] .
 ucs:0x28A71   # 𨩱
     :structure [ a idc:⿰ ;
@@ -18555,13 +18439,7 @@ ucs:0x28A7B   # 𨩻
 ucs:0x28A7C   # 𨩼
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x2E8A ; # ⺊
-                :middle   rep.big5-cdp:0x897C ; # &CDP-897C;
-                :below    a.ucs:0x9FB0   # 龰
-            ]
-        ]
+        :right    a.ucs:0x758C   # 疌
     ] .
 ucs:0x28A7D   # 𨩽
     :structure [ a idc:⿰ ;
@@ -18648,7 +18526,7 @@ ucs:0x28A8A   # 𨪊
         :left     a.ucs:0x91D1 ; # 金
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-5:0x2141 ; # &C5-2141;
+                :above    a.ucs:0x355A ; # 㕚
                 :below    a.ucs:0x866B   # 虫
             ]
         ]
@@ -18691,12 +18569,7 @@ ucs:0x28A91   # 𨪑
 ucs:0x28A92   # 𨪒
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    [
-            :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8C4C ; # &I-CDP-8C4C;
-                :right    rep.big5-cdp:0x8C4C   # &I-CDP-8C4C;
-            ]
-        ]
+        :right    a.ucs:0x20CEF   # 𠳯
     ] .
 ucs:0x28A93   # 𨪓
     :structure [ a idc:⿰ ;
@@ -18741,7 +18614,7 @@ ucs:0x28A98   # 𨪘
 ucs:0x28A99   # 𨪙
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:02453   # &AJ1-02453;
+        :right    rep.adobe-japan1-0:02453   # &AJ1-02453;
     ] .
 ucs:0x28A9A   # 𨪚
     :structure [ a idc:⿰ ;
@@ -19220,18 +19093,8 @@ ucs:0x28AD8   # 𨫘
         :left     a.ucs:0x91D1 ; # 金
         :right    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    [
-                    :structure [ a idc:⿶ ;
-                        :surround a.ucs:0x51F5 ; # 凵
-                        :filling  a.ucs:0x5E72   # 干
-                    ]
-                ]
+                :above    a.ucs:0x5405 ; # 吅
+                :below    a.ucs:0x2067B   # 𠙻
             ]
         ]
     ] .
@@ -19824,17 +19687,7 @@ ucs:0x28B2C   # 𨬬
 ucs:0x28B2D   # 𨬭
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E1A ; # 业
-                :below    [
-                    :structure [ a idc:⿶ ;
-                        :surround a.ucs:0x51F5 ; # 凵
-                        :filling  rep.cns11643-4:0x2178   # &I-C4-2178;
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x51FF   # 凿
     ] .
 ucs:0x28B2E   # 𨬮
     :structure [ a idc:⿱ ;
@@ -20299,7 +20152,7 @@ ucs:0x28B68   # 𨭨
 ucs:0x28B69   # 𨭩
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:02557   # &AJ1-02557;
+        :right    rep.adobe-japan1-0:02557   # &AJ1-02557;
     ] .
 ucs:0x28B6A   # 𨭪
     :structure [ a idc:⿰ ;
@@ -20345,7 +20198,7 @@ ucs:0x28B6F   # 𨭯
 ucs:0x28B70   # 𨭰
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:02655   # &AJ1-02655;
+        :right    rep.adobe-japan1-0:02655   # &AJ1-02655;
     ] .
 ucs:0x28B71   # 𨭱
     :structure [ a idc:⿰ ;
@@ -20477,7 +20330,7 @@ ucs:0x28B7E   # 𨭾
                 :below    [
                     :structure [ a idc:⿵ ;
                         :surround a.ucs:0x2E87 ; # ⺇
-                        :filling  rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                        :filling  a.ucs:0x2EA2   # ⺢
                     ]
                 ]
             ]
@@ -20666,7 +20519,7 @@ ucs:0x28B9E   # 𨮞
 ucs:0x28B9F   # 𨮟
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:01533   # &AJ1-01533;
+        :right    rep.adobe-japan1-0:01533   # &AJ1-01533;
     ] .
 ucs:0x28BA0   # 𨮠
     :structure [ a idc:⿺ ;
@@ -21250,7 +21103,7 @@ ucs:0x28BF4   # 𨯴
         :left     a.ucs:0x91D1 ; # 金
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:⿰ ;
                         :left     a.ucs:0x8C46 ; # 豆
@@ -21571,7 +21424,7 @@ ucs:0x28C1D   # 𨰝
 ucs:0x28C1E   # 𨰞
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:07430   # &AJ1-07430;
+        :right    rep.adobe-japan1-0:07430   # &AJ1-07430;
     ] .
 ucs:0x28C1F   # 𨰟
     :structure [ a idc:⿰ ;
@@ -21646,7 +21499,7 @@ ucs:0x28C2A   # 𨰪
 ucs:0x28C2B   # 𨰫
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.adobe-japan1:04449   # &AJ1-04449;
+        :right    rep.adobe-japan1-0:04449   # &AJ1-04449;
     ] .
 ucs:0x28C2C   # 𨰬
     :structure [ a idc:⿰ ;
@@ -21813,7 +21666,7 @@ ucs:0x28C41   # 𨱁
 ucs:0x28C42   # 𨱂
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9485 ; # 钅
-        :right    rep.adobe-japan1:01341   # &AJ1-01341;
+        :right    rep.adobe-japan1-0:01341   # &AJ1-01341;
     ] .
 ucs:0x28C43   # 𨱃
     :structure [ a idc:⿰ ;
@@ -21931,7 +21784,7 @@ ucs:0x28C58   # 𨱘
         :above    [
             :structure [ a idc:⿸ ;
                 :surround rep.big5-cdp:0x86E8 ; # &CDP-86E8;
-                :filling  rep.big5-cdp:0x8B55   # &I-CDP-8B55;
+                :filling  a.ucs:0x4E37   # 丷
             ]
         ] ;
         :middle   a.ucs:0x4E00 ; # 一
@@ -22389,12 +22242,7 @@ ucs:0x28CA2   # 𨲢
         :left     a.ucs:0x9578 ; # 镸
         :right    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿶ ;
-                        :surround a.ucs:0x51F5 ; # 凵
-                        :filling  a.ucs:0x5E72   # 干
-                    ]
-                ] ;
+                :above    a.ucs:0x2067B ; # 𠙻
                 :below    a.ucs:0x4E3B   # 主
             ]
         ]
@@ -22404,12 +22252,7 @@ ucs:0x28CA3   # 𨲣
         :above    [
             :structure [ a idc:⿰ ;
                 :left     a.ucs:0x9578 ; # 镸
-                :right    [
-                    :structure [ a idc:⿶ ;
-                        :surround a.ucs:0x51F5 ; # 凵
-                        :filling  a.ucs:0x5E72   # 干
-                    ]
-                ]
+                :right    a.ucs:0x2067B   # 𠙻
             ]
         ] ;
         :below    a.ucs:0x4E3B   # 主
@@ -22574,17 +22417,7 @@ ucs:0x28CBA   # 𨲺
 ucs:0x28CBB   # 𨲻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9578 ; # 镸
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x5382 ; # 厂
-                        :filling  a.ucs:0x5DE5   # 工
-                    ]
-                ]
-            ]
-        ]
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x28CBC   # 𨲼
     :structure [ a idc:⿰ ;
@@ -22629,12 +22462,7 @@ ucs:0x28CC1   # 𨳁
 ucs:0x28CC2   # 𨳂
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9578 ; # 镸
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8CD1 ; # &CDP-8CD1;
-                :below    a.ucs:0x514D   # 免
-            ]
-        ]
+        :right    a.ucs:0x6BDA   # 毚
     ] .
 ucs:0x28CC3   # 𨳃
     :structure [ a idc:⿰ ;
@@ -23033,7 +22861,7 @@ ucs:0x28D0C   # 𨴌
         :filling  [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x53B6 ; # 厶
-                :below    rep.big5-cdp:0x897C   # &CDP-897C;
+                :below    rep.gb2312:0x6566   # &G0-6566;
             ]
         ]
     ] .
@@ -23890,7 +23718,7 @@ ucs:0x28D96   # 𨶖
         :surround a.ucs:0x9580 ; # 門
         :filling  [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x20BD1   # 𠯑
             ]
         ]
@@ -23903,17 +23731,7 @@ ucs:0x28D97   # 𨶗
 ucs:0x28D98   # 𨶘
     :structure [ a idc:⿵ ;
         :surround a.ucs:0x9580 ; # 門
-        :filling  [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x5DF3 ; # 巳
-                        :right    a.ucs:0x5DF3   # 巳
-                    ]
-                ] ;
-                :below    a.ucs:0x5F00   # 开
-            ]
-        ]
+        :filling  a.ucs:0x22045   # 𢁅
     ] .
 ucs:0x28D99   # 𨶙
     :structure [ a idc:⿵ ;
@@ -23952,7 +23770,7 @@ ucs:0x28D9E   # 𨶞
             :structure [ a idc:⿰ ;
                 :left     [
                     :structure [ a idc:⿱ ;
-                        :above    rep.big5-cdp:0x897C ; # &CDP-897C;
+                        :above    rep.gb2312:0x6566 ; # &G0-6566;
                         :below    a.ucs:0x6708   # 月
                     ]
                 ] ;
@@ -23969,7 +23787,7 @@ ucs:0x28D9F   # 𨶟
                 :below    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x201A2 ; # 𠆢
-                        :below    rep.big5-cdp:0x897C   # &CDP-897C;
+                        :below    rep.gb2312:0x6566   # &G0-6566;
                     ]
                 ]
             ]
@@ -24296,7 +24114,7 @@ ucs:0x28DCC   # 𨷌
         :surround a.ucs:0x9580 ; # 門
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:01455 ; # &AJ1-01455;
+                :above    rep.adobe-japan1-0:01455 ; # &AJ1-01455;
                 :below    a.ucs:0x866B   # 虫
             ]
         ]
@@ -25114,7 +24932,7 @@ ucs:0x28E50   # 𨹐
         :right    [
             :structure [ a idc:⿹ ;
                 :surround a.ucs:0x52F9 ; # 勹
-                :filling  rep.cns11643-6:0x232B   # &I-C6-232B;
+                :filling  a.ucs:0x20B9B   # 𠮛
             ]
         ]
     ] .
@@ -25245,7 +25063,7 @@ ucs:0x28E62   # 𨹢
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4E00 ; # 一
-                :middle   rep.adobe-japan1:13834 ; # &AJ1-13834;
+                :middle   rep.adobe-japan1-4:13834 ; # &AJ1-13834;
                 :below    a.ucs:0x5DE5   # 工
             ]
         ]
@@ -25524,7 +25342,7 @@ ucs:0x28E8A   # 𨺊
 ucs:0x28E8B   # 𨺋
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ED6 ; # ⻖
-        :right    rep.adobe-japan1:01148   # &AJ1-01148;
+        :right    rep.adobe-japan1-0:01148   # &AJ1-01148;
     ] .
 ucs:0x28E8C   # 𨺌
     :structure [ a idc:⿰ ;
@@ -25652,12 +25470,7 @@ ucs:0x28E9A   # 𨺚
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5902 ; # 夂
-                :below    [
-                    :structure [ a idc:⿶ ;
-                        :surround a.ucs:0x51F5 ; # 凵
-                        :filling  a.ucs:0x5E72   # 干
-                    ]
-                ]
+                :below    a.ucs:0x2067B   # 𠙻
             ]
         ]
     ] .
@@ -25860,7 +25673,7 @@ ucs:0x28EBA   # 𨺺
 ucs:0x28EBB   # 𨺻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ED6 ; # ⻖
-        :right    a.ucs-itaiji-005:0x8200   # &A-GT-K06065;
+        :right    a.gt-k:06065   # &A-GT-K06065;
     ] .
 ucs:0x28EBC   # 𨺼
     :structure [ a idc:⿰ ;
@@ -26417,7 +26230,7 @@ ucs:0x28F06   # 𨼆
         :right    [
             :structure [ a idc:⿳ ;
                 :above    rep.big5-cdp:0x87FD ; # &CDP-87FD;
-                :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
+                :middle   rep.adobe-japan1-4:15391 ; # &AJ1-15391;
                 :below    a.ucs:0x5FC3   # 心
             ]
         ]
@@ -26761,7 +26574,7 @@ ucs:0x28F32   # 𨼲
 ucs:0x28F33   # 𨼳
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2ED6 ; # ⻖
-        :right    rep.adobe-japan1:02655   # &AJ1-02655;
+        :right    rep.adobe-japan1-0:02655   # &AJ1-02655;
     ] .
 ucs:0x28F34   # 𨼴
     :structure [ a idc:⿰ ;
@@ -27725,12 +27538,7 @@ ucs:0x28FB3   # 𨾳
     ] .
 ucs:0x28FB4   # 𨾴
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        :above    a.ucs:0x5405 ; # 吅
         :below    a.ucs:0x96B9   # 隹
     ] .
 ucs:0x28FB5   # 𨾵
@@ -27842,8 +27650,8 @@ ucs:0x28FC9   # 𨿉
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x897C ; # &CDP-897C;
-                :below    rep.big5-cdp:0x897C   # &CDP-897C;
+                :above    rep.gb2312:0x6566 ; # &G0-6566;
+                :below    rep.gb2312:0x6566   # &G0-6566;
             ]
         ] ;
         :right    a.ucs:0x96B9   # 隹
@@ -28317,7 +28125,7 @@ ucs:0x2901B   # 𩀛
     ] .
 ucs:0x2901C   # 𩀜
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x96B9   # 隹
     ] .
 ucs:0x2901D   # 𩀝
@@ -28534,12 +28342,7 @@ ucs:0x29041   # 𩁁
 ucs:0x29042   # 𩁂
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x5171 ; # 共
-        :middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        :middle   a.ucs:0x5405 ; # 吅
         :below    a.ucs:0x96B9   # 隹
     ] .
 ucs:0x29043   # 𩁃
@@ -28989,7 +28792,7 @@ ucs:0x29086   # 𩂆
 ucs:0x29087   # 𩂇
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2ED7 ; # ⻗
-        :below    rep.adobe-japan1:02067   # &AJ1-02067;
+        :below    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x29088   # 𩂈
     :structure [ a idc:⿱ ;
@@ -29169,12 +28972,7 @@ ucs:0x290A8   # 𩂨
 ucs:0x290A9   # 𩂩
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2ED7 ; # ⻗
-        :below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ]
+        :below    a.ucs:0x5405   # 吅
     ] .
 ucs:0x290AA   # 𩂪
     :structure [ a idc:⿱ ;
@@ -29401,7 +29199,7 @@ ucs:0x290CD   # 𩃍
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x516C   # 公
             ]
         ]
@@ -29614,7 +29412,7 @@ ucs:0x290F0   # 𩃰
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x340C   # 㐌
             ]
         ]
@@ -29652,7 +29450,7 @@ ucs:0x290F5   # 𩃵
 ucs:0x290F6   # 𩃶
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x96F2 ; # 雲
-        :right    rep.adobe-japan1:18056   # &AJ1-18056;
+        :right    rep.adobe-japan1-5:18056   # &AJ1-18056;
     ] .
 ucs:0x290F7   # 𩃷
     :structure [ a idc:⿰ ;
@@ -29769,7 +29567,7 @@ ucs:0x29107   # 𩄇
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x738B   # 王
             ]
         ]
@@ -29922,7 +29720,7 @@ ucs:0x2911C   # 𩄜
 ucs:0x2911D   # 𩄝
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x96E8 ; # 雨
-        :below    rep.adobe-japan1:02089   # &AJ1-02089;
+        :below    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x2911E   # 𩄞
     :structure [ a idc:⿱ ;
@@ -29998,7 +29796,7 @@ ucs:0x29127   # 𩄧
 ucs:0x29128   # 𩄨
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2ED7 ; # ⻗
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x2912A   # 𩄪
     :structure [ a idc:⿳ ;
@@ -30131,7 +29929,7 @@ ucs:0x2913C   # 𩄼
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x975E   # 非
             ]
         ]
@@ -30226,7 +30024,7 @@ ucs:0x2914A   # 𩅊
         :above    a.ucs:0x96E8 ; # 雨
         :below    [
             :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
+                :above    a.ucs:0x4E37 ; # 丷
                 :middle   a.ucs:0x7530 ; # 田
                 :below    a.ucs:0x706B   # 火
             ]
@@ -30272,23 +30070,13 @@ ucs:0x2914F   # 𩅏
 ucs:0x29150   # 𩅐
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x2ED7 ; # ⻗
-        :middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        :middle   a.ucs:0x5405 ; # 吅
         :below    rep.big5-cdp:0x8BE8   # &CDP-8BE8;
     ] .
 ucs:0x29151   # 𩅑
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x2ED7 ; # ⻗
-        :middle   [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x53E3 ; # 口
-                :right    a.ucs:0x53E3   # 口
-            ]
-        ] ;
+        :middle   a.ucs:0x5405 ; # 吅
         :below    a.ucs:0x7530   # 田
     ] .
 ucs:0x29152   # 𩅒
@@ -30321,7 +30109,7 @@ ucs:0x29155   # 𩅕
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x5E1A   # 帚
             ]
         ]
@@ -30444,23 +30232,8 @@ ucs:0x29166   # 𩅦
     ] .
 ucs:0x29167   # 𩅧
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2ED7 ; # ⻗
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
-                :below    [
-                    :structure [ a idc:⿰ ;
-                        :left     [
-                            :structure [ a idc:⿱ ;
-                                :above    a.ucs:0x4E3F ; # 丿
-                                :below    a.ucs:0x4E3F   # 丿
-                            ]
-                        ] ;
-                        :right    rep.big5-cdp:0x8C66   # &CDP-8C66;
-                    ]
-                ]
-            ]
-        ]
+        :above    a.ucs:0x96E8 ; # 雨
+        :below    a.ucs:0x8846   # 衆
     ] .
 ucs:0x29168   # 𩅨
     :structure [ a idc:⿱ ;
@@ -30571,7 +30344,7 @@ ucs:0x29176   # 𩅶
 ucs:0x29177   # 𩅷
     :structure [ a idc:⿰ ;
         :left     rep.gt:56696 ; # &GT-56696;
-        :right    rep.adobe-japan1:02585   # &AJ1-02585;
+        :right    rep.adobe-japan1-0:02585   # &AJ1-02585;
     ] .
 ucs:0x29178   # 𩅸
     :structure [ a idc:⿳ ;
@@ -30619,7 +30392,7 @@ ucs:0x29180   # 𩆀
         :above    a.ucs:0x2ED7 ; # ⻗
         :below    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8AF6 ; # &I-CDP-8AF6;
+                :left     a.ucs:0x6C35 ; # 氵
                 :right    a.ucs:0x96BB   # 隻
             ]
         ]
@@ -31190,12 +30963,7 @@ ucs:0x291CE   # 𩇎
         :middle   a.ucs:0x5927 ; # 大
         :below    [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    a.ucs:0x5405 ; # 吅
                 :below    a.ucs:0x571F   # 土
             ]
         ]
@@ -31884,7 +31652,7 @@ ucs:0x29243   # 𩉃
         :left     [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x5BF8   # 寸
             ]
         ] ;
@@ -31927,7 +31695,7 @@ ucs:0x29249   # 𩉉
         :below    [
             :structure [ a idc:⿰ ;
                 :left     a.ucs:0x9762 ; # 面
-                :right    rep.adobe-japan1:18448   # &AJ1-18448;
+                :right    rep.adobe-japan1-5:18448   # &AJ1-18448;
             ]
         ]
     ] .
@@ -32039,7 +31807,7 @@ ucs:0x29259   # 𩉙
 ucs:0x2925A   # 𩉚
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9762 ; # 面
-        :right    rep.adobe-japan1:07430   # &AJ1-07430;
+        :right    rep.adobe-japan1-0:07430   # &AJ1-07430;
     ] .
 ucs:0x2925B   # 𩉛
     :structure [ a idc:⿰ ;
@@ -32572,7 +32340,7 @@ ucs:0x292B8   # 𩊸
         :left     a.ucs:0x9769 ; # 革
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x51E0   # 几
             ]
         ]
@@ -33237,7 +33005,7 @@ ucs:0x29321   # 𩌡
 ucs:0x29322   # 𩌢
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9769 ; # 革
-        :right    rep.adobe-japan1:02089   # &AJ1-02089;
+        :right    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x29323   # 𩌣
     :structure [ a idc:⿰ ;
@@ -33991,7 +33759,7 @@ ucs:0x2938B   # 𩎋
                 :above    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x2EA4 ; # ⺤
-                        :below    rep.gt:36329   # &GT-36329;
+                        :below    a.ucs:0x2EAB   # ⺫
                     ]
                 ] ;
                 :middle   a.ucs:0x97ED ; # 韭
@@ -34367,7 +34135,7 @@ ucs:0x293C9   # 𩏉
 ucs:0x293CA   # 𩏊
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x97CB ; # 韋
-        :right    rep.adobe-japan1:04109   # &AJ1-04109;
+        :right    rep.adobe-japan1-0:04109   # &AJ1-04109;
     ] .
 ucs:0x293CB   # 𩏋
     :structure [ a idc:⿰ ;
@@ -34388,7 +34156,7 @@ ucs:0x293CD   # 𩏍
                 :below    a.ucs:0x3404   # 㐄
             ]
         ] ;
-        :right    a.ucs-itaiji-005:0x8200   # &A-GT-K06065;
+        :right    a.gt-k:06065   # &A-GT-K06065;
     ] .
 ucs:0x293CE   # 𩏎
     :structure [ a idc:⿰ ;
@@ -34475,8 +34243,8 @@ ucs:0x293DB   # 𩏛
         :left     a.ucs:0x97CB ; # 韋
         :right    [
             :structure [ a idc:⿳ ;
-                :above    a.ucs:0x20089 ; # 𠂉
-                :middle   rep.cns11643-6:0x232B ; # &I-C6-232B;
+                :above    rep.big5-cdp:0x8C74 ; # &CDP-8C74;
+                :middle   a.ucs:0x53E3 ; # 口
                 :below    a.ucs:0x76BF   # 皿
             ]
         ]
@@ -35189,12 +34957,7 @@ ucs:0x29444   # 𩑄
 ucs:0x29445   # 𩑅
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x97F3 ; # 音
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5902 ; # 夂
-                :below    a.ucs:0x8CA2   # 貢
-            ]
-        ]
+        :right    rep.gt-k:10656   # &GT-K10656;
     ] .
 ucs:0x29446   # 𩑆
     :structure [ a idc:⿰ ;
@@ -35289,12 +35052,7 @@ ucs:0x29454   # 𩑔
     ] .
 ucs:0x29455   # 𩑕
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x4E02 ; # 丂
-                :overlaying a.ucs:0x4E00   # 一
-            ]
-        ] ;
+        :left     a.ucs_component:0x4E8F ; # &A-compU+4E8F;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x29456   # 𩑖
@@ -35349,7 +35107,7 @@ ucs:0x2945E   # 𩑞
     ] .
 ucs:0x2945F   # 𩑟
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02067 ; # &AJ1-02067;
+        :left     rep.adobe-japan1-0:02067 ; # &AJ1-02067;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x29460   # 𩑠
@@ -35430,7 +35188,7 @@ ucs:0x2946C   # 𩑬
     ] .
 ucs:0x2946D   # 𩑭
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:01341 ; # &AJ1-01341;
+        :left     rep.adobe-japan1-0:01341 ; # &AJ1-01341;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x2946E   # 𩑮
@@ -35891,17 +35649,7 @@ ucs:0x294B7   # 𩒷
     ] .
 ucs:0x294B8   # 𩒸
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:15391 ; # &AJ1-15391;
-                :below    [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x5196 ; # 冖
-                        :below    a.ucs:0x53C8   # 又
-                    ]
-                ]
-            ]
-        ] ;
+        :left     a.ucs:0x20B36 ; # 𠬶
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x294B9   # 𩒹
@@ -35916,7 +35664,7 @@ ucs:0x294BA   # 𩒺
     ] .
 ucs:0x294BB   # 𩒻
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:01755 ; # &AJ1-01755;
+        :left     rep.adobe-japan1-0:01755 ; # &AJ1-01755;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x294BC   # 𩒼
@@ -35991,7 +35739,7 @@ ucs:0x294C6   # 𩓆
     ] .
 ucs:0x294C7   # 𩓇
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:01829 ; # &AJ1-01829;
+        :left     rep.adobe-japan1-0:01829 ; # &AJ1-01829;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x294C8   # 𩓈
@@ -36176,7 +35924,7 @@ ucs:0x294DE   # 𩓞
     ] .
 ucs:0x294DF   # 𩓟
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:18448 ; # &AJ1-18448;
+        :left     rep.adobe-japan1-5:18448 ; # &AJ1-18448;
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x294E0   # 𩓠
@@ -36491,12 +36239,7 @@ ucs:0x2950C   # 𩔌
     ] .
 ucs:0x2950D   # 𩔍
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x7ACB ; # 立
-                :below    a.ucs:0x6708   # 月
-            ]
-        ] ;
+        :left     a.ucs:0x2668F ; # 𦚏
         :right    a.ucs:0x9801   # 頁
     ] .
 ucs:0x2950E   # 𩔎
@@ -36840,7 +36583,7 @@ ucs:0x2953D   # 𩔽
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿸ ;
-                :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+                :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
                 :filling  a.ucs:0x76EE   # 目
             ]
         ] ;
@@ -37008,7 +36751,7 @@ ucs:0x29556   # 𩕖
         :left     [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EA4 ; # ⺤
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x5BF8   # 寸
             ]
         ] ;
@@ -37513,7 +37256,7 @@ ucs:0x2959E   # 𩖞
     ] .
 ucs:0x2959F   # 𩖟
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:13834 ; # &AJ1-13834;
+        :above    rep.adobe-japan1-4:13834 ; # &AJ1-13834;
         :below    a.ucs:0x98A8   # 風
     ] .
 ucs:0x295A0   # 𩖠
@@ -37549,7 +37292,7 @@ ucs:0x295A5   # 𩖥
 ucs:0x295A6   # 𩖦
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x98A8 ; # 風
-        :filling  rep.adobe-japan1:02067   # &AJ1-02067;
+        :filling  rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x295A7   # 𩖧
     :structure [ a idc:⿺ ;
@@ -38483,7 +38226,7 @@ ucs:0x2964A   # 𩙊
                         :filling  a.ucs:0x200AD   # 𠂭
                     ]
                 ] ;
-                :below    rep.gt:37857   # &GT-37857;
+                :below    a.ucs:0x2EBC   # ⺼
             ]
         ]
     ] .
@@ -38507,12 +38250,7 @@ ucs:0x2964E   # 𩙎
         :surround a.ucs:0x98A8 ; # 風
         :filling  [
             :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿰ ;
-                        :left     a.ucs:0x53E3 ; # 口
-                        :right    a.ucs:0x53E3   # 口
-                    ]
-                ] ;
+                :above    a.ucs:0x5405 ; # 吅
                 :below    rep.big5-cdp:0x86A8   # &CDP-86A8;
             ]
         ]
@@ -38766,7 +38504,7 @@ ucs:0x29673   # 𩙳
     ] .
 ucs:0x29674   # 𩙴
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x98DB   # 飛
     ] .
 ucs:0x29675   # 𩙵
@@ -38952,7 +38690,7 @@ ucs:0x29694   # 𩚔
 ucs:0x29695   # 𩚕
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x98E0 ; # 飠
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x29696   # 𩚖
     :structure [ a idc:⿰ ;
@@ -38986,7 +38724,7 @@ ucs:0x2969B   # 𩚛
     ] .
 ucs:0x2969C   # 𩚜
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02067 ; # &AJ1-02067;
+        :above    rep.adobe-japan1-0:02067 ; # &AJ1-02067;
         :below    a.ucs:0x98DF   # 食
     ] .
 ucs:0x2969D   # 𩚝
@@ -39940,7 +39678,7 @@ ucs:0x29730   # 𩜰
 ucs:0x29731   # 𩜱
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x98E0 ; # 飠
-        :right    rep.adobe-japan1:02585   # &AJ1-02585;
+        :right    rep.adobe-japan1-0:02585   # &AJ1-02585;
     ] .
 ucs:0x29732   # 𩜲
     :structure [ a idc:⿰ ;
@@ -40345,7 +40083,7 @@ ucs:0x2976C   # 𩝬
 ucs:0x2976D   # 𩝭
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x98E0 ; # 飠
-        :right    rep.adobe-japan1:02089   # &AJ1-02089;
+        :right    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x2976E   # 𩝮
     :structure [ a idc:⿰ ;
@@ -40721,13 +40459,8 @@ ucs:0x297A3   # 𩞣
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:⿰ ;
-                :left     rep.big5-cdp:0x8C4C ; # &I-CDP-8C4C;
-                :right    [
-                    :structure [ a idc:⿸ ;
-                        :surround a.ucs:0x20086 ; # 𠂆
-                        :filling  rep.big5-cdp:0x89ED   # &CDP-89ED;
-                    ]
-                ]
+                :left     a.ucs:0x53F7 ; # 号
+                :right    a.ucs:0x4E55   # 乕
             ]
         ] ;
         :below    rep.gt:59026   # &GT-59026;
@@ -40984,7 +40717,7 @@ ucs:0x297C9   # 𩟉
         :left     a.ucs:0x98E0 ; # 飠
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    [
                     :structure [ a idc:⿹ ;
                         :surround a.ucs:0x52F9 ; # 勹
@@ -41137,7 +40870,7 @@ ucs:0x297DC   # 𩟜
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x51FA ; # 出
-                :middle   rep.cns11643-6:0x213C ; # &I-C6-213C;
+                :middle   a.ucs:0x20AD4 ; # 𠫔
                 :below    a.ucs:0x2BDA7   # 𫶧
             ]
         ]
@@ -41305,17 +41038,7 @@ ucs:0x297F3   # 𩟳
 ucs:0x297F4   # 𩟴
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x98E0 ; # 飠
-        :right    [
-            :structure [ a idc:⿰ ;
-                :left     [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x6797 ; # 林
-                        :below    a.ucs:0x6708   # 月
-                    ]
-                ] ;
-                :right    a.ucs:0x6534   # 攴
-            ]
-        ]
+        :right    a.ucs:0x22FE8   # 𢿨
     ] .
 ucs:0x297F5   # 𩟵
     :structure [ a idc:⿰ ;
@@ -41378,7 +41101,7 @@ ucs:0x297FC   # 𩟼
     :structure [ a idc:⿲ ;
         :left     a.ucs:0x98E0 ; # 飠
         :middle   a.ucs:0x59A5 ; # 妥
-        :right    rep.adobe-japan1:03910   # &AJ1-03910;
+        :right    rep.adobe-japan1-0:03910   # &AJ1-03910;
     ] .
 ucs:0x297FD   # 𩟽
     :structure [ a idc:⿰ ;
@@ -41503,11 +41226,11 @@ ucs:0x29814   # 𩠔
 ucs:0x29815   # 𩠕
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9996 ; # 首
-        :right    rep.adobe-japan1:18056   # &AJ1-18056;
+        :right    rep.adobe-japan1-5:18056   # &AJ1-18056;
     ] .
 ucs:0x29816   # 𩠖
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:18056 ; # &AJ1-18056;
+        :left     rep.adobe-japan1-5:18056 ; # &AJ1-18056;
         :right    a.ucs:0x29810   # 𩠐
     ] .
 ucs:0x29817   # 𩠗
@@ -41518,11 +41241,11 @@ ucs:0x29817   # 𩠗
 ucs:0x29818   # 𩠘
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9996 ; # 首
-        :below    rep.adobe-japan1:01422   # &AJ1-01422;
+        :below    rep.adobe-japan1-0:01422   # &AJ1-01422;
     ] .
 ucs:0x29819   # 𩠙
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:18056 ; # &AJ1-18056;
+        :left     rep.adobe-japan1-5:18056 ; # &AJ1-18056;
         :right    a.ucs:0x9996   # 首
     ] .
 ucs:0x2981A   # 𩠚
@@ -41706,7 +41429,7 @@ ucs:0x29837   # 𩠷
                 :right    [
                     :structure [ a idc:⿱ ;
                         :above    a.ucs:0x5F61 ; # 彡
-                        :below    rep.adobe-japan1:18056   # &AJ1-18056;
+                        :below    rep.adobe-japan1-5:18056   # &AJ1-18056;
                     ]
                 ]
             ]
@@ -41731,7 +41454,7 @@ ucs:0x2983A   # 𩠺
 ucs:0x2983B   # 𩠻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9999 ; # 香
-        :right    rep.adobe-japan1:02067   # &AJ1-02067;
+        :right    rep.adobe-japan1-0:02067   # &AJ1-02067;
     ] .
 ucs:0x2983C   # 𩠼
     :structure [ a idc:⿱ ;
@@ -41819,7 +41542,7 @@ ucs:0x2984B   # 𩡋
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5929 ; # 天
-                :below    rep.adobe-japan1:13852   # &AJ1-13852;
+                :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
             ]
         ]
     ] .
@@ -41833,7 +41556,7 @@ ucs:0x2984D   # 𩡍
         :left     [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x79BE ; # 禾
-                :middle   rep.big5-cdp:0x8C43 ; # &I-CDP-8C43;
+                :middle   a.ucs:0x2EA2 ; # ⺢
                 :below    a.ucs:0x65E5   # 日
             ]
         ] ;
@@ -41954,7 +41677,7 @@ ucs:0x2985F   # 𩡟
                 :below    [
                     :structure [ a idc:⿵ ;
                         :surround a.ucs:0x5182 ; # 冂
-                        :filling  rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                        :filling  a.ucs:0x2EA2   # ⺢
                     ]
                 ]
             ]
@@ -42378,13 +42101,8 @@ ucs:0x298A3   # 𩢣
         :left     a.ucs:0x99AC ; # 馬
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :below    [
-                    :structure [ a idc:⿻ ;
-                        :underlying a.ucs:0x4E02 ; # 丂
-                        :overlaying a.ucs:0x4E00   # 一
-                    ]
-                ]
+                :above    a.ucs:0x4E37 ; # 丷
+                :below    a.ucs:0x4E90   # 亐
             ]
         ]
     ] .
@@ -43096,12 +42814,7 @@ ucs:0x29915   # 𩤕
 ucs:0x29916   # 𩤖
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x99AC ; # 馬
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x56DF ; # 囟
-                :below    a.ucs:0x513F   # 儿
-            ]
-        ]
+        :right    a.ucs:0x20486   # 𠒆
     ] .
 ucs:0x29917   # 𩤗
     :structure [ a idc:⿰ ;
@@ -43228,7 +42941,7 @@ ucs:0x2992C   # 𩤬
         :left     a.ucs:0x99AC ; # 馬
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B53 ; # &I-CDP-8B53;
+                :above    rep.ucs_iso:0x20B9B ; # &C4-2147;
                 :below    a.ucs:0x518B   # 冋
             ]
         ]
@@ -43523,7 +43236,7 @@ ucs:0x29958   # 𩥘
 ucs:0x29959   # 𩥙
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x99AC ; # 馬
-        :right    rep.adobe-japan1:02089   # &AJ1-02089;
+        :right    rep.adobe-japan1-0:02089   # &AJ1-02089;
     ] .
 ucs:0x2995A   # 𩥚
     :structure [ a idc:⿰ ;
@@ -43692,7 +43405,7 @@ ucs:0x29971   # 𩥱
         :right    [
             :structure [ a idc:⿱ ;
                 :above    rep.big5-cdp:0x8BFA ; # &CDP-8BFA;
-                :below    rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :below    a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
@@ -44110,7 +43823,7 @@ ucs:0x299AF   # 𩦯
         :left     a.ucs:0x99AC ; # 馬
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    rep.big5-cdp:0x8ABA   # &CDP-8ABA;
             ]
         ]
@@ -44202,7 +43915,7 @@ ucs:0x299BB   # 𩦻
         :middle   a.ucs:0x53E3 ; # 口
         :below    [
             :structure [ a idc:⿲ ;
-                :left     rep.gt:37857 ; # &GT-37857;
+                :left     a.ucs:0x2EBC ; # ⺼
                 :middle   a.ucs:0x99AC ; # 馬
                 :right    a.ucs:0x4E2E   # 丮
             ]
@@ -44435,14 +44148,14 @@ ucs:0x299DD   # 𩧝
                 :below    a.ucs:0x382D   # 㠭
             ]
         ] ;
-        :right    rep.big5-cdp:0x8B67   # &CDP-8B67;
+        :right    rep.ucs_iso:0x27607   # &CDP-8B67;
     ] .
 ucs:0x299DE   # 𩧞
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x99AC ; # 馬
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-6:0x2D4A ; # &I-C6-2D4A;
+                :above    a.ucs:0x25762 ; # 𥝢
                 :below    [
                     :structure [ a idc:⿰ ;
                         :left     rep.big5-cdp:0x8D71 ; # &CDP-8D71;
@@ -44622,7 +44335,7 @@ ucs:0x299FA   # 𩧺
 ucs:0x299FB   # 𩧻
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2EE2 ; # ⻢
-        :right    rep.adobe-japan1:01148   # &AJ1-01148;
+        :right    rep.adobe-japan1-0:01148   # &AJ1-01148;
     ] .
 ucs:0x299FC   # 𩧼
     :structure [ a idc:⿰ ;
@@ -44657,13 +44370,7 @@ ucs:0x29A01   # 𩨁
 ucs:0x29A02   # 𩨂
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x2EE2 ; # ⻢
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :middle   a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5FC3   # 心
-            ]
-        ]
+        :right    a.ucs:0x603B   # 总
     ] .
 ucs:0x29A03   # 𩨃
     :structure [ a idc:⿰ ;
@@ -44737,12 +44444,12 @@ ucs:0x29A10   # 𩨐
     ] .
 ucs:0x29A11   # 𩨑
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x4E01   # 丁
     ] .
 ucs:0x29A12   # 𩨒
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x51E0   # 几
     ] .
 ucs:0x29A13   # 𩨓
@@ -44757,23 +44464,18 @@ ucs:0x29A14   # 𩨔
     ] .
 ucs:0x29A15   # 𩨕
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5DF2   # 已
     ] .
 ucs:0x29A16   # 𩨖
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5342   # 卂
     ] .
 ucs:0x29A17   # 𩨗
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
-        :right    [
-            :structure [ a idc:⿻ ;
-                :underlying a.ucs:0x4E02 ; # 丂
-                :overlaying a.ucs:0x4E00   # 一
-            ]
-        ]
+        :left     a.ucs:0x9AA8 ; # 骨
+        :right    a.ucs_component:0x4E8F   # &A-compU+4E8F;
     ] .
 ucs:0x29A18   # 𩨘
     :structure [ a idc:⿰ ;
@@ -44792,52 +44494,52 @@ ucs:0x29A1A   # 𩨚
     ] .
 ucs:0x29A1B   # 𩨛
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x4E47   # 乇
     ] .
 ucs:0x29A1C   # 𩨜
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5DF4   # 巴
     ] .
 ucs:0x29A1D   # 𩨝
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x652F   # 支
     ] .
 ucs:0x29A1E   # 𩨞
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53CA   # 及
     ] .
 ucs:0x29A1F   # 𩨟
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x723B   # 爻
     ] .
 ucs:0x29A20   # 𩨠
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7259   # 牙
     ] .
 ucs:0x29A21   # 𩨡
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5C11   # 少
     ] .
 ucs:0x29A22   # 𩨢
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x722A   # 爪
     ] .
 ucs:0x29A23   # 𩨣
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x65B9   # 方
     ] .
 ucs:0x29A24   # 𩨤
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4E00 ; # 一
@@ -44852,12 +44554,12 @@ ucs:0x29A25   # 𩨥
     ] .
 ucs:0x29A26   # 𩨦
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x516E   # 兮
     ] .
 ucs:0x29A27   # 𩨧
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x201A2 ; # 𠆢
@@ -44892,67 +44594,62 @@ ucs:0x29A2B   # 𩨫
     ] .
 ucs:0x29A2C   # 𩨬
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7384   # 玄
     ] .
 ucs:0x29A2D   # 𩨭
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5B83   # 它
     ] .
 ucs:0x29A2E   # 𩨮
     :structure [ a idc:⿸ ;
         :surround rep.big5-cdp:0x894F ; # &CDP-894F;
-        :filling  rep.adobe-japan1:02062   # &AJ1-02062;
+        :filling  rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A2F   # 𩨯
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x65A5   # 斥
     ] .
 ucs:0x29A30   # 𩨰
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5931   # 失
     ] .
 ucs:0x29A31   # 𩨱
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x6B64 ; # 此
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A32   # 𩨲
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5FC5   # 必
     ] .
 ucs:0x29A33   # 𩨳
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x51FA ; # 出
-        :right    rep.adobe-japan1:02062   # &AJ1-02062;
+        :right    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A34   # 𩨴
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53F7   # 号
     ] .
 ucs:0x29A35   # 𩨵
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53EA   # 只
     ] .
 ucs:0x29A36   # 𩨶
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E3F ; # 丿
-                :below    rep.big5-cdp:0x8C66   # &CDP-8C66;
-            ]
-        ]
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
+        :right    rep.gt-k:01340   # &GT-K01340;
     ] .
 ucs:0x29A37   # 𩨷
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5C71 ; # 山
@@ -44962,7 +44659,7 @@ ucs:0x29A37   # 𩨷
     ] .
 ucs:0x29A38   # 𩨸
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x51FA   # 出
     ] .
 ucs:0x29A39   # 𩨹
@@ -44972,7 +44669,7 @@ ucs:0x29A39   # 𩨹
     ] .
 ucs:0x29A3A   # 𩨺
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x20089 ; # 𠂉
@@ -44992,22 +44689,22 @@ ucs:0x29A3C   # 𩨼
     ] .
 ucs:0x29A3D   # 𩨽
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x200A4   # 𠂤
     ] .
 ucs:0x29A3E   # 𩨾
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5371   # 危
     ] .
 ucs:0x29A3F   # 𩨿
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7070   # 灰
     ] .
 ucs:0x29A40   # 𩩀
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5DDB ; # 巛
@@ -45022,12 +44719,12 @@ ucs:0x29A41   # 𩩁
     ] .
 ucs:0x29A42   # 𩩂
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5408   # 合
     ] .
 ucs:0x29A43   # 𩩃
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5927 ; # 大
@@ -45047,7 +44744,7 @@ ucs:0x29A45   # 𩩅
     ] .
 ucs:0x29A46   # 𩩆
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5C71 ; # 山
@@ -45067,37 +44764,37 @@ ucs:0x29A48   # 𩩈
     ] .
 ucs:0x29A49   # 𩩉
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5B5D   # 孝
     ] .
 ucs:0x29A4A   # 𩩊
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x542B   # 含
     ] .
 ucs:0x29A4B   # 𩩋
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5DE0   # 巠
     ] .
 ucs:0x29A4C   # 𩩌
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7CFB   # 系
     ] .
 ucs:0x29A4D   # 𩩍
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7539   # 甹
     ] .
 ucs:0x29A4E   # 𩩎
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x20BD1   # 𠯑
     ] .
 ucs:0x29A4F   # 𩩏
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x5B80 ; # 宀
@@ -45123,7 +44820,7 @@ ucs:0x29A52   # 𩩒
     ] .
 ucs:0x29A53   # 𩩓
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x8096   # 肖
     ] .
 ucs:0x29A54   # 𩩔
@@ -45133,7 +44830,7 @@ ucs:0x29A54   # 𩩔
     ] .
 ucs:0x29A55   # 𩩕
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7683   # 皃
     ] .
 ucs:0x29A56   # 𩩖
@@ -45143,17 +44840,17 @@ ucs:0x29A56   # 𩩖
     ] .
 ucs:0x29A57   # 𩩗
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x820D   # 舍
     ] .
 ucs:0x29A58   # 𩩘
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x65BC ; # 於
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A59   # 𩩙
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x7530 ; # 田
@@ -45168,12 +44865,12 @@ ucs:0x29A59   # 𩩙
     ] .
 ucs:0x29A5A   # 𩩚
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7540   # 畀
     ] .
 ucs:0x29A5B   # 𩩛
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5947   # 奇
     ] .
 ucs:0x29A5C   # 𩩜
@@ -45182,13 +44879,13 @@ ucs:0x29A5C   # 𩩜
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5DE6 ; # 左
-                :below    rep.adobe-japan1:02062   # &AJ1-02062;
+                :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
             ]
         ]
     ] .
 ucs:0x29A5D   # 𩩝
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7A7A   # 空
     ] .
 ucs:0x29A5E   # 𩩞
@@ -45198,22 +44895,22 @@ ucs:0x29A5E   # 𩩞
     ] .
 ucs:0x29A5F   # 𩩟
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53D5   # 叕
     ] .
 ucs:0x29A60   # 𩩠
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5352   # 卒
     ] .
 ucs:0x29A61   # 𩩡
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x590C   # 夌
     ] .
 ucs:0x29A62   # 𩩢
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5152   # 兒
     ] .
 ucs:0x29A63   # 𩩣
@@ -45238,7 +44935,7 @@ ucs:0x29A65   # 𩩥
     ] .
 ucs:0x29A66   # 𩩦
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x65BC   # 於
     ] .
 ucs:0x29A67   # 𩩧
@@ -45283,27 +44980,27 @@ ucs:0x29A6C   # 𩩬
     ] .
 ucs:0x29A6D   # 𩩭
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7701   # 省
     ] .
 ucs:0x29A6E   # 𩩮
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5EA6   # 度
     ] .
 ucs:0x29A6F   # 𩩯
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x6241   # 扁
     ] .
 ucs:0x29A70   # 𩩰
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7686   # 皆
     ] .
 ucs:0x29A71   # 𩩱
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53DA   # 叚
     ] .
 ucs:0x29A72   # 𩩲
@@ -45313,22 +45010,22 @@ ucs:0x29A72   # 𩩲
     ] .
 ucs:0x29A73   # 𩩳
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x91CD   # 重
     ] .
 ucs:0x29A74   # 𩩴
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x54B8   # 咸
     ] .
 ucs:0x29A75   # 𩩵
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x4FAF   # 侯
     ] .
 ucs:0x29A76   # 𩩶
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x98DF   # 食
     ] .
 ucs:0x29A77   # 𩩷
@@ -45338,12 +45035,12 @@ ucs:0x29A77   # 𩩷
     ] .
 ucs:0x29A78   # 𩩸
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9769   # 革
     ] .
 ucs:0x29A79   # 𩩹
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4E19 ; # 丙
@@ -45373,12 +45070,12 @@ ucs:0x29A7C   # 𩩼
     ] .
 ucs:0x29A7D   # 𩩽
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x77E6   # 矦
     ] .
 ucs:0x29A7E   # 𩩾
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿸ ;
                 :surround a.ucs:0x6236 ; # 戶
@@ -45403,12 +45100,12 @@ ucs:0x29A80   # 𩪀
     ] .
 ucs:0x29A81   # 𩪁
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9B3C   # 鬼
     ] .
 ucs:0x29A82   # 𩪂
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x8C48   # 豈
     ] .
 ucs:0x29A83   # 𩪃
@@ -45418,7 +45115,7 @@ ucs:0x29A83   # 𩪃
     ] .
 ucs:0x29A84   # 𩪄
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5DE6 ; # 左
@@ -45428,7 +45125,7 @@ ucs:0x29A84   # 𩪄
     ] .
 ucs:0x29A85   # 𩪅
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x56DF ; # 囟
@@ -45438,7 +45135,7 @@ ucs:0x29A85   # 𩪅
     ] .
 ucs:0x29A86   # 𩪆
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9AA8   # 骨
     ] .
 ucs:0x29A87   # 𩪇
@@ -45453,7 +45150,7 @@ ucs:0x29A88   # 𩪈
     ] .
 ucs:0x29A89   # 𩪉
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9E7F   # 鹿
     ] .
 ucs:0x29A8A   # 𩪊
@@ -45464,7 +45161,7 @@ ucs:0x29A8A   # 𩪊
 ucs:0x29A8B   # 𩪋
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x6556 ; # 敖
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A8C   # 𩪌
     :structure [ a idc:⿰ ;
@@ -45473,17 +45170,17 @@ ucs:0x29A8C   # 𩪌
     ] .
 ucs:0x29A8D   # 𩪍
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5340   # 區
     ] .
 ucs:0x29A8E   # 𩪎
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x83BD   # 莽
     ] .
 ucs:0x29A8F   # 𩪏
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5DE6 ; # 左
@@ -45493,17 +45190,17 @@ ucs:0x29A8F   # 𩪏
     ] .
 ucs:0x29A90   # 𩪐
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x570B   # 國
     ] .
 ucs:0x29A91   # 𩪑
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5DE2   # 巢
     ] .
 ucs:0x29A92   # 𩪒
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EBF ; # ⺿
@@ -45514,12 +45211,12 @@ ucs:0x29A92   # 𩪒
     ] .
 ucs:0x29A93   # 𩪓
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5D14   # 崔
     ] .
 ucs:0x29A95   # 𩪕
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x6556   # 敖
     ] .
 ucs:0x29A96   # 𩪖
@@ -45529,33 +45226,33 @@ ucs:0x29A96   # 𩪖
     ] .
 ucs:0x29A97   # 𩪗
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x53A5   # 厥
     ] .
 ucs:0x29A98   # 𩪘
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7AE5   # 童
     ] .
 ucs:0x29A99   # 𩪙
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x557B   # 啻
     ] .
 ucs:0x29A9A   # 𩪚
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x5C1E   # 尞
     ] .
 ucs:0x29A9B   # 𩪛
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x83D0   # 菐
     ] .
 ucs:0x29A9C   # 𩪜
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x53A5 ; # 厥
-        :filling  rep.adobe-japan1:02062   # &AJ1-02062;
+        :filling  rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29A9D   # 𩪝
     :structure [ a idc:⿰ ;
@@ -45586,41 +45283,41 @@ ucs:0x29A9F   # 𩪟
 ucs:0x29AA0   # 𩪠
     :structure [ a idc:⿸ ;
         :surround rep.big5-cdp:0x8BD2 ; # &CDP-8BD2;
-        :filling  rep.adobe-japan1:02062   # &AJ1-02062;
+        :filling  rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29AA1   # 𩪡
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x6BBF ; # 殿
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29AA2   # 𩪢
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x6B46   # 歆
     ] .
 ucs:0x29AA3   # 𩪣
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x610F   # 意
     ] .
 ucs:0x29AA4   # 𩪤
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x696D   # 業
     ] .
 ucs:0x29AA5   # 𩪥
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x96F6   # 零
     ] .
 ucs:0x29AA6   # 𩪦
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9693   # 隓
     ] .
 ucs:0x29AA7   # 𩪧
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x8F9F   # 辟
     ] .
 ucs:0x29AA8   # 𩪨
@@ -45636,11 +45333,11 @@ ucs:0x29AA8   # 𩪨
                 :right    a.ucs:0x6534   # 攴
             ]
         ] ;
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29AA9   # 𩪩
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿳ ;
                 :above    rep.big5-cdp:0x8BEC ; # &CDP-8BEC;
@@ -45666,12 +45363,12 @@ ucs:0x29AAC   # 𩪬
     ] .
 ucs:0x29AAD   # 𩪭
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    rep.gt:42188   # &GT-42188;
     ] .
 ucs:0x29AAE   # 𩪮
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9EBC   # 麼
     ] .
 ucs:0x29AAF   # 𩪯
@@ -45691,23 +45388,13 @@ ucs:0x29AB1   # 𩪱
     ] .
 ucs:0x29AB2   # 𩪲
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x9F52   # 齒
     ] .
 ucs:0x29AB3   # 𩪳
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x200B9 ; # 𠂹
-                :below    [
-                    :structure [ a idc:⿸ ;
-                        :surround rep.big5-cdp:0x896C ; # &I-CDP-896C;
-                        :filling  a.ucs:0x5DE5   # 工
-                    ]
-                ]
-            ]
-        ]
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
+        :right    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x29AB4   # 𩪴
     :structure [ a idc:⿰ ;
@@ -45721,7 +45408,7 @@ ucs:0x29AB5   # 𩪵
     ] .
 ucs:0x29AB6   # 𩪶
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x7BC0   # 節
     ] .
 ucs:0x29AB7   # 𩪷
@@ -45731,12 +45418,12 @@ ucs:0x29AB7   # 𩪷
     ] .
 ucs:0x29AB8   # 𩪸
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x6B77   # 歷
     ] .
 ucs:0x29AB9   # 𩪹
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x81FE ; # 臾
@@ -45751,18 +45438,18 @@ ucs:0x29ABA   # 𩪺
     ] .
 ucs:0x29ABB   # 𩪻
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EAE ; # ⺮
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x4F10   # 伐
             ]
         ]
     ] .
 ucs:0x29ABC   # 𩪼
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:02062 ; # &AJ1-02062;
+        :left     rep.adobe-japan1-0:02062 ; # &AJ1-02062;
         :right    a.ucs:0x96DA   # 雚
     ] .
 ucs:0x29ABD   # 𩪽
@@ -45773,7 +45460,7 @@ ucs:0x29ABD   # 𩪽
 ucs:0x29ABE   # 𩪾
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x470C ; # 䜌
-        :below    rep.adobe-japan1:02062   # &AJ1-02062;
+        :below    rep.adobe-japan1-0:02062   # &AJ1-02062;
     ] .
 ucs:0x29ABF   # 𩪿
     :structure [ a idc:⿰ ;
@@ -46075,7 +45762,7 @@ ucs:0x29AEF   # 𩫯
 ucs:0x29AF0   # 𩫰
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x29ACF ; # 𩫏
-        :right    a.ucs_component:0x5A41   # &IWDS1-348;
+        :right    a.ucs_component:0x5A41   # &A-compU+5A41;
     ] .
 ucs:0x29AF1   # 𩫱
     :structure [ a idc:⿰ ;
@@ -46145,12 +45832,7 @@ ucs:0x29AFD   # 𩫽
 ucs:0x29AFE   # 𩫾
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9ADF ; # 髟
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x8B55 ; # &I-CDP-8B55;
-                :below    a.ucs:0x4E28   # 丨
-            ]
-        ]
+        :below    a.ucs:0x4E2B   # 丫
     ] .
 ucs:0x29AFF   # 𩫿
     :structure [ a idc:⿱ ;
@@ -46720,7 +46402,7 @@ ucs:0x29B64   # 𩭤
 ucs:0x29B65   # 𩭥
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9ADF ; # 髟
-        :below    rep.adobe-japan1:18448   # &AJ1-18448;
+        :below    rep.adobe-japan1-5:18448   # &AJ1-18448;
     ] .
 ucs:0x29B66   # 𩭦
     :structure [ a idc:⿱ ;
@@ -47052,7 +46734,7 @@ ucs:0x29B9A   # 𩮚
         :above    a.ucs:0x9ADF ; # 髟
         :below    [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-5:0x2141 ; # &C5-2141;
+                :above    a.ucs:0x355A ; # 㕚
                 :below    a.ucs:0x866B   # 虫
             ]
         ]
@@ -47123,19 +46805,14 @@ ucs:0x29BA5   # 𩮥
         :below    [
             :structure [ a idc:⿵ ;
                 :surround a.ucs:0x215DC ; # 𡗜
-                :filling  rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :filling  a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
 ucs:0x29BA6   # 𩮦
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9ADF ; # 髟
-        :below    [
-            :structure [ a idc:⿱ ;
-                :above    rep.big5-cdp:0x88D2 ; # &CDP-88D2;
-                :below    a.ucs:0x6708   # 月
-            ]
-        ]
+        :below    a.ucs:0x810A   # 脊
     ] .
 ucs:0x29BA7   # 𩮧
     :structure [ a idc:⿱ ;
@@ -47398,7 +47075,7 @@ ucs:0x29BD4   # 𩯔
 ucs:0x29BD5   # 𩯕
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x9ADF ; # 髟
-        :below    rep.adobe-japan1:02755   # &AJ1-02755;
+        :below    rep.adobe-japan1-0:02755   # &AJ1-02755;
     ] .
 ucs:0x29BD6   # 𩯖
     :structure [ a idc:⿱ ;
@@ -47426,7 +47103,7 @@ ucs:0x29BD9   # 𩯙
         :below    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4E3F ; # 丿
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x27C28   # 𧰨
             ]
         ]
@@ -47645,15 +47322,9 @@ ucs:0x29BF7   # 𩯷
         :right    a.ucs:0x6208   # 戈
     ] .
 ucs:0x29BF8   # 𩯸
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    a.ucs:0x9ADF ; # 髟
-        :middle   a.ucs:0x200B9 ; # 𠂹
-        :below    [
-            :structure [ a idc:⿸ ;
-                :surround rep.big5-cdp:0x896C ; # &I-CDP-896C;
-                :filling  a.ucs:0x5DE5   # 工
-            ]
-        ]
+        :below    a.ucs:0x22029   # 𢀩
     ] .
 ucs:0x29BF9   # 𩯹
     :structure [ a idc:⿱ ;
@@ -47911,7 +47582,7 @@ ucs:0x29C24   # 𩰤
 ucs:0x29C25   # 𩰥
     :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 ; # 鬯
@@ -47922,7 +47593,7 @@ ucs:0x29C25   # 𩰥
 ucs:0x29C26   # 𩰦
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x6728 ; # 木
-        :middle   rep.gt:36329 ; # &GT-36329;
+        :middle   a.ucs:0x2EAB ; # ⺫
         :below    [
             :structure [ a idc:⿰ ;
                 :left     a.ucs:0x9B2F ; # 鬯
@@ -47975,12 +47646,7 @@ ucs:0x29C29   # 𩰩
             ]
         ] ;
         :middle   a.ucs:0x5196 ; # 冖
-        :below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x9B2F ; # 鬯
-                :right    a.ucs:0x5BF8   # 寸
-            ]
-        ]
+        :below    rep.ucs-itaiji-001:0x21B20   # &U-i001+21B20;
     ] .
 ucs:0x29C2A   # 𩰪
     :structure [ a idc:⿱ ;
@@ -48811,7 +48477,7 @@ ucs:0x29C8E   # 𩲎
     ] .
 ucs:0x29C8F   # 𩲏
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:01341 ; # &AJ1-01341;
+        :left     rep.adobe-japan1-0:01341 ; # &AJ1-01341;
         :right    a.ucs:0x9B3C   # 鬼
     ] .
 ucs:0x29C90   # 𩲐
@@ -48882,7 +48548,7 @@ ucs:0x29C9B   # 𩲛
     ] .
 ucs:0x29C9C   # 𩲜
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01341 ; # &AJ1-01341;
+        :above    rep.adobe-japan1-0:01341 ; # &AJ1-01341;
         :below    a.ucs:0x9B3C   # 鬼
     ] .
 ucs:0x29C9D   # 𩲝
@@ -48981,7 +48647,7 @@ ucs:0x29CAD   # 𩲭
         :filling  [
             :structure [ a idc:⿹ ;
                 :surround a.ucs:0x5F0B ; # 弋
-                :filling  rep.cns11643-5:0x2126   # &I-C5-2126;
+                :filling  a.ucs:0x20087   # 𠂇
             ]
         ]
     ] .
@@ -49207,7 +48873,7 @@ ucs:0x29CD4   # 𩳔
     ] .
 ucs:0x29CD5   # 𩳕
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  rep.mj:009599   # &MJ009599;
     ] .
 ucs:0x29CD6   # 𩳖
@@ -49267,7 +48933,7 @@ ucs:0x29CDE   # 𩳞
     ] .
 ucs:0x29CDF   # 𩳟
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x8C55   # 豕
     ] .
 ucs:0x29CE0   # 𩳠
@@ -49282,12 +48948,12 @@ ucs:0x29CE0   # 𩳠
     ] .
 ucs:0x29CE1   # 𩳡
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x5BFD   # 寽
     ] .
 ucs:0x29CE2   # 𩳢
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x5944   # 奄
     ] .
 ucs:0x29CE3   # 𩳣
@@ -49297,17 +48963,17 @@ ucs:0x29CE3   # 𩳣
     ] .
 ucs:0x29CE4   # 𩳤
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x9577   # 長
     ] .
 ucs:0x29CE5   # 𩳥
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8C56 ; # 豖
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CE6   # 𩳦
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x77E5   # 知
     ] .
 ucs:0x29CE7   # 𩳧
@@ -49327,12 +48993,12 @@ ucs:0x29CE8   # 𩳨
     ] .
 ucs:0x29CE9   # 𩳩
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x25762   # 𥝢
     ] .
 ucs:0x29CEA   # 𩳪
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x6607   # 昇
     ] .
 ucs:0x29CEB   # 𩳫
@@ -49357,7 +49023,7 @@ ucs:0x29CEC   # 𩳬
     ] .
 ucs:0x29CED   # 𩳭
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x897E ; # 襾
@@ -49368,11 +49034,11 @@ ucs:0x29CED   # 𩳭
 ucs:0x29CEE   # 𩳮
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5169 ; # 兩
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CEF   # 𩳯
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x65E1 ; # 旡
@@ -49382,7 +49048,7 @@ ucs:0x29CEF   # 𩳯
     ] .
 ucs:0x29CF0   # 𩳰
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  [
             :structure [ a idc:⿺ ;
                 :surround a.ucs:0x864D ; # 虍
@@ -49392,12 +49058,12 @@ ucs:0x29CF0   # 𩳰
     ] .
 ucs:0x29CF1   # 𩳱
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x26954   # 𦥔
     ] .
 ucs:0x29CF2   # 𩳲
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x4F88   # 侈
     ] .
 ucs:0x29CF3   # 𩳳
@@ -49412,27 +49078,27 @@ ucs:0x29CF4   # 𩳴
     ] .
 ucs:0x29CF5   # 𩳵
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x72CA   # 狊
     ] .
 ucs:0x29CF6   # 𩳶
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x67BC ; # 枼
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CF7   # 𩳷
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x97CB   # 韋
     ] .
 ucs:0x29CF8   # 𩳸
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x82D7   # 苗
     ] .
 ucs:0x29CF9   # 𩳹
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  [
             :structure [ a idc:⿺ ;
                 :surround a.ucs:0x5EF4 ; # 廴
@@ -49448,7 +49114,7 @@ ucs:0x29CFA   # 𩳺
                 :below    a.ucs:0x53F5   # 叵
             ]
         ] ;
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CFB   # 𩳻
     :structure [ a idc:⿺ ;
@@ -49458,31 +49124,31 @@ ucs:0x29CFB   # 𩳻
 ucs:0x29CFC   # 𩳼
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x5BA2 ; # 客
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CFD   # 𩳽
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x6625 ; # 春
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29CFE   # 𩳾
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x9762   # 面
     ] .
 ucs:0x29CFF   # 𩳿
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x80CC ; # 背
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D00   # 𩴀
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x8005   # 者
     ] .
 ucs:0x29D01   # 𩴁
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x54B8   # 咸
     ] .
 ucs:0x29D02   # 𩴂
@@ -49492,7 +49158,7 @@ ucs:0x29D02   # 𩴂
     ] .
 ucs:0x29D03   # 𩴃
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  rep.mj:011472   # &MJ011472;
     ] .
 ucs:0x29D04   # 𩴄
@@ -49502,47 +49168,47 @@ ucs:0x29D04   # 𩴄
     ] .
 ucs:0x29D05   # 𩴅
     :structure [ a idc:⿰ ;
-        :left     rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :left     rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :right    a.ucs:0x5951   # 契
     ] .
 ucs:0x29D06   # 𩴆
     :structure [ a idc:⿱ ;
         :above    rep.big5-cdp:0x8BA4 ; # &CDP-8BA4;
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D07   # 𩴇
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x6BBA   # 殺
     ] .
 ucs:0x29D08   # 𩴈
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x771B ; # 眛
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D09   # 𩴉
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x54E1   # 員
     ] .
 ucs:0x29D0A   # 𩴊
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x8336   # 茶
     ] .
 ucs:0x29D0B   # 𩴋
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x2245A   # 𢑚
     ] .
 ucs:0x29D0C   # 𩴌
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x76D1   # 监
     ] .
 ucs:0x29D0D   # 𩴍
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x53DF   # 叟
     ] .
 ucs:0x29D0E   # 𩴎
@@ -49558,56 +49224,56 @@ ucs:0x29D0F   # 𩴏
                 :below    a.ucs:0x65E5   # 日
             ]
         ] ;
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D10   # 𩴐
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7387   # 率
     ] .
 ucs:0x29D11   # 𩴑
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x53C3   # 參
     ] .
 ucs:0x29D12   # 𩴒
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5F37 ; # 強
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D13   # 𩴓
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  rep.big5-cdp:0x8BD3   # &CDP-8BD3;
     ] .
 ucs:0x29D14   # 𩴔
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x5EB8   # 庸
     ] .
 ucs:0x29D15   # 𩴕
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x65AC ; # 斬
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D16   # 𩴖
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x7737 ; # 眷
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D17   # 𩴗
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x5807   # 堇
     ] .
 ucs:0x29D18   # 𩴘
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x8655   # 處
     ] .
 ucs:0x29D19   # 𩴙
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x6DF1   # 深
     ] .
 ucs:0x29D1A   # 𩴚
@@ -49623,51 +49289,51 @@ ucs:0x29D1B   # 𩴛
                 :filling  a.ucs:0x4E18   # 丘
             ]
         ] ;
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D1C   # 𩴜
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7570   # 異
     ] .
 ucs:0x29D1D   # 𩴝
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x767B   # 登
     ] .
 ucs:0x29D1E   # 𩴞
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7232   # 爲
     ] .
 ucs:0x29D1F   # 𩴟
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x5962 ; # 奢
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D20   # 𩴠
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7CA6   # 粦
     ] .
 ucs:0x29D21   # 𩴡
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  rep.gt:56386   # &GT-56386;
     ] .
 ucs:0x29D22   # 𩴢
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x77DE ; # 矞
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D23   # 𩴣
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x53A4 ; # 厤
-        :filling  rep.adobe-japan1:01614   # &AJ1-01614;
+        :filling  rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D24   # 𩴤
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x5C1E   # 尞
     ] .
 ucs:0x29D25   # 𩴥
@@ -49678,11 +49344,11 @@ ucs:0x29D25   # 𩴥
 ucs:0x29D26   # 𩴦
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9593 ; # 間
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D27   # 𩴧
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7126   # 焦
     ] .
 ucs:0x29D28   # 𩴨
@@ -49693,17 +49359,17 @@ ucs:0x29D28   # 𩴨
                 :right    a.ucs:0x7F8A   # 羊
             ]
         ] ;
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D29   # 𩴩
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x7131   # 焱
     ] .
 ucs:0x29D2A   # 𩴪
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01586 ; # &AJ1-01586;
-        :below    rep.adobe-japan1:01614   # &AJ1-01614;
+        :above    rep.adobe-japan1-0:01586 ; # &AJ1-01586;
+        :below    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D2B   # 𩴫
     :structure [ a idc:⿺ ;
@@ -49722,7 +49388,7 @@ ucs:0x29D2C   # 𩴬
     ] .
 ucs:0x29D2D   # 𩴭
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2F878 ; # 屮
@@ -49733,12 +49399,12 @@ ucs:0x29D2D   # 𩴭
     ] .
 ucs:0x29D2E   # 𩴮
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x776A   # 睪
     ] .
 ucs:0x29D2F   # 𩴯
     :structure [ a idc:⿺ ;
-        :surround rep.adobe-japan1:01614 ; # &AJ1-01614;
+        :surround rep.adobe-japan1-0:01614 ; # &AJ1-01614;
         :filling  a.ucs:0x8C66   # 豦
     ] .
 ucs:0x29D30   # 𩴰
@@ -49749,12 +49415,12 @@ ucs:0x29D30   # 𩴰
 ucs:0x29D31   # 𩴱
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x8CD3 ; # 賓
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D32   # 𩴲
     :structure [ a idc:⿰ ;
         :left     rep.mj:009447 ; # &MJ009447;
-        :right    rep.adobe-japan1:01614   # &AJ1-01614;
+        :right    rep.adobe-japan1-0:01614   # &AJ1-01614;
     ] .
 ucs:0x29D33   # 𩴳
     :structure [ a idc:⿺ ;
@@ -50025,7 +49691,7 @@ ucs:0x29D5C   # 𩵜
 ucs:0x29D5D   # 𩵝
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:02109   # &AJ1-02109;
+        :right    rep.adobe-japan1-0:02109   # &AJ1-02109;
     ] .
 ucs:0x29D5E   # 𩵞
     :structure [ a idc:⿰ ;
@@ -50254,7 +49920,7 @@ ucs:0x29D89   # 𩶉
     ] .
 ucs:0x29D8A   # 𩶊
     :structure [ a idc:⿱ ;
-        :above    rep.gt:36329 ; # &GT-36329;
+        :above    a.ucs:0x2EAB ; # ⺫
         :below    a.ucs:0x9B5A   # 魚
     ] .
 ucs:0x29D8B   # 𩶋
@@ -50705,7 +50371,7 @@ ucs:0x29DDA   # 𩷚
 ucs:0x29DDB   # 𩷛
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:01455   # &AJ1-01455;
+        :right    rep.adobe-japan1-0:01455   # &AJ1-01455;
     ] .
 ucs:0x29DDC   # 𩷜
     :structure [ a idc:⿰ ;
@@ -51070,7 +50736,7 @@ ucs:0x29E16   # 𩸖
 ucs:0x29E17   # 𩸗
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:03690   # &AJ1-03690;
+        :right    rep.adobe-japan1-0:03690   # &AJ1-03690;
     ] .
 ucs:0x29E18   # 𩸘
     :structure [ a idc:⿰ ;
@@ -51130,17 +50796,7 @@ ucs:0x29E1F   # 𩸟
 ucs:0x29E20   # 𩸠
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿺ ;
-                        :surround a.ucs:0x200CA ; # 𠃊
-                        :filling  a.ucs:0x53E3   # 口
-                    ]
-                ] ;
-                :below    rep.gt:37857   # &GT-37857;
-            ]
-        ]
+        :right    a.ucs:0x26643   # 𦙃
     ] .
 ucs:0x29E21   # 𩸡
     :structure [ a idc:⿱ ;
@@ -51387,7 +51043,7 @@ ucs:0x29E4C   # 𩹌
         :left     a.ucs:0x9B5A ; # 魚
         :right    [
             :structure [ a idc:⿱ ;
-                :above    rep.gt:36329 ; # &GT-36329;
+                :above    a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x6C34   # 水
             ]
         ]
@@ -51648,14 +51304,9 @@ ucs:0x29E74   # 𩹴
         :right    a.ucs:0x8200   # 舀
     ] .
 ucs:0x29E75   # 𩹵
-    :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8DEB ; # &CDP-8DEB;
-        :below    [
-            :structure [ a idc:⿻ ;
-                :underlying rep.big5-cdp:0x8BF5 ; # &CDP-8BF5;
-                :overlaying a.ucs:0x9B5A   # 魚
-            ]
-        ]
+    :structure [ a idc:⿵ ;
+        :surround rep.ucs-itaiji-005:0x9F4A ; # &U-i005+9F4A;
+        :filling  a.ucs:0x9B5A   # 魚
     ] .
 ucs:0x29E76   # 𩹶
     :structure [ a idc:⿰ ;
@@ -51745,7 +51396,7 @@ ucs:0x29E82   # 𩺂
     ] .
 ucs:0x29E83   # 𩺃
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02089 ; # &AJ1-02089;
+        :above    rep.adobe-japan1-0:02089 ; # &AJ1-02089;
         :below    a.ucs:0x9B5A   # 魚
     ] .
 ucs:0x29E84   # 𩺄
@@ -52067,7 +51718,7 @@ ucs:0x29EAD   # 𩺭
         :right    [
             :structure [ a idc:⿱ ;
                 :above    rep.big5-cdp:0x8BFA ; # &CDP-8BFA;
-                :below    rep.big5-cdp:0x8C43   # &I-CDP-8C43;
+                :below    a.ucs:0x2EA2   # ⺢
             ]
         ]
     ] .
@@ -52134,7 +51785,7 @@ ucs:0x29EB8   # 𩺸
 ucs:0x29EB9   # 𩺹
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:17729   # &AJ1-17729;
+        :right    rep.adobe-japan1-5:17729   # &AJ1-17729;
     ] .
 ucs:0x29EBA   # 𩺺
     :structure [ a idc:⿰ ;
@@ -52256,7 +51907,7 @@ ucs:0x29EC7   # 𩻇
 ucs:0x29EC8   # 𩻈
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:02164   # &AJ1-02164;
+        :right    rep.adobe-japan1-0:02164   # &AJ1-02164;
     ] .
 ucs:0x29EC9   # 𩻉
     :structure [ a idc:⿱ ;
@@ -52637,7 +52288,7 @@ ucs:0x29F03   # 𩼃
     ] .
 ucs:0x29F04   # 𩼄
     :structure [ a idc:⿱ ;
-        :above    rep.gt:36329 ; # &GT-36329;
+        :above    a.ucs:0x2EAB ; # ⺫
         :below    [
             :structure [ a idc:⿰ ;
                 :left     a.ucs:0x9B5A ; # 魚
@@ -52927,7 +52578,7 @@ ucs:0x29F2B   # 𩼫
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.cns11643-4:0x232C ; # &I-C4-232C;
+                :above    a.ucs:0x2634C ; # 𦍌
                 :below    a.ucs:0x9B5A   # 魚
             ]
         ] ;
@@ -52966,13 +52617,7 @@ ucs:0x29F2F   # 𩼯
 ucs:0x29F30   # 𩼰
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x2EBF ; # ⺿
-                :middle   rep.cns11643-4:0x2267 ; # &I-C4-2267;
-                :below    a.ucs:0x5FC3   # 心
-            ]
-        ]
+        :right    a.ucs:0x6148   # 慈
     ] .
 ucs:0x29F31   # 𩼱
     :structure [ a idc:⿰ ;
@@ -53103,7 +52748,7 @@ ucs:0x29F3F   # 𩼿
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x200B9 ; # 𠂹
                 :middle   a.ucs:0x4E00 ; # 一
-                :below    rep.gt:37857   # &GT-37857;
+                :below    a.ucs:0x2EBC   # ⺼
             ]
         ]
     ] .
@@ -53358,7 +53003,7 @@ ucs:0x29F63   # 𩽣
 ucs:0x29F64   # 𩽤
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:02371   # &AJ1-02371;
+        :right    rep.adobe-japan1-0:02371   # &AJ1-02371;
     ] .
 ucs:0x29F65   # 𩽥
     :structure [ a idc:⿰ ;
@@ -53399,7 +53044,7 @@ ucs:0x29F6B   # 𩽫
     :structure [ a idc:⿰ ;
         :left     [
             :structure [ a idc:⿱ ;
-                :above    rep.adobe-japan1:02089 ; # &AJ1-02089;
+                :above    rep.adobe-japan1-0:02089 ; # &AJ1-02089;
                 :below    a.ucs:0x9B5A   # 魚
             ]
         ] ;
@@ -53488,7 +53133,7 @@ ucs:0x29F77   # 𩽷
 ucs:0x29F78   # 𩽸
     :structure [ a idc:⿰ ;
         :left     a.ucs:0x9B5A ; # 魚
-        :right    rep.adobe-japan1:07224   # &AJ1-07224;
+        :right    rep.adobe-japan1-0:07224   # &AJ1-07224;
     ] .
 ucs:0x29F79   # 𩽹
     :structure [ a idc:⿰ ;
@@ -53827,7 +53472,7 @@ ucs:0x29FB8   # 𩾸
     ] .
 ucs:0x29FB9   # 𩾹
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01341 ; # &AJ1-01341;
+        :above    rep.adobe-japan1-0:01341 ; # &AJ1-01341;
         :below    a.ucs:0x9CE5   # 鳥
     ] .
 ucs:0x29FBA   # 𩾺
@@ -53983,12 +53628,7 @@ ucs:0x29FD4   # 𩿔
     ] .
 ucs:0x29FD5   # 𩿕
     :structure [ a idc:⿰ ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EBA ; # 人
-                :below    a.ucs:0x4EBA   # 人
-            ]
-        ] ;
+        :left     a.ucs:0x4ECC ; # 仌
         :right    a.ucs:0x9CE5   # 鳥
     ] .
 ucs:0x29FD6   # 𩿖
@@ -54121,7 +53761,7 @@ ucs:0x29FEE   # 𩿮
         :left     [
             :structure [ a idc:⿱ ;
                 :above    rep.big5-cdp:0x8C78 ; # &CDP-8C78;
-                :below    rep.adobe-japan1:15391   # &AJ1-15391;
+                :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
             ]
         ] ;
         :right    a.ucs:0x9CE5   # 鳥