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

- Use `ideo:same-as' instead of `:from.same'.
- Use `ideo:vulgar-form-of' instead of `:from.vulgar'.
- Use `ideo:original-form-of' instead of `:from.original'.
- Use `ideo:ancient-form-of' instead of `:from.ancient'.
- Use `ideo:mistakable' instead of `:to.mistakable'.
- Use `ideo:interchangeable-form-of' instead of
  `:from.interchangeable'.

diff --git a/Ideograph-R181-Leaf.ttl b/Ideograph-R181-Leaf.ttl
index f25eed8..cd82baa 100644 (file)
--- a/Ideograph-R181-Leaf.ttl
+++ b/Ideograph-R181-Leaf.ttl
@@ -272,8 +272,8 @@ a.ucs:0x9875
     ideo:strokes           0 ;
     ideo:total-strokes     6 ;
     :eq rep.gb2312:0x5233         ; # &I-G0-5233;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x9801         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x9801         ] ;
     .
     rep.gb2312:0x5233
                :abstract-glyph-of         gb2312:0x5233  .
@@ -1407,7 +1407,7 @@ rep.cns11643-3:0x4552
     ideo:strokes           4 ;
     ideo:total-strokes    13 ;
     :eq rep.ucs_unicode:0x980B    ; # &C3-4552;
-    :from.same           a.ucs:0x2F9FF        ;
+    ideo:same-as         a.ucs:0x2F9FF        ;
     :subsume
         g2.ucs_unicode:0x980B ,
         a.ucs:0x2F9FE        ;
@@ -2781,8 +2781,8 @@ a.ucs:0x987F
     ideo:strokes           4 ;
     ideo:total-strokes    10 ;
     :eq rep.gb2312:0x3659         ; # &I-G0-3659;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.cns11643-1:0x6761 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.cns11643-1:0x6761 ] ;
     .
     rep.gb2312:0x3659
                :abstract-glyph-of         gb2312:0x3659  .
@@ -3486,7 +3486,7 @@ a.ucs:0x2F9FF
                          ] ;
     :eq rep.cns11643-6:0x6430     ; # &I-C6-6430;
     :eq rep.daikanwa:43411        ; # &I-M-43411;
-    :from.vulgar         [ :sources chisebib:yupian ,
+    ideo:vulgar-form-of  [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.gt:58611         ] ;
     :subsume
@@ -4207,8 +4207,8 @@ a.ucs:0x981A
     :eq rep.gt:58265              ; # &I-GT-58265;
     :eq rep.gt-pj-1:14171         ; # &I-GT-58265;
     :eq rep.daikanwa:43434        ; # &I-M-43434;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0x9838         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0x9838         ] ;
     :subsume
         g2.ucs_unicode:0x981A ,
         g2.adobe-japan1-0:01841 ;
@@ -4468,7 +4468,7 @@ a.ucs:0x981C
     :eq rep.gb12345:0x7222        ; # 頜
     :eq rep.daikanwa:43440        ; # &I-M-43440;
     :eq rep.shinjigen:9167        ; # 頜
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x9837         ] ;
     .
     rep.jis-x0212:0x677A
@@ -4630,8 +4630,8 @@ a.ucs:0x981F
     :eq rep.cns11643-3:0x4F69     ; # &I-C3-4F69;
     :eq rep.daikanwa:43448        ; # &I-M-43448;
     :eq rep.shinjigen:9179        ; # 頟
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x984D         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x984D         ] ;
     .
     rep.cns11643-3:0x4F69
                :abstract-glyph-of     cns11643-3:0x4F69  .
@@ -4833,11 +4833,11 @@ rep.adobe-japan1-0:07182
     :eq rep.gt-pj-1:28789         ; # &I-GT-58308;
     :eq rep.daikanwa:43455        ; # &I-M-43455;
     :eq rep.shinjigen:9162        ; # &AJ1-07182;
-    :from.ancient        a.ucs:0x268DD        ;
-    :from.same           [ :sources chisebib:shuowen-zhu ,
+    ideo:ancient-form-of a.ucs:0x268DD        ;
+    ideo:same-as         [ :sources chisebib:shuowen-zhu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x268DD        ] ;
-    :to.mistakable       [ :sources chisebib:kangxi-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9823         ] ;
     .
@@ -5058,7 +5058,7 @@ rep.cns11643-2:0x5562
     ideo:total-strokes    15 ;
     :eq rep.ucs_unicode:0x9829    ; # &C2-5562;
     :eq rep.daikanwa:43461        ; # &I-M-43461;
-    :from.same           [ :sources chisebib:zhonghua-dazidian ,
+    ideo:same-as         [ :sources chisebib:zhonghua-dazidian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:43561   ] ;
     .
@@ -5261,7 +5261,7 @@ rep.daikanwa:43471
     ideo:radical         181 ; # ⾴ 
     ideo:strokes           6 ;
     ideo:total-strokes    15 ;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4AB6         ] ;
     .
@@ -5472,7 +5472,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         ] ;
@@ -6096,8 +6096,8 @@ a.ucs:0x982C
     :eq rep.gt:58319              ; # &I-GT-58319;
     :eq rep.gt-pj-1:19275         ; # &I-GT-58319;
     :eq rep.jef-china3:0x6CFD     ; # &I-JC3-6CFD;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0x9830         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0x9830         ] ;
     .
     rep.adobe-japan1-0:03705
                :abstract-glyph-of adobe-japan1-0:03705   .
@@ -6972,8 +6972,8 @@ rep.adobe-japan1-0:03523
     :eq rep.gt:58465              ; # &I-GT-58465;
     :eq rep.gt-pj-1:18769         ; # &I-GT-58465;
     :eq rep.jef-china3:0x6CFB     ; # &I-JC3-6CFB;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA6A         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA6A         ] ;
     :subsume
         g2.adobe-japan1-0:03523 ,
         repi.hng-khm:01510   ;
@@ -7135,7 +7135,7 @@ a.ucs:0x9825
     :eq rep.daikanwa:43523        ; # &I-M-43523;
     :eq rep.shinjigen:9163        ; # 頥
     :eq rep.jef-china3:0x6CED     ; # &I-JC3-6CED;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:07182 ] ;
     :subsume
         g2.ucs_unicode:0x9825 ;
@@ -7350,8 +7350,8 @@ a.ucs:0x983C
     :eq rep.gt:58416              ; # &I-GT-58416;
     :eq rep.gt-pj-1:19818         ; # &I-GT-58416;
     :eq rep.daikanwa...._.p:43529 ; # 頼
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-2:08627 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-2:08627 ] ;
     :subsume
         g2.ucs_unicode:0x983C ;
     .
@@ -9596,14 +9596,14 @@ a.ucs:0x9853
     :eq rep.jef-china3:0x6CF1     ; # &I-JC3-6CF1;
     :form-of             [ :sources chisebib:zhengzitong ;
                            :target  a.ucs:0x5718         ] ;
-    :from.interchangeable [ :sources chisebib:daikanwa ;
-                            :target  [ :target  rep.adobe-japan1-0:04642 ;
-                                       :sources chisebib:hanshu-zhu ,
-                                                chisebib:daikanwa ] ,
-                                     [ :target  a.ucs:0x5718         ;
-                                       :sources chisebib:hanshu-zhu ,
-                                                chisebib:zhengzitong ,
-                                                chisebib:daikanwa ] ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:daikanwa ;
+                                   :target  [ :target  rep.adobe-japan1-0:04642 ;
+                                              :sources chisebib:hanshu-zhu ,
+                                                       chisebib:daikanwa ] ,
+                                            [ :target  a.ucs:0x5718         ;
+                                              :sources chisebib:hanshu-zhu ,
+                                                       chisebib:zhengzitong ,
+                                                       chisebib:daikanwa ] ] ;
     :subsume
         g2.ucs_unicode:0x9853 ,
         repi.hng-kar:13970   ;
@@ -9841,8 +9841,8 @@ rep.adobe-japan1-0:04008
     :eq rep.gt:58526              ; # &I-GT-58526;
     :eq rep.gt-pj-1:20064         ; # &I-GT-58526;
     :eq rep.daikanwa...._.p:43608 ; # &AJ1-04008;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13396 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13396 ] ;
     .
     rep.ucs_jis:0x985E
                :abstract-glyph-of [ :context domain:jis     ;
@@ -9909,8 +9909,8 @@ a.ucs:0x9855
     :eq rep.gt:58498              ; # &I-GT-58498;
     :eq rep.gt-pj-1:14386         ; # &I-GT-58498;
     :eq rep.daikanwa...._.p:43609 ; # 顕
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x986F         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x986F         ] ;
     .
     rep.adobe-japan1-0:01894
                :abstract-glyph-of adobe-japan1-0:01894   .
@@ -10810,8 +10810,8 @@ rep.adobe-japan1-0:03129
     :eq rep.gt:58557              ; # &I-GT-58557;
     :eq rep.gt-pj-1:17727         ; # &I-GT-58557;
     :eq rep.jef-china3:0x6CF4     ; # &I-JC3-6CF4;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07752 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07752 ] ;
     :subsume
         g2.adobe-japan1-0:03129 ;
     .