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

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

diff --git a/Ideograph-R113-Spirit.ttl b/Ideograph-R113-Spirit.ttl
index c9f41db..ec98e10 100644 (file)
--- a/Ideograph-R113-Spirit.ttl
+++ b/Ideograph-R113-Spirit.ttl
@@ -525,7 +525,7 @@ a.ucs:0x793B
     :eq rep.jef-china3:0x72FE     ; # &I-JC3-72FE;
     :form-of             [ :context domain:component...connect-right ;
                            :target  a.ucs:0x793A         ] ;
-    :from.vulgar         [ :context domain:component...connect-right ;
+    ideo:vulgar-form-of  [ :context domain:component...connect-right ;
                            :sources chisebib:daikanwa ;
                            :target  a.ucs:0x793A         ] ;
     :subsume
@@ -663,7 +663,7 @@ a.ucs:0xFA18
     :eq rep.daikanwa:24626        ; # &I-M-24626;
     :eq rep.shinjigen:5507        ; # 礼
     :eq rep.jef-china3:0x70E5     ; # &I-JC3-70E5;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:05900 ] ;
@@ -740,8 +740,8 @@ rep.adobe-japan1-0:04017
     :eq rep.gt-k:01024            ; # &I-GT-K01024;
     :eq rep.gt-pj-1:20073         ; # &I-GT-31490;
     :eq rep.daikanwa...._.p:24626 ; # &AJ1-04017;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05900 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05900 ] ;
     :subsume
         g2.ucs_unicode:0x793C ;
     .
@@ -1241,8 +1241,8 @@ rep.adobe-japan1-0:02302
     :eq rep.gt:31503              ; # &I-GT-31503;
     :eq rep.gt-pj-1:15442         ; # &I-GT-31503;
     :eq rep.daikanwa...._.p:24631 ; # &AJ1-02302;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA4C         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA4C         ] ;
     :subsume
         g2.ucs_unicode:0x793E ;
     .
@@ -1741,8 +1741,8 @@ rep.adobe-japan1-0:01805
     :eq rep.gt-k:02532            ; # &I-GT-K02532;
     :eq rep.gt-pj-1:14135         ; # &I-GT-31498;
     :eq rep.jef-china3:0x5CD0     ; # &I-JC3-5CD0;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.adobe-japan1-0:07668 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.adobe-japan1-0:07668 ] ;
     :subsume
         g2.ucs_unicode:0x7941 ;
     .
@@ -2655,8 +2655,8 @@ rep.adobe-japan1-0:01626
     :eq rep.gt:31519              ; # &I-GT-31519;
     :eq rep.gt-pj-1:13632         ; # &I-GT-31519;
     :eq rep.jef-china3:0x5CCF     ; # &I-JC3-5CCF;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.adobe-japan1-0:07659 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.adobe-japan1-0:07659 ] ;
     :subsume
         g2.ucs_unicode:0x7947 ;
     .
@@ -2905,8 +2905,8 @@ rep.adobe-japan1-0:01601
     :eq rep.gt:31516              ; # &I-GT-31516;
     :eq rep.gt-pj-1:13607         ; # &I-GT-31516;
     :eq rep.daikanwa...._.p:24640 ; # &AJ1-01601;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA4E         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA4E         ] ;
     :subsume
         g2.ucs_unicode:0x7948 ;
     .
@@ -3114,8 +3114,8 @@ rep.adobe-japan1-0:02225
     :eq rep.gt:31522              ; # &I-GT-31522;
     :eq rep.gt-pj-1:15203         ; # &I-GT-31522;
     :eq rep.daikanwa...._.p:24641 ; # &AJ1-02225;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA4D         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA4D         ] ;
     :subsume
         g2.ucs_unicode:0x7949 ;
     .
@@ -4625,7 +4625,7 @@ rep.daikanwa:24659
     :form-of             [ :sources chisebib:jiyun ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:05892 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05892 ] ;
     .
@@ -5069,8 +5069,8 @@ rep.adobe-japan1-0:02758
     :eq rep.gt-k:05126            ; # &I-GT-K05126;
     :eq rep.gt-pj-1:16708         ; # &I-GT-31578;
     :eq rep.daikanwa...._.p:24664 ; # &AJ1-02758;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA50         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA50         ] ;
     :subsume
         g2.ucs_unicode:0x7956 ;
     .
@@ -6181,8 +6181,8 @@ rep.adobe-japan1-0:02389
     :eq rep.gt-k:05102            ; # &I-GT-K05102;
     :eq rep.gt-pj-1:15691         ; # &I-GT-31569;
     :eq rep.daikanwa...._.p:24672 ; # &AJ1-02389;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA51         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA51         ] ;
     :subsume
         g2.ucs_unicode:0x795D ;
     .
@@ -6441,8 +6441,8 @@ rep.adobe-japan1-0:02566
     :eq rep.gt-k:05113            ; # &I-GT-K05113;
     :eq rep.gt-pj-1:16192         ; # &I-GT-31572;
     :eq rep.daikanwa...._.p:24673 ; # &AJ1-02566;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA19         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA19         ] ;
     :subsume
         g2.ucs_unicode:0x795E ;
     .
@@ -7127,7 +7127,7 @@ a.ucs:0x25632
         ] ;
         :eq rep.daikanwa:24681        ; # &M-24681;
         :eq rep.hanziku-1:0xA954      ; # &I-HZK01-A954;
-        :from.ancient        [ :sources chisebib:jiyun ,
+        ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xFA50         ] ;
         .
@@ -7140,7 +7140,7 @@ a.ucs:0x25632
         :abstract-character-of ucs:0x2F953 ;
         :to.canonical-ucs      a.ucs:0x7956 ; # 祖
         :eq rep.cns11643-6:0x334A     ; # &I-C6-334A;
-        :from.same           [ :context domain:ucs     ;
+        ideo:same-as         [ :context domain:ucs     ;
                                :target  a.ucs:0x7956         ] ;
         .
         rep.cns11643-6:0x334A
@@ -7173,7 +7173,7 @@ rep.mj:042992
     :eq rep.hanyo-denshi...ks:275960 ; # &MJ042992;
     :eq rep.daikanwa:24684        ; # &I-M-24684;
     :form-of             a.ucs:0x796D         ;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x796D         ] ;
     :subsume
@@ -7882,8 +7882,8 @@ rep.adobe-japan1-0:02485
     :eq rep.gt-k:06470            ; # &I-GT-K06470;
     :eq rep.gt-pj-1:15949         ; # &I-GT-31632;
     :eq rep.daikanwa...._.p:24689 ; # &AJ1-02485;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA1A         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA1A         ] ;
     :subsume
         g2.ucs_unicode:0x7965 ;
     .
@@ -9037,7 +9037,7 @@ rep.cbeta:00865
     ideo:total-strokes    11 ;
     ideo:hanyu-dazidian  ( 4 2396 11 ) ;
     :eq rep.daikanwa...ho:0402    ; # &M-H0402;
-    :from.vulgar         [ :sources chisebib:longkanshoujian ,
+    ideo:vulgar-form-of  [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:013869        ] ;
     :subsume
@@ -11122,7 +11122,7 @@ rep.adobe-japan1-0:05916
     :eq rep.gt-pj-1:25417         ; # &I-GT-31833;
     :eq rep.daikanwa:24742        ; # &I-M-24742;
     :eq rep.shinjigen:5641        ; # &AJ1-05916;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:05915 ] ;
     :subsume
         g2.cns11643-3:0x433D ,
@@ -11729,7 +11729,7 @@ rep.gb2312:0x6C78
     :eq rep.ucs_unicode:0x7985    ; # &G0-6C78;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :eq rep.daikanwa:24754        ; # &I-M-24754;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05899 ] ;
     :subsume
@@ -12672,8 +12672,8 @@ rep.adobe-japan1-0:01362
     :eq rep.gt-k:10174            ; # &I-GT-K10174;
     :eq rep.gt-pj-1:12882         ; # &I-GT-31777;
     :eq rep.daikanwa...._.p:24766 ; # &AJ1-01362;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA52         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA52         ] ;
     :subsume
         g2.adobe-japan1-0:01362 ;
     .
@@ -13141,8 +13141,8 @@ rep.adobe-japan1-0:03569
     :eq rep.gt-pj-1:18977         ; # &I-GT-31825;
     :eq rep.daikanwa...._.p:24768 ; # &AJ1-03569;
     :eq rep.shinjigen:5572        ; # &AJ1-03569;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA1B         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA1B         ] ;
     :subsume
         g2.ucs_unicode:0x798F ;
     .
@@ -14579,10 +14579,10 @@ rep.adobe-japan1-0:02743
     :eq rep.gt-pj-1:16693         ; # &I-GT-31813;
     :eq rep.daikanwa...._.p:24787 ; # &AJ1-02743;
     :eq rep.shinjigen:5566        ; # &AJ1-02743;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:daikanwa ,
-                                    chisebib:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05899 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:daikanwa ,
+                                       chisebib:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05899 ] ;
     .
     rep.ucs_jis:0x7985
                :abstract-glyph-of [ :context domain:jis     ;
@@ -16673,7 +16673,7 @@ a.ucs:0x9834
     :eq rep.gt-pj-1:12624         ; # &I-GT-31942;
     :eq rep.daikanwa:24824        ; # &I-M-24824;
     :eq rep.shinjigen:5660        ; # 頴
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x7A4E         ] ;
@@ -18893,8 +18893,8 @@ rep.adobe-japan1-0:03295
     :eq rep.gt:32014              ; # &I-GT-32014;
     :eq rep.gt-pj-1:18217         ; # &I-GT-32014;
     :eq rep.jef-china3:0x5CED     ; # &I-JC3-5CED;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.adobe-japan1-0:07769 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.adobe-japan1-0:07769 ] ;
     :subsume
         g2.ucs_unicode:0x79B0 ;
     .
@@ -19227,8 +19227,8 @@ a.ucs:0x7977
     :eq rep.gt:31697              ; # &I-GT-31697;
     :eq rep.gt-pj-1:17784         ; # &I-GT-31697;
     :eq rep.jef-china3:0x5CEC     ; # &I-JC3-5CEC;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.adobe-japan1-0:07758 ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.adobe-japan1-0:07758 ] ;
     :subsume
         g2.adobe-japan1-0:03186 ,
         g2.ucs_unicode:0x7977 ;