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

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

diff --git a/Ideograph-R130-Meat.ttl b/Ideograph-R130-Meat.ttl
index 57a3576..e6a0d34 100644 (file)
--- a/Ideograph-R130-Meat.ttl
+++ b/Ideograph-R130-Meat.ttl
@@ -625,8 +625,8 @@ a.ucs:0x808A
     :eq rep.gt-pj-6:14458         ; # &I-GT-37858;
     :eq rep.daikanwa:29238        ; # &I-M-29238;
     :eq rep.shinjigen:6569        ; # 肊
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x81C6         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x81C6         ] ;
     :subsume
         g2.ucs_unicode:0x808A ,
         g2.cns11643-2:0x2168 ;
@@ -1260,8 +1260,8 @@ a.ucs:0x808E
     :eq rep.gt-pj-6:14627         ; # &I-GT-37863;
     :eq rep.daikanwa:29247        ; # &I-M-29247;
     :eq rep.shinjigen:6435        ; # 肎
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x80AF         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x80AF         ] ;
     :subsume
         a.gt:37863           ,
         rep.cbeta:05089      ;
@@ -1665,10 +1665,10 @@ rep.gt:37898
     ideo:total-strokes     7 ;
     :eq rep.gt-pj-6:14633         ; # &GT-37898;
     :eq rep.daikanwa:29253        ; # &I-M-29253;
-    :from.original       [ :context domain:s.:.scratch ;
-                           :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.ucs_unicode:0x8092 ] ;
+    ideo:original-form-of [ :context domain:s.:.scratch ;
+                            :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.ucs_unicode:0x8092 ] ;
     .
     rep.gt-pj-6:14633
                :abstract-glyph-of        gt-pj-6:14633   .
@@ -1745,10 +1745,10 @@ a.ucs:0x8090
     :eq rep.cns11643-2:0x2476     ; # &I-C2-2476;
     :eq a.big5:0xCB76             ; # &I-B-CB76;
     :eq rep.daikanwa:29254        ; # &I-M-29254;
-    :from.same           [ :context domain:p.:.ge  ;
+    ideo:same-as         [ :context domain:p.:.ge  ;
                            :sources chisebib:daikanwa ;
                            :target  a.ucs:0x80F3         ] ;
-    :from.same           [ :context domain:zh      ;
+    ideo:same-as         [ :context domain:zh      ;
                            :sources chisebib:daikanwa ;
                            :target  a.ucs:0x80F3         ] ;
     :from.wrong          [ :context domain:p.:.yi  ;
@@ -1902,13 +1902,13 @@ a.ucs:0x2F980
                          ] ;
     :eq rep.cns11643-6:0x287B     ; # &I-C6-287B;
     :eq rep.daikanwa:29258        ; # &I-M-29258;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x808E         ] ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :notes  ("Different character") ;
                            :target  a.ucs:0x2335F        ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  rep.ucs_iso:0x2335F  ,
                                     a.ucs:0x8099         ] ;
     :subsume
@@ -3353,7 +3353,7 @@ a.ucs:0x20554
     :eq rep.cns11643-6:0x287A     ; # &I-C6-287A;
     :eq rep.daikanwa:49525        ; # &I-M-49525;
     :form-of             a.ucs:0x2F980        ;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x2F980        ] ;
     :subsume
         g2.daikanwa:49525    ,
@@ -4196,8 +4196,8 @@ a.ucs:0x80A7
     :eq rep.daikanwa:29296        ; # &I-M-29296;
     :eq rep.shinjigen:6469        ; # 肧
     :eq rep.jef-china3:0x52B2     ; # &I-JC3-52B2;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x80DA         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x80DA         ] ;
     :subsume
         g2.ucs_unicode:0x80A7 ,
         g2.cns11643-3:0x2A58 ;
@@ -4995,7 +4995,7 @@ a.ucs:0x26643
     :eq rep.gt-k:04151            ; # &I-GT-K04151;
     :eq rep.gt-pj-6:14677         ; # &I-GT-37935;
     :eq rep.daikanwa:29307        ; # &I-M-29307;
-    :from.ancient        [ :sources chisebib:zhengzitong ,
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x80E5         ] ;
     :subsume
@@ -7436,8 +7436,8 @@ a.ucs:0x80C6
     :eq rep.gt-pj-1:17216         ; # &I-GT-38021;
     :eq rep.daikanwa:29354        ; # &I-M-29354;
     :eq rep.shinjigen:6461        ; # 胆
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x81BD         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x81BD         ] ;
     :subsume
         g2.ucs_unicode:0x80C6 ,
         g2.cns11643-3:0x2E66 ;
@@ -8385,8 +8385,8 @@ a.ucs:0x80D1
     :eq a.big5:0xD059             ; # &I-B-D059;
     :eq rep.daikanwa:29374        ; # &I-M-29374;
     :eq rep.shinjigen:6444        ; # 胑
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x80A2         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x80A2         ] ;
     :subsume
         g2.ucs_unicode:0x80D1 ,
         g2.cns11643-2:0x2C7A ;
@@ -9478,8 +9478,8 @@ a.ucs:0x80DC
     :eq a.big5:0xD060             ; # &I-B-D060;
     :eq rep.daikanwa:29394        ; # &I-M-29394;
     :eq rep.shinjigen:6527        ; # 胜
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x8165         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x8165         ] ;
     :subsume
         g2.ucs_unicode:0x80DC ,
         g2.cns11643-2:0x2D23 ;
@@ -13469,8 +13469,8 @@ rep.jis-x0212:0x5628
     :eq rep.cns11643-3:0x334E     ; # &I-C3-334E;
     :eq rep.daikanwa:29464        ; # &I-M-29464;
     :eq rep.shinjigen:6484        ; # &JSP-5628;
-    :from.original       [ :sources chisebib:shinjigen_1ed ;
-                           :target  a.ucs:0x8106         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_1ed ;
+                            :target  a.ucs:0x8106         ] ;
     :subsume
         g2.ucs_jis:0x8103    ,
         g2.cns11643-3:0x334E ;
@@ -14126,7 +14126,7 @@ o.ucs_jis:0x8108
         :eq rep.jis-x0208_1983:0x4C2E ; # &I-J83-4C2E;
         :eq rep.gt-pj-1:19502         ; # &I-GT-38135;
         :eq rep.daikanwa:29470        ; # &I-M-29470;
-        :from.same           [ :sources chisebib:daikanwa ;
+        ideo:same-as         [ :sources chisebib:daikanwa ;
                                :target  rep.cns11643-1:0x5763 ] ;
         :subsume
             g2.daikanwa:29470    ,
@@ -15220,7 +15220,7 @@ a.ucs:0x8117
         :eq rep.daikanwa:29498        ; # &I-M-29498;
         :eq rep.shinjigen:1007        ; # &JSP-562B;
         :eq rep.hanziku-6:0xAC4E      ; # &I-HZK06-AC4E;
-        :from.vulgar         [ :sources chisebib:shinjigen ;
+        ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                                :target  a.ucs:0x543B         ] ;
         .
         rep.ucs_unicode:0x8117
@@ -16327,8 +16327,8 @@ a.ucs:0x8123
     :eq rep.daikanwa:29526        ; # &I-M-29526;
     :eq rep.shinjigen_1ed:6496    ; # 脣
     :eq rep.shinjigen_rev:1091    ; # 脣
-    :from.original       [ :sources chisebib:shinjigen_rev ;
-                           :target  rep.adobe-japan1-0:02550 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_rev ;
+                            :target  rep.adobe-japan1-0:02550 ] ;
     :subsume
         g2.ucs_unicode:0x8123 ,
         g2.cns11643-1:0x5C6A ;
@@ -18214,8 +18214,8 @@ a.ucs:0x8133
     :eq rep.gt-pj-1:18238         ; # &I-GT-38218;
     :eq rep.daikanwa...._.p:29567 ; # 脳
     :eq rep.shinjigen:6504        ; # 脳
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:06261 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:06261 ] ;
     :subsume
         g2.ucs_unicode:0x8133 ;
     .
@@ -21656,7 +21656,7 @@ a.ucs:0x2F984
     :sound               [ :context domain:ja...on ;
                            :target  ( "sou" "su" ) ;
                          ] ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :notes  ("different meanings") ;
                            :target  a.ucs:0x440B         ] ;
     :subsume
@@ -21667,7 +21667,7 @@ a.ucs:0x2F984
     rep.daikanwa:29639
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:29639 ;
-        :to.mistakable       [ :sources chisebib:daikanwa ;
+        ideo:mistakable      [ :sources chisebib:daikanwa ;
                                :target  rep.daikanwa:14379   ] ;
         .
     rep.ucs_iso:0x2F984
@@ -22818,7 +22818,7 @@ a.ucs:0x815F
     :eq rep.gt-pj-1:26421         ; # &I-GT-38427;
     :eq rep.daikanwa:29667        ; # &I-M-29667;
     :eq rep.shinjigen:6557        ; # 腟
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x81A3         ] ;
     :subsume
         g2.ucs_unicode:0x815F ,
@@ -23763,7 +23763,7 @@ rep.mj:058390
     :eq rep.shinjigen:6506        ; # &MJ058390;
     :form-of             [ :sources chisebib:koseki ;
                            :target  rep.adobe-japan1-0:06261 ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:06261 ] ;
     :subsume
         g2.mj:058390         ;
@@ -24524,7 +24524,7 @@ a.ucs:0x816E
     :eq rep.gt-pj-1:26408         ; # &I-GT-38390;
     :eq rep.daikanwa:29702        ; # &I-M-29702;
     :eq rep.shinjigen:9189        ; # 腮
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x984B         ] ;
     :subsume
         g2.ucs_unicode:0x816E ,
@@ -25172,8 +25172,8 @@ rep.cns11643-1:0x6626
     :eq rep.daikanwa:29712        ; # &I-M-29712;
     :eq rep.shinjigen:6493        ; # &C1-6626;
     :eq rep.jef-china3:0x52D5     ; # &I-JC3-52D5;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x811A         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x811A         ] ;
     :subsume
         g2.ucs_unicode:0x8173 ,
         g2.shinjigen:6493    ,
@@ -26894,8 +26894,8 @@ rep.mj:021168
     :eq rep.gt:38421              ; # &I-GT-38421;
     :eq rep.gt-pj-1:16988         ; # &I-GT-38421;
     :eq rep.jef-china3:0x52E2     ; # &I-JC3-52E2;
-    :from.simplified     [ :context domain:JP...extra ;
-                           :target  rep.mj:021169        ] ;
+    ideo:simplified-form-of [ :context domain:JP...extra ;
+                              :target  rep.mj:021169        ] ;
     :subsume
         g2.mj:021168         ,
         g2.ucs_unicode:0x817F ;
@@ -29982,7 +29982,7 @@ rep.adobe-japan1-0:06273
     :eq rep.gt-pj-1:26422         ; # &I-GT-38597;
     :eq rep.daikanwa:29811        ; # &I-M-29811;
     :eq rep.shinjigen:6530        ; # &AJ1-06273;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x8178         ] ;
     :subsume
         g2.ucs_unicode:0x8193 ,
@@ -31660,6 +31660,10 @@ a.ucs:0x267E3
     ideo:radical         130 ; # ⾁ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs_component:0x6708 ; # &A-compU+6708;
+        isd:right    a.ucs:0x21569   # 𡕩
+    ] ;
     .
 
 rep.cns11643-5:0x4F7C
@@ -31670,6 +31674,10 @@ rep.cns11643-5:0x4F7C
     ideo:radical         130 ; # ⾁ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x2EBC ; # ⺼
+        isd:right    rep.ucs_iso:0x21569   # &C6-3E3C;
+    ] ;
     :eq rep.ucs_cns:0x267E3       ; # &C5-4F7C;
     :eq rep.daikanwa:29848        ; # &I-M-29848;
     :subsume
@@ -31704,6 +31712,10 @@ rep.ucs_iso:0x267E3
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
     ideo:hanyu-dazidian  ( 3 2108 6 ) ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x2EBC ; # ⺼
+        isd:right    rep.ucs_JP...hanazono:0x21569   # &hanaJU+21569;
+    ] ;
     :subsume
         rep.hanziku-6:0xB1FD ,
         g2.ucs_iso:0x267E3   ;
@@ -32311,7 +32323,7 @@ a.ucs:0x26803
                          ] ;
     :eq rep.cns11643-7:0x316C     ; # &I-C7-316C;
     :eq rep.daikanwa:29860        ; # &I-M-29860;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x81CD         ] ;
     :subsume
@@ -36489,11 +36501,11 @@ a.ucs:0x81C6
     :form-of             [ :context domain:p.:.yi  ;
                            :sources chisebib:shuowen ;
                            :target  a.ucs:0x808A         ] ;
-    :from.same           [ :context domain:p.:.yi  ;
+    ideo:same-as         [ :context domain:p.:.yi  ;
                            :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x808A         ] ;
-    :from.same           [ :context domain:s.:.drink ;
+    ideo:same-as         [ :context domain:s.:.drink ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:026547        ] ;
@@ -36742,7 +36754,7 @@ rep.mj:021256
     :eq rep.gt:38701              ; # &I-GT-38701;
     :eq rep.gt-pj-1:26437         ; # &I-GT-38701;
     :eq rep.shinjigen:6586        ; # &MJ021256;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:06287 ] ;
     :subsume
         g2.mj:021256         ;
@@ -38119,7 +38131,7 @@ a.ucs:0x26878
     :eq rep.gt-pj-6:16425         ; # &I-GT-38776;
     :eq rep.daikanwa:29982        ; # &I-M-29982;
     :eq rep.shinjigen:6561        ; # 𦡸
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x81A9         ] ;
     :subsume
         g2.ucs_iso:0x26878   ,
@@ -38786,8 +38798,8 @@ rep.adobe-japan1-0:02817
     :eq rep.gt:38786              ; # &I-GT-38786;
     :eq rep.gt-pj-1:16929         ; # &I-GT-38786;
     :eq rep.daikanwa...._.p:29995 ; # &AJ1-02817;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:021282        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:021282        ] ;
     :subsume
         g2.ucs_unicode:0x81D3 ;
     .