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

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

diff --git a/Ideograph-R115-Grain.ttl b/Ideograph-R115-Grain.ttl
index 1004c70..bafb686 100644 (file)
--- a/Ideograph-R115-Grain.ttl
+++ b/Ideograph-R115-Grain.ttl
@@ -969,7 +969,7 @@ a.ucs:0x79C6
     :eq rep.shinjigen:5620        ; # 秆
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7A08         ] ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A08         ] ;
     .
@@ -1319,10 +1319,10 @@ a.ucs:0x79CA
         :eq rep.hanziku-7:0xC16F      ; # &I-HZK07-C16F;
         :eq rep.cbeta:05383           ; # &I-CB05383;
         :eq rep.jef-china3:0x4CB1     ; # &I-JC3-4CB1;
-        :from.original       [ :sources chisebib:zhengzitong ,
-                                        chisebib:daikanwa ,
-                                        chisebib:shinjigen ;
-                               :target  rep.adobe-japan1-0:03301 ] ;
+        ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                         chisebib:daikanwa ,
+                                         chisebib:shinjigen ;
+                                :target  rep.adobe-japan1-0:03301 ] ;
         .
         rep.ucs_unicode:0x79CA
                    :abstract-glyph-of [ :context domain:unicode ;
@@ -1718,8 +1718,8 @@ a.ucs:0x79CC
     :eq rep.daikanwa:24941        ; # &I-M-24941;
     :eq rep.shinjigen:5596        ; # 秌
     :eq rep.jef-china3:0x5CF5     ; # &I-JC3-5CF5;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x79CB         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x79CB         ] ;
     :subsume
         g2.ucs_unicode:0x79CC ,
         g2.jef-china3:0x5CF5 ,
@@ -2239,8 +2239,8 @@ a.ucs:0x79D4
     :eq rep.shinjigen:5920        ; # 秔
     :eq rep.cbeta:00271           ; # &I-CB00271;
     :eq rep.jef-china3:0x5CF9     ; # &I-JC3-5CF9;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7CB3         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7CB3         ] ;
     :subsume
         g2.ucs_unicode:0x79D4 ;
     .
@@ -2570,7 +2570,7 @@ a.ucs:0x2576F
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2576F ] ;
         :eq rep.daikanwa:24968        ; # &M-24968;
-        :from.same           [ :sources chisebib:yupian ,
+        ideo:same-as         [ :sources chisebib:yupian ,
                                         chisebib:kangxi ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xFA7F         ] ;
@@ -2590,7 +2590,7 @@ a.ucs:0x2577A
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3355     ; # &I-C6-3355;
     :eq rep.daikanwa:24969        ; # &I-M-24969;
-    :from.same           [ :sources chisebib:chuanpian ,
+    ideo:same-as         [ :sources chisebib:chuanpian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A73         ] ;
     .
@@ -2607,7 +2607,7 @@ a.ucs:0x2577B
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3353     ; # &I-C6-3353;
     :eq rep.daikanwa:24970        ; # &I-M-24970;
-    :from.same           [ :sources chisebib:yuwen ,
+    ideo:same-as         [ :sources chisebib:yuwen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0xFA54         ] ;
     :subsume
@@ -2940,8 +2940,8 @@ a.ucs:0x79D8
     :eq rep.gt-pj-1:18539         ; # &I-GT-32244;
     :eq rep.daikanwa:24977        ; # &I-M-24977;
     :eq rep.shinjigen:5536        ; # 秘
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05891 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05891 ] ;
     .
     rep.adobe-japan1-0:03455
                :abstract-glyph-of adobe-japan1-0:03455   .
@@ -3584,8 +3584,8 @@ rep.adobe-japan1-0:03359
     :eq rep.gt:32226              ; # &I-GT-32226;
     :eq rep.gt-pj-1:18281         ; # &I-GT-32226;
     :eq rep.jef-china3:0x5DC6     ; # &I-JC3-5DC6;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.jis-x0213-1_2004:0x4769 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.jis-x0213-1_2004:0x4769 ] ;
     :subsume
         g2.ucs_unicode:0x79E4 ;
     .
@@ -4717,8 +4717,8 @@ rep.adobe-japan1-0:02486
     :eq rep.gt-pj-1:15950         ; # &I-GT-32225;
     :eq rep.daikanwa...._.p:25016 ; # &AJ1-02486;
     :eq rep.cbeta:00379           ; # &I-CB00379;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05917 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05917 ] ;
     :subsume
         g2.adobe-japan1-0:02486 ;
     .
@@ -5691,7 +5691,7 @@ a.ucs:0x2F958
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x4267     ; # &I-C6-4267;
     :eq rep.daikanwa:49407        ; # &I-M-49407;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.daikanwa:09184   ] ;
     .
     rep.cns11643-6:0x4267
@@ -6512,10 +6512,10 @@ a.ucs:0x7A0E
     :eq rep.gt:32336              ; # &I-GT-32336;
     :eq rep.gt-pj-1:16455         ; # &I-GT-32336;
     :eq rep.daikanwa...._.p:25070 ; # 税
-    :from.same           [ :sources chisebib:daikanwa ;
-                           :target  rep.ks-x1001:0x612A  ] ;
-    :from.simplified     [ :context domain:JP...misc ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.ks-x1001:0x612A  ] ;
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :target  rep.ks-x1001:0x612A  ] ;
     .
     rep.adobe-japan1-0:02667
                :abstract-glyph-of adobe-japan1-0:02667   .
@@ -8082,8 +8082,8 @@ rep.adobe-japan1-0:03477
     :eq rep.gt-k:11165            ; # &I-GT-K11165;
     :eq rep.gt-pj-1:18723         ; # &I-GT-32477;
     :eq rep.jef-china3:0x5DC7     ; # &I-JC3-5DC7;
-    :from.simplified     [ :context domain:JP...extra...design ;
-                           :target  rep.jis-x0213-1_2004:0x4923 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra...design ;
+                              :target  rep.jis-x0213-1_2004:0x4923 ] ;
     .
     rep.ucs_jis...1990:0x7A17
                :abstract-glyph-of [ :context domain:jis...1990 ;
@@ -10920,8 +10920,8 @@ rep.adobe-japan1-0:01204
     :eq rep.gt:32476              ; # &I-GT-32476;
     :eq rep.gt-pj-1:12400         ; # &I-GT-32476;
     :eq rep.daikanwa...._.p:25187 ; # &AJ1-01204;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05918 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05918 ] ;
     :subsume
         g2.ucs_unicode:0x7A32 ;
     .
@@ -11041,8 +11041,8 @@ a.ucs:0x2F959
     :eq rep.gt-k:11664            ; # &I-GT-K11664;
     :eq rep.gt-pj-1:14706         ; # &I-GT-32448;
     :eq rep.daikanwa...._.p:25188 ; # 穀
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA54         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA54         ] ;
     :subsume
         g2.adobe-japan1-0:02052 ,
         g2.ucs_iso:0x2F959   ,
@@ -12385,8 +12385,8 @@ a.ucs:0x7A3A
     :eq rep.cns11643-3:0x4D56     ; # &I-C3-4D56;
     :eq rep.daikanwa:25213        ; # &I-M-25213;
     :eq rep.shinjigen:5635        ; # 稺
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7A1A         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7A1A         ] ;
     :subsume
         g2.ucs_unicode:0x7A3A ;
     .
@@ -13728,8 +13728,8 @@ rep.adobe-japan1-0:03638
     :eq rep.gt:32528              ; # &I-GT-32528;
     :eq rep.gt-pj-1:19046         ; # &I-GT-32528;
     :eq rep.daikanwa...._.p:25236 ; # &AJ1-03638;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05922 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05922 ] ;
     :subsume
         g2.ucs_unicode:0x7A42 ;
     .
@@ -15526,7 +15526,7 @@ rep.daikanwa:25280
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05926 ] ;
     .
@@ -15561,8 +15561,8 @@ rep.adobe-japan1-0:01338
     :eq rep.gt:32561              ; # &I-GT-32561;
     :eq rep.gt-pj-1:12858         ; # &I-GT-32561;
     :eq rep.daikanwa...._.p:25280 ; # &AJ1-01338;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05926 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05926 ] ;
     :subsume
         g2.ucs_unicode:0x7A4F ;
     .
@@ -19033,7 +19033,7 @@ rep.daikanwa:25361
     :sound               [ :context domain:ja...on ;
                            :target  ( "ti" ) ;
                          ] ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7A3A         ] ;
     :subsume
@@ -19471,7 +19471,7 @@ a.ucs:0x258F7
         :abstract-glyph-of daikanwa:40149 ;
         ideo:radical         166 ; # ⾥ 
         ideo:strokes          12 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x7CE7         ] ;
         .
@@ -19674,7 +19674,7 @@ rep.adobe-japan1-0:05927
     :eq rep.gt:32753              ; # &I-GT-32753;
     :eq rep.gt-pj-1:25428         ; # &I-GT-32753;
     :eq rep.shinjigen:5597        ; # &AJ1-05927;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen_rev ;
                            :target  a.ucs:0x79CB         ] ;
@@ -19803,7 +19803,7 @@ rep.cns11643-3:0x5E47
     ] ;
     :eq rep.ucs_cns:0x9F9D        ; # &C3-5E47;
     :eq rep.shinjigen_1ed:5595    ; # &C3-5E47;
-    :from.ancient        [ :sources chisebib:shinjigen_1ed ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x79CB         ] ;
     :subsume
         g2.cns11643-3:0x5E47 ,
@@ -20675,7 +20675,7 @@ rep.ucs_iso:0x2591B
     ] ;
     :eq rep.daikanwa:25401        ; # &M-25401;
     :eq rep.shinjigen:5598        ; # &M-25401;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x79CB         ] ;