X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ISD-MJ-0.ttl;h=d56748bf7687f430f70cdf6c0ea5b105ee21c48c;hb=0419f83175062eefeb94b7472dd2ae7601d0e5c9;hp=28af6d9b637fb0d7c34de0d88e19200bbd8ea095;hpb=df8aeb91a3af47958ccbdc6d9d54276cd092158d;p=chise%2Fisd.git

diff --git a/ISD-MJ-0.ttl b/ISD-MJ-0.ttl
index 28af6d9..d56748b 100644
--- a/ISD-MJ-0.ttl
+++ b/ISD-MJ-0.ttl
@@ -4,17 +4,21 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @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=> .
@@ -32,23 +36,33 @@
 @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.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-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 
+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: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:000835   # &MJ000835;
     :structure [ a idc:⿱ ;
@@ -60,6 +74,11 @@ rep.mj:000836   # &MJ000836;
         :above    a.ucs:0x5C71 ; # å±±
         :below    a.ucs:0x738B   # 王
     ] .
+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 ; # 弓
@@ -72,9 +91,14 @@ rep.mj:001076   # &MJ001076;
     ] .
 rep.mj:001165   # &MJ001165;
     :structure [ a idc:⿱ ;
-        :above    rep.adobe-japan1:17472 ; # &AJ1-17472;
+        :above    rep.adobe-japan1-5:17472 ; # &AJ1-17472;
         :below    rep.cns11643-6:0x217E   # &C6-217E;
     ] .
+rep.mj:001193   # 㤵
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x5B5C ; # 孜
+        :below    a.ucs:0x5FC3   # 心
+    ] .
 rep.mj:001247   # &MJ001247;
     :structure [ a idc:⿱ ;
         :above    rep.daikanwa:19680 ; # &M-19680;
@@ -85,6 +109,11 @@ 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 ; # 方
@@ -95,11 +124,41 @@ rep.mj:001814   # &MJ001814;
         :left     a.ucs:0x6728 ; # 木
         :right    a.ucs:0x5C07   # 將
     ] .
+rep.mj:002066   # &MJ002066;
+    :structure [ a idc:⿱ ;
+        :above    rep.adobe-japan1-0:01694 ; # &AJ1-01694;
+        :below    a.ucs:0x6C34   # æ°´
+    ] .
+rep.mj:002208   # &MJ002208;
+    :structure [ a idc:â¿° ;
+        :left     a.ucs:0x6C35 ; # æ°µ
+        :right    rep.ucs_iso:0x21EDF   # &C4-4325;
+    ] .
 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:002594   # &MJ002594;
+    :structure [ a idc:â¿° ;
+        :left     rep.adobe-japan1-0:04216 ; # &AJ1-04216;
+        :right    a.ucs:0x74E6   # 瓦
+    ] .
 rep.mj:002815   # 䀠
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x76EE ; # 目
@@ -115,6 +174,11 @@ rep.mj:004166   # &MJ004166;
         :above    a.ucs:0x2EBE ; # ⺾
         :below    a.ucs:0x9682   # 隂
     ] .
+rep.mj:004276   # &MJ004276;
+    :structure [ a idc:⿱ ;
+        :above    a.ucs:0x4E3F ; # 丿
+        :below    a.ucs:0x866B   # 虫
+    ] .
 rep.mj:004487   # &MJ004487;
     :structure [ a idc:⿱ ;
         :above    rep.cns11643-5:0x2B47 ; # &C5-2B47;
@@ -162,7 +226,7 @@ rep.mj:006467   # &MJ006467;
     ] .
 rep.mj:006470   # &MJ006470;
     :structure [ a idc:⿳ ;
-        :above    rep.adobe-japan1:04110 ; # &AJ1-04110;
+        :above    rep.adobe-japan1-0:04110 ; # &AJ1-04110;
         :middle   rep.gt:00154 ; # &GT-00154;
         :below    a.ucs:0x4EBA   # 人
     ] .
@@ -220,12 +284,12 @@ rep.mj:006558   # 伀
 rep.mj:006559   # &MJ006559;
     :structure [ a idc:â¿° ;
         :left     a.ucs:0x2E85 ; # ⺅
-        :right    g2.mj:0x1C6B   # &g2-MJ007275;
+        :right    g2.mj:007275   # &g2-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:â¿° ;
@@ -264,7 +328,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;
@@ -305,7 +369,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:⿸ ;
@@ -387,7 +451,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   # 韋
@@ -415,7 +484,7 @@ 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:â¿° ;
@@ -430,7 +499,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:â¿° ;
@@ -445,7 +514,7 @@ rep.mj:006997   # &MJ006997;
 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:â¿° ;
@@ -495,12 +564,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:â¿° ;
@@ -515,7 +584,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:â¿° ;
@@ -543,7 +612,7 @@ rep.mj:007111   # &MJ007111;
         :right    [
             :structure [ a idc:⿱ ;
                 :above    a.ucs:0x8980 ; # 覀
-                :below    g2.mj:0x5377   # &g2-MJ021367;
+                :below    g2.mj:021367   # &g2-MJ021367;
             ]
         ]
     ] .
@@ -590,12 +659,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:â¿° ;
@@ -619,7 +688,7 @@ rep.mj:007222   # 兊
     ] .
 rep.mj:007224   # &MJ007224;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x1C6B ; # &g2-MJ007275;
+        :above    g2.mj:007275 ; # &g2-MJ007275;
         :below    a.ucs:0x513F   # 儿
     ] .
 rep.mj:007227   # 兌
@@ -679,7 +748,7 @@ rep.mj:007275   # 公
     ] .
 rep.mj:007276   # &MJ007276;
     :structure [ a idc:⿱ ;
-        :above    g2.mj:0x1C69 ; # &g2-MJ007273;
+        :above    g2.mj:007273 ; # &g2-MJ007273;
         :below    a.ucs:0x53B6   # 厶
     ] .
 rep.mj:007278   # 兮
@@ -690,7 +759,7 @@ rep.mj:007278   # 兮
 rep.mj:007279   # &MJ007279;
     :structure [ a idc:⿱ ;
         :above    rep.mj:007274 ; # &MJ007274;
-        :below    a.ucs:0x4E02   # 丂
+        :below    rep.adobe-japan1-5:17234   # &AJ1-17234;
     ] .
 rep.mj:007283   # &MJ007283;
     :structure [ a idc:⿱ ;
@@ -740,12 +809,12 @@ rep.mj:007313   # &MJ007313;
     ] .
 rep.mj:007320   # &MJ007320;
     :structure [ a idc:â¿» ;
-        :underlying rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
+        :underlying rep.ucs_iso:0x2000E ; # &CDP-8BB7;
         :overlaying rep.mj:007307   # &MJ007307;
     ] .
 rep.mj:007321   # &MJ007321;
     :structure [ a idc:⿱ ;
-        :above    rep.big5-cdp:0x8BB7 ; # &CDP-8BB7;
+        :above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
         :below    rep.mj:007308   # &MJ007308;
     ] .
 rep.mj:007324   # &MJ007324;
@@ -753,6 +822,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 ; # 冖
@@ -856,7 +930,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:⿱ ;
@@ -902,8 +976,8 @@ 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;
     :structure [ a idc:â¿° ;
@@ -1007,7 +1081,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;
@@ -1053,12 +1127,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:â¿° ;
@@ -1082,7 +1156,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;
@@ -1162,7 +1236,7 @@ rep.mj:007762   # &MJ007762;
     ] .
 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;
@@ -1188,7 +1262,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:â¿· ;
@@ -1213,7 +1287,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:â¿° ;
@@ -1223,7 +1297,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:â¿° ;
@@ -1252,7 +1326,7 @@ rep.mj:007891   # &MJ007891;
     ] .
 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;
@@ -1268,7 +1342,7 @@ 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:â¿° ;
@@ -1288,12 +1362,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:⿸ ;
@@ -1303,7 +1377,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:⿸ ;
@@ -1338,7 +1412,7 @@ rep.mj:008019   # &MJ008019;
 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:â¿° ;
@@ -1373,7 +1447,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:â¿° ;
@@ -1438,7 +1512,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:⿸ ;
@@ -1458,7 +1532,7 @@ 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:â¿° ;
@@ -1473,7 +1547,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:â¿° ;
@@ -1533,7 +1607,7 @@ rep.mj:008469   # &MJ008469;
 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:â¿° ;
@@ -1548,7 +1622,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:â¿° ;
@@ -1573,7 +1647,7 @@ 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:008526   # &MJ008526;
     :structure [ a idc:â¿° ;
@@ -1623,7 +1697,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:â¿° ;
@@ -1643,7 +1717,7 @@ 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:â¿° ;
@@ -1708,7 +1782,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:â¿° ;
@@ -1743,7 +1817,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:â¿° ;
@@ -1768,12 +1842,12 @@ 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:â¿° ;
@@ -1798,7 +1872,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:â¿´ ;
@@ -1823,12 +1897,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:â¿° ;
@@ -1838,12 +1912,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:â¿° ;
@@ -1878,12 +1952,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:â¿° ;
@@ -1904,7 +1978,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:â¿° ;
@@ -1914,7 +1988,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:â¿° ;
@@ -1977,19 +2051,9 @@ 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:⿱ ;
@@ -2008,7 +2072,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;
@@ -2088,13 +2152,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:â¿° ;
@@ -2123,7 +2187,7 @@ 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   # 夢
@@ -2131,7 +2195,7 @@ rep.mj:009446   # 夢
         :above    [
             :structure [ a idc:⿳ ;
                 :above    a.ucs:0x2EBE ; # ⺾
-                :middle   rep.gt:36329 ; # &GT-36329;
+                :middle   a.ucs:0x2EAB ; # ⺫
                 :below    a.ucs:0x5196   # 冖
             ]
         ] ;
@@ -2157,11 +2221,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;
@@ -2230,7 +2304,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:â¿° ;
@@ -2295,7 +2369,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:â¿° ;