From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 31 May 2017 19:48:45 +0000 (+0900)
Subject: - Use `ideo:simplified-form-of' instead of `:from.simplified'.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a02b745dd5e9556188f2cd7b455a4741c1790a;p=chise%2Fchiset.git

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

diff --git a/Ideograph-R023-Hiding-Enclosure.ttl b/Ideograph-R023-Hiding-Enclosure.ttl
index 58bb47e..5234c48 100644
--- a/Ideograph-R023-Hiding-Enclosure.ttl
+++ b/Ideograph-R023-Hiding-Enclosure.ttl
@@ -654,8 +654,8 @@ a.ucs:0x533A
     ideo:radical          23 ; # ⼖ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x5340         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x5340         ] ;
     .
 
 rep.gt:03428
@@ -674,8 +674,8 @@ rep.gt:03428
     :eq rep.cns11643-3:0x2157     ; # &GT-03428;
     :eq rep.gt-pj-2:18296         ; # &I-GT-03428;
     :eq rep.daikanwa:02674        ; # &I-M-02674;
-    :from.simplified     [ :sources chisebib:daikanwa ;
-                           :target  rep.mj:007833        ] ;
+    ideo:simplified-form-of [ :sources chisebib:daikanwa ;
+                              :target  rep.mj:007833        ] ;
     :subsume
         g2.gt:03428          ;
     .
@@ -749,13 +749,13 @@ rep.adobe-japan1-0:01760
     :eq rep.gt-pj-1:13928         ; # &I-GT-03327;
     :eq rep.shinjigen:0801        ; # &AJ1-01760;
     :eq rep.hanziku-1:0xB4B6      ; # &I-HZK01-B4B6;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:007832        ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:007832        ] ;
-    :from.simplified     [ :context domain:JP...misc ;
-                           :sources chisebib:shinjigen ;
-                           :target  rep.mj:007833        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:007832        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:007832        ] ;
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :sources chisebib:shinjigen ;
+                              :target  rep.mj:007833        ] ;
     .
     rep.ucs_unicode:0x533A
                :abstract-glyph-of [ :context domain:unicode ;
@@ -777,27 +777,50 @@ rep.adobe-japan1-0:01760
     rep.hanziku-1:0xB4B6
                :abstract-glyph-of      hanziku-1:0xB4B6  .
 
-rep.daikanwa:48948
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:48948 ;
-    :to.ucs		  a.ucs:0x20504 ; # 𠔄
-    ideo:radical          23 ; # ⼖ 
-    ideo:strokes           2 ;
-    ideo:total-strokes     4 ;
-    .
-
 a.ucs:0x20504
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20504 ;
-
-    :morohashi-daikanwa	  (48948 0 1) ;
     ideo:radical          23 ; # ⼖ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
-    :eq rep.cns11643-6:0x2159     ; # &I-C6-2159;
+    :subsume
+        rep.daikanwa:48948   ,
+        rep.ucs_iso:0x20504  ;
     .
-    rep.cns11643-6:0x2159
-               :abstract-glyph-of     cns11643-6:0x2159  .
+    rep.daikanwa:48948
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of daikanwa:48948 ;
+        .
+    rep.ucs_iso:0x20504
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x20504 ] ;
+        :eq rep.cns11643-6:0x2159     ; # &C6-2159;
+        :subsume
+            g2.ucs_iso:0x20504   ;
+        .
+        rep.cns11643-6:0x2159
+                   :abstract-glyph-of     cns11643-6:0x2159  .
+        g2.ucs_iso:0x20504
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x20504 ] ;
+            :eq g2.cns11643-6:0x2159      ; # &g2-IU-00020504;
+            :subsume
+                repi.cns11643-6:0x2159 ,
+                repi.ucs_iso:0x20504 ;
+            .
+            g2.cns11643-6:0x2159
+                  :abstract-glyph-form-of     cns11643-6:0x2159  .
+            repi.cns11643-6:0x2159
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-6:0x2159 ;
+                .
+            repi.ucs_iso:0x20504
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x20504 ] ;
+                .
 
 a.ucs:0x2096E
     a chisegg:abstract-character ;
@@ -1080,8 +1103,8 @@ a.ucs:0x533B
     ideo:radical          23 ; # ⼖ 
     ideo:strokes           5 ;
     ideo:total-strokes     7 ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x91AB         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x91AB         ] ;
     .
 
 rep.mj:007821
@@ -1205,10 +1228,10 @@ rep.mj:007820
     :eq rep.gt-k:02502            ; # &I-GT-K02502;
     :eq rep.gt-pj-1:12389         ; # &I-GT-03344;
     :eq rep.shinjigen:8537        ; # &MJ007820;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:026547        ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:026547        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:026547        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:026547        ] ;
     :subsume
         g2.ucs_unicode:0x533B ,
         g2.mj:007820         ;
@@ -1331,7 +1354,7 @@ rep.ucs_iso:0x20971
     :form-of             [ :context domain:Zetian  ;
                            :sources chisebib:zihui-bu ;
                            :target  a.ucs:0x6708         ] ;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:013520        ] ;
     :subsume
@@ -1394,7 +1417,7 @@ rep.daikanwa:02682
     :sound               [ :context domain:ja...on ;
                            :target  ( "kou" ) ;
                          ] ;
-    :from.ancient        [ :sources chisebib:zihui-bu ,
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6046         ] ;
     .