X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ISD-MJ-0.ttl;h=c34bf17682acc064597560363b654f8932d27a2c;hb=0409dbbbc66bf83e1fca86f880cbaf9e1a3c021e;hp=29c49fa8cb76ed9cbb9cd08b8127d2fedccc2659;hpb=54e65d44120de4216d7c247864d0c8fb16e92559;p=chise%2Fisd.git

diff --git a/ISD-MJ-0.ttl b/ISD-MJ-0.ttl
index 29c49fa..c34bf17 100644
--- a/ISD-MJ-0.ttl
+++ b/ISD-MJ-0.ttl
@@ -2,58 +2,138 @@
 @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 a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
+@prefix g.ucs_cns: <http://www.chise.org/est/view/character/g.ucs@cns=> .
 @prefix g2.ucs_unicode: <http://www.chise.org/est/view/character/g2.ucs@unicode=> .
 @prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
 @prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
-@prefix rep.adobe-japan1: <http://www.chise.org/est/view/character/rep.adobe-japan1=> .
-@prefix g2.adobe-japan1-6: <http://www.chise.org/est/view/character/g2.adobe-japan1-6=> .
+@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 g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
 @prefix g2.ks-x1001: <http://www.chise.org/est/view/character/g2.ks-x1001=> .
 @prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
-@prefix g2.jis-x0208_1990: <http://www.chise.org/est/view/character/g2.jis-x0208@1990=> .
+@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 g2.cns11643-1: <http://www.chise.org/est/view/character/g2.cns11643-1=> .
 @prefix rep.cns11643-2: <http://www.chise.org/est/view/character/rep.cns11643-2=> .
 @prefix g2.cns11643-2: <http://www.chise.org/est/view/character/g2.cns11643-2=> .
 @prefix rep.cns11643-3: <http://www.chise.org/est/view/character/rep.cns11643-3=> .
 @prefix rep.cns11643-4: <http://www.chise.org/est/view/character/rep.cns11643-4=> .
 @prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
-@prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
+@prefix a.jis-x0213-1: <http://www.chise.org/est/view/character/a.jis-x0213-1=> .
 @prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
-@prefix rep.jis-x0213-1_2004: <http://www.chise.org/est/view/character/rep.jis-x0213-1@2004=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
+@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 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 rep.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
+@prefix rep.big5-cdp-itaiji-002: <http://www.chise.org/est/view/character/rep.big5-cdp-itaiji-002=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
-@prefix rep.ucs-bmp-var-002: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-002=> .
-@prefix rep.ucs-bmp-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-bmp-itaiji-004=> .
+@prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
+@prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
+@prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
+@prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 
+rep.mj:000022   # 㐪
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x4EA0 ; # 亠
+        :below    rep.big5-cdp:0x88B8   # &CDP-88B8;
+    ] .
+rep.mj:000023   # &MJ000023;
+    :structure [ a idc:â¿» ;
+        :underlying a.ucs:0x4E00 ; # 一
+        :overlaying rep.big5-cdp:0x88B8   # &CDP-88B8;
+    ] .
+rep.mj:000147   # 㒺
+    :structure [ a idc:⿵ ;
+        :surround rep.gt-k:01266 ; # &GT-K01266;
+        :filling  a.ucs:0x4EBE   # 亾
+    ] .
+rep.mj:000196   # &MJ000196;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-4:13749 ; # &AJ1-13749;
+        :right    a.ucs:0x5202   # 刂
+    ] .
 rep.mj:000302   # &MJ000302;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  rep.adobe-japan1:03709   # &AJ1-03709;
+        :filling  rep.adobe-japan1-0:03709   # &AJ1-03709;
+    ] .
+rep.mj:000536   # &MJ000536;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-4:14431 ; # &AJ1-14431;
+        :below    a.ucs:0x4E91   # 云
+    ] .
+rep.mj:000556   # &MJ000556;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x23140 ; # 𣅀
+        :below    a.ucs:0x5902   # 夂
     ] .
 rep.mj:000558   # 㚈
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5915 ; # 夕
         :right    a.ucs:0x5341   # 十
     ] .
+rep.mj:000567   # &MJ000567;
+    :structure [ a idc:⿱ ;
+        :above    rep.gb2312:0x6566 ; # &G0-6566;
+        :below    a.ucs:0x5927   # 大
+    ] .
 rep.mj:000568   # &MJ000568;
-    :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E95 ; # ⺕
-        :right    a.ucs:0x5927   # 大
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-4:15391 ; # &AJ1-15391;
+        :below    a.ucs:0x5927   # 大
+    ] .
+rep.mj:000737   # 㝎
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5B80 ; # 宀
+        :below    a.ucs:0x4E4B   # 之
+    ] .
+rep.mj:000739   # 㝐
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5B80 ; # 宀
+        :below    a.ucs:0x516C   # 公
+    ] .
+rep.mj:000758   # &MJ000758;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5B80 ; # 宀
+        :below    rep.mj:009490   # &MJ009490;
+    ] .
+rep.mj:000796   # 㞋
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x5C38 ; # å°¸
+        :filling  a.ucs:0x53C8   # 又
+    ] .
+rep.mj:000813   # 㞡
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x5C38 ; # å°¸
+        :filling  [
+            :structure [ a idc:⿱ ;
+                :above    a.ucs:0x382D ; # ã ­
+                :below    rep.ucs_iso:0x27607   # &CDP-8B67;
+            ]
+        ]
+    ] .
+rep.mj:000827   # 㞮
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5C71 ; # å±±
+        :below    a.ucs:0x206A4   # 𠚤
     ] .
 rep.mj:000835   # &MJ000835;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x5C6E ; # å±®
+        :above    a.ucs:0x2F878 ; # 屮
         :below    a.ucs:0x738B   # 王
     ] .
 rep.mj:000836   # &MJ000836;
@@ -61,20 +141,40 @@ rep.mj:000836   # &MJ000836;
         :above    a.ucs:0x5C71 ; # å±±
         :below    a.ucs:0x738B   # 王
     ] .
+rep.mj:000906   # &MJ000906;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5C71 ; # å±±
+        :below    rep.adobe-japan1-0:03566   # &AJ1-03566;
+    ] .
+rep.mj:000916   # 㠎
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x5C71 ; # å±±
+        :right    a.ucs:0x96C6   # 集
+    ] .
+rep.mj:000975   # &MJ000975;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x5DFE ; # å·¾
+        :right    rep.adobe-japan1-0:04216   # &AJ1-04216;
+    ] .
 rep.mj:001076   # &MJ001076;
     :structure [ a idc:⿹ ;
         :surround a.ucs:0x5F13 ; # 弓
-        :filling  [
-            :structure [ a idc:â¿´ ;
-                :surround a.ucs:0x56D7 ; # 囗
-                :filling  a.ucs:0x590A   # 夊
-            ]
-        ]
+        :filling  rep.ucs-itaiji-003:0x56EA   # &U-i003+56EA;
+    ] .
+rep.mj:001090   # &MJ001090;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x5F13 ; # 弓
+        :right    rep.mj:013508   # &MJ013508;
     ] .
 rep.mj:001165   # &MJ001165;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17472 ; # &AJ1-17472;
-        :below    rep.cns11643-6:0x217E   # &C6-217E;
+        :above    rep.adobe-japan1-5:17472 ; # &AJ1-17472;
+        :below    a.ucs:0x2E97   # ⺗
+    ] .
+rep.mj:001193   # 㤵
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5B5C ; # 孜
+        :below    a.ucs:0x5FC3   # 心
     ] .
 rep.mj:001247   # &MJ001247;
     :structure [ a idc:⿱ ;
@@ -86,31 +186,312 @@ rep.mj:001248   # &MJ001248;
         :above    rep.ucs_iso:0x2450C ; # &C5-2E51;
         :below    a.ucs:0x5FC3   # 心
     ] .
+rep.mj:001270   # &MJ001270;
+    :structure [ a idc:⿱ ;
+        :above    rep.gt:65256 ; # &GT-65256;
+        :below    a.ucs:0x5FC3   # 心
+    ] .
 rep.mj:001565   # 㫃
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x65B9 ; # 方
         :right    a.ucs:0x4EBA   # 人
     ] .
+rep.mj:001681   # &MJ001681;
+    :structure [ a idc:â¿° ;
+        :left     rep.mj:013520 ; # &MJ013520;
+        :right    rep.hanyo-denshi...ks:346980   # &HD-KS-346980;
+    ] .
+rep.mj:001785   # 㮯
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6728 ; # 木
+        :right    a.ucs:0x5702   # 圂
+    ] .
 rep.mj:001814   # &MJ001814;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x6728 ; # 木
         :right    a.ucs:0x5C07   # 將
     ] .
+rep.mj:001829   # 𣚓
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6728 ; # 木
+        :right    rep.cbeta:09125   # &HD-JT-B81B;
+    ] .
+rep.mj:001864   # 㰆
+    :structure [ a idc:â¿´ ;
+        :surround rep.ucs-itaiji-001:0x675F ; # &U-i001+675F;
+        :filling  a.ucs:0x975E   # 非
+    ] .
+rep.mj:001981   # &MJ001981;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8FB0 ; # è¾°
+        :right    rep.mj:014908   # &MJ014908;
+    ] .
+rep.mj:001984   # &MJ001984;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x209E2 ; # 𠧢
+        :right    rep.mj:014908   # &MJ014908;
+    ] .
+rep.mj:002064   # &MJ002064;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-0:01694 ; # &AJ1-01694;
+        :below    a.ucs:0x6C3A   # æ°º
+    ] .
+rep.mj:002066   # &MJ002066;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-0:01694 ; # &AJ1-01694;
+        :below    a.ucs:0x6C34   # æ°´
+    ] .
+rep.mj:002179   # &MJ002179;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.mj:011343   # &MJ011343;
+    ] .
+rep.mj:002208   # &MJ002208;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.ucs_iso:0x21EDF   # &C4-4325;
+    ] .
+rep.mj:002216   # &MJ002216;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.adobe-japan1-0:06268   # &AJ1-06268;
+    ] .
+rep.mj:002218   # &MJ002218;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.jis-x0213-1:0x7B50   # &JX1-7B50;
+    ] .
+rep.mj:002319   # ã·¼
+    :structure [ a idc:⿳ ;
+        :above    a.ucs:0x5EFF ; # 廿
+        :middle   rep.big5-cdp:0x8D76 ; # &CDP-8D76;
+        :below    a.ucs:0x706B   # 火
+    ] .
 rep.mj:002326   # &MJ002326;
     :structure [ a idc:⿺ ;
         :surround a.ucs:0x9ED2 ; # 黒
         :filling  a.ucs:0x5360   # 占
     ] .
+rep.mj:002335   # &MJ002335;
+    :structure [ a idc:⿸ ;
+        :surround rep.adobe-japan1-0:07430 ; # &AJ1-07430;
+        :filling  a.ucs:0x706B   # 火
+    ] .
+rep.mj:002336   # &MJ002336;
+    :structure [ a idc:⿸ ;
+        :surround g.ucs_cns:0x9761 ; # &G-CU+9761;
+        :filling  a.ucs:0x706B   # 火
+    ] .
+rep.mj:002339   # &MJ002339;
+    :structure [ a idc:⿱ ;
+        :above    rep.jis-x0213-2:0x702A ; # &GT-25225;
+        :below    a.ucs:0x2123C   # 𡈼
+    ] .
+rep.mj:002510   # 㻎
+    :structure [ a idc:â¿» ;
+        :underlying a.ucs:0x5927 ; # 大
+        :overlaying [
+            :structure [ a idc:â¿° ;
+                :left     a.ucs:0x248E9 ; # 𤣩
+                :right    a.ucs:0x738B   # 王
+            ]
+        ]
+    ] .
+rep.mj:002594   # &MJ002594;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:04216 ; # &AJ1-04216;
+        :right    a.ucs:0x74E6   # 瓦
+    ] .
+rep.mj:002793   # &MJ002793;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-4:13701 ; # &AJ1-13701;
+        :below    a.ucs:0x76BF   # 皿
+    ] .
 rep.mj:002815   # 䀠
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
         :right    a.ucs:0x76EE   # 目
     ] .
+rep.mj:003048   # &MJ003048;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x793A ; # 示
+        :right    rep.mj:008132   # &MJ008132;
+    ] .
+rep.mj:003049   # &MJ003049;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x793A ; # 示
+        :right    rep.mj:008134   # &MJ008134;
+    ] .
+rep.mj:003054   # &MJ003054;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x793A ; # 示
+        :right    a.ucs:0x53D5   # 叕
+    ] .
+rep.mj:003217   # &MJ003217;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7A74 ; # ç©´
+        :below    rep.adobe-japan1-0:04815   # &AJ1-04815;
+    ] .
+rep.mj:003315   # &MJ003315;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    rep.adobe-japan1-4:14444   # &AJ1-14444;
+    ] .
+rep.mj:003344   # &MJ003344;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    rep.hanyo-denshi...ks:065500   # &HD-KS-065500;
+    ] .
+rep.mj:003354   # &MJ003354;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7AF9 ; # 竹
+        :below    rep.adobe-japan1-5:17679   # &AJ1-17679;
+    ] .
+rep.mj:003479   # &MJ003479;
+    :structure [ a idc:⿵ ;
+        :surround rep.ucs-itaiji-001:0x23386 ; # &U-i001+23386;
+        :filling  a.ucs:0x7C73   # ç±³
+    ] .
+rep.mj:003521   # 䋎
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7CF8 ; # 糸
+        :right    a.ucs:0x65E6   # 旦
+    ] .
+rep.mj:003595   # &MJ003595;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7CF8 ; # 糸
+        :right    rep.jis-x0213-1:0x7E71   # &GT-65324;
+    ] .
+rep.mj:003607   # &MJ003607;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7CF8 ; # 糸
+        :right    rep.mj:001247   # &MJ001247;
+    ] .
+rep.mj:003617   # &MJ003617;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x7CF8 ; # 糸
+        :right    rep.jis-x0212:0x6676   # &HD-JB-6676;
+    ] .
+rep.mj:003642   # 䍑
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7F51 ; # 网
+        :below    a.ucs:0x5E72   # å¹²
+    ] .
+rep.mj:003943   # &MJ003943;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x821F ; # 舟
+        :right    rep.daikanwa:28634   # &M-28634;
+    ] .
+rep.mj:003972   # &MJ003972;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBF ; # ⺿
+        :below    rep.adobe-japan1-0:02455   # &AJ1-02455;
+    ] .
+rep.mj:004018   # &MJ004018;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBE ; # ⺾
+        :below    a.ucs:0x8863   # è¡£
+    ] .
+rep.mj:004067   # &MJ004067;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBF ; # ⺿
+        :below    rep.adobe-japan1-0:04258   # &AJ1-04258;
+    ] .
+rep.mj:004166   # &MJ004166;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBE ; # ⺾
+        :below    a.ucs:0x9682   # 隂
+    ] .
+rep.mj:004205   # &MJ004205;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBF ; # ⺿
+        :below    rep.ucs-itaiji-001:0x24568   # &U-i001+24568;
+    ] .
+rep.mj:004211   # &MJ004211;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x2EBF ; # ⺿
+        :below    rep.mj:016002   # &MJ016002;
+    ] .
+rep.mj:004276   # &MJ004276;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x4E3F ; # 丿
+        :below    a.ucs:0x866B   # 虫
+    ] .
+rep.mj:004407   # &MJ004407;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8864 ; # 衤
+        :right    a.ucs:0x672E   # 朮
+    ] .
+rep.mj:004423   # &MJ004423;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8864 ; # 衤
+        :right    a.ucs:0x5F54   # 彔
+    ] .
+rep.mj:004477   # &MJ004477;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8864 ; # 衤
+        :right    rep.jis-x0212:0x6676   # &HD-JB-6676;
+    ] .
 rep.mj:004487   # &MJ004487;
     :structure [ a idc:⿱ ;
         :above    rep.cns11643-5:0x2B47 ; # &C5-2B47;
         :below    a.ucs:0x5DF1   # å·±
     ] .
+rep.mj:004503   # &MJ004503;
+    :structure [ a idc:â¿° ;
+        :left     rep.mj:021701 ; # &MJ021701;
+        :right    a.ucs:0x898B   # 見
+    ] .
+rep.mj:004519   # &MJ004519;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:01455 ; # &AJ1-01455;
+        :right    a.ucs:0x516C   # 公
+    ] .
+rep.mj:004528   # &MJ004528;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:01455 ; # &AJ1-01455;
+        :right    a.ucs:0x6606   # 昆
+    ] .
+rep.mj:004530   # &MJ004530;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:01455 ; # &AJ1-01455;
+        :right    a.ucs:0x67BC   # 枼
+    ] .
+rep.mj:004533   # &MJ004533;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:01455 ; # &AJ1-01455;
+        :right    rep.jis-x0212:0x5A39   # &JSP-5A39;
+    ] .
+rep.mj:004538   # &MJ004538;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x656B ; # 敫
+        :below    rep.adobe-japan1-0:01455   # &AJ1-01455;
+    ] .
+rep.mj:004541   # &MJ004541;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:01455 ; # &AJ1-01455;
+        :right    rep.jis-x0212:0x6676   # &HD-JB-6676;
+    ] .
+rep.mj:004642   # &MJ004642;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8A00 ; # 言
+        :right    a.ucs:0x5967   # 奧
+    ] .
+rep.mj:004643   # &MJ004643;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8A00 ; # 言
+        :right    rep.cns11643-1:0x6634   # &HD-JT-B9DA;
+    ] .
+rep.mj:004644   # &MJ004644;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x8A00 ; # 言
+        :right    rep.cns11643-1:0x655C   # &C1-655C;
+    ] .
+rep.mj:006293   # &MJ006293;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x9FA0 ; # é¾ 
+        :right    rep.jis-x0212:0x5A39   # &JSP-5A39;
+    ] .
 rep.mj:006311   # &MJ006311;
     :structure [ a idc:⿹ ;
         :surround rep.big5-cdp:0x8BBF ; # &CDP-8BBF;
@@ -151,9 +532,9 @@ rep.mj:006467   # &MJ006467;
         :above    a.ucs:0x4EA0 ; # 亠
         :below    a.ucs:0x7236   # 父
     ] .
-rep.mj:006470   # &MJ006470;
+rep.mj:006470   # 亥
     :structure [ a idc:⿳ ;
-        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+        :above    a.ucs:0x4EA0 ; # 亠
         :middle   rep.gt:00154 ; # &GT-00154;
         :below    a.ucs:0x4EBA   # 人
     ] .
@@ -161,7 +542,7 @@ rep.mj:006471   # &MJ006471;
     :structure [ a idc:⿳ ;
         :above    a.ucs:0x2011E ; # 𠄞
         :middle   rep.gt:00154 ; # &GT-00154;
-        :below    a.ucs:0x4EBA   # 人
+        :below    rep.gt-k:00049   # &GT-K00049;
     ] .
 rep.mj:006477   # &MJ006477;
     :structure [ a idc:⿱ ;
@@ -210,13 +591,13 @@ rep.mj:006558   # 伀
     ] .
 rep.mj:006559   # &MJ006559;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E85 ; # ⺅
-        :right    g2.mj:0x1C6B   # &g2-MJ007275;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    a.jis-x0213-1:0x3878   # &G-MJ007275;
     ] .
 rep.mj:006569   # &MJ006569;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:04649   # &AJ1-04649;
+        :right    rep.adobe-japan1-0:04649   # &AJ1-04649;
     ] .
 rep.mj:006570   # &MJ006570;
     :structure [ a idc:â¿° ;
@@ -245,7 +626,7 @@ rep.mj:006605   # 伶
     ] .
 rep.mj:006606   # &MJ006606;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E85 ; # ⺅
+        :left     a.ucs:0x4EBB ; # 亻
         :right    rep.gt-k:01022   # &GT-K01022;
     ] .
 rep.mj:006632   # 住
@@ -255,7 +636,7 @@ rep.mj:006632   # 住
     ] .
 rep.mj:006633   # &MJ006633;
     :structure [ a idc:â¿° ;
-        :left     a.ucs:0x2E85 ; # ⺅
+        :left     a.ucs:0x4EBB ; # 亻
         :right    rep.mj:006363   # &MJ006363;
     ] .
 rep.mj:006651   # &MJ006651;
@@ -296,7 +677,7 @@ rep.mj:006762   # &MJ006762;
 rep.mj:006763   # &MJ006763;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:08425   # &AJ1-08425;
+        :right    rep.adobe-japan1-2:08425   # &AJ1-08425;
     ] .
 rep.mj:006829   # &MJ006829;
     :structure [ a idc:⿸ ;
@@ -361,12 +742,12 @@ rep.mj:006863   # &MJ006863;
 rep.mj:006885   # &MJ006885;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:01267   # &AJ1-01267;
+        :right    rep.mj:021700   # &MJ021700;
     ] .
 rep.mj:006886   # &MJ006886;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.gt:40028   # &HD-IB-3B76;
+        :right    rep.mj:021701   # &MJ021701;
     ] .
 rep.mj:006888   # &MJ006888;
     :structure [ a idc:â¿° ;
@@ -378,7 +759,12 @@ rep.mj:006889   # &MJ006889;
         :left     a.ucs:0x4EBB ; # 亻
         :right    rep.mj:007532   # &MJ007532;
     ] .
-rep.mj:006898   # 偉
+rep.mj:006898   # &MJ006898;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.gt:57812   # &GT-57812;
+    ] .
+rep.mj:006899   # 偉
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
         :right    a.ucs:0x97CB   # 韋
@@ -406,13 +792,23 @@ rep.mj:006947   # &MJ006947;
 rep.mj:006967   # &MJ006967;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:17537   # &AJ1-17537;
+        :right    rep.adobe-japan1-5:17537   # &AJ1-17537;
     ] .
 rep.mj:006968   # &MJ006968;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
         :right    rep.hanyo-denshi...tk:01023430   # &HD-TK-01023430;
     ] .
+rep.mj:006979   # 傍
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    a.ucs:0x65C1   # 旁
+    ] .
+rep.mj:006980   # &MJ006980;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.mj:057637   # &MJ057637;
+    ] .
 rep.mj:006986   # 傑
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
@@ -421,7 +817,7 @@ rep.mj:006986   # 傑
 rep.mj:006991   # &MJ006991;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.gt:01936   # &GT-01936;
+        :right    rep.mj:056985   # &MJ056985;
     ] .
 rep.mj:006992   # &MJ006992;
     :structure [ a idc:â¿° ;
@@ -433,10 +829,15 @@ rep.mj:006997   # &MJ006997;
         :left     a.ucs:0x4EBB ; # 亻
         :right    rep.daikanwa:21714   # &M-21714;
     ] .
+rep.mj:007022   # &MJ007022;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.adobe-japan1-0:02704   # &AJ1-02704;
+    ] .
 rep.mj:007023   # &MJ007023;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:04642   # &AJ1-04642;
+        :right    rep.adobe-japan1-0:04642   # &AJ1-04642;
     ] .
 rep.mj:007024   # &MJ007024;
     :structure [ a idc:â¿° ;
@@ -486,12 +887,12 @@ rep.mj:007063   # &MJ007063;
 rep.mj:007064   # &MJ007064;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2E85 ; # ⺅
-        :right    g2.mj:0x615A   # &g2-MJ024922;
+        :right    g2.mj:024922   # &g2-MJ024922;
     ] .
 rep.mj:007095   # 僧
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:02752   # &AJ1-02752;
+        :right    rep.adobe-japan1-0:02752   # &AJ1-02752;
     ] .
 rep.mj:007096   # &MJ007096;
     :structure [ a idc:â¿° ;
@@ -506,7 +907,7 @@ rep.mj:007102   # &MJ007102;
 rep.mj:007103   # &MJ007103;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2E85 ; # ⺅
-        :right    g2.mj:0x34C4   # &g2-MJ013508;
+        :right    g2.mj:013508   # &g2-MJ013508;
     ] .
 rep.mj:007104   # 僮
     :structure [ a idc:â¿° ;
@@ -534,10 +935,15 @@ rep.mj:007111   # &MJ007111;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x8980 ; # 覀
-                :below    g2.mj:0x5377   # &g2-MJ021367;
+                :below    g2.mj:021367   # &g2-MJ021367;
             ]
         ]
     ] .
+rep.mj:007118   # &MJ007118;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.cns11643-1:0x6634   # &HD-JT-B9DA;
+    ] .
 rep.mj:007133   # 億
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
@@ -548,6 +954,11 @@ rep.mj:007134   # &MJ007134;
         :left     a.ucs:0x2E85 ; # ⺅
         :right    rep.jef-china3:0x4DD9   # &g2-AJ1-13639;
     ] .
+rep.mj:007143   # &MJ007143;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x4EBB ; # 亻
+        :right    rep.ucs-var-001:0x21570   # &U-v001+21570;
+    ] .
 rep.mj:007158   # &MJ007158;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
@@ -581,12 +992,12 @@ rep.mj:007179   # &MJ007179;
 rep.mj:007180   # &MJ007180;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.ucs-bmp-itaiji-004:0x6182   # &U-i004+6182;
+        :right    rep.ucs-itaiji-004:0x6182   # &U-i004+6182;
     ] .
 rep.mj:007190   # &MJ007190;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x4EBB ; # 亻
-        :right    rep.adobe-japan1:02430   # &AJ1-02430;
+        :right    rep.adobe-japan1-0:02430   # &AJ1-02430;
     ] .
 rep.mj:007191   # &MJ007191;
     :structure [ a idc:â¿° ;
@@ -610,7 +1021,7 @@ rep.mj:007222   # 兊
     ] .
 rep.mj:007224   # &MJ007224;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x1C6B ; # &g2-MJ007275;
+        :above    a.jis-x0213-1:0x3878 ; # &G-MJ007275;
         :below    a.ucs:0x513F   # 儿
     ] .
 rep.mj:007227   # 兌
@@ -670,7 +1081,7 @@ rep.mj:007275   # 公
     ] .
 rep.mj:007276   # &MJ007276;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x1C69 ; # &g2-MJ007273;
+        :above    rep.jef-china3:0x43E4 ; # &G-MJ007273;
         :below    a.ucs:0x53B6   # 厶
     ] .
 rep.mj:007278   # 兮
@@ -704,21 +1115,30 @@ rep.mj:007289   # &MJ007289;
         :below    rep.gt-k:00059   # &GT-K00059;
     ] .
 rep.mj:007296   # &MJ007296;
-    :structure [ a idc:⿳ ;
-        :above    a.ucs:0x516B ; # 八
-        :middle   a.ucs:0x4E00 ; # 一
+    :structure [ a idc:⿱ ;
+        :above    rep.ucs-var-001:0x4491 ; # &U-v001+4491;
         :below    rep.big5-cdp:0x8CDE   # &CDP-8CDE;
     ] .
 rep.mj:007297   # &MJ007297;
     :structure [ a idc:⿱ ;
-        :above    a.ucs:0x4491 ; # 䒑
+        :above    rep.jis-x0213-2:0x7577 ; # &JX2-7577;
         :below    rep.big5-cdp:0x8CDE   # &CDP-8CDE;
     ] .
+rep.mj:007298   # &MJ007298;
+    :structure [ a idc:⿱ ;
+        :above    rep.jis-x0213-2:0x7577 ; # &JX2-7577;
+        :below    rep.big5-cdp-itaiji-002:0x8CDE   # &CDP-i002-8CDE;
+    ] .
 rep.mj:007299   # &MJ007299;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x516B ; # 八
         :below    rep.mj:017706   # &MJ017706;
     ] .
+rep.mj:007302   # &MJ007302;
+    :structure [ a idc:â¿´ ;
+        :surround a.ucs:0x5182 ; # 冂
+        :filling  a.ucs_component:0x4E8C   # &A-compU+4E8C;
+    ] .
 rep.mj:007312   # 再
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x4E00 ; # 一
@@ -731,12 +1151,12 @@ rep.mj:007313   # &MJ007313;
     ] .
 rep.mj:007320   # &MJ007320;
     :structure [ a idc:â¿» ;
-        :underlying rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
+        :underlying a.ucs:0x2000E ; # 𠀎
         :overlaying rep.mj:007307   # &MJ007307;
     ] .
 rep.mj:007321   # &MJ007321;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
+        :above    a.ucs:0x2000E ; # 𠀎
         :below    rep.mj:007308   # &MJ007308;
     ] .
 rep.mj:007324   # &MJ007324;
@@ -744,6 +1164,11 @@ rep.mj:007324   # &MJ007324;
         :above    a.ucs:0x5183 ; # 冃
         :below    rep.mj:007229   # &MJ007229;
     ] .
+rep.mj:007326   # &MJ007326;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x66F0 ; # 曰
+        :below    rep.mj:007230   # &MJ007230;
+    ] .
 rep.mj:007329   # &MJ007329;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x5196 ; # 冖
@@ -847,7 +1272,7 @@ rep.mj:007395   # &MJ007395;
 rep.mj:007396   # &MJ007396;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x51AB ; # 冫
-        :right    rep.adobe-japan1:14444   # &AJ1-14444;
+        :right    rep.adobe-japan1-4:14444   # &AJ1-14444;
     ] .
 rep.mj:007413   # &MJ007413;
     :structure [ a idc:⿱ ;
@@ -893,10 +1318,10 @@ rep.mj:007455   # &MJ007455;
     ] .
 rep.mj:007456   # &MJ007456;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x1C69 ; # &g2-MJ007273;
-        :below    g2.ucs_unicode:0x5200   # &g2-AJ1-03163;
+        :above    rep.jef-china3:0x43E4 ; # &G-MJ007273;
+        :below    a.ucs:0x5200   # 刀
     ] .
-rep.mj:007458   # &MJ007458;
+rep.mj:007458   # 𭃄
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5341 ; # 十
         :right    a.ucs:0x5200   # 刀
@@ -923,7 +1348,7 @@ rep.mj:007527   # &MJ007527;
     ] .
 rep.mj:007528   # &MJ007528;
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:02491 ; # &AJ1-02491;
+        :left     rep.mj:020928 ; # &MJ020928;
         :right    a.ucs:0x5202   # 刂
     ] .
 rep.mj:007531   # &MJ007531;
@@ -946,6 +1371,11 @@ rep.mj:007532   # &MJ007532;
         ] ;
         :filling  a.ucs:0x5202   # 刂
     ] .
+rep.mj:007533   # &MJ007533;
+    :structure [ a idc:â¿° ;
+        :left     rep.ucs_iso:0x233C2 ; # &GT-18397;
+        :right    a.ucs:0x5202   # 刂
+    ] .
 rep.mj:007571   # &MJ007571;
     :structure [ a idc:â¿° ;
         :left     rep.mj:010160 ; # &MJ010160;
@@ -958,7 +1388,7 @@ rep.mj:007572   # &MJ007572;
     ] .
 rep.mj:007574   # &MJ007574;
     :structure [ a idc:â¿° ;
-        :left     rep.adobe-japan1:06354 ; # &AJ1-06354;
+        :left     rep.mj:021865 ; # &MJ021865;
         :right    a.ucs:0x5202   # 刂
     ] .
 rep.mj:007575   # &MJ007575;
@@ -998,7 +1428,7 @@ rep.mj:007612   # &MJ007612;
     ] .
 rep.mj:007645   # &MJ007645;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17299 ; # &AJ1-17299;
+        :above    rep.adobe-japan1-5:17299 ; # &AJ1-17299;
         :below    a.ucs:0x529B   # 力
     ] .
 rep.mj:007646   # &MJ007646;
@@ -1044,12 +1474,12 @@ rep.mj:007693   # &MJ007693;
 rep.mj:007694   # &MJ007694;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x2E9C ; # ⺜
-        :below    rep.adobe-japan1:02431   # &AJ1-02431;
+        :below    rep.adobe-japan1-0:02431   # &AJ1-02431;
     ] .
 rep.mj:007695   # &MJ007695;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x66F0 ; # 曰
-        :below    rep.adobe-japan1:02431   # &AJ1-02431;
+        :below    rep.adobe-japan1-0:02431   # &AJ1-02431;
     ] .
 rep.mj:007700   # &MJ007700;
     :structure [ a idc:â¿° ;
@@ -1063,7 +1493,7 @@ rep.mj:007701   # &MJ007701;
     ] .
 rep.mj:007703   # &MJ007703;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:03378 ; # &AJ1-03378;
+        :above    rep.mj:022034 ; # &MJ022034;
         :below    a.ucs:0x529B   # 力
     ] .
 rep.mj:007704   # &MJ007704;
@@ -1073,7 +1503,7 @@ rep.mj:007704   # &MJ007704;
     ] .
 rep.mj:007705   # &MJ007705;
     :structure [ a idc:â¿° ;
-        :left     rep.jis-x0213-2:0x747B ; # &JX2-747B;
+        :left     rep.adobe-japan1-5:18400 ; # &AJ1-18400;
         :right    a.ucs:0x529B   # 力
     ] .
 rep.mj:007706   # &MJ007706;
@@ -1144,16 +1574,21 @@ rep.mj:007758   # 包
 rep.mj:007761   # &MJ007761;
     :structure [ a idc:⿹ ;
         :surround a.ucs:0x52F9 ; # 勹
-        :filling  a.ucs:0x5915   # 夕
+        :filling  a.ucs:0x5902   # 夂
     ] .
 rep.mj:007762   # &MJ007762;
     :structure [ a idc:⿹ ;
         :surround a.ucs:0x52F9 ; # 勹
         :filling  a.ucs:0x5915   # 夕
     ] .
+rep.mj:007782   # &MJ007782;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x5315 ; # 匕
+        :right    a.ucs:0x21FFA   # 𡿺
+    ] .
 rep.mj:007817   # &MJ007817;
     :structure [ a idc:â¿· ;
-        :surround rep.adobe-japan1:04307 ; # &AJ1-04307;
+        :surround rep.adobe-japan1-0:04307 ; # &AJ1-04307;
         :filling  a.ucs:0x513F   # 儿
     ] .
 rep.mj:007818   # &MJ007818;
@@ -1179,7 +1614,7 @@ rep.mj:007827   # &MJ007827;
 rep.mj:007828   # &MJ007828;
     :structure [ a idc:â¿· ;
         :surround g2.ucs_unicode:0x5338 ; # &g2-UU+5338;
-        :filling  g2.mj:0x2F59   # &g2-MJ012121;
+        :filling  g2.mj:012121   # &g2-MJ012121;
     ] .
 rep.mj:007830   # &MJ007830;
     :structure [ a idc:â¿· ;
@@ -1204,7 +1639,7 @@ rep.mj:007833   # &MJ007833;
 rep.mj:007859   # &MJ007859;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5341 ; # 十
-        :right    rep.adobe-japan1:17537   # &AJ1-17537;
+        :right    rep.adobe-japan1-5:17537   # &AJ1-17537;
     ] .
 rep.mj:007860   # &MJ007860;
     :structure [ a idc:â¿° ;
@@ -1214,7 +1649,7 @@ rep.mj:007860   # &MJ007860;
 rep.mj:007861   # &MJ007861;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5341 ; # 十
-        :right    rep.adobe-japan1:02704   # &AJ1-02704;
+        :right    rep.adobe-japan1-0:02704   # &AJ1-02704;
     ] .
 rep.mj:007862   # &MJ007862;
     :structure [ a idc:â¿° ;
@@ -1241,9 +1676,14 @@ rep.mj:007891   # &MJ007891;
         :left     rep.big5-cdp:0x8B7C ; # &CDP-8B7C;
         :right    a.ucs:0x5369   # 卩
     ] .
+rep.mj:007892   # 即
+    :structure [ a idc:â¿° ;
+        :left     rep.gt-k:02400 ; # &CDP-v001-8B7C;
+        :right    a.ucs:0x5369   # 卩
+    ] .
 rep.mj:007897   # &MJ007897;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17299 ; # &AJ1-17299;
+        :above    rep.adobe-japan1-5:17299 ; # &AJ1-17299;
         :below    a.ucs:0x353E   # 㔾
     ] .
 rep.mj:007900   # &MJ007900;
@@ -1259,12 +1699,17 @@ rep.mj:007911   # &MJ007911;
 rep.mj:007914   # 卿
     :structure [ a idc:â¿° ;
         :left     rep.big5-cdp:0x8D41 ; # &CDP-8D41;
-        :right    rep.adobe-japan1:13365   # &AJ1-13365;
+        :right    rep.adobe-japan1-4:13365   # &AJ1-13365;
     ] .
 rep.mj:007915   # &MJ007915;
     :structure [ a idc:â¿° ;
         :left     rep.big5-cdp:0x8D41 ; # &CDP-8D41;
-        :right    rep.daikanwa:02873   # &M-02873;
+        :right    rep.daikanwa:02873   # &HD-JT-AE7B;
+    ] .
+rep.mj:007920   # &MJ007920;
+    :structure [ a idc:⿸ ;
+        :surround a.ucs:0x5382 ; # 厂
+        :filling  a.ucs:0x5DF3   # å·³
     ] .
 rep.mj:007931   # &MJ007931;
     :structure [ a idc:⿸ ;
@@ -1279,12 +1724,12 @@ rep.mj:007932   # &MJ007932;
 rep.mj:007948   # &MJ007948;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  rep.adobe-japan1:01591   # &AJ1-01591;
+        :filling  rep.adobe-japan1-0:01591   # &AJ1-01591;
     ] .
 rep.mj:007950   # &MJ007950;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  rep.adobe-japan1:13701   # &AJ1-13701;
+        :filling  rep.adobe-japan1-4:13701   # &AJ1-13701;
     ] .
 rep.mj:007951   # &MJ007951;
     :structure [ a idc:⿸ ;
@@ -1294,7 +1739,7 @@ rep.mj:007951   # &MJ007951;
 rep.mj:007952   # &MJ007952;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  g2.adobe-japan1-6:0x3585   # &g2-AJ1-13701;
+        :filling  g2.adobe-japan1-4:13701   # &g2-AJ1-13701;
     ] .
 rep.mj:007965   # &MJ007965;
     :structure [ a idc:⿸ ;
@@ -1304,7 +1749,7 @@ rep.mj:007965   # &MJ007965;
 rep.mj:007966   # &MJ007966;
     :structure [ a idc:⿸ ;
         :surround a.ucs:0x5382 ; # 厂
-        :filling  rep.adobe-japan1:06408   # &AJ1-06408;
+        :filling  rep.mj:022254   # &MJ022254;
     ] .
 rep.mj:008009   # &MJ008009;
     :structure [ a idc:â¿° ;
@@ -1316,20 +1761,25 @@ rep.mj:008010   # &MJ008010;
         :left     rep.mj:007844 ; # &MJ007844;
         :right    a.ucs:0x53CD   # 反
     ] .
+rep.mj:008017   # 叟
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x7533 ; # 申
+        :below    a.ucs:0x53C8   # 又
+    ] .
 rep.mj:008018   # &MJ008018;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8CCD ; # &CDP-8CCD;
+        :above    rep.ucs-var-001:0x26954 ; # &U-v001+26954;
         :below    a.ucs:0x53C8   # 又
     ] .
 rep.mj:008019   # &MJ008019;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8CCD ; # &CDP-8CCD;
+        :above    rep.ucs_iso:0x26954 ; # &C6-2D73;
         :below    a.ucs:0x53C8   # 又
     ] .
 rep.mj:008031   # &MJ008031;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:17237   # &AJ1-17237;
+        :right    rep.adobe-japan1-5:17237   # &AJ1-17237;
     ] .
 rep.mj:008032   # &MJ008032;
     :structure [ a idc:â¿° ;
@@ -1364,7 +1814,7 @@ rep.mj:008134   # &MJ008134;
 rep.mj:008144   # &MJ008144;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:01760   # &AJ1-01760;
+        :right    rep.adobe-japan1-0:01760   # &AJ1-01760;
     ] .
 rep.mj:008145   # &MJ008145;
     :structure [ a idc:â¿° ;
@@ -1419,7 +1869,7 @@ rep.mj:008279   # &MJ008279;
 rep.mj:008280   # &MJ008280;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:02491   # &AJ1-02491;
+        :right    rep.mj:020928   # &MJ020928;
     ] .
 rep.mj:008313   # &MJ008313;
     :structure [ a idc:â¿° ;
@@ -1429,7 +1879,7 @@ rep.mj:008313   # &MJ008313;
 rep.mj:008314   # &MJ008314;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:08425   # &AJ1-08425;
+        :right    rep.adobe-japan1-2:08425   # &AJ1-08425;
     ] .
 rep.mj:008325   # &MJ008325;
     :structure [ a idc:⿸ ;
@@ -1449,13 +1899,18 @@ rep.mj:008351   # &MJ008351;
 rep.mj:008357   # &MJ008357;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:01305   # &AJ1-01305;
+        :right    rep.adobe-japan1-0:01305   # &AJ1-01305;
     ] .
 rep.mj:008358   # &MJ008358;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
         :right    rep.daikanwa:13628   # &M-13628;
     ] .
+rep.mj:008364   # 唿
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x53E3 ; # 口
+        :right    a.ucs:0x5FFD   # 忽
+    ] .
 rep.mj:008370   # &MJ008370;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
@@ -1464,7 +1919,7 @@ rep.mj:008370   # &MJ008370;
 rep.mj:008372   # &MJ008372;
     :structure [ a idc:â¿° ;
         :left     g2.ucs_unicode:0x53E3 ; # &g2-AJ1-01969;
-        :right    g2.mj:0x614B   # &g2-MJ024907;
+        :right    g2.mj:024907   # &g2-MJ024907;
     ] .
 rep.mj:008374   # &MJ008374;
     :structure [ a idc:â¿° ;
@@ -1473,7 +1928,7 @@ rep.mj:008374   # &MJ008374;
     ] .
 rep.mj:008391   # &MJ008391;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8CB6 ; # &CDP-8CB6;
+        :above    rep.gt:16595 ; # &GT-16595;
         :below    a.ucs:0x53E3   # 口
     ] .
 rep.mj:008392   # 啓
@@ -1519,12 +1974,12 @@ rep.mj:008449   # &MJ008449;
 rep.mj:008469   # &MJ008469;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.daikanwa:02873   # &M-02873;
+        :right    rep.daikanwa:02873   # &HD-JT-AE7B;
     ] .
 rep.mj:008470   # &MJ008470;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:13365   # &AJ1-13365;
+        :right    rep.adobe-japan1-4:13365   # &AJ1-13365;
     ] .
 rep.mj:008480   # &MJ008480;
     :structure [ a idc:â¿° ;
@@ -1539,7 +1994,7 @@ rep.mj:008481   # &MJ008481;
 rep.mj:008482   # &MJ008482;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:04216   # &AJ1-04216;
+        :right    rep.adobe-japan1-0:04216   # &AJ1-04216;
     ] .
 rep.mj:008483   # &MJ008483;
     :structure [ a idc:â¿° ;
@@ -1564,12 +2019,17 @@ rep.mj:008493   # 喰
 rep.mj:008494   # &MJ008494;
     :structure [ a idc:â¿° ;
         :left     g2.ucs_unicode:0x53E3 ; # &g2-AJ1-01969;
-        :right    g2.cns11643-1:0x537A   # &g2-GT-59026;
+        :right    g2.ks-x1001:0x635D   # &g2-GT-59026;
+    ] .
+rep.mj:008523   # &MJ008523;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x53E3 ; # 口
+        :right    rep.mj:010159   # &MJ010159;
     ] .
 rep.mj:008526   # &MJ008526;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:06354   # &AJ1-06354;
+        :right    rep.mj:021865   # &MJ021865;
     ] .
 rep.mj:008527   # &MJ008527;
     :structure [ a idc:â¿° ;
@@ -1614,7 +2074,7 @@ rep.mj:008561   # &MJ008561;
 rep.mj:008562   # &MJ008562;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:14097   # &AJ1-14097;
+        :right    rep.adobe-japan1-4:14097   # &AJ1-14097;
     ] .
 rep.mj:008595   # &MJ008595;
     :structure [ a idc:â¿° ;
@@ -1634,12 +2094,12 @@ rep.mj:008603   # &MJ008603;
 rep.mj:008604   # &MJ008604;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:03729   # &AJ1-03729;
+        :right    rep.adobe-japan1-0:03729   # &AJ1-03729;
     ] .
 rep.mj:008610   # &MJ008610;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:01370   # &AJ1-01370;
+        :right    rep.mj:022150   # &MJ022150;
     ] .
 rep.mj:008611   # &MJ008611;
     :structure [ a idc:â¿° ;
@@ -1699,7 +2159,7 @@ rep.mj:008694   # &MJ008694;
 rep.mj:008697   # &MJ008697;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:06765   # &AJ1-06765;
+        :right    rep.adobe-japan1-0:06765   # &AJ1-06765;
     ] .
 rep.mj:008701   # &MJ008701;
     :structure [ a idc:â¿° ;
@@ -1714,7 +2174,7 @@ rep.mj:008702   # &MJ008702;
 rep.mj:008720   # &MJ008720;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:06415   # &AJ1-06415;
+        :right    rep.mj:022522   # &MJ022522;
     ] .
 rep.mj:008721   # &MJ008721;
     :structure [ a idc:â¿° ;
@@ -1734,7 +2194,7 @@ rep.mj:008745   # &MJ008745;
 rep.mj:008757   # &MJ008757;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:03966   # &AJ1-03966;
+        :right    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:008758   # &MJ008758;
     :structure [ a idc:â¿° ;
@@ -1759,17 +2219,17 @@ rep.mj:008766   # &MJ008766;
 rep.mj:008783   # &MJ008783;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:06874   # &AJ1-06874;
+        :right    rep.adobe-japan1-0:06874   # &AJ1-06874;
     ] .
 rep.mj:008784   # &MJ008784;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.ucs-bmp-var-002:0x8F49   # &U-v002+8F49;
+        :right    rep.ucs-var-002:0x8F49   # &U-v002+8F49;
     ] .
 rep.mj:008793   # &MJ008793;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:06465   # &AJ1-06465;
+        :right    rep.mj:023068   # &MJ023068;
     ] .
 rep.mj:008794   # &MJ008794;
     :structure [ a idc:â¿° ;
@@ -1789,7 +2249,7 @@ rep.mj:008809   # &MJ008809;
 rep.mj:008810   # &MJ008810;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x53E3 ; # 口
-        :right    rep.adobe-japan1:07465   # &AJ1-07465;
+        :right    rep.adobe-japan1-0:07465   # &AJ1-07465;
     ] .
 rep.mj:008843   # 囶
     :structure [ a idc:â¿´ ;
@@ -1814,12 +2274,12 @@ rep.mj:008868   # &MJ008868;
 rep.mj:008869   # &MJ008869;
     :structure [ a idc:â¿´ ;
         :surround a.ucs:0x56D7 ; # 囗
-        :filling  g2.jis-x0208_1990:0x706A   # &g2-AJ1-07171;
+        :filling  a.jis-x0208:0x706A   # &G-MJ028060;
     ] .
 rep.mj:008880   # &MJ008880;
     :structure [ a idc:â¿´ ;
         :surround a.ucs:0x56D7 ; # 囗
-        :filling  rep.adobe-japan1:21281   # &AJ1-21281;
+        :filling  rep.adobe-japan1-6:21281   # &AJ1-21281;
     ] .
 rep.mj:008917   # &MJ008917;
     :structure [ a idc:â¿° ;
@@ -1829,12 +2289,12 @@ rep.mj:008917   # &MJ008917;
 rep.mj:008934   # &MJ008934;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:08403   # &AJ1-08403;
+        :right    rep.adobe-japan1-2:08403   # &AJ1-08403;
     ] .
 rep.mj:008935   # &MJ008935;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:14287   # &AJ1-14287;
+        :right    rep.adobe-japan1-4:14287   # &AJ1-14287;
     ] .
 rep.mj:008966   # &MJ008966;
     :structure [ a idc:â¿° ;
@@ -1869,12 +2329,12 @@ rep.mj:009007   # 垓
 rep.mj:009062   # &MJ009062;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:02642   # &AJ1-02642;
+        :right    rep.adobe-japan1-0:02642   # &AJ1-02642;
     ] .
 rep.mj:009067   # &MJ009067;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:17535   # &AJ1-17535;
+        :right    rep.adobe-japan1-5:17535   # &AJ1-17535;
     ] .
 rep.mj:009068   # &MJ009068;
     :structure [ a idc:â¿° ;
@@ -1895,7 +2355,7 @@ rep.mj:009070   # &MJ009070;
 rep.mj:009174   # &MJ009174;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:05099   # &AJ1-05099;
+        :right    rep.adobe-japan1-0:05099   # &AJ1-05099;
     ] .
 rep.mj:009175   # &MJ009175;
     :structure [ a idc:â¿° ;
@@ -1905,7 +2365,7 @@ rep.mj:009175   # &MJ009175;
 rep.mj:009176   # &MJ009176;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:02304   # &AJ1-02304;
+        :right    rep.adobe-japan1-0:02304   # &AJ1-02304;
     ] .
 rep.mj:009177   # &MJ009177;
     :structure [ a idc:â¿° ;
@@ -1930,7 +2390,7 @@ rep.mj:009202   # 塑
 rep.mj:009205   # &MJ009205;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:06354   # &AJ1-06354;
+        :right    rep.mj:021865   # &MJ021865;
     ] .
 rep.mj:009206   # &MJ009206;
     :structure [ a idc:â¿° ;
@@ -1968,23 +2428,13 @@ rep.mj:009237   # &MJ009237;
         :below    a.ucs:0x571F   # 土
     ] .
 rep.mj:009270   # &MJ009270;
-    :structure [ a idc:â¿° ;
-        :left     [
-            :structure [ a idc:â¿° ;
-                :left     [
-                    :structure [ a idc:⿱ ;
-                        :above    a.ucs:0x767D ; # 白
-                        :below    a.ucs:0x5315   # 匕
-                    ]
-                ] ;
-                :right    a.ucs:0x65E1   # 旡
-            ]
-        ] ;
-        :right    a.ucs:0x571F   # 土
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-4:13701 ; # &AJ1-13701;
+        :below    a.ucs:0x571F   # 土
     ] .
 rep.mj:009279   # &MJ009279;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:03378 ; # &AJ1-03378;
+        :above    rep.mj:022034 ; # &MJ022034;
         :below    a.ucs:0x571F   # 土
     ] .
 rep.mj:009280   # &MJ009280;
@@ -1999,7 +2449,7 @@ rep.mj:009286   # &MJ009286;
     ] .
 rep.mj:009287   # &MJ009287;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x6BFE ; # &g2-MJ027646;
+        :above    g2.mj:027646 ; # &g2-MJ027646;
         :below    a.ucs:0x571F   # 土
     ] .
 rep.mj:009290   # &MJ009290;
@@ -2015,7 +2465,7 @@ rep.mj:009291   # &MJ009291;
 rep.mj:009292   # &MJ009292;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    a.ucs:0x865A   # 虚
+        :right    rep.adobe-japan1-0:01679   # &AJ1-01679;
     ] .
 rep.mj:009304   # &MJ009304;
     :structure [ a idc:â¿° ;
@@ -2055,7 +2505,7 @@ rep.mj:009345   # &MJ009345;
 rep.mj:009350   # &MJ009350;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:01430   # &AJ1-01430;
+        :right    rep.mj:022549   # &MJ022549;
     ] .
 rep.mj:009351   # &MJ009351;
     :structure [ a idc:â¿° ;
@@ -2079,13 +2529,13 @@ rep.mj:009361   # &MJ009361;
     ] .
 rep.mj:009368   # &MJ009368;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:03966 ; # &AJ1-03966;
+        :above    rep.adobe-japan1-0:03966 ; # &AJ1-03966;
         :below    a.ucs:0x571F   # 土
     ] .
 rep.mj:009370   # &MJ009370;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x571F ; # 土
-        :right    rep.adobe-japan1:03966   # &AJ1-03966;
+        :right    rep.adobe-japan1-0:03966   # &AJ1-03966;
     ] .
 rep.mj:009371   # &MJ009371;
     :structure [ a idc:â¿° ;
@@ -2095,13 +2545,18 @@ rep.mj:009371   # &MJ009371;
 rep.mj:009419   # &MJ009419;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x268FB ; # 𦣻
-        :below    a.ucs:0x5902   # 夂
+        :below    a.ucs:0x590A   # 夊
     ] .
 rep.mj:009420   # &MJ009420;
     :structure [ a idc:⿱ ;
         :above    a.ucs:0x268FB ; # 𦣻
         :below    a.ucs:0x5902   # 夂
     ] .
+rep.mj:009427   # &MJ009427;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x4E37 ; # 丷
+        :below    rep.ucs-var-004:0x5912   # &U-v004+5912;
+    ] .
 rep.mj:009433   # &MJ009433;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5915 ; # 夕
@@ -2114,18 +2569,12 @@ rep.mj:009434   # &MJ009434;
     ] .
 rep.mj:009438   # &MJ009438;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:14521 ; # &AJ1-14521;
+        :above    rep.adobe-japan1-4:14521 ; # &AJ1-14521;
         :below    a.ucs:0x5915   # 夕
     ] .
-rep.mj:009446   # 夢
+rep.mj:009446   # &MJ009446;
     :structure [ a idc:⿱ ;
-        :above    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x2EBE ; # ⺾
-                :middle   rep.gt:36329 ; # &GT-36329;
-                :below    a.ucs:0x5196   # 冖
-            ]
-        ] ;
+        :above    rep.gt-k:07341 ; # &GT-K07341;
         :below    a.ucs:0x5915   # 夕
     ] .
 rep.mj:009447   # &MJ009447;
@@ -2148,11 +2597,21 @@ rep.mj:009480   # &MJ009480;
         :above    a.ucs:0x5927 ; # 大
         :below    rep.mj:010777   # &MJ010777;
     ] .
+rep.mj:009490   # &MJ009490;
+    :structure [ a idc:⿱ ;
+        :above    rep.gt:02444 ; # &GT-02444;
+        :below    a.ucs:0x5927   # 大
+    ] .
 rep.mj:009491   # &MJ009491;
     :structure [ a idc:⿱ ;
         :above    rep.gt:02447 ; # &GT-02447;
         :below    a.ucs:0x5927   # 大
     ] .
+rep.mj:009492   # &MJ009492;
+    :structure [ a idc:⿱ ;
+        :above    rep.cns11643-5:0x2230 ; # &C5-2230;
+        :below    a.ucs:0x5927   # 大
+    ] .
 rep.mj:009493   # &MJ009493;
     :structure [ a idc:⿱ ;
         :above    rep.big5-cdp:0x8CE9 ; # &CDP-8CE9;
@@ -2175,12 +2634,12 @@ rep.mj:009513   # &MJ009513;
     ] .
 rep.mj:009514   # &MJ009514;
     :structure [ a idc:⿱ ;
-        :above    rep.jis-x0213-1_2004:0x3D36 ; # &HD-FT-3233;
+        :above    rep.mj:026434 ; # &MJ026434;
         :below    a.ucs:0x5927   # 大
     ] .
 rep.mj:009516   # &MJ009516;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:02368 ; # &AJ1-02368;
+        :above    rep.mj:026435 ; # &MJ026435;
         :below    a.ucs:0x5927   # 大
     ] .
 rep.mj:009599   # &MJ009599;
@@ -2221,7 +2680,7 @@ rep.mj:009735   # &MJ009735;
 rep.mj:009796   # &MJ009796;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    rep.adobe-japan1:04721   # &AJ1-04721;
+        :right    rep.adobe-japan1-0:04721   # &AJ1-04721;
     ] .
 rep.mj:009797   # 婦
     :structure [ a idc:â¿° ;
@@ -2248,6 +2707,11 @@ rep.mj:009852   # &MJ009852;
         :left     a.ucs:0x5973 ; # 女
         :right    rep.mj:016741   # &MJ016741;
     ] .
+rep.mj:009866   # &MJ009866;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x5973 ; # 女
+        :right    rep.mj:026434   # &MJ026434;
+    ] .
 rep.mj:009881   # &MJ009881;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
@@ -2286,7 +2750,7 @@ rep.mj:009894   # &MJ009894;
 rep.mj:009909   # &MJ009909;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x5973 ; # 女
-        :right    rep.gt:01936   # &GT-01936;
+        :right    rep.mj:056985   # &MJ056985;
     ] .
 rep.mj:009910   # &MJ009910;
     :structure [ a idc:â¿° ;