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

- Use `ideo:simplified-form-of' instead of `:from.simplified'.
- Use `ideo:original-form-of' instead of `:from.original'.
- Use `ideo:same-as' instead of `:from.same'.
- Sync up with the current environment.

diff --git a/Ideograph-R050-Turban.ttl b/Ideograph-R050-Turban.ttl
index d662482..6ef9d1b 100644 (file)
--- a/Ideograph-R050-Turban.ttl
+++ b/Ideograph-R050-Turban.ttl
@@ -1354,7 +1354,7 @@ a.ucs:0x5E08
     :eq rep.cns11643-3:0x235C     ; # &I-C3-235C;
     :eq rep.daikanwa:08800        ; # &I-M-08800;
     :eq rep.shinjigen:2105        ; # 师
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02211 ] ;
     :subsume
         g2.daikanwa:08800    ,
@@ -1692,7 +1692,7 @@ a.ucs:0x5E0B
     :eq rep.daikanwa:08809        ; # &I-M-08809;
     :eq rep.shinjigen:5982        ; # 帋
     :eq rep.cbeta:02408           ; # &I-CB02408;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7D19         ] ;
     :subsume
         g2.ucs_unicode:0x5E0B ;
@@ -6285,8 +6285,8 @@ a.ucs:0x5E2F
     :eq rep.gt-pj-1:16979         ; # &I-GT-11232;
     :eq rep.daikanwa:08929        ; # &I-M-08929;
     :eq rep.shinjigen:2108        ; # 帯
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5E36         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5E36         ] ;
     :subsume
         g2.ucs_unicode:0x5E2F ;
     .
@@ -6391,8 +6391,8 @@ a.ucs:0x5E26
     ideo:total-strokes     9 ;
     ideo:hanyu-dazidian  ( 1 736 9 ) ;
     :eq rep.gb2312:0x3478         ; # &I-G0-3478;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5E36         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5E36         ] ;
     :subsume
         g2.ucs_unicode:0x5E26 ;
     .
@@ -6452,8 +6452,8 @@ rep.adobe-japan1-0:01596
     :eq rep.gt-pj-1:13602         ; # &I-GT-11209;
     :eq rep.daikanwa:08930        ; # &I-M-08930;
     :eq rep.shinjigen:3959        ; # &AJ1-13429;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:014849        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:014849        ] ;
     :subsume
         g2.ucs_unicode:0x5E30 ,
         g2.adobe-japan1-0:01596 ;
@@ -7937,7 +7937,7 @@ a.ucs:0x384C
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:08967 ;
         :eq rep.shinjigen:2120        ; # &M-08967;
-        :from.vulgar         [ :sources chisebib:shinjigen ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                                :target  rep.adobe-japan1-4:14032 ] ;
         .
         rep.shinjigen:2120
@@ -8993,8 +8993,8 @@ a.ucs:0x3853
     :eq rep.daikanwa:08988        ; # &I-M-08988;
     :eq rep.shinjigen:7418        ; # 㡓
     :eq rep.cbeta:07144           ; # &I-CB07144;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x890C         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x890C         ] ;
     :subsume
         g2.ucs_unicode:0x3853 ;
     .
@@ -9619,7 +9619,7 @@ a.ucs:0x5E47
     :eq rep.gt-pj-1:22131         ; # &I-GT-11335;
     :eq rep.daikanwa:08999        ; # &I-M-08999;
     :eq rep.shinjigen:2145        ; # 幇
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5E6B         ] ;
     :subsume
         g2.ucs_unicode:0x5E47 ;
@@ -9973,9 +9973,9 @@ a.ucs:0x5E42
     ] ;
     .
 
-rep.cns11643-3:0x3979
+rep.mj:010875
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-3:0x3979 ;
+    :abstract-glyph-of mj:010875 ;
     :denotation-of
         a.ucs:0x5E42         ;
     ideo:radical           [ :context domain:ucs     ;
@@ -9994,39 +9994,64 @@ rep.cns11643-3:0x3979
         isd:above    rep.ucs_iso:0x20587 ; # &U-00020587;
         isd:below    a.ucs:0x5DFE   # 巾
     ] ;
-    :eq rep.ucs_unicode:0x5E42    ; # &C3-3979;
-    :eq rep.gb2312:0x435D         ; # &C3-3979;
-    :eq rep.shinjigen:0537        ; # &C3-3979;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.mj:007355        ] ;
+    :eq rep.ucs_unicode:0x5E42    ; # &MJ010875;
+    :eq rep.gb2312:0x435D         ; # &I-G0-435D;
+    :eq rep.cns11643-3:0x3979     ; # &I-C3-3979;
+    :eq rep.hanyo-denshi...ks:101990 ; # &MJ010875;
+    :eq rep.shinjigen:0537        ; # &MJ010875;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.mj:007355        ] ;
     :subsume
-        g2.ucs_unicode:0x5E42 ;
+        g2.mj:010875         ;
     .
     rep.ucs_unicode:0x5E42
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x5E42  ] .
     rep.gb2312:0x435D
                :abstract-glyph-of         gb2312:0x435D  .
+    rep.cns11643-3:0x3979
+               :abstract-glyph-of     cns11643-3:0x3979  .
+    rep.hanyo-denshi...ks:101990
+               :abstract-glyph-of hanyo-denshi...ks:101990  .
     rep.shinjigen:0537
                :abstract-glyph-of      shinjigen:0537    .
-    g2.ucs_unicode:0x5E42
+    g2.mj:010875
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x5E42  ] ;
-        :eq g2.gb2312:0x435D          ; # &g2-UU+5E42;
-        :eq g2.cns11643-3:0x3979      ; # &g2-UU+5E42;
-        :eq g2.shinjigen:0537         ; # &g2-UU+5E42;
+        :abstract-glyph-form-of mj:010875 ;
+        :eq g2.ucs_unicode:0x5E42     ; # &g2-MJ010875;
+        :eq g2.gb2312:0x435D          ; # &g2-MJ010875;
+        :eq g2.cns11643-3:0x3979      ; # &g2-MJ010875;
+        :eq g2.hanyo-denshi...ks:101990 ; # &g2-MJ010875;
+        :eq g2.shinjigen:0537         ; # &g2-MJ010875;
         :subsume
+            repi.hanyo-denshi...ks:101990 ,
+            repi.mj:010875       ,
             repi.cns11643-3:0x3979 ,
             repi.ucs_unicode:0x5E42 ,
             rep.hanziku-1:0xE4DF ;
         .
+        g2.ucs_unicode:0x5E42
+              :abstract-glyph-form-of [ :context domain:unicode ;
+                                        :target     ucs:0x5E42  ] .
         g2.gb2312:0x435D
               :abstract-glyph-form-of         gb2312:0x435D  .
         g2.cns11643-3:0x3979
               :abstract-glyph-form-of     cns11643-3:0x3979  .
+        g2.hanyo-denshi...ks:101990
+              :abstract-glyph-form-of hanyo-denshi...ks:101990  .
         g2.shinjigen:0537
               :abstract-glyph-form-of      shinjigen:0537    .
+        repi.hanyo-denshi...ks:101990
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...ks:101990 ;
+            :eq rep.hanyo-denshi...ks...mf:010199 ; # &R-HD-KS-101990;
+            .
+            rep.hanyo-denshi...ks...mf:010199
+                       :abstract-glyph-of hanyo-denshi...ks...mf:010199  .
+        repi.mj:010875
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:010875 ;
+            .
         repi.cns11643-3:0x3979
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-3:0x3979 ;
@@ -10699,6 +10724,7 @@ a.ucs:0x5E4E
     :eq rep.gt-pj-1:22125         ; # &I-GT-11376;
     :eq rep.daikanwa:09024        ; # &I-M-09024;
     :eq rep.shinjigen:2128        ; # 幎
+    :form-of             rep.mj:010874        ;
     :subsume
         g2.ucs_unicode:0x5E4E ;
     .
@@ -11669,6 +11695,16 @@ rep.mj:010898
     :eq rep.hanyo-denshi...ks:102450 ; # &MJ010898;
     :eq rep.koseki:102450         ; # &MJ010898;
     :eq rep.daikanwa:09051        ; # &I-M-09051;
+    ideo:interchangeable-form-of rep.mj:015839        ;
+    ideo:interchangeable-form-of [ :context domain:ancient ;
+                                   :target  rep.mj:015839        ] ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  [ :target  rep.cns11643-2:0x4978 ;
+                                      :sources chisebib:zihui-bu ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  rep.adobe-japan1-4:14125 ;
+                                      :sources chisebib:jiyun ,
+                                               chisebib:daikanwa ] ] ;
     :subsume
         g2.mj:010898         ;
     .
@@ -14171,6 +14207,9 @@ a.ucs:0x5E66
     :eq rep.cns11643-2:0x5677     ; # &I-C2-5677;
     :eq a.big5:0xE96D             ; # &I-B-E96D;
     :eq rep.daikanwa:09100        ; # &I-M-09100;
+    ideo:interchangeable-form-of rep.mj:010898        ;
+    :subsume
+        g2.ucs_unicode:0x5E66 ;
     .
     rep.cns11643-2:0x5677
                :abstract-glyph-of     cns11643-2:0x5677  .
@@ -14178,6 +14217,34 @@ a.ucs:0x5E66
            :abstract-character-of           big5:0xE96D  .
     rep.daikanwa:09100
                :abstract-glyph-of       daikanwa:09100   .
+    g2.ucs_unicode:0x5E66
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5E66  ] ;
+        :eq g2.cns11643-2:0x5677      ; # &g2-M-09100;
+        :eq g2.daikanwa:09100         ; # &g2-M-09100;
+        :subsume
+            repi.daikanwa:09100  ,
+            repi.cns11643-2:0x5677 ,
+            repi.ucs_unicode:0x5E66 ;
+        .
+        g2.cns11643-2:0x5677
+              :abstract-glyph-form-of     cns11643-2:0x5677  .
+        g2.daikanwa:09100
+              :abstract-glyph-form-of       daikanwa:09100   .
+        repi.daikanwa:09100
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:09100 ;
+            .
+        repi.cns11643-2:0x5677
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-2:0x5677 ;
+            .
+        repi.ucs_unicode:0x5E66
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x5E66  ] ;
+            .
 
 rep.daikanwa:09101
     a chisegg:abstract-glyph ;
@@ -14444,7 +14511,7 @@ a.ucs:0x2F888
     ideo:total-strokes    16 ;
     :eq rep.cns11643-7:0x2D55     ; # &I-C7-2D55;
     :eq rep.daikanwa:09107        ; # &I-M-09107;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14125 ] ;
     :subsume
@@ -14747,7 +14814,7 @@ rep.mj:035179
     :eq rep.daikanwa:09117        ; # &I-M-09117;
     :form-of             [ :sources chisebib:koseki ;
                            :target  rep.adobe-japan1-0:03966 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:03966 ] ;
     :subsume
@@ -16249,7 +16316,7 @@ a.ucs:0x2217B
     :eq rep.gt:11529              ; # &I-GT-11529;
     :eq rep.gt-pj-3:16988         ; # &I-GT-11529;
     :eq rep.daikanwa:09153        ; # &I-M-09153;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6B06         ] ;
     :subsume
@@ -16449,7 +16516,7 @@ a.ucs:0x22183
         :abstract-glyph-of daikanwa:09159 ;
         ideo:strokes          20 ;
         ideo:total-strokes    23 ;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:09151   ] ;
         .