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

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

diff --git a/Ideograph-R005-Second.ttl b/Ideograph-R005-Second.ttl
index 5e7e0d0..198f0ee 100644 (file)
--- a/Ideograph-R005-Second.ttl
+++ b/Ideograph-R005-Second.ttl
@@ -1516,8 +1516,8 @@ a.ucs:0x4E60
     :eq rep.gb2312:0x4F30         ; # &I-G0-4F30;
     :eq rep.big5-cdp:0x8973       ; # &I-CDP-8973;
     :eq rep.jef-china3:0x81C9     ; # &I-JC3-81C9;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:020683        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:020683        ] ;
     .
     rep.gb2312:0x4F30
                :abstract-glyph-of         gb2312:0x4F30  .
@@ -1535,8 +1535,8 @@ a.ucs:0x4E61
     ideo:hanyu-dazidian  ( 1 51 5 ) ;
     :eq rep.gb2312:0x4F67         ; # &I-G0-4F67;
     :eq rep.big5-cdp:0x8C51       ; # &I-CDP-8C51;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gb12345:0x4F67   ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gb12345:0x4F67   ] ;
     .
     rep.gb2312:0x4F67
                :abstract-glyph-of         gb2312:0x4F67  .
@@ -1550,8 +1550,8 @@ a.ucs:0x200D3
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
     :eq rep.big5-cdp:0x89DB       ; # &I-CDP-89DB;
-    :from.simplified     [ :context domain:CN...component ;
-                           :target  rep.adobe-japan1-0:05099 ] ;
+    ideo:simplified-form-of [ :context domain:CN...component ;
+                              :target  rep.adobe-japan1-0:05099 ] ;
     :subsume
         g2.ucs_iso:0x200D3   ,
         g2.big5-cdp:0x89DB   ;
@@ -1844,8 +1844,8 @@ a.ucs:0x4E66
     :eq rep.gb2312:0x4A69         ; # &I-G0-4A69;
     :eq rep.big5-cdp:0x8A4C       ; # &I-CDP-8A4C;
     :eq rep.jef-china3:0x81CD     ; # &I-JC3-81CD;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:02427 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:02427 ] ;
     .
     rep.gb2312:0x4A69
                :abstract-glyph-of         gb2312:0x4A69  .
@@ -2563,8 +2563,8 @@ a.ucs:0x4E70
     :eq rep.gb2312:0x4272         ; # &I-G0-4272;
     :eq rep.hanziku-1:0xAEE9      ; # &I-HZK01-AEE9;
     :eq rep.jef-china3:0x81ED     ; # &I-JC3-81ED;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8CB7         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8CB7         ] ;
     .
     rep.gb2312:0x4272
                :abstract-glyph-of         gb2312:0x4272  .
@@ -2636,11 +2636,11 @@ a.ucs:0x4E71
     :eq rep.gt-pj-1:19824         ; # &I-GT-00251;
     :eq rep.daikanwa:00187        ; # &I-M-00187;
     :eq rep.shinjigen:0060        ; # 乱
-    :from.simplified     a.ucs:0x4E82         ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gt:00286         ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04101 ] ;
+    ideo:simplified-form-of a.ucs:0x4E82         ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gt:00286         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04101 ] ;
     :subsume
         g2.ucs_unicode:0x4E71 ;
     .
@@ -3519,7 +3519,7 @@ rep.ucs_iso:0x200ED
     :eq rep.gt:00253              ; # &I-GT-00253;
     :eq rep.gt-pj-2:12636         ; # &I-GT-00253;
     :eq rep.daikanwa:00193        ; # &I-M-00193;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x59CB         ] ;
     :subsume
@@ -3828,7 +3828,7 @@ a.ucs:0x4E79
     :eq rep.shinjigen:0065        ; # 乹
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x4E7E         ] ;
-    :from.vulgar         [ :sources chisebib:jiyun ,
+    ideo:vulgar-form-of  [ :sources chisebib:jiyun ,
                                     chisebib:zhengzitong ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
@@ -3956,7 +3956,7 @@ a.ucs:0x341C
     :eq rep.daikanwa:00195        ; # &I-M-00195;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  a.ucs:0x4EC7         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4EC7         ] ;
     :subsume
@@ -4039,7 +4039,7 @@ a.ucs:0x200F2
     :eq rep.gt-pj-2:12639         ; # &I-GT-00263;
     :eq rep.daikanwa:00196        ; # &I-M-00196;
     :eq rep.hanziku-1:0xAFA6      ; # &I-HZK01-AFA6;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x622A         ] ;
     :subsume
@@ -4838,7 +4838,7 @@ rep.gt:00270
     :eq rep.daikanwa:00207        ; # &I-M-00207;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.daikanwa:11041   ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:11041   ] ;
     :subsume
@@ -5025,7 +5025,7 @@ a.ucs:0x4E80
     :eq rep.daikanwa:00210        ; # &I-M-00210;
     :eq rep.shinjigen_1ed:9917    ; # 亀
     :eq rep.shinjigen_rev:9916    ; # 亀
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07472 ] ;
     :subsume
         g2.ucs_unicode:0x4E80 ;