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

- Use `ideo:original-form-of' instead of `:from.original'.
- 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-R112-Stone.ttl b/Ideograph-R112-Stone.ttl
index b213884..cfcffc9 100644 (file)
--- a/Ideograph-R112-Stone.ttl
+++ b/Ideograph-R112-Stone.ttl
@@ -400,7 +400,7 @@ a.ucs:0x4096
         :abstract-glyph-of daikanwa:24026 ;
         :from.Liwen          [ :sources chisebib:zhengzitong ;
                                :target  a.ucs:0x77F3         ] ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x77F3         ] ;
         .
@@ -431,7 +431,7 @@ a.ucs:0x2F94C
         :abstract-glyph-of daikanwa:24027 ;
         :from.Liwen          [ :sources chisebib:zhengzitong ;
                                :target  a.ucs:0x77F3         ] ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x77F3         ] ;
         .
@@ -483,8 +483,8 @@ a.ucs:0x77F4
     :eq rep.daikanwa:24029        ; # &I-M-24029;
     :eq rep.shinjigen:5450        ; # 矴
     :eq rep.jef-china3:0x5BF6     ; # &I-JC3-5BF6;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x7887         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x7887         ] ;
     :subsume
         g2.ucs_unicode:0x77F4 ;
     .
@@ -2233,9 +2233,9 @@ a.ucs:0x7814
     :eq rep.gt-pj-1:14374         ; # &I-GT-30764;
     :eq rep.daikanwa:24080        ; # &I-M-24080;
     :eq rep.shinjigen:5407        ; # 研
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13342 ] ;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13342 ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13342 ] ;
     :subsume
         g2.ucs_unicode:0x7814 ;
@@ -2344,8 +2344,8 @@ a.ucs:0x7815
     :eq rep.gt:30774              ; # &I-GT-30774;
     :eq rep.gt-pj-1:14933         ; # &I-GT-30774;
     :eq rep.daikanwa...._.p:24080 ; # 砕
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x788E         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x788E         ] ;
     :subsume
         g2.ucs_unicode:0x7815 ;
     .
@@ -3576,10 +3576,10 @@ a.ucs:0x2544A
     :eq rep.cns11643-6:0x3A35     ; # &I-C6-3A35;
     :eq rep.daikanwa:24105        ; # &I-M-24105;
     :eq rep.shinjigen:5469        ; # 𥑊
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x78BE         ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x78BE         ] ;
     .
     rep.cns11643-6:0x3A35
@@ -4613,6 +4613,10 @@ a.ucs:0x25469
     ideo:radical         112 ; # ⽯ 
     ideo:strokes           5 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x77F3 ; # 石
+        isd:right    a.ucs:0x20B26   # 𠬦
+    ] ;
     :eq rep.cns11643-6:0x3A37     ; # &I-C6-3A37;
     :eq rep.daikanwa:24140        ; # &I-M-24140;
     .
@@ -4627,6 +4631,10 @@ a.ucs:0x2545A
     ideo:radical         112 ; # ⽯ 
     ideo:strokes           5 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x77F3 ; # 石
+        isd:right    rep.ucs-itaiji-005:0x56DF   # &U-i005+56DF;
+    ] ;
     :eq rep.cns11643-6:0x3A38     ; # &I-C6-3A38;
     :eq rep.daikanwa:24141        ; # &I-M-24141;
     .
@@ -4700,8 +4708,8 @@ a.ucs:0x783F
     :eq rep.gt:30816              ; # &I-GT-30816;
     :eq rep.gt-pj-1:14684         ; # &I-GT-30816;
     :eq rep.daikanwa...ho:0382    ; # 砿
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:05853 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:05853 ] ;
     :subsume
         g2.ucs_unicode:0x783F ;
     .
@@ -4822,8 +4830,8 @@ a.ucs:0x783A
     :eq rep.jis-x0213-1:0x4557    ; # &I-JX1-4557;
     :eq rep.gt:30868              ; # &I-GT-30868;
     :eq rep.gt-pj-1:17751         ; # &I-GT-30868;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:05855 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:05855 ] ;
     :subsume
         g2.ucs_unicode:0x783A ;
     .
@@ -4999,6 +5007,21 @@ a.ucs:0x25459
     rep.cns11643-5:0x2F37
                :abstract-glyph-of     cns11643-5:0x2F37  .
 
+a.ucs:0x25468
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x25468 ;
+    ideo:radical         112 ; # ⽯ 
+    ideo:strokes           5 ;
+    ideo:total-strokes    10 ;
+    :subsume
+        g2.ucs_iso:0x25468   ;
+    .
+    g2.ucs_iso:0x25468
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x25468 ] ;
+        .
+
 a.ucs:0x25473
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x25473 ;
@@ -5562,6 +5585,7 @@ a.ucs:0x7847
     :eq rep.gt:30918              ; # &I-GT-30918;
     :eq rep.gt-pj-5:19067         ; # &I-GT-30918;
     :eq rep.daikanwa:24162        ; # &I-M-24162;
+    :form-of             rep.mj:032017        ;
     :subsume
         g2.ucs_unicode:0x7847 ;
     .
@@ -6651,7 +6675,7 @@ a.ucs:0x785C
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿰ ;
         isd:left     a.ucs:0x77F3 ; # 石
-        isd:right    a.ucs_component:0x5DE0   # &IWDS1-085;
+        isd:right    a.ucs_component:0x5DE0   # &A-compU+5DE0;
     ] ;
     .
 
@@ -8942,8 +8966,8 @@ rep.adobe-japan1-0:05860
     :eq rep.gt:31069              ; # &I-GT-31069;
     :eq rep.gt-pj-1:25199         ; # &I-GT-31069;
     :eq rep.jef-china3:0x5CCD     ; # &I-JC3-5CCD;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.gt:31068         ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.gt:31068         ] ;
     :subsume
         g2.ucs_unicode:0x787C ;
     .
@@ -11142,7 +11166,7 @@ a.ucs:0x7897
     :eq rep.gt-pj-1:20306         ; # &I-GT-31079;
     :eq rep.daikanwa:24306        ; # &I-M-24306;
     :eq rep.shinjigen:5248        ; # 碗
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x76CC         ] ;
     :subsume
         g2.ucs_unicode:0x7897 ;
@@ -13902,8 +13926,8 @@ rep.adobe-japan1-0:03454
     :eq rep.gt:31138              ; # &I-GT-31138;
     :eq rep.gt-pj-1:18538         ; # &I-GT-31138;
     :eq rep.daikanwa...._.p:24364 ; # &AJ1-03454;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA4B         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA4B         ] ;
     :subsume
         g2.adobe-japan1-0:03454 ;
     .
@@ -14575,11 +14599,11 @@ a.ucs:0x78BE
     :form-of             [ :context domain:s.:.hand-mill ;
                            :sources chisebib:jiyun ;
                            :target  a.ucs:0x2544A        ] ;
-    :from.same           [ :context domain:s.:.hand-mill ;
+    ideo:same-as         [ :context domain:s.:.hand-mill ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2544A        ] ;
-    :from.same           [ :context domain:s.:.mill ;
+    ideo:same-as         [ :context domain:s.:.mill ;
                            :sources chisebib:guangyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x8F3E         ] ;
@@ -15932,7 +15956,7 @@ rep.daikanwa:24397
     ideo:strokes          10 ;
     ideo:total-strokes    15 ;
     :eq rep.jef-china3:0x5CB9     ; # &I-JC3-5CB9;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0213-2:0x7251 ] ;
     .
@@ -17044,7 +17068,7 @@ a.ucs:0x78DA
     :eq rep.gt-pj-1:25378         ; # &I-GT-31247;
     :eq rep.daikanwa:24418        ; # &I-M-24418;
     :eq rep.shinjigen:4998        ; # 磚
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x750E         ] ;
     :subsume
         g2.ucs_unicode:0x78DA ;
@@ -17490,6 +17514,7 @@ rep.daikanwa:24435
     ideo:radical         112 ; # ⽯ 
     ideo:strokes          11 ;
     ideo:total-strokes    16 ;
+    :form-of             rep.mj:015839        ;
     .
 
 a.ucs:0x25553
@@ -20381,6 +20406,7 @@ a.ucs:0x40E9
     ideo:total-strokes    18 ;
     :eq rep.cns11643-3:0x5841     ; # &I-C3-5841;
     :eq rep.daikanwa:24504        ; # &I-M-24504;
+    :form-of             rep.mj:032017        ;
     .
     rep.cns11643-3:0x5841
                :abstract-glyph-of     cns11643-3:0x5841  .
@@ -21581,8 +21607,8 @@ a.ucs:0x7919
     :eq rep.gt-pj-1:25384         ; # &I-GT-31378;
     :eq rep.daikanwa:24542        ; # &I-M-24542;
     :eq rep.shinjigen:5444        ; # 礙
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x788D         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x788D         ] ;
     :subsume
         g2.ucs_unicode:0x7919 ,
         g2.cns11643-1:0x7855 ;