Reformatted.

diff --git a/Ideograph-R002-Line.ttl b/Ideograph-R002-Line.ttl
index b56f034..fdbafa9 100644 (file)
--- a/Ideograph-R002-Line.ttl
+++ b/Ideograph-R002-Line.ttl
@@ -77,7 +77,6 @@
 @prefix repi.adobe-japan1-5: <http://www.chise.org/est/view/character/repi.adobe-japan1-5=> .
 @prefix repi.adobe-japan1-6: <http://www.chise.org/est/view/character/repi.adobe-japan1-6=> .
 @prefix o.adobe-japan1-4: <http://www.chise.org/est/view/character/o.adobe-japan1-4=> .
-@prefix o.adobe-japan1: <http://www.chise.org/est/view/character/o.adobe-japan1=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
@@ -142,7 +141,6 @@
 @prefix jis-x0213-1: <http://rdf.chise.org/data/ccs/jis-x0213-1/code-point/> .
 @prefix jis-x0213-2: <http://rdf.chise.org/data/ccs/jis-x0213-2/code-point/> .
 @prefix big5: <http://rdf.chise.org/data/ccs/big5/code-point/> .
-@prefix adobe-japan1: <http://rdf.chise.org/data/ccs/adobe-japan1/code-point/> .
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
 @prefix hanyo-denshi...jb: <http://rdf.chise.org/data/ccs/hanyo-denshi...jb/code-point/> .
 @prefix hanyo-denshi...ib: <http://rdf.chise.org/data/ccs/hanyo-denshi...ib/code-point/> .
@@ -235,7 +233,7 @@ rep.adobe-japan1-5:17237
     :eq rep.shinjigen:00031       ; # &AJ1-17237;
     :subsume
         g2.ucs_unicode:0x4E29 ,
-        repi.gt:00102        ,
+        g2.gt:00102          ,
         rep.gt-k:00068       ;
     .
     rep.ucs_unicode:0x4E29
@@ -299,11 +297,10 @@ rep.adobe-japan1-5:17237
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x4E29  ] ;
             .
-    repi.gt:00102
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00102 ;
+    g2.gt:00102
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00102 ;
         :eq g2.big5-cdp:0x8BA3        ; # &g2-GT-00102;
-        :eq g2.gt:00102               ; # &g2-GT-00102;
         :eq g2.gt-k:00069             ; # &g2-GT-00102;
         :subsume
             repi.big5-cdp:0x8BA3 ,
@@ -311,8 +308,6 @@ rep.adobe-japan1-5:17237
         .
         g2.big5-cdp:0x8BA3
               :abstract-glyph-form-of       big5-cdp:0x8BA3  .
-        g2.gt:00102
-              :abstract-glyph-form-of             gt:00102   .
         g2.gt-k:00069
               :abstract-glyph-form-of           gt-k:00069   .
         repi.big5-cdp:0x8BA3
@@ -782,22 +777,19 @@ rep.big5-cdp:0x8BF1
     :eq rep.gt-k:00287            ; # &I-GT-K00287;
     :eq rep.gt-pj-k1:14641        ; # &CDP-8BF1;
     :subsume
-        repi.gt-k:00287      ;
+        g2.gt-k:00287        ;
     .
     rep.gt-k:00287
                :abstract-glyph-of           gt-k:00287   .
     rep.gt-pj-k1:14641
                :abstract-glyph-of       gt-pj-k1:14641   .
-    repi.gt-k:00287
-        a chisegg:glyph-image ;
-        :glyph-image-of gt-k:00287 ;
+    g2.gt-k:00287
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:00287 ;
         :eq g2.big5-cdp:0x8BF1        ; # &g2-CDP-8BF1;
-        :eq g2.gt-k:00287             ; # &g2-CDP-8BF1;
         .
         g2.big5-cdp:0x8BF1
               :abstract-glyph-form-of       big5-cdp:0x8BF1  .
-        g2.gt-k:00287
-              :abstract-glyph-form-of           gt-k:00287   .
 
 a.ucs:0x4E2D
     a chisegg:abstract-character ;
@@ -1031,7 +1023,7 @@ rep.adobe-japan1-5:17238
                                         a.ucs:0xE0100        ] ;
     isd:structure [ a idc:⿹ ;
         isd:surround a.ucs:0x2E84 ; # ⺄
-        isd:filling  repi.gt-k:00287   # &g2-CDP-8BF1;
+        isd:filling  g2.gt-k:00287   # &g2-CDP-8BF1;
     ] ;
         :eq g2.adobe-japan1-5:17238   ; # &g2-AJ1-17238;
         :eq g2.jis-x0212:0x302B       ; # &g2-AJ1-17238;
@@ -1307,23 +1299,20 @@ a.jis-x0213-1:0x2E26
         :abstract-glyph-of big5-cdp:0x897E ;
         .
 
-o.adobe-japan1:15386
+o.ucs_cns:0x4E30
     a chisegg:unified-glyph ;
-    :unified-glyph-of adobe-japan1:15386 ;
+    :unified-glyph-of [ :context domain:cns     ;
+                        :target     ucs:0x4E30  ] ;
     :denotation-of
         a.ucs:0x4E30         ;
     ideo:radical           2 ; # ⼁ 
     ideo:strokes           3 ;
     ideo:total-strokes     4 ;
-    :eq o.ucs_cns:0x4E30          ; # &o-AJ1-15386;
     :eq o.adobe-japan1-4:15386    ; # &o-AJ1-15386;
     :subsume
         rep.mj:006351        ,
         rep.cns11643-1:0x4464 ;
     .
-    o.ucs_cns:0x4E30
-                :unified-glyph-of [ :context domain:cns     ;
-                                    :target     ucs:0x4E30  ] .
     o.adobe-japan1-4:15386
                 :unified-glyph-of adobe-japan1-4:15386   .
     rep.mj:006351
@@ -1435,7 +1424,7 @@ a.ucs:0x4E31
     :eq rep.daikanwa:00077        ; # &I-M-00077;
     :eq rep.shinjigen:00036       ; # 丱
     :subsume
-        g2.ucs_jis:0x4E31    ,
+        g2.adobe-japan1-0:04094 ,
         g2.ucs_unicode:0x4E31 ,
         rep.gt-k:01123       ;
     .
@@ -1459,15 +1448,14 @@ a.ucs:0x4E31
                :abstract-glyph-of       daikanwa:00077   .
     rep.shinjigen:00036
                :abstract-glyph-of      shinjigen:00036   .
-    g2.ucs_jis:0x4E31
+    g2.adobe-japan1-0:04094
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:jis     ;
-                                  :target     ucs:0x4E31  ] ;
+        :abstract-glyph-form-of adobe-japan1-0:04094 ;
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4E31         ,
                                         a.ucs:0xE0100        ] ;
         :eq g2.ucs_cns:0x4E31         ; # &g2-AJ1-04094;
-        :eq g2.adobe-japan1-0:04094   ; # &g2-AJ1-04094;
+        :eq g2.ucs_jis:0x4E31         ; # &g2-AJ1-04094;
         :eq g2.jis-x0208:0x5025       ; # &g2-AJ1-04094;
         :eq g2.cns11643-2:0x2143      ; # &g2-AJ1-04094;
         :eq g2.jis-x0213-1:0x5025     ; # &g2-AJ1-04094;
@@ -1485,8 +1473,9 @@ a.ucs:0x4E31
         g2.ucs_cns:0x4E31
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x4E31  ] .
-        g2.adobe-japan1-0:04094
-              :abstract-glyph-form-of adobe-japan1-0:04094   .
+        g2.ucs_jis:0x4E31
+              :abstract-glyph-form-of [ :context domain:jis     ;
+                                        :target     ucs:0x4E31  ] .
         g2.jis-x0208:0x5025
               :abstract-glyph-form-of      jis-x0208:0x5025  .
         g2.cns11643-2:0x2143