X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R033-Scholar.ttl;h=d3202fd8908272c979384697d93177922a0a3de4;hb=87ca728e4479e7e1c67272276f05aafc6662062d;hp=b37b60d7586d6ba9b5960cf30c143e3bc9e71ede;hpb=9fcfce4bb72f19e83445e234316b8ae925908e55;p=chise%2Fchiset.git

diff --git a/Ideograph-R033-Scholar.ttl b/Ideograph-R033-Scholar.ttl
index b37b60d..d3202fd 100644
--- a/Ideograph-R033-Scholar.ttl
+++ b/Ideograph-R033-Scholar.ttl
@@ -7,12 +7,14 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
 @prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 
 @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_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @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=> .
@@ -32,13 +34,18 @@
 @prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
 @prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
 @prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
+@prefix rep.adobe-japan1-6: <http://www.chise.org/est/view/character/rep.adobe-japan1-6=> .
 @prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
 @prefix g2.adobe-japan1-5: <http://www.chise.org/est/view/character/g2.adobe-japan1-5=> .
 @prefix rep.jis-x0208: <http://www.chise.org/est/view/character/rep.jis-x0208=> .
 @prefix rep.jis-x0208_1978: <http://www.chise.org/est/view/character/rep.jis-x0208@1978=> .
+@prefix g2.jis-x0208_1978: <http://www.chise.org/est/view/character/g2.jis-x0208@1978=> .
+@prefix repi.jis-x0208_1978: <http://www.chise.org/est/view/character/repi.jis-x0208@1978=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
 @prefix g2.gb2312: <http://www.chise.org/est/view/character/g2.gb2312=> .
 @prefix rep.jis-x0208_1983: <http://www.chise.org/est/view/character/rep.jis-x0208@1983=> .
+@prefix g2.jis-x0208_1983: <http://www.chise.org/est/view/character/g2.jis-x0208@1983=> .
+@prefix repi.jis-x0208_1983: <http://www.chise.org/est/view/character/repi.jis-x0208@1983=> .
 @prefix rep.ks-x1001: <http://www.chise.org/est/view/character/rep.ks-x1001=> .
 @prefix g2.ks-x1001: <http://www.chise.org/est/view/character/g2.ks-x1001=> .
 @prefix repi.ks-x1001: <http://www.chise.org/est/view/character/repi.ks-x1001=> .
@@ -48,7 +55,10 @@
 @prefix rep.iso-ir165: <http://www.chise.org/est/view/character/rep.iso-ir165=> .
 @prefix rep.jis-x0208_1990: <http://www.chise.org/est/view/character/rep.jis-x0208@1990=> .
 @prefix g2.jis-x0208: <http://www.chise.org/est/view/character/g2.jis-x0208=> .
+@prefix g2.jis-x0208_1990: <http://www.chise.org/est/view/character/g2.jis-x0208@1990=> .
 @prefix repi.jis-x0208: <http://www.chise.org/est/view/character/repi.jis-x0208=> .
+@prefix repi.jis-x0208_1990: <http://www.chise.org/est/view/character/repi.jis-x0208@1990=> .
+@prefix a.jis-x0208: <http://www.chise.org/est/view/character/a.jis-x0208=> .
 @prefix rep.cns11643-1: <http://www.chise.org/est/view/character/rep.cns11643-1=> .
 @prefix g2.cns11643-1: <http://www.chise.org/est/view/character/g2.cns11643-1=> .
 @prefix repi.cns11643-1: <http://www.chise.org/est/view/character/repi.cns11643-1=> .
@@ -59,6 +69,8 @@
 @prefix g2.cns11643-3: <http://www.chise.org/est/view/character/g2.cns11643-3=> .
 @prefix repi.cns11643-3: <http://www.chise.org/est/view/character/repi.cns11643-3=> .
 @prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
+@prefix g2.cns11643-5: <http://www.chise.org/est/view/character/g2.cns11643-5=> .
+@prefix repi.cns11643-5: <http://www.chise.org/est/view/character/repi.cns11643-5=> .
 @prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
 @prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
 @prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
@@ -81,6 +93,8 @@
 @prefix a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
 @prefix rep.hanyo-denshi...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
 @prefix g2.hanyo-denshi...ks: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ks=> .
+@prefix rep.koseki: <http://www.chise.org/est/view/character/rep.koseki=> .
+@prefix g2.koseki: <http://www.chise.org/est/view/character/g2.koseki=> .
 @prefix repi.hanyo-denshi...ks: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ks=> .
 @prefix rep.hanyo-denshi...ks...mf: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks...mf=> .
 @prefix repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
@@ -96,7 +110,9 @@
 @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 g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
+@prefix g2.daikanwa...._.p: <http://www.chise.org/est/view/character/g2.daikanwa...+p=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
+@prefix repi.daikanwa...._.p: <http://www.chise.org/est/view/character/repi.daikanwa...+p=> .
 @prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
 @prefix rep.shinjigen: <http://www.chise.org/est/view/character/rep.shinjigen=> .
 @prefix g2.shinjigen: <http://www.chise.org/est/view/character/g2.shinjigen=> .
@@ -105,6 +121,8 @@
 @prefix repi.hng-khm: <http://www.chise.org/est/view/character/repi.hng-khm=> .
 @prefix repi.hng-kar: <http://www.chise.org/est/view/character/repi.hng-kar=> .
 @prefix rep.cbeta: <http://www.chise.org/est/view/character/rep.cbeta=> .
+@prefix g2.cbeta: <http://www.chise.org/est/view/character/g2.cbeta=> .
+@prefix repi.cbeta: <http://www.chise.org/est/view/character/repi.cbeta=> .
 @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=> .
@@ -114,6 +132,7 @@
 @prefix adobe-japan1-0: <http://rdf.chise.org/data/ccs/adobe-japan1-0/code-point/> .
 @prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
 @prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
+@prefix adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
 @prefix gb2312: <http://rdf.chise.org/data/ccs/gb2312/code-point/> .
 @prefix ks-x1001: <http://rdf.chise.org/data/ccs/ks-x1001/code-point/> .
@@ -129,9 +148,9 @@
 @prefix jis-x0213-2: <http://rdf.chise.org/data/ccs/jis-x0213-2/code-point/> .
 @prefix gb12345: <http://rdf.chise.org/data/ccs/gb12345/code-point/> .
 @prefix big5: <http://rdf.chise.org/data/ccs/big5/code-point/> .
-@prefix adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/code-point/> .
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
 @prefix hanyo-denshi...ks: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks/code-point/> .
+@prefix koseki: <http://rdf.chise.org/data/ccs/koseki/code-point/> .
 @prefix hanyo-denshi...ks...mf: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks...mf/code-point/> .
 @prefix gt: <http://rdf.chise.org/data/ccs/gt/code-point/> .
 @prefix gt-k: <http://rdf.chise.org/data/ccs/gt-k/code-point/> .
@@ -298,23 +317,11 @@ a.ucs:0x58EB
         :glyph-image-of hng-kar:07070 ;
         .
 
-a.ucs_component:0x58EC
-    a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:component ;
-                             :target     ucs:0x58EC  ] ;
-    ideo:radical          33 ; # â¼  
-    ideo:strokes           1 ;
-    ideo:total-strokes     4 ;
-    :eq a.iwds-1:0001             ; # &IWDS1-001;
-    .
-    a.iwds-1:0001
-           :abstract-character-of         iwds-1:0001    .
-
 a.ucs:0x58EC
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x58EC ;
     :from.denotational_component
-        a.ucs_component:0x58EC ;
+        a.ucs_component:0x2123C ;
     ideo:radical          33 ; # â¼  
     ideo:strokes           1 ;
     ideo:total-strokes     4 ;
@@ -338,9 +345,6 @@ rep.adobe-japan1-0:02583
     ideo:radical          33 ; # â¼  
     ideo:strokes           1 ;
     ideo:total-strokes     4 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x58EC         ,
-                                    a.ucs:0xE0100        ] ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E3F ; # 丿
         isd:below    a.ucs:0x58EB   # 士
@@ -355,9 +359,11 @@ rep.adobe-japan1-0:02583
     :eq rep.gt-pj-1:16209         ; # &I-GT-07136;
     :eq rep.daikanwa:05639        ; # &I-M-05639;
     :eq rep.shinjigen:1525        ; # &AJ1-02583;
-    :to.mistakable       [ :sources chisebib:zihui-biansi-2char ,
+    ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2123C        ] ;
+    :subsume
+        g2.ucs_unicode:0x58EC ;
     .
     rep.ucs_unicode:0x58EC
                :abstract-glyph-of [ :context domain:unicode ;
@@ -380,6 +386,83 @@ rep.adobe-japan1-0:02583
                :abstract-glyph-of       daikanwa:05639   .
     rep.shinjigen:1525
                :abstract-glyph-of      shinjigen:1525    .
+    g2.ucs_unicode:0x58EC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58EC  ] ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x58EC         ,
+                                        a.ucs:0xE0100        ] ;
+        :eq g2.adobe-japan1-0:02583   ; # &g2-AJ1-02583;
+        :eq g2.gb2312:0x4849          ; # &g2-AJ1-02583;
+        :eq g2.ks-x1001:0x6C73        ; # &g2-AJ1-02583;
+        :eq g2.jis-x0208:0x3F51       ; # &g2-AJ1-02583;
+        :eq g2.jis-x0213-1:0x3F51     ; # &g2-AJ1-02583;
+        :eq g2.gt:07136               ; # &g2-AJ1-02583;
+        :eq g2.gt-k:00452             ; # &g2-AJ1-02583;
+        :eq g2.daikanwa:05639         ; # &g2-AJ1-02583;
+        :eq g2.shinjigen:1525         ; # &g2-AJ1-02583;
+        :subsume
+            repi.daikanwa:05639  ,
+            repi.jis-x0208:0x3F51 ,
+            repi.adobe-japan1-6:02583 ,
+            repi.gt:07136        ,
+            repi.ks-x1001:0x6C73 ,
+            repi.ucs_unicode:0x58EC ;
+        .
+        g2.adobe-japan1-0:02583
+              :abstract-glyph-form-of adobe-japan1-0:02583   .
+        g2.gb2312:0x4849
+              :abstract-glyph-form-of         gb2312:0x4849  .
+        g2.ks-x1001:0x6C73
+              :abstract-glyph-form-of       ks-x1001:0x6C73  .
+        g2.jis-x0208:0x3F51
+              :abstract-glyph-form-of      jis-x0208:0x3F51  .
+        g2.jis-x0213-1:0x3F51
+              :abstract-glyph-form-of    jis-x0213-1:0x3F51  .
+        g2.gt:07136
+              :abstract-glyph-form-of             gt:07136   .
+        g2.gt-k:00452
+              :abstract-glyph-form-of           gt-k:00452   .
+        g2.daikanwa:05639
+              :abstract-glyph-form-of       daikanwa:05639   .
+        g2.shinjigen:1525
+              :abstract-glyph-form-of      shinjigen:1525    .
+        repi.daikanwa:05639
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05639 ;
+            .
+        repi.jis-x0208:0x3F51
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x3F51 ;
+            :eq repi.jis-x0213-1:0x3F51   ; # &R-J0-3F51;
+            .
+            repi.jis-x0213-1:0x3F51
+                          :glyph-image-of    jis-x0213-1:0x3F51  .
+        repi.adobe-japan1-0:02583
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:02583 ;
+            .
+        repi.gt:07136
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07136 ;
+            :eq repi.gt-k:00452           ; # &R-GT-07136;
+            .
+            repi.gt-k:00452
+                          :glyph-image-of           gt-k:00452   .
+        repi.ks-x1001:0x6C73
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x6C73 ;
+            :eq repi.ucs_ks:0x58EC        ; # &R-K0-6C73;
+            .
+            repi.ucs_ks:0x58EC
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x58EC  ] .
+        repi.ucs_unicode:0x58EC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58EC  ] ;
+            .
 
 rep.cns11643-1:0x4531
     a chisegg:abstract-glyph ;
@@ -393,7 +476,33 @@ rep.cns11643-1:0x4531
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    a.ucs:0x58EB   # 士
     ] ;
+    :eq rep.ucs_cns:0x58EC        ; # &C1-4531;
+    :subsume
+        g2.cns11643-1:0x4531 ;
+    .
+    rep.ucs_cns:0x58EC
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x58EC  ] .
+    g2.cns11643-1:0x4531
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-1:0x4531 ;
+        :eq g2.ucs_cns:0x58EC         ; # &g2-CU+58EC;
+        .
+        g2.ucs_cns:0x58EC
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x58EC  ] .
+
+a.ucs_component:0x58EC
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x58EC  ] ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           1 ;
+    ideo:total-strokes     4 ;
+    :eq a.iwds-1:0001             ; # &A-compU+58EC;
     .
+    a.iwds-1:0001
+           :abstract-character-of         iwds-1:0001    .
 
 a.ucs:0x2151B
     a chisegg:abstract-character ;
@@ -450,9 +559,6 @@ rep.adobe-japan1-0:02774
     ideo:radical          33 ; # â¼  
     ideo:strokes           3 ;
     ideo:total-strokes     6 ;
-    :rep.decomposition   [ :context domain:cid     ;
-                           :target  a.ucs:0x58EE         ,
-                                    a.ucs:0xE0100        ] ;
     ideo:hanyu-dazidian  ( 1 420 6 ) ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x4E2C ; # 丬
@@ -468,13 +574,14 @@ rep.adobe-japan1-0:02774
     :eq rep.gt-pj-1:16724         ; # &I-GT-07139;
     :eq rep.daikanwa:05642        ; # &I-M-05642;
     :eq rep.shinjigen:1526        ; # &AJ1-02774;
-    :eq rep.hanziku-2:0xA6B0      ; # &I-HZK02-A6B0;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gb12345:0x5733   ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x58EF         ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x58EF         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x58EF         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x58EF         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x58EF         ] ;
+    :subsume
+        g2.ucs_unicode:0x58EE ;
     .
     rep.ucs_unicode:0x58EE
                :abstract-glyph-of [ :context domain:unicode ;
@@ -497,8 +604,84 @@ rep.adobe-japan1-0:02774
                :abstract-glyph-of       daikanwa:05642   .
     rep.shinjigen:1526
                :abstract-glyph-of      shinjigen:1526    .
-    rep.hanziku-2:0xA6B0
-               :abstract-glyph-of      hanziku-2:0xA6B0  .
+    g2.ucs_unicode:0x58EE
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58EE  ] ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x58EE         ,
+                                        a.ucs:0xE0100        ] ;
+        :eq g2.adobe-japan1-0:02774   ; # &g2-AJ1-02774;
+        :eq g2.gb2312:0x5733          ; # &g2-AJ1-02774;
+        :eq g2.jis-x0208:0x4154       ; # &g2-AJ1-02774;
+        :eq g2.cns11643-3:0x2343      ; # &g2-AJ1-02774;
+        :eq g2.jis-x0213-1:0x4154     ; # &g2-AJ1-02774;
+        :eq g2.gt:07139               ; # &g2-AJ1-02774;
+        :eq g2.gt-k:01660             ; # &g2-AJ1-02774;
+        :eq g2.daikanwa:05642         ; # &g2-AJ1-02774;
+        :eq g2.shinjigen:1526         ; # &g2-AJ1-02774;
+        :subsume
+            repi.daikanwa:05642  ,
+            repi.jis-x0208:0x4154 ,
+            repi.adobe-japan1-6:02774 ,
+            repi.cns11643-3:0x2343 ,
+            repi.gt:07139        ,
+            repi.ucs_unicode:0x58EE ,
+            rep.hanziku-2:0xA6B0 ;
+        .
+        g2.adobe-japan1-0:02774
+              :abstract-glyph-form-of adobe-japan1-0:02774   .
+        g2.gb2312:0x5733
+              :abstract-glyph-form-of         gb2312:0x5733  .
+        g2.jis-x0208:0x4154
+              :abstract-glyph-form-of      jis-x0208:0x4154  .
+        g2.cns11643-3:0x2343
+              :abstract-glyph-form-of     cns11643-3:0x2343  .
+        g2.jis-x0213-1:0x4154
+              :abstract-glyph-form-of    jis-x0213-1:0x4154  .
+        g2.gt:07139
+              :abstract-glyph-form-of             gt:07139   .
+        g2.gt-k:01660
+              :abstract-glyph-form-of           gt-k:01660   .
+        g2.daikanwa:05642
+              :abstract-glyph-form-of       daikanwa:05642   .
+        g2.shinjigen:1526
+              :abstract-glyph-form-of      shinjigen:1526    .
+        repi.daikanwa:05642
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05642 ;
+            .
+        repi.jis-x0208:0x4154
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x4154 ;
+            :eq repi.jis-x0213-1:0x4154   ; # &R-J0-4154;
+            .
+            repi.jis-x0213-1:0x4154
+                          :glyph-image-of    jis-x0213-1:0x4154  .
+        repi.adobe-japan1-0:02774
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:02774 ;
+            .
+        repi.cns11643-3:0x2343
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2343 ;
+            .
+        repi.gt:07139
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07139 ;
+            :eq repi.gt-k:01660           ; # &R-GT-07139;
+            .
+            repi.gt-k:01660
+                          :glyph-image-of           gt-k:01660   .
+        repi.ucs_unicode:0x58EE
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58EE  ] ;
+            .
+        rep.hanziku-2:0xA6B0
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-2:0xA6B0 ;
+            .
 
 a.ucs:0x58EF
     a chisegg:abstract-character ;
@@ -558,10 +741,10 @@ a.ucs:0x58EF
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x58EF         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.ucs_unicode:0x723F ; # &g2-AJ1-05606;
-        isd:right    a.ucs:0x58EB   # 士
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.ucs_unicode:0x723F ; # &g2-AJ1-05606;
+            isd:right    a.ucs:0x58EB   # 士
+        ] ;
         :eq g2.adobe-japan1-0:04532   ; # &g2-AJ1-04532;
         :eq g2.ks-x1001:0x6D60        ; # &g2-AJ1-04532;
         :eq g2.jis-x0208:0x5463       ; # &g2-AJ1-04532;
@@ -635,10 +818,10 @@ a.ucs:0x58EF
     g2.cns11643-1:0x4967
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-1:0x4967 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.cns11643-2:0x2142 ; # &g2-CU+723F;
-        isd:right    a.ucs:0x58EB   # 士
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.cns11643-2:0x2142 ; # &g2-CU+723F;
+            isd:right    a.ucs:0x58EB   # 士
+        ] ;
         :eq g2.ucs_cns:0x58EF         ; # &g2-CU+58EF;
         .
         g2.ucs_cns:0x58EF
@@ -694,12 +877,12 @@ rep.adobe-japan1-0:02656
     :eq rep.gt-pj-1:16444         ; # &I-GT-07143;
     :eq rep.daikanwa:05645        ; # &I-M-05645;
     :eq rep.shinjigen:6398        ; # &AJ1-02656;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8072         ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x8072         ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x8072         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8072         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x8072         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x8072         ] ;
     :subsume
         g2.ucs_unicode:0x58F0 ;
     .
@@ -864,7 +1047,7 @@ rep.daikanwa:05646
         isd:above    rep.mj:006462 ; # &MJ006462;
         isd:below    rep.adobe-japan1-0:02583   # &AJ1-02583;
     ] ;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:14055 ] ;
     :subsume
@@ -956,8 +1139,10 @@ a.ucs:0x58F1
     :eq rep.gt-pj-1:12397         ; # &I-GT-07140;
     :eq rep.daikanwa:05647        ; # &I-M-05647;
     :eq rep.shinjigen:1528        ; # 壱
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x58F9         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x58F9         ] ;
+    :subsume
+        g2.ucs_unicode:0x58F1 ;
     .
     rep.adobe-japan1-0:01201
                :abstract-glyph-of adobe-japan1-0:01201   .
@@ -975,6 +1160,67 @@ a.ucs:0x58F1
                :abstract-glyph-of       daikanwa:05647   .
     rep.shinjigen:1528
                :abstract-glyph-of      shinjigen:1528    .
+    g2.ucs_unicode:0x58F1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58F1  ] ;
+        :eq g2.adobe-japan1-0:01201   ; # &g2-AJ1-01201;
+        :eq g2.jis-x0208:0x306D       ; # &g2-AJ1-01201;
+        :eq g2.cns11643-3:0x2543      ; # &g2-AJ1-01201;
+        :eq g2.jis-x0213-1:0x306D     ; # &g2-AJ1-01201;
+        :eq g2.gt:07140               ; # &g2-AJ1-01201;
+        :eq g2.daikanwa:05647         ; # &g2-AJ1-01201;
+        :eq g2.shinjigen:1528         ; # &g2-AJ1-01201;
+        :subsume
+            repi.daikanwa:05647  ,
+            repi.jis-x0208:0x306D ,
+            repi.adobe-japan1-6:01201 ,
+            repi.cns11643-3:0x2543 ,
+            repi.gt:07140        ,
+            repi.ucs_unicode:0x58F1 ;
+        .
+        g2.adobe-japan1-0:01201
+              :abstract-glyph-form-of adobe-japan1-0:01201   .
+        g2.jis-x0208:0x306D
+              :abstract-glyph-form-of      jis-x0208:0x306D  .
+        g2.cns11643-3:0x2543
+              :abstract-glyph-form-of     cns11643-3:0x2543  .
+        g2.jis-x0213-1:0x306D
+              :abstract-glyph-form-of    jis-x0213-1:0x306D  .
+        g2.gt:07140
+              :abstract-glyph-form-of             gt:07140   .
+        g2.daikanwa:05647
+              :abstract-glyph-form-of       daikanwa:05647   .
+        g2.shinjigen:1528
+              :abstract-glyph-form-of      shinjigen:1528    .
+        repi.daikanwa:05647
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05647 ;
+            .
+        repi.jis-x0208:0x306D
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x306D ;
+            :eq repi.jis-x0213-1:0x306D   ; # &R-J0-306D;
+            .
+            repi.jis-x0213-1:0x306D
+                          :glyph-image-of    jis-x0213-1:0x306D  .
+        repi.adobe-japan1-0:01201
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:01201 ;
+            .
+        repi.cns11643-3:0x2543
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2543 ;
+            .
+        repi.gt:07140
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07140 ;
+            .
+        repi.ucs_unicode:0x58F1
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58F1  ] ;
+            .
 
 a.ucs:0x58F2
     a chisegg:abstract-character ;
@@ -995,8 +1241,10 @@ a.ucs:0x58F2
     :eq rep.gt-pj-1:18276         ; # &I-GT-07145;
     :eq rep.daikanwa...._.p:05647 ; # 売
     :eq rep.shinjigen:7905        ; # 売
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x8CE3         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x8CE3         ] ;
+    :subsume
+        g2.ucs_unicode:0x58F2 ;
     .
     rep.adobe-japan1-0:03354
                :abstract-glyph-of adobe-japan1-0:03354   .
@@ -1016,6 +1264,73 @@ a.ucs:0x58F2
                :abstract-glyph-of daikanwa...._.p:05647   .
     rep.shinjigen:7905
                :abstract-glyph-of      shinjigen:7905    .
+    g2.ucs_unicode:0x58F2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58F2  ] ;
+        :eq g2.adobe-japan1-0:03354   ; # &g2-AJ1-03354;
+        :eq g2.jis-x0208:0x4764       ; # &g2-AJ1-03354;
+        :eq g2.cns11643-3:0x2544      ; # &g2-AJ1-03354;
+        :eq g2.jis-x0213-1:0x4764     ; # &g2-AJ1-03354;
+        :eq g2.gt:07145               ; # &g2-AJ1-03354;
+        :eq g2.gt-k:02771             ; # &g2-AJ1-03354;
+        :eq g2.daikanwa...._.p:05647  ; # &g2-AJ1-03354;
+        :eq g2.shinjigen:7905         ; # &g2-AJ1-03354;
+        :subsume
+            repi.daikanwa...._.p:05647 ,
+            repi.jis-x0208:0x4764 ,
+            repi.adobe-japan1-6:03354 ,
+            repi.cns11643-3:0x2544 ,
+            repi.gt:07145        ,
+            repi.ucs_unicode:0x58F2 ;
+        .
+        g2.adobe-japan1-0:03354
+              :abstract-glyph-form-of adobe-japan1-0:03354   .
+        g2.jis-x0208:0x4764
+              :abstract-glyph-form-of      jis-x0208:0x4764  .
+        g2.cns11643-3:0x2544
+              :abstract-glyph-form-of     cns11643-3:0x2544  .
+        g2.jis-x0213-1:0x4764
+              :abstract-glyph-form-of    jis-x0213-1:0x4764  .
+        g2.gt:07145
+              :abstract-glyph-form-of             gt:07145   .
+        g2.gt-k:02771
+              :abstract-glyph-form-of           gt-k:02771   .
+        g2.daikanwa...._.p:05647
+              :abstract-glyph-form-of daikanwa...._.p:05647   .
+        g2.shinjigen:7905
+              :abstract-glyph-form-of      shinjigen:7905    .
+        repi.daikanwa...._.p:05647
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa...._.p:05647 ;
+            .
+        repi.jis-x0208:0x4764
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x4764 ;
+            :eq repi.jis-x0213-1:0x4764   ; # &R-J0-4764;
+            .
+            repi.jis-x0213-1:0x4764
+                          :glyph-image-of    jis-x0213-1:0x4764  .
+        repi.adobe-japan1-0:03354
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:03354 ;
+            .
+        repi.cns11643-3:0x2544
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x2544 ;
+            .
+        repi.gt:07145
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07145 ;
+            :eq repi.gt-k:02771           ; # &R-GT-07145;
+            .
+            repi.gt-k:02771
+                          :glyph-image-of           gt-k:02771   .
+        repi.ucs_unicode:0x58F2
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58F2  ] ;
+            .
 
 a.ucs:0x58F3
     a chisegg:abstract-character ;
@@ -1036,10 +1351,10 @@ rep.adobe-japan1-5:17466
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x58EB ; # 士
         isd:below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x5196 ; # 冖
-                :middle   a.ucs:0x4E00 ; # 一
-                :below    a.ucs:0x51E0   # 几
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x5196 ; # 冖
+                isd:middle   a.ucs:0x4E00 ; # 一
+                isd:below    a.ucs:0x51E0   # 几
             ]
         ]
     ] ;
@@ -1151,8 +1466,8 @@ rep.gb2312:0x3F47
     ] ;
     :eq rep.ucs_unicode:0x58F3    ; # &G0-3F47;
     :rep.ucs_JP...hanazono     rdf:nil ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x6BBB         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x6BBB         ] ;
     :subsume
         g2.ucs_unicode:0x58F3 ;
     .
@@ -1377,9 +1692,9 @@ rep.cns11643-3:0x2B77
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x58EB ; # 士
         isd:below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x58EB ; # 士
-                :right    a.ucs:0x58EB   # 士
+            isd:structure [ a idc:â¿° ;
+                isd:left     a.ucs:0x58EB ; # 士
+                isd:right    a.ucs:0x58EB   # 士
             ]
         ]
     ] ;
@@ -1438,35 +1753,157 @@ rep.ucs-var-002:0x58F5
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x58EB ; # 士
         isd:below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x58EB ; # 士
-                :right    a.ucs:0x571F   # 土
+            isd:structure [ a idc:â¿° ;
+                isd:left     a.ucs:0x58EB ; # 士
+                isd:right    a.ucs:0x571F   # 土
             ]
         ]
     ] ;
     .
 
-rep.daikanwa:05651
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:05651 ;
-    :to.ucs		  a.ucs:0x21522 ; # 𡔢
+a.ucs_iwds-1:0x21523
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x21523 ] ;
     ideo:radical          33 ; # â¼  
     ideo:strokes           7 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x5928 ; # 夨
+        isd:filling  a.jis-x0208:0x3548   # &J97-3548;
+    ] ;
+    .
+
+a.ucs:0x21523
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21523 ;
+    :denotation-of
+        a.ucs_iwds-1:0x21523 ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           7 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.big5-cdp:0x8CD5 ; # &CDP-8CD5;
+        isd:filling  a.jis-x0208:0x3548   # &J97-3548;
+    ] ;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "keti" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "tetu" ) ;
+                         ] ;
     .
 
+rep.mj:033286
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:033286 ;
+    :denotation-of
+        a.ucs:0x21523        ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           7 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.big5-cdp:0x8CD5 ; # &CDP-8CD5;
+        isd:filling  a.ucs:0x5409   # 吉
+    ] ;
+    :eq rep.ucs_iso:0x21523       ; # &MJ033286;
+    :eq rep.koseki:064710         ; # &MJ033286;
+    :eq rep.daikanwa:05651        ; # &I-M-05651;
+    :subsume
+        g2.mj:033286         ;
+    .
+    rep.ucs_iso:0x21523
+               :abstract-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x21523 ] .
+    rep.koseki:064710
+               :abstract-glyph-of         koseki:064710  .
+    rep.daikanwa:05651
+               :abstract-glyph-of       daikanwa:05651   .
+    g2.mj:033286
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:033286 ;
+        :eq g2.ucs_iso:0x21523        ; # &g2-MJ033286;
+        :eq g2.koseki:064710          ; # &g2-MJ033286;
+        :eq g2.daikanwa:05651         ; # &g2-MJ033286;
+        :subsume
+            repi.daikanwa:05651  ,
+            repi.mj:033286       ,
+            repi.ucs_iso:0x21523 ;
+        .
+        g2.ucs_iso:0x21523
+              :abstract-glyph-form-of [ :context domain:iso     ;
+                                        :target     ucs:0x21523 ] .
+        g2.koseki:064710
+              :abstract-glyph-form-of         koseki:064710  .
+        g2.daikanwa:05651
+              :abstract-glyph-form-of       daikanwa:05651   .
+        repi.daikanwa:05651
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05651 ;
+            .
+        repi.mj:033286
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:033286 ;
+            .
+        repi.ucs_iso:0x21523
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x21523 ] ;
+            .
+
 a.ucs:0x21522
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x21522 ;
+    :denotation-of
+        a.ucs_iwds-1:0x21523 ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           7 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.adobe-japan1-6:21376 ; # &AJ1-21376;
+        isd:filling  a.jis-x0208:0x3548   # &J97-3548;
+    ] ;
+    .
 
-    :morohashi-daikanwa	  (5651 0 4) ;
+rep.ucs_iso:0x21522
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21522 ] ;
+    :denotation-of
+        a.ucs:0x21522        ;
     ideo:radical          33 ; # â¼  
     ideo:strokes           7 ;
     ideo:total-strokes    10 ;
-    :eq rep.cns11643-5:0x2C64     ; # &I-C5-2C64;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.adobe-japan1-6:21376 ; # &AJ1-21376;
+        isd:filling  a.ucs:0x5409   # 吉
+    ] ;
+    :eq rep.cns11643-5:0x2C64     ; # &C5-2C64;
+    :subsume
+        g2.ucs_iso:0x21522   ;
     .
     rep.cns11643-5:0x2C64
                :abstract-glyph-of     cns11643-5:0x2C64  .
+    g2.ucs_iso:0x21522
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21522 ] ;
+        :eq g2.cns11643-5:0x2C64      ; # &g2-IU-00021522;
+        :subsume
+            repi.cns11643-5:0x2C64 ,
+            repi.ucs_iso:0x21522 ;
+        .
+        g2.cns11643-5:0x2C64
+              :abstract-glyph-form-of     cns11643-5:0x2C64  .
+        repi.cns11643-5:0x2C64
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x2C64 ;
+            .
+        repi.ucs_iso:0x21522
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x21522 ] ;
+            .
 
 rep.cns11643-6:0x3642
     a chisegg:abstract-glyph ;
@@ -1552,29 +1989,18 @@ a.ucs:0x21529
     rep.daikanwa:05656
                :abstract-glyph-of       daikanwa:05656   .
 
-a.ucs:0x58F6
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x58F6 ;
+bucs:0x58FA
+    a chisegg:super-abstract-character ;
+    :super-abstract-character-of [ :context domain:bucs    ;
+                                   :target     ucs:0x58FA  ] ;
     ideo:radical          33 ; # â¼  
-    ideo:strokes           7 ;
-    ideo:total-strokes    10 ;
-    ideo:hanyu-dazidian  ( 1 447 6 ) ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x58EB ; # 士
-        isd:middle   a.ucs:0x5196 ; # 冖
-        isd:below    a.ucs:0x4E1A   # 业
-    ] ;
-    :eq rep.gb2312:0x3A78         ; # &I-G0-3A78;
-    :eq rep.hanziku-2:0xAC40      ; # &I-HZK02-AC40;
     .
-    rep.gb2312:0x3A78
-               :abstract-glyph-of         gb2312:0x3A78  .
-    rep.hanziku-2:0xAC40
-               :abstract-glyph-of      hanziku-2:0xAC40  .
 
 a.ucs:0x58F7
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x58F7 ;
+    :denotation-of
+        bucs:0x58FA          ;
     ideo:radical          33 ; # â¼  
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
@@ -1594,13 +2020,14 @@ a.ucs:0x58F7
     :eq rep.gt-pj-1:17499         ; # &I-GT-07160;
     :eq rep.daikanwa:05657        ; # &I-M-05657;
     :eq rep.shinjigen:1530        ; # 壷
-    :eq rep.hanziku-2:0xAE68      ; # &I-HZK02-AE68;
     :eq rep.cbeta:06724           ; # &I-CB06724;
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x58FA         ] ;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x58FA         ] ;
+    :subsume
+        g2.ucs_unicode:0x58F7 ;
     .
     rep.adobe-japan1-0:03063
                :abstract-glyph-of adobe-japan1-0:03063   .
@@ -1627,10 +2054,191 @@ a.ucs:0x58F7
                :abstract-glyph-of       daikanwa:05657   .
     rep.shinjigen:1530
                :abstract-glyph-of      shinjigen:1530    .
-    rep.hanziku-2:0xAE68
-               :abstract-glyph-of      hanziku-2:0xAE68  .
     rep.cbeta:06724
                :abstract-glyph-of          cbeta:06724   .
+    g2.ucs_unicode:0x58F7
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58F7  ] ;
+        :eq g2.adobe-japan1-0:03063   ; # &g2-AJ1-03063;
+        :eq g2.jis-x0208_1978:0x5464  ; # &g2-AJ1-03063;
+        :eq g2.jis-x0208_1983:0x445B  ; # &g2-AJ1-03063;
+        :eq g2.jis-x0208_1990:0x445B  ; # &g2-AJ1-03063;
+        :eq g2.cns11643-3:0x3477      ; # &g2-AJ1-03063;
+        :eq g2.jis-x0213-1:0x445B     ; # &g2-AJ1-03063;
+        :eq g2.gt:07160               ; # &g2-AJ1-03063;
+        :eq g2.gt-k:07837             ; # &g2-AJ1-03063;
+        :eq g2.daikanwa:05657         ; # &g2-AJ1-03063;
+        :eq g2.shinjigen:1530         ; # &g2-AJ1-03063;
+        :eq g2.cbeta:06724            ; # &g2-AJ1-03063;
+        :subsume
+            repi.daikanwa:05657  ,
+            repi.jis-x0208_1978:0x5464 ,
+            repi.jis-x0208_1983:0x445B ,
+            repi.jis-x0208_1990:0x445B ,
+            repi.adobe-japan1-6:03063 ,
+            repi.cns11643-3:0x3477 ,
+            repi.gt:07160        ,
+            repi.ucs_unicode:0x58F7 ,
+            rep.hanziku-2:0xAE68 ,
+            repi.cbeta:06724     ;
+        .
+        g2.adobe-japan1-0:03063
+              :abstract-glyph-form-of adobe-japan1-0:03063   .
+        g2.jis-x0208_1978:0x5464
+              :abstract-glyph-form-of [ :context domain:1978    ;
+                                        :target jis-x0208:0x5464  ] .
+        g2.jis-x0208_1983:0x445B
+              :abstract-glyph-form-of [ :context domain:1983    ;
+                                        :target jis-x0208:0x445B  ] .
+        g2.jis-x0208_1990:0x445B
+              :abstract-glyph-form-of [ :context domain:1990    ;
+                                        :target jis-x0208:0x445B  ] .
+        g2.cns11643-3:0x3477
+              :abstract-glyph-form-of     cns11643-3:0x3477  .
+        g2.jis-x0213-1:0x445B
+              :abstract-glyph-form-of    jis-x0213-1:0x445B  .
+        g2.gt:07160
+              :abstract-glyph-form-of             gt:07160   .
+        g2.gt-k:07837
+              :abstract-glyph-form-of           gt-k:07837   .
+        g2.daikanwa:05657
+              :abstract-glyph-form-of       daikanwa:05657   .
+        g2.shinjigen:1530
+              :abstract-glyph-form-of      shinjigen:1530    .
+        g2.cbeta:06724
+              :abstract-glyph-form-of          cbeta:06724   .
+        repi.daikanwa:05657
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05657 ;
+            .
+        repi.jis-x0208_1978:0x5464
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1978    ;
+                              :target jis-x0208:0x5464  ] ;
+            .
+        repi.jis-x0208_1983:0x445B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1983    ;
+                              :target jis-x0208:0x445B  ] ;
+            .
+        repi.jis-x0208_1990:0x445B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1990    ;
+                              :target jis-x0208:0x445B  ] ;
+            :eq repi.jis-x0213-1:0x445B   ; # &R-J90-445B;
+            .
+            repi.jis-x0213-1:0x445B
+                          :glyph-image-of    jis-x0213-1:0x445B  .
+        repi.adobe-japan1-0:03063
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:03063 ;
+            .
+        repi.cns11643-3:0x3477
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x3477 ;
+            .
+        repi.gt:07160
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07160 ;
+            :eq repi.gt-k:07837           ; # &R-GT-07160;
+            .
+            repi.gt-k:07837
+                          :glyph-image-of           gt-k:07837   .
+        repi.ucs_unicode:0x58F7
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58F7  ] ;
+            .
+        rep.hanziku-2:0xAE68
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-2:0xAE68 ;
+            .
+        repi.cbeta:06724
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:06724 ;
+            .
+
+a.ucs:0x58F6
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x58F6 ;
+    :denotation-of
+        bucs:0x58FA          ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           7 ;
+    ideo:total-strokes    10 ;
+    ideo:hanyu-dazidian  ( 1 447 6 ) ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x58EB ; # 士
+        isd:middle   a.ucs:0x5196 ; # 冖
+        isd:below    a.ucs:0x4E1A   # 业
+    ] ;
+    :eq rep.gb2312:0x3A78         ; # &I-G0-3A78;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x58FA         ] ;
+    :subsume
+        g2.ucs_unicode:0x58F6 ;
+    .
+    rep.gb2312:0x3A78
+               :abstract-glyph-of         gb2312:0x3A78  .
+    g2.ucs_unicode:0x58F6
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58F6  ] ;
+        :eq g2.gb2312:0x3A78          ; # &g2-UU+58F6;
+        :subsume
+            repi.ucs_unicode:0x58F6 ,
+            rep.hanziku-2:0xAC40 ;
+        .
+        g2.gb2312:0x3A78
+              :abstract-glyph-form-of         gb2312:0x3A78  .
+        repi.ucs_unicode:0x58F6
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58F6  ] ;
+            .
+        rep.hanziku-2:0xAC40
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-2:0xAC40 ;
+            .
+
+a.ucs:0x21532
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21532 ;
+    :denotation-of
+        bucs:0x58FA          ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    .
+
+rep.ucs-var-001:0x21532
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x21532 ;
+    :denotation-of
+        a.ucs:0x21532        ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    .
+
+rep.ucs_iso:0x21532
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21532 ] ;
+    :denotation-of
+        a.ucs:0x21532        ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    :subsume
+        g2.ucs_iso:0x21532   ;
+    .
+    g2.ucs_iso:0x21532
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21532 ] ;
+        .
 
 a.ucs:0x2152C
     a chisegg:abstract-character ;
@@ -1686,6 +2294,8 @@ a.ucs:0x58F9
     :eq rep.gt-pj-1:21605         ; # &I-GT-07165;
     :eq rep.daikanwa:05661        ; # &I-M-05661;
     :eq rep.shinjigen:1529        ; # 壹
+    :subsume
+        g2.ucs_unicode:0x58F9 ;
     .
     rep.adobe-japan1-0:04534
                :abstract-glyph-of adobe-japan1-0:04534   .
@@ -1711,10 +2321,94 @@ a.ucs:0x58F9
                :abstract-glyph-of       daikanwa:05661   .
     rep.shinjigen:1529
                :abstract-glyph-of      shinjigen:1529    .
+    g2.ucs_unicode:0x58F9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58F9  ] ;
+        :eq g2.adobe-japan1-0:04534   ; # &g2-AJ1-04534;
+        :eq g2.gb2312:0x523C          ; # &g2-AJ1-04534;
+        :eq g2.ks-x1001:0x6C6C        ; # &g2-AJ1-04534;
+        :eq g2.jis-x0208:0x5465       ; # &g2-AJ1-04534;
+        :eq g2.cns11643-1:0x5E62      ; # &g2-AJ1-04534;
+        :eq g2.jis-x0213-1:0x5465     ; # &g2-AJ1-04534;
+        :eq g2.gt:07165               ; # &g2-AJ1-04534;
+        :eq g2.gt-k:09176             ; # &g2-AJ1-04534;
+        :eq g2.daikanwa:05661         ; # &g2-AJ1-04534;
+        :eq g2.shinjigen:1529         ; # &g2-AJ1-04534;
+        :subsume
+            repi.daikanwa:05661  ,
+            repi.jis-x0208:0x5465 ,
+            repi.adobe-japan1-6:04534 ,
+            repi.cns11643-1:0x5E62 ,
+            repi.gt:07165        ,
+            repi.ks-x1001:0x6C6C ,
+            repi.ucs_unicode:0x58F9 ;
+        .
+        g2.adobe-japan1-0:04534
+              :abstract-glyph-form-of adobe-japan1-0:04534   .
+        g2.gb2312:0x523C
+              :abstract-glyph-form-of         gb2312:0x523C  .
+        g2.ks-x1001:0x6C6C
+              :abstract-glyph-form-of       ks-x1001:0x6C6C  .
+        g2.jis-x0208:0x5465
+              :abstract-glyph-form-of      jis-x0208:0x5465  .
+        g2.cns11643-1:0x5E62
+              :abstract-glyph-form-of     cns11643-1:0x5E62  .
+        g2.jis-x0213-1:0x5465
+              :abstract-glyph-form-of    jis-x0213-1:0x5465  .
+        g2.gt:07165
+              :abstract-glyph-form-of             gt:07165   .
+        g2.gt-k:09176
+              :abstract-glyph-form-of           gt-k:09176   .
+        g2.daikanwa:05661
+              :abstract-glyph-form-of       daikanwa:05661   .
+        g2.shinjigen:1529
+              :abstract-glyph-form-of      shinjigen:1529    .
+        repi.daikanwa:05661
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05661 ;
+            .
+        repi.jis-x0208:0x5465
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x5465 ;
+            :eq repi.jis-x0213-1:0x5465   ; # &R-J0-5465;
+            .
+            repi.jis-x0213-1:0x5465
+                          :glyph-image-of    jis-x0213-1:0x5465  .
+        repi.adobe-japan1-0:04534
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:04534 ;
+            .
+        repi.cns11643-1:0x5E62
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x5E62 ;
+            .
+        repi.gt:07165
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07165 ;
+            :eq repi.gt-k:09176           ; # &R-GT-07165;
+            .
+            repi.gt-k:09176
+                          :glyph-image-of           gt-k:09176   .
+        repi.ks-x1001:0x6C6C
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x6C6C ;
+            :eq repi.ucs_ks:0x58F9        ; # &R-K0-6C6C;
+            .
+            repi.ucs_ks:0x58F9
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x58F9  ] .
+        repi.ucs_unicode:0x58F9
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58F9  ] ;
+            .
 
 a.ucs:0x58FA
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x58FA ;
+    :denotation-of
+        bucs:0x58FA          ;
     ideo:radical          33 ; # â¼  
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
@@ -1737,6 +2431,8 @@ a.ucs:0x58FA
     :eq rep.gt-pj-1:21604         ; # &I-GT-07168;
     :eq rep.daikanwa:05662        ; # &I-M-05662;
     :eq rep.shinjigen:1531        ; # 壺
+    :subsume
+        g2.ucs_unicode:0x58FA ;
     .
     rep.adobe-japan1-0:04533
                :abstract-glyph-of adobe-japan1-0:04533   .
@@ -1769,6 +2465,110 @@ a.ucs:0x58FA
                :abstract-glyph-of       daikanwa:05662   .
     rep.shinjigen:1531
                :abstract-glyph-of      shinjigen:1531    .
+    g2.ucs_unicode:0x58FA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58FA  ] ;
+        :eq g2.adobe-japan1-0:04533   ; # &g2-AJ1-04533;
+        :eq g2.jis-x0208_1978:0x445B  ; # &g2-AJ1-04533;
+        :eq g2.jis-x0208_1983:0x5464  ; # &g2-AJ1-04533;
+        :eq g2.ks-x1001:0x7B3E        ; # &g2-AJ1-04533;
+        :eq g2.jis-x0208_1990:0x5464  ; # &g2-AJ1-04533;
+        :eq g2.cns11643-1:0x5E63      ; # &g2-AJ1-04533;
+        :eq g2.jis-x0213-1:0x5464     ; # &g2-AJ1-04533;
+        :eq g2.gb12345:0x3A78         ; # &g2-AJ1-04533;
+        :eq g2.gt:07168               ; # &g2-AJ1-04533;
+        :eq g2.gt-k:09175             ; # &g2-AJ1-04533;
+        :eq g2.daikanwa:05662         ; # &g2-AJ1-04533;
+        :eq g2.shinjigen:1531         ; # &g2-AJ1-04533;
+        :subsume
+            repi.daikanwa:05662  ,
+            repi.jis-x0208_1978:0x445B ,
+            repi.jis-x0208_1983:0x5464 ,
+            repi.jis-x0208_1990:0x5464 ,
+            repi.adobe-japan1-6:04533 ,
+            repi.cns11643-1:0x5E63 ,
+            repi.gt:07168        ,
+            repi.ks-x1001:0x7B3E ,
+            repi.ucs_unicode:0x58FA ;
+        .
+        g2.adobe-japan1-0:04533
+              :abstract-glyph-form-of adobe-japan1-0:04533   .
+        g2.jis-x0208_1978:0x445B
+              :abstract-glyph-form-of [ :context domain:1978    ;
+                                        :target jis-x0208:0x445B  ] .
+        g2.jis-x0208_1983:0x5464
+              :abstract-glyph-form-of [ :context domain:1983    ;
+                                        :target jis-x0208:0x5464  ] .
+        g2.ks-x1001:0x7B3E
+              :abstract-glyph-form-of       ks-x1001:0x7B3E  .
+        g2.jis-x0208_1990:0x5464
+              :abstract-glyph-form-of [ :context domain:1990    ;
+                                        :target jis-x0208:0x5464  ] .
+        g2.cns11643-1:0x5E63
+              :abstract-glyph-form-of     cns11643-1:0x5E63  .
+        g2.jis-x0213-1:0x5464
+              :abstract-glyph-form-of    jis-x0213-1:0x5464  .
+        g2.gb12345:0x3A78
+              :abstract-glyph-form-of        gb12345:0x3A78  .
+        g2.gt:07168
+              :abstract-glyph-form-of             gt:07168   .
+        g2.gt-k:09175
+              :abstract-glyph-form-of           gt-k:09175   .
+        g2.daikanwa:05662
+              :abstract-glyph-form-of       daikanwa:05662   .
+        g2.shinjigen:1531
+              :abstract-glyph-form-of      shinjigen:1531    .
+        repi.daikanwa:05662
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05662 ;
+            .
+        repi.jis-x0208_1978:0x445B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1978    ;
+                              :target jis-x0208:0x445B  ] ;
+            .
+        repi.jis-x0208_1983:0x5464
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1983    ;
+                              :target jis-x0208:0x5464  ] ;
+            .
+        repi.jis-x0208_1990:0x5464
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1990    ;
+                              :target jis-x0208:0x5464  ] ;
+            :eq repi.jis-x0213-1:0x5464   ; # &R-J90-5464;
+            .
+            repi.jis-x0213-1:0x5464
+                          :glyph-image-of    jis-x0213-1:0x5464  .
+        repi.adobe-japan1-0:04533
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:04533 ;
+            .
+        repi.cns11643-1:0x5E63
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-1:0x5E63 ;
+            .
+        repi.gt:07168
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07168 ;
+            :eq repi.gt-k:09175           ; # &R-GT-07168;
+            .
+            repi.gt-k:09175
+                          :glyph-image-of           gt-k:09175   .
+        repi.ks-x1001:0x7B3E
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x7B3E ;
+            :eq repi.ucs_ks:0x58FA        ; # &R-K0-7B3E;
+            .
+            repi.ucs_ks:0x58FA
+                          :glyph-image-of [ :context domain:ks      ;
+                                            :target     ucs:0x58FA  ] .
+        repi.ucs_unicode:0x58FA
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58FA  ] ;
+            .
 
 a.ucs:0x3683
     a chisegg:abstract-character ;
@@ -1833,10 +2633,10 @@ a.ucs:0x58FB
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x58FB         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:00199 ; # &GT-K00199;
-        isd:right    g2.ucs_unicode:0x80E5   # &g2-AJ1-06238;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.gt-k:00199 ; # &GT-K00199;
+            isd:right    g2.ucs_unicode:0x80E5   # &g2-AJ1-06238;
+        ] ;
         :eq g2.adobe-japan1-0:04535   ; # &g2-AJ1-04535;
         :eq g2.ks-x1001:0x5F6B        ; # &g2-AJ1-04535;
         :eq g2.jis-x0208:0x5466       ; # &g2-AJ1-04535;
@@ -1906,10 +2706,10 @@ a.ucs:0x58FB
     g2.cns11643-3:0x3A52
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-3:0x3A52 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:00199 ; # &GT-K00199;
-        isd:right    g2.cns11643-1:0x5328   # &g2-CU+80E5;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.gt-k:00199 ; # &GT-K00199;
+            isd:right    g2.cns11643-1:0x5328   # &g2-CU+80E5;
+        ] ;
         :eq g2.ucs_cns:0x58FB         ; # &g2-CU+58FB;
         .
         g2.ucs_cns:0x58FB
@@ -1945,17 +2745,71 @@ a.ucs:0x2152F
     ideo:radical          33 ; # â¼  
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
-    :eq rep.cns11643-6:0x4752     ; # &I-C6-4752;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.jis-x0208:0x3548 ; # &J97-3548;
+        isd:below    a.jis-x0208:0x3548   # &J97-3548;
+    ] ;
+    .
+
+rep.ucs_iso:0x2152F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2152F ] ;
+    :denotation-of
+        a.ucs:0x2152F        ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes           9 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x5409 ; # 吉
+        isd:below    a.ucs:0x5409   # 吉
+    ] ;
+    :eq rep.cns11643-6:0x4752     ; # &C6-4752;
     :eq rep.daikanwa:05666        ; # &I-M-05666;
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-0:01578 ] ;
+    :subsume
+        g2.ucs_iso:0x2152F   ;
     .
     rep.cns11643-6:0x4752
                :abstract-glyph-of     cns11643-6:0x4752  .
     rep.daikanwa:05666
                :abstract-glyph-of       daikanwa:05666   .
+    g2.ucs_iso:0x2152F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2152F ] ;
+        :eq g2.cns11643-6:0x4752      ; # &g2-M-05666;
+        :eq g2.daikanwa:05666         ; # &g2-M-05666;
+        :subsume
+            repi.daikanwa:05666  ,
+            repi.cns11643-6:0x4752 ,
+            repi.ucs_iso:0x2152F ;
+        .
+        g2.cns11643-6:0x4752
+              :abstract-glyph-form-of     cns11643-6:0x4752  .
+        g2.daikanwa:05666
+              :abstract-glyph-form-of       daikanwa:05666   .
+        repi.daikanwa:05666
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05666 ;
+            .
+        repi.cns11643-6:0x4752
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x4752 ;
+            .
+        repi.ucs_iso:0x2152F
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2152F ] ;
+            .
 
 a.ucs:0x58FC
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x58FC ;
+    :denotation-of
+        bucs:0x58FA          ;
     ideo:radical          33 ; # â¼  
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
@@ -1974,6 +2828,8 @@ a.ucs:0x58FC
     :eq rep.gt-pj-1:21607         ; # &I-GT-07178;
     :eq rep.daikanwa:05667        ; # &I-M-05667;
     :eq rep.shinjigen:1532        ; # 壼
+    :subsume
+        g2.ucs_unicode:0x58FC ;
     .
     rep.adobe-japan1-0:04536
                :abstract-glyph-of adobe-japan1-0:04536   .
@@ -1993,42 +2849,160 @@ a.ucs:0x58FC
                :abstract-glyph-of       daikanwa:05667   .
     rep.shinjigen:1532
                :abstract-glyph-of      shinjigen:1532    .
+    g2.ucs_unicode:0x58FC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x58FC  ] ;
+        :eq g2.adobe-japan1-0:04536   ; # &g2-AJ1-04536;
+        :eq g2.jis-x0208:0x5467       ; # &g2-AJ1-04536;
+        :eq g2.cns11643-2:0x4239      ; # &g2-AJ1-04536;
+        :eq g2.jis-x0213-1:0x5467     ; # &g2-AJ1-04536;
+        :eq g2.gt:07178               ; # &g2-AJ1-04536;
+        :eq g2.daikanwa:05667         ; # &g2-AJ1-04536;
+        :eq g2.shinjigen:1532         ; # &g2-AJ1-04536;
+        :subsume
+            repi.daikanwa:05667  ,
+            repi.jis-x0208:0x5467 ,
+            repi.adobe-japan1-6:04536 ,
+            repi.cns11643-2:0x4239 ,
+            repi.gt:07178        ,
+            repi.ucs_unicode:0x58FC ;
+        .
+        g2.adobe-japan1-0:04536
+              :abstract-glyph-form-of adobe-japan1-0:04536   .
+        g2.jis-x0208:0x5467
+              :abstract-glyph-form-of      jis-x0208:0x5467  .
+        g2.cns11643-2:0x4239
+              :abstract-glyph-form-of     cns11643-2:0x4239  .
+        g2.jis-x0213-1:0x5467
+              :abstract-glyph-form-of    jis-x0213-1:0x5467  .
+        g2.gt:07178
+              :abstract-glyph-form-of             gt:07178   .
+        g2.daikanwa:05667
+              :abstract-glyph-form-of       daikanwa:05667   .
+        g2.shinjigen:1532
+              :abstract-glyph-form-of      shinjigen:1532    .
+        repi.daikanwa:05667
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05667 ;
+            .
+        repi.jis-x0208:0x5467
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x5467 ;
+            :eq repi.jis-x0213-1:0x5467   ; # &R-J0-5467;
+            .
+            repi.jis-x0213-1:0x5467
+                          :glyph-image-of    jis-x0213-1:0x5467  .
+        repi.adobe-japan1-0:04536
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:04536 ;
+            .
+        repi.cns11643-2:0x4239
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-2:0x4239 ;
+            .
+        repi.gt:07178
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07178 ;
+            .
+        repi.ucs_unicode:0x58FC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x58FC  ] ;
+            .
 
-a.ucs:0x2F85B
+a.ucs:0x21533
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x2F85B ;
-    :to.canonical-ucs	a.ucs:0x58F7 ; # 壷
+    :abstract-character-of ucs:0x21533 ;
+    :denotation-of
+        bucs:0x58FA          ;
     ideo:radical          33 ; # â¼  
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    :eq rep.ucs_cns:0x2F85B       ; # 𡔳
+    :eq rep.cns11643-6:0x5157     ; # &I-C6-5157;
+    :eq rep.gt:07175              ; # &I-GT-07175;
+    :eq rep.gt-k:10855            ; # &I-GT-K10855;
+    :eq rep.gt-pj-2:25715         ; # &I-GT-07175;
+    :eq rep.daikanwa:05668        ; # &I-M-05668;
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x58FA         ] ;
     :subsume
-        rep.gt:07175         ,
-        rep.ucs_iso:0x2F85B  ;
+        g2.gt:07175          ,
+        a.ucs:0x2F85B        ;
     .
+    rep.ucs_cns:0x2F85B
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x2F85B ] .
+    rep.cns11643-6:0x5157
+               :abstract-glyph-of     cns11643-6:0x5157  .
     rep.gt:07175
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt:07175 ;
-        :eq rep.cns11643-6:0x5157     ; # &GT-07175;
-        :eq rep.gt-k:10855            ; # &I-GT-K10855;
-        :eq rep.gt-pj-2:25715         ; # &I-GT-07175;
-        :eq rep.daikanwa:05668        ; # &I-M-05668;
-        :from.same           [ :sources chisebib:pianhai-leibian ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x58FA         ] ;
+               :abstract-glyph-of             gt:07175   .
+    rep.gt-k:10855
+               :abstract-glyph-of           gt-k:10855   .
+    rep.gt-pj-2:25715
+               :abstract-glyph-of        gt-pj-2:25715   .
+    rep.daikanwa:05668
+               :abstract-glyph-of       daikanwa:05668   .
+    g2.gt:07175
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:07175 ;
+        :eq g2.ucs_cns:0x2F85B        ; # &g2-GT-07175;
+        :eq g2.cns11643-6:0x5157      ; # &g2-GT-07175;
+        :eq g2.gt-k:10855             ; # &g2-GT-07175;
+        :eq g2.daikanwa:05668         ; # &g2-GT-07175;
+        :subsume
+            repi.daikanwa:05668  ,
+            repi.cns11643-6:0x5157 ,
+            repi.gt:07175        ;
         .
-        rep.cns11643-6:0x5157
-                   :abstract-glyph-of     cns11643-6:0x5157  .
-        rep.gt-k:10855
-                   :abstract-glyph-of           gt-k:10855   .
-        rep.gt-pj-2:25715
-                   :abstract-glyph-of        gt-pj-2:25715   .
-        rep.daikanwa:05668
-                   :abstract-glyph-of       daikanwa:05668   .
-    rep.ucs_iso:0x2F85B
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x2F85B ] ;
+        g2.ucs_cns:0x2F85B
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x2F85B ] .
+        g2.cns11643-6:0x5157
+              :abstract-glyph-form-of     cns11643-6:0x5157  .
+        g2.gt-k:10855
+              :abstract-glyph-form-of           gt-k:10855   .
+        g2.daikanwa:05668
+              :abstract-glyph-form-of       daikanwa:05668   .
+        repi.daikanwa:05668
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:05668 ;
+            .
+        repi.cns11643-6:0x5157
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x5157 ;
+            .
+        repi.gt:07175
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:07175 ;
+            :eq repi.gt-k:10855           ; # &R-GT-07175;
+            .
+            repi.gt-k:10855
+                          :glyph-image-of           gt-k:10855   .
+    a.ucs:0x2F85B
+        a chisegg:abstract-character ;
+        :abstract-character-of ucs:0x2F85B ;
+        :to.canonical-ucs	a.ucs:0x58F7 ; # 壷
+        :eq g2.ucs_iso:0x21533        ; # 壷
+        :subsume
+            repi.ucs_iso:0x21533 ,
+            repi.ucs_iso:0x2F85B ;
         .
+        g2.ucs_iso:0x21533
+              :abstract-glyph-form-of [ :context domain:iso     ;
+                                        :target     ucs:0x21533 ] .
+        repi.ucs_iso:0x21533
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x21533 ] ;
+            .
+        repi.ucs_iso:0x2F85B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2F85B ] ;
+            .
 
 a.ucs:0x21530
     a chisegg:abstract-character ;
@@ -2113,7 +3087,7 @@ a.ucs_component:0x58FD
     ideo:radical          33 ; # â¼  
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
-    :eq a.iwds-1:0330             ; # &IWDS1-330;
+    :eq a.iwds-1:0330             ; # &A-compU+58FD;
     .
     a.iwds-1:0330
            :abstract-character-of         iwds-1:0330    .
@@ -2341,7 +3315,7 @@ a.ucs:0x5900
     :eq rep.daikanwa:07459        ; # &I-M-07459;
     :form-of             [ :sources chisebib:hng ;
                            :target  a.ucs:0x58FD         ] ;
-    :from.same           [ :sources chisebib:cihai ,
+    ideo:same-as         [ :sources chisebib:cihai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x58FD         ] ;
     :subsume
@@ -2357,10 +3331,10 @@ a.ucs:0x5900
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x5900  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.big5-cdp:0x8A4E ; # &CDP-8A4E;
-        isd:below    a.ucs:0x540B   # 吋
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.big5-cdp:0x8A4E ; # &CDP-8A4E;
+            isd:below    a.ucs:0x540B   # 吋
+        ] ;
         :eq g2.daikanwa:07459         ; # &g2-M-07459;
         :subsume
             repi.daikanwa:07459  ,
@@ -2454,10 +3428,10 @@ rep.daikanwa:05678
     g2.daikanwa:05678
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:05678 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     a.ucs:0x58EB ; # 士
-        isd:right    g2.mj:010275   # &g2-MJ010275;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     a.ucs:0x58EB ; # 士
+            isd:right    g2.mj:010275   # &g2-MJ010275;
+        ] ;
         .
 
 rep.cns11643-2:0x4F7A
@@ -2483,10 +3457,10 @@ rep.cns11643-2:0x4F7A
     g2.cns11643-2:0x4F7A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x4F7A ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     a.ucs:0x58EB ; # 士
-        isd:right    g2.cns11643-1:0x5E71   # &g2-CU+5C0A;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     a.ucs:0x58EB ; # 士
+            isd:right    g2.cns11643-1:0x5E71   # &g2-CU+5C0A;
+        ] ;
         :eq g2.ucs_cns:0x58FF         ; # &g2-CU+58FF;
         .
         g2.ucs_cns:0x58FF
@@ -2496,10 +3470,10 @@ rep.cns11643-2:0x4F7A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x58FF  ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     a.ucs:0x58EB ; # 士
-        isd:right    g2.ucs_unicode:0x5C0A   # &g2-UU+5C0A;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     a.ucs:0x58EB ; # 士
+            isd:right    g2.ucs_unicode:0x5C0A   # &g2-UU+5C0A;
+        ] ;
         .
 
 a.ucs:0x2153C
@@ -2524,7 +3498,7 @@ a.ucs:0x2153D
     ideo:total-strokes    15 ;
     :eq rep.cns11643-7:0x2179     ; # &I-C7-2179;
     :eq rep.shinjigen:1535        ; # 𡔽
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x58FD         ] ;
     .
     rep.cns11643-7:0x2179
@@ -2640,6 +3614,40 @@ a.ucs:0x2154B
     rep.daikanwa:05685
                :abstract-glyph-of       daikanwa:05685   .
 
+a.ucs:0x21548
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21548 ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes          15 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:â¿´ ;
+        isd:surround a.ucs:0x21532 ; # 𡔲
+        isd:filling  a.ucs:0x9FB1   # é¾±
+    ] ;
+    .
+
+rep.ucs_iso:0x21548
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21548 ] ;
+    :denotation-of
+        a.ucs:0x21548        ;
+    ideo:radical          33 ; # â¼  
+    ideo:strokes          15 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:â¿´ ;
+        isd:surround rep.ucs-var-001:0x21532 ; # &U-v001+21532;
+        isd:filling  a.ucs:0x9FB1   # é¾±
+    ] ;
+    :subsume
+        g2.ucs_iso:0x21548   ;
+    .
+    g2.ucs_iso:0x21548
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21548 ] ;
+        .
+
 rep.daikanwa:05686
     a chisegg:abstract-glyph ;
     :abstract-glyph-of daikanwa:05686 ;