Sync up with the current environment.

diff --git a/Ideograph-R115-Grain.ttl b/Ideograph-R115-Grain.ttl
index c49e5d7..f56c8fb 100644 (file)
--- a/Ideograph-R115-Grain.ttl
+++ b/Ideograph-R115-Grain.ttl
@@ -465,6 +465,9 @@ a.ucs:0x79BF
         isd:above    a.ucs:0x79BE ; # 禾
         isd:below    a.ucs:0x513F   # 儿
     ] ;
         isd:above    a.ucs:0x79BE ; # 禾
         isd:below    a.ucs:0x513F   # 儿
     ] ;

+    :sound               [ :context domain:ja...on ;
+                           :target  ( "toku" ) ;
+                         ] ;

     :eq rep.adobe-japan1-0:03229  ; # &I-AJ1-03229;
     :eq rep.jis-x0208:0x4645      ; # &I-J90-4645;
     :eq rep.ks-x1001:0x543E       ; # &I-K0-543E;
     :eq rep.adobe-japan1-0:03229  ; # &I-AJ1-03229;
     :eq rep.jis-x0208:0x4645      ; # &I-J90-4645;
     :eq rep.ks-x1001:0x543E       ; # &I-K0-543E;

@@ -475,7 +478,9 @@ a.ucs:0x79BF
     :eq rep.gt-k:02621            ; # &I-GT-K02621;
     :eq rep.gt-pj-1:17989         ; # &I-GT-32132;
     :eq rep.daikanwa:24910        ; # &I-M-24910;
     :eq rep.gt-k:02621            ; # &I-GT-K02621;
     :eq rep.gt-pj-1:17989         ; # &I-GT-32132;
     :eq rep.daikanwa:24910        ; # &I-M-24910;

-    :eq rep.shinjigen_rev:5591    ; # 禿
+    :eq rep.shinjigen:5591        ; # 禿
+    :subsume
+        g2.ucs_unicode:0x79BF ;

     .
     rep.adobe-japan1-0:03229
                :abstract-glyph-of adobe-japan1-0:03229   .
     .
     rep.adobe-japan1-0:03229
                :abstract-glyph-of adobe-japan1-0:03229   .

@@ -497,9 +502,87 @@ a.ucs:0x79BF
                :abstract-glyph-of        gt-pj-1:17989   .
     rep.daikanwa:24910
                :abstract-glyph-of       daikanwa:24910   .
                :abstract-glyph-of        gt-pj-1:17989   .
     rep.daikanwa:24910
                :abstract-glyph-of       daikanwa:24910   .

-    rep.shinjigen_rev:5591
-               :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:5591    ] .
+    rep.shinjigen:5591
+               :abstract-glyph-of      shinjigen:5591    .
+    g2.ucs_unicode:0x79BF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x79BF  ] ;
+        :eq g2.adobe-japan1-0:03229   ; # &g2-AJ1-03229;
+        :eq g2.ks-x1001:0x543E        ; # &g2-AJ1-03229;
+        :eq g2.jis-x0208:0x4645       ; # &g2-AJ1-03229;
+        :eq g2.cns11643-1:0x4B35      ; # &g2-AJ1-03229;
+        :eq g2.jis-x0213-1:0x4645     ; # &g2-AJ1-03229;
+        :eq g2.gt:32132               ; # &g2-AJ1-03229;
+        :eq g2.gt-k:02621             ; # &g2-AJ1-03229;
+        :eq g2.daikanwa:24910         ; # &g2-AJ1-03229;
+        :eq g2.shinjigen:5591         ; # &g2-AJ1-03229;
+        :subsume
+            repi.daikanwa:24910  ,
+            repi.jis-x0208:0x4645 ,
+            repi.adobe-japan1-6:03229 ,
+            repi.cns11643-1:0x4B35 ,
+            repi.gt:32132        ,
+            repi.ks-x1001:0x543E ,
+            repi.ucs_unicode:0x79BF ;
+        .
+        g2.adobe-japan1-0:03229
+              :abstract-glyph-form-of adobe-japan1-0:03229   .
+        g2.ks-x1001:0x543E
+              :abstract-glyph-form-of       ks-x1001:0x543E  .
+        g2.jis-x0208:0x4645
+              :abstract-glyph-form-of      jis-x0208:0x4645  .
+        g2.cns11643-1:0x4B35
+              :abstract-glyph-form-of     cns11643-1:0x4B35  .
+        g2.jis-x0213-1:0x4645
+              :abstract-glyph-form-of    jis-x0213-1:0x4645  .
+        g2.gt:32132
+              :abstract-glyph-form-of             gt:32132   .
+        g2.gt-k:02621
+              :abstract-glyph-form-of           gt-k:02621   .
+        g2.daikanwa:24910
+              :abstract-glyph-form-of       daikanwa:24910   .
+        g2.shinjigen:5591
+              :abstract-glyph-form-of      shinjigen:5591    .
+        repi.daikanwa:24910
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:24910 ;
+            .
+        repi.jis-x0208:0x4645
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x4645 ;
+            :eq repi.jis-x0213-1:0x4645   ; # &R-J0-4645;
+            .
+            repi.jis-x0213-1:0x4645
+                          :glyph-image-of    jis-x0213-1:0x4645  .
+        repi.adobe-japan1-0:03229
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:03229 ;
+            .
+        repi.cns11643-1:0x4B35
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x4B35 ;
+            .
+        repi.gt:32132
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:32132 ;
+            :eq repi.gt-k:02621           ; # &R-GT-32132;
+            .
+            repi.gt-k:02621
+                          :glyph-image-of           gt-k:02621   .
+        repi.ks-x1001:0x543E
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x543E ;
+            :eq repi.ucs_ks:0x79BF        ; # &R-K0-543E;
+            .
+            repi.ucs_ks:0x79BF
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x79BF  ] .
+        repi.ucs_unicode:0x79BF
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x79BF  ] ;
+            .

 
 a.ucs:0x79C3
     a chisegg:abstract-character ;
 
 a.ucs:0x79C3
     a chisegg:abstract-character ;

@@ -19101,6 +19184,10 @@ a.ucs:0x258DE
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;

+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    a.ucs:0x7FDF   # 翟
+    ] ;

     .
 
 rep.daikanwa:25352
     .
 
 rep.daikanwa:25352

@@ -19111,7 +19198,18 @@ rep.daikanwa:25352
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;

+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.jis-x0213-1:0x7A40   # &JX1-7A40;
+    ] ;
+    :form-of             rep.daikanwa:27172   ;
+    :subsume
+        g2.daikanwa:25352    ;

     .
     .

+    g2.daikanwa:25352
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:25352 ;
+        .

 
 rep.ucs_iso:0x258DE
     a chisegg:abstract-glyph ;
 
 rep.ucs_iso:0x258DE
     a chisegg:abstract-glyph ;

@@ -19122,10 +19220,36 @@ rep.ucs_iso:0x258DE
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;
     ideo:radical         115 ; # ⽲ 
     ideo:strokes          14 ;
     ideo:total-strokes    19 ;

+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x79BE ; # 禾
+        isd:right    rep.cns11643-1:0x6A4B   # &C1-6A4B;
+    ] ;

     :eq rep.cns11643-4:0x6046     ; # &C4-6046;
     :eq rep.cns11643-4:0x6046     ; # &C4-6046;

+    :subsume
+        g2.ucs_iso:0x258DE   ;

     .
     rep.cns11643-4:0x6046
                :abstract-glyph-of     cns11643-4:0x6046  .
     .
     rep.cns11643-4:0x6046
                :abstract-glyph-of     cns11643-4:0x6046  .

+    g2.ucs_iso:0x258DE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x258DE ] ;
+        :eq g2.cns11643-4:0x6046      ; # &g2-IU-000258DE;
+        :subsume
+            repi.cns11643-4:0x6046 ,
+            repi.ucs_iso:0x258DE ;
+        .
+        g2.cns11643-4:0x6046
+              :abstract-glyph-form-of     cns11643-4:0x6046  .
+        repi.cns11643-4:0x6046
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-4:0x6046 ;
+            .
+        repi.ucs_iso:0x258DE
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x258DE ] ;
+            .

 
 a.ucs:0x258DF
     a chisegg:abstract-character ;
 
 a.ucs:0x258DF
     a chisegg:abstract-character ;