X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R072-Sun.ttl;h=f18f5e4ff35017b8edec0b7d3e0a7287eea017be;hb=95d8653eae93f02e86b96e63d5f0c9b2148eb876;hp=2a3f1c533ac028557a0159bf6932a51133a1fd14;hpb=98911b4363ae83e30c73385e9ead2ea8a2cb4751;p=chise%2Fchiset.git

diff --git a/Ideograph-R072-Sun.ttl b/Ideograph-R072-Sun.ttl
index 2a3f1c5..f18f5e4 100644
--- a/Ideograph-R072-Sun.ttl
+++ b/Ideograph-R072-Sun.ttl
@@ -16,6 +16,7 @@
 @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_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=> .
@@ -109,6 +110,7 @@
 @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=> .
@@ -137,6 +139,7 @@
 @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=> .
@@ -1698,18 +1701,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
@@ -2224,10 +2227,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    ;
@@ -2237,19 +2240,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;
@@ -2386,10 +2389,10 @@ 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   # 旧
-    ] ;
+        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;
         .
         g2.ucs-itaiji-002:0x81FD
@@ -2397,10 +2400,10 @@ rep.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        ;
@@ -2789,10 +2792,10 @@ 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;
@@ -2847,10 +2850,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
@@ -3511,10 +3514,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 ;
@@ -3522,10 +3525,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;
@@ -3575,10 +3578,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 ;
         .
 
@@ -4136,10 +4139,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 ;
         .
 
@@ -4480,33 +4483,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 ;
@@ -4905,10 +4908,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;
@@ -4928,10 +4931,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 ;
@@ -4939,10 +4942,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;
@@ -4998,10 +5001,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;
@@ -6498,10 +6501,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
@@ -6522,10 +6525,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
@@ -6545,10 +6548,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;
@@ -6607,10 +6610,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;
@@ -6643,10 +6646,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;
@@ -6688,10 +6691,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;
@@ -8468,11 +8471,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
@@ -8497,6 +8508,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 ;
@@ -10386,10 +10401,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;
@@ -10432,10 +10447,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;
@@ -13153,10 +13168,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;
@@ -13202,10 +13217,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
@@ -13343,6 +13358,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
@@ -13353,7 +13372,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 ;
@@ -13364,6 +13393,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   ,
@@ -15118,10 +15151,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 ;
@@ -15130,10 +15163,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;
@@ -16103,10 +16136,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;
@@ -16188,10 +16221,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;
@@ -16443,19 +16476,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
@@ -17743,10 +17776,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;
@@ -17784,10 +17817,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 ;
         .
 
@@ -18400,17 +18433,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 ;
@@ -18421,6 +18505,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   ,
@@ -18671,10 +18778,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  ,
@@ -18696,10 +18803,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
@@ -19235,10 +19342,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
@@ -19265,11 +19372,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 ,
@@ -19399,10 +19506,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
@@ -21009,10 +21116,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;
@@ -21110,10 +21217,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 ;
         .
@@ -21211,6 +21318,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
@@ -21224,7 +21335,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 ;
@@ -21234,6 +21355,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
@@ -21518,18 +21643,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;
@@ -21804,10 +21929,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  ,
@@ -21827,10 +21952,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
@@ -22288,6 +22413,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    ,
@@ -22313,9 +22442,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 ;
@@ -22354,6 +22491,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
@@ -22364,7 +22505,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 ;
@@ -22374,6 +22525,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
@@ -22754,11 +22909,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
@@ -22783,6 +22946,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 ;
@@ -22998,6 +23165,10 @@ a.ucs:0x66AF
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x66AF ;
     ideo:radical          72 ; # ⽇ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x65E5 ; # 日
+        isd:right    a.ucs:0x83AB   # 莫
+    ] ;
     :eq a.big5:0xE5C9             ; # &I-B-E5C9;
     .
     a.big5:0xE5C9
@@ -23011,8 +23182,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 ;
@@ -23044,6 +23219,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 ;
     .
@@ -23473,10 +23652,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 ;
         .
 
@@ -24832,10 +25011,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;
@@ -25061,10 +25240,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;
@@ -25152,10 +25331,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 ,
@@ -25226,10 +25405,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;
@@ -25273,10 +25452,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 ;
@@ -25902,10 +26081,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  ,
@@ -25925,10 +26104,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 ;
@@ -26567,18 +26746,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
@@ -26674,18 +26853,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;
@@ -26717,10 +26896,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
@@ -27123,10 +27302,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  ,
@@ -27145,10 +27324,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
@@ -27158,10 +27337,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
@@ -27647,18 +27826,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 ;
@@ -28116,16 +28295,23 @@ a.ucs:0x3B25
     ideo:radical          72 ; # ⽇ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
+    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;
-    :from.original       [ :sources chisebib:shinjigen ;
+    :from.original       [ :sources chisebib:zhengzitong ,
+                                    chisebib:daikanwa ,
+                                    chisebib:shinjigen ;
                            :target  a.ucs:0x66B4         ] ;
     :subsume
         g2.daikanwa:14225    ,
         g2.ucs_unicode:0x3B25 ,
-        g2.cns11643-4:0x5B41 ;
+        g2.cns11643-4:0x5B41 ,
+        g2.cbeta:07862       ;
     .
     rep.cns11643-4:0x5B41
                :abstract-glyph-of     cns11643-4:0x5B41  .
@@ -28139,35 +28325,15 @@ a.ucs:0x3B25
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:14225 ;
         :eq g2.shinjigen:3382         ; # &g2-M-14225;
-        :eq g2.cbeta:07862            ; # &g2-M-14225;
-        :subsume
-            repi.daikanwa:14225  ,
-            repi.cbeta:07862     ;
         .
         g2.shinjigen:3382
               :abstract-glyph-form-of      shinjigen:3382    .
-        g2.cbeta:07862
-              :abstract-glyph-form-of          cbeta:07862   .
-        repi.daikanwa:14225
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:14225 ;
-            .
-        repi.cbeta:07862
-            a chisegg:glyph-image ;
-            :glyph-image-of cbeta:07862 ;
-            .
     g2.ucs_unicode:0x3B25
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3B25  ] ;
-        :subsume
-            repi.ucs_unicode:0x3B25 ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
         .
-        repi.ucs_unicode:0x3B25
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x3B25  ] ;
-            .
     g2.cns11643-4:0x5B41
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x5B41 ;
@@ -28176,6 +28342,10 @@ a.ucs:0x3B25
         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
     a chisegg:abstract-character ;
@@ -28563,57 +28733,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;
+    :from.same           [ :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;
+    :from.ancient        [ :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 ;
@@ -28635,6 +28853,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;
@@ -28645,7 +28867,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        ; # 曝
+    :from.vulgar         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x66B4         ,
+                                    a.ucs:0x3B25         ] ;
     .
     rep.adobe-japan1-0:03374
                :abstract-glyph-of adobe-japan1-0:03374   .
@@ -28667,9 +28893,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 ;
@@ -28698,10 +28923,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
@@ -28729,10 +28954,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
@@ -29142,10 +29367,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
@@ -29154,10 +29379,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
@@ -29261,10 +29486,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     ,
@@ -29636,10 +29861,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
@@ -30008,10 +30233,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  ,
@@ -30030,10 +30255,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
@@ -30043,10 +30268,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 ;
         .
 
@@ -30437,10 +30662,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 ;
         .
 
@@ -30492,10 +30717,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  ,
@@ -30515,10 +30740,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