Reformatted.

diff --git a/Ideograph-R018-Knife.ttl b/Ideograph-R018-Knife.ttl
index 084a6e8..248a5a3 100644 (file)
--- a/Ideograph-R018-Knife.ttl
+++ b/Ideograph-R018-Knife.ttl
@@ -6206,7 +6206,7 @@ a.ucs:0x206EC
     ideo:total-strokes     8 ;
     :subsume
         rep.adobe-japan1-5:20083 ,
-        g2.shinjigen:0604    ,
+        rep.shinjigen:0604   ,
         rep.ucs_iso:0x206EC  ;
     .
     rep.adobe-japan1-5:20083
@@ -6231,15 +6231,12 @@ a.ucs:0x206EC
                    :abstract-glyph-of        gt-pj-2:16679   .
         rep.daikanwa:01951
                    :abstract-glyph-of       daikanwa:01951   .
-    g2.shinjigen:0604
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0604 ;
-        :eq rep.shinjigen:0604        ; # &SJG2-0604;
+    rep.shinjigen:0604
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0604 ;
         :from.original       [ :sources chisebib:shinjigen ;
                                :target  a.ucs:0x5211         ] ;
         .
-        rep.shinjigen:0604
-                   :abstract-glyph-of      shinjigen:0604    .
     rep.ucs_iso:0x206EC
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
@@ -10518,7 +10515,7 @@ a.ucs:0x5255
     :eq rep.daikanwa:02033        ; # &I-M-02033;
     :eq rep.shinjigen:0668        ; # 剕
     :subsume
-        g2.shinjigen:0668    ,
+        g2.daikanwa:02033    ,
         g2.adobe-japan1-5:17313 ,
         g2.ucs_unicode:0x5255 ;
     .
@@ -10536,17 +10533,17 @@ a.ucs:0x5255
                :abstract-glyph-of       daikanwa:02033   .
     rep.shinjigen:0668
                :abstract-glyph-of      shinjigen:0668    .
-    g2.shinjigen:0668
+    g2.daikanwa:02033
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0668 ;
+        :abstract-glyph-form-of daikanwa:02033 ;
     isd:structure [ a idc:⿰ ;
         isd:left     g2.adobe-japan1-0:03463 ; # &g2-AJ1-03463;
         isd:right    a.ucs:0x2E89   # ⺉
     ] ;
-        :eq g2.daikanwa:02033         ; # &g2-M-02033;
+        :eq g2.shinjigen:0668         ; # &g2-M-02033;
         .
-        g2.daikanwa:02033
-              :abstract-glyph-form-of       daikanwa:02033   .
+        g2.shinjigen:0668
+              :abstract-glyph-form-of      shinjigen:0668    .
     g2.adobe-japan1-5:17313
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of adobe-japan1-5:17313 ;
@@ -10630,7 +10627,7 @@ a.ucs:0x5256
     :eq rep.shinjigen:0669        ; # 剖
     :subsume
         g2.ucs_unicode:0x5256 ,
-        g2.shinjigen:0670    ;
+        rep.shinjigen:0670   ;
     .
     rep.adobe-japan1-0:03684
                :abstract-glyph-of adobe-japan1-0:03684   .
@@ -10745,17 +10742,14 @@ a.ucs:0x5256
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-1:0x5448 ;
             .
-    g2.shinjigen:0670
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0670 ;
+    rep.shinjigen:0670
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0670 ;
     isd:structure [ a idc:⿰ ;
         isd:left     rep.jef-china3:0x46A1 ; # &JC3-46A1;
         isd:right    a.ucs:0x2E89   # ⺉
     ] ;
-        :eq rep.shinjigen:0670        ; # &SJG2-0670;
         .
-        rep.shinjigen:0670
-                   :abstract-glyph-of      shinjigen:0670    .
 
 a.ucs:0x20752
     a chisegg:abstract-character ;
@@ -12825,7 +12819,7 @@ a.ucs:0x5265
     :from.vulgar         [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x525D         ] ;
     :subsume
-        g2.shinjigen:0667    ,
+        g2.daikanwa:48939    ,
         g2.gt:02662          ,
         g2.ucs_unicode:0x5265 ,
         g2.adobe-japan1-0:03363 ,
@@ -12855,13 +12849,13 @@ a.ucs:0x5265
                :abstract-glyph-of      shinjigen:0667    .
     rep.jef-china3:0x44D0
                :abstract-glyph-of     jef-china3:0x44D0  .
-    g2.shinjigen:0667
+    g2.daikanwa:48939
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0667 ;
-        :eq g2.daikanwa:48939         ; # &g2-M-48939;
+        :abstract-glyph-form-of daikanwa:48939 ;
+        :eq g2.shinjigen:0667         ; # &g2-M-48939;
         .
-        g2.daikanwa:48939
-              :abstract-glyph-form-of       daikanwa:48939   .
+        g2.shinjigen:0667
+              :abstract-glyph-form-of      shinjigen:0667    .
     g2.gt:02662
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:02662 ;
@@ -18244,7 +18238,7 @@ a.ucs:0x5283
     :eq g.jis-x0208:0x3344        ; # 劃
     :subsume
         rep.adobe-japan1-0:01442 ,
-        g2.shinjigen:0692    ;
+        rep.shinjigen:0692   ;
     .
     g.jis-x0208:0x3344
                :detailed-glyph-of      jis-x0208:0x3344  .
@@ -18286,13 +18280,10 @@ a.ucs:0x5283
                    :abstract-glyph-of        gt-pj-1:13124   .
         rep.daikanwa:02193
                    :abstract-glyph-of       daikanwa:02193   .
-    g2.shinjigen:0692
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0692 ;
-        :eq rep.shinjigen:0692        ; # &SJG2-0692;
+    rep.shinjigen:0692
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0692 ;
         .
-        rep.shinjigen:0692
-                   :abstract-glyph-of      shinjigen:0692    .
 
 rep.daikanwa:02194
     a chisegg:abstract-glyph ;
@@ -20439,7 +20430,7 @@ o.ucs_unicode:0x5292
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x528D         ] ;
         :subsume
-            g2.shinjigen:0654    ,
+            g2.daikanwa:02243    ,
             g2.mj:007611         ;
         .
         rep.ucs_unicode:0x5292
@@ -20463,13 +20454,13 @@ o.ucs_unicode:0x5292
                    :abstract-glyph-of       daikanwa:02243   .
         rep.shinjigen:0654
                    :abstract-glyph-of      shinjigen:0654    .
-        g2.shinjigen:0654
+        g2.daikanwa:02243
             a chisegg:abstract-glyph-form ;
-            :abstract-glyph-form-of shinjigen:0654 ;
-            :eq g2.daikanwa:02243         ; # &g2-M-02243;
+            :abstract-glyph-form-of daikanwa:02243 ;
+            :eq g2.shinjigen:0654         ; # &g2-M-02243;
             .
-            g2.daikanwa:02243
-                  :abstract-glyph-form-of       daikanwa:02243   .
+            g2.shinjigen:0654
+                  :abstract-glyph-form-of      shinjigen:0654    .
         g2.mj:007611
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of mj:007611 ;