X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ISD-UCS-Ext-C.ttl;h=6fe07bb83dffee431d4525e26d5f98034ef5d5c7;hb=bd34400a9fc996f3e20ad9dbfdf93c1889cd5842;hp=59245edfb9d65dfd3b17f80cfaaf3dd43010a9ba;hpb=0f84f7d2c29e704896e12fabdab1d1519ad65080;p=chise%2Fisd.git

diff --git a/ISD-UCS-Ext-C.ttl b/ISD-UCS-Ext-C.ttl
index 59245ed..6fe07bb 100644
--- a/ISD-UCS-Ext-C.ttl
+++ b/ISD-UCS-Ext-C.ttl
@@ -3,13 +3,23 @@
 @prefix idc: <http://rdf.chise.org/rdf/type/character/idc/> .
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix ucs: <http://www.chise.org/est/view/character/ucs=> .
+@prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
-@prefix rep.adobe-japan1: <http://www.chise.org/est/view/character/rep.adobe-japan1=> .
+@prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @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.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
+@prefix rep.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
+@prefix a.ucs-itaiji-003: <http://www.chise.org/est/view/character/a.ucs-itaiji-003=> .
+@prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
+@prefix a.ucs-itaiji-006: <http://www.chise.org/est/view/character/a.ucs-itaiji-006=> .
+@prefix rep.ucs-itaiji-007: <http://www.chise.org/est/view/character/rep.ucs-itaiji-007=> .
 
 ucs:0x2A701   # 𪜁
     :structure [ a idc:⿱ ;
@@ -28,7 +38,7 @@ ucs:0x2A703   # 𪜃
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4E00 ; # 一
                 :middle   a.ucs:0x53E3 ; # 口
-                :below    rep.adobe-japan1:15391   # &AJ1-15391;
+                :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
             ]
         ]
     ] .
@@ -1124,12 +1134,7 @@ ucs:0x2A7C9   # 𪟉
     ] .
 ucs:0x2A7CA   # 𪟊
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿» ;
-                :underlying a.ucs:0x268FB ; # 𦣻
-                :overlaying a.ucs:0x4E00   # 一
-            ]
-        ] ;
+        :above    rep.big5-cdp:0x8DE0 ; # &CDP-8DE0;
         :below    a.ucs:0x5206   # 分
     ] .
 ucs:0x2A7CB   # 𪟋
@@ -1275,12 +1280,7 @@ ucs:0x2A7E2   # 𪟢
     ] .
 ucs:0x2A7E3   # 𪟣
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5405 ; # 吅
-                :below    a.ucs:0x20541   # 𠕁
-            ]
-        ] ;
+        :left     a.ucs:0x2BAA1 ; # 𫪡
         :right    a.ucs:0x529B   # 力
     ] .
 ucs:0x2A7E4   # 𪟤
@@ -2204,12 +2204,7 @@ ucs:0x2A882   # 𪢂
 ucs:0x2A883   # 𪢃
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4EA0 ; # 亠
-                :below    a.ucs:0x3687   # 㚇
-            ]
-        ]
+        :right    a.ucs-itaiji-003:0x21569   # &A-U-i003+21569;
     ] .
 ucs:0x2A884   # 𪢄
     :structure [ a idc:â¿° ;
@@ -2636,12 +2631,7 @@ ucs:0x2A8D2   # 𪣒
 ucs:0x2A8D3   # 𪣓
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    [
-            :structure [ a idc:⿸ ;
-                :surround a.ucs:0x5C38 ; # å°¸
-                :filling  a.ucs:0x4E47   # 乇
-            ]
-        ]
+        :right    rep.ruimoku-v6:0xE147   # &RUI6-E147;
     ] .
 ucs:0x2A8D4   # 𪣔
     :structure [ a idc:â¿° ;
@@ -3351,12 +3341,7 @@ ucs:0x2A94B   # 𪥋
     ] .
 ucs:0x2A94C   # 𪥌
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E3F ; # 丿
-                :below    a.ucs:0x2053F   # 𠔿
-            ]
-        ] ;
+        :above    rep.ucs-itaiji-005:0x56DF ; # &U-i005+56DF;
         :below    a.ucs:0x5927   # 大
     ] .
 ucs:0x2A94D   # 𪥍
@@ -3447,10 +3432,9 @@ ucs:0x2A95B   # 𪥛
         :filling  a.ucs:0x5927   # 大
     ] .
 ucs:0x2A95C   # 𪥜
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    a.ucs:0x5927 ; # 大
-        :middle   a.ucs:0x5405 ; # 吅
-        :below    a.ucs:0x20541   # 𠕁
+        :below    a.ucs:0x2BAA1   # 𫪡
     ] .
 ucs:0x2A95D   # 𪥝
     :structure [ a idc:⿱ ;
@@ -3678,13 +3662,7 @@ ucs:0x2A981   # 𪦁
 ucs:0x2A982   # 𪦂
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4E3F ; # 丿
-                :middle   a.ucs:0x7F53 ; # 罓
-                :below    a.ucs:0x5927   # 大
-            ]
-        ]
+        :right    rep.ucs-itaiji-002:0x5965   # &U-i002+5965;
     ] .
 ucs:0x2A983   # 𪦃
     :structure [ a idc:â¿° ;
@@ -3699,12 +3677,7 @@ ucs:0x2A984   # 𪦄
 ucs:0x2A985   # 𪦅
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :below    a.ucs:0x9FB1   # é¾±
-            ]
-        ]
+        :right    rep.ucs-itaiji-002:0x21FFA   # &U-i002+21FFA;
     ] .
 ucs:0x2A986   # 𪦆
     :structure [ a idc:⿱ ;
@@ -4084,7 +4057,7 @@ ucs:0x2A9C6   # 𪧆
 ucs:0x2A9C7   # 𪧇
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    a.ucs:0x723F   # 爿
+        :below    a.ucs_iwds-1:0x723F   # &A-IWDSU+723F;
     ] .
 ucs:0x2A9C8   # 𪧈
     :structure [ a idc:⿱ ;
@@ -4239,7 +4212,7 @@ ucs:0x2A9DF   # 𪧟
 ucs:0x2A9E0   # 𪧠
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B93 ; # 宓
-        :below    a.ucs:0x4E14   # 且
+        :below    a.ucs_component:0x4E14   # &A-compU+4E14;
     ] .
 ucs:0x2A9E1   # 𪧡
     :structure [ a idc:â¿° ;
@@ -5036,14 +5009,9 @@ ucs:0x2AA67   # 𪩧
 ucs:0x2AA68   # 𪩨
     :structure [ a idc:â¿° ;
         :left     [
-            :structure [ a idc:⿱ ;
-                :above    [
-                    :structure [ a idc:⿳ ;
-                        :above    a.ucs:0x2E88 ; # ⺈
-                        :middle   a.ucs:0x7F52 ; # 罒
-                        :below    a.ucs:0x5196   # 冖
-                    ]
-                ] ;
+            :structure [ a idc:⿳ ;
+                :above    rep.gt-k:03322 ; # &GT-K03322;
+                :middle   a.ucs:0x5196 ; # 冖
                 :below    a.ucs:0x5915   # 夕
             ]
         ] ;
@@ -6735,7 +6703,7 @@ ucs:0x2AB84   # 𪮄
         :right    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2E8A ; # ⺊
-                :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
+                :middle   rep.adobe-japan1-4:15391 ; # &AJ1-15391;
                 :below    a.ucs:0x5973   # 女
             ]
         ]
@@ -7371,7 +7339,7 @@ ucs:0x2ABF2   # 𪯲
     ] .
 ucs:0x2ABF3   # 𪯳
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x53C8   # 又
     ] .
 ucs:0x2ABF4   # 𪯴
@@ -7386,7 +7354,7 @@ ucs:0x2ABF5   # 𪯵
     ] .
 ucs:0x2ABF6   # 𪯶
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x5929   # 天
     ] .
 ucs:0x2ABF7   # 𪯷
@@ -7396,7 +7364,7 @@ ucs:0x2ABF7   # 𪯷
     ] .
 ucs:0x2ABF8   # 𪯸
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x767D   # 白
     ] .
 ucs:0x2ABF9   # 𪯹
@@ -7421,7 +7389,7 @@ ucs:0x2ABFC   # 𪯼
     ] .
 ucs:0x2ABFD   # 𪯽
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x250EB   # 𥃫
     ] .
 ucs:0x2ABFE   # 𪯾
@@ -7461,7 +7429,7 @@ ucs:0x2AC03   # 𪰃
     ] .
 ucs:0x2AC04   # 𪰄
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  [
             :structure [ a idc:â¿° ;
                 :left     a.ucs:0x65E5 ; # 日
@@ -7471,7 +7439,7 @@ ucs:0x2AC04   # 𪰄
     ] .
 ucs:0x2AC05   # 𪰅
     :structure [ a idc:⿸ ;
-        :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+        :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
         :filling  a.ucs:0x2659E   # 𦖞
     ] .
 ucs:0x2AC06   # 𪰆
@@ -7597,7 +7565,7 @@ ucs:0x2AC1D   # 𪰝
 ucs:0x2AC1E   # 𪰞
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x65E5 ; # 日
-        :below    a.ucs:0x200B9   # 𠂹
+        :below    a.gt-k:03433   # &A-GT-K03433;
     ] .
 ucs:0x2AC1F   # 𪰟
     :structure [ a idc:â¿° ;
@@ -8216,12 +8184,7 @@ ucs:0x2AC8C   # 𪲌
 ucs:0x2AC8D   # 𪲍
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4491 ; # 䒑
-                :below    a.ucs:0x5DFE   # å·¾
-            ]
-        ]
+        :right    rep.gt-k:02281   # &GT-K02281;
     ] .
 ucs:0x2AC8E   # 𪲎
     :structure [ a idc:â¿° ;
@@ -8247,7 +8210,7 @@ ucs:0x2AC91   # 𪲑
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:â¿° ;
-                :left     a.ucs:0x738B ; # 王
+                :left     a.ucs:0x248E9 ; # 𤣩
                 :right    a.ucs:0x961D   # 阝
             ]
         ] ;
@@ -8333,7 +8296,7 @@ ucs:0x2ACA0   # 𪲠
     :structure [ a idc:⿱ ;
         :above    [
             :structure [ a idc:â¿° ;
-                :left     a.ucs:0x738B ; # 王
+                :left     a.ucs:0x248E9 ; # 𤣩
                 :right    a.ucs:0x5205   # 刅
             ]
         ] ;
@@ -9936,12 +9899,7 @@ ucs:0x2ADB2   # 𪶲
 ucs:0x2ADB3   # 𪶳
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x514D ; # 免
-                :below    a.ucs:0x2E80   # ⺀
-            ]
-        ]
+        :right    a.ucs:0x2B94E   # 𫥎
     ] .
 ucs:0x2ADB4   # 𪶴
     :structure [ a idc:â¿° ;
@@ -10804,9 +10762,8 @@ ucs:0x2AE4B   # 𪹋
         :right    a.ucs:0x79B9   # 禹
     ] .
 ucs:0x2AE4C   # 𪹌
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x2E88 ; # ⺈
-        :middle   a.ucs:0x7F52 ; # 罒
+    :structure [ a idc:⿱ ;
+        :above    rep.gt-k:03322 ; # &GT-K03322;
         :below    a.ucs:0x7073   # 灳
     ] .
 ucs:0x2AE4D   # 𪹍
@@ -11209,7 +11166,7 @@ ucs:0x2AE8C   # 𪺌
 ucs:0x2AE8D   # 𪺍
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x722B ; # 爫
-        :below    rep.adobe-japan1:15391   # &AJ1-15391;
+        :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
     ] .
 ucs:0x2AE8E   # 𪺎
     :structure [ a idc:â¿° ;
@@ -11250,13 +11207,7 @@ ucs:0x2AE94   # 𪺔
 ucs:0x2AE95   # 𪺕
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x722B ; # 爫
-        :below    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x5E7A ; # 幺
-                :middle   a.ucs:0x5E7A ; # 幺
-                :right    a.ucs:0x5E7A   # 幺
-            ]
-        ]
+        :below    rep.ucs-itaiji-001:0x221C7   # &U-i001+221C7;
     ] .
 ucs:0x2AE96   # 𪺖
     :structure [ a idc:â¿° ;
@@ -11578,32 +11529,32 @@ ucs:0x2AECC   # 𪻌
     ] .
 ucs:0x2AECD   # 𪻍
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x53C8   # 又
     ] .
 ucs:0x2AECE   # 𪻎
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x52FB   # 勻
     ] .
 ucs:0x2AECF   # 𪻏
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x53CA   # 及
     ] .
 ucs:0x2AED0   # 𪻐
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4ECE   # 从
     ] .
 ucs:0x2AED1   # 𪻑
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4EA2   # 亢
     ] .
 ucs:0x2AED2   # 𪻒
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5FC3   # 心
     ] .
 ucs:0x2AED3   # 𪻓
@@ -11613,17 +11564,17 @@ ucs:0x2AED3   # 𪻓
     ] .
 ucs:0x2AED4   # 𪻔
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5198   # 冘
     ] .
 ucs:0x2AED5   # 𪻕
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x53E4   # 古
     ] .
 ucs:0x2AED6   # 𪻖
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x201A2 ; # 𠆢
@@ -11633,42 +11584,42 @@ ucs:0x2AED6   # 𪻖
     ] .
 ucs:0x2AED7   # 𪻗
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5736   # 圶
     ] .
 ucs:0x2AED8   # 𪻘
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4E98   # 亘
     ] .
 ucs:0x2AED9   # 𪻙
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5F0F   # 式
     ] .
 ucs:0x2AEDA   # 𪻚
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x827E   # 艾
     ] .
 ucs:0x2AEDB   # 𪻛
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x540C   # 同
     ] .
 ucs:0x2AEDC   # 𪻜
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4F11   # 休
     ] .
 ucs:0x2AEDD   # 𪻝
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5B87   # 宇
     ] .
 ucs:0x2AEDE   # 𪻞
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4EA5   # 亥
     ] .
 ucs:0x2AEDF   # 𪻟
@@ -11683,72 +11634,72 @@ ucs:0x2AEDF   # 𪻟
     ] .
 ucs:0x2AEE0   # 𪻠
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5F04   # 弄
     ] .
 ucs:0x2AEE1   # 𪻡
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8C46   # 豆
     ] .
 ucs:0x2AEE2   # 𪻢
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x6298   # 折
     ] .
 ucs:0x2AEE3   # 𪻣
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x518F   # 冏
     ] .
 ucs:0x2AEE4   # 𪻤
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5175   # 兵
     ] .
 ucs:0x2AEE5   # 𪻥
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x4EA8   # 亨
     ] .
 ucs:0x2AEE6   # 𪻦
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5948   # 奈
     ] .
 ucs:0x2AEE7   # 𪻧
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5774   # 坴
     ] .
 ucs:0x2AEE8   # 𪻨
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5356   # 卖
     ] .
 ucs:0x2AEE9   # 𪻩
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x6790   # 析
     ] .
 ucs:0x2AEEA   # 𪻪
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x660E   # 明
     ] .
 ucs:0x2AEEB   # 𪻫
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7F54   # 罔
     ] .
 ucs:0x2AEEC   # 𪻬
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5CB3   # å²³
     ] .
 ucs:0x2AEED   # 𪻭
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5196 ; # 冖
@@ -11757,14 +11708,13 @@ ucs:0x2AEED   # 𪻭
         ]
     ] .
 ucs:0x2AEEE   # 𪻮
-    :structure [ a idc:⿲ ;
-        :left     a.ucs:0x738B ; # 王
-        :middle   a.ucs:0x706B ; # 火
-        :right    a.ucs:0x738B   # 王
+    :structure [ a idc:â¿´ ;
+        :surround a.ucs:0x73A8 ; # 玨
+        :filling  a.ucs:0x706B   # 火
     ] .
 ucs:0x2AEEF   # 𪻯
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x653E   # 放
     ] .
 ucs:0x2AEF0   # 𪻰
@@ -11774,17 +11724,17 @@ ucs:0x2AEF0   # 𪻰
     ] .
 ucs:0x2AEF1   # 𪻱
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x51FD   # 函
     ] .
 ucs:0x2AEF2   # 𪻲
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8D2F   # è´¯
     ] .
 ucs:0x2AEF3   # 𪻳
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5357   # 南
     ] .
 ucs:0x2AEF4   # 𪻴
@@ -11794,22 +11744,22 @@ ucs:0x2AEF4   # 𪻴
     ] .
 ucs:0x2AEF5   # 𪻵
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5398   # 厘
     ] .
 ucs:0x2AEF6   # 𪻶
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x539A   # 厚
     ] .
 ucs:0x2AEF7   # 𪻷
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x82E5   # 若
     ] .
 ucs:0x2AEF8   # 𪻸
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x82DB   # 苛
     ] .
 ucs:0x2AEF9   # 𪻹
@@ -11819,32 +11769,32 @@ ucs:0x2AEF9   # 𪻹
     ] .
 ucs:0x2AEFA   # 𪻺
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8D35   # è´µ
     ] .
 ucs:0x2AEFB   # 𪻻
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7701   # 省
     ] .
 ucs:0x2AEFC   # 𪻼
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x23429   # 𣐩
     ] .
 ucs:0x2AEFD   # 𪻽
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5BA2   # 客
     ] .
 ucs:0x2AEFE   # 𪻾
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5F65   # å½¥
     ] .
 ucs:0x2AEFF   # 𪻿
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5EA6   # 度
     ] .
 ucs:0x2AF00   # 𪼀
@@ -11854,7 +11804,7 @@ ucs:0x2AF00   # 𪼀
     ] .
 ucs:0x2AF01   # 𪼁
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5955   # 奕
     ] .
 ucs:0x2AF02   # 𪼂
@@ -11864,12 +11814,12 @@ ucs:0x2AF02   # 𪼂
     ] .
 ucs:0x2AF03   # 𪼃
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x6CF0   # æ³°
     ] .
 ucs:0x2AF04   # 𪼄
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8881   # 袁
     ] .
 ucs:0x2AF05   # 𪼅
@@ -11884,12 +11834,12 @@ ucs:0x2AF05   # 𪼅
     ] .
 ucs:0x2AF06   # 𪼆
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x539F   # 原
     ] .
 ucs:0x2AF07   # 𪼇
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5CEF   # 峯
     ] .
 ucs:0x2AF08   # 𪼈
@@ -11904,22 +11854,22 @@ ucs:0x2AF09   # 𪼉
     ] .
 ucs:0x2AF0A   # 𪼊
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5F92   # 徒
     ] .
 ucs:0x2AF0B   # 𪼋
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7B14   # 笔
     ] .
 ucs:0x2AF0C   # 𪼌
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x96BB   # 隻
     ] .
 ucs:0x2AF0D   # 𪼍
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x7A74 ; # ç©´
@@ -11929,37 +11879,37 @@ ucs:0x2AF0D   # 𪼍
     ] .
 ucs:0x2AF0E   # 𪼎
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7F97   # 羗
     ] .
 ucs:0x2AF0F   # 𪼏
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x6851   # 桑
     ] .
 ucs:0x2AF10   # 𪼐
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x723D   # 爽
     ] .
 ucs:0x2AF11   # 𪼑
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5805   # 堅
     ] .
 ucs:0x2AF12   # 𪼒
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x839E   # 莞
     ] .
 ucs:0x2AF13   # 𪼓
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x570B   # 國
     ] .
 ucs:0x2AF14   # 𪼔
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x4EBC ; # 亼
@@ -11969,12 +11919,12 @@ ucs:0x2AF14   # 𪼔
     ] .
 ucs:0x2AF15   # 𪼕
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x65CF   # 族
     ] .
 ucs:0x2AF16   # 𪼖
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5B80 ; # 宀
@@ -11984,12 +11934,12 @@ ucs:0x2AF16   # 𪼖
     ] .
 ucs:0x2AF17   # 𪼗
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x96EF   # 雯
     ] .
 ucs:0x2AF18   # 𪼘
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x2B1E6 ; # 𫇦
@@ -11999,82 +11949,82 @@ ucs:0x2AF18   # 𪼘
     ] .
 ucs:0x2AF19   # 𪼙
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x958F   # 閏
     ] .
 ucs:0x2AF1A   # 𪼚
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5195   # 冕
     ] .
 ucs:0x2AF1B   # 𪼛
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x96C6   # 集
     ] .
 ucs:0x2AF1C   # 𪼜
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7FD5   # 翕
     ] .
 ucs:0x2AF1D   # 𪼝
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5C31   # å°±
     ] .
 ucs:0x2AF1E   # 𪼞
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x6220   # 戠
     ] .
 ucs:0x2AF1F   # 𪼟
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7280   # 犀
     ] .
 ucs:0x2AF20   # 𪼠
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x767C   # 發
     ] .
 ucs:0x2AF21   # 𪼡
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x757A   # 畺
     ] .
 ucs:0x2AF22   # 𪼢
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x776A   # 睪
     ] .
 ucs:0x2AF23   # 𪼣
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5967   # 奧
     ] .
 ucs:0x2AF24   # 𪼤
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8A79   # 詹
     ] .
 ucs:0x2AF25   # 𪼥
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5EC9   # 廉
     ] .
 ucs:0x2AF26   # 𪼦
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x610F   # 意
     ] .
 ucs:0x2AF27   # 𪼧
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x84BC   # 蒼
     ] .
 ucs:0x2AF28   # 𪼨
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x5B80 ; # 宀
@@ -12090,17 +12040,17 @@ ucs:0x2AF28   # 𪼨
     ] .
 ucs:0x2AF29   # 𪼩
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x596D   # 奭
     ] .
 ucs:0x2AF2A   # 𪼪
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x78D0   # 磐
     ] .
 ucs:0x2AF2B   # 𪼫
     :structure [ a idc:⿲ ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :middle   [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x4491 ; # 䒑
@@ -12112,17 +12062,17 @@ ucs:0x2AF2B   # 𪼫
     ] .
 ucs:0x2AF2C   # 𪼬
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x9716   # 霖
     ] .
 ucs:0x2AF2D   # 𪼭
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x61B2   # 憲
     ] .
 ucs:0x2AF2E   # 𪼮
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x5BF0   # 寰
     ] .
 ucs:0x2AF2F   # 𪼯
@@ -12132,17 +12082,17 @@ ucs:0x2AF2F   # 𪼯
     ] .
 ucs:0x2AF30   # 𪼰
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x64E7   # 擧
     ] .
 ucs:0x2AF31   # 𪼱
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x8D07   # 贇
     ] .
 ucs:0x2AF32   # 𪼲
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x9EE8   # 黨
     ] .
 ucs:0x2AF33   # 𪼳
@@ -12261,10 +12211,9 @@ ucs:0x2AF48   # 𪽈
         :right    a.ucs:0x200D3   # 𠃓
     ] .
 ucs:0x2AF49   # 𪽉
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    a.ucs:0x7531 ; # 由
-        :middle   a.ucs:0x4E00 ; # 一
-        :below    rep.big5-cdp:0x8CC6   # &CDP-8CC6;
+        :below    rep.ucs-itaiji-001:0x5140   # &U-i001+5140;
     ] .
 ucs:0x2AF4A   # 𪽊
     :structure [ a idc:â¿° ;
@@ -13087,7 +13036,7 @@ ucs:0x2AFDC   # 𪿜
     ] .
 ucs:0x2AFDD   # 𪿝
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5174 ; # 兴
+        :above    rep.gt-k:02290 ; # &GT-K02290;
         :below    a.ucs:0x77F3   # 石
     ] .
 ucs:0x2AFDE   # 𪿞
@@ -14668,10 +14617,14 @@ ucs:0x2B0F0   # 𫃰
         :right    a.ucs:0x53C1   # 叁
     ] .
 ucs:0x2B0F1   # 𫃱
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x7CF9 ; # ç³¹
-        :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
-        :below    a.ucs:0x23C73   # 𣱳
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7CF8 ; # 糸
+        :right    [
+            :structure [ a idc:⿱ ;
+                :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+                :below    a.ucs:0x23C73   # 𣱳
+            ]
+        ]
     ] .
 ucs:0x2B0F2   # 𫃲
     :structure [ a idc:â¿° ;
@@ -15065,10 +15018,9 @@ ucs:0x2B13C   # 𫄼
         :right    a.ucs:0x67D0   # 某
     ] .
 ucs:0x2B13D   # 𫄽
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x2EBB ; # ⺻
-        :middle   a.ucs:0x706C ; # 灬
-        :below    a.ucs:0x7F36   # 缶
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2DD18 ; # 𭴘
+        :below    a.ucs_iwds-1:0x7F36   # &A-IWDSU+7F36;
     ] .
 ucs:0x2B13E   # 𫄾
     :structure [ a idc:â¿° ;
@@ -15503,12 +15455,7 @@ ucs:0x2B191   # 𫆑
 ucs:0x2B192   # 𫆒
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x8033 ; # 耳
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x7A74 ; # ç©´
-                :below    a.ucs:0x5FFD   # 忽
-            ]
-        ]
+        :right    rep.cbeta:08728   # &CB08728;
     ] .
 ucs:0x2B193   # 𫆓
     :structure [ a idc:â¿° ;
@@ -15572,13 +15519,8 @@ ucs:0x2B19D   # 𫆝
     ] .
 ucs:0x2B19E   # 𫆞
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x6708 ; # 月
-        :right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :below    a.ucs:0x5DE5   # å·¥
-            ]
-        ]
+        :left     a.ucs_component:0x6708 ; # &A-compU+6708;
+        :right    rep.gt-k:02100   # &GT-K02100;
     ] .
 ucs:0x2B19F   # 𫆟
     :structure [ a idc:â¿° ;
@@ -16357,7 +16299,7 @@ ucs:0x2B226   # 𫈦
 ucs:0x2B227   # 𫈧
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x8279 ; # 艹
-        :middle   a.ucs:0x65E5 ; # 日
+        :middle   a.ucs_component:0x65E5 ; # &A-compU+65E5;
         :below    a.ucs:0x79B8   # 禸
     ] .
 ucs:0x2B228   # 𫈨
@@ -16620,12 +16562,7 @@ ucs:0x2B252   # 𫉒
     ] .
 ucs:0x2B253   # 𫉓
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4491 ; # 䒑
-                :below    a.ucs:0x5DFE   # å·¾
-            ]
-        ] ;
+        :left     rep.gt-k:02281 ; # &GT-K02281;
         :right    a.ucs:0x6771   # 東
     ] .
 ucs:0x2B254   # 𫉔
@@ -16733,7 +16670,7 @@ ucs:0x2B266   # 𫉦
         :above    a.ucs:0x8279 ; # 艹
         :below    [
             :structure [ a idc:â¿° ;
-                :left     a.ucs:0x738B ; # 王
+                :left     a.ucs:0x248E9 ; # 𤣩
                 :right    a.ucs:0x6542   # 敂
             ]
         ]
@@ -17096,7 +17033,7 @@ ucs:0x2B29E   # 𫊞
 ucs:0x2B29F   # 𫊟
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x864D ; # 虍
-        :filling  a.ucs:0x58EC   # 壬
+        :filling  a.ucs_component:0x58EC   # &A-compU+58EC;
     ] .
 ucs:0x2B2A0   # 𫊠
     :structure [ a idc:⿺ ;
@@ -17357,10 +17294,9 @@ ucs:0x2B2D1   # 𫋑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x866B ; # 虫
         :right    [
-            :structure [ a idc:⿲ ;
-                :left     a.ucs:0x738B ; # 王
-                :middle   a.ucs:0x3405 ; # 㐅
-                :right    a.ucs:0x738B   # 王
+            :structure [ a idc:â¿´ ;
+                :surround a.ucs:0x73A8 ; # 玨
+                :filling  a.ucs:0x3405   # 㐅
             ]
         ]
     ] .
@@ -18122,7 +18058,7 @@ ucs:0x2B35C   # 𫍜
 ucs:0x2B35D   # 𫍝
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x8BA0 ; # è® 
-        :right    rep.big5-cdp:0x89BA   # &CDP-89BA;
+        :right    a.ucs:0x2B823   # ð« £
     ] .
 ucs:0x2B35E   # 𫍞
     :structure [ a idc:â¿° ;
@@ -18860,13 +18796,7 @@ ucs:0x2B3E5   # 𫏥
 ucs:0x2B3E6   # 𫏦
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x27FB7 ; # 𧾷
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x56DA ; # 囚
-                :below    a.ucs:0x200A1   # 𠂡
-            ]
-        ]
+        :right    rep.ucs-itaiji-007:0x22002   # &U-i007+22002;
     ] .
 ucs:0x2B3E7   # 𫏧
     :structure [ a idc:â¿° ;
@@ -19458,7 +19388,7 @@ ucs:0x2B449   # 𫑉
         :surround a.ucs:0x8FB6 ; # 辶
         :filling  [
             :structure [ a idc:⿸ ;
-                :surround rep.ucs-itaiji-001:0x3AC3 ; # &CB12073;
+                :surround rep.ucs-itaiji-001:0x3AC3 ; # &U-i001+3AC3;
                 :filling  a.ucs:0x540C   # 同
             ]
         ]
@@ -19989,7 +19919,7 @@ ucs:0x2B4A0   # 𫒠
 ucs:0x2B4A1   # 𫒡
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x91D1 ; # 金
-        :right    rep.big5-cdp:0x8DA6   # &CDP-8DA6;
+        :right    a.ucs:0x2DEFE   # ð­»¾
     ] .
 ucs:0x2B4A2   # 𫒢
     :structure [ a idc:â¿° ;
@@ -20488,7 +20418,7 @@ ucs:0x2B4F6   # 𫓶
 ucs:0x2B4F7   # 𫓷
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x9485 ; # 钅
-        :right    rep.big5-cdp:0x8DA6   # &CDP-8DA6;
+        :right    a.ucs:0x2DEFE   # ð­»¾
     ] .
 ucs:0x2B4F8   # 𫓸
     :structure [ a idc:â¿° ;
@@ -21260,8 +21190,9 @@ ucs:0x2B583   # 𫖃
         :right    a.ucs:0x8D35   # è´µ
     ] .
 ucs:0x2B584   # 𫖄
-    :structure [ a idc:â¿° ;
-        :left     a.ucs:0x5047 ; # 假
+    :structure [ a idc:⿲ ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :middle   a.ucs:0x2C1A3 ; # 𬆣
         :right    a.ucs:0x9762   # 面
     ] .
 ucs:0x2B585   # 𫖅
@@ -21271,13 +21202,7 @@ ucs:0x2B585   # 𫖅
     ] .
 ucs:0x2B586   # 𫖆
     :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5EFF ; # 廿
-                :middle   a.ucs:0x53E3 ; # 口
-                :below    a.ucs:0x5341   # 十
-            ]
-        ] ;
+        :left     rep.ucs-itaiji-001:0x2E9D3 ; # &U-i001+2E9D3;
         :right    a.ucs:0x53EA   # 只
     ] .
 ucs:0x2B587   # 𫖇
@@ -22545,13 +22470,7 @@ ucs:0x2B66C   # 𫙬
 ucs:0x2B66D   # 𫙭
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x29D4B ; # 𩵋
-        :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x514D ; # 免
-                :middle   a.ucs:0x4E36 ; # 丶
-                :below    a.ucs:0x4E36   # 丶
-            ]
-        ]
+        :right    a.ucs:0x2B94E   # 𫥎
     ] .
 ucs:0x2B66E   # 𫙮
     :structure [ a idc:â¿° ;
@@ -22693,9 +22612,8 @@ ucs:0x2B685   # 𫚅
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x9B5A ; # 魚
         :right    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5DDB ; # 巛
-                :middle   a.ucs:0x7F53 ; # 罓
+            :structure [ a idc:⿱ ;
+                :above    a.ucs-itaiji-006:0x21FFA ; # &A-U-i006+21FFA;
                 :below    a.ucs:0x73E7   # 珧
             ]
         ]