X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R072-Sun.ttl;h=9719e6177205f99a00a211886edbb123d7f94023;hb=b816843f52a97e2cabcf7043bafea306c84f0a9e;hp=f18f5e4ff35017b8edec0b7d3e0a7287eea017be;hpb=2b2709f65b1ec6f027a11675fc144bf857530741;p=chise%2Fchiset.git

diff --git a/Ideograph-R072-Sun.ttl b/Ideograph-R072-Sun.ttl
index f18f5e4..9719e61 100644
--- a/Ideograph-R072-Sun.ttl
+++ b/Ideograph-R072-Sun.ttl
@@ -15,6 +15,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_iso: <http://www.chise.org/est/view/character/a.ucs@iso=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
@@ -30,6 +31,7 @@
 @prefix rep.ucs_jis...1990: <http://www.chise.org/est/view/character/rep.ucs@jis...1990=> .
 @prefix rep.ucs_jis...2000: <http://www.chise.org/est/view/character/rep.ucs@jis...2000=> .
 @prefix rep.ucs_jis...2004: <http://www.chise.org/est/view/character/rep.ucs@jis...2004=> .
+@prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
 @prefix rep.ucs_big5: <http://www.chise.org/est/view/character/rep.ucs@big5=> .
 @prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
@@ -217,7 +219,9 @@
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
+@prefix g2.ucs-var-002: <http://www.chise.org/est/view/character/g2.ucs-var-002=> .
 @prefix rep.ucs-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
+@prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 @prefix a.ucs-itaiji-002: <http://www.chise.org/est/view/character/a.ucs-itaiji-002=> .
@@ -282,6 +286,7 @@
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
 @prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
 @prefix ucs-var-003: <http://rdf.chise.org/data/ccs/ucs-var-003/code-point/> .
+@prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
 @prefix ucs-itaiji-002: <http://rdf.chise.org/data/ccs/ucs-itaiji-002/code-point/> .
 @prefix ucs-itaiji-003: <http://rdf.chise.org/data/ccs/ucs-itaiji-003/code-point/> .
@@ -294,7 +299,7 @@ a.ucs_component:0x65E5
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
-    :eq a.iwds-1:0118             ; # &IWDS1-118;
+    :eq a.iwds-1:0118             ; # &A-compU+65E5;
     .
     a.iwds-1:0118
            :abstract-character-of         iwds-1:0118    .
@@ -523,6 +528,32 @@ a.ucs:0x65E5
                 :glyph-image-of hng-khm:03660 ;
                 .
 
+rep.ucs-var-002:0x65E5
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x65E5 ;
+    :from.denotational_component
+        a.ucs_component:0x65E5 ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     4 ;
+    :subsume
+        g2.ucs-var-002:0x65E5 ,
+        rep.ucs-var-003:0x65E5 ,
+        rep.ucs-var-004:0x65E5 ;
+    .
+    g2.ucs-var-002:0x65E5
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-var-002:0x65E5 ;
+        .
+    rep.ucs-var-003:0x65E5
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-003:0x65E5 ;
+        .
+    rep.ucs-var-004:0x65E5
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-004:0x65E5 ;
+        .
+
 a.ucs:0x65E6
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x65E6 ;
@@ -617,8 +648,8 @@ a.ucs:0x65E7
     :eq rep.daikanwa:13737        ; # &I-M-13737;
     :eq rep.shinjigen:8973        ; # 旧
     :eq rep.hanziku-4:0xDBA9      ; # &I-HZK04-DBA9;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:06300 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:06300 ] ;
     .
     rep.adobe-japan1-0:01670
                :abstract-glyph-of adobe-japan1-0:01670   .
@@ -1315,7 +1346,7 @@ rep.cbeta:13033
     :eq rep.daikanwa...ho:0230    ; # &M-H0230;
     :form-of             [ :sources chisebib:guangyun ;
                            :target  a.ucs:0x65E8         ] ;
-    :from.same           [ :sources chisebib:guangyun ,
+    ideo:same-as         [ :sources chisebib:guangyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x65E8         ] ;
     :subsume
@@ -1690,8 +1721,8 @@ rep.daikanwa:13760
         isd:right    a.ucs:0x2F828   # 勺
     ] ;
     :eq rep.shinjigen:5201        ; # &M-13760;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:03108 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:03108 ] ;
     :subsume
         g2.daikanwa:13760    ,
         g2.shinjigen:5201    ;
@@ -2081,7 +2112,7 @@ a.ucs:0x65F6
     :eq rep.daikanwa:13772        ; # &I-M-13772;
     :eq rep.shinjigen:3321        ; # 时
     :eq rep.jef-china3:0x51BA     ; # &I-JC3-51BA;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02252 ] ;
     :subsume
         g2.ucs_unicode:0x65F6 ,
@@ -2177,7 +2208,7 @@ a.ucs:0x3AD6
     :eq rep.jis-x0213-2:0x2D71    ; # &I-JX2-2D71;
     :eq rep.shinjigen:3269        ; # 㫖
     :eq rep.cbeta:11730           ; # &I-CB11730;
-    :from.vulgar         [ :sources chisebib:shinjigen_1ed ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x65E8         ] ;
     .
     rep.adobe-japan1-5:17731
@@ -2208,10 +2239,10 @@ a.ucs:0x3AD7
     :eq rep.cns11643-3:0x2640     ; # &I-C3-2640;
     :eq rep.jis-x0213-2:0x2E36    ; # &I-JX2-2E36;
     :eq rep.daikanwa:14285        ; # &I-M-14285;
-    :from.original       [ :sources chisebib:shuowen ,
-                                    chisebib:shuowen-zhu ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x539A         ] ;
+    ideo:original-form-of [ :sources chisebib:shuowen ,
+                                     chisebib:shuowen-zhu ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x539A         ] ;
     :subsume
         a.daikanwa:14285     ,
         g2.ucs_unicode:0x3AD7 ;
@@ -2348,6 +2379,54 @@ a.ucs:0x2314D
     rep.cbeta:03191
                :abstract-glyph-of          cbeta:03191   .
 
+a.ucs:0x23158
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23158 ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    a.ucs_iwds-1:0x4E8F   # &A-IWDSU+4E8F;
+    ] ;
+    .
+
+rep.ucs-var-001:0x23158
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x23158 ;
+    :denotation-of
+        a.ucs:0x23158        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    a.ucs:0x4E90   # 亐
+    ] ;
+    .
+
+rep.ucs_iso:0x23158
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23158 ] ;
+    :denotation-of
+        a.ucs:0x23158        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    a.ucs:0x4E8F   # 亏
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23158   ;
+    .
+    g2.ucs_iso:0x23158
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23158 ] ;
+        .
+
 a.ucs-itaiji-002:0x81FD
     a chisegg:abstract-character ;
     :abstract-character-of ucs-itaiji-002:0x81FD ;
@@ -2366,14 +2445,14 @@ rep.ucs-itaiji-002:0x81FD
         isd:above    a.ucs:0x2008A ; # 𠂊
         isd:below    a.ucs:0x65E7   # 旧
     ] ;
-    :eq rep.gt-k:03616            ; # &GT-K03616;
-    :eq g.gt-k:03318              ; # &GT-K03616;
-    :eq rep.gt-pj-k1:24132        ; # &GT-K03616;
-    :eq rep.ucs-itaiji-003:0x81FD ; # &GT-K03616;
-    :from.simplified     [ :context domain:component ;
-                           :target  a.ucs:0x81FD         ] ;
-    :from.simplified     [ :context domain:misc    ;
-                           :target  rep.adobe-japan1-5:18448 ] ;
+    :eq rep.gt-k:03616            ; # &U-i002+81FD;
+    :eq g.gt-k:03318              ; # &U-i002+81FD;
+    :eq rep.gt-pj-k1:24132        ; # &U-i002+81FD;
+    :eq rep.ucs-itaiji-003:0x81FD ; # &U-i002+81FD;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x81FD         ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  rep.adobe-japan1-5:18448 ] ;
     :subsume
         g2.gt-k:03616        ,
         rep.gt-k:03318       ;
@@ -2393,7 +2472,7 @@ rep.ucs-itaiji-002:0x81FD
             isd:above    rep.gt-k:00089 ; # &GT-K00089;
             isd:below    a.ucs:0x65E7   # 旧
         ] ;
-        :eq g2.ucs-itaiji-002:0x81FD  ; # &g2-GT-K03616;
+        :eq g2.ucs-itaiji-002:0x81FD  ; # &g2-U-i002+81FD;
         .
         g2.ucs-itaiji-002:0x81FD
               :abstract-glyph-form-of ucs-itaiji-002:0x81FD  .
@@ -2413,7 +2492,7 @@ rep.ucs-itaiji-002:0x81FD
         g2.gt-k:03318
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of gt-k:03318 ;
-            :eq g2.ucs-itaiji-003:0x81FD  ; # &g2-GT-K03318;
+            :eq g2.ucs-itaiji-003:0x81FD  ; # &g2-U-i003+81FD;
             .
             g2.ucs-itaiji-003:0x81FD
                   :abstract-glyph-form-of ucs-itaiji-003:0x81FD  .
@@ -2801,7 +2880,7 @@ a.ucs:0x65FE
         :eq rep.daikanwa:13778        ; # &I-M-13778;
         :eq rep.shinjigen:3302        ; # &AJ1-21697;
         :eq rep.cbeta:05945           ; # &I-CB05945;
-        :from.ancient        [ :sources chisebib:shinjigen ;
+        ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:02399 ] ;
         :subsume
             g2.daikanwa:13778    ,
@@ -3435,22 +3514,82 @@ a.ucs:0x23173
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    a.ucs:0x5928   # 夨
+    ] ;
+    .
+
+rep.ucs_iso:0x23173
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23173 ] ;
+    :denotation-of
+        a.ucs:0x23173        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    rep.big5-cdp:0x8CD5   # &CDP-8CD5;
+    ] ;
+    :eq rep.cns11643-6:0x2B72     ; # &C6-2B72;
+    :eq rep.daikanwa:13787        ; # &I-M-13787;
     :subsume
-        rep.ucs_iso:0x23173  ,
-        rep.cns11643-6:0x2B72 ;
+        g2.ucs_iso:0x23173   ,
+        g2.cns11643-6:0x2B72 ;
     .
-    rep.ucs_iso:0x23173
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x23173 ] ;
-        :eq rep.daikanwa:13787        ; # &M-13787;
-        .
-        rep.daikanwa:13787
-                   :abstract-glyph-of       daikanwa:13787   .
     rep.cns11643-6:0x2B72
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-6:0x2B72 ;
+               :abstract-glyph-of     cns11643-6:0x2B72  .
+    rep.daikanwa:13787
+               :abstract-glyph-of       daikanwa:13787   .
+    g2.ucs_iso:0x23173
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23173 ] ;
+        :eq g2.daikanwa:13787         ; # &g2-M-13787;
+        :subsume
+            repi.daikanwa:13787  ,
+            repi.ucs_iso:0x23173 ,
+            rep.hanziku-4:0xDE56 ;
         .
+        g2.daikanwa:13787
+              :abstract-glyph-form-of       daikanwa:13787   .
+        repi.daikanwa:13787
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:13787 ;
+            .
+        repi.ucs_iso:0x23173
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23173 ] ;
+            .
+        rep.hanziku-4:0xDE56
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-4:0xDE56 ;
+            .
+    g2.cns11643-6:0x2B72
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x2B72 ;
+        :eq g2.ucs_cns:0x23173        ; # &g2-CU+23173;
+        .
+        g2.ucs_cns:0x23173
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x23173 ] .
+
+rep.hanziku-4:0xDC6F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of hanziku-4:0xDC6F ;
+    :denotation-of
+        a.ucs:0x23173        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    rep.adobe-japan1-6:21376   # &AJ1-21376;
+    ] ;
+    .
 
 a.ucs:0x6617
     a chisegg:abstract-character ;
@@ -4461,7 +4600,7 @@ a.ucs:0x660B
     ideo:strokes           4 ;
     ideo:total-strokes     8 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs_component:0x5929 ; # &IWDS1-008;
+        isd:above    a.ucs_component:0x5929 ; # &A-compU+5929;
         isd:below    a.ucs:0x65E5   # 日
     ] ;
     .
@@ -5733,6 +5872,21 @@ rep.ucs-var-001:0x6614
     ] ;
     .
 
+rep.ucs-var-003:0x6614
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-003:0x6614 ;
+    :denotation-of
+        a.ucs:0x6614         ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x2EBF ; # ⺿
+        isd:middle   a.ucs:0x4E00 ; # 一
+        isd:below    a.ucs:0x65E5   # 日
+    ] ;
+    .
+
 a.ucs:0x6615
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6615 ;
@@ -7451,6 +7605,10 @@ a.ucs:0x6625
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x215D7 ; # 𡗗
+        isd:below    a.ucs:0x65E5   # 日
+    ] ;
     :eq a.big5:0xAC4B             ; # &I-B-AC4B;
     :subsume
         rep.adobe-japan1-0:02399 ,
@@ -7461,6 +7619,10 @@ a.ucs:0x6625
     rep.adobe-japan1-0:02399
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-0:02399 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-5:17472 ; # &AJ1-17472;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq rep.ucs_jis:0x6625        ; # &AJ1-02399;
         :eq rep.jis-x0208:0x3D55      ; # &I-J90-3D55;
         :eq rep.ks-x1001:0x7570       ; # &I-K0-7570;
@@ -7567,6 +7729,10 @@ a.ucs:0x6625
     rep.cns11643-1:0x514E
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-1:0x514E ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.big5-cdp:0x8BE9 ; # &CDP-8BE9;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq rep.ucs_unicode:0x6625    ; # &C1-514E;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :eq rep.gb2312:0x343A         ; # &C1-514E;
@@ -9164,7 +9330,7 @@ a.ucs:0x6637
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6637 ;
     :denotation-of
-        a.ucs_component:0x6637 ;
+        a.ucs_iwds-1:0x6637  ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
@@ -9179,7 +9345,7 @@ a.ucs:0x6637
     :eq rep.shinjigen:5235        ; # 昷
     :eq rep.cbeta:03379           ; # &I-CB03379;
     :eq rep.jef-china3:0x5BB6     ; # &I-JC3-5BB6;
-    :from.same           [ :sources chisebib:guangyun ,
+    ideo:same-as         [ :sources chisebib:guangyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x25055        ] ;
     :subsume
@@ -9479,7 +9645,7 @@ a.ucs:0x663B
     :eq rep.cns11643-3:0x2D22     ; # &I-C3-2D22;
     :eq rep.daikanwa:13885        ; # &I-M-13885;
     :eq rep.shinjigen:3278        ; # 昻
-    :from.vulgar         [ :sources chisebib:pianhai ,
+    ideo:vulgar-form-of  [ :sources chisebib:pianhai ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:01993 ] ;
@@ -9520,10 +9686,10 @@ a.ucs:0x663C
     :eq rep.gt:17517              ; # &I-GT-17517;
     :eq rep.gt-pj-1:17259         ; # &I-GT-17517;
     :eq rep.shinjigen:3309        ; # 昼
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:05105 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05105 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:05105 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05105 ] ;
     :subsume
         g2.gt:17517          ,
         g2.ucs_unicode:0x663C ,
@@ -9548,7 +9714,7 @@ a.ucs:0x663C
     g2.gt:17517
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:17517 ;
-        :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+        ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:05105 ] ;
         :subsume
@@ -9676,8 +9842,8 @@ a.ucs:0x663F
     :eq rep.jis-x0213-1:0x5B26    ; # &I-JX1-5B26;
     :eq rep.gt:17494              ; # &I-GT-17494;
     :eq rep.gt-pj-1:23334         ; # &I-GT-17494;
-    :from.simplified     [ :context domain:JP...misc ;
-                           :target  rep.adobe-japan1-0:05128 ] ;
+    ideo:simplified-form-of [ :context domain:JP...misc ;
+                              :target  rep.adobe-japan1-0:05128 ] ;
     :subsume
         g2.ucs_unicode:0x663F ;
     .
@@ -9749,6 +9915,62 @@ a.ucs:0x2B783
     ] ;
     .
 
+a.ucs:0x2D96D
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2D96D ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           72 ; # ⽇
+                           ] ;
+    ideo:radical           [ :context domain:koseki  ;
+                             :target           73 ; # ⽈
+                           ] ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    a.ucs:0x208CF   # 𠣏
+    ] ;
+    .
+
+rep.mj:057661
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:057661 ;
+    :denotation-of
+        a.ucs:0x2D96D        ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           72 ; # ⽇
+                           ] ;
+    ideo:radical           [ :context domain:koseki  ;
+                             :target           73 ; # ⽈
+                           ] ;
+    ideo:strokes           5 ;
+    ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    rep.ucs_iso:0x208CF   # &M-02509;
+    ] ;
+    :eq rep.ucs_JP...hanazono:0x2D96D ; # &MJ057661;
+    :eq rep.koseki:156260         ; # &MJ057661;
+    :form-of             [ :sources chisebib:koseki ;
+                           :target  rep.mj:013488        ] ;
+    :subsume
+        g2.mj:057661         ;
+    .
+    rep.ucs_JP...hanazono:0x2D96D
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x2D96D ] .
+    rep.koseki:156260
+               :abstract-glyph-of         koseki:156260  .
+    g2.mj:057661
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057661 ;
+        :eq g2.ucs_JP...hanazono:0x2D96D ; # &g2-MJ057661;
+        :eq g2.koseki:156260          ; # &g2-MJ057661;
+        .
+        g2.ucs_JP...hanazono:0x2D96D
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2D96D ] .
+        g2.koseki:156260
+              :abstract-glyph-form-of         koseki:156260  .
+
 a.ucs:0x23192
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23192 ;
@@ -10484,7 +10706,7 @@ a.ucs_component:0x6649
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           6 ;
     ideo:total-strokes    10 ;
-    :eq a.iwds-1:0388             ; # &IWDS1-388;
+    :eq a.iwds-1:0388             ; # &A-compU+6649;
     .
     a.iwds-1:0388
            :abstract-character-of         iwds-1:0388    .
@@ -10668,11 +10890,11 @@ a.ucs:0x664B
     :eq rep.gt-pj-1:16184         ; # &I-GT-17581;
     :eq rep.daikanwa:13899        ; # &I-M-13899;
     :eq rep.shinjigen:3323        ; # 晋
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:05102 ] ;
-    :from.simplified     [ :context domain:misc    ;
-                           :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:05102 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:05102 ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:shinjigen ;
+                              :target  rep.adobe-japan1-0:05102 ] ;
     .
     rep.adobe-japan1-0:02558
                :abstract-glyph-of adobe-japan1-0:02558   .
@@ -11521,9 +11743,9 @@ a.ucs:0x2F8CC
     :from.Large-Seal     [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05105 ] ;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x26618        ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:02427 ] ;
     .
     rep.cns11643-6:0x3836
@@ -11844,6 +12066,25 @@ rep.ucs-itaiji-001:0x2C037
     ideo:total-strokes    10 ;
     .
 
+rep.ucs-var-001:0x2D96D
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x2D96D ;
+    :denotation-of
+        a.ucs:0x2D96D        ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target           72 ; # ⽇
+                           ] ;
+    ideo:radical           [ :context domain:koseki  ;
+                             :target           73 ; # ⽈
+                           ] ;
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    rep.cns11643-5:0x2235   # &C5-2235;
+    ] ;
+    .
+
 rep.gt-k:07007
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt-k:07007 ;
@@ -12462,7 +12703,7 @@ rep.ucs_iso:0x231B6
     ideo:total-strokes    11 ;
     :eq rep.cns11643-4:0x323D     ; # &C4-323D;
     :eq rep.daikanwa:13941        ; # &I-M-13941;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13377 ] ;
     :subsume
@@ -13762,8 +14003,8 @@ rep.adobe-japan1-0:01408
     :eq rep.gt:17551              ; # &I-GT-17551;
     :eq rep.gt-pj-1:13090         ; # &I-GT-17551;
     :eq rep.jef-china3:0x51FD     ; # &I-JC3-51FD;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07650 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07650 ] ;
     :subsume
         g2.adobe-japan1-0:01408 ;
     .
@@ -14111,6 +14352,10 @@ a.ucs:0x6668
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6668 ;
     ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    a.ucs_cognate:0x8FB0   # &A-cgnU+8FB0;
+    ] ;
     .
 
 rep.adobe-japan1-0:05108
@@ -14276,7 +14521,7 @@ repi.hng-kar:01730
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    rep.mj:058835   # &MJ058835;
+        isd:below    a.ucs:0x2E77E   # 𮝾
     ] ;
     .
 
@@ -14516,6 +14761,38 @@ a.ucs:0x231E2
     rep.cns11643-5:0x3274
                :abstract-glyph-of     cns11643-5:0x3274  .
 
+a.ucs:0x2AC1E
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2AC1E ;
+    ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    a.gt-k:03433   # &A-GT-K03433;
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x2AC1E
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2AC1E ] ;
+    :denotation-of
+        a.ucs:0x2AC1E        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           7 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:below    rep.gt-k:03433   # &GT-K03433;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2AC1E ;
+    .
+    g2.ucs_JP...hanazono:0x2AC1E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2AC1E ] ;
+        .
+
 rep.ucs_iso:0x2C037
     a chisegg:abstract-glyph ;
     :abstract-glyph-of [ :context domain:iso     ;
@@ -14959,6 +15236,14 @@ rep.adobe-japan1-0:03539
     :eq rep.gt-pj-1:18785         ; # &I-GT-17722;
     :eq rep.daikanwa:13982        ; # &I-M-13982;
     :eq rep.shinjigen:3357        ; # &AJ1-03539;
+    :from.Liwen          [ :sources chisebib:shuowen-tongxun-dingsheng ;
+                           :target  rep.adobe-japan1-6:21720 ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:shuowen-zhu ,
+                                            chisebib:daikanwa ;
+                                   :target  rep.mj:015697        ] ;
+    ideo:same-as         [ :sources chisebib:shuowen-tongxun-dingsheng ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-6:21720 ] ;
     :subsume
         g2.daikanwa:13982    ,
         g2.ucs_unicode:0x666E ,
@@ -15793,7 +16078,7 @@ rep.adobe-japan1-6:21714
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8CB6 ; # &CDP-8CB6;
+        isd:above    rep.gt:16595 ; # &GT-16595;
         isd:below    a.ucs:0x65E5   # 日
     ] ;
     :eq rep.ucs_jis:0x6675        ; # &AJ1-21714;
@@ -16462,9 +16747,9 @@ a.ucs:0x3AFA
     ] ;
     :eq rep.cns11643-3:0x3C27     ; # &I-C3-3C27;
     :eq rep.daikanwa:14008        ; # &I-M-14008;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-0:02674 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-0:02674 ] ;
     :subsume
         g2.daikanwa:14008    ,
         g2.ucs_unicode:0x3AFA ;
@@ -17116,16 +17401,72 @@ a.ucs:0x23205
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x6797 ; # &A-compU+6797;
+        isd:below    a.ucs:0x65E5   # 日
+    ] ;
+    .
+
+rep.ucs_iso:0x23205
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23205 ] ;
+    :denotation-of
+        a.ucs:0x23205        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x6797 ; # 林
         isd:below    a.ucs:0x65E5   # 日
     ] ;
-    :eq rep.daikanwa:14020        ; # &I-M-14020;
+    :eq rep.daikanwa:14020        ; # &M-14020;
     :eq rep.cbeta:04877           ; # &I-CB04877;
+    :subsume
+        g2.daikanwa:14020    ,
+        g2.ucs_iso:0x23205   ;
     .
     rep.daikanwa:14020
                :abstract-glyph-of       daikanwa:14020   .
     rep.cbeta:04877
                :abstract-glyph-of          cbeta:04877   .
+    g2.daikanwa:14020
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14020 ;
+        .
+    g2.ucs_iso:0x23205
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23205 ] ;
+        :eq g2.cbeta:04877            ; # &g2-CB04877;
+        :subsume
+            repi.ucs_iso:0x23205 ,
+            repi.cbeta:04877     ;
+        .
+        g2.cbeta:04877
+              :abstract-glyph-form-of          cbeta:04877   .
+        repi.ucs_iso:0x23205
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23205 ] ;
+            .
+        repi.cbeta:04877
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:04877 ;
+            .
+
+rep.ucs-var-001:0x23205
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x23205 ;
+    :denotation-of
+        a.ucs:0x23205        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x233DF ; # 𣏟
+        isd:below    a.ucs:0x65E5   # 日
+    ] ;
+    .
 
 a.ucs:0x231F1
     a chisegg:abstract-character ;
@@ -17308,8 +17649,8 @@ rep.adobe-japan1-0:03433
     :eq rep.gt:17718              ; # &I-GT-17718;
     :eq rep.gt-pj-1:18517         ; # &I-GT-17718;
     :eq rep.daikanwa...._.p:14030 ; # &AJ1-03433;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13377 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13377 ] ;
     :subsume
         g2.ucs_unicode:0x6669 ;
     .
@@ -17420,8 +17761,8 @@ a.ucs:0x6681
     :eq rep.gt-pj-1:13895         ; # &I-GT-17672;
     :eq rep.daikanwa:14031        ; # &I-M-14031;
     :eq rep.shinjigen:3342        ; # 暁
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05121 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05121 ] ;
     :subsume
         g2.daikanwa:14031    ,
         g2.gt:17672          ,
@@ -17547,8 +17888,8 @@ rep.adobe-japan1-0:02421
     :eq rep.gt-k:09069            ; # &I-GT-K09069;
     :eq rep.gt-pj-1:15723         ; # &I-GT-17690;
     :eq rep.daikanwa...._.p:14031 ; # &AJ1-02421;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13352 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13352 ] ;
     :subsume
         g2.ucs_unicode:0x6691 ;
     .
@@ -17848,8 +18189,8 @@ rep.gt-k:09590
         isd:below    a.ucs:0x5927   # 大
     ] ;
     :eq rep.gt-pj-k1:15172        ; # &GT-K09590;
-    :from.simplified     [ :context domain:component ;
-                           :target  a.ucs:0x66D3         ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x66D3         ] ;
     :subsume
         g2.gt-k:09590        ;
     .
@@ -20375,7 +20716,7 @@ a.ucs:0x6685
     ] ;
     :eq rep.cns11643-4:0x3D69     ; # &I-C4-3D69;
     :eq rep.cbeta:05750           ; # &I-CB05750;
-    :from.same           a.ucs:0x23236        ;
+    ideo:same-as         a.ucs:0x23236        ;
     .
     rep.cns11643-4:0x3D69
                :abstract-glyph-of     cns11643-4:0x3D69  .
@@ -20681,43 +21022,60 @@ a.ucs:0x669C
     ideo:strokes           [ :context domain:ucs...compat ;
                              :target  10 ] ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7ADD ; # 竝
+        isd:below    a.ucs_component:0x65E5   # &A-compU+65E5;
+    ] ;
     .
 
-o.ucs_unicode:0x669C
-    a chisegg:unified-glyph ;
-    :unified-glyph-of [ :context domain:unicode ;
-                        :target     ucs:0x669C  ] ;
+rep.adobe-japan1-6:21720
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-6:21720 ;
     :denotation-of
         a.ucs:0x669C         ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :subsume
-        rep.adobe-japan1-6:21720 ,
-        rep.cns11643-3:0x4735 ;
-    .
-    rep.adobe-japan1-6:21720
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1-6:21720 ;
-        :eq rep.ucs_unicode:0x669C    ; # &AJ1-21720;
-        :eq rep.jis-x0212:0x4255      ; # &I-JSP-4255;
-        :eq rep.daikanwa:14082        ; # &I-M-14082;
-        :eq rep.shinjigen:3358        ; # &AJ1-21720;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  rep.adobe-japan1-0:03539 ] ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7ADD ; # 竝
+        isd:below    a.ucs:0x65E5   # 日
+    ] ;
+    :eq rep.ucs_unicode:0x669C    ; # &AJ1-21720;
+    :eq rep.jis-x0212:0x4255      ; # &I-JSP-4255;
+    :eq rep.cns11643-3:0x4735     ; # &I-C3-4735;
+    :eq rep.daikanwa:14082        ; # &I-M-14082;
+    :eq rep.shinjigen:3358        ; # &AJ1-21720;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:03539 ] ;
+    :subsume
+        g.ucs_unicode:0x669C ,
+        g.ucs_cns:0x669C     ;
+    .
+    rep.ucs_unicode:0x669C
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x669C  ] .
+    rep.jis-x0212:0x4255
+               :abstract-glyph-of      jis-x0212:0x4255  .
+    rep.cns11643-3:0x4735
+               :abstract-glyph-of     cns11643-3:0x4735  .
+    rep.daikanwa:14082
+               :abstract-glyph-of       daikanwa:14082   .
+    rep.shinjigen:3358
+               :abstract-glyph-of      shinjigen:3358    .
+    g.ucs_unicode:0x669C
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:unicode ;
+                             :target     ucs:0x669C  ] ;
+        :eq g.adobe-japan1-6:21720    ; # &G-AJ1-21720;
+        :eq g.daikanwa:14082          ; # &G-AJ1-21720;
         :subsume
             g2.daikanwa:14082    ,
             g2.ucs_unicode:0x669C ;
         .
-        rep.ucs_unicode:0x669C
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x669C  ] .
-        rep.jis-x0212:0x4255
-                   :abstract-glyph-of      jis-x0212:0x4255  .
-        rep.daikanwa:14082
-                   :abstract-glyph-of       daikanwa:14082   .
-        rep.shinjigen:3358
-                   :abstract-glyph-of      shinjigen:3358    .
+        g.adobe-japan1-6:21720
+                   :detailed-glyph-of adobe-japan1-6:21720   .
+        g.daikanwa:14082
+                   :detailed-glyph-of       daikanwa:14082   .
         g2.daikanwa:14082
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of daikanwa:14082 ;
@@ -20753,14 +21111,21 @@ o.ucs_unicode:0x669C
                 :glyph-image-of [ :context domain:unicode ;
                                   :target     ucs:0x669C  ] ;
                 .
-    rep.cns11643-3:0x4735
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x4735 ;
-        :eq rep.ucs_cns:0x669C        ; # &C3-4735;
+    g.ucs_cns:0x669C
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:cns     ;
+                             :target     ucs:0x669C  ] ;
+        :subsume
+            g2.cns11643-3:0x4735 ;
         .
-        rep.ucs_cns:0x669C
-                   :abstract-glyph-of [ :context domain:cns     ;
-                                        :target     ucs:0x669C  ] .
+        g2.cns11643-3:0x4735
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of cns11643-3:0x4735 ;
+            :eq g2.ucs_cns:0x669C         ; # &g2-CU+669C;
+            .
+            g2.ucs_cns:0x669C
+                  :abstract-glyph-form-of [ :context domain:cns     ;
+                                            :target     ucs:0x669C  ] .
 
 a.ucs:0x669D
     a chisegg:abstract-character ;
@@ -21574,13 +21939,62 @@ a.ucs:0x23259
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
-    :eq rep.cns11643-5:0x4644     ; # &I-C5-4644;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x501D ; # 倝
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
+    .
+
+rep.ucs_iso:0x23259
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23259 ] ;
+    :denotation-of
+        a.ucs:0x23259        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.adobe-japan1-6:21127 ; # &AJ1-21127;
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
+    :eq rep.cns11643-5:0x4644     ; # &C5-4644;
     :eq rep.daikanwa:14097        ; # &I-M-14097;
+    :subsume
+        g2.ucs_iso:0x23259   ;
     .
     rep.cns11643-5:0x4644
                :abstract-glyph-of     cns11643-5:0x4644  .
     rep.daikanwa:14097
                :abstract-glyph-of       daikanwa:14097   .
+    g2.ucs_iso:0x23259
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23259 ] ;
+        :eq g2.cns11643-5:0x4644      ; # &g2-M-14097;
+        :eq g2.daikanwa:14097         ; # &g2-M-14097;
+        :subsume
+            repi.daikanwa:14097  ,
+            repi.cns11643-5:0x4644 ,
+            repi.ucs_iso:0x23259 ;
+        .
+        g2.cns11643-5:0x4644
+              :abstract-glyph-form-of     cns11643-5:0x4644  .
+        g2.daikanwa:14097
+              :abstract-glyph-form-of       daikanwa:14097   .
+        repi.daikanwa:14097
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:14097 ;
+            .
+        repi.cns11643-5:0x4644
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x4644 ;
+            .
+        repi.ucs_iso:0x23259
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23259 ] ;
+            .
 
 a.ucs:0x2325A
     a chisegg:abstract-character ;
@@ -21621,7 +22035,7 @@ a.ucs:0x3B0E
     :eq rep.big5-cdp:0x8CE3       ; # &I-CDP-8CE3;
     :eq rep.daikanwa:14099        ; # &I-M-14099;
     :eq rep.shinjigen:9187        ; # 㬎
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x986F         ] ;
     :subsume
         g2.daikanwa:14099    ,
@@ -22137,12 +22551,12 @@ a.ucs:0x66A6
     :eq rep.gt-pj-1:20081         ; # &I-GT-17852;
     :eq rep.daikanwa...._.p:14111 ; # 暦
     :eq rep.shinjigen:3374        ; # 暦
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:JP...Touyou ,
-                                    chisebib:JP...Jouyou ,
-                                    chisebib:shinjigen ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x66C6         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:JP...Touyou ,
+                                       chisebib:JP...Jouyou ,
+                                       chisebib:shinjigen ,
+                                       chisebib:daikanwa ;
+                              :target  a.ucs:0x66C6         ] ;
     :subsume
         g2.ucs_unicode:0x66A6 ,
         g2.cns11643-3:0x4737 ;
@@ -23294,7 +23708,7 @@ rep.daikanwa:14132
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
     :eq rep.jef-china3:0x51EA     ; # &I-JC3-51EA;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6635         ] ;
     .
@@ -23315,8 +23729,8 @@ rep.hanyo-denshi...ks:159500
     :eq rep.cns11643-1:0x6D34     ; # &HD-KS-159500;
     :eq rep.hanyo-denshi...ks...mf:015950 ; # &I-KSMF-15950;
     :eq rep.shinjigen:3300        ; # &HD-KS-159500;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x6635         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x6635         ] ;
     .
     rep.cns11643-1:0x6D34
                :abstract-glyph-of     cns11643-1:0x6D34  .
@@ -25110,8 +25524,8 @@ a.ucs:0x3B1C
     :eq rep.jis-x0213-2:0x2E34    ; # &I-JX2-2E34;
     :eq rep.daikanwa:14164        ; # &I-M-14164;
     :eq rep.shinjigen:3325        ; # 㬜
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:05102 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:05102 ] ;
     :subsume
         g2.daikanwa:14164    ,
         g2.ucs_unicode:0x3B1C ;
@@ -25763,7 +26177,7 @@ rep.cns11643-3:0x507E
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
     :eq rep.daikanwa:14170        ; # &I-M-14170;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.cns11643-1:0x7070 ] ;
     .
@@ -26043,7 +26457,7 @@ a.ucs:0x232A0
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x232A0 ] ;
         :eq rep.daikanwa:14173        ; # &M-14173;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.cns11643-4:0x4A32 ] ;
         .
@@ -26775,7 +27189,7 @@ a.ucs:0x66CD
     ] ;
     :eq rep.cns11643-3:0x5122     ; # &I-C3-5122;
     :eq rep.shinjigen:5218        ; # 曍
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x769E         ] ;
     :subsume
         g2.cns11643-3:0x5122 ,
@@ -27751,7 +28165,7 @@ rep.ucs-itaiji-004:0x66B4
         isd:above    rep.gt-k:09590 ; # &GT-K09590;
         isd:below    a.ucs:0x6C3A   # æ°º
     ] ;
-    :from.wrong          a.ucs:0x3B25         ;
+    ideo:wrong-form-of   a.ucs:0x3B25         ;
     .
 
 a.ucs:0x3B23
@@ -27972,8 +28386,8 @@ rep.adobe-japan1-0:02422
     :eq rep.gt:17977              ; # &I-GT-17977;
     :eq rep.gt-pj-1:15724         ; # &I-GT-17977;
     :eq rep.jef-china3:0x51FE     ; # &I-JC3-51FE;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07699 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07699 ] ;
     :subsume
         g2.ucs_unicode:0x66D9 ;
     .
@@ -28303,10 +28717,10 @@ a.ucs:0x3B25
     :eq rep.daikanwa:14225        ; # &I-M-14225;
     :eq rep.shinjigen:3382        ; # 㬥
     :eq rep.cbeta:07862           ; # &I-CB07862;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  a.ucs:0x66B4         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x66B4         ] ;
     :subsume
         g2.daikanwa:14225    ,
         g2.ucs_unicode:0x3B25 ,
@@ -28621,15 +29035,85 @@ a.ucs:0x232EF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x232EF ;
     ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x660F ; # 昏
+        isd:right    a.ucs:0x2B7CE   # 𫟎
+    ] ;
+    .
+
+rep.mj:037828
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:037828 ;
+    :denotation-of
+        a.ucs:0x232EF        ;
+    ideo:radical          72 ; # ⽇ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x660F ; # 昏
+        isd:right    rep.ucs-var-003:0x2B7CE   # &U-v003+2B7CE;
+    ] ;
+    :eq rep.ucs_iso:0x232EF       ; # &MJ037828;
     :eq rep.cns11643-7:0x3F78     ; # &I-C7-3F78;
+    :eq rep.koseki:160420         ; # &MJ037828;
     :eq rep.daikanwa:14228        ; # &I-M-14228;
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x660F         ] ;
+    :subsume
+        g2.mj:037828         ,
+        g2.ucs_iso:0x232EF   ;
     .
+    rep.ucs_iso:0x232EF
+               :abstract-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x232EF ] .
     rep.cns11643-7:0x3F78
                :abstract-glyph-of     cns11643-7:0x3F78  .
+    rep.koseki:160420
+               :abstract-glyph-of         koseki:160420  .
     rep.daikanwa:14228
                :abstract-glyph-of       daikanwa:14228   .
+    g2.mj:037828
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:037828 ;
+        :eq g2.koseki:160420          ; # &g2-MJ037828;
+        :eq g2.daikanwa:14228         ; # &g2-MJ037828;
+        :subsume
+            repi.daikanwa:14228  ,
+            repi.mj:037828       ;
+        .
+        g2.koseki:160420
+              :abstract-glyph-form-of         koseki:160420  .
+        g2.daikanwa:14228
+              :abstract-glyph-form-of       daikanwa:14228   .
+        repi.daikanwa:14228
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:14228 ;
+            .
+        repi.mj:037828
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:037828 ;
+            .
+    g2.ucs_iso:0x232EF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x232EF ] ;
+        :eq g2.cns11643-7:0x3F78      ; # &g2-IU-000232EF;
+        :subsume
+            repi.cns11643-7:0x3F78 ,
+            repi.ucs_iso:0x232EF ;
+        .
+        g2.cns11643-7:0x3F78
+              :abstract-glyph-form-of     cns11643-7:0x3F78  .
+        repi.cns11643-7:0x3F78
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x3F78 ;
+            .
+        repi.ucs_iso:0x232EF
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x232EF ] ;
+            .
 
 a.ucs:0x232E5
     a chisegg:abstract-character ;
@@ -28745,7 +29229,7 @@ a.ucs:0x232F3
     ] ;
     :eq rep.cns11643-7:0x473D     ; # &I-C7-473D;
     :eq rep.daikanwa:14236        ; # &I-M-14236;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x232F4        ] ;
     :subsume
@@ -28797,7 +29281,7 @@ a.ucs:0x232F4
     ] ;
     :eq rep.cns11643-7:0x473C     ; # &I-C7-473C;
     :eq rep.daikanwa:14237        ; # &I-M-14237;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x3B25         ] ;
     :subsume
@@ -28868,7 +29352,7 @@ a.ucs:0x66DD
     :eq rep.gt-pj-1:18296         ; # &I-GT-18029;
     :eq rep.daikanwa:14239        ; # &I-M-14239;
     :eq rep.shinjigen:3399        ; # 曝
-    :from.vulgar         [ :sources chisebib:jiyun ,
+    ideo:vulgar-form-of  [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x66B4         ,
                                     a.ucs:0x3B25         ] ;
@@ -29392,23 +29876,64 @@ a.ucs:0x232F8
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x232F8 ;
     ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x6B4E   # 歎
+    ] ;
+    .
+
+rep.ucs_iso:0x232F8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x232F8 ] ;
+    :denotation-of
+        a.ucs:0x232F8        ;
+    ideo:radical          72 ; # ⽇ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.jis-x0213-1_2004:0x4337   # &HD-FT-3D30;
+    ] ;
+    :eq rep.cns11643-7:0x473E     ; # &C7-473E;
+    :eq rep.daikanwa:14247        ; # &I-M-14247;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-5:0x756E ] ;
     :subsume
-        rep.cns11643-7:0x473E ,
-        rep.ucs_iso:0x232F8  ;
+        g2.cns11643-7:0x473E ,
+        g2.ucs_iso:0x232F8   ;
     .
     rep.cns11643-7:0x473E
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-7:0x473E ;
-        :eq rep.daikanwa:14247        ; # &I-M-14247;
+               :abstract-glyph-of     cns11643-7:0x473E  .
+    rep.daikanwa:14247
+               :abstract-glyph-of       daikanwa:14247   .
+    g2.cns11643-7:0x473E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x473E ;
+        :eq g2.ucs_cns:0x232F8        ; # &g2-M-14247;
+        :eq g2.daikanwa:14247         ; # &g2-M-14247;
+        :subsume
+            repi.daikanwa:14247  ,
+            repi.cns11643-7:0x473E ;
         .
-        rep.daikanwa:14247
-                   :abstract-glyph-of       daikanwa:14247   .
-    rep.ucs_iso:0x232F8
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x232F8 ] ;
+        g2.ucs_cns:0x232F8
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x232F8 ] .
+        g2.daikanwa:14247
+              :abstract-glyph-form-of       daikanwa:14247   .
+        repi.daikanwa:14247
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:14247 ;
+            .
+        repi.cns11643-7:0x473E
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x473E ;
+            .
+    g2.ucs_iso:0x232F8
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x232F8 ] ;
         .
 
 a.ucs:0x232F9
@@ -30455,49 +30980,129 @@ rep.adobe-japan1-4:14612
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x66EC  ] .
 
-rep.daikanwa:14267
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:14267 ;
-    :to.ucs		  a.ucs:0x3B2E ; # 㬮
-    ideo:radical          72 ; # ⽇ 
-    ideo:strokes          19 ;
-    ideo:total-strokes    23 ;
-    .
-
 a.ucs:0x3B2E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3B2E ;
-
-    :morohashi-daikanwa	  (14267 0 1) ;
     ideo:radical          72 ; # ⽇ 
-    ideo:strokes          19 ;
-    ideo:total-strokes    23 ;
-    :eq rep.cns11643-5:0x756E     ; # &I-C5-756E;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    a.ucs:0x96E3   # 難
+    ] ;
     .
-    rep.cns11643-5:0x756E
-               :abstract-glyph-of     cns11643-5:0x756E  .
 
-rep.daikanwa:14268
+rep.cns11643-5:0x756E
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:14268 ;
-    :to.ucs		  a.ucs:0x23316 ; # 𣌖
+    :abstract-glyph-of cns11643-5:0x756E ;
+    :denotation-of
+        a.ucs:0x3B2E         ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          19 ;
     ideo:total-strokes    23 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x65E5 ; # &A-compU+65E5;
+        isd:below    a.ucs:0xFA68   # 難
+    ] ;
+    :eq rep.ucs_unicode:0x3B2E    ; # &C5-756E;
+    :eq rep.daikanwa:14267        ; # &I-M-14267;
+    :subsume
+        g2.daikanwa:14267    ,
+        g2.ucs_unicode:0x3B2E ;
     .
+    rep.ucs_unicode:0x3B2E
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x3B2E  ] .
+    rep.daikanwa:14267
+               :abstract-glyph-of       daikanwa:14267   .
+    g2.daikanwa:14267
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14267 ;
+        .
+    g2.ucs_unicode:0x3B2E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3B2E  ] ;
+        :eq g2.cns11643-5:0x756E      ; # &g2-UU+3B2E;
+        :subsume
+            repi.cns11643-5:0x756E ,
+            repi.ucs_unicode:0x3B2E ;
+        .
+        g2.cns11643-5:0x756E
+              :abstract-glyph-form-of     cns11643-5:0x756E  .
+        repi.cns11643-5:0x756E
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x756E ;
+            .
+        repi.ucs_unicode:0x3B2E
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x3B2E  ] ;
+            .
 
 a.ucs:0x23316
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23316 ;
+    ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x96E3   # 難
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "daN" ) ;
+                         ] ;
+    .
 
-    :morohashi-daikanwa	  (14268 0 1) ;
+rep.ucs_iso:0x23316
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23316 ] ;
+    :denotation-of
+        a.ucs:0x23316        ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          19 ;
     ideo:total-strokes    23 ;
-    :eq rep.cns11643-7:0x5B5C     ; # &I-C7-5B5C;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0xFA68   # 難
+    ] ;
+    :eq rep.cns11643-7:0x5B5C     ; # &C7-5B5C;
+    :eq rep.daikanwa:14268        ; # &I-M-14268;
+    :form-of             [ :sources chisebib:jiyun ;
+                           :target  rep.cns11643-5:0x756E ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-5:0x756E ] ;
+    :subsume
+        g2.daikanwa:14268    ,
+        g2.ucs_iso:0x23316   ;
     .
     rep.cns11643-7:0x5B5C
                :abstract-glyph-of     cns11643-7:0x5B5C  .
+    rep.daikanwa:14268
+               :abstract-glyph-of       daikanwa:14268   .
+    g2.daikanwa:14268
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14268 ;
+        .
+    g2.ucs_iso:0x23316
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23316 ] ;
+        :eq g2.cns11643-7:0x5B5C      ; # &g2-IU-00023316;
+        :subsume
+            repi.cns11643-7:0x5B5C ,
+            repi.ucs_iso:0x23316 ;
+        .
+        g2.cns11643-7:0x5B5C
+              :abstract-glyph-form-of     cns11643-7:0x5B5C  .
+        repi.cns11643-7:0x5B5C
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x5B5C ;
+            .
+        repi.ucs_iso:0x23316
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23316 ] ;
+            .
 
 rep.daikanwa:14269
     a chisegg:abstract-glyph ;