X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ISD-MJ-1.ttl;h=9a37a850d999daaa710aefd4e5d61c38870b7c09;hb=9c7c300803909229c2b623451286bf73df1dfae7;hp=51aba372615fec005ba1d94e187becf4776053ef;hpb=5f930a11e74f9866581b613695ee303ec4f12c3f;p=chise%2Fisd.git

diff --git a/ISD-MJ-1.ttl b/ISD-MJ-1.ttl
index 51aba37..9a37a85 100644
--- a/ISD-MJ-1.ttl
+++ b/ISD-MJ-1.ttl
@@ -2,30 +2,39 @@
 @prefix : <http://rdf.chise.org/rdf/property/character/isd/> .
 @prefix idc: <http://rdf.chise.org/rdf/type/character/idc/> .
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
+@prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
+@prefix o.ucs_jis: <http://www.chise.org/est/view/character/o.ucs@jis=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
 @prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
+@prefix g.ucs_cns: <http://www.chise.org/est/view/character/g.ucs@cns=> .
 @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-2: <http://www.chise.org/est/view/character/rep.adobe-japan1-2=> .
+@prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
+@prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
+@prefix rep.adobe-japan1-6: <http://www.chise.org/est/view/character/rep.adobe-japan1-6=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
 @prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
-@prefix a.jis-x0208: <http://www.chise.org/est/view/character/a.jis-x0208=> .
 @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=> .
 @prefix rep.cns11643-3: <http://www.chise.org/est/view/character/rep.cns11643-3=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
 @prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
-@prefix rep.big5: <http://www.chise.org/est/view/character/rep.big5=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
-@prefix rep.hanyo-denshi...jt: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jt=> .
+@prefix rep.hanyo-denshi...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
 @prefix rep.hanyo-denshi...tk: <http://www.chise.org/est/view/character/rep.hanyo-denshi...tk=> .
+@prefix o.hanyo-denshi...jt: <http://www.chise.org/est/view/character/o.hanyo-denshi...jt=> .
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix rep.gt-k: <http://www.chise.org/est/view/character/rep.gt-k=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
+@prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix rep.big5-cdp-itaiji-001: <http://www.chise.org/est/view/character/rep.big5-cdp-itaiji-001=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
-@prefix rep.ucs-sip-var-003: <http://www.chise.org/est/view/character/rep.ucs-sip-var-003=> .
+@prefix rep.ucs-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
+@prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
+@prefix rep.ucs-itaiji-006: <http://www.chise.org/est/view/character/rep.ucs-itaiji-006=> .
 
 rep.mj:010019   # &MJ010019;
     :structure [ a idc:⿵ ;
@@ -55,7 +64,7 @@ rep.mj:010072   # &MJ010072;
 rep.mj:010073   # &MJ010073;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5B50 ; # 子
-        :right    rep.adobe-japan1:01245   # &AJ1-01245;
+        :right    rep.adobe-japan1-0:01245   # &AJ1-01245;
     ] .
 rep.mj:010077   # å­©
     :structure [ a idc:â¿° ;
@@ -105,7 +114,7 @@ rep.mj:010230   # &MJ010230;
 rep.mj:010248   # &MJ010248;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5B80 ; # 宀
-        :below    rep.adobe-japan1:03966   # &AJ1-03966;
+        :below    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:010260   # 寿
     :structure [ a idc:â¿» ;
@@ -115,7 +124,7 @@ rep.mj:010260   # 寿
 rep.mj:010271   # &MJ010271;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x723F ; # 爿
-        :right    rep.big5-cdp:0x8BC3   # &CDP-8BC3;
+        :right    rep.gt:09333   # &GT-09333;
     ] .
 rep.mj:010275   # &MJ010275;
     :structure [ a idc:⿱ ;
@@ -129,7 +138,7 @@ rep.mj:010276   # &MJ010276;
     ] .
 rep.mj:010279   # &MJ010279;
     :structure [ a idc:⿳ ;
-        :above    rep.big5-cdp:0x897C ; # &CDP-897C;
+        :above    rep.gb2312:0x6566 ; # &G0-6566;
         :middle   rep.big5-cdp:0x8CFA ; # &CDP-8CFA;
         :below    a.ucs:0x5BF8   # 寸
     ] .
@@ -170,18 +179,18 @@ rep.mj:010769   # &MJ010769;
     ] .
 rep.mj:010789   # &MJ010789;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01694 ; # &AJ1-01694;
+        :above    rep.adobe-japan1-0:01694 ; # &AJ1-01694;
         :below    a.ucs:0x5DF3   # å·³
     ] .
 rep.mj:010790   # &MJ010790;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:01694 ; # &AJ1-01694;
+        :above    rep.adobe-japan1-0:01694 ; # &AJ1-01694;
         :below    a.ucs:0x5DF1   # å·±
     ] .
 rep.mj:010798   # &MJ010798;
-    :structure [ a idc:â¿° ;
-        :left     rep.gt-k:01769 ; # &GT-K01769;
-        :right    a.ucs:0x5DF1   # å·±
+    :structure [ a idc:⿱ ;
+        :above    rep.gt-k:01769 ; # &GT-K01769;
+        :below    a.ucs:0x5DF1   # å·±
     ] .
 rep.mj:010799   # &MJ010799;
     :structure [ a idc:⿱ ;
@@ -190,28 +199,29 @@ rep.mj:010799   # &MJ010799;
     ] .
 rep.mj:010800   # &MJ010800;
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5DF3 ; # å·³
-                :right    a.ucs:0x5DF3   # å·³
-            ]
-        ] ;
-        :below    rep.adobe-japan1:01694   # &AJ1-01694;
+        :above    rep.ucs-itaiji-002:0x5DF3 ; # &U-i002+5DF3;
+        :below    rep.adobe-japan1-0:01694   # &AJ1-01694;
     ] .
 rep.mj:010801   # &MJ010801;
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5DF1 ; # å·±
-                :right    a.ucs:0x5DF1   # å·±
-            ]
-        ] ;
-        :below    rep.adobe-japan1:01694   # &AJ1-01694;
+        :above    rep.gt-k:01869 ; # &GT-K01869;
+        :below    rep.adobe-japan1-0:01694   # &AJ1-01694;
+    ] .
+rep.mj:010874   # &MJ010874;
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x5196 ; # 冖
+        :middle   a.ucs:0x5183 ; # 冃
+        :below    a.ucs:0x2BBDC   # 𫯜
+    ] .
+rep.mj:010875   # &MJ010875;
+    :structure [ a idc:⿱ ;
+        :above    rep.ucs_iso:0x20587 ; # &U-00020587;
+        :below    a.ucs:0x5DFE   # å·¾
     ] .
 rep.mj:010888   # &MJ010888;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5DFE ; # å·¾
-        :right    rep.adobe-japan1:19722   # &AJ1-19722;
+        :right    rep.adobe-japan1-5:19722   # &AJ1-19722;
     ] .
 rep.mj:010897   # &MJ010897;
     :structure [ a idc:⿱ ;
@@ -248,6 +258,11 @@ rep.mj:011018   # &MJ011018;
         :surround a.ucs:0x5E7F ; # 广
         :filling  rep.ucs_iso:0x2C3BE   # &CDP-8DCB;
     ] .
+rep.mj:011023   # &MJ011023;
+    :structure [ a idc:⿸ ;
+        :surround rep.ucs-itaiji-006:0x77F3 ; # &U-i006+77F3;
+        :filling  a.ucs:0x4ECE   # 从
+    ] .
 rep.mj:011039   # &MJ011039;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5E7F ; # 广
@@ -280,14 +295,24 @@ rep.mj:011104   # &MJ011104;
     ] .
 rep.mj:011220   # &MJ011220;
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:01655 ; # &AJ1-01655;
+        :left     a.ucs:0x5F13 ; # 弓
         :right    rep.mj:058020   # &MJ058020;
     ] .
 rep.mj:011233   # &MJ011233;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5F51 ; # 彑
+        :above    rep.adobe-japan1-0:04779 ; # &AJ1-04779;
+        :below    a.ucs:0x27C28   # 𧰨
+    ] .
+rep.mj:011234   # &MJ011234;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-4:14521 ; # &AJ1-14521;
         :below    a.ucs:0x27C28   # 𧰨
     ] .
+rep.mj:011235   # &MJ011235;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5F51 ; # 彑
+        :below    g.ucs_cns:0x27C28   # &G-CDP-8BC9;
+    ] .
 rep.mj:011236   # &MJ011236;
     :structure [ a idc:⿱ ;
         :above    [
@@ -296,7 +321,7 @@ rep.mj:011236   # &MJ011236;
                 :right    a.ucs:0x4E30   # 丰
             ]
         ] ;
-        :below    rep.adobe-japan1:15391   # &AJ1-15391;
+        :below    rep.adobe-japan1-4:15391   # &AJ1-15391;
     ] .
 rep.mj:011289   # 往
     :structure [ a idc:â¿° ;
@@ -382,7 +407,7 @@ rep.mj:011379   # 忍
     ] .
 rep.mj:011380   # &MJ011380;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:04250 ; # &AJ1-04250;
+        :above    rep.adobe-japan1-0:04250 ; # &AJ1-04250;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011393   # &MJ011393;
@@ -396,19 +421,18 @@ rep.mj:011395   # &MJ011395;
         :right    rep.mj:006463   # &MJ006463;
     ] .
 rep.mj:011472   # &MJ011472;
-    :structure [ a idc:⿳ ;
-        :above    rep.big5-cdp:0x8B5B ; # &CDP-8B5B;
-        :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
+    :structure [ a idc:⿱ ;
+        :above    rep.ucs-var-001:0x520D ; # &U-v001+520D;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011473   # &MJ011473;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x520D ; # 刍
+        :above    rep.gb2312:0x5B3B ; # &G0-5B3B;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011537   # &MJ011537;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E96 ; # ⺖
+        :left     a.ucs:0x5FC4 ; # 忄
         :right    a.ucs:0x7070   # 灰
     ] .
 rep.mj:011538   # &MJ011538;
@@ -453,7 +477,7 @@ rep.mj:011681   # &MJ011681;
     ] .
 rep.mj:011682   # &MJ011682;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17339 ; # &AJ1-17339;
+        :above    rep.adobe-japan1-5:17339 ; # &AJ1-17339;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011704   # &MJ011704;
@@ -468,7 +492,7 @@ rep.mj:011705   # &MJ011705;
     ] .
 rep.mj:011721   # &MJ011721;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:04216 ; # &AJ1-04216;
+        :above    rep.adobe-japan1-0:04216 ; # &AJ1-04216;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011722   # &MJ011722;
@@ -509,13 +533,13 @@ rep.mj:011781   # &MJ011781;
     ] .
 rep.mj:011782   # &MJ011782;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E96 ; # ⺖
+        :left     a.ucs:0x5FC4 ; # 忄
         :right    rep.gt:40452   # &GT-40452;
     ] .
 rep.mj:011788   # &MJ011788;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:17537   # &AJ1-17537;
+        :right    rep.adobe-japan1-5:17537   # &AJ1-17537;
     ] .
 rep.mj:011790   # &MJ011790;
     :structure [ a idc:â¿° ;
@@ -527,10 +551,20 @@ rep.mj:011802   # &MJ011802;
         :above    a.ucs:0x5179 ; # 兹
         :below    a.ucs:0x5FC3   # 心
     ] .
+rep.mj:011803   # 慈
+    :structure [ a idc:⿱ ;
+        :above    rep.cns11643-1:0x577B ; # &C1-577B;
+        :below    a.ucs:0x5FC3   # 心
+    ] .
+rep.mj:011804   # &MJ011804;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7386 ; # 玆
+        :below    a.ucs:0x5FC3   # 心
+    ] .
 rep.mj:011807   # &MJ011807;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.gt:01936   # &GT-01936;
+        :right    rep.mj:056985   # &MJ056985;
     ] .
 rep.mj:011808   # &MJ011808;
     :structure [ a idc:â¿° ;
@@ -544,18 +578,18 @@ rep.mj:011810   # &MJ011810;
     ] .
 rep.mj:011812   # &MJ011812;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E96 ; # ⺖
-        :right    a.jis-x0208:0x3953   # &o-J0-3953;
+        :left     a.ucs:0x5FC4 ; # 忄
+        :right    o.ucs_unicode:0x8352   # &o-J0-3953;
     ] .
 rep.mj:011821   # &MJ011821;
     :structure [ a idc:⿱ ;
         :above    rep.mj:022034 ; # &MJ022034;
-        :below    rep.adobe-japan1:13852   # &AJ1-13852;
+        :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
     ] .
 rep.mj:011822   # &MJ011822;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x83AB ; # 莫
-        :below    rep.adobe-japan1:13852   # &AJ1-13852;
+        :above    rep.cns11643-1:0x5C7B ; # &C1-5C7B;
+        :below    rep.adobe-japan1-4:13852   # &AJ1-13852;
     ] .
 rep.mj:011831   # &MJ011831;
     :structure [ a idc:⿱ ;
@@ -590,7 +624,7 @@ rep.mj:011847   # &MJ011847;
                 :right    rep.cns11643-1:0x4464   # &C1-4464;
             ]
         ] ;
-        :middle   rep.adobe-japan1:15391 ; # &AJ1-15391;
+        :middle   rep.adobe-japan1-4:15391 ; # &AJ1-15391;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011848   # &MJ011848;
@@ -611,12 +645,12 @@ rep.mj:011848   # &MJ011848;
 rep.mj:011849   # &MJ011849;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:01591   # &AJ1-01591;
+        :right    rep.adobe-japan1-0:01591   # &AJ1-01591;
     ] .
 rep.mj:011853   # &MJ011853;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:13701   # &AJ1-13701;
+        :right    rep.adobe-japan1-4:13701   # &AJ1-13701;
     ] .
 rep.mj:011872   # &MJ011872;
     :structure [ a idc:â¿´ ;
@@ -663,12 +697,12 @@ rep.mj:011891   # &MJ011891;
 rep.mj:011907   # 憐
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:18321   # &AJ1-18321;
+        :right    rep.adobe-japan1-5:18321   # &AJ1-18321;
     ] .
 rep.mj:011930   # &MJ011930;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:06765   # &AJ1-06765;
+        :right    rep.adobe-japan1-0:06765   # &AJ1-06765;
     ] .
 rep.mj:011935   # 憧
     :structure [ a idc:â¿° ;
@@ -677,7 +711,7 @@ rep.mj:011935   # 憧
     ] .
 rep.mj:011948   # &MJ011948;
     :structure [ a idc:⿱ ;
-        :above    rep.ucs-sip-var-003:0x21A5C ; # &U-v003+21A5C;
+        :above    rep.ucs-var-003:0x21A5C ; # &U-v003+21A5C;
         :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:011949   # &MJ011949;
@@ -712,7 +746,7 @@ rep.mj:011991   # &MJ011991;
     ] .
 rep.mj:011992   # &MJ011992;
     :structure [ a idc:⿸ ;
-        :surround rep.adobe-japan1:01280 ; # &AJ1-01280;
+        :surround rep.adobe-japan1-0:01280 ; # &AJ1-01280;
         :filling  a.ucs:0x5FC3   # 心
     ] .
 rep.mj:012032   # 懶
@@ -723,7 +757,7 @@ rep.mj:012032   # 懶
 rep.mj:012033   # &MJ012033;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5FC4 ; # 忄
-        :right    rep.adobe-japan1:08627   # &AJ1-08627;
+        :right    rep.adobe-japan1-2:08627   # &AJ1-08627;
     ] .
 rep.mj:012041   # &MJ012041;
     :structure [ a idc:â¿° ;
@@ -732,13 +766,13 @@ rep.mj:012041   # &MJ012041;
     ] .
 rep.mj:012042   # &MJ012042;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E96 ; # ⺖
+        :left     a.ucs:0x5FC4 ; # 忄
         :right    rep.jis-x0212:0x6676   # &HD-JB-6676;
     ] .
 rep.mj:012045   # &MJ012045;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x58F9 ; # 壹
-        :right    rep.adobe-japan1:04830   # &AJ1-04830;
+        :right    rep.adobe-japan1-0:04830   # &AJ1-04830;
     ] .
 rep.mj:012046   # &MJ012046;
     :structure [ a idc:â¿° ;
@@ -747,12 +781,12 @@ rep.mj:012046   # &MJ012046;
     ] .
 rep.mj:012096   # &MJ012096;
     :structure [ a idc:â¿° ;
-        :left     rep.jis-x0213-2:0x747B ; # &JX2-747B;
+        :left     rep.adobe-japan1-5:18400 ; # &AJ1-18400;
         :right    a.ucs:0x6208   # 戈
     ] .
 rep.mj:012112   # &MJ012112;
     :structure [ a idc:⿸ ;
-        :surround a.ucs:0x6238 ; # 戸
+        :surround o.ucs_jis:0x6238 ; # &o-J0-384D;
         :filling  a.ucs:0x5927   # 大
     ] .
 rep.mj:012121   # &MJ012121;
@@ -762,7 +796,7 @@ rep.mj:012121   # &MJ012121;
     ] .
 rep.mj:012122   # &MJ012122;
     :structure [ a idc:⿸ ;
-        :surround a.ucs:0x6238 ; # 戸
+        :surround o.ucs_jis:0x6238 ; # &o-J0-384D;
         :filling  a.ucs:0x20541   # 𠕁
     ] .
 rep.mj:012599   # &MJ012599;
@@ -802,12 +836,12 @@ rep.mj:013007   # &MJ013007;
     ] .
 rep.mj:013021   # &MJ013021;
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:17729 ; # &AJ1-17729;
+        :left     rep.adobe-japan1-5:17729 ; # &AJ1-17729;
         :right    a.ucs:0x6535   # 攵
     ] .
 rep.mj:013022   # &MJ013022;
     :structure [ a idc:â¿° ;
-        :left     rep.hanyo-denshi...jt:0xB274 ; # &HD-JT-B274;
+        :left     o.hanyo-denshi...jt:0xB274 ; # &HD-JT-B274;
         :right    a.ucs:0x6535   # 攵
     ] .
 rep.mj:013026   # &MJ013026;
@@ -822,7 +856,7 @@ rep.mj:013027   # &MJ013027;
     ] .
 rep.mj:013034   # &MJ013034;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:05070 ; # &AJ1-05070;
+        :above    rep.adobe-japan1-0:05070 ; # &AJ1-05070;
         :below    a.ucs:0x6B7B   # æ­»
     ] .
 rep.mj:013036   # &MJ013036;
@@ -838,13 +872,18 @@ rep.mj:013097   # &MJ013097;
 rep.mj:013317   # &MJ013317;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x65E5 ; # 日
-        :below    rep.adobe-japan1:04352   # &AJ1-04352;
+        :below    rep.adobe-japan1-0:04352   # &AJ1-04352;
     ] .
 rep.mj:013318   # &MJ013318;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x65E5 ; # 日
         :below    rep.gb2312:0x3E4C   # &G0-3E4C;
     ] .
+rep.mj:013381   # 暬
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x57F6 ; # 埶
+        :below    a.ucs:0x65E5   # 日
+    ] .
 rep.mj:013488   # &MJ013488;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x66F0 ; # 曰
@@ -876,10 +915,9 @@ rep.mj:013499   # &MJ013499;
         :below    a.ucs:0x53C8   # 又
     ] .
 rep.mj:013501   # &MJ013501;
-    :structure [ a idc:⿳ ;
+    :structure [ a idc:⿱ ;
         :above    a.ucs:0x516B ; # 八
-        :middle   rep.big5-cdp:0x8B62 ; # &CDP-8B62;
-        :below    a.ucs:0x65E5   # 日
+        :below    rep.big5-cdp:0x8B63   # &CDP-8B63;
     ] .
 rep.mj:013502   # &MJ013502;
     :structure [ a idc:⿱ ;
@@ -888,7 +926,7 @@ rep.mj:013502   # &MJ013502;
     ] .
 rep.mj:013505   # &MJ013505;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8A78 ; # &CDP-8A78;
+        :above    a.ucs:0x2E9C ; # ⺜
         :below    a.ucs:0x53D6   # 取
     ] .
 rep.mj:013506   # &MJ013506;
@@ -896,14 +934,14 @@ rep.mj:013506   # &MJ013506;
         :above    a.ucs:0x65E5 ; # 日
         :below    a.ucs:0x53D6   # 取
     ] .
+rep.mj:013507   # &MJ013507;
+    :structure [ a idc:⿱ ;
+        :above    g2.daikanwa:01367 ; # &g2-M-01367;
+        :below    a.ucs:0x66F0   # 曰
+    ] .
 rep.mj:013508   # &MJ013508;
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x65E1 ; # 旡
-                :right    a.ucs:0x65E1   # 旡
-            ]
-        ] ;
+        :above    rep.adobe-japan1-6:21179 ; # &AJ1-21179;
         :below    a.ucs:0x66F0   # 曰
     ] .
 rep.mj:013511   # &MJ013511;
@@ -1015,7 +1053,7 @@ rep.mj:013687   # 枌
 rep.mj:013712   # &MJ013712;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    a.jis-x0208:0x384D   # &o-J0-384D;
+        :right    o.ucs_jis:0x6238   # &o-J0-384D;
     ] .
 rep.mj:013713   # &MJ013713;
     :structure [ a idc:â¿° ;
@@ -1050,7 +1088,7 @@ rep.mj:013818   # 栃
 rep.mj:013819   # &MJ013819;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:14288   # &AJ1-14288;
+        :right    rep.adobe-japan1-4:14288   # &AJ1-14288;
     ] .
 rep.mj:013826   # &MJ013826;
     :structure [ a idc:â¿° ;
@@ -1065,7 +1103,7 @@ rep.mj:013827   # &MJ013827;
 rep.mj:013843   # &MJ013843;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:04738   # &AJ1-04738;
+        :right    rep.adobe-japan1-0:04738   # &AJ1-04738;
     ] .
 rep.mj:013844   # &MJ013844;
     :structure [ a idc:â¿° ;
@@ -1080,7 +1118,7 @@ rep.mj:013856   # &MJ013856;
 rep.mj:013857   # &MJ013857;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:01227   # &AJ1-01227;
+        :right    rep.adobe-japan1-0:01227   # &AJ1-01227;
     ] .
 rep.mj:013866   # æ ²
     :structure [ a idc:â¿° ;
@@ -1103,13 +1141,13 @@ rep.mj:013870   # &MJ013870;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x20089 ; # 𠂉
-                :below    rep.adobe-japan1:02926   # &AJ1-02926;
+                :below    rep.adobe-japan1-0:02926   # &AJ1-02926;
             ]
         ]
     ] .
 rep.mj:013905   # &MJ013905;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:04312 ; # &AJ1-04312;
+        :above    rep.adobe-japan1-0:04312 ; # &AJ1-04312;
         :below    a.ucs:0x6728   # 木
     ] .
 rep.mj:013907   # 桒
@@ -1190,7 +1228,7 @@ rep.mj:014012   # &MJ014012;
 rep.mj:014013   # &MJ014013;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:08425   # &AJ1-08425;
+        :right    rep.adobe-japan1-2:08425   # &AJ1-08425;
     ] .
 rep.mj:014032   # &MJ014032;
     :structure [ a idc:⿱ ;
@@ -1240,7 +1278,7 @@ rep.mj:014135   # &MJ014135;
 rep.mj:014160   # 椹
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:02585   # &AJ1-02585;
+        :right    rep.adobe-japan1-0:02585   # &AJ1-02585;
     ] .
 rep.mj:014165   # &MJ014165;
     :structure [ a idc:â¿° ;
@@ -1285,7 +1323,7 @@ rep.mj:014213   # &MJ014213;
 rep.mj:014228   # &MJ014228;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:02304   # &AJ1-02304;
+        :right    rep.adobe-japan1-0:02304   # &AJ1-02304;
     ] .
 rep.mj:014229   # &MJ014229;
     :structure [ a idc:â¿° ;
@@ -1295,12 +1333,12 @@ rep.mj:014229   # &MJ014229;
 rep.mj:014255   # &MJ014255;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:02566   # &AJ1-02566;
+        :right    rep.adobe-japan1-0:02566   # &AJ1-02566;
     ] .
 rep.mj:014262   # &MJ014262;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:17537   # &AJ1-17537;
+        :right    rep.adobe-japan1-5:17537   # &AJ1-17537;
     ] .
 rep.mj:014267   # &MJ014267;
     :structure [ a idc:â¿° ;
@@ -1350,11 +1388,11 @@ rep.mj:014340   # &MJ014340;
 rep.mj:014341   # &MJ014341;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:13938   # &AJ1-13938;
+        :right    rep.adobe-japan1-4:13938   # &AJ1-13938;
     ] .
 rep.mj:014370   # &MJ014370;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:13701 ; # &AJ1-13701;
+        :above    rep.adobe-japan1-4:13701 ; # &AJ1-13701;
         :below    a.ucs:0x6728   # 木
     ] .
 rep.mj:014372   # &MJ014372;
@@ -1445,12 +1483,12 @@ rep.mj:014481   # &MJ014481;
 rep.mj:014520   # &MJ014520;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:01586   # &AJ1-01586;
+        :right    rep.adobe-japan1-0:01586   # &AJ1-01586;
     ] .
 rep.mj:014521   # &MJ014521;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:13700   # &AJ1-13700;
+        :right    rep.adobe-japan1-4:13700   # &AJ1-13700;
     ] .
 rep.mj:014523   # æ©¡
     :structure [ a idc:â¿° ;
@@ -1495,7 +1533,7 @@ rep.mj:014573   # 檐
 rep.mj:014590   # &MJ014590;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:04171   # &AJ1-04171;
+        :right    rep.adobe-japan1-0:04171   # &AJ1-04171;
     ] .
 rep.mj:014592   # &MJ014592;
     :structure [ a idc:â¿° ;
@@ -1577,6 +1615,11 @@ rep.mj:014687   # &MJ014687;
         :left     a.ucs:0x6728 ; # 木
         :right    rep.mj:019556   # &MJ019556;
     ] .
+rep.mj:014695   # &MJ014695;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6728 ; # 木
+        :right    rep.adobe-japan1-0:05119   # &AJ1-20140;
+    ] .
 rep.mj:014723   # &MJ014723;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
@@ -1600,19 +1643,24 @@ rep.mj:014735   # &MJ014735;
 rep.mj:014742   # &MJ014742;
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x68E5 ; # 棥
-        :middle   rep.gt:36329 ; # &GT-36329;
-        :below    rep.big5-cdp:0x8D42   # &CDP-8D42;
+        :middle   a.ucs:0x2EAB ; # ⺫
+        :below    rep.ucs_iso:0x21B20   # &C6-2A69;
     ] .
 rep.mj:014743   # &MJ014743;
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x68E5 ; # 棥
-        :middle   rep.gt:36329 ; # &GT-36329;
-        :below    rep.big5-cdp:0x8D42   # &CDP-8D42;
+        :middle   a.ucs:0x2EAB ; # ⺫
+        :below    rep.ucs_iso:0x21B20   # &C6-2A69;
     ] .
 rep.mj:014745   # &MJ014745;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
-        :right    rep.adobe-japan1:06650   # &AJ1-06650;
+        :right    rep.adobe-japan1-0:06650   # &AJ1-06650;
+    ] .
+rep.mj:014748   # &MJ014748;
+    :structure [ a idc:â¿° ;
+        :left     rep.gt-k:00083 ; # &GT-K00083;
+        :right    a.ucs:0x6B20   # 欠
     ] .
 rep.mj:014787   # 歆
     :structure [ a idc:â¿° ;
@@ -1622,17 +1670,22 @@ rep.mj:014787   # 歆
 rep.mj:014849   # &MJ014849;
     :structure [ a idc:â¿° ;
         :left     rep.big5-cdp:0x8CAB ; # &CDP-8CAB;
-        :right    rep.adobe-japan1:04721   # &AJ1-04721;
+        :right    rep.adobe-japan1-0:04721   # &AJ1-04721;
     ] .
 rep.mj:014908   # &MJ014908;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x51E0 ; # 几
         :below    a.ucs:0x53C8   # 又
     ] .
+rep.mj:014909   # &MJ014909;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x513F ; # 儿
+        :below    a.ucs:0x53C8   # 又
+    ] .
 rep.mj:015061   # &MJ015061;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:03724   # &AJ1-03724;
+        :right    rep.adobe-japan1-0:03724   # &AJ1-03724;
     ] .
 rep.mj:015098   # &MJ015098;
     :structure [ a idc:â¿° ;
@@ -1651,7 +1704,7 @@ rep.mj:015105   # &MJ015105;
     ] .
 rep.mj:015106   # &MJ015106;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.mj:007989   # &MJ007989;
     ] .
 rep.mj:015109   # æ±´
@@ -1702,7 +1755,7 @@ rep.mj:015227   # &MJ015227;
 rep.mj:015296   # &MJ015296;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:06227   # &AJ1-06227;
+        :right    rep.adobe-japan1-0:06227   # &AJ1-06227;
     ] .
 rep.mj:015307   # &MJ015307;
     :structure [ a idc:⿱ ;
@@ -1721,13 +1774,13 @@ rep.mj:015325   # &MJ015325;
     ] .
 rep.mj:015329   # &MJ015329;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
-        :right    rep.adobe-japan1:17246   # &AJ1-17246;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.adobe-japan1-5:17246   # &AJ1-17246;
     ] .
 rep.mj:015330   # 流
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:17246   # &AJ1-17246;
+        :right    rep.adobe-japan1-5:17246   # &AJ1-17246;
     ] .
 rep.mj:015356   # &MJ015356;
     :structure [ a idc:â¿° ;
@@ -1772,7 +1825,7 @@ rep.mj:015477   # 淞
 rep.mj:015488   # &MJ015488;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:05600   # &AJ1-05600;
+        :right    rep.adobe-japan1-0:05600   # &AJ1-05600;
     ] .
 rep.mj:015489   # &MJ015489;
     :structure [ a idc:â¿° ;
@@ -1784,7 +1837,7 @@ rep.mj:015493   # &MJ015493;
         :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.big5-cdp:0x8AC0   # &CDP-8AC0;
     ] .
-rep.mj:015504   # &MJ015504;
+rep.mj:015504   # æ·µ
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
         :right    a.ucs:0x23D92   # 𣶒
@@ -1792,17 +1845,17 @@ rep.mj:015504   # &MJ015504;
 rep.mj:015511   # &MJ015511;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:04806   # &AJ1-04806;
+        :right    rep.adobe-japan1-0:04806   # &AJ1-04806;
     ] .
 rep.mj:015512   # &MJ015512;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:20118   # &AJ1-20118;
+        :right    rep.adobe-japan1-5:20118   # &AJ1-20118;
     ] .
 rep.mj:015541   # &MJ015541;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:04216   # &AJ1-04216;
+        :right    rep.adobe-japan1-0:04216   # &AJ1-04216;
     ] .
 rep.mj:015542   # &MJ015542;
     :structure [ a idc:â¿° ;
@@ -1831,7 +1884,7 @@ rep.mj:015562   # &MJ015562;
     ] .
 rep.mj:015563   # &MJ015563;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.gt:40031   # &GT-40031;
     ] .
 rep.mj:015564   # &MJ015564;
@@ -1857,7 +1910,7 @@ rep.mj:015576   # &MJ015576;
 rep.mj:015615   # 湛
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:02585   # &AJ1-02585;
+        :right    rep.adobe-japan1-0:02585   # &AJ1-02585;
     ] .
 rep.mj:015630   # &MJ015630;
     :structure [ a idc:â¿° ;
@@ -1882,12 +1935,12 @@ rep.mj:015687   # &MJ015687;
 rep.mj:015693   # &MJ015693;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:01273   # &AJ1-01273;
+        :right    rep.adobe-japan1-0:01273   # &AJ1-01273;
     ] .
 rep.mj:015697   # &MJ015697;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:17537   # &AJ1-17537;
+        :right    rep.adobe-japan1-5:17537   # &AJ1-17537;
     ] .
 rep.mj:015698   # &MJ015698;
     :structure [ a idc:â¿° ;
@@ -1897,7 +1950,7 @@ rep.mj:015698   # &MJ015698;
 rep.mj:015703   # &MJ015703;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:04553   # &AJ1-04553;
+        :right    rep.adobe-japan1-0:04553   # &AJ1-04553;
     ] .
 rep.mj:015704   # &MJ015704;
     :structure [ a idc:â¿° ;
@@ -1907,17 +1960,17 @@ rep.mj:015704   # &MJ015704;
 rep.mj:015713   # &MJ015713;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    a.ucs:0x53DF   # 叟
+        :right    rep.mj:008019   # &MJ008019;
     ] .
 rep.mj:015723   # &MJ015723;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:13811   # &AJ1-13811;
+        :right    rep.adobe-japan1-4:13811   # &AJ1-13811;
     ] .
 rep.mj:015724   # &MJ015724;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:02321   # &AJ1-02321;
+        :right    rep.adobe-japan1-0:02321   # &AJ1-02321;
     ] .
 rep.mj:015729   # &MJ015729;
     :structure [ a idc:â¿° ;
@@ -1949,20 +2002,20 @@ rep.mj:015758   # &MJ015758;
         :surround [
             :structure [ a idc:â¿° ;
                 :left     rep.mj:013520 ; # &MJ013520;
-                :right    rep.adobe-japan1:17299   # &AJ1-17299;
+                :right    rep.adobe-japan1-5:17299   # &AJ1-17299;
             ]
         ] ;
         :filling  a.ucs:0x6C3A   # æ°º
     ] .
 rep.mj:015774   # &MJ015774;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
-        :right    rep.adobe-japan1:07874   # &AJ1-07874;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.adobe-japan1-0:07874   # &AJ1-07874;
     ] .
 rep.mj:015775   # &MJ015775;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:06938   # &AJ1-06938;
+        :right    rep.adobe-japan1-0:06938   # &AJ1-06938;
     ] .
 rep.mj:015794   # 滾
     :structure [ a idc:â¿° ;
@@ -1992,11 +2045,11 @@ rep.mj:015832   # &MJ015832;
 rep.mj:015838   # &MJ015838;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.cns11643-1:0x5C7B   # &C1-5C7B;
+        :right    rep.mj:022034   # &MJ022034;
     ] .
 rep.mj:015839   # &MJ015839;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.cns11643-1:0x5C7B   # &C1-5C7B;
     ] .
 rep.mj:015844   # &MJ015844;
@@ -2006,8 +2059,8 @@ rep.mj:015844   # &MJ015844;
     ] .
 rep.mj:015854   # &MJ015854;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
-        :right    a.ucs:0x66FC   # 曼
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.mj:013499   # &MJ013499;
     ] .
 rep.mj:015855   # &MJ015855;
     :structure [ a idc:â¿° ;
@@ -2037,7 +2090,7 @@ rep.mj:015897   # &MJ015897;
 rep.mj:015899   # &MJ015899;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.jis-x0213-1:0x7A24   # &HD-JC-7A24;
+        :right    rep.adobe-japan1-5:17041   # &AJ1-17041;
     ] .
 rep.mj:015907   # &MJ015907;
     :structure [ a idc:â¿° ;
@@ -2057,7 +2110,7 @@ rep.mj:015937   # &MJ015937;
 rep.mj:015938   # &MJ015938;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:13859   # &AJ1-13859;
+        :right    rep.adobe-japan1-4:13859   # &AJ1-13859;
     ] .
 rep.mj:015939   # &MJ015939;
     :structure [ a idc:â¿° ;
@@ -2072,7 +2125,7 @@ rep.mj:015944   # &MJ015944;
 rep.mj:015945   # &MJ015945;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:02996   # &AJ1-02996;
+        :right    rep.adobe-japan1-0:02996   # &AJ1-02996;
     ] .
 rep.mj:015954   # æ½¼
     :structure [ a idc:â¿° ;
@@ -2114,7 +2167,7 @@ rep.mj:015967   # &MJ015967;
 rep.mj:015997   # &MJ015997;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:07449   # &AJ1-07449;
+        :right    rep.adobe-japan1-0:07449   # &AJ1-07449;
     ] .
 rep.mj:016002   # &MJ016002;
     :structure [ a idc:â¿° ;
@@ -2139,7 +2192,7 @@ rep.mj:016036   # &MJ016036;
 rep.mj:016037   # &MJ016037;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:13912   # &AJ1-13912;
+        :right    rep.adobe-japan1-4:13912   # &AJ1-13912;
     ] .
 rep.mj:016068   # &MJ016068;
     :structure [ a idc:â¿° ;
@@ -2148,7 +2201,7 @@ rep.mj:016068   # &MJ016068;
     ] .
 rep.mj:016069   # &MJ016069;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.cns11643-1:0x6A60   # &C1-6A60;
     ] .
 rep.mj:016075   # &MJ016075;
@@ -2164,7 +2217,7 @@ rep.mj:016087   # &MJ016087;
 rep.mj:016098   # &MJ016098;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.gt-k:11272   # &GT-K11272;
+        :right    rep.mj:058358   # &MJ058358;
     ] .
 rep.mj:016101   # &MJ016101;
     :structure [ a idc:â¿° ;
@@ -2174,12 +2227,12 @@ rep.mj:016101   # &MJ016101;
 rep.mj:016109   # &MJ016109;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:03709   # &AJ1-03709;
+        :right    rep.adobe-japan1-0:03709   # &AJ1-03709;
     ] .
 rep.mj:016119   # &MJ016119;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:03910   # &AJ1-03910;
+        :right    rep.adobe-japan1-0:03910   # &AJ1-03910;
     ] .
 rep.mj:016127   # &MJ016127;
     :structure [ a idc:â¿° ;
@@ -2199,7 +2252,7 @@ rep.mj:016143   # &MJ016143;
 rep.mj:016144   # &MJ016144;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:03523   # &AJ1-03523;
+        :right    rep.adobe-japan1-0:03523   # &AJ1-03523;
     ] .
 rep.mj:016152   # &MJ016152;
     :structure [ a idc:â¿° ;
@@ -2219,7 +2272,7 @@ rep.mj:016159   # &MJ016159;
 rep.mj:016160   # 瀞
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:02665   # &AJ1-02665;
+        :right    rep.adobe-japan1-0:02665   # &AJ1-02665;
     ] .
 rep.mj:016161   # &MJ016161;
     :structure [ a idc:â¿° ;
@@ -2238,13 +2291,13 @@ rep.mj:016163   # &MJ016163;
     ] .
 rep.mj:016165   # &MJ016165;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.cns11643-1:0x7227   # &C1-7227;
     ] .
 rep.mj:016166   # &MJ016166;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    a.ucs:0x856D   # 蕭
+        :right    rep.mj:022847   # &MJ022847;
     ] .
 rep.mj:016175   # &MJ016175;
     :structure [ a idc:â¿° ;
@@ -2254,7 +2307,7 @@ rep.mj:016175   # &MJ016175;
 rep.mj:016177   # &MJ016177;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.big5:0xC073   # &B-C073;
+        :right    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:016207   # &MJ016207;
     :structure [ a idc:â¿° ;
@@ -2268,13 +2321,13 @@ rep.mj:016226   # &MJ016226;
     ] .
 rep.mj:016227   # &MJ016227;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA1 ; # ⺡
+        :left     a.ucs:0x6C35 ; # æ°µ
         :right    rep.jis-x0212:0x6676   # &HD-JB-6676;
     ] .
 rep.mj:016237   # &MJ016237;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6C35 ; # æ°µ
-        :right    rep.adobe-japan1:03273   # &AJ1-03273;
+        :right    rep.adobe-japan1-0:03273   # &AJ1-03273;
     ] .
 rep.mj:016238   # &MJ016238;
     :structure [ a idc:â¿° ;
@@ -2286,6 +2339,21 @@ rep.mj:016266   # &MJ016266;
         :surround a.ucs:0x20087 ; # 𠂇
         :filling  a.ucs:0x706B   # 火
     ] .
+rep.mj:016516   # &MJ016516;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x706B ; # 火
+        :right    rep.mj:026434   # &MJ026434;
+    ] .
+rep.mj:016688   # &MJ016688;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x706B ; # 火
+        :right    rep.mj:007965   # &MJ007965;
+    ] .
+rep.mj:016721   # &MJ016721;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-0:07430 ; # &AJ1-07430;
+        :below    a.ucs:0x706C   # 灬
+    ] .
 rep.mj:016740   # &MJ016740;
     :structure [ a idc:⿳ ;
         :above    rep.jis-x0213-2:0x702A ; # &GT-25225;
@@ -2294,15 +2362,15 @@ rep.mj:016740   # &MJ016740;
     ] .
 rep.mj:016741   # &MJ016741;
     :structure [ a idc:⿳ ;
-        :above    a.ucs:0xFA49 ; # 爫
+        :above    a.ucs:0x2EA4 ; # ⺤
         :middle   a.ucs:0x4E00 ; # 一
         :below    a.ucs:0x53CB   # 友
     ] .
 rep.mj:016747   # &MJ016747;
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x722B ; # 爫
-        :middle   rep.gt:36329 ; # &GT-36329;
-        :below    rep.big5-cdp:0x8D42   # &CDP-8D42;
+        :middle   a.ucs:0x2EAB ; # ⺫
+        :below    rep.ucs_iso:0x21B20   # &C6-2A69;
     ] .
 rep.mj:016762   # &MJ016762;
     :structure [ a idc:⿱ ;
@@ -2352,11 +2420,11 @@ rep.mj:017240   # &MJ017240;
 rep.mj:017241   # &MJ017241;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:02642   # &AJ1-02642;
+        :right    rep.adobe-japan1-0:02642   # &AJ1-02642;
     ] .
 rep.mj:017282   # &MJ017282;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    rep.mj:024906   # &MJ024906;
     ] .
 rep.mj:017334   # 瑋
@@ -2366,7 +2434,7 @@ rep.mj:017334   # 瑋
     ] .
 rep.mj:017350   # &MJ017350;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x21FFA   # 𡿺
     ] .
 rep.mj:017352   # &MJ017352;
@@ -2376,7 +2444,7 @@ rep.mj:017352   # &MJ017352;
     ] .
 rep.mj:017353   # &MJ017353;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EA9 ; # ⺩
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    rep.mj:021701   # &MJ021701;
     ] .
 rep.mj:017355   # &MJ017355;
@@ -2391,7 +2459,7 @@ rep.mj:017364   # 瑢
     ] .
 rep.mj:017365   # &MJ017365;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x27D2A   # 𧴪
     ] .
 rep.mj:017366   # &MJ017366;
@@ -2401,7 +2469,7 @@ rep.mj:017366   # &MJ017366;
     ] .
 rep.mj:017381   # &MJ017381;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x90DE   # 郞
     ] .
 rep.mj:017382   # &MJ017382;
@@ -2412,7 +2480,7 @@ rep.mj:017382   # &MJ017382;
 rep.mj:017404   # &MJ017404;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:14542   # &AJ1-14542;
+        :right    rep.adobe-japan1-4:14542   # &AJ1-14542;
     ] .
 rep.mj:017405   # &MJ017405;
     :structure [ a idc:â¿° ;
@@ -2426,9 +2494,14 @@ rep.mj:017416   # &MJ017416;
     ] .
 rep.mj:017420   # 璋
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x7AE0   # ç« 
     ] .
+rep.mj:017427   # &MJ017427;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x248E9 ; # 𤣩
+        :right    rep.cns11643-1:0x5D22   # &C1-5D22;
+    ] .
 rep.mj:017433   # 璘
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
@@ -2437,7 +2510,7 @@ rep.mj:017433   # 璘
 rep.mj:017443   # &MJ017443;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.adobe-japan1:13855   # &AJ1-13855;
+        :right    rep.adobe-japan1-4:13855   # &AJ1-13855;
     ] .
 rep.mj:017444   # &MJ017444;
     :structure [ a idc:â¿° ;
@@ -2462,7 +2535,7 @@ rep.mj:017455   # 璩
 rep.mj:017464   # &MJ017464;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x248E9 ; # 𤣩
-        :right    rep.jis-x0213-2:0x7225   # &JX2-7225;
+        :right    rep.adobe-japan1-5:18194   # &AJ1-18194;
     ] .
 rep.mj:017465   # &MJ017465;
     :structure [ a idc:â¿° ;
@@ -2471,18 +2544,18 @@ rep.mj:017465   # &MJ017465;
     ] .
 rep.mj:017495   # &MJ017495;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
-        :right    a.ucs:0x657B   # 敻
+        :left     a.ucs:0x248E9 ; # 𤣩
+        :right    a.ucs:0x5910   # 夐
     ] .
 rep.mj:017496   # &MJ017496;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
+        :left     a.ucs:0x248E9 ; # 𤣩
         :right    a.ucs:0x657B   # 敻
     ] .
 rep.mj:017504   # &MJ017504;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x738B ; # 王
-        :right    rep.adobe-japan1:03966   # &AJ1-03966;
+        :left     a.ucs:0x248E9 ; # 𤣩
+        :right    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:017513   # &MJ017513;
     :structure [ a idc:â¿° ;
@@ -2507,11 +2580,11 @@ rep.mj:017681   # &MJ017681;
 rep.mj:017706   # &MJ017706;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7530 ; # 田
-        :below    rep.adobe-japan1:01694   # &AJ1-01694;
+        :below    rep.adobe-japan1-0:01694   # &AJ1-01694;
     ] .
 rep.mj:018051   # &MJ018051;
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:14444 ; # &AJ1-14444;
+        :left     rep.adobe-japan1-4:14444 ; # &AJ1-14444;
         :right    a.ucs:0x76AE   # 皮
     ] .
 rep.mj:018104   # &MJ018104;
@@ -2542,7 +2615,7 @@ rep.mj:018173   # &MJ018173;
     ] .
 rep.mj:018201   # &MJ018201;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17299 ; # &AJ1-17299;
+        :above    rep.adobe-japan1-5:17299 ; # &AJ1-17299;
         :below    a.ucs:0x76EE   # 目
     ] .
 rep.mj:018213   # &MJ018213;
@@ -2555,6 +2628,11 @@ rep.mj:018241   # &MJ018241;
         :left     a.ucs:0x76EE ; # 目
         :right    a.ucs:0x9752   # 青
     ] .
+rep.mj:018261   # &MJ018261;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x76EE ; # 目
+        :right    rep.adobe-japan1-0:04216   # &AJ1-04216;
+    ] .
 rep.mj:018318   # &MJ018318;
     :structure [ a idc:⿱ ;
         :above    rep.big5-cdp:0x8D60 ; # &CDP-8D60;
@@ -2595,14 +2673,19 @@ rep.mj:018494   # 硎
         :left     a.ucs:0x77F3 ; # 石
         :right    a.ucs:0x206EC   # 𠛬
     ] .
+rep.mj:018884   # &MJ018884;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x793A ; # 示
+        :right    rep.mj:026434   # &MJ026434;
+    ] .
 rep.mj:018964   # &MJ018964;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2EAD ; # ⺭
+        :left     a.ucs:0x793B ; # 礻
         :right    a.ucs:0x8C4A   # 豊
     ] .
 rep.mj:019380   # &MJ019380;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2EAE ; # ⺮
+        :above    a.ucs:0x7AF9 ; # 竹
         :below    rep.mj:007989   # &MJ007989;
     ] .
 rep.mj:019381   # &MJ019381;
@@ -2610,6 +2693,11 @@ rep.mj:019381   # &MJ019381;
         :above    a.ucs:0x7AF9 ; # 竹
         :below    a.ucs:0x2F836   # 及
     ] .
+rep.mj:019387   # &MJ019387;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    a.ucs:0x5167   # 內
+    ] .
 rep.mj:019391   # &MJ019391;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
@@ -2622,18 +2710,23 @@ rep.mj:019450   # &MJ019450;
     ] .
 rep.mj:019451   # &MJ019451;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x2EAE ; # ⺮
+        :above    a.ucs:0x7AF9 ; # 竹
         :below    rep.mj:007268   # &MJ007268;
     ] .
 rep.mj:019457   # &MJ019457;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.gb2312:0x392E   # &HD-KS-098790;
+        :below    rep.hanyo-denshi...ks:098790   # &HD-KS-098790;
+    ] .
+rep.mj:019469   # &MJ019469;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    rep.mj:010060   # &MJ010060;
     ] .
 rep.mj:019482   # &MJ019482;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:02642   # &AJ1-02642;
+        :below    rep.adobe-japan1-0:02642   # &AJ1-02642;
     ] .
 rep.mj:019484   # ç­­
     :structure [ a idc:⿱ ;
@@ -2643,7 +2736,7 @@ rep.mj:019484   # ç­­
 rep.mj:019518   # &MJ019518;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:05600   # &AJ1-05600;
+        :below    rep.adobe-japan1-0:05600   # &AJ1-05600;
     ] .
 rep.mj:019519   # &MJ019519;
     :structure [ a idc:⿱ ;
@@ -2678,7 +2771,7 @@ rep.mj:019556   # &MJ019556;
 rep.mj:019567   # &MJ019567;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:02304   # &AJ1-02304;
+        :below    rep.adobe-japan1-0:02304   # &AJ1-02304;
     ] .
 rep.mj:019576   # &MJ019576;
     :structure [ a idc:⿱ ;
@@ -2728,7 +2821,7 @@ rep.mj:019615   # 篠
 rep.mj:019635   # &MJ019635;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:03487   # &AJ1-03487;
+        :below    rep.adobe-japan1-0:03487   # &AJ1-03487;
     ] .
 rep.mj:019641   # &MJ019641;
     :structure [ a idc:⿱ ;
@@ -2775,20 +2868,25 @@ rep.mj:019742   # &MJ019742;
         :above    a.ucs:0x7AF9 ; # 竹
         :below    rep.mj:015758   # &MJ015758;
     ] .
+rep.mj:019743   # &MJ019743;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    rep.mj:015759   # &MJ015759;
+    ] .
 rep.mj:019753   # &MJ019753;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:06119   # &AJ1-06119;
+        :below    rep.adobe-japan1-0:06119   # &AJ1-06119;
     ] .
 rep.mj:019763   # &MJ019763;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:08627   # &AJ1-08627;
+        :below    rep.adobe-japan1-2:08627   # &AJ1-08627;
     ] .
 rep.mj:019765   # &MJ019765;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:03966   # &AJ1-03966;
+        :below    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:019778   # &MJ019778;
     :structure [ a idc:⿱ ;
@@ -2798,10 +2896,15 @@ rep.mj:019778   # &MJ019778;
 rep.mj:019779   # &MJ019779;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
-        :below    rep.adobe-japan1:14237   # &AJ1-14237;
+        :below    rep.adobe-japan1-4:14237   # &AJ1-14237;
     ] .
 rep.mj:019780   # &MJ019780;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x7AF9 ; # 竹
         :below    rep.mj:026200   # &MJ026200;
     ] .
+rep.mj:019939   # &MJ019939;
+    :structure [ a idc:⿱ ;
+        :above    rep.mj:038948 ; # &MJ038948;
+        :below    a.ucs:0x7C73   # ç±³
+    ] .