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

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

diff --git a/Ideograph-R060-Step.ttl b/Ideograph-R060-Step.ttl
index dfb9b7b..c51b9f7 100644 (file)
--- a/Ideograph-R060-Step.ttl
+++ b/Ideograph-R060-Step.ttl
@@ -1853,7 +1853,7 @@ a.ucs:0x5F83
     :eq rep.daikanwa:10074        ; # &I-M-10074;
     :eq rep.shinjigen:2334        ; # 徃
     :eq rep.cbeta:01191           ; # &I-CB01191;
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x5F80         ] ;
@@ -2073,8 +2073,8 @@ a.ucs:0x5F84
     ideo:radical          60 ; # ⼻ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x5F91         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x5F91         ] ;
     .
 
 rep.adobe-japan1-0:01816
@@ -2095,8 +2095,8 @@ rep.adobe-japan1-0:01816
     :eq rep.gt:12687              ; # &I-GT-12687;
     :eq rep.gt-pj-1:14146         ; # &I-GT-12687;
     :eq rep.daikanwa...._.p:10080 ; # &AJ1-01816;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5F91         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5F91         ] ;
     .
     rep.ucs_jis:0x5F84
                :abstract-glyph-of [ :context domain:jis     ;
@@ -2125,8 +2125,8 @@ rep.gb2312:0x3E36
     ideo:total-strokes     8 ;
     :eq rep.ucs_unicode:0x5F84    ; # &G0-3E36;
     :rep.ucs_JP...hanazono     rdf:nil ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5F91         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5F91         ] ;
     .
     rep.ucs_unicode:0x5F84
                :abstract-glyph-of [ :context domain:unicode ;
@@ -3004,7 +3004,7 @@ a.ucs:0x38E0
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:10104 ;
         :eq rep.jef-china3:0x4DB3     ; # &I-JC3-4DB3;
-        :from.same           [ :sources chisebib:chuanpian ,
+        ideo:same-as         [ :sources chisebib:chuanpian ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-5:16780 ] ;
         .
@@ -3763,7 +3763,7 @@ a.ucs:0x224F6
     ideo:total-strokes    10 ;
     :eq rep.cns11643-6:0x3749     ; # &I-C6-3749;
     :eq rep.daikanwa:10124        ; # &I-M-10124;
-    :from.ancient        [ :sources chisebib:zihui-bei ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bei ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13939 ] ;
     :subsume
@@ -3964,8 +3964,8 @@ a.ucs:0x5F93
     :eq rep.gt-pj-1:15678         ; # &I-GT-12746;
     :eq rep.daikanwa:10133        ; # &I-M-10133;
     :eq rep.shinjigen:2354        ; # 従
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:011321        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:011321        ] ;
     .
     rep.adobe-japan1-0:02376
                :abstract-glyph-of adobe-japan1-0:02376   .
@@ -4052,10 +4052,10 @@ rep.ucs-itaiji-003:0x5FAE
         isd:middle   a.ucs:0x5C71 ; # 山
         isd:right    a.ucs:0x6535   # 攵
     ] ;
-    :from.simplified     [ :context domain:component ;
-                           :target  rep.ucs-itaiji-004:0x5FAE ] ;
-    :from.simplified     [ :context domain:component...surround-from-above ;
-                           :target  a.ucs:0x5FAE         ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  rep.ucs-itaiji-004:0x5FAE ] ;
+    ideo:simplified-form-of [ :context domain:component...surround-from-above ;
+                              :target  a.ucs:0x5FAE         ] ;
     .
 
 rep.daikanwa:10134
@@ -5178,7 +5178,7 @@ a.ucs:0x5FA0
     :eq rep.gt-pj-1:22354         ; # &I-GT-12812;
     :eq rep.daikanwa:10155        ; # &I-M-10155;
     :eq rep.shinjigen:0242        ; # 徠
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x4F86         ] ;
     .
     rep.adobe-japan1-0:04797
@@ -5621,7 +5621,7 @@ rep.ucs_iso:0x2250E
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x3F62     ; # &C6-3F62;
     :eq rep.daikanwa:10162        ; # &I-M-10162;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F80         ] ;
     :subsume
@@ -5807,8 +5807,8 @@ rep.ucs-itaiji-004:0x5FAE
         isd:surround rep.ucs-itaiji-003:0x5FAE ; # &U-i003+5FAE;
         isd:filling  a.ucs:0x4E00   # 一
     ] ;
-    :from.simplified     [ :context domain:component...surround-from-above ;
-                           :target  a.ucs:0x5FAE         ] ;
+    ideo:simplified-form-of [ :context domain:component...surround-from-above ;
+                              :target  a.ucs:0x5FAE         ] ;
     .
 
 rep.cbeta:05237
@@ -7801,11 +7801,11 @@ a.ucs:0x5FB0
     :eq rep.jis-x0212:0x3D35      ; # &I-JSP-3D35;
     :eq rep.cns11643-4:0x3D34     ; # &I-C4-3D34;
     :eq rep.daikanwa:10210        ; # &I-M-10210;
-    :from.ancient        [ :context domain:r060    ;
+    ideo:ancient-form-of [ :context domain:r060    ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:02640 ] ;
-    :from.ancient        [ :context domain:r162    ;
+    ideo:ancient-form-of [ :context domain:r162    ;
                            :target  rep.daikanwa:38796   ] ;
     .
     rep.adobe-japan1-6:21530
@@ -8160,7 +8160,7 @@ a.ucs:0x38F2
     :eq rep.cns11643-6:0x5C67     ; # &I-C6-5C67;
     :eq rep.daikanwa:10226        ; # &I-M-10226;
     :eq rep.shinjigen:2378        ; # 㣲
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.mj:011343        ] ;
@@ -8446,8 +8446,8 @@ a.ucs:0x5FB3
     :eq rep.gt-k:11158            ; # &I-GT-K11158;
     :eq rep.gt-pj-1:17985         ; # &I-GT-12896;
     :eq rep.daikanwa...._.p:10237 ; # 徳
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5FB7         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5FB7         ] ;
     :subsume
         g2.adobe-japan1-0:03225 ,
         g2.ucs_unicode:0x5FB3 ;
@@ -8610,8 +8610,8 @@ rep.adobe-japan1-0:03011
     :eq rep.gt-k:11152            ; # &I-GT-K11152;
     :eq rep.gt-pj-1:17447         ; # &I-GT-12893;
     :eq rep.daikanwa...._.p:10238 ; # &AJ1-03011;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:011354        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:011354        ] ;
     :subsume
         g2.adobe-japan1-0:03011 ,
         g2.ucs_unicode:0x5FB4 ;
@@ -9639,7 +9639,7 @@ a.ucs:0x5FBC
     :eq rep.shinjigen:2388        ; # 徼
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.mj:026166        ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026166        ] ;
     :subsume
@@ -10040,8 +10040,8 @@ rep.mj:011362
     :eq rep.gt:35717              ; # &I-GT-35717;
     :eq rep.gt-pj-1:13611         ; # &I-GT-35717;
     :eq rep.jef-china3:0x4DC1     ; # &I-JC3-4DC1;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:011363        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:011363        ] ;
     :subsume
         g2.mj:011362         ;
     .
@@ -10502,7 +10502,7 @@ a.ucs:0x5FC1
     :eq rep.cns11643-2:0x6875     ; # &I-C2-6875;
     :eq a.big5:0xF449             ; # &I-B-F449;
     :eq rep.daikanwa:10283        ; # &I-M-10283;
-    :from.same           [ :sources chisebib:pianhai ,
+    ideo:same-as         [ :sources chisebib:pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5124         ] ;
     :subsume