Sync up with the current environment.
[chise/chiset.git] / Ideograph-R072-Sun.ttl
index f11097f..9719e61 100644 (file)
@@ -15,7 +15,9 @@
 @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=> .
 @prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
 @prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
@@ -29,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=> .
 @prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
 @prefix rep.cns11643-7: <http://www.chise.org/est/view/character/rep.cns11643-7=> .
 @prefix g2.cns11643-7: <http://www.chise.org/est/view/character/g2.cns11643-7=> .
+@prefix repi.cns11643-7: <http://www.chise.org/est/view/character/repi.cns11643-7=> .
 @prefix rep.jis-x0213-1_2000: <http://www.chise.org/est/view/character/rep.jis-x0213-1@2000=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
 @prefix g2.jis-x0213-1: <http://www.chise.org/est/view/character/g2.jis-x0213-1=> .
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
+@prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
 @prefix rep.hanyo-denshi...jb: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jb=> .
 @prefix rep.hanyo-denshi...jc: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jc=> .
 @prefix rep.gt-pj-3: <http://www.chise.org/est/view/character/rep.gt-pj-3=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...._.p: <http://www.chise.org/est/view/character/rep.daikanwa...+p=> .
 @prefix rep.daikanwa...ho: <http://www.chise.org/est/view/character/rep.daikanwa...ho=> .
 @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 rep.ucs-bmp-var-003: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-003=> .
+@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=> .
 @prefix g2.ucs-itaiji-002: <http://www.chise.org/est/view/character/g2.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
 @prefix g2.ucs-itaiji-003: <http://www.chise.org/est/view/character/g2.ucs-itaiji-003=> .
+@prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @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-bmp-var-003: <http://rdf.chise.org/data/ccs/ucs-bmp-var-003/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/> .
+@prefix ucs-itaiji-004: <http://rdf.chise.org/data/ccs/ucs-itaiji-004/code-point/> .
 
 a.ucs_component:0x65E5
     a chisegg:abstract-character ;
@@ -288,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    .
@@ -388,14 +399,14 @@ a.ucs:0x65E5
     a.jis-x0208:0x467C
         a chisegg:abstract-character ;
         :abstract-character-of jis-x0208:0x467C ;
-        :eq g.ucs_unicode:0x65E5      ; # &G-AJ1-03284;
-        :eq g.mj:013151               ; # &G-AJ1-03284;
-        :eq g.adobe-japan1-0:03284    ; # &G-AJ1-03284;
-        :eq g.jis-x0208:0x467C        ; # &G-AJ1-03284;
-        :eq g.cns11643-1:0x454A       ; # &G-AJ1-03284;
-        :eq g.jis-x0213-1:0x467C      ; # &G-AJ1-03284;
-        :eq g.gt:17359                ; # &G-AJ1-03284;
-        :eq g.gt-k:00473              ; # &G-AJ1-03284;
+        :eq g.ucs_unicode:0x65E5      ; # &G-MJ013151;
+        :eq g.mj:013151               ; # &G-MJ013151;
+        :eq g.adobe-japan1-0:03284    ; # &G-MJ013151;
+        :eq g.jis-x0208:0x467C        ; # &G-MJ013151;
+        :eq g.cns11643-1:0x454A       ; # &G-MJ013151;
+        :eq g.jis-x0213-1:0x467C      ; # &G-MJ013151;
+        :eq g.gt:17359                ; # &G-MJ013151;
+        :eq g.gt-k:00473              ; # &G-MJ013151;
         :subsume
             g2.mj:013151         ;
         .
@@ -517,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 ;
@@ -611,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   .
@@ -1309,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
@@ -1684,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    ;
@@ -1695,18 +1732,18 @@ rep.daikanwa:13760
     g2.daikanwa:13760
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:13760 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013152 ; # &g2-MJ013152;
-        isd:right    g2.mj:007744   # &g2-MJ007744;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013152 ; # &g2-MJ013152;
+            isd:right    g2.mj:007744   # &g2-MJ007744;
+        ] ;
         .
     g2.shinjigen:5201
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of shinjigen:5201 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.mj:007744   # &g2-MJ007744;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.mj:007744   # &g2-MJ007744;
+        ] ;
         .
 
 rep.cns11643-2:0x243B
@@ -2075,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 ,
@@ -2171,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
@@ -2202,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 ;
@@ -2221,10 +2258,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    ;
@@ -2234,19 +2271,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;
@@ -2342,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 ;
@@ -2360,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       ;
@@ -2383,21 +2468,21 @@ rep.ucs-itaiji-002:0x81FD
     g2.gt-k:03616
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt-k:03616 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gt-k:00089 ; # &GT-K00089;
-        isd:below    a.ucs:0x65E7   # 旧
-    ] ;
-        :eq g2.ucs-itaiji-002:0x81FD  ; # &g2-GT-K03616;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt-k:00089 ; # &GT-K00089;
+            isd:below    a.ucs:0x65E7   # 旧
+        ] ;
+        :eq g2.ucs-itaiji-002:0x81FD  ; # &g2-U-i002+81FD;
         .
         g2.ucs-itaiji-002:0x81FD
               :abstract-glyph-form-of ucs-itaiji-002:0x81FD  .
     rep.gt-k:03318
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt-k:03318 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x2E88 ; # ⺈
-        isd:below    a.ucs:0x65E7   # 旧
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x2E88 ; # ⺈
+            isd:below    a.ucs:0x65E7   # 旧
+        ] ;
         :eq rep.gt-pj-k1:13693        ; # &GT-K03318;
         :subsume
             g2.gt-k:03318        ;
@@ -2407,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  .
@@ -2786,16 +2871,16 @@ a.ucs:0x65FE
     rep.adobe-japan1-6:21697
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-6:21697 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:03246 ; # &AJ1-03246;
-        isd:below    a.ucs:0x65E5   # 日
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:03246 ; # &AJ1-03246;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq rep.ucs_jis:0x65FE        ; # &AJ1-21697;
         :eq rep.jis-x0212:0x4173      ; # &I-JSP-4173;
         :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    ,
@@ -2844,10 +2929,10 @@ a.ucs:0x65FE
     rep.cns11643-3:0x2943
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-3:0x2943 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.cns11643-1:0x453A ; # &C1-453A;
-        isd:below    a.ucs:0x65E5   # 日
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.cns11643-1:0x453A ; # &C1-453A;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq rep.ucs_unicode:0x65FE    ; # &C3-2943;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :subsume
@@ -3429,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 ;
@@ -3508,10 +3653,10 @@ a.ucs:0x6604
     g2.daikanwa:13789
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:13789 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013152 ; # &g2-MJ013152;
-        isd:right    g2.adobe-japan1-0:03411   # &g2-AJ1-03411;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013152 ; # &g2-MJ013152;
+            isd:right    g2.adobe-japan1-0:03411   # &g2-AJ1-03411;
+        ] ;
         .
     g2.adobe-japan1-5:17734
         a chisegg:abstract-glyph-form ;
@@ -3519,10 +3664,10 @@ a.ucs:0x6604
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x6604         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.adobe-japan1-0:03411   # &g2-AJ1-03411;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.adobe-japan1-0:03411   # &g2-AJ1-03411;
+        ] ;
         :eq g2.ucs_cns:0x6604         ; # &g2-AJ1-17734;
         :eq g2.ucs_jis:0x6604         ; # &g2-AJ1-17734;
         :eq g2.jis-x0212:0x4176       ; # &g2-AJ1-17734;
@@ -3572,10 +3717,10 @@ a.ucs:0x6604
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x6604  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.ucs_unicode:0x53CD   # &g2-GT-K00476;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.ucs_unicode:0x53CD   # &g2-GT-K00476;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -4133,10 +4278,10 @@ rep.ucs_unicode:0x6608
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x6608  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    a.ucs:0x6237   # 户
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    a.ucs:0x6237   # 户
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -4455,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   # 日
     ] ;
     .
@@ -4477,33 +4622,33 @@ rep.ucs_unicode:0x660B
     :eq rep.daikanwa:13800        ; # &M-13800;
     :eq rep.jef-china3:0x51B1     ; # &I-JC3-51B1;
     :subsume
-        g2.ucs_unicode:0x660B ,
+        g.ucs_unicode:0x660B ,
         g2.jef-china3:0x51B1 ;
     .
     rep.daikanwa:13800
                :abstract-glyph-of       daikanwa:13800   .
     rep.jef-china3:0x51B1
                :abstract-glyph-of     jef-china3:0x51B1  .
-    g2.ucs_unicode:0x660B
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x660B  ] ;
-        :g2.ucs_JP...hanazono      rdf:nil ;
-        :eq g2.daikanwa:13800         ; # &g2-M-13800;
+    g.ucs_unicode:0x660B
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:unicode ;
+                             :target     ucs:0x660B  ] ;
+        :eq g.daikanwa:13800          ; # &G-UU+660B;
         :subsume
-            repi.daikanwa:13800  ,
-            repi.ucs_unicode:0x660B ;
+            g2.daikanwa:13800    ,
+            g2.ucs_unicode:0x660B ;
         .
+        g.daikanwa:13800
+                   :detailed-glyph-of       daikanwa:13800   .
         g2.daikanwa:13800
-              :abstract-glyph-form-of       daikanwa:13800   .
-        repi.daikanwa:13800
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:13800 ;
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of daikanwa:13800 ;
             .
-        repi.ucs_unicode:0x660B
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x660B  ] ;
+        g2.ucs_unicode:0x660B
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x660B  ] ;
+            :g2.ucs_JP...hanazono      rdf:nil ;
             .
     g2.jef-china3:0x51B1
         a chisegg:abstract-glyph-form ;
@@ -4902,10 +5047,10 @@ a.ucs:0x660E
     rep.gt:17473
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:17473 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.mj:013519   # &MJ013519;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.mj:013519   # &MJ013519;
+        ] ;
         :eq rep.gt-k:04329            ; # &I-GT-K04329;
         :eq rep.gt-pj-9:19289         ; # &GT-17473;
         :eq rep.shinjigen:3292        ; # &GT-17473;
@@ -4925,10 +5070,10 @@ a.ucs:0x660E
         g2.daikanwa:13805
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of daikanwa:13805 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013152 ; # &g2-MJ013152;
-        isd:right    g2.mj:013519   # &g2-MJ013519;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     g2.mj:013152 ; # &g2-MJ013152;
+                isd:right    g2.mj:013519   # &g2-MJ013519;
+            ] ;
             .
         g2.adobe-japan1-4:14052
             a chisegg:abstract-glyph-form ;
@@ -4936,10 +5081,10 @@ a.ucs:0x660E
             :rep.decomposition   [ :context domain:hanyo-denshi ;
                                    :target  a.ucs:0x660E         ,
                                             a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.mj:013519   # &g2-MJ013519;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     g2.mj:013151 ; # &g2-MJ013151;
+                isd:right    g2.mj:013519   # &g2-MJ013519;
+            ] ;
             :eq g2.hanyo-denshi...jt:0xB27F ; # &g2-AJ1-14052;
             :eq g2.gt:17473               ; # &g2-AJ1-14052;
             :eq g2.gt-k:04329             ; # &g2-AJ1-14052;
@@ -4995,10 +5140,10 @@ a.ucs:0x660E
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x660E         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.mj:013520   # &g2-MJ013520;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.mj:013520   # &g2-MJ013520;
+        ] ;
         :eq g2.adobe-japan1-0:03788   ; # &g2-AJ1-03788;
         :eq g2.gb2312:0x4377          ; # &g2-AJ1-03788;
         :eq g2.ks-x1001:0x5925        ; # &g2-AJ1-03788;
@@ -5727,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 ;
@@ -6495,10 +6655,10 @@ o.ucs_unicode:0x661D
     rep.gb2312:0x6A43
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gb2312:0x6A43 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.gb2312:0x3426 ; # &G0-3426;
-        isd:below    a.ucs:0x65E5   # 日
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gb2312:0x3426 ; # &G0-3426;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         :eq rep.ucs_unicode:0x661D    ; # &G0-6A43;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :subsume
@@ -6519,10 +6679,10 @@ o.ucs_unicode:0x661D
     rep.ucs-var-001:0x661D
         a chisegg:abstract-glyph ;
         :abstract-glyph-of ucs-var-001:0x661D ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs-var-002:0x5904 ; # &U-v002+5904;
-        isd:below    a.ucs:0x65E5   # 日
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.ucs-var-002:0x5904 ; # &U-v002+5904;
+            isd:below    a.ucs:0x65E5   # 日
+        ] ;
         .
 
 a.ucs:0x661E
@@ -6542,10 +6702,10 @@ a.ucs:0x661E
     rep.adobe-japan1-2:08476
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-2:08476 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.mj:006328   # &MJ006328;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.mj:006328   # &MJ006328;
+        ] ;
         :eq rep.ucs_jis...1990:0x661E ; # &AJ1-08476;
         :eq rep.jis-x0212:0x4221      ; # &I-JSP-4221;
         :eq rep.hanyo-denshi...jb:0x4221 ; # &I-HD-JB-4221;
@@ -6604,10 +6764,10 @@ a.ucs:0x661E
     rep.adobe-japan1-5:20304
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-5:20304 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.mj:006327   # &MJ006327;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.mj:006327   # &MJ006327;
+        ] ;
         :eq rep.ucs_unicode:0x661E    ; # &AJ1-20304;
         :eq rep.ks-x1001:0x5C35       ; # &I-K0-5C35;
         :eq rep.cns11643-3:0x2D23     ; # &I-C3-2D23;
@@ -6640,10 +6800,10 @@ a.ucs:0x661E
             :rep.decomposition   [ :context domain:hanyo-denshi ;
                                    :target  a.ucs:0x661E         ,
                                             a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.jef-china3:0x41A2   # &JC3-41A2;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x65E5 ; # 日
+                isd:right    rep.jef-china3:0x41A2   # &JC3-41A2;
+            ] ;
             :eq g2.ucs_jis...2000:0x661E  ; # &g2-AJ1-20304;
             :eq g2.ucs_jis...2004:0x661E  ; # &g2-AJ1-20304;
             :eq g2.jis-x0213-1:0x752F     ; # &g2-AJ1-20304;
@@ -6685,10 +6845,10 @@ a.ucs:0x661E
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of [ :context domain:unicode ;
                                       :target     ucs:0x661E  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.mj:006327   # &g2-MJ006327;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x65E5 ; # 日
+                isd:right    g2.mj:006327   # &g2-MJ006327;
+            ] ;
             :g2.ucs_JP...hanazono      rdf:nil ;
             :eq g2.ks-x1001:0x5C35        ; # &g2-K0-5C35;
             :eq g2.cns11643-3:0x2D23      ; # &g2-K0-5C35;
@@ -7445,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 ,
@@ -7455,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;
@@ -7561,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;
@@ -8465,11 +8637,19 @@ rep.cns11643-4:0x2965
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
-    :eq rep.daikanwa:13861        ; # &C4-2965;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.adobe-japan1-5:17344   # &AJ1-17344;
+    ] ;
+    :eq rep.ucs_cns:0x3ADF        ; # &C4-2965;
+    :eq rep.daikanwa:13861        ; # &I-M-13861;
     :subsume
         g2.daikanwa:13861    ,
         g2.cns11643-4:0x2965 ;
     .
+    rep.ucs_cns:0x3ADF
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x3ADF  ] .
     rep.daikanwa:13861
                :abstract-glyph-of       daikanwa:13861   .
     g2.daikanwa:13861
@@ -8494,6 +8674,10 @@ rep.ucs_unicode:0x3ADF
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           5 ;
     ideo:total-strokes     9 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.ucs-var-001:0x3563   # &U-v001+3563;
+    ] ;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
         g2.ucs_unicode:0x3ADF ;
@@ -9146,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 ;
@@ -9161,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
@@ -9461,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 ] ;
@@ -9502,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 ,
@@ -9530,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
@@ -9658,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 ;
     .
@@ -9731,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 ;
@@ -10383,10 +10623,10 @@ a.ucs:0x6648
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x6648         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.gt:00389   # &g2-AJ1-13439;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.gt:00389   # &g2-AJ1-13439;
+        ] ;
         :eq g2.ucs_jis:0x6648         ; # &g2-AJ1-16887;
         :eq g2.jis-x0213-1:0x7538     ; # &g2-AJ1-16887;
         :eq g2.daikanwa:13897         ; # &g2-AJ1-16887;
@@ -10429,10 +10669,10 @@ a.ucs:0x6648
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x6648  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.mj:006467   # &g2-MJ006467;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.mj:006467   # &g2-MJ006467;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-3:0x3149      ; # &g2-UU+6648;
         :eq g2.jef-china3:0x51D0      ; # &g2-UU+6648;
@@ -10466,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    .
@@ -10650,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   .
@@ -11503,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
@@ -11826,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 ;
@@ -12444,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
@@ -13150,10 +13409,10 @@ a.ucs:0x6660
         :abstract-glyph-of adobe-japan1-6:21713 ;
         ideo:strokes           7 ;
         ideo:total-strokes    11 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    a.ucs:0x2F8B2   # 成
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    a.ucs:0x2F8B2   # 成
+        ] ;
         :eq rep.ucs_jis:0x6660        ; # &AJ1-21713;
         :eq rep.jis-x0212:0x423D      ; # &I-JSP-423D;
         :eq rep.daikanwa:13951        ; # &I-M-13951;
@@ -13199,10 +13458,10 @@ a.ucs:0x6660
         :abstract-glyph-of cns11643-3:0x314B ;
         ideo:strokes           6 ;
         ideo:total-strokes    10 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.adobe-japan1-0:02642   # &AJ1-02642;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.adobe-japan1-0:02642   # &AJ1-02642;
+        ] ;
         :eq rep.ucs_unicode:0x6660    ; # &C3-314B;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :subsume
@@ -13340,6 +13599,10 @@ a.ucs:0x231BA
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x8096   # 肖
+    ] ;
     .
 
 rep.daikanwa:13955
@@ -13350,7 +13613,17 @@ rep.daikanwa:13955
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.gt:37890   # &GT-37890;
+    ] ;
+    :subsume
+        g2.daikanwa:13955    ;
     .
+    g2.daikanwa:13955
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:13955 ;
+        .
 
 rep.ucs_iso:0x231BA
     a chisegg:abstract-glyph ;
@@ -13361,6 +13634,10 @@ rep.ucs_iso:0x231BA
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           7 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.mj:020928   # &MJ020928;
+    ] ;
     :eq rep.cns11643-6:0x4050     ; # &C6-4050;
     :subsume
         g2.ucs_iso:0x231BA   ,
@@ -13726,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 ;
     .
@@ -14075,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
@@ -14240,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   # 𮝾
     ] ;
     .
 
@@ -14480,11 +14761,43 @@ a.ucs:0x231E2
     rep.cns11643-5:0x3274
                :abstract-glyph-of     cns11643-5:0x3274  .
 
-rep.ucs_iso:0x2C037
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of [ :context domain:iso     ;
-                         :target     ucs:0x2C037 ] ;
-    :denotation-of
+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     ;
+                         :target     ucs:0x2C037 ] ;
+    :denotation-of
         a.ucs:0x2C037        ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           7 ;
@@ -14923,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 ,
@@ -15115,10 +15436,10 @@ a.ucs:0x666F
     g2.daikanwa:13983
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:13983 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013152 ; # &g2-MJ013152;
-        isd:below    g2.ucs_unicode:0x4EAC   # &g2-AJ1-01688;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013152 ; # &g2-MJ013152;
+            isd:below    g2.ucs_unicode:0x4EAC   # &g2-AJ1-01688;
+        ] ;
         .
     g2.ucs_unicode:0x666F
         a chisegg:abstract-glyph-form ;
@@ -15127,10 +15448,10 @@ a.ucs:0x666F
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x666F         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013151 ; # &g2-MJ013151;
-        isd:below    g2.ucs_unicode:0x4EAC   # &g2-AJ1-01688;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013151 ; # &g2-MJ013151;
+            isd:below    g2.ucs_unicode:0x4EAC   # &g2-AJ1-01688;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.adobe-japan1-0:01824   ; # &g2-AJ1-01824;
         :eq g2.gb2312:0x3E30          ; # &g2-AJ1-01824;
@@ -15757,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;
@@ -16100,10 +16421,10 @@ o.ucs_unicode:0x6677
     rep.adobe-japan1-4:14609
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-4:14609 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    rep.cbeta:04799   # &CB04799;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    rep.cbeta:04799   # &CB04799;
+        ] ;
         :eq rep.ucs_jis...1990:0x6677 ; # &AJ1-14609;
         :eq rep.ucs_ks:0x6677         ; # &AJ1-14609;
         :eq rep.ks-x1001:0x4F7C       ; # &I-K0-4F7C;
@@ -16185,10 +16506,10 @@ o.ucs_unicode:0x6677
     rep.mj:013318
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:013318 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    rep.gb2312:0x3E4C   # &G0-3E4C;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    rep.gb2312:0x3E4C   # &G0-3E4C;
+        ] ;
         :eq rep.ucs_unicode:0x6677    ; # &MJ013318;
         :rep.ucs_JP...hanazono     rdf:nil ;
         :eq rep.gb2312:0x6A50         ; # &I-G0-6A50;
@@ -16426,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 ;
@@ -16440,19 +16761,19 @@ a.ucs:0x3AFA
     g2.daikanwa:14008
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14008 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-4:0x2535 ; # &g2-CU+2020C;
-        isd:below    g2.mj:013152   # &g2-MJ013152;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-4:0x2535 ; # &g2-CU+2020C;
+            isd:below    g2.mj:013152   # &g2-MJ013152;
+        ] ;
         .
     g2.ucs_unicode:0x3AFA
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3AFA  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-4:0x2535 ; # &g2-CU+2020C;
-        isd:below    g2.mj:013151   # &g2-MJ013151;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-4:0x2535 ; # &g2-CU+2020C;
+            isd:below    g2.mj:013151   # &g2-MJ013151;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-3:0x3C27      ; # &g2-UU+3AFA;
         :subsume
@@ -17080,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 ;
@@ -17272,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 ;
     .
@@ -17384,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          ,
@@ -17511,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 ;
     .
@@ -17740,10 +18117,10 @@ a.ucs:0x6683
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x6683         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    g2.cns11643-1:0x4F66   # &g2-CU+975E;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    g2.cns11643-1:0x4F66   # &g2-CU+975E;
+        ] ;
         :eq g2.ucs_jis:0x6683         ; # &g2-AJ1-05112;
         :eq g2.jis-x0208:0x5A73       ; # &g2-AJ1-05112;
         :eq g2.jis-x0213-1:0x5A73     ; # &g2-AJ1-05112;
@@ -17781,10 +18158,10 @@ a.ucs:0x6683
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x6683  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    g2.ucs_unicode:0x975E   # &g2-UU+975E;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    g2.ucs_unicode:0x975E   # &g2-UU+975E;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -17800,6 +18177,33 @@ a.ucs:0x231FB
     rep.cns11643-6:0x4977
                :abstract-glyph-of     cns11643-6:0x4977  .
 
+rep.gt-k:09590
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:09590 ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x65E5 ; # 日
+        isd:middle   a.ucs:0x51FA ; # 出
+        isd:below    a.ucs:0x5927   # 大
+    ] ;
+    :eq rep.gt-pj-k1:15172        ; # &GT-K09590;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x66D3         ] ;
+    :subsume
+        g2.gt-k:09590        ;
+    .
+    rep.gt-pj-k1:15172
+               :abstract-glyph-of       gt-pj-k1:15172   .
+    g2.gt-k:09590
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:09590 ;
+        :eq g2.gt-pj-k1:15172         ; # &g2-GT-K09590;
+        .
+        g2.gt-pj-k1:15172
+              :abstract-glyph-form-of       gt-pj-k1:15172   .
+
 a.ucs:0x3B01
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3B01 ;
@@ -18370,17 +18774,68 @@ a.ucs:0x23225
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.jis-x0208:0x5141   # &J97-5141;
+    ] ;
+    .
+
+a.mj:037742
+    a chisegg:abstract-character ;
+    :abstract-character-of mj:037742 ;
+    :denotation-of
+        a.ucs:0x23225        ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x516A   # 兪
+    ] ;
     .
 
-rep.daikanwa:14042
+rep.mj:037742
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:14042 ;
+    :abstract-glyph-of mj:037742 ;
     :denotation-of
-        a.ucs:0x23225        ;
+        a.mj:037742          ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.adobe-japan1-0:04216   # &AJ1-04216;
+    ] ;
+    :eq rep.koseki:158240         ; # &MJ037742;
+    :eq rep.daikanwa:14042        ; # &I-M-14042;
+    :subsume
+        g2.mj:037742         ;
     .
+    rep.koseki:158240
+               :abstract-glyph-of         koseki:158240  .
+    rep.daikanwa:14042
+               :abstract-glyph-of       daikanwa:14042   .
+    g2.mj:037742
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:037742 ;
+        :eq g2.koseki:158240          ; # &g2-MJ037742;
+        :eq g2.daikanwa:14042         ; # &g2-MJ037742;
+        :subsume
+            repi.daikanwa:14042  ,
+            repi.mj:037742       ;
+        .
+        g2.koseki:158240
+              :abstract-glyph-form-of         koseki:158240  .
+        g2.daikanwa:14042
+              :abstract-glyph-form-of       daikanwa:14042   .
+        repi.daikanwa:14042
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:14042 ;
+            .
+        repi.mj:037742
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:037742 ;
+            .
 
 rep.ucs_iso:0x23225
     a chisegg:abstract-glyph ;
@@ -18391,6 +18846,29 @@ rep.ucs_iso:0x23225
     ideo:radical          72 ; # ⽇ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x4FDE   # 俞
+    ] ;
+    :eq a.ucs_iso:0x23225         ; # &A-IU+23225;
+    .
+    a.ucs_iso:0x23225
+           :abstract-character-of [ :context domain:iso     ;
+                                    :target     ucs:0x23225 ] .
+
+rep.ucs_iso:0x23225
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23225 ] ;
+    :denotation-of
+        rep.ucs_iso:0x23225  ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.cns11643-1:0x4F7E   # &C1-4F7E;
+    ] ;
     :eq rep.cns11643-5:0x3F63     ; # &C5-3F63;
     :subsume
         g2.ucs_iso:0x23225   ,
@@ -18641,10 +19119,10 @@ rep.hanyo-denshi...ks:158300
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x668E         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.mj:021701   # &g2-MJ021701;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.mj:021701   # &g2-MJ021701;
+        ] ;
         :eq g2.daikanwa:14048         ; # &g2-HD-KS-158300;
         :subsume
             repi.daikanwa:14048  ,
@@ -18666,10 +19144,10 @@ rep.hanyo-denshi...ks:158300
     g2.cns11643-3:0x415B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x415B ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.cns11643-1:0x5341   # &g2-CU+82F1;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.cns11643-1:0x5341   # &g2-CU+82F1;
+        ] ;
         :eq g2.ucs_cns:0x668E         ; # &g2-CU+668E;
         .
         g2.ucs_cns:0x668E
@@ -19205,10 +19683,10 @@ rep.daikanwa:14056
     g2.daikanwa:14056
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14056 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8CBF ; # &CDP-8CBF;
-        isd:below    g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.big5-cdp:0x8CBF ; # &CDP-8CBF;
+            isd:below    g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
+        ] ;
         .
 
 rep.cns11643-3:0x415A
@@ -19235,11 +19713,11 @@ rep.cns11643-3:0x415A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3B05  ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:middle   g2.ucs_unicode:0x2EAB ; # &g2-UU+2EAB;
-        isd:below    g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:middle   g2.ucs_unicode:0x2EAB ; # &g2-UU+2EAB;
+            isd:below    g2.ucs_unicode:0x65B9   # &g2-AJ1-03661;
+        ] ;
         :eq g2.cns11643-3:0x415A      ; # &g2-UU+3B05;
         :subsume
             repi.cns11643-3:0x415A ,
@@ -19369,10 +19847,10 @@ rep.ucs_unicode:0x3B07
     g2.daikanwa:14060
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14060 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.adobe-japan1-0:04551   # &AJ1-04551;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.adobe-japan1-0:04551   # &AJ1-04551;
+        ] ;
         :eq g2.ucs_JP:0x3B07          ; # &g2-M-14060;
         :eq g2.cbeta:06254            ; # &g2-M-14060;
         :subsume
@@ -20238,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  .
@@ -20544,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 ;
+    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
-        rep.adobe-japan1-6:21720 ,
-        rep.cns11643-3:0x4735 ;
+        g.ucs_unicode:0x669C ,
+        g.ucs_cns:0x669C     ;
     .
-    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 ] ;
+    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 ;
@@ -20616,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 ;
@@ -20979,10 +21481,10 @@ rep.adobe-japan1-2:08484
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66A0         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    g2.ucs_unicode:0x9AD8   # &g2-AJ1-02036;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    g2.ucs_unicode:0x9AD8   # &g2-AJ1-02036;
+        ] ;
         :eq g2.adobe-japan1-2:08484   ; # &g2-AJ1-08484;
         :eq g2.ks-x1001:0x4D3C        ; # &g2-AJ1-08484;
         :eq g2.jis-x0212:0x4257       ; # &g2-AJ1-08484;
@@ -21080,10 +21582,10 @@ o.hanyo-denshi...jt:0xB2BA
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66A0         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    g2.ucs_unicode:0x9AD9   # &g2-AJ1-08705;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    g2.ucs_unicode:0x9AD9   # &g2-AJ1-08705;
+        ] ;
         :subsume
             repi.hanyo-denshi...jt:0xB2BA ;
         .
@@ -21181,6 +21683,10 @@ a.ucs:0x66A1
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x7FC1   # 翁
+    ] ;
     :eq a.big5:0xE1F6             ; # &I-B-E1F6;
     .
     a.big5:0xE1F6
@@ -21194,7 +21700,17 @@ rep.daikanwa:14094
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.gt:36863   # &GT-36863;
+    ] ;
+    :subsume
+        g2.daikanwa:14094    ;
     .
+    g2.daikanwa:14094
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14094 ;
+        .
 
 rep.cns11643-2:0x4A5D
     a chisegg:abstract-glyph ;
@@ -21204,6 +21720,10 @@ rep.cns11643-2:0x4A5D
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.mj:020660   # &MJ020660;
+    ] ;
     :eq rep.ucs_unicode:0x66A1    ; # &C2-4A5D;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
@@ -21419,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 ;
@@ -21466,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    ,
@@ -21488,18 +22057,18 @@ a.ucs:0x3B0E
     g2.daikanwa:14099
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14099 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013152 ; # &g2-MJ013152;
-        isd:below    g2.daikanwa:27325   # &g2-M-27325;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013152 ; # &g2-MJ013152;
+            isd:below    g2.daikanwa:27325   # &g2-M-27325;
+        ] ;
         .
     g2.adobe-japan1-5:17752
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of adobe-japan1-5:17752 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013151 ; # &g2-MJ013151;
-        isd:below    g2.big5-cdp:0x8CE2   # &g2-CDP-8CE2;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013151 ; # &g2-MJ013151;
+            isd:below    g2.big5-cdp:0x8CE2   # &g2-CDP-8CE2;
+        ] ;
         :eq g2.ucs_cns:0x3B0E         ; # &g2-AJ1-17752;
         :eq g2.ucs_jis:0x3B0E         ; # &g2-AJ1-17752;
         :eq g2.cns11643-4:0x436E      ; # &g2-AJ1-17752;
@@ -21774,10 +22343,10 @@ rep.ucs_iso:0x2325C
     g2.daikanwa:14104
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14104 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.adobe-japan1-0:02164   # &g2-AJ1-02164;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.adobe-japan1-0:02164   # &g2-AJ1-02164;
+        ] ;
         :eq g2.cbeta:02842            ; # &g2-M-14104;
         :subsume
             repi.daikanwa:14104  ,
@@ -21797,10 +22366,10 @@ rep.ucs_iso:0x2325C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2325C ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x6BBA   # &g2-UU+6BBA;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x6BBA   # &g2-UU+6BBA;
+        ] ;
         .
 
 rep.cns11643-5:0x4D4E
@@ -21982,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 ;
@@ -22258,6 +22827,10 @@ rep.ucs_iso:0x2327D
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.jis-x0213-2:0x726E   # &JX2-726E;
+    ] ;
     :eq rep.daikanwa:14116        ; # &M-14116;
     :subsume
         g2.daikanwa:14116    ,
@@ -22283,9 +22856,17 @@ rep.cns11643-7:0x235B
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.cns11643-2:0x3766   # &C2-3766;
+    ] ;
+    :eq rep.ucs_cns:0x2327D       ; # &C7-235B;
     :subsume
         g2.cns11643-7:0x235B ;
     .
+    rep.ucs_cns:0x2327D
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x2327D ] .
     g2.cns11643-7:0x235B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-7:0x235B ;
@@ -22324,6 +22905,10 @@ a.ucs:0x3B14
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x7FCF   # 翏
+    ] ;
     .
 
 rep.daikanwa:14118
@@ -22334,7 +22919,17 @@ rep.daikanwa:14118
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.adobe-japan1-5:18400   # &AJ1-18400;
+    ] ;
+    :subsume
+        g2.daikanwa:14118    ;
     .
+    g2.daikanwa:14118
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14118 ;
+        .
 
 rep.cns11643-3:0x4C42
     a chisegg:abstract-glyph ;
@@ -22344,6 +22939,10 @@ rep.cns11643-3:0x4C42
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.cns11643-2:0x3841   # &C2-3841;
+    ] ;
     :eq rep.ucs_unicode:0x3B14    ; # &C3-4C42;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
@@ -22724,11 +23323,19 @@ rep.cns11643-3:0x4C45
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :eq rep.daikanwa:14124        ; # &C3-4C45;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0xFA1A   # 祥
+    ] ;
+    :eq rep.ucs_cns:0x3B15        ; # &C3-4C45;
+    :eq rep.daikanwa:14124        ; # &I-M-14124;
     :subsume
         g2.daikanwa:14124    ,
         g2.cns11643-3:0x4C45 ;
     .
+    rep.ucs_cns:0x3B15
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x3B15  ] .
     rep.daikanwa:14124
                :abstract-glyph-of       daikanwa:14124   .
     g2.daikanwa:14124
@@ -22753,6 +23360,10 @@ rep.ucs_unicode:0x3B15
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.adobe-japan1-0:02485   # &AJ1-02485;
+    ] ;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
         g2.ucs_unicode:0x3B15 ;
@@ -22968,7 +23579,11 @@ a.ucs:0x66AF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x66AF ;
     ideo:radical          72 ; # ⽇ 
-    :eq a.big5:0xE5C9             ; # &I-B-E5C9;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x83AB   # 莫
+    ] ;
+    :eq a.big5:0xE5C9             ; # &I-B-E5C9;
     .
     a.big5:0xE5C9
            :abstract-character-of           big5:0xE5C9  .
@@ -22981,8 +23596,12 @@ rep.cns11643-2:0x5070
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.cns11643-1:0x5C7B   # &C1-5C7B;
+    ] ;
     :eq rep.ucs_cns:0x66AF        ; # &C2-5070;
-    :eq rep.daikanwa:14129        ; # &C2-5070;
+    :eq rep.daikanwa:14129        ; # &I-M-14129;
     :subsume
         g2.daikanwa:14129    ,
         g2.cns11643-2:0x5070 ;
@@ -23014,6 +23633,10 @@ rep.ucs_unicode:0x66AF
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    rep.mj:022034   # &MJ022034;
+    ] ;
     :subsume
         g2.ucs_unicode:0x66AF ;
     .
@@ -23085,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         ] ;
     .
@@ -23106,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  .
@@ -23443,10 +24066,10 @@ rep.ucs_unicode:0x66B3
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66B3  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.ucs_unicode:0x5F57   # &g2-UU+5F57;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.ucs_unicode:0x5F57   # &g2-UU+5F57;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -24802,10 +25425,10 @@ rep.ucs_iso:0x2329F
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2329F ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.adobe-japan1-0:01526   # &g2-AJ1-01526;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.adobe-japan1-0:01526   # &g2-AJ1-01526;
+        ] ;
         :eq g2.cns11643-5:0x546B      ; # &g2-M-14161;
         :eq g2.daikanwa:14161         ; # &g2-M-14161;
         :eq g2.cbeta:02528            ; # &g2-M-14161;
@@ -24901,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 ;
@@ -25031,10 +25654,10 @@ rep.adobe-japan1-0:05119
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66C1         ,
                                         a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x65E3 ; # &g2-M-13724;
-        isd:below    a.ucs:0x65E6   # 旦
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x65E3 ; # &g2-M-13724;
+            isd:below    a.ucs:0x65E6   # 旦
+        ] ;
         :eq g2.ucs_jis:0x66C1         ; # &g2-AJ1-05119;
         :eq g2.jis-x0208:0x5A7A       ; # &g2-AJ1-05119;
         :eq g2.jis-x0213-1:0x5A7A     ; # &g2-AJ1-05119;
@@ -25122,10 +25745,10 @@ rep.adobe-japan1-0:07992
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x66C1         ,
                                         a.ucs:0xE0104        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.daikanwa:13725 ; # &g2-M-13725;
-        isd:below    a.ucs:0x65E6   # 旦
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.daikanwa:13725 ; # &g2-M-13725;
+            isd:below    a.ucs:0x65E6   # 旦
+        ] ;
         :eq g2.hanyo-denshi...jt:0xB2BE ; # &g2-AJ1-07992;
         :subsume
             repi.hanyo-denshi...jt:0xB2BE ,
@@ -25196,10 +25819,10 @@ o.ucs_jis:0x66C2
     rep.adobe-japan1-6:21723
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-6:21723 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.jis-x0213-1:0x7E71   # &GT-65324;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.jis-x0213-1:0x7E71   # &GT-65324;
+        ] ;
         :eq rep.ucs_jis:0x66C2        ; # &AJ1-21723;
         :eq rep.jis-x0212:0x4260      ; # &I-JSP-4260;
         :eq rep.daikanwa:14167        ; # &I-M-14167;
@@ -25243,10 +25866,10 @@ o.ucs_jis:0x66C2
     rep.cns11643-4:0x5050
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-4:0x5050 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.cns11643-1:0x6327   # &C1-6327;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    rep.cns11643-1:0x6327   # &C1-6327;
+        ] ;
         :eq rep.ucs_cns:0x66C2        ; # &C4-5050;
         :subsume
             g2.cns11643-4:0x5050 ;
@@ -25554,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 ] ;
     .
@@ -25834,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 ] ;
         .
@@ -25872,10 +26495,10 @@ a.ucs:0x232A1
     g2.daikanwa:14174
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14174 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013152 ; # &g2-MJ013152;
-        isd:below    g2.adobe-japan1-0:06078   # &g2-AJ1-06078;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013152 ; # &g2-MJ013152;
+            isd:below    g2.adobe-japan1-0:06078   # &g2-AJ1-06078;
+        ] ;
         :eq g2.cbeta:05952            ; # &g2-M-14174;
         :subsume
             repi.daikanwa:14174  ,
@@ -25895,10 +26518,10 @@ a.ucs:0x232A1
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x232A1 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.mj:013151 ; # &g2-MJ013151;
-        isd:below    g2.ucs_unicode:0x7D72   # &g2-UU+7D72;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.mj:013151 ; # &g2-MJ013151;
+            isd:below    g2.ucs_unicode:0x7D72   # &g2-UU+7D72;
+        ] ;
         .
     g2.cns11643-4:0x5055
         a chisegg:abstract-glyph-form ;
@@ -26537,18 +27160,18 @@ rep.mj:037801
     g2.daikanwa:49154
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:49154 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.daikanwa:48990 ; # &g2-M-48990;
-        isd:below    g2.mj:013152   # &g2-MJ013152;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.daikanwa:48990 ; # &g2-M-48990;
+            isd:below    g2.mj:013152   # &g2-MJ013152;
+        ] ;
         .
     g2.mj:037801
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:037801 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.daikanwa:48990 ; # &g2-M-48990;
-        isd:below    g2.mj:013151   # &g2-MJ013151;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.daikanwa:48990 ; # &g2-M-48990;
+            isd:below    g2.mj:013151   # &g2-MJ013151;
+        ] ;
         :eq g2.koseki:159960          ; # &g2-MJ037801;
         .
         g2.koseki:159960
@@ -26566,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 ,
@@ -26644,18 +27267,18 @@ a.ucs:0x66CE
     g2.daikanwa:14194
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14194 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013152 ; # &g2-MJ013152;
-        isd:right    g2.ucs_jis:0x776A   # &g2-JSP-4F23;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013152 ; # &g2-MJ013152;
+            isd:right    g2.ucs_jis:0x776A   # &g2-JSP-4F23;
+        ] ;
         .
     g2.adobe-japan1-6:21726
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of adobe-japan1-6:21726 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.ucs_jis:0x776A   # &g2-JSP-4F23;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.ucs_jis:0x776A   # &g2-JSP-4F23;
+        ] ;
         :eq g2.ucs_jis:0x66CE         ; # &g2-AJ1-21726;
         :eq g2.jis-x0212:0x4264       ; # &g2-AJ1-21726;
         :eq g2.cbeta:02529            ; # &g2-AJ1-21726;
@@ -26687,10 +27310,10 @@ a.ucs:0x66CE
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66CE  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.ucs_unicode:0x776A   # &g2-M-23466;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.ucs_unicode:0x776A   # &g2-M-23466;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-3:0x5471      ; # &g2-UU+66CE;
         :subsume
@@ -27093,10 +27716,10 @@ a.ucs:0x66D5
         g2.daikanwa:14204
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of daikanwa:14204 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.adobe-japan1-2:08618   # &g2-AJ1-08618;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x65E5 ; # 日
+                isd:right    g2.adobe-japan1-2:08618   # &g2-AJ1-08618;
+            ] ;
             :eq g2.cbeta:02344            ; # &g2-M-14204;
             :subsume
                 repi.daikanwa:14204  ,
@@ -27115,10 +27738,10 @@ a.ucs:0x66D5
         g2.cns11643-3:0x546D
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of cns11643-3:0x546D ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.cns11643-1:0x6669   # &g2-CU+8A79;
-    ] ;
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x65E5 ; # 日
+                isd:right    g2.cns11643-1:0x6669   # &g2-CU+8A79;
+            ] ;
             :eq g2.ucs_cns:0x66D5         ; # &g2-CU+66D5;
             .
             g2.ucs_cns:0x66D5
@@ -27128,10 +27751,10 @@ a.ucs:0x66D5
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66D5  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x8A79   # &g2-UU+8A79;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x8A79   # &g2-UU+8A79;
+        ] ;
         .
 
 a.ucs:0x3B21
@@ -27532,6 +28155,19 @@ a.ucs:0x232D3
         rep.cns11643-7:0x3849
                    :abstract-glyph-of     cns11643-7:0x3849  .
 
+rep.ucs-itaiji-004:0x66B4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-004:0x66B4 ;
+    ideo:radical          72 ; # ⽇ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.gt-k:09590 ; # &GT-K09590;
+        isd:below    a.ucs:0x6C3A   # 氺
+    ] ;
+    ideo:wrong-form-of   a.ucs:0x3B25         ;
+    .
+
 a.ucs:0x3B23
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3B23 ;
@@ -27604,18 +28240,18 @@ a.ucs:0x3B24
     g2.daikanwa:14219
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14219 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013152 ; # &g2-MJ013152;
-        isd:right    g2.daikanwa:27325   # &g2-M-27325;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013152 ; # &g2-MJ013152;
+            isd:right    g2.daikanwa:27325   # &g2-M-27325;
+        ] ;
         .
     g2.cbeta:01491
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cbeta:01491 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    rep.big5-cdp:0x8CE2   # &CDP-8CE2;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    rep.big5-cdp:0x8CE2   # &CDP-8CE2;
+        ] ;
         .
     g2.ucs_unicode:0x3B24
         a chisegg:abstract-glyph-form ;
@@ -27750,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 ;
     .
@@ -28073,28 +28709,56 @@ a.ucs:0x3B25
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
-    :subsume
-        rep.daikanwa:14225   ,
-        rep.ucs_unicode:0x3B25 ,
-        rep.cns11643-4:0x5B41 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround rep.gt-k:09590 ; # &GT-K09590;
+        isd:filling  a.ucs:0x7C73   # 米
+    ] ;
+    :eq rep.cns11643-4:0x5B41     ; # &I-C4-5B41;
+    :eq rep.daikanwa:14225        ; # &I-M-14225;
+    :eq rep.shinjigen:3382        ; # 㬥
+    :eq rep.cbeta:07862           ; # &I-CB07862;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x66B4         ] ;
+    :subsume
+        g2.daikanwa:14225    ,
+        g2.ucs_unicode:0x3B25 ,
+        g2.cns11643-4:0x5B41 ,
+        g2.cbeta:07862       ;
     .
+    rep.cns11643-4:0x5B41
+               :abstract-glyph-of     cns11643-4:0x5B41  .
     rep.daikanwa:14225
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:14225 ;
-        :eq rep.shinjigen:3382        ; # &M-14225;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  a.ucs:0x66B4         ] ;
-        .
-        rep.shinjigen:3382
-                   :abstract-glyph-of      shinjigen:3382    .
-    rep.ucs_unicode:0x3B25
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x3B25  ] ;
+               :abstract-glyph-of       daikanwa:14225   .
+    rep.shinjigen:3382
+               :abstract-glyph-of      shinjigen:3382    .
+    rep.cbeta:07862
+               :abstract-glyph-of          cbeta:07862   .
+    g2.daikanwa:14225
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14225 ;
+        :eq g2.shinjigen:3382         ; # &g2-M-14225;
         .
-    rep.cns11643-4:0x5B41
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-4:0x5B41 ;
+        g2.shinjigen:3382
+              :abstract-glyph-form-of      shinjigen:3382    .
+    g2.ucs_unicode:0x3B25
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3B25  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        .
+    g2.cns11643-4:0x5B41
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-4:0x5B41 ;
+        :eq g2.ucs_cns:0x3B25         ; # &g2-CU+3B25;
+        .
+        g2.ucs_cns:0x3B25
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x3B25  ] .
+    g2.cbeta:07862
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cbeta:07862 ;
         .
 
 a.ucs:0x3B26
@@ -28371,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 ;
@@ -28483,57 +29217,105 @@ rep.cns11643-5:0x6823
     ideo:total-strokes    19 ;
     .
 
-rep.daikanwa:14236
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:14236 ;
-    :to.ucs              a.ucs:0x232F3 ; # 𣋳
-    ideo:radical          72 ; # ⽇ 
-    ideo:strokes          15 ;
-    ideo:total-strokes    19 ;
-    .
-
 a.ucs:0x232F3
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x232F3 ;
-
-    :morohashi-daikanwa          (14236 0 0) ;
-    ideo:radical          72 ; # ⽇ 
-    ideo:strokes          15 ;
-    ideo:total-strokes    19 ;
-    .
-
-rep.cns11643-7:0x473D
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-7:0x473D ;
-    :to.ucs              a.ucs:0x232F3 ; # 𣋳
-
-    :morohashi-daikanwa          (14236 0 1) ;
-    ideo:radical          72 ; # ⽇ 
-    ideo:strokes          15 ;
-    ideo:total-strokes    19 ;
-    .
-
-rep.daikanwa:14237
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:14237 ;
-    :to.ucs              a.ucs:0x232F4 ; # 𣋴
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x9E83   # 麃
+    ] ;
+    :eq rep.cns11643-7:0x473D     ; # &I-C7-473D;
+    :eq rep.daikanwa:14236        ; # &I-M-14236;
+    ideo:same-as         [ :sources chisebib:zihui ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x232F4        ] ;
+    :subsume
+        g2.ucs_iso:0x232F3   ,
+        g2.cns11643-7:0x473D ;
     .
+    rep.cns11643-7:0x473D
+               :abstract-glyph-of     cns11643-7:0x473D  .
+    rep.daikanwa:14236
+               :abstract-glyph-of       daikanwa:14236   .
+    g2.ucs_iso:0x232F3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x232F3 ] ;
+        :eq g2.daikanwa:14236         ; # &g2-M-14236;
+        :subsume
+            repi.daikanwa:14236  ,
+            repi.ucs_iso:0x232F3 ;
+        .
+        g2.daikanwa:14236
+              :abstract-glyph-form-of       daikanwa:14236   .
+        repi.daikanwa:14236
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:14236 ;
+            .
+        repi.ucs_iso:0x232F3
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x232F3 ] ;
+            .
+    g2.cns11643-7:0x473D
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x473D ;
+        :eq g2.ucs_cns:0x232F3        ; # &g2-CU+232F3;
+        .
+        g2.ucs_cns:0x232F3
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x232F3 ] .
 
 a.ucs:0x232F4
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x232F4 ;
-
-    :morohashi-daikanwa          (14237 0 0) ;
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.ucs-itaiji-001:0x9E83 ; # &U-i001+9E83;
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
     :eq rep.cns11643-7:0x473C     ; # &I-C7-473C;
+    :eq rep.daikanwa:14237        ; # &I-M-14237;
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x3B25         ] ;
+    :subsume
+        g2.daikanwa:14237    ,
+        g2.ucs_iso:0x232F4   ;
     .
     rep.cns11643-7:0x473C
                :abstract-glyph-of     cns11643-7:0x473C  .
+    rep.daikanwa:14237
+               :abstract-glyph-of       daikanwa:14237   .
+    g2.daikanwa:14237
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:14237 ;
+        .
+    g2.ucs_iso:0x232F4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x232F4 ] ;
+        :eq g2.cns11643-7:0x473C      ; # &g2-IU-000232F4;
+        :subsume
+            repi.cns11643-7:0x473C ,
+            repi.ucs_iso:0x232F4 ;
+        .
+        g2.cns11643-7:0x473C
+              :abstract-glyph-form-of     cns11643-7:0x473C  .
+        repi.cns11643-7:0x473C
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x473C ;
+            .
+        repi.ucs_iso:0x232F4
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x232F4 ] ;
+            .
 
 a.ucs:0x3B29
     a chisegg:abstract-character ;
@@ -28555,6 +29337,10 @@ a.ucs:0x66DD
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          15 ;
     ideo:total-strokes    19 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x66B4   # 暴
+    ] ;
     :eq rep.adobe-japan1-0:03374  ; # &I-AJ1-03374;
     :eq rep.jis-x0208:0x4778      ; # &I-J90-4778;
     :eq rep.gb2312:0x4658         ; # &I-G0-4658;
@@ -28565,7 +29351,11 @@ a.ucs:0x66DD
     :eq rep.gt:18029              ; # &I-GT-18029;
     :eq rep.gt-pj-1:18296         ; # &I-GT-18029;
     :eq rep.daikanwa:14239        ; # &I-M-14239;
-    :eq rep.shinjigen_rev:3399    ; # 曝
+    :eq rep.shinjigen:3399        ; # 曝
+    ideo:vulgar-form-of  [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x66B4         ,
+                                    a.ucs:0x3B25         ] ;
     .
     rep.adobe-japan1-0:03374
                :abstract-glyph-of adobe-japan1-0:03374   .
@@ -28587,9 +29377,8 @@ a.ucs:0x66DD
                :abstract-glyph-of        gt-pj-1:18296   .
     rep.daikanwa:14239
                :abstract-glyph-of       daikanwa:14239   .
-    rep.shinjigen_rev:3399
-               :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:3399    ] .
+    rep.shinjigen:3399
+               :abstract-glyph-of      shinjigen:3399    .
 
 a.ucs:0x232F5
     a chisegg:abstract-character ;
@@ -28618,10 +29407,10 @@ a.ucs:0x232F5
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x232F5 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x6A02   # &g2-AJ1-05276;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x6A02   # &g2-AJ1-05276;
+        ] ;
         :eq g2.daikanwa:14240         ; # &g2-M-14240;
         :eq g2.cbeta:05366            ; # &g2-M-14240;
         :subsume
@@ -28649,10 +29438,10 @@ a.ucs:0x232F5
     g2.cns11643-5:0x6822
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-5:0x6822 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.cns11643-1:0x6D40   # &g2-CU+6A02;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.cns11643-1:0x6D40   # &g2-CU+6A02;
+        ] ;
         :eq g2.ucs_cns:0x232F5        ; # &g2-CU+232F5;
         .
         g2.ucs_cns:0x232F5
@@ -28977,7 +29766,7 @@ repi.hng-khm:03770
     ideo:total-strokes    19 ;
     isd:structure [ a idc:⿰ ;
         isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    rep.ucs-bmp-var-003:0x5EE3   # &U-v003+5EE3;
+        isd:right    rep.ucs-var-003:0x5EE3   # &U-v003+5EE3;
     ] ;
     .
 
@@ -29062,10 +29851,10 @@ rep.ucs_iso:0x232F7
     rep.daikanwa:14246
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:14246 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    rep.mj:011077   # &MJ011077;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    rep.mj:011077   # &MJ011077;
+        ] ;
         :eq rep.cbeta:05953           ; # &I-CB05953;
         .
         rep.cbeta:05953
@@ -29074,10 +29863,10 @@ rep.ucs_iso:0x232F7
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x232F7 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x65E5 ; # 日
-        isd:below    rep.cns11643-1:0x6C5D   # &C1-6C5D;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x65E5 ; # 日
+            isd:below    rep.cns11643-1:0x6C5D   # &C1-6C5D;
+        ] ;
         :eq rep.cns11643-7:0x473B     ; # &C7-473B;
         .
         rep.cns11643-7:0x473B
@@ -29087,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
@@ -29181,10 +30011,10 @@ a.ucs:0x66E2
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66E2  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x5BEE   # &g2-AJ1-03976;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x5BEE   # &g2-AJ1-03976;
+        ] ;
         :eq g2.cbeta:00154            ; # &g2-CB00154;
         :subsume
             repi.cbeta:00154     ,
@@ -29556,10 +30386,10 @@ rep.ucs_iso:0x23300
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x23300 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.cns11643-4:0x5254   # &g2-M-28554;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.cns11643-4:0x5254   # &g2-M-28554;
+        ] ;
         .
 
 a.ucs:0x23305
@@ -29928,10 +30758,10 @@ a.ucs:0x66EA
     g2.daikanwa:14264
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14264 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.adobe-japan1-0:03919   # &g2-AJ1-03919;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.adobe-japan1-0:03919   # &g2-AJ1-03919;
+        ] ;
         :eq g2.cbeta:02604            ; # &g2-M-14264;
         :subsume
             repi.daikanwa:14264  ,
@@ -29950,10 +30780,10 @@ a.ucs:0x66EA
     g2.cns11643-4:0x6A4C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x6A4C ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.cns11643-1:0x7865   # &g2-CU+7F85;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.cns11643-1:0x7865   # &g2-CU+7F85;
+        ] ;
         :eq g2.ucs_cns:0x66EA         ; # &g2-CU+66EA;
         .
         g2.ucs_cns:0x66EA
@@ -29963,10 +30793,10 @@ a.ucs:0x66EA
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66EA  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x7F85   # &g2-UU+7F85;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x7F85   # &g2-UU+7F85;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -30150,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 ;
@@ -30357,10 +31267,10 @@ rep.ucs_unicode:0x66EE
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66EE  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:013151 ; # &g2-MJ013151;
-        isd:right    g2.ucs_unicode:0x56B4   # &g2-UU+56B4;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:013151 ; # &g2-MJ013151;
+            isd:right    g2.ucs_unicode:0x56B4   # &g2-UU+56B4;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -30412,10 +31322,10 @@ a.ucs:0x66EF
     g2.daikanwa:14274
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14274 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.adobe-japan1-0:04657   # &g2-AJ1-04657;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.adobe-japan1-0:04657   # &g2-AJ1-04657;
+        ] ;
         :eq g2.cbeta:04706            ; # &g2-M-14274;
         :subsume
             repi.daikanwa:14274  ,
@@ -30435,10 +31345,10 @@ a.ucs:0x66EF
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x66EF  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x65E5 ; # 日
-        isd:right    g2.ucs_unicode:0x5C6C   # &g2-UU+5C6C;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x65E5 ; # 日
+            isd:right    g2.ucs_unicode:0x5C6C   # &g2-UU+5C6C;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-3:0x613F      ; # &g2-UU+66EF;
         :subsume