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

- Sync up with the current environment.

diff --git a/Ideograph-R018-Knife.ttl b/Ideograph-R018-Knife.ttl
index 4dba99a..da5fc4b 100644 (file)
--- a/Ideograph-R018-Knife.ttl
+++ b/Ideograph-R018-Knife.ttl
@@ -2499,7 +2499,7 @@ a.ucs:0x34DB
     :eq rep.jef-china3:0x44B7     ; # &I-JC3-44B7;
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x529F         ] ;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x529F         ] ;
     :subsume
@@ -2632,7 +2632,7 @@ rep.gt:02432
     ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:02686 ] ;
-    :from.wrong          [ :sources chisebib:shinjigen ;
+    ideo:wrong-form-of   [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02686 ] ;
     :subsume
         a.ucs:0x2F850        ,
@@ -7004,7 +7004,7 @@ a.ucs:0x5238
     ideo:total-strokes     8 ;
     ideo:hanyu-dazidian  ( 1 332 11 ) ;
     isd:structure [ a idc:⿱ ;
-        isd:above    a.daikanwa:48931 ; # &A-M-48931;
+        isd:above    a.ucs_component:0x9FB9 ; # &A-compU+9FB9;
         isd:below    a.ucs:0x5200   # 刀
     ] ;
     :eq a.jis-x0208:0x3774        ; # 券
@@ -7026,9 +7026,6 @@ rep.adobe-japan1-4:13749
     ideo:radical          18 ; # ⼑ 
     ideo:strokes           6 ;
     ideo:total-strokes     8 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x5238         ,
-                                    a.ucs:0xE0101        ] ;
     isd:structure [ a idc:⿱ ;
         isd:above    rep.adobe-japan1-5:17299 ; # &AJ1-17299;
         isd:below    a.ucs:0x5200   # 刀
@@ -7038,6 +7035,8 @@ rep.adobe-japan1-4:13749
     :eq rep.daikanwa:01966        ; # &I-M-01966;
     :eq rep.shinjigen:0624        ; # &AJ1-13749;
     :eq rep.jef-china3:0x44B6     ; # &I-JC3-44B6;
+    :subsume
+        g2.adobe-japan1-4:13749 ;
     .
     rep.ucs_ks:0x5238
                :abstract-glyph-of [ :context domain:ks      ;
@@ -7050,6 +7049,54 @@ rep.adobe-japan1-4:13749
                :abstract-glyph-of      shinjigen:0624    .
     rep.jef-china3:0x44B6
                :abstract-glyph-of     jef-china3:0x44B6  .
+    g2.adobe-japan1-4:13749
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:13749 ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x5238         ,
+                                        a.ucs:0xE0101        ] ;
+        :eq g2.ucs_ks:0x5238          ; # &g2-AJ1-13749;
+        :eq g2.ks-x1001:0x4F67        ; # &g2-AJ1-13749;
+        :eq g2.daikanwa:01966         ; # &g2-AJ1-13749;
+        :eq g2.shinjigen:0624         ; # &g2-AJ1-13749;
+        :eq g2.jef-china3:0x44B6      ; # &g2-AJ1-13749;
+        :subsume
+            repi.daikanwa:01966  ,
+            repi.adobe-japan1-6:13749 ,
+            repi.jef-china3:0x44B6 ,
+            repi.ks-x1001:0x4F67 ;
+        .
+        g2.ucs_ks:0x5238
+              :abstract-glyph-form-of [ :context domain:ks      ;
+                                        :target     ucs:0x5238  ] .
+        g2.ks-x1001:0x4F67
+              :abstract-glyph-form-of       ks-x1001:0x4F67  .
+        g2.daikanwa:01966
+              :abstract-glyph-form-of       daikanwa:01966   .
+        g2.shinjigen:0624
+              :abstract-glyph-form-of      shinjigen:0624    .
+        g2.jef-china3:0x44B6
+              :abstract-glyph-form-of     jef-china3:0x44B6  .
+        repi.daikanwa:01966
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:01966 ;
+            .
+        repi.adobe-japan1-4:13749
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:13749 ;
+            .
+        repi.jef-china3:0x44B6
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x44B6 ;
+            .
+        repi.ks-x1001:0x4F67
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x4F67 ;
+            :eq repi.ucs_ks:0x5238        ; # &R-K0-4F67;
+            .
+            repi.ucs_ks:0x5238
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x5238  ] .
 
 o.ucs_unicode:0x5238
     a chisegg:unified-glyph ;
@@ -7083,9 +7130,6 @@ o.ucs_unicode:0x5238
     rep.adobe-japan1-0:01866
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-0:01866 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x5238         ,
-                                        a.ucs:0xE0100        ] ;
         isd:structure [ a idc:⿱ ;
             isd:above    rep.gt-k:01769 ; # &GT-K01769;
             isd:below    a.ucs:0x5200   # 刀
@@ -7097,6 +7141,8 @@ o.ucs_unicode:0x5238
         :eq rep.gt-k:03687            ; # &I-GT-K03687;
         :eq rep.gt-pj-1:14196         ; # &I-GT-02528;
         :eq rep.shinjigen:0623        ; # &AJ1-01866;
+        :subsume
+            g2.adobe-japan1-0:01866 ;
         .
         rep.ucs_jis:0x5238
                    :abstract-glyph-of [ :context domain:jis     ;
@@ -7113,6 +7159,54 @@ o.ucs_unicode:0x5238
                    :abstract-glyph-of        gt-pj-1:14196   .
         rep.shinjigen:0623
                    :abstract-glyph-of      shinjigen:0623    .
+        g2.adobe-japan1-0:01866
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of adobe-japan1-0:01866 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x5238         ,
+                                            a.ucs:0xE0100        ] ;
+            :eq g2.ucs_jis:0x5238         ; # &g2-AJ1-01866;
+            :eq g2.jis-x0208:0x3774       ; # &g2-AJ1-01866;
+            :eq g2.jis-x0213-1:0x3774     ; # &g2-AJ1-01866;
+            :eq g2.gt:02528               ; # &g2-AJ1-01866;
+            :eq g2.gt-k:03687             ; # &g2-AJ1-01866;
+            :eq g2.shinjigen:0623         ; # &g2-AJ1-01866;
+            :subsume
+                repi.jis-x0208:0x3774 ,
+                repi.adobe-japan1-6:01866 ,
+                repi.gt:02528        ;
+            .
+            g2.ucs_jis:0x5238
+                  :abstract-glyph-form-of [ :context domain:jis     ;
+                                            :target     ucs:0x5238  ] .
+            g2.jis-x0208:0x3774
+                  :abstract-glyph-form-of      jis-x0208:0x3774  .
+            g2.jis-x0213-1:0x3774
+                  :abstract-glyph-form-of    jis-x0213-1:0x3774  .
+            g2.gt:02528
+                  :abstract-glyph-form-of             gt:02528   .
+            g2.gt-k:03687
+                  :abstract-glyph-form-of           gt-k:03687   .
+            g2.shinjigen:0623
+                  :abstract-glyph-form-of      shinjigen:0623    .
+            repi.jis-x0208:0x3774
+                a chisegg:glyph-image ;
+                :glyph-image-of jis-x0208:0x3774 ;
+                :eq repi.jis-x0213-1:0x3774   ; # &R-J0-3774;
+                .
+                repi.jis-x0213-1:0x3774
+                              :glyph-image-of    jis-x0213-1:0x3774  .
+            repi.adobe-japan1-0:01866
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-0:01866 ;
+                .
+            repi.gt:02528
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:02528 ;
+                :eq repi.gt-k:03687           ; # &R-GT-02528;
+                .
+                repi.gt-k:03687
+                              :glyph-image-of           gt-k:03687   .
     rep.cns11643-1:0x4C2C
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-1:0x4C2C ;
@@ -7123,12 +7217,38 @@ o.ucs_unicode:0x5238
         :eq rep.ucs_unicode:0x5238    ; # &C1-4C2C;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :eq rep.gb2312:0x482F         ; # &C1-4C2C;
+        :subsume
+            g2.ucs_unicode:0x5238 ;
         .
         rep.ucs_unicode:0x5238
                    :abstract-glyph-of [ :context domain:unicode ;
                                         :target     ucs:0x5238  ] .
         rep.gb2312:0x482F
                    :abstract-glyph-of         gb2312:0x482F  .
+        g2.ucs_unicode:0x5238
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x5238  ] ;
+            :g2.ucs_JP...hanazono      rdf:nil ;
+            :eq g2.gb2312:0x482F          ; # &g2-UU+5238;
+            :eq g2.cns11643-1:0x4C2C      ; # &g2-UU+5238;
+            :subsume
+                repi.cns11643-1:0x4C2C ,
+                repi.ucs_unicode:0x5238 ;
+            .
+            g2.gb2312:0x482F
+                  :abstract-glyph-form-of         gb2312:0x482F  .
+            g2.cns11643-1:0x4C2C
+                  :abstract-glyph-form-of     cns11643-1:0x4C2C  .
+            repi.cns11643-1:0x4C2C
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-1:0x4C2C ;
+                .
+            repi.ucs_unicode:0x5238
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x5238  ] ;
+                .
 
 bucs:0x5239
     a chisegg:super-abstract-character ;
@@ -14055,7 +14175,7 @@ a.ucs:0x20771
     rep.daikanwa:02103
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:02103 ;
-        :from.wrong          [ :sources chisebib:zihui-bei ,
+        ideo:wrong-form-of   [ :sources chisebib:zihui-bei ,
                                         chisebib:daikanwa ;
                                :target  rep.cns11643-5:0x3D70 ] ;
         .