- Sync up with the current environment.

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

diff --git a/Ideograph-R079-Weapon.ttl b/Ideograph-R079-Weapon.ttl
index f756e10..060cca4 100644 (file)
--- a/Ideograph-R079-Weapon.ttl
+++ b/Ideograph-R079-Weapon.ttl
@@ -149,6 +149,7 @@
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
@@ -547,8 +548,8 @@ rep.adobe-japan1-0:01317
     :eq rep.gt:21302              ; # &I-GT-21302;
     :eq rep.gt-pj-1:12837         ; # &I-GT-21302;
     :eq rep.daikanwa...._.p:16618 ; # &AJ1-01317;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05367 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05367 ] ;
     :subsume
         g2.adobe-japan1-0:01317 ,
         g2.ucs_unicode:0x6BB4 ;
@@ -790,7 +791,7 @@ a.ucs:0x23A85
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3227     ; # &I-C6-3227;
     :eq rep.daikanwa:16620        ; # &I-M-16620;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05367 ] ;
     :subsume
@@ -839,7 +840,7 @@ a.ucs:0x23A86
     rep.daikanwa:16621
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16621 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xF970         ] ;
         .
@@ -861,7 +862,7 @@ a.ucs:0x6BB6
     :eq rep.cns11643-2:0x2B49     ; # &I-C2-2B49;
     :eq a.big5:0xCF67             ; # &I-B-CF67;
     :eq rep.daikanwa:16622        ; # &I-M-16622;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6CE8         ] ;
     :subsume
@@ -944,8 +945,8 @@ rep.big5-cdp:0x8AD4
         isd:left     rep.big5-cdp:0x8B7C ; # &CDP-8B7C;
         isd:right    a.ucs:0x6BB3   # 殳
     ] ;
-    :from.simplified     [ :context domain:misc    ;
-                           :target  rep.adobe-japan1-5:17897 ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  rep.adobe-japan1-5:17897 ] ;
     :subsume
         g2.big5-cdp:0x8AD4   ;
     .
@@ -1307,9 +1308,9 @@ rep.adobe-japan1-0:02164
     :eq rep.gt-pj-1:15142         ; # &I-GT-21319;
     :eq rep.daikanwa:16629        ; # &I-M-16629;
     :eq rep.shinjigen:3996        ; # &AJ1-02164;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xF970         ] ;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xF970         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0xF970         ] ;
     :subsume
         g2.adobe-japan1-0:02164 ,
@@ -1476,7 +1477,7 @@ a.ucs:0x23A8B
     ideo:total-strokes    11 ;
     :eq rep.cns11643-4:0x324C     ; # &I-C4-324C;
     :eq rep.daikanwa:16630        ; # &I-M-16630;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01657 ] ;
     :subsume
@@ -1829,7 +1830,7 @@ rep.ucs_iso:0x23A8F
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x4076     ; # &C6-4076;
     :eq rep.daikanwa:16637        ; # &I-M-16637;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01526 ] ;
     :subsume
@@ -2003,7 +2004,7 @@ a.ucs:0x23A96
     rep.daikanwa:16641
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16641 ;
-        :from.same           [ :sources chisebib:wuyin-pianhai ,
+        ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xF970         ] ;
         .
@@ -2483,8 +2484,8 @@ a.ucs:0x6BBB
     :eq rep.gt-k:07726            ; # &I-GT-K07726;
     :eq rep.gt-pj-1:13132         ; # &I-GT-21325;
     :eq rep.shinjigen:3999        ; # 殻
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6BBC         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6BBC         ] ;
     :subsume
         g2.gt:21325          ,
         g2.ucs_unicode:0x6BBB ,
@@ -2712,7 +2713,7 @@ a.ucs:0x23A99
     rep.daikanwa:16648
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16648 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16645   ] ;
         .
@@ -2738,7 +2739,7 @@ a.ucs:0x23A9B
     rep.daikanwa:16649
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16649 ;
-        :from.same           [ :sources chisebib:zhonghua-dazidian ,
+        ideo:same-as         [ :sources chisebib:zhonghua-dazidian ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:04033   ] ;
         .
@@ -3172,7 +3173,7 @@ a.ucs:0x23AA1
     rep.daikanwa:16653
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16653 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x22F81        ] ;
         .
@@ -3492,7 +3493,7 @@ rep.cns11643-3:0x4226
     :eq rep.gb2312:0x3B59         ; # &C3-4226;
     :eq rep.ks-x1001:0x7D43       ; # &I-K0-7D43;
     :eq rep.daikanwa:16661        ; # &I-M-16661;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04509 ] ;
     :subsume
@@ -3704,7 +3705,7 @@ a.ucs:0x23AB0
     ideo:total-strokes    14 ;
     :eq rep.cns11643-6:0x5E21     ; # &I-C6-5E21;
     :eq rep.daikanwa:16664        ; # &I-M-16664;
-    :from.same           [ :sources chisebib:kangxi ,
+    ideo:same-as         [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17314 ] ;
     :subsume
@@ -3976,7 +3977,7 @@ a.ucs:0x23AB3
     rep.daikanwa:16670
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16670 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:04033   ] ;
         .
@@ -4007,7 +4008,7 @@ rep.ucs_iso:0x23AB7
     ideo:total-strokes    14 ;
     :eq rep.cns11643-6:0x5E22     ; # &C6-5E22;
     :eq rep.daikanwa:16671        ; # &I-M-16671;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04509 ] ;
     :subsume
@@ -4404,7 +4405,7 @@ a.ucs:0x23AB8
     ideo:total-strokes    15 ;
     :eq rep.cns11643-7:0x242D     ; # &I-C7-242D;
     :eq rep.daikanwa:16675        ; # &I-M-16675;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9DC7         ] ;
     :subsume
@@ -4710,7 +4711,7 @@ a.ucs:0x23ABD
     rep.daikanwa:16682
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16682 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x657D         ] ;
         .
@@ -4786,10 +4787,10 @@ a.ucs:0x3C87
         :abstract-glyph-of daikanwa:16685 ;
         :form-of             [ :sources chisebib:jiyun ;
                                :target  a.ucs:0x2A533        ] ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2A533        ] ;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:07453 ] ;
         .
@@ -4920,7 +4921,7 @@ a.ucs:0x23AC1
     ideo:total-strokes    16 ;
     :eq rep.cns11643-7:0x2F22     ; # &I-C7-2F22;
     :eq rep.daikanwa:16689        ; # &I-M-16689;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6572         ] ;
     :subsume
@@ -4956,6 +4957,40 @@ a.ucs:0x23AC1
                               :target     ucs:0x23AC1 ] ;
             .
 
+a.ucs:0x23AC4
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23AC4 ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs-itaiji-001:0x6614 ; # &A-U-i001+6614;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
+rep.ucs_iso:0x23AC4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23AC4 ] ;
+    :denotation-of
+        a.ucs:0x23AC4        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.ucs-itaiji-002:0x6614 ; # &U-i002+6614;
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23AC4   ;
+    .
+    g2.ucs_iso:0x23AC4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23AC4 ] ;
+        .
+
 a.ucs:0x23AC9
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23AC9 ;
@@ -5024,7 +5059,7 @@ a.daikanwa:16692
     rep.daikanwa:16692
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16692 ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:07012   ] ;
         .
@@ -5093,7 +5128,7 @@ a.ucs:0x23AD0
     rep.daikanwa:16694
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16694 ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16639   ] ;
         .
@@ -5180,7 +5215,7 @@ a.daikanwa:16697
     rep.daikanwa:16697
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16697 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:47917   ] ;
         .
@@ -5423,7 +5458,7 @@ a.ucs:0x23AD8
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16702 ;
         :eq rep.cbeta:01083           ; # &I-CB01083;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16693   ] ;
         .
@@ -5489,9 +5524,9 @@ a.ucs:0x23ADA
     ideo:total-strokes    19 ;
     :eq rep.cns11643-7:0x474C     ; # &I-C7-474C;
     :eq rep.daikanwa:16704        ; # &I-M-16704;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x6BC5         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x6BC5         ] ;
     :subsume
         g2.daikanwa:16704    ,
         g2.ucs_iso:0x23ADA   ;
@@ -5592,7 +5627,7 @@ rep.mj:038948
     :eq rep.big5-cdp:0x8DD4       ; # &I-CDP-8DD4;
     :eq rep.koseki:189400         ; # &MJ038948;
     :eq rep.daikanwa:16707        ; # &I-M-16707;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07059 ] ;
     :subsume
@@ -5671,7 +5706,7 @@ rep.daikanwa:16708
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          16 ;
     ideo:total-strokes    20 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x5547 ] ;
     :subsume
@@ -5740,7 +5775,7 @@ a.ucs:0x23AE1
     rep.daikanwa:16709
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16709 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:25834   ] ;
         .
@@ -5940,7 +5975,7 @@ a.ucs:0x23AE3
     rep.daikanwa:16712
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16712 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2A533        ] ;
         .
@@ -5966,7 +6001,7 @@ a.ucs:0x23AE4
     ] ;
     :eq rep.cns11643-7:0x5B64     ; # &I-C7-5B64;
     :eq rep.daikanwa:16713        ; # &I-M-16713;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9F1F         ] ;
     :subsume
@@ -6012,7 +6047,7 @@ a.ucs:0x23AE6
     ideo:total-strokes    24 ;
     :eq rep.cns11643-7:0x5E73     ; # &I-C7-5E73;
     :eq rep.daikanwa:16715        ; # &I-M-16715;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01829 ] ;
     :subsume
@@ -6098,7 +6133,7 @@ a.ucs:0x23AE9
     ideo:total-strokes    25 ;
     :eq rep.cns11643-7:0x6076     ; # &I-C7-6076;
     :eq rep.daikanwa:16718        ; # &I-M-16718;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07059 ] ;
     :subsume
@@ -6146,7 +6181,7 @@ rep.ucs_iso:0x23AEB
     ideo:strokes          23 ;
     ideo:total-strokes    27 ;
     :eq rep.daikanwa:16719        ; # &M-16719;
-    :from.same           [ :sources chisebib:sauzhenyujing ,
+    ideo:same-as         [ :sources chisebib:sauzhenyujing ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:038948        ] ;
     :subsume