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

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

diff --git a/Ideograph-R031-Enclosure.ttl b/Ideograph-R031-Enclosure.ttl
index fb40178..6597f9b 100644 (file)
--- a/Ideograph-R031-Enclosure.ttl
+++ b/Ideograph-R031-Enclosure.ttl
@@ -423,7 +423,7 @@ a.ucs:0x56D9
     :eq rep.big5-cdp:0x8DE5       ; # &I-CDP-8DE5;
     :eq rep.daikanwa:04678        ; # &I-M-04678;
     :eq rep.shinjigen:1301        ; # 囙
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x56E0         ] ;
     .
     rep.adobe-japan1-5:19270
@@ -1711,8 +1711,8 @@ a.ucs:0x56E3
     :eq rep.gt:05918              ; # &I-GT-05918;
     :eq rep.gt-pj-1:17220         ; # &I-GT-05918;
     :eq rep.daikanwa...._.p:04703 ; # 団
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5718         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5718         ] ;
     :subsume
         g2.ucs_unicode:0x56E3 ;
     .
@@ -2369,7 +2369,7 @@ a.ucs:0x56EC
     :eq rep.daikanwa:04713        ; # &I-M-04713;
     :eq rep.shinjigen_1ed:1304    ; # 囬
     :eq rep.hanziku-2:0xE55E      ; # &I-HZK02-E55E;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x56DE         ] ;
     .
     rep.cns11643-3:0x252B
@@ -2411,14 +2411,14 @@ a.ucs:0x56ED
                                        :sources chisebib:zhuangzi-jijie ,
                                                 chisebib:daikanwa ] ,
                                      a.ucs:0x5718         ] ;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  [ :target  a.ucs:0x5213         ;
                                       :sources chisebib:guangyun ,
                                                chisebib:daikanwa ] ,
                                     [ :target  a.ucs:0x5718         ;
                                       :sources chisebib:jiyun ,
                                                chisebib:daikanwa ] ] ;
-    :to.mistakable       [ :sources chisebib:kangxi-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  rep.ucs_iso:0x211B6  ] ;
     :subsume
@@ -2693,7 +2693,7 @@ a.ucs:0x56EF
     :eq rep.daikanwa:04716        ; # &I-M-04716;
     :eq rep.shinjigen_1ed:1321    ; # 囯
     :eq rep.hanziku-2:0xE4E6      ; # &I-HZK02-E4E6;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  rep.adobe-japan1-0:04467 ] ;
     .
     rep.cns11643-3:0x2529
@@ -3019,8 +3019,8 @@ a.ucs:0x56F2
     :eq rep.gt-pj-1:12367         ; # &I-GT-05925;
     :eq rep.daikanwa:04722        ; # &I-M-04722;
     :eq rep.shinjigen:1308        ; # 囲
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:008868        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:008868        ] ;
     :subsume
         g2.ucs_unicode:0x56F2 ;
     .
@@ -3403,8 +3403,8 @@ a.ucs:0x56F3
         :eq rep.gt:05950              ; # &I-GT-05950;
         :eq rep.gt-pj-1:16222         ; # &I-GT-05950;
         :eq rep.daikanwa...._.p:04734 ; # &AJ1-02596;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  rep.mj:008880        ] ;
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  rep.mj:008880        ] ;
         :subsume
             g2.adobe-japan1-0:02596 ;
         .
@@ -3558,8 +3558,8 @@ a.ucs:0x56F5
     ] ;
     :eq rep.gb2312:0x6070         ; # &I-G0-6070;
     :eq rep.hanziku-2:0xE565      ; # &I-HZK02-E565;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5707         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5707         ] ;
     .
     rep.gb2312:0x6070
                :abstract-glyph-of         gb2312:0x6070  .
@@ -4426,12 +4426,12 @@ a.ucs:0x56FD
     :eq rep.gt-pj-1:14705         ; # &I-GT-05968;
     :eq rep.daikanwa:04752        ; # &I-M-04752;
     :eq rep.shinjigen:1318        ; # 国
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  rep.adobe-japan1-0:04467 ] ;
     :subsume
         g2.ucs_unicode:0x56FD ;
     .
@@ -7435,7 +7435,7 @@ a.ucs:0x570E
     :eq rep.daikanwa:04813        ; # &I-M-04813;
     :eq rep.shinjigen_1ed:1333    ; # 圎
     :eq rep.jef-china3:0x8FB5     ; # &I-JC3-8FB5;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x5713         ] ;
     :subsume
         g2.ucs_unicode:0x570E ;
@@ -7568,8 +7568,8 @@ a.ucs:0x570F
         :eq rep.gt-k:09046            ; # &I-GT-K09046;
         :eq rep.gt-pj-1:14199         ; # &I-GT-06048;
         :eq rep.daikanwa...._.p:04815 ; # &AJ1-01869;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  rep.mj:008861        ] ;
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  rep.mj:008861        ] ;
         :subsume
             g2.adobe-japan1-0:01869 ;
         .
@@ -8937,7 +8937,7 @@ g.ucs_unicode:0x5717
         :abstract-glyph-of [ :context domain:unicode ;
                              :target     ucs:0x5717  ] ;
         :eq rep.daikanwa:04833        ; # &M-04833;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.mj:008880        ] ;
         .
@@ -8950,7 +8950,7 @@ g.ucs_unicode:0x5717
         :eq rep.ucs_cns:0x5717        ; # &C3-4637;
         :eq rep.shinjigen_1ed:1315    ; # &C3-4637;
         :eq rep.hanziku-2:0xE7AC      ; # &I-HZK02-E7AC;
-        :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                                :target  rep.mj:008880        ] ;
         .
         rep.ucs_cns:0x5717
@@ -8985,7 +8985,7 @@ a.ucs:0x5718
     :eq rep.gt-pj-1:21541         ; # &I-GT-06086;
     :eq rep.daikanwa:04834        ; # &I-M-04834;
     :eq rep.shinjigen:1307        ; # 團
-    :from.ancient        rep.adobe-japan1-0:04894 ;
+    ideo:ancient-form-of rep.adobe-japan1-0:04894 ;
     :form-of             [ :sources chisebib:maoshi ;
                            :target  rep.cns11643-2:0x4B3F ] ;
     :from.interchangeable [ :sources chisebib:maoshi ,
@@ -9286,7 +9286,7 @@ a.ucs:0x2F84D
     :eq rep.gt:06085              ; # &I-GT-06085;
     :eq rep.gt-pj-2:23844         ; # &I-GT-06085;
     :eq rep.daikanwa...._.p:04841 ; # 圗
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:008880        ] ;
     :subsume
@@ -9849,7 +9849,7 @@ a.ucs:0x2122D
     :eq rep.cns11643-7:0x373C     ; # &I-C7-373C;
     :eq rep.daikanwa:04855        ; # &I-M-04855;
     :eq rep.shinjigen:7639        ; # 𡈭
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7344         ] ;
     :subsume
         g2.daikanwa:04855    ,
@@ -10115,7 +10115,7 @@ rep.adobe-japan1-5:19279
     :eq rep.daikanwa:04866        ; # &I-M-04866;
     :eq rep.shinjigen:3895        ; # &AJ1-19279;
     :eq rep.cbeta:01402           ; # &I-CB01402;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x6B12         ] ;
     :subsume
         g2.adobe-japan1-5:19279 ,