X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R009-Man.ttl;h=4b6008ed67ba5bbc9ed6d46849795213b4e77e4c;hb=9ccc1e7f2691af32a93229e844a817642e737c72;hp=b9e4040d785bd5fa5a598c6543121bf8e8e5968e;hpb=6f6200358cbf1270b26cdd9cc99a7970801bc6ce;p=chise%2Fchiset.git

diff --git a/Ideograph-R009-Man.ttl b/Ideograph-R009-Man.ttl
index b9e4040..4b6008e 100644
--- a/Ideograph-R009-Man.ttl
+++ b/Ideograph-R009-Man.ttl
@@ -932,8 +932,8 @@ a.ucs:0x4EBE
     :eq rep.cns11643-3:0x2133     ; # &I-C3-2133;
     :eq rep.big5-cdp:0x8CA1       ; # &I-CDP-8CA1;
     :eq rep.shinjigen_rev:0091    ; # 亾
-    :from.original       [ :sources chisebib:shinjigen_rev ;
-                           :target  rep.mj:006462        ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_rev ;
+                            :target  rep.mj:006462        ] ;
     :subsume
         g2.cns11643-3:0x2133 ,
         g2.ucs_unicode:0x4EBE ,
@@ -1639,8 +1639,8 @@ a.ucs:0x4EC5
     :eq rep.daikanwa:00353        ; # &I-M-00353;
     :eq rep.hanziku-1:0xBAA7      ; # &I-HZK01-BAA7;
     :eq rep.cbeta:04556           ; # &I-CB04556;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007049        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007049        ] ;
     :subsume
         g2.daikanwa:00353    ,
         g2.ucs_unicode:0x4EC5 ;
@@ -1736,8 +1736,8 @@ a.ucs:0x4EC6
     :eq rep.gt-pj-1:20541         ; # &I-GT-00481;
     :eq rep.daikanwa:00354        ; # &I-M-00354;
     :eq rep.shinjigen:0124        ; # 仆
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:03707 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:03707 ] ;
     :subsume
         g2.ucs_unicode:0x4EC6 ;
     .
@@ -1859,10 +1859,10 @@ a.ucs:0x4EC7
     :eq rep.shinjigen:0117        ; # 仇
     :form-of             [ :sources chisebib:jiyun ;
                            :target  a.ucs:0x3ABA         ] ;
-    :from.interchangeable [ :sources chisebib:jiyun ,
-                                     chisebib:daikanwa ;
-                            :target  a.ucs:0x3ABA         ] ;
-    :from.same           [ :context domain:ancient ;
+    ideo:interchangeable-form-of [ :sources chisebib:jiyun ,
+                                            chisebib:daikanwa ;
+                                   :target  a.ucs:0x3ABA         ] ;
+    ideo:same-as         [ :context domain:ancient ;
                            :sources chisebib:yiqiejing-yinyi ;
                            :target  rep.mj:025914        ] ;
     :subsume
@@ -2436,10 +2436,10 @@ a.ucs:0x4ECC
         :eq rep.ucs_cns:0x4ECC        ; # &C3-214C;
         :eq rep.daikanwa:00360        ; # &I-M-00360;
         :eq rep.cbeta:08093           ; # &I-CB08093;
-        :from.original       [ :sources chisebib:shuowen ,
-                                        chisebib:shuowen-tongxun-dingsheng ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x51B0         ] ;
+        ideo:original-form-of [ :sources chisebib:shuowen ,
+                                         chisebib:shuowen-tongxun-dingsheng ,
+                                         chisebib:daikanwa ;
+                                :target  a.ucs:0x51B0         ] ;
         .
         rep.ucs_cns:0x4ECC
                    :abstract-glyph-of [ :context domain:cns     ;
@@ -2639,8 +2639,8 @@ a.ucs:0x4ECE
     :eq rep.shinjigen:2356        ; # 从
     :eq rep.hanziku-1:0xB9A3      ; # &I-HZK01-B9A3;
     :eq rep.cbeta:05155           ; # &I-CB05155;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:011321        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:011321        ] ;
     :subsume
         g2.ucs_unicode:0x4ECE ;
     .
@@ -2819,8 +2819,8 @@ a.ucs:0x4ECF
     :eq rep.gt-pj-1:18985         ; # &I-GT-00482;
     :eq rep.daikanwa:00364        ; # &I-M-00364;
     :eq rep.shinjigen:0125        ; # 仏
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04128 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04128 ] ;
     :subsume
         g2.ucs_unicode:0x4ECF ;
     .
@@ -3026,9 +3026,9 @@ a.ucs:0x5185
     :eq rep.daikanwa:01512        ; # &I-M-01512;
     :eq rep.daikanwa...._.p:00366 ; # 内
     :eq rep.shinjigen:0481        ; # 内
-    :from.same           [ :sources chisebib:daikanwa.:.00366...._.p ;
+    ideo:same-as         [ :sources chisebib:daikanwa.:.00366...._.p ;
                            :target  a.ucs:0x5167         ] ;
-    :from.vulgar         [ :sources chisebib:daikanwa.:.01512 ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa.:.01512 ;
                            :target  a.ucs:0x5167         ] ;
     .
     rep.adobe-japan1-0:03258
@@ -5680,9 +5680,9 @@ a.ucs:0x36A2
         :abstract-glyph-of daikanwa:00395 ;
         ideo:radical           9 ; # ⼈ 
         ideo:strokes           3 ;
-        :from.ancient        [ :sources chisebib:daikanwa ;
+        ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                                :target  rep.adobe-japan1-4:13382 ] ;
-        :to.mistakable       rep.daikanwa:06040   ;
+        ideo:mistakable      rep.daikanwa:06040   ;
         :subsume
             g2.daikanwa:00395    ,
             g2.cns11643-3:0x2174 ;
@@ -5704,10 +5704,10 @@ a.ucs:0x36A2
         :abstract-glyph-of daikanwa:06040 ;
         ideo:radical          38 ; # â¼¥ 
         ideo:strokes           2 ;
-        :from.ancient        [ :sources chisebib:shuowen ,
+        ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x5974         ] ;
-        :to.mistakable       rep.daikanwa:00395   ;
+        ideo:mistakable      rep.daikanwa:00395   ;
         :subsume
             g2.daikanwa:06040    ,
             g2.ucs_unicode:0x36A2 ;
@@ -6159,8 +6159,8 @@ a.ucs:0x4EEE
     :eq rep.gt-pj-1:12862         ; # &I-GT-00526;
     :eq rep.daikanwa:00398        ; # &I-M-00398;
     :eq rep.shinjigen:0144        ; # ä»®
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5047         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5047         ] ;
     :subsume
         g2.adobe-japan1-0:01342 ,
         g2.ucs_unicode:0x4EEE ;
@@ -6257,7 +6257,7 @@ a.ucs:0x4EEE
         ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq rep.shinjigen:0146        ; # &g2-UU+4EEE;
-        :from.vulgar         [ :sources chisebib:shinjigen ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                                :target  a.ucs:0x5047         ] ;
         :subsume
             repi.ucs_unicode:0x4EEE ,
@@ -7417,8 +7417,8 @@ a.ucs:0x4EF7
     :eq rep.gt-pj-1:20547         ; # &I-GT-00529;
     :eq rep.daikanwa:00412        ; # &I-M-00412;
     :eq rep.shinjigen:0150        ; # ä»·
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50F9         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50F9         ] ;
     :subsume
         g2.ucs_unicode:0x4EF7 ;
     .
@@ -9819,18 +9819,18 @@ rep.cns11643-4:0x2231
     :eq rep.ucs_unicode:0x343A    ; # &C4-2231;
     :eq rep.big5-cdp:0x894B       ; # &I-CDP-894B;
     :eq rep.daikanwa:00437        ; # &I-M-00437;
-    :from.original       [ :context domain:p.:.yin2 ;
-                           :sources chisebib:zhengzitong ;
-                           :target  a.ucs:0x4E51         ] ;
-    :from.original       [ :context domain:p.:.zhong4 ;
-                           :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-5:19582 ] ;
-    :from.same           [ :context domain:p.:.yin2 ;
+    ideo:original-form-of [ :context domain:p.:.yin2 ;
+                            :sources chisebib:zhengzitong ;
+                            :target  a.ucs:0x4E51         ] ;
+    ideo:original-form-of [ :context domain:p.:.zhong4 ;
+                            :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-5:19582 ] ;
+    ideo:same-as         [ :context domain:p.:.yin2 ;
                            :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4E51         ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  rep.mj:030386        ] ;
     :subsume
         g2.ucs_unicode:0x343A ;
@@ -10832,7 +10832,7 @@ a.ucs:0x4F16
     :eq rep.cns11643-3:0x2270     ; # &I-C3-2270;
     :eq rep.jis-x0213-2:0x2140    ; # &I-JX2-2140;
     :eq rep.daikanwa:00452        ; # &I-M-00452;
-    :from.same           [ :sources chisebib:yunhai ,
+    ideo:same-as         [ :sources chisebib:yunhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5E11         ] ;
     :subsume
@@ -10966,8 +10966,8 @@ a.ucs:0x4F18
     :eq a.big5:0xC9AC             ; # &I-B-C9AC;
     :eq rep.daikanwa:00454        ; # &I-M-00454;
     :eq rep.jef-china3:0x82A4     ; # &I-JC3-82A4;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007179        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007179        ] ;
     :subsume
         g2.cns11643-2:0x216B ,
         g2.ucs_unicode:0x4F18 ;
@@ -11141,8 +11141,8 @@ a.ucs:0x4F19
     :eq rep.gt-pj-2:13160         ; # &I-GT-00527;
     :eq rep.daikanwa:00457        ; # &I-M-00457;
     :eq rep.jef-china3:0x41F5     ; # &I-JC3-41F5;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5925         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5925         ] ;
     :subsume
         g2.ucs_unicode:0x4F19 ,
         g2.cns11643-1:0x472D ;
@@ -11330,10 +11330,10 @@ a.ucs:0x4F1A
     :eq rep.daikanwa:00460        ; # &I-M-00460;
     :eq rep.shinjigen:0147        ; # 会
     :eq rep.hanziku-1:0xBBC9      ; # &I-HZK01-BBC9;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04171 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04171 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04171 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04171 ] ;
     :subsume
         g2.ucs_unicode:0x4F1A ;
     .
@@ -11467,8 +11467,8 @@ rep.gb2312:0x5871
     :eq rep.ucs_unicode:0x4F1B    ; # &G0-5871;
     :eq rep.daikanwa:00461        ; # &I-M-00461;
     :eq rep.hanziku-1:0xBCAA      ; # &I-HZK01-BCAA;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04182 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04182 ] ;
     .
     rep.ucs_unicode:0x4F1B
                :abstract-glyph-of [ :context domain:unicode ;
@@ -11637,8 +11637,8 @@ a.ucs:0x4F1D
     :eq rep.gt-pj-1:17729         ; # &I-GT-00577;
     :eq rep.daikanwa...._.p:00462 ; # 伝
     :eq rep.shinjigen:0161        ; # 伝
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:007023        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:007023        ] ;
     :subsume
         g2.ucs_unicode:0x4F1D ;
     .
@@ -11737,8 +11737,8 @@ a.ucs:0x4F20
     ] ;
     :eq rep.gb2312:0x342B         ; # &I-G0-342B;
     :eq rep.hanziku-1:0xBBF7      ; # &I-HZK01-BBF7;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007023        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007023        ] ;
     .
     rep.gb2312:0x342B
                :abstract-glyph-of         gb2312:0x342B  .
@@ -11860,7 +11860,7 @@ rep.ucs_iso:0x201D0
     :eq rep.gt:00598              ; # &I-GT-00598;
     :eq rep.gt-pj-11:17201        ; # &I-GT-00598;
     :eq rep.daikanwa...ho:0013    ; # &GT-00598;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4F03         ] ;
     :subsume
@@ -15449,8 +15449,8 @@ a.ucs:0x4F2B
     ] ;
     :eq rep.adobe-japan1-5:19147  ; # &I-AJ1-19147;
     :eq rep.gb2312:0x5879         ; # &I-G0-5879;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x4F47         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x4F47         ] ;
     :subsume
         g2.ucs_unicode:0x4F2B ;
     .
@@ -16818,12 +16818,12 @@ rep.adobe-japan1-0:02862
     :eq rep.gt-pj-1:16974         ; # &I-GT-00660;
     :eq rep.daikanwa:00509        ; # &I-M-00509;
     :eq rep.shinjigen:0188        ; # &AJ1-02862;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x9AD4 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:07274 ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x9AD4         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x9AD4 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:07274 ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x9AD4         ] ;
     :subsume
         g2.ucs_unicode:0x4F53 ;
     .
@@ -17481,8 +17481,8 @@ rep.adobe-japan1-0:03880
     :eq rep.gt-pj-1:19774         ; # &I-GT-00693;
     :eq rep.daikanwa:00515        ; # &I-M-00515;
     :eq rep.shinjigen:0202        ; # &AJ1-03880;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:07208 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:07208 ] ;
     :subsume
         g2.ucs_unicode:0x4F59 ,
         rep.gt-k:02663       ;
@@ -18096,10 +18096,10 @@ a.ucs:0x3445
     :eq rep.cns11643-6:0x2571     ; # &I-C6-2571;
     :eq rep.daikanwa:00519        ; # &I-M-00519;
     :eq rep.jef-china3:0x42A9     ; # &I-JC3-42A9;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:hng ;
-                           :target  a.ucs:0x4F5C         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:hng ;
+                            :target  a.ucs:0x4F5C         ] ;
     :subsume
         g2.ucs_unicode:0x3445 ;
     .
@@ -19181,8 +19181,8 @@ a.ucs:0x4F63
     :eq a.big5:0xA6FE             ; # &I-B-A6FE;
     :eq rep.daikanwa:00539        ; # &I-M-00539;
     :eq rep.jef-china3:0x42AB     ; # &I-JC3-42AB;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:03885 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:03885 ] ;
     .
     rep.adobe-japan1-6:21099
                :abstract-glyph-of adobe-japan1-6:21099   .
@@ -19207,7 +19207,7 @@ rep.daikanwa:00540
     ideo:radical           9 ; # ⼈ 
     ideo:strokes           5 ;
     ideo:total-strokes     7 ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:02862 ] ;
     .
@@ -20819,8 +20819,8 @@ a.ucs:0x4F75
     :eq rep.gt-pj-1:19003         ; # &I-GT-00791;
     :eq rep.daikanwa:00561        ; # &I-M-00561;
     :eq rep.shinjigen:0235        ; # ä½µ
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5002         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5002         ] ;
     :subsume
         g2.ucs_unicode:0x4F75 ;
     .
@@ -22603,7 +22603,7 @@ a.ucs:0x20209
     :eq rep.cns11643-3:0x274E     ; # &I-C3-274E;
     :eq rep.daikanwa:00578        ; # &I-M-00578;
     :eq rep.shinjigen:0212        ; # 𠈉
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4F83         ] ;
     :subsume
         g2.ucs_iso:0x20209   ,
@@ -22678,7 +22678,7 @@ a.ucs:0x4F84
     :eq rep.daikanwa:00579        ; # &I-M-00579;
     :eq rep.shinjigen:1660        ; # 侄
     :eq rep.jef-china3:0x42B2     ; # &I-JC3-42B2;
-    :from.vulgar         [ :context domain:s.:.niece ;
+    ideo:vulgar-form-of  [ :context domain:s.:.niece ;
                            :sources chisebib:zihui ,
                                     chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
@@ -24639,8 +24639,8 @@ rep.gb2312:0x4258
         isd:below    a.ucs:0x5315   # 匕
     ] ;
     :eq rep.ucs_unicode:0x4ED1    ; # &G0-4258;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04142 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04142 ] ;
     :subsume
         g2.ucs_unicode:0x4ED1 ;
     .
@@ -25662,7 +25662,7 @@ a.ucs:0x2020C
                          ] ;
     :eq rep.cns11643-4:0x2535     ; # &I-C4-2535;
     :eq rep.daikanwa:00611        ; # &I-M-00611;
-    :from.ancient        [ :sources chisebib:liushugu ,
+    ideo:ancient-form-of [ :sources chisebib:liushugu ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-1:0x663E ] ;
     :subsume
@@ -26099,8 +26099,8 @@ a.ucs:0x4FA0
     :eq rep.shinjigen:0249        ; # ä¾ 
     :eq rep.hanziku-1:0xC1F9      ; # &I-HZK01-C1F9;
     :eq rep.jef-china3:0x43CB     ; # &I-JC3-43CB;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x4FE0         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x4FE0         ] ;
     :subsume
         g2.ucs_unicode:0x4FA0 ;
     .
@@ -26322,8 +26322,8 @@ a.ucs:0x4FA1
     :eq rep.gt-pj-1:12865         ; # &I-GT-00709;
     :eq rep.daikanwa...._.p:00628 ; # 価
     :eq rep.shinjigen:0207        ; # 価
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x50F9         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x50F9         ] ;
     :subsume
         g2.ucs_unicode:0x4FA1 ;
     .
@@ -26551,8 +26551,8 @@ a.ucs:0x2F805
     :eq rep.gt-pj-1:18798         ; # &I-GT-00790;
     :eq rep.daikanwa...._.p:00629 ; # 侮
     :eq rep.shinjigen:0233        ; # 侮
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13382 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13382 ] ;
     :subsume
         g2.ucs_iso:0x2F805   ;
     .
@@ -26722,8 +26722,8 @@ a.ucs:0x4FAD
     :eq rep.gt:00762              ; # &I-GT-00762;
     :eq rep.gt-pj-1:19321         ; # &I-GT-00762;
     :eq rep.daikanwa...ho:0015    ; # ä¾­
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:04143 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:04143 ] ;
     :subsume
         g2.ucs_unicode:0x4FAD ;
     .
@@ -26856,7 +26856,7 @@ a.ucs:0x4FAB
         :eq rep.daikanwa...ho:0016    ; # &AJ1-04564;
         :eq rep.shinjigen:1614        ; # &AJ1-04564;
         :eq rep.cbeta:00126           ; # &I-CB00126;
-        :from.vulgar         [ :sources chisebib:shinjigen ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                                :target  a.ucs:0x4F5E         ] ;
         :subsume
             g2.adobe-japan1-0:04564 ;
@@ -26972,8 +26972,8 @@ a.ucs:0x3452
     :eq rep.gt:00767              ; # &I-GT-00767;
     :eq rep.gt-k:03991            ; # &I-GT-K03991;
     :eq rep.gt-pj-9:20831         ; # &I-GT-00767;
-    :from.simplified     [ :context domain:component ;
-                           :target  a.ucs:0x50C9         ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x50C9         ] ;
     :subsume
         g2.ucs_unicode:0x3452 ;
     .
@@ -27197,8 +27197,8 @@ a.ucs:0x2B899
         isd:right    a.ucs:0x52A8   # 动
     ] ;
     :eq rep.iso-ir165:0x2C7A      ; # &I-EGB-2C7A;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50CD         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50CD         ] ;
     :subsume
         g2.ucs_iso:0x2B899   ;
     .
@@ -27719,10 +27719,10 @@ a.ucs:0x77E6
     :eq rep.jis-x0213-2:0x7236    ; # &I-JX2-7236;
     :eq rep.big5-cdp:0x8AC7       ; # &I-CDP-8AC7;
     :eq rep.jef-china3:0x5BE9     ; # &I-JC3-5BE9;
-    :from.original       [ :sources chisebib:zihui ,
-                                    chisebib:daikanwa.:.00634 ;
-                           :target  a.ucs:0x4FAF         ] ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:original-form-of [ :sources chisebib:zihui ,
+                                     chisebib:daikanwa.:.00634 ;
+                            :target  a.ucs:0x4FAF         ] ;
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa.:.23937 ;
                            :target  a.ucs:0x4FAF         ] ;
     :subsume
@@ -27945,7 +27945,7 @@ a.ucs:0x2022F
     ideo:hanyu-dazidian  ( 1 162 13 ) ;
     :eq rep.cns11643-6:0x2E59     ; # &I-C6-2E59;
     :eq rep.daikanwa:00639        ; # &I-M-00639;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5175         ] ;
     :subsume
@@ -29742,7 +29742,7 @@ rep.ucs_iso:0x20233
         isd:right    rep.ucs-itaiji-001:0x7075   # &U-i001+7075;
     ] ;
     :eq rep.daikanwa:00661        ; # &M-00661;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8F9F         ] ;
     :subsume
@@ -33187,7 +33187,7 @@ rep.daikanwa:00703
     ideo:strokes           7 ;
     ideo:total-strokes     9 ;
     :eq rep.shinjigen_1ed:0488    ; # &M-00703;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  rep.adobe-japan1-0:04216 ] ;
     .
     rep.shinjigen_1ed:0488
@@ -33221,7 +33221,7 @@ rep.cns11643-1:0x4F7E
     :eq rep.gb2312:0x5361         ; # &C1-4F7E;
     :eq rep.shinjigen_rev:0488    ; # &C1-4F7E;
     :eq rep.jef-china3:0x43E0     ; # &I-JC3-43E0;
-    :from.vulgar         [ :sources chisebib:shinjigen_rev ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_rev ;
                            :target  rep.adobe-japan1-0:04216 ] ;
     :subsume
         g2.ucs_unicode:0x4FDE ,
@@ -33751,7 +33751,7 @@ a.ucs:0x2023C
     ideo:hanyu-dazidian  ( 1 166 1 ) ;
     :eq rep.cns11643-6:0x2E55     ; # &I-C6-2E55;
     :eq rep.daikanwa:00708        ; # &I-M-00708;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9806         ] ;
     :subsume
@@ -34545,10 +34545,10 @@ a.ucs:0x2028A
     :eq rep.cns11643-6:0x3521     ; # &I-C6-3521;
     :eq rep.daikanwa:44018        ; # &I-M-44018;
     :eq rep.shinjigen:9236        ; # 𠊊
-    :from.original       [ :sources chisebib:zhonghua-dazidian ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  a.ucs:0x98DF         ] ;
+    ideo:original-form-of [ :sources chisebib:zhonghua-dazidian ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x98DF         ] ;
     :subsume
         g2.ucs_iso:0x2028A   ,
         g2.cns11643-6:0x3521 ;
@@ -35382,7 +35382,7 @@ a.ucs:0x4FF2
     :eq rep.hanziku-1:0xCBEF      ; # &I-HZK01-CBEF;
     :eq rep.cbeta:04885           ; # &I-CB04885;
     :eq rep.jef-china3:0x42FE     ; # &I-JC3-42FE;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x509A         ] ;
     :subsume
         g2.ucs_unicode:0x4FF2 ;
@@ -36968,8 +36968,8 @@ a.ucs:0x4F25
     ] ;
     :eq rep.gb2312:0x5876         ; # &I-G0-5876;
     :eq rep.hanziku-1:0xBD6C      ; # &I-HZK01-BD6C;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5000         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5000         ] ;
     .
     rep.gb2312:0x5876
                :abstract-glyph-of         gb2312:0x5876  .
@@ -37724,8 +37724,8 @@ a.ucs:0x4FE9
     :eq rep.gb2312:0x4129         ; # &I-G0-4129;
     :eq rep.cns11643-4:0x283D     ; # &I-C4-283D;
     :eq rep.hanziku-1:0xC462      ; # &I-HZK01-C462;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5006         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5006         ] ;
     .
     rep.gb2312:0x4129
                :abstract-glyph-of         gb2312:0x4129  .
@@ -38151,8 +38151,8 @@ a.ucs:0x4ED3
     ] ;
     :eq rep.gb2312:0x3256         ; # &I-G0-3256;
     :eq rep.hanziku-1:0xB9A6      ; # &I-HZK01-B9A6;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5009         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5009         ] ;
     .
     rep.gb2312:0x3256
                :abstract-glyph-of         gb2312:0x3256  .
@@ -38983,7 +38983,7 @@ rep.adobe-japan1-4:14329
     :eq rep.hanziku-1:0xCAAC      ; # &I-HZK01-CAAC;
     :eq rep.cbeta:00519           ; # &I-CB00519;
     :eq rep.jef-china3:0x42D8     ; # &I-JC3-42D8;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  rep.mj:006829        ] ;
     :subsume
         g2.adobe-japan1-4:14329 ,
@@ -39351,8 +39351,8 @@ a.ucs:0x4EEC
     :eq rep.gb2312:0x4347         ; # &I-G0-4347;
     :eq rep.hanziku-1:0xBBAA      ; # &I-HZK01-BBAA;
     :eq rep.jef-china3:0x82BB     ; # &I-JC3-82BB;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5011         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5011         ] ;
     .
     rep.gb2312:0x4347
                :abstract-glyph-of         gb2312:0x4347  .
@@ -42048,8 +42048,8 @@ rep.mj:006859
     :eq rep.gt:01087              ; # &I-GT-01087;
     :eq rep.gt-pj-1:14193         ; # &I-GT-01087;
     :eq rep.jef-china3:0x43CD     ; # &I-JC3-43CD;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:006858        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:006858        ] ;
     :subsume
         g2.mj:006859         ;
     .
@@ -42930,8 +42930,8 @@ a.ucs:0x4F26
     ] ;
     :eq rep.gb2312:0x4257         ; # &I-G0-4257;
     :eq rep.hanziku-1:0xBD74      ; # &I-HZK01-BD74;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x502B         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x502B         ] ;
     .
     rep.gb2312:0x4257
                :abstract-glyph-of         gb2312:0x4257  .
@@ -44601,8 +44601,8 @@ a.ucs:0x5039
     :eq rep.gt-pj-1:14192         ; # &I-GT-00962;
     :eq rep.daikanwa:00823        ; # &I-M-00823;
     :eq rep.shinjigen:0290        ; # 倹
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5109         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5109         ] ;
     :subsume
         g2.ucs_unicode:0x5039 ;
     .
@@ -44699,8 +44699,8 @@ a.ucs:0x4FED
     ] ;
     :eq rep.gb2312:0x3C73         ; # &I-G0-3C73;
     :eq rep.hanziku-1:0xC56A      ; # &I-HZK01-C56A;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5109         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5109         ] ;
     .
     rep.gb2312:0x3C73
                :abstract-glyph-of         gb2312:0x3C73  .
@@ -46916,8 +46916,8 @@ a.ucs:0x4F1F
     ] ;
     :eq rep.gb2312:0x4E30         ; # &I-G0-4E30;
     :eq rep.hanziku-1:0xBBF5      ; # &I-HZK01-BBF5;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5049         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5049         ] ;
     .
     rep.gb2312:0x4E30
                :abstract-glyph-of         gb2312:0x4E30  .
@@ -46969,7 +46969,7 @@ a.ucs:0x504B
     :eq rep.cns11643-2:0x3355     ; # &I-C2-3355;
     :eq a.big5:0xD452             ; # &I-B-D452;
     :eq rep.daikanwa:00839        ; # &I-M-00839;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.ucs_iso:0x20338  ] ;
     :subsume
@@ -47744,7 +47744,7 @@ rep.adobe-japan1-0:04173
     :eq rep.shinjigen:0331        ; # &AJ1-04173;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.jis-x0212:0x5F44 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x5F44 ] ;
     :subsume
@@ -48601,7 +48601,7 @@ a.ucs:0x5058
     :eq rep.jef-china3:0x91A6     ; # &I-JC3-91A6;
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4F83         ] ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4F83         ] ;
     .
@@ -50185,10 +50185,10 @@ a.ucs:0x202B3
     :eq rep.daikanwa:00878        ; # &I-M-00878;
     :eq rep.shinjigen:0271        ; # 𠊳
     :eq rep.hanziku-1:0xCCD5      ; # &I-HZK01-CCD5;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  a.ucs:0x4FBF         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x4FBF         ] ;
     :subsume
         g2.ucs_iso:0x202B3   ,
         g2.shinjigen:0271    ;
@@ -51598,8 +51598,8 @@ a.ucs:0x4FA7
     ] ;
     :eq rep.gb2312:0x3260         ; # &I-G0-3260;
     :eq rep.hanziku-1:0xC261      ; # &I-HZK01-C261;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5074         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5074         ] ;
     .
     rep.gb2312:0x3260
                :abstract-glyph-of         gb2312:0x3260  .
@@ -51750,8 +51750,8 @@ a.ucs:0x4FA6
     ideo:hanyu-dazidian  ( 1 147 7 ) ;
     :eq rep.gb2312:0x556C         ; # &I-G0-556C;
     :eq rep.hanziku-1:0xC240      ; # &I-HZK01-C240;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5075         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5075         ] ;
     .
     rep.gb2312:0x556C
                :abstract-glyph-of         gb2312:0x556C  .
@@ -52358,7 +52358,7 @@ rep.daikanwa:00905
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    rep.daikanwa:19667   # &M-19667;
     ] ;
-    :from.ancient        [ :sources chisebib:kangxi ,
+    ideo:ancient-form-of [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4FDD         ] ;
     :subsume
@@ -53345,8 +53345,8 @@ a.ucs:0x507D
     :eq rep.gt-pj-1:13622         ; # &I-GT-01077;
     :eq rep.daikanwa...._.p:00927 ; # 偽
     :eq rep.shinjigen:0332        ; # 偽
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04189 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04189 ] ;
     :subsume
         g2.ucs_unicode:0x507D ;
     .
@@ -53443,8 +53443,8 @@ a.ucs:0x4F2A
     ] ;
     :eq rep.gb2312:0x4E31         ; # &I-G0-4E31;
     :eq rep.hanziku-1:0xBDD0      ; # &I-HZK01-BDD0;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.cns11643-3:0x4576 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.cns11643-3:0x4576 ] ;
     .
     rep.gb2312:0x4E31
                :abstract-glyph-of         gb2312:0x4E31  .
@@ -54746,7 +54746,7 @@ a.ucs:0x202F4
         isd:right    a.ucs:0x5261   # 剡
     ] ;
     :eq rep.cns11643-5:0x3663     ; # &I-C5-3663;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:yunhai-bei ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5013         ] ;
@@ -55641,11 +55641,11 @@ a.ucs:0x3475
     :eq rep.daikanwa:00949        ; # &I-M-00949;
     :eq rep.shinjigen:1721        ; # 㑵
     :eq rep.cbeta:08689           ; # &I-CB08689;
-    :from.interchangeable [ :sources chisebib:zhengzitong ,
-                                     chisebib:daikanwa ;
-                            :target  a.ucs:0x75BE         ] ;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x5AC9         ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:zhengzitong ,
+                                            chisebib:daikanwa ;
+                                   :target  a.ucs:0x75BE         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x5AC9         ] ;
     :subsume
         g2.ucs_unicode:0x3475 ,
         g2.cns11643-4:0x3632 ;
@@ -57439,8 +57439,8 @@ a.ucs:0x4F27
     ] ;
     :eq rep.gb2312:0x5877         ; # &I-G0-5877;
     :eq rep.hanziku-1:0xBD78      ; # &I-HZK01-BD78;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5096         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5096         ] ;
     .
     rep.gb2312:0x5877
                :abstract-glyph-of         gb2312:0x5877  .
@@ -57685,8 +57685,8 @@ a.ucs:0x4F1E
     ] ;
     :eq rep.gb2312:0x4921         ; # &I-G0-4921;
     :eq rep.hanziku-1:0xBBF0      ; # &I-HZK01-BBF0;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5098         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5098         ] ;
     .
     rep.gb2312:0x4921
                :abstract-glyph-of         gb2312:0x4921  .
@@ -58954,7 +58954,7 @@ rep.daikanwa:00981
     ideo:total-strokes    12 ;
     ideo:hanyu-dazidian  ( 1 203 16 ) ;
     :eq rep.hanziku-1:0xD04B      ; # &I-HZK01-D04B;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4FDD         ] ;
     :subsume
@@ -60193,8 +60193,8 @@ a.ucs:0x50A4
         isd:right    a.ucs:0x8F7D   # è½½
     ] ;
     :eq rep.iso-ir165:0x2E27      ; # &I-EGB-2E27;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x510E         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x510E         ] ;
     :subsume
         g2.ucs_unicode:0x50A4 ;
     .
@@ -61701,7 +61701,7 @@ rep.daikanwa:01016
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    rep.jis-x0213-2:0x726E   # &JX2-726E;
     ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04205 ] ;
     :subsume
@@ -62426,8 +62426,8 @@ a.ucs:0x503A
     ] ;
     :eq rep.gb2312:0x552E         ; # &I-G0-552E;
     :eq rep.hanziku-1:0xC968      ; # &I-HZK01-C968;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50B5         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50B5         ] ;
     .
     rep.gb2312:0x552E
                :abstract-glyph-of         gb2312:0x552E  .
@@ -62840,8 +62840,8 @@ a.ucs:0x4F24
     ideo:total-strokes     6 ;
     ideo:hanyu-dazidian  ( 1 124 1 ) ;
     :eq rep.gb2312:0x494B         ; # &I-G0-494B;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:02439 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:02439 ] ;
     :subsume
         g2.ucs_unicode:0x4F24 ;
     .
@@ -63108,6 +63108,10 @@ a.ucs:0x50BB
     ideo:strokes          11 ;
     ideo:total-strokes    13 ;
     ideo:hanyu-dazidian  ( 1 212 3 ) ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x4EBB ; # 亻
+        isd:right    a.ucs:0x21569   # 𡕩
+    ] ;
     :eq a.big5:0xB6CC             ; # &I-B-B6CC;
     .
     a.big5:0xB6CC
@@ -63121,6 +63125,10 @@ rep.cns11643-1:0x6333
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          11 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x4EBB ; # 亻
+        isd:right    rep.ucs_iso:0x21569   # &C6-3E3C;
+    ] ;
     :eq rep.ucs_cns:0x50BB        ; # &C1-6333;
     :eq rep.daikanwa:01034        ; # &I-M-01034;
     :subsume
@@ -63137,7 +63145,7 @@ rep.cns11643-1:0x6333
         :abstract-glyph-form-of daikanwa:01034 ;
         isd:structure [ a idc:â¿° ;
             isd:left     a.ucs:0x2E85 ; # ⺅
-            isd:right    rep.daikanwa:49004   # &M-49004;
+            isd:right    g2.daikanwa:49004   # &g2-M-49004;
         ] ;
         .
     g2.cns11643-1:0x6333
@@ -63145,7 +63153,7 @@ rep.cns11643-1:0x6333
         :abstract-glyph-form-of cns11643-1:0x6333 ;
         isd:structure [ a idc:â¿° ;
             isd:left     a.ucs:0x2E85 ; # ⺅
-            isd:right    rep.cns11643-6:0x3E3C   # &C6-3E3C;
+            isd:right    g2.cns11643-6:0x3E3C   # &g2-CU+21569;
         ] ;
         :eq g2.ucs_cns:0x50BB         ; # &g2-CU+50BB;
         .
@@ -63161,6 +63169,10 @@ rep.adobe-japan1-5:17285
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          11 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x4EBB ; # 亻
+        isd:right    rep.ucs_JP...hanazono:0x21569   # &hanaJU+21569;
+    ] ;
     :eq rep.ucs_unicode:0x50BB    ; # &AJ1-17285;
     :eq rep.gb2312:0x4935         ; # &I-G0-4935;
     :eq rep.jis-x0213-2:0x2173    ; # &I-JX2-2173;
@@ -63218,16 +63230,6 @@ rep.adobe-japan1-5:17285
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x50BB  ] ;
-        isd:structure [ a idc:â¿° ;
-            isd:left     a.ucs:0x2E85 ; # ⺅
-            isd:right    [
-                isd:structure [ a idc:⿳ ;
-                    isd:above    a.ucs:0x56DF ; # 囟
-                    isd:middle   rep.gt-k:00059 ; # &GT-K00059;
-                    isd:below    a.ucs:0x5902   # 夂
-                ]
-            ]
-        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x4935          ; # &g2-UU+50BB;
         .
@@ -63567,8 +63569,8 @@ a.ucs:0x503E
     ] ;
     :eq rep.gb2312:0x4763         ; # &I-G0-4763;
     :eq rep.hanziku-1:0xCBCF      ; # &I-HZK01-CBCF;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50BE         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50BE         ] ;
     .
     rep.gb2312:0x4763
                :abstract-glyph-of         gb2312:0x4763  .
@@ -64560,8 +64562,8 @@ rep.mj:007048
     :eq rep.gt:01207              ; # &I-GT-01207;
     :eq rep.gt-pj-1:13903         ; # &I-GT-01207;
     :eq rep.jef-china3:0x43CC     ; # &I-JC3-43CC;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:007049        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:007049        ] ;
     :subsume
         g2.mj:007048         ;
     .
@@ -65275,8 +65277,8 @@ a.ucs:0x4F65
         isd:below    a.ucs:0x4E00   # 一
     ] ;
     :eq rep.gb2312:0x595D         ; # &I-G0-595D;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50C9         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50C9         ] ;
     :subsume
         g2.ucs_unicode:0x4F65 ;
     .
@@ -65735,7 +65737,7 @@ rep.ucs_iso:0x20339
     ] ;
     :eq rep.cns11643-6:0x505C     ; # &C6-505C;
     :eq rep.daikanwa:01057        ; # &I-M-01057;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:027596        ] ;
@@ -66522,7 +66524,7 @@ rep.mj:007094
     ideo:total-strokes    13 ;
     :eq rep.hanyo-denshi...ks:012500 ; # &MJ007094;
     :eq rep.daikanwa:01076        ; # &I-M-01076;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0xFA31         ] ;
     :subsume
@@ -66590,8 +66592,8 @@ a.ucs:0x2F80A
     :eq rep.gt:01350              ; # &I-GT-01350;
     :eq rep.gt-pj-1:16718         ; # &I-GT-01350;
     :eq rep.shinjigen:0381        ; # 僧
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA31         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA31         ] ;
     :subsume
         g2.mj:007095         ;
     .
@@ -67832,8 +67834,8 @@ a.ucs:0x4FA8
     ] ;
     :eq rep.gb2312:0x4748         ; # &I-G0-4748;
     :eq rep.hanziku-1:0xC2A1      ; # &I-HZK01-C2A1;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50D1         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50D1         ] ;
     .
     rep.gb2312:0x4748
                :abstract-glyph-of         gb2312:0x4748  .
@@ -70217,8 +70219,8 @@ a.ucs:0x4FA5
     ] ;
     :eq rep.gb2312:0x3D44         ; # &I-G0-3D44;
     :eq rep.hanziku-1:0xC1FB      ; # &I-HZK01-C1FB;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x50E5         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x50E5         ] ;
     .
     rep.gb2312:0x3D44
                :abstract-glyph-of         gb2312:0x3D44  .
@@ -70805,8 +70807,8 @@ a.ucs:0x507E
         isd:right    a.ucs:0x8D32   # è´²
     ] ;
     :eq rep.gb2312:0x5947         ; # &I-G0-5947;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-5:19163 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-5:19163 ] ;
     :subsume
         g2.ucs_unicode:0x507E ;
     .
@@ -71027,7 +71029,7 @@ a.ucs:0x50F4
     :eq rep.cns11643-3:0x4574     ; # &I-C3-4574;
     :eq rep.shinjigen:0389        ; # 僴
     :eq rep.jef-china3:0x43B9     ; # &I-JC3-43B9;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x50E9         ] ;
     :subsume
         g2.ucs_unicode:0x50F4 ;
@@ -71669,7 +71671,7 @@ rep.ucs_iso:0x20378
     ] ;
     :eq rep.cns11643-6:0x5A74     ; # &C6-5A74;
     :eq rep.daikanwa:01131        ; # &I-M-01131;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:19582 ] ;
     :subsume
@@ -72941,7 +72943,7 @@ a.ucs:0x2039B
     :eq rep.cns11643-6:0x5E57     ; # &I-C6-5E57;
     :eq rep.daikanwa:19751        ; # &I-M-19751;
     :eq rep.hanziku-1:0xD2C7      ; # &I-HZK01-D2C7;
-    :from.same           [ :sources chisebib:ermuzi ,
+    ideo:same-as         [ :sources chisebib:ermuzi ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x24564        ] ;
     .
@@ -74601,8 +74603,8 @@ a.ucs:0x4EEA
     ] ;
     :eq rep.gb2312:0x5247         ; # &I-G0-5247;
     :eq rep.hanziku-1:0xBB6C      ; # &I-HZK01-BB6C;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5100         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5100         ] ;
     .
     rep.gb2312:0x5247
                :abstract-glyph-of         gb2312:0x5247  .
@@ -75074,8 +75076,8 @@ a.ucs:0x4FAC
     ] ;
     :eq rep.gb2312:0x592F         ; # &I-G0-592F;
     :eq rep.hanziku-1:0xC3A3      ; # &I-HZK01-C3A3;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5102         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5102         ] ;
     .
     rep.gb2312:0x592F
                :abstract-glyph-of         gb2312:0x592F  .
@@ -75398,8 +75400,8 @@ a.ucs:0x4EBF
     ] ;
     :eq rep.gb2312:0x525A         ; # &I-G0-525A;
     :eq rep.hanziku-1:0xB942      ; # &I-HZK01-B942;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5104         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5104         ] ;
     .
     rep.gb2312:0x525A
                :abstract-glyph-of         gb2312:0x525A  .
@@ -76191,8 +76193,8 @@ a.ucs:0x4FA9
     ] ;
     :eq rep.gb2312:0x3F6B         ; # &I-G0-3F6B;
     :eq rep.hanziku-1:0xC2BE      ; # &I-HZK01-C2BE;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-4:14344 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-4:14344 ] ;
     .
     rep.gb2312:0x3F6B
                :abstract-glyph-of         gb2312:0x3F6B  .
@@ -77338,7 +77340,7 @@ rep.cns11643-3:0x4B28
     ] ;
     :eq rep.ucs_cns:0x3496        ; # &C3-4B28;
     :eq rep.daikanwa:01207        ; # &I-M-01207;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-1:0x786D ] ;
     :subsume
@@ -77990,8 +77992,8 @@ a.ucs:0x50A7
     ] ;
     :eq rep.gb2312:0x594F         ; # &I-G0-594F;
     :eq rep.hanziku-1:0xD0C0      ; # &I-HZK01-D0C0;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-4:14346 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-4:14346 ] ;
     .
     rep.gb2312:0x594F
                :abstract-glyph-of         gb2312:0x594F  .
@@ -78647,9 +78649,9 @@ a.ucs:0x4FE6
     :eq rep.gb2312:0x5931         ; # &I-G0-5931;
     :eq rep.jis-x0213-2:0x214F    ; # &I-JX2-214F;
     :eq rep.shinjigen:0426        ; # 俦
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5114         ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5114         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5114         ] ;
     :subsume
         g2.adobe-japan1-5:17264 ,
@@ -78974,8 +78976,8 @@ a.ucs:0x4FAA
     ] ;
     :eq rep.gb2312:0x592D         ; # &I-G0-592D;
     :eq rep.hanziku-1:0xC341      ; # &I-HZK01-C341;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5115         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5115         ] ;
     .
     rep.gb2312:0x592D
                :abstract-glyph-of         gb2312:0x592D  .
@@ -80992,8 +80994,8 @@ a.ucs:0x507F
     ] ;
     :eq rep.gb2312:0x3325         ; # &I-G0-3325;
     :eq rep.hanziku-1:0xCD59      ; # &I-HZK01-CD59;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x511F         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x511F         ] ;
     .
     rep.gb2312:0x3325
                :abstract-glyph-of         gb2312:0x3325  .
@@ -83388,9 +83390,9 @@ a.ucs:0x20425
     ideo:hanyu-dazidian  ( 1 237 2 ) ;
     :eq rep.cns11643-4:0x5A69     ; # &I-C4-5A69;
     :eq rep.daikanwa:01279        ; # &I-M-01279;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x5104         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x5104         ] ;
     :subsume
         g2.ucs_iso:0x20425   ;
     .
@@ -84125,8 +84127,8 @@ a.ucs:0x50A8
     ] ;
     :eq rep.gb2312:0x3422         ; # &I-G0-3422;
     :eq rep.hanziku-1:0xD0C4      ; # &I-HZK01-D0C4;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007190        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007190        ] ;
     .
     rep.gb2312:0x3422
                :abstract-glyph-of         gb2312:0x3422  .
@@ -84501,7 +84503,7 @@ a.ucs:0x20432
     :eq rep.hanziku-1:0xD6D4      ; # &I-HZK01-D6D4;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  a.ucs:0x8A96         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8A96         ] ;
     .
@@ -86074,8 +86076,8 @@ a.ucs:0x4FEA
     ideo:hanyu-dazidian  ( 1 158 4 ) ;
     :eq rep.gb2312:0x5933         ; # &I-G0-5933;
     :eq rep.hanziku-1:0xC463      ; # &I-HZK01-C463;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04205 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04205 ] ;
     .
     rep.gb2312:0x5933
                :abstract-glyph-of         gb2312:0x5933  .
@@ -86753,8 +86755,8 @@ a.ucs:0x50A9
     ] ;
     :eq rep.gb2312:0x5950         ; # &I-G0-5950;
     :eq rep.hanziku-1:0xD0CB      ; # &I-HZK01-D0CB;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04204 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04204 ] ;
     .
     rep.gb2312:0x5950
                :abstract-glyph-of         gb2312:0x5950  .
@@ -87236,8 +87238,8 @@ a.ucs:0x50A5
     :eq rep.gb2312:0x594E         ; # &I-G0-594E;
     :eq rep.hanziku-1:0xCFEA      ; # &I-HZK01-CFEA;
     :eq rep.jef-china3:0x43A8     ; # &I-JC3-43A8;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x513B         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x513B         ] ;
     .
     rep.gb2312:0x594E
                :abstract-glyph-of         gb2312:0x594E  .
@@ -87457,8 +87459,8 @@ a.ucs:0x4FE8
     ] ;
     :eq rep.gb2312:0x5932         ; # &I-G0-5932;
     :eq rep.hanziku-1:0xC3EE      ; # &I-HZK01-C3EE;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x513C ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x513C ] ;
     .
     rep.gb2312:0x5932
                :abstract-glyph-of         gb2312:0x5932  .