Sync up with the current environment.

diff --git a/Ideograph-R085-Water.ttl b/Ideograph-R085-Water.ttl
index 2506ca9..b3443db 100644 (file)
--- a/Ideograph-R085-Water.ttl
+++ b/Ideograph-R085-Water.ttl
@@ -45106,40 +45106,114 @@ a.ucs:0x6EA7
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
     ideo:radical          85 ; # ⽔ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;

+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    a.ucs:0x6817   # 栗
+    ] ;
+    .
+
+rep.adobe-japan1-5:17970
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-5:17970 ;
+    :denotation-of
+        a.ucs:0x6EA7         ;
+    ideo:radical          85 ; # ⽔ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x6C35 ; # 氵
+        isd:right    rep.adobe-japan1-0:01792   # &AJ1-01792;
+    ] ;
+    :eq rep.ucs_unicode:0x6EA7    ; # &AJ1-17970;
+    :eq rep.gb2312:0x6460         ; # &I-G0-6460;
+    :eq rep.jis-x0212:0x482B      ; # &I-JSP-482B;
+    :eq rep.cns11643-1:0x6472     ; # &I-C1-6472;
+    :eq rep.jis-x0213-2:0x6F22    ; # &I-JX2-6F22;

     :eq a.big5:0xB7CC             ; # &I-B-B7CC;
     :eq a.big5:0xB7CC             ; # &I-B-B7CC;

+    :eq rep.daikanwa:17960        ; # &I-M-17960;
+    :eq rep.jef-china3:0x91F8     ; # &I-JC3-91F8;

     :subsume
     :subsume

-        rep.adobe-japan1-5:17970 ,
-        rep.cns11643-1:0x6472 ;
+        g2.ucs_unicode:0x6EA7 ,
+        g2.cns11643-1:0x6472 ;

     .
     .

+    rep.ucs_unicode:0x6EA7
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x6EA7  ] .
+    rep.gb2312:0x6460
+               :abstract-glyph-of         gb2312:0x6460  .
+    rep.jis-x0212:0x482B
+               :abstract-glyph-of      jis-x0212:0x482B  .
+    rep.cns11643-1:0x6472
+               :abstract-glyph-of     cns11643-1:0x6472  .
+    rep.jis-x0213-2:0x6F22
+               :abstract-glyph-of    jis-x0213-2:0x6F22  .

     a.big5:0xB7CC
            :abstract-character-of           big5:0xB7CC  .
     a.big5:0xB7CC
            :abstract-character-of           big5:0xB7CC  .

-    rep.adobe-japan1-5:17970
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1-5:17970 ;
-        :eq rep.ucs_unicode:0x6EA7    ; # &AJ1-17970;
-        :eq rep.gb2312:0x6460         ; # &I-G0-6460;
-        :eq rep.jis-x0212:0x482B      ; # &I-JSP-482B;
-        :eq rep.jis-x0213-2:0x6F22    ; # &I-JX2-6F22;
-        :eq rep.daikanwa:17960        ; # &I-M-17960;
-        :eq rep.jef-china3:0x91F8     ; # &I-JC3-91F8;
+    rep.daikanwa:17960
+               :abstract-glyph-of       daikanwa:17960   .
+    rep.jef-china3:0x91F8
+               :abstract-glyph-of     jef-china3:0x91F8  .
+    g2.ucs_unicode:0x6EA7
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x6EA7  ] ;
+        :eq g2.adobe-japan1-5:17970   ; # &g2-AJ1-17970;
+        :eq g2.gb2312:0x6460          ; # &g2-AJ1-17970;
+        :eq g2.jis-x0212:0x482B       ; # &g2-AJ1-17970;
+        :eq g2.jis-x0213-2:0x6F22     ; # &g2-AJ1-17970;
+        :eq g2.daikanwa:17960         ; # &g2-AJ1-17970;
+        :eq g2.jef-china3:0x91F8      ; # &g2-AJ1-17970;
+        :subsume
+            repi.daikanwa:17960  ,
+            repi.jis-x0213-2:0x6F22 ,
+            repi.adobe-japan1-6:17970 ,
+            repi.ucs_unicode:0x6EA7 ,
+            repi.jef-china3:0x91F8 ;
+        .
+        g2.adobe-japan1-5:17970
+              :abstract-glyph-form-of adobe-japan1-5:17970   .
+        g2.gb2312:0x6460
+              :abstract-glyph-form-of         gb2312:0x6460  .
+        g2.jis-x0212:0x482B
+              :abstract-glyph-form-of      jis-x0212:0x482B  .
+        g2.jis-x0213-2:0x6F22
+              :abstract-glyph-form-of    jis-x0213-2:0x6F22  .
+        g2.daikanwa:17960
+              :abstract-glyph-form-of       daikanwa:17960   .
+        g2.jef-china3:0x91F8
+              :abstract-glyph-form-of     jef-china3:0x91F8  .
+        repi.daikanwa:17960
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:17960 ;
+            .
+        repi.jis-x0212:0x482B
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0212:0x482B ;
+            :eq repi.jis-x0213-2:0x6F22   ; # &R-JX2-6F22;
+            .
+            repi.jis-x0213-2:0x6F22
+                          :glyph-image-of    jis-x0213-2:0x6F22  .
+        repi.adobe-japan1-5:17970
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-5:17970 ;
+            .
+        repi.ucs_unicode:0x6EA7
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x6EA7  ] ;
+            .
+        repi.jef-china3:0x91F8
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x91F8 ;
+            .
+    g2.cns11643-1:0x6472
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-1:0x6472 ;
+        :eq g2.ucs_cns:0x6EA7         ; # &g2-CU+6EA7;

         .
         .

-        rep.ucs_unicode:0x6EA7
-                   :abstract-glyph-of [ :context domain:unicode ;
+        g2.ucs_cns:0x6EA7
+              :abstract-glyph-form-of [ :context domain:cns     ;

                                         :target     ucs:0x6EA7  ] .
                                         :target     ucs:0x6EA7  ] .

-        rep.gb2312:0x6460
-                   :abstract-glyph-of         gb2312:0x6460  .
-        rep.jis-x0212:0x482B
-                   :abstract-glyph-of      jis-x0212:0x482B  .
-        rep.jis-x0213-2:0x6F22
-                   :abstract-glyph-of    jis-x0213-2:0x6F22  .
-        rep.daikanwa:17960
-                   :abstract-glyph-of       daikanwa:17960   .
-        rep.jef-china3:0x91F8
-                   :abstract-glyph-of     jef-china3:0x91F8  .
-    rep.cns11643-1:0x6472
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-1:0x6472 ;
-        .

 
 rep.daikanwa:17961
     a chisegg:abstract-glyph ;
 
 rep.daikanwa:17961
     a chisegg:abstract-glyph ;

@@ -66312,6 +66386,9 @@ a.ucs:0x23F6E
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    a.ucs:0x5AB1   # 媱
     ] ;
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    a.ucs:0x5AB1   # 媱
     ] ;

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

     .
 
 rep.daikanwa:18352
     .
 
 rep.daikanwa:18352

@@ -66326,6 +66403,10 @@ rep.daikanwa:18352
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.ucs-var-002:0x5AB1   # &U-v002+5AB1;
     ] ;
         isd:left     a.ucs:0x6C35 ; # 氵
         isd:right    rep.ucs-var-002:0x5AB1   # &U-v002+5AB1;
     ] ;

+    ideo:same-as         [ :sources chisebib:kangxi ,
+                                    chisebib:daikanwa ;
+                           :target  rep.mj:015492        ,
+                                    rep.adobe-japan1-0:07135 ] ;

     :subsume
         g2.daikanwa:18352    ;
     .
     :subsume
         g2.daikanwa:18352    ;
     .

@@ -70890,6 +70971,9 @@ a.ucs:0x23FDA
     ] ;
     :eq rep.cns11643-7:0x2F43     ; # &I-C7-2F43;
     :eq rep.daikanwa:18460        ; # &I-M-18460;
     ] ;
     :eq rep.cns11643-7:0x2F43     ; # &I-C7-2F43;
     :eq rep.daikanwa:18460        ; # &I-M-18460;

+    ideo:original-form-of [ :sources chisebib:jiyun ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-5:17970 ] ;

     :subsume
         g2.ucs_iso:0x23FDA   ,
         g2.cns11643-7:0x2F43 ;
     :subsume
         g2.ucs_iso:0x23FDA   ,
         g2.cns11643-7:0x2F43 ;