Sync up with the current environment.

diff --git a/Ideograph-R073-Say.ttl b/Ideograph-R073-Say.ttl
index 6f3bfc1..37d97c6 100644 (file)
--- a/Ideograph-R073-Say.ttl
+++ b/Ideograph-R073-Say.ttl
@@ -940,6 +940,8 @@ a.ucs:0x66F5
     :from.wrong          [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x66F3         ] ;
     :subsume
+        g2.daikanwa:14284    ,
+        g2.adobe-japan1-0:05133 ,
         g2.ucs_unicode:0x66F5 ;
     .
     rep.adobe-japan1-0:05133
@@ -958,43 +960,27 @@ a.ucs:0x66F5
                :abstract-glyph-of       daikanwa:14284   .
     rep.shinjigen:3408
                :abstract-glyph-of      shinjigen:3408    .
-    g2.ucs_unicode:0x66F5
+    g2.daikanwa:14284
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x66F5  ] ;
-        :eq g2.adobe-japan1-0:05133   ; # &g2-AJ1-05133;
+        :abstract-glyph-form-of daikanwa:14284 ;
+        .
+    g2.adobe-japan1-0:05133
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-0:05133 ;
+        :eq g2.ucs_jis:0x66F5         ; # &g2-AJ1-05133;
         :eq g2.jis-x0208:0x5B2A       ; # &g2-AJ1-05133;
-        :eq g2.cns11643-3:0x2641      ; # &g2-AJ1-05133;
         :eq g2.jis-x0213-1:0x5B2A     ; # &g2-AJ1-05133;
-        :eq g2.gt:18076               ; # &g2-AJ1-05133;
-        :eq g2.daikanwa:14284         ; # &g2-AJ1-05133;
-        :eq g2.shinjigen:3408         ; # &g2-AJ1-05133;
         :subsume
-            repi.daikanwa:14284  ,
             repi.jis-x0208:0x5B2A ,
-            repi.adobe-japan1-6:05133 ,
-            repi.cns11643-3:0x2641 ,
-            repi.gt:18076        ,
-            repi.ucs_unicode:0x66F5 ;
+            repi.adobe-japan1-6:05133 ;
         .
-        g2.adobe-japan1-0:05133
-              :abstract-glyph-form-of adobe-japan1-0:05133   .
+        g2.ucs_jis:0x66F5
+              :abstract-glyph-form-of [ :context domain:jis     ;
+                                        :target     ucs:0x66F5  ] .
         g2.jis-x0208:0x5B2A
               :abstract-glyph-form-of      jis-x0208:0x5B2A  .
-        g2.cns11643-3:0x2641
-              :abstract-glyph-form-of     cns11643-3:0x2641  .
         g2.jis-x0213-1:0x5B2A
               :abstract-glyph-form-of    jis-x0213-1:0x5B2A  .
-        g2.gt:18076
-              :abstract-glyph-form-of             gt:18076   .
-        g2.daikanwa:14284
-              :abstract-glyph-form-of       daikanwa:14284   .
-        g2.shinjigen:3408
-              :abstract-glyph-form-of      shinjigen:3408    .
-        repi.daikanwa:14284
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:14284 ;
-            .
         repi.jis-x0208:0x5B2A
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x5B2A ;
@@ -1006,6 +992,30 @@ a.ucs:0x66F5
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-0:05133 ;
             .
+    g2.ucs_unicode:0x66F5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x66F5  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        :eq g2.cns11643-3:0x2641      ; # &g2-GT-18076;
+        :eq g2.gt:18076               ; # &g2-GT-18076;
+        :eq g2.shinjigen:3408         ; # &g2-GT-18076;
+        :subsume
+            repi.ucs_unicode:0x66F5 ,
+            repi.cns11643-3:0x2641 ,
+            repi.gt:18076        ;
+        .
+        g2.cns11643-3:0x2641
+              :abstract-glyph-form-of     cns11643-3:0x2641  .
+        g2.gt:18076
+              :abstract-glyph-form-of             gt:18076   .
+        g2.shinjigen:3408
+              :abstract-glyph-form-of      shinjigen:3408    .
+        repi.ucs_unicode:0x66F5
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x66F5  ] ;
+            .
         repi.cns11643-3:0x2641
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-3:0x2641 ;
@@ -1014,11 +1024,6 @@ a.ucs:0x66F5
             a chisegg:glyph-image ;
             :glyph-image-of gt:18076 ;
             .
-        repi.ucs_unicode:0x66F5
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x66F5  ] ;
-            .
 
 a.ucs:0x3AD7
     a chisegg:abstract-character ;
@@ -1058,10 +1063,10 @@ a.ucs:0x3AD7
     a.daikanwa:14285
         a chisegg:abstract-character ;
         :abstract-character-of daikanwa:14285 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x66F0 ; # 曰
-        isd:below    a.ucs:0x5B50   # 子
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x66F0 ; # 曰
+            isd:below    a.ucs:0x5B50   # 子
+        ] ;
         :eq g.daikanwa:14285          ; # &G-M-14285;
         :subsume
             g2.daikanwa:14285    ;
@@ -1071,19 +1076,19 @@ a.ucs:0x3AD7
         g2.daikanwa:14285
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of daikanwa:14285 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x66F0 ; # &g2-AJ1-05132;
-        isd:below    g2.ucs_unicode:0x5B50   # &g2-AJ1-02208;
-    ] ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    g2.ucs_unicode:0x66F0 ; # &g2-AJ1-05132;
+                isd:below    g2.ucs_unicode:0x5B50   # &g2-AJ1-02208;
+            ] ;
             .
     g2.ucs_unicode:0x3AD7
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3AD7  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013151 ; # &g2-MJ013151;
-        isd:below    g2.ucs_unicode:0x5B50   # &g2-AJ1-02208;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013151 ; # &g2-MJ013151;
+            isd:below    g2.ucs_unicode:0x5B50   # &g2-AJ1-02208;
+        ] ;
         :eq g2.adobe-japan1-5:17758   ; # &g2-AJ1-17758;
         :eq g2.cns11643-3:0x2640      ; # &g2-AJ1-17758;
         :eq g2.jis-x0213-2:0x2E36     ; # &g2-AJ1-17758;
@@ -1272,10 +1277,10 @@ rep.mj:013488
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66F7         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
-        isd:below    rep.adobe-japan1-5:19201   # &AJ1-19201;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
+            isd:below    rep.adobe-japan1-5:19201   # &AJ1-19201;
+        ] ;
         :eq g2.ucs_unicode:0x66F7     ; # &g2-MJ013488;
         :eq g2.adobe-japan1-0:05134   ; # &g2-MJ013488;
         :eq g2.gb2312:0x6A42          ; # &g2-MJ013488;
@@ -1405,10 +1410,10 @@ rep.mj:013489
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66F7         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
-        isd:below    g2.ucs_unicode:0x5302   # &g2-AJ1-03279;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
+            isd:below    g2.ucs_unicode:0x5302   # &g2-AJ1-03279;
+        ] ;
         :eq g2.hanyo-denshi...ft:0x3645 ; # &g2-MJ013489;
         :subsume
             repi.hanyo-denshi...ft:0x3645 ,
@@ -2259,10 +2264,10 @@ rep.mj:007695
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x52D7         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
-        isd:below    rep.adobe-japan1-0:02431   # &AJ1-02431;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
+            isd:below    rep.adobe-japan1-0:02431   # &AJ1-02431;
+        ] ;
         :eq g2.ucs_unicode:0x52D7     ; # &g2-MJ007695;
         :eq g2.adobe-japan1-0:04285   ; # &g2-MJ007695;
         :eq g2.jis-x0208:0x5228       ; # &g2-MJ007695;
@@ -2544,10 +2549,10 @@ a.ucs:0x2F8D3
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2F8D3 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
-        isd:below    g2.ucs_unicode:0x514D   # &g2-UU+514D;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
+            isd:below    g2.ucs_unicode:0x514D   # &g2-UU+514D;
+        ] ;
         :eq g2.ucs_ks:0x5195          ; # &g2-K0-5874;
         :eq g2.ks-x1001:0x5874        ; # &g2-K0-5874;
         :eq g2.cns11643-6:0x4057      ; # &g2-K0-5874;
@@ -3228,10 +3233,10 @@ rep.mj:013508
     rep.mj:013507
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:013507 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.daikanwa:01367 ; # &g2-M-01367;
-        isd:below    a.ucs:0x66F0   # 曰
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.daikanwa:01367 ; # &g2-M-01367;
+            isd:below    a.ucs:0x66F0   # 曰
+        ] ;
         :eq g.hanyo-denshi...ks:158130 ; # &MJ013507;
         :eq g.daikanwa:14302          ; # &MJ013507;
         :subsume
@@ -3282,10 +3287,10 @@ rep.mj:013508
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x6701         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.adobe-japan1-6:21179 ; # &g2-AJ1-21179;
-        isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.adobe-japan1-6:21179 ; # &g2-AJ1-21179;
+            isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
+        ] ;
         :eq g2.ucs_jis:0x6701         ; # &g2-MJ013508;
         :eq g2.jis-x0213-2:0x2E37     ; # &g2-MJ013508;
         :eq g2.hanyo-denshi...jd:0x2E37 ; # &g2-MJ013508;
@@ -3374,10 +3379,10 @@ a.ucs:0x2333D
     rep.daikanwa:14304
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:14304 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x88E1 ; # &CDP-88E1;
-        isd:below    a.ucs:0x4E9A   # 亚
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.big5-cdp:0x88E1 ; # &CDP-88E1;
+            isd:below    a.ucs:0x4E9A   # 亚
+        ] ;
         :eq rep.hanziku-1:0xA97A      ; # &I-HZK01-A97A;
         .
         rep.hanziku-1:0xA97A
@@ -3513,11 +3518,11 @@ rep.mj:013511
     g2.mj:013511
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:013511 ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    rep.big5-cdp:0x8AFC ; # &CDP-8AFC;
-        isd:middle   a.ucs:0x7530 ; # 田
-        isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    rep.big5-cdp:0x8AFC ; # &CDP-8AFC;
+            isd:middle   a.ucs:0x7530 ; # 田
+            isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
+        ] ;
         :eq g2.hanyo-denshi...jt:0xAD8C ; # &g2-MJ013511;
         :eq g2.shinjigen_1ed:0149     ; # &g2-MJ013511;
         :subsume
@@ -3570,10 +3575,10 @@ rep.mj:007326
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x5195         ,
                                         a.ucs:0xE0104        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
-        isd:below    g2.mj:007230   # &g2-MJ007230;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x454B ; # &g2-CU+66F0;
+            isd:below    g2.mj:007230   # &g2-MJ007230;
+        ] ;
         :eq g2.hanyo-denshi...ib:0x2E40 ; # &g2-MJ007326;
         :subsume
             repi.hanyo-denshi...ib:0x2E40 ,
@@ -4226,10 +4231,10 @@ a.ucs:0x3B31
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3B31  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-4:14349 ; # &AJ1-14349;
-        isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-4:14349 ; # &AJ1-14349;
+            isd:below    g2.cns11643-1:0x454B   # &g2-CU+66F0;
+        ] ;
         :eq g2.cns11643-4:0x5056      ; # &g2-CB06796;
         :eq g2.shinjigen:3420         ; # &g2-CB06796;
         :eq g2.cbeta:06796            ; # &g2-CB06796;
@@ -4319,6 +4324,10 @@ a.ucs:0x3B32
     ideo:radical          73 ; # ⽈ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x66F4 ; # 更
+        isd:filling  a.ucs:0x76CA   # 益
+    ] ;
     .
 
 rep.daikanwa:14319
@@ -4329,7 +4338,17 @@ rep.daikanwa:14319
     ideo:radical          73 ; # ⽈ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x66F4 ; # 更
+        isd:filling  a.ucs:0xFA17   # 益
+    ] ;
+    :subsume
+        g2.daikanwa:14319    ;
     .
+    g2.daikanwa:14319
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14319 ;
+        .
 
 rep.cns11643-3:0x5474
     a chisegg:abstract-glyph ;
@@ -4339,21 +4358,19 @@ rep.cns11643-3:0x5474
     ideo:radical          73 ; # ⽈ 
     ideo:strokes          13 ;
     ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x66F4 ; # 更
+        isd:filling  rep.adobe-japan1-0:01273   # &AJ1-01273;
+    ] ;
     :eq rep.ucs_unicode:0x3B32    ; # &C3-5474;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
-        g2.ucs_unicode:0x3B32 ,
-        g2.cns11643-3:0x5474 ;
+        g2.cns11643-3:0x5474 ,
+        g2.ucs_unicode:0x3B32 ;
     .
     rep.ucs_unicode:0x3B32
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x3B32  ] .
-    g2.ucs_unicode:0x3B32
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x3B32  ] ;
-        :g2.ucs_JP...hanazono      rdf:nil ;
-        .
     g2.cns11643-3:0x5474
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x5474 ;
@@ -4362,6 +4379,12 @@ rep.cns11643-3:0x5474
         g2.ucs_cns:0x3B32
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x3B32  ] .
+    g2.ucs_unicode:0x3B32
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3B32  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        .
 
 a.ucs:0x23351
     a chisegg:abstract-character ;