- Use `ideo:simplified-form-of' instead of `:from.simplified'.

- Use `ideo:vulgar-form-of' instead of `:from.vulgar'.
- Use `ideo:same-as' instead of `:from.same'.
- Use `ideo:ancient-form-of' instead of `:from.ancient'.

diff --git a/Ideograph-R019-Power.ttl b/Ideograph-R019-Power.ttl
index 1be0ee7..2c3955a 100644 (file)
--- a/Ideograph-R019-Power.ttl
+++ b/Ideograph-R019-Power.ttl
@@ -2452,17 +2452,17 @@ a.ucs:0x52B1
     :eq rep.daikanwa:02326        ; # &I-M-02326;
     :eq rep.shinjigen:0715        ; # 励
     :eq rep.hanziku-1:0xF1C4      ; # &I-HZK01-F1C4;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007736        ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:007736        ] ;
-    :from.simplified     [ :context domain:misc    ;
-                           :sources chisebib:songyuan-yilai-suzipu ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen_1ed ;
-                           :target  rep.mj:007737        ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x52F5         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007736        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:007736        ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:songyuan-yilai-suzipu ,
+                                       chisebib:daikanwa ,
+                                       chisebib:shinjigen_1ed ;
+                              :target  rep.mj:007737        ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x52F5         ] ;
     :subsume
         g2.ucs_unicode:0x52B1 ;
     .
@@ -2588,7 +2588,7 @@ a.ucs:0x2084D
         rep.daikanwa:02327
             a chisegg:abstract-glyph ;
             :abstract-glyph-of daikanwa:02327 ;
-            :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+            ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                             chisebib:daikanwa ;
                                    :target  rep.adobe-japan1-0:04283 ] ;
             .
@@ -2620,8 +2620,8 @@ a.ucs:0x52B2
         isd:right    a.ucs:0x529B   # 力
     ] ;
     :eq rep.gb2312:0x3E22         ; # &I-G0-3E22;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04283 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04283 ] ;
     :subsume
         g2.ucs_unicode:0x52B2 ;
     .
@@ -2685,9 +2685,9 @@ rep.cns11643-3:0x2463
     :eq rep.daikanwa:02328        ; # &I-M-02328;
     :eq rep.hanziku-1:0xF1C1      ; # &I-HZK01-F1C1;
     :eq rep.jef-china3:0x82B2     ; # &I-JC3-82B2;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x52DE         ] ;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x52DE         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x52DE         ] ;
     .
@@ -2721,11 +2721,11 @@ a.ucs:0x52B4
     :eq rep.gt-pj-1:20267         ; # &I-GT-02987;
     :eq rep.daikanwa:02329        ; # &I-M-02329;
     :eq rep.shinjigen:0717        ; # 労
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:shinjigen_1ed ,
-                                    chisebib:JP...Jouyou ;
-                           :target  a.ucs:0x52DE         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:shinjigen_1ed ,
+                                       chisebib:JP...Jouyou ;
+                              :target  a.ucs:0x52DE         ] ;
     :subsume
         g2.ucs_unicode:0x52B4 ;
     .
@@ -3263,9 +3263,9 @@ a.ucs:0x52B9
     :eq rep.shinjigen:0724        ; # 効
     :eq rep.hanziku-1:0xF242      ; # &I-HZK01-F242;
     :eq rep.cbeta:00283           ; # &I-CB00283;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6548         ] ;
-    :from.vulgar         [ :sources chisebib:yupian ,
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6548         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:yupian ,
                                     chisebib:zhengyun ,
                                     chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
@@ -4041,8 +4041,8 @@ a.ucs:0x52BF
     :eq rep.cns11643-3:0x2762     ; # &I-C3-2762;
     :eq rep.daikanwa:02347        ; # &I-M-02347;
     :eq rep.hanziku-1:0xF1EC      ; # &I-HZK01-F1EC;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x52E2         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x52E2         ] ;
     .
     rep.gb2312:0x4A46
                :abstract-glyph-of         gb2312:0x4A46  .
@@ -4609,9 +4609,9 @@ a.ucs:0x52C5
     :eq rep.cbeta:00330           ; # &I-CB00330;
     :form-of             rep.adobe-japan1-0:05066 ;
     :from.interchangeable rep.adobe-japan1-0:05066 ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05066 ] ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05066 ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17326 ] ;
     :subsume
@@ -4788,7 +4788,7 @@ a.ucs:0x20860
     ] ;
     :eq rep.cns11643-6:0x2F26     ; # &I-C6-2F26;
     :eq rep.daikanwa:02357        ; # &I-M-02357;
-    :from.vulgar         [ :sources chisebib:pianhai ,
+    ideo:vulgar-form-of  [ :sources chisebib:pianhai ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17326 ] ;
     :subsume
@@ -5149,7 +5149,7 @@ a.ucs:0x2F825
     :eq rep.gt-pj-1:19750         ; # &I-GT-03030;
     :eq rep.daikanwa...._.p:02360 ; # 勇
     :eq rep.shinjigen:0730        ; # 勇
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ;
                            :target  rep.mj:007667        ] ;
     :subsume
@@ -5419,7 +5419,7 @@ a.ucs:0xFA33
     :eq rep.daikanwa:02362        ; # &I-M-02362;
     :eq rep.shinjigen:0736        ; # 勉
     :eq rep.jef-china3:0x44E7     ; # &I-JC3-44E7;
-    :from.same           [ :sources chisebib:shinjigen ;
+    ideo:same-as         [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x2F826        ] ;
     :subsume
         g2.ucs_unicode:0xFA33 ,
@@ -6706,8 +6706,8 @@ a.ucs:0x2F826
     :eq rep.gt-pj-1:19033         ; # &I-GT-03050;
     :eq rep.daikanwa...._.p:02384 ; # 勉
     :eq rep.shinjigen:0735        ; # 勉
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA33         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA33         ] ;
     :subsume
         g2.ucs_iso:0x2F826   ;
     .
@@ -7309,8 +7309,8 @@ a.ucs:0x52A8
     :eq rep.cns11643-3:0x2328     ; # &I-C3-2328;
     :eq rep.hanziku-1:0xF1A2      ; # &I-HZK01-F1A2;
     :eq rep.jef-china3:0x81E4     ; # &I-JC3-81E4;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x52D5         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x52D5         ] ;
     .
     rep.gb2312:0x362F
                :abstract-glyph-of         gb2312:0x362F  .
@@ -7543,7 +7543,7 @@ rep.mj:007694
     :eq rep.hanyo-denshi...ks...mf:002779 ; # &I-KSMF-02779;
     :eq rep.daikanwa:02392        ; # &I-M-02392;
     :eq rep.shinjigen:0741        ; # &MJ007694;
-    :from.vulgar         [ :sources chisebib:daikanwa ,
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ,
                                     chisebib:shinjigen_1ed ;
                            :target  rep.mj:007692        ] ;
     .
@@ -8048,8 +8048,8 @@ a.ucs:0x52A1
     :eq rep.gb2312:0x4E71         ; # &I-G0-4E71;
     :eq rep.hanziku-1:0xF162      ; # &I-HZK01-F162;
     :eq rep.jef-china3:0x82A1     ; # &I-JC3-82A1;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x52D9 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x52D9 ] ;
     .
     rep.gb2312:0x4E71
                :abstract-glyph-of         gb2312:0x4E71  .
@@ -8189,8 +8189,8 @@ a.ucs:0x52DA
         isd:right    a.ucs:0x529B   # 力
     ] ;
     :eq rep.iso-ir165:0x7A43      ; # &I-EGB-7A43;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x52E9         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x52E9         ] ;
     :subsume
         g2.ucs_unicode:0x52DA ;
     .
@@ -8247,7 +8247,7 @@ a.ucs:0x52DB
     :eq rep.daikanwa:02402        ; # &I-M-02402;
     :eq rep.shinjigen:0759        ; # 勛
     :eq rep.jef-china3:0x44ED     ; # &I-JC3-44ED;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:007733        ] ;
     :subsume
@@ -8365,8 +8365,8 @@ a.ucs:0x52CB
     ] ;
     :eq rep.gb2312:0x512B         ; # &I-G0-512B;
     :eq rep.hanziku-1:0xF267      ; # &I-HZK01-F267;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x52DB         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x52DB         ] ;
     .
     rep.gb2312:0x512B
                :abstract-glyph-of         gb2312:0x512B  .
@@ -9188,10 +9188,10 @@ a.ucs:0x2F827
     :eq rep.gt-pj-1:13904         ; # &I-GT-03088;
     :eq rep.daikanwa...._.p:02415 ; # 勤
     :eq rep.shinjigen:0743        ; # 勤
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13338 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13338 ] ;
     :subsume
         g2.ucs_iso:0x2F827   ,
         repi.hng-khi:00150   ;
@@ -10825,12 +10825,12 @@ a.ucs:0x52E7
     :eq rep.daikanwa:02433        ; # &I-M-02433;
     :eq rep.shinjigen:0750        ; # 勧
     :eq rep.hanziku-1:0xF3EA      ; # &I-HZK01-F3EA;
-    :from.simplified     [ :sources chisebib:songyuan-yilai-suzipu ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen_1ed ;
-                           :target  rep.mj:007741        ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:007740        ] ;
+    ideo:simplified-form-of [ :sources chisebib:songyuan-yilai-suzipu ,
+                                       chisebib:daikanwa ,
+                                       chisebib:shinjigen_1ed ;
+                              :target  rep.mj:007741        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:007740        ] ;
     :subsume
         g2.ucs_unicode:0x52E7 ;
     .
@@ -12087,8 +12087,8 @@ a.ucs:0x52A2
         isd:right    a.ucs:0x529B   # 力
     ] ;
     :eq rep.gb2312:0x5B3D         ; # &I-G0-5B3D;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-5:19200 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-5:19200 ] ;
     .
     rep.gb2312:0x5B3D
                :abstract-glyph-of         gb2312:0x5B3D  .
@@ -12165,8 +12165,8 @@ a.ucs:0x52F2
     :eq rep.gt-pj-1:14126         ; # &I-GT-24769;
     :eq rep.daikanwa:02463        ; # &I-M-02463;
     :eq rep.shinjigen:0757        ; # 勲
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:007733        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:007733        ] ;
     :subsume
         g2.ucs_unicode:0x52F2 ;
     .