Sync up with the current environment.

[chise/chiset.git] / Ideograph-R047-River.ttl

diff --git a/Ideograph-R047-River.ttl b/Ideograph-R047-River.ttl
index 956d142..9669333 100644 (file)
--- a/Ideograph-R047-River.ttl
+++ b/Ideograph-R047-River.ttl
@@ -300,10 +300,10 @@ rep.gt:10943
     ideo:total-strokes     3 ;
     :eq rep.gt-pj-3:15730         ; # &GT-10943;
     :eq rep.daikanwa:08670        ; # &I-M-08670;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5764         ] ;
-    :to.mistakable       [ :sources chisebib:kangxi ,
+    ideo:mistakable      [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5DDB         ,
                                     rep.ucs_iso:0x21FE7  ] ;
@@ -507,9 +507,9 @@ a.ucs:0x2BDA7
     :eq rep.gt:10942              ; # &I-GT-10942;
     :eq rep.gt-pj-3:15733         ; # &I-GT-10942;
     :eq rep.daikanwa:08674        ; # &I-M-08674;
-    :from.simplified     [ :context domain:JP...old ;
-                           :sources chisebib:daikanwa ;
-                           :target  a.ucs:0x8A13         ] ;
+    ideo:simplified-form-of [ :context domain:JP...old ;
+                              :sources chisebib:daikanwa ;
+                              :target  a.ucs:0x8A13         ] ;
     :subsume
         g2.ucs_iso:0x2BDA7   ;
     .
@@ -1101,9 +1101,9 @@ rep.cns11643-3:0x235B
     ] ;
     :eq rep.ucs_unicode:0x3829    ; # &C3-235B;
     :eq rep.daikanwa:49064        ; # &I-M-49064;
-    :from.interchangeable [ :sources chisebib:daikanwa ;
-                            :target  rep.daikanwa:30682   ,
-                                     rep.daikanwa:30953   ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:daikanwa ;
+                                   :target  rep.daikanwa:30682   ,
+                                            rep.daikanwa:30953   ] ;
     :subsume
         g2.ucs_unicode:0x3829 ,
         g2.cns11643-3:0x235B ;
@@ -1178,7 +1178,7 @@ a.ucs:0x5DDF
     rep.daikanwa:49065
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:49065 ;
-        :from.same           [ :sources chisebib:daikanwa ;
+        ideo:same-as         [ :sources chisebib:daikanwa ;
                                :target  rep.cns11643-5:0x286D ] ;
         :subsume
             g2.daikanwa:49065    ;
@@ -1867,6 +1867,7 @@ rep.mj:010769
     :eq a.big5:0xB15F             ; # &I-B-B15F;
     :eq rep.hanyo-denshi...jc:0x7428 ; # &I-HD-JC-7428;
     :eq rep.daikanwa:08696        ; # &I-M-08696;
+    :eq rep.shinjigen:3644        ; # &MJ010769;
     :eq rep.jef-china3:0x52F1     ; # &I-JC3-52F1;
     :subsume
         g2.mj:010769         ;
@@ -1890,6 +1891,8 @@ rep.mj:010769
                :abstract-glyph-of hanyo-denshi...jc:0x7428  .
     rep.daikanwa:08696
                :abstract-glyph-of       daikanwa:08696   .
+    rep.shinjigen:3644
+               :abstract-glyph-of      shinjigen:3644    .
     rep.jef-china3:0x52F1
                :abstract-glyph-of     jef-china3:0x52F1  .
     g2.mj:010769
@@ -1909,6 +1912,7 @@ rep.mj:010769
         :eq g2.jis-x0213-1:0x7428     ; # &g2-MJ010769;
         :eq g2.hanyo-denshi...jc:0x7428 ; # &g2-MJ010769;
         :eq g2.daikanwa:08696         ; # &g2-MJ010769;
+        :eq g2.shinjigen:3644         ; # &g2-MJ010769;
         :eq g2.jef-china3:0x52F1      ; # &g2-MJ010769;
         :subsume
             repi.daikanwa:08696  ,
@@ -1937,6 +1941,8 @@ rep.mj:010769
               :abstract-glyph-form-of hanyo-denshi...jc:0x7428  .
         g2.daikanwa:08696
               :abstract-glyph-form-of       daikanwa:08696   .
+        g2.shinjigen:3644
+              :abstract-glyph-form-of      shinjigen:3644    .
         g2.jef-china3:0x52F1
               :abstract-glyph-form-of     jef-china3:0x52F1  .
         repi.daikanwa:08696
@@ -1988,6 +1994,15 @@ rep.mj:057404
     ideo:radical          47 ; # ⼮ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    [
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x21FE8 ; # 𡿨
+                isd:right    a.ucs:0x4E37   # 丷
+            ]
+        ] ;
+        isd:below    a.ucs:0x679C   # 果
+    ] ;
     :eq rep.hanyo-denshi...jt:0xB323 ; # &I-HD-JT-B323;
     :subsume
         g2.mj:057404         ;
@@ -2031,8 +2046,9 @@ a.ucs:0x5DE3
     :eq rep.gt-k:07816            ; # &I-GT-K07816;
     :eq rep.gt-pj-1:16739         ; # &I-GT-12986;
     :eq rep.daikanwa...._.p:08696 ; # 巣
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:010769        ] ;
+    :eq rep.shinjigen:3643        ; # 巣
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:010769        ] ;
     :subsume
         g2.ucs_unicode:0x5DE3 ;
     .
@@ -2052,6 +2068,8 @@ a.ucs:0x5DE3
                :abstract-glyph-of        gt-pj-1:16739   .
     rep.daikanwa...._.p:08696
                :abstract-glyph-of daikanwa...._.p:08696   .
+    rep.shinjigen:3643
+               :abstract-glyph-of      shinjigen:3643    .
     g2.ucs_unicode:0x5DE3
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -2063,6 +2081,7 @@ a.ucs:0x5DE3
         :eq g2.gt:12986               ; # &g2-AJ1-02789;
         :eq g2.gt-k:07816             ; # &g2-AJ1-02789;
         :eq g2.daikanwa...._.p:08696  ; # &g2-AJ1-02789;
+        :eq g2.shinjigen:3643         ; # &g2-AJ1-02789;
         :subsume
             repi.daikanwa...._.p:08696 ,
             repi.jis-x0208:0x4163 ,
@@ -2086,6 +2105,8 @@ a.ucs:0x5DE3
               :abstract-glyph-form-of           gt-k:07816   .
         g2.daikanwa...._.p:08696
               :abstract-glyph-form-of daikanwa...._.p:08696   .
+        g2.shinjigen:3643
+              :abstract-glyph-form-of      shinjigen:3643    .
         repi.daikanwa...._.p:08696
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa...._.p:08696 ;
@@ -2205,9 +2226,9 @@ rep.gt:10977
     :eq rep.cns11643-6:0x5C49     ; # &GT-10977;
     :eq rep.gt-pj-3:15923         ; # &I-GT-10977;
     :eq rep.daikanwa:08700        ; # &I-M-08700;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.mj:010769        ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.mj:010769        ] ;
     :subsume
         a.ucs:0x2F882        ;
     .
@@ -2262,7 +2283,7 @@ a.ucs:0x22002
     :eq rep.gt-k:11511            ; # &I-GT-K11511;
     :eq rep.gt-pj-3:15924         ; # 𢀂
     :eq rep.daikanwa:08701        ; # &I-M-08701;
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17586 ] ;
     :subsume