Sync up with the current environment.
[chise/chiset.git] / Ideograph-R079-Weapon.ttl
index 8e0aee4..a788604 100644 (file)
@@ -15,6 +15,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_iso: <http://www.chise.org/est/view/character/a.ucs@iso=> .
 @prefix a.ucs_jis: <http://www.chise.org/est/view/character/a.ucs@jis=> .
@@ -25,6 +26,7 @@
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
 @prefix rep.ucs_cns: <http://www.chise.org/est/view/character/rep.ucs@cns=> .
 @prefix rep.ucs_jis: <http://www.chise.org/est/view/character/rep.ucs@jis=> .
+@prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
 @prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
 @prefix g2.ucs_iso: <http://www.chise.org/est/view/character/g2.ucs@iso=> .
@@ -34,6 +36,7 @@
 @prefix g2.ucs_jis...1990: <http://www.chise.org/est/view/character/g2.ucs@jis...1990=> .
 @prefix g2.ucs_jis...2000: <http://www.chise.org/est/view/character/g2.ucs@jis...2000=> .
 @prefix g2.ucs_jis...2004: <http://www.chise.org/est/view/character/g2.ucs@jis...2004=> .
+@prefix g2.ucs_JP...hanazono: <http://www.chise.org/est/view/character/g2.ucs@JP...hanazono=> .
 @prefix g2.ucs_ks: <http://www.chise.org/est/view/character/g2.ucs@ks=> .
 @prefix repi.ucs_iso: <http://www.chise.org/est/view/character/repi.ucs@iso=> .
 @prefix repi.ucs_unicode: <http://www.chise.org/est/view/character/repi.ucs@unicode=> .
 @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=> .
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix rep.gt-pj-4: <http://www.chise.org/est/view/character/rep.gt-pj-4=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
+@prefix g2.gt-pj-k2: <http://www.chise.org/est/view/character/g2.gt-pj-k2=> .
 @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.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
 @prefix rep.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
+@prefix rep.big5-cdp-var-002: <http://www.chise.org/est/view/character/rep.big5-cdp-var-002=> .
 @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-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
 @prefix ruimoku-v6: <http://rdf.chise.org/data/ccs/ruimoku-v6/code-point/> .
+@prefix big5-cdp-var-002: <http://rdf.chise.org/data/ccs/big5-cdp-var-002/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
@@ -205,7 +213,7 @@ a.ucs_component:0x6BB3
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
-    :eq a.iwds-1:0220             ; # &IWDS1-220;
+    :eq a.iwds-1:0220             ; # &A-compU+6BB3;
     .
     a.iwds-1:0220
            :abstract-character-of         iwds-1:0220    .
@@ -218,6 +226,10 @@ a.ucs:0x6BB3
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x51E0 ; # &A-compU+51E0;
+        isd:below    a.ucs:0x53C8   # 又
+    ] ;
     .
 
 rep.mj:014908
@@ -228,6 +240,10 @@ rep.mj:014908
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x51E0 ; # 几
+        isd:below    a.ucs:0x53C8   # 又
+    ] ;
     :eq rep.ucs_unicode:0x6BB3    ; # &MJ014908;
     :eq rep.adobe-japan1-0:05364  ; # &I-AJ1-05364;
     :eq rep.jis-x0208:0x5D55      ; # &I-J90-5D55;
@@ -364,21 +380,48 @@ rep.mj:014908
             :glyph-image-of cns11643-2:0x213F ;
             .
 
-rep.hanyo-denshi...ks:188360
+rep.mj:014909
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of hanyo-denshi...ks:188360 ;
+    :abstract-glyph-of mj:014909 ;
     :denotation-of
         a.ucs:0x6BB3         ;
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           0 ;
     ideo:total-strokes     4 ;
-    :rep.decomposition   [ :context domain:hanyo-denshi ;
-                           :target  a.ucs:0x6BB3         ,
-                                    a.ucs:0xE0102        ] ;
-    :eq rep.hanyo-denshi...ks...mf:018836 ; # &HD-KS-188360;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x513F ; # 儿
+        isd:below    a.ucs:0x53C8   # 又
+    ] ;
+    :eq rep.hanyo-denshi...ks:188360 ; # &MJ014909;
+    :subsume
+        g2.mj:014909         ;
     .
-    rep.hanyo-denshi...ks...mf:018836
-               :abstract-glyph-of hanyo-denshi...ks...mf:018836  .
+    rep.hanyo-denshi...ks:188360
+               :abstract-glyph-of hanyo-denshi...ks:188360  .
+    g2.mj:014909
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:014909 ;
+        :rep.decomposition   [ :context domain:hanyo-denshi ;
+                               :target  a.ucs:0x6BB3         ,
+                                        a.ucs:0xE0102        ] ;
+        :eq g2.hanyo-denshi...ks:188360 ; # &g2-MJ014909;
+        :subsume
+            repi.hanyo-denshi...ks:188360 ,
+            repi.mj:014909       ;
+        .
+        g2.hanyo-denshi...ks:188360
+              :abstract-glyph-form-of hanyo-denshi...ks:188360  .
+        repi.hanyo-denshi...ks:188360
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...ks:188360 ;
+            :eq rep.hanyo-denshi...ks...mf:018836 ; # &R-HD-KS-188360;
+            .
+            rep.hanyo-denshi...ks...mf:018836
+                       :abstract-glyph-of hanyo-denshi...ks...mf:018836  .
+        repi.mj:014909
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:014909 ;
+            .
 
 a.ucs:0x3C7C
     a chisegg:abstract-character ;
@@ -547,8 +590,8 @@ rep.adobe-japan1-0:01317
     :eq rep.gt:21302              ; # &I-GT-21302;
     :eq rep.gt-pj-1:12837         ; # &I-GT-21302;
     :eq rep.daikanwa...._.p:16618 ; # &AJ1-01317;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:05367 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:05367 ] ;
     :subsume
         g2.adobe-japan1-0:01317 ,
         g2.ucs_unicode:0x6BB4 ;
@@ -790,7 +833,7 @@ a.ucs:0x23A85
     ideo:total-strokes     9 ;
     :eq rep.cns11643-6:0x3227     ; # &I-C6-3227;
     :eq rep.daikanwa:16620        ; # &I-M-16620;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:05367 ] ;
     :subsume
@@ -839,7 +882,7 @@ a.ucs:0x23A86
     rep.daikanwa:16621
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16621 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xF970         ] ;
         .
@@ -861,7 +904,7 @@ a.ucs:0x6BB6
     :eq rep.cns11643-2:0x2B49     ; # &I-C2-2B49;
     :eq a.big5:0xCF67             ; # &I-B-CF67;
     :eq rep.daikanwa:16622        ; # &I-M-16622;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6CE8         ] ;
     :subsume
@@ -927,6 +970,10 @@ a.ucs:0x23A98
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23A98 ;
     ideo:radical          79 ; # ⽎ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs_component:0x7680 ; # &A-compU+7680;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
     :eq a.jis-x0213-2:0x6E23      ; # 𣪘
     .
     a.jis-x0213-2:0x6E23
@@ -942,20 +989,20 @@ rep.big5-cdp:0x8AD4
     ideo:total-strokes     9 ;
     isd:structure [ a idc:⿰ ;
         isd:left     rep.big5-cdp:0x8B7C ; # &CDP-8B7C;
-        isd:right    a.ucs:0x6BB3   # 殳
+        isd:right    rep.mj:014908   # &MJ014908;
     ] ;
-    :from.simplified     [ :context domain:misc    ;
-                           :target  rep.adobe-japan1-5:17897 ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  rep.adobe-japan1-5:17897 ] ;
     :subsume
         g2.big5-cdp:0x8AD4   ;
     .
     g2.big5-cdp:0x8AD4
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of big5-cdp:0x8AD4 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     rep.big5-cdp:0x8B7C ; # &CDP-8B7C;
-        isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.big5-cdp:0x8B7C ; # &g2-CDP-8B7C;
+            isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
+        ] ;
         .
 
 a.ucs:0x23A88
@@ -1307,9 +1354,9 @@ rep.adobe-japan1-0:02164
     :eq rep.gt-pj-1:15142         ; # &I-GT-21319;
     :eq rep.daikanwa:16629        ; # &I-M-16629;
     :eq rep.shinjigen:3996        ; # &AJ1-02164;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xF970         ] ;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xF970         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0xF970         ] ;
     :subsume
         g2.adobe-japan1-0:02164 ,
@@ -1448,8 +1495,23 @@ a.ucs:0x23A8A
         isd:left     rep.big5-cdp:0x8D44 ; # &CDP-8D44;
         isd:right    a.ucs:0x6BB3   # 殳
     ] ;
-    :eq rep.gt-k:07489            ; # &I-GT-K07489;
-    :eq rep.gt-pj-k2:16207        ; # 𣪊
+    .
+
+rep.ucs_iso:0x23A8A
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23A8A ] ;
+    :denotation-of
+        a.ucs:0x23A8A        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.big5-cdp:0x8D44 ; # &CDP-8D44;
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :eq rep.gt-k:07489            ; # &GT-K07489;
+    :eq rep.gt-pj-k2:16207        ; # &GT-K07489;
     :subsume
         g2.gt-k:07489        ,
         g2.ucs_iso:0x23A8A   ;
@@ -1461,13 +1523,52 @@ a.ucs:0x23A8A
     g2.gt-k:07489
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt-k:07489 ;
+        :eq g2.gt-pj-k2:16207         ; # &g2-GT-K07489;
         .
+        g2.gt-pj-k2:16207
+              :abstract-glyph-form-of       gt-pj-k2:16207   .
     g2.ucs_iso:0x23A8A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x23A8A ] ;
         .
 
+a.ucs:0x2C1A3
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2C1A3 ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.big5-cdp-var-002:0x8C7A ; # &CDP-v002-8C7A;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    ideo:same-as         a.ucs:0x2BA3B        ,
+                         a.ucs:0x6BB5         ;
+    .
+
+rep.ucs_JP...hanazono:0x2C1A3
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2C1A3 ] ;
+    :denotation-of
+        a.ucs:0x2C1A3        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes           6 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.big5-cdp-var-002:0x8C7A ; # &CDP-v002-8C7A;
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2C1A3 ;
+    .
+    g2.ucs_JP...hanazono:0x2C1A3
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2C1A3 ] ;
+        .
+
 a.ucs:0x23A8B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23A8B ;
@@ -1476,7 +1577,7 @@ a.ucs:0x23A8B
     ideo:total-strokes    11 ;
     :eq rep.cns11643-4:0x324C     ; # &I-C4-324C;
     :eq rep.daikanwa:16630        ; # &I-M-16630;
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01657 ] ;
     :subsume
@@ -1539,21 +1640,66 @@ a.ucs:0x3C80
         isd:left     a.ucs:0x8FB0 ; # 辰
         isd:right    a.ucs:0x6BB3   # 殳
     ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "siN" ) ;
+                         ] ;
+    .
+
+rep.mj:001981
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:001981 ;
+    :denotation-of
+        a.ucs:0x3C80         ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes           7 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x8FB0 ; # 辰
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :eq rep.ucs_unicode:0x3C80    ; # &MJ001981;
+    :eq rep.cns11643-4:0x324F     ; # &I-C4-324F;
+    :eq rep.koseki:188690         ; # &MJ001981;
+    :eq rep.daikanwa:16632        ; # &I-M-16632;
     :subsume
-        rep.daikanwa:16632   ,
-        rep.cns11643-4:0x324F ;
+        g2.daikanwa:16632    ,
+        g2.mj:001981         ,
+        g2.ucs_unicode:0x3C80 ,
+        g2.cns11643-4:0x324F ;
     .
+    rep.ucs_unicode:0x3C80
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x3C80  ] .
+    rep.cns11643-4:0x324F
+               :abstract-glyph-of     cns11643-4:0x324F  .
+    rep.koseki:188690
+               :abstract-glyph-of         koseki:188690  .
     rep.daikanwa:16632
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:16632 ;
+               :abstract-glyph-of       daikanwa:16632   .
+    g2.daikanwa:16632
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:16632 ;
         .
-    rep.cns11643-4:0x324F
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-4:0x324F ;
-        :eq rep.ucs_unicode:0x3C80    ; # &C4-324F;
+    g2.mj:001981
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:001981 ;
+        :eq g2.koseki:188690          ; # &g2-MJ001981;
         .
-        rep.ucs_unicode:0x3C80
-                   :abstract-glyph-of [ :context domain:unicode ;
+        g2.koseki:188690
+              :abstract-glyph-form-of         koseki:188690  .
+    g2.ucs_unicode:0x3C80
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3C80  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        .
+    g2.cns11643-4:0x324F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-4:0x324F ;
+        :eq g2.ucs_cns:0x3C80         ; # &g2-CU+3C80;
+        .
+        g2.ucs_cns:0x3C80
+              :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x3C80  ] .
 
 a.ucs:0x6BB8
@@ -1578,7 +1724,7 @@ rep.jis-x0212:0x4630
     ideo:total-strokes    11 ;
     isd:structure [ a idc:⿰ ;
         isd:left     rep.adobe-japan1-0:02656 ; # &AJ1-02656;
-        isd:right    a.ucs:0x6BB3   # 殳
+        isd:right    rep.mj:014908   # &MJ014908;
     ] ;
     :eq rep.ucs_unicode:0x6BB8    ; # &JSP-4630;
     :eq rep.cns11643-4:0x324E     ; # &I-C4-324E;
@@ -1601,10 +1747,10 @@ rep.jis-x0212:0x4630
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:jis     ;
                                   :target     ucs:0x6BB8  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.ucs_unicode:0x58F0 ; # &g2-AJ1-02656;
-        isd:right    g2.mj:014908   # &g2-MJ014908;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.ucs_unicode:0x58F0 ; # &g2-AJ1-02656;
+            isd:right    g2.mj:014908   # &g2-MJ014908;
+        ] ;
         :eq g2.jis-x0212:0x4630       ; # &g2-JSP-4630;
         :eq g2.big5-cdp:0x8BE0        ; # &g2-JSP-4630;
         :eq g2.daikanwa:16633         ; # &g2-JSP-4630;
@@ -1635,10 +1781,10 @@ rep.jis-x0212:0x4630
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x6BB8  ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.ucs_unicode:0x58F0 ; # &g2-AJ1-02656;
-        isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.ucs_unicode:0x58F0 ; # &g2-AJ1-02656;
+            isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.cns11643-4:0x324E      ; # &g2-UU+6BB8;
         :subsume
@@ -1797,7 +1943,7 @@ a.ucs:0x23A8E
     rep.daikanwa:16636
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16636 ;
-        :from.wrong          [ :sources chisebib:zhengzitong ,
+        ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:04033   ] ;
         .
@@ -1829,7 +1975,7 @@ rep.ucs_iso:0x23A8F
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x4076     ; # &C6-4076;
     :eq rep.daikanwa:16637        ; # &I-M-16637;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01526 ] ;
     :subsume
@@ -2003,7 +2149,7 @@ a.ucs:0x23A96
     rep.daikanwa:16641
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16641 ;
-        :from.same           [ :sources chisebib:wuyin-pianhai ,
+        ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0xF970         ] ;
         .
@@ -2244,10 +2390,10 @@ rep.cbeta:00906
     g2.cbeta:00906
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cbeta:00906 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x6BCF ; # 每
-        isd:right    g2.mj:014908   # &g2-MJ014908;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x6BCF ; # 每
+            isd:right    g2.mj:014908   # &g2-MJ014908;
+        ] ;
         .
 
 a.ucs:0x3C81
@@ -2483,8 +2629,8 @@ a.ucs:0x6BBB
     :eq rep.gt-k:07726            ; # &I-GT-K07726;
     :eq rep.gt-pj-1:13132         ; # &I-GT-21325;
     :eq rep.shinjigen:3999        ; # 殻
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x6BBC         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x6BBC         ] ;
     :subsume
         g2.gt:21325          ,
         g2.ucs_unicode:0x6BBB ,
@@ -2712,7 +2858,7 @@ a.ucs:0x23A99
     rep.daikanwa:16648
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16648 ;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16645   ] ;
         .
@@ -2738,7 +2884,7 @@ a.ucs:0x23A9B
     rep.daikanwa:16649
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16649 ;
-        :from.same           [ :sources chisebib:zhonghua-dazidian ,
+        ideo:same-as         [ :sources chisebib:zhonghua-dazidian ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:04033   ] ;
         .
@@ -2824,9 +2970,9 @@ rep.ruimoku-v6:0xE01E
     ideo:total-strokes    12 ;
     isd:structure [ a idc:⿹ ;
         isd:surround [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x81FC ; # 臼
-                :right    a.ucs:0x6BB3   # 殳
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x81FC ; # 臼
+                isd:right    a.ucs:0x6BB3   # 殳
             ]
         ] ;
         isd:filling  a.ucs:0x53B6   # 厶
@@ -3097,20 +3243,27 @@ a.ucs:0x23AA0
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x282A5 ; # 𨊥
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
     :eq rep.cns11643-6:0x5421     ; # &I-C6-5421;
+    :eq rep.big5-cdp:0x8CF6       ; # &I-CDP-8CF6;
     :eq rep.gt:21354              ; # &I-GT-21354;
     :eq rep.gt-k:10381            ; # &I-GT-K10381;
     :eq rep.gt-pj-4:17698         ; # &I-GT-21354;
     :eq rep.daikanwa:16652        ; # &I-M-16652;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6BC4         ] ;
     :subsume
         g2.gt:21354          ,
-        g2.ucs_unicode:0x23AA0 ;
+        g2.ucs_iso:0x23AA0   ;
     .
     rep.cns11643-6:0x5421
                :abstract-glyph-of     cns11643-6:0x5421  .
+    rep.big5-cdp:0x8CF6
+               :abstract-glyph-of       big5-cdp:0x8CF6  .
     rep.gt:21354
                :abstract-glyph-of             gt:21354   .
     rep.gt-k:10381
@@ -3137,26 +3290,34 @@ a.ucs:0x23AA0
             a chisegg:glyph-image ;
             :glyph-image-of gt:21354 ;
             .
-    g2.ucs_unicode:0x23AA0
+    g2.ucs_iso:0x23AA0
         a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x23AA0 ] ;
-        :eq g2.cns11643-6:0x5421      ; # &g2-UU+23AA0;
+        :eq g2.cns11643-6:0x5421      ; # &g2-CDP-8CF6;
+        :eq g2.big5-cdp:0x8CF6        ; # &g2-CDP-8CF6;
         :subsume
-            repi.ucs_unicode:0x23AA0 ,
-            repi.cns11643-6:0x5421 ;
+            repi.big5-cdp:0x8CF6 ,
+            repi.cns11643-6:0x5421 ,
+            repi.ucs_iso:0x23AA0 ;
         .
         g2.cns11643-6:0x5421
               :abstract-glyph-form-of     cns11643-6:0x5421  .
-        repi.ucs_unicode:0x23AA0
+        g2.big5-cdp:0x8CF6
+              :abstract-glyph-form-of       big5-cdp:0x8CF6  .
+        repi.big5-cdp:0x8CF6
             a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x23AA0 ] ;
+            :glyph-image-of big5-cdp:0x8CF6 ;
             .
         repi.cns11643-6:0x5421
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-6:0x5421 ;
             .
+        repi.ucs_iso:0x23AA0
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23AA0 ] ;
+            .
 
 a.ucs:0x23AA1
     a chisegg:abstract-character ;
@@ -3172,7 +3333,7 @@ a.ucs:0x23AA1
     rep.daikanwa:16653
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16653 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x22F81        ] ;
         .
@@ -3186,9 +3347,31 @@ a.ucs:0x23AA1
         :abstract-glyph-of cns11643-6:0x5422 ;
         .
 
+a.ucs_cognate:0x6BC0
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x6BC0  ] ;
+    ideo:radical          79 ; # ⽎ 
+    .
+
+a.ucs_iwds-1:0x6BC0
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x6BC0  ] ;
+    :denotation-of
+        a.ucs_cognate:0x6BC0 ;
+    ideo:radical          79 ; # ⽎ 
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs_iwds-1:0x2C6F8 ; # &A-IWDSU+2C6F8;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
 a.ucs:0x6BC0
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6BC0 ;
+    :denotation-of
+        a.ucs_iwds-1:0x6BC0  ;
     ideo:radical          79 ; # ⽎ 
     .
 
@@ -3200,7 +3383,6 @@ rep.adobe-japan1-0:04509
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           9 ;
     ideo:total-strokes    13 ;
-    :eq a.ucs_iwds-1:0x6BC0       ; # &AJ1-04509;
     :eq rep.ucs_unicode:0x6BC0    ; # &AJ1-04509;
     :eq rep.jis-x0208:0x544C      ; # &I-J90-544C;
     :eq rep.cns11643-1:0x645A     ; # &I-C1-645A;
@@ -3210,14 +3392,12 @@ rep.adobe-japan1-0:04509
     :eq rep.gt-k:10300            ; # &I-GT-K10300;
     :eq rep.gt-pj-1:21580         ; # &I-GT-21351;
     :eq rep.daikanwa:16654        ; # &I-M-16654;
+    ideo:interchangeable-form-of rep.daikanwa:35732   ;
     :subsume
         g2.adobe-japan1-0:04509 ,
         g2.ucs_unicode:0x6BC0 ,
         repi.hng-kar:10080   ;
     .
-    a.ucs_iwds-1:0x6BC0
-           :abstract-character-of [ :context domain:iwds-1  ;
-                                    :target     ucs:0x6BC0  ] .
     rep.ucs_unicode:0x6BC0
                :abstract-glyph-of [ :context domain:unicode ;
                                     :target     ucs:0x6BC0  ] .
@@ -3317,16 +3497,16 @@ repi.hng-khm:00730
     a chisegg:glyph-image ;
     :glyph-image-of hng-khm:00730 ;
     :denotation-of
-        a.ucs:0x6BC0         ;
+        a.ucs_cognate:0x6BC0 ;
     ideo:radical          79 ; # ⽎ 
     ideo:strokes           9 ;
     ideo:total-strokes    16 ;
     isd:structure [ a idc:⿰ ;
         isd:left     rep.big5-cdp:0x8DB4 ; # &CDP-8DB4;
         isd:right    [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x206A4 ; # 𠚤
-                :below    a.ucs:0x6535   # 攵
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x206A4 ; # 𠚤
+                isd:below    a.ucs:0x6535   # 攵
             ]
         ]
     ] ;
@@ -3391,7 +3571,7 @@ a.ucs:0x23AA4
     rep.daikanwa:16657
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16657 ;
-        :from.wrong          [ :sources chisebib:kangxi ,
+        ideo:wrong-form-of   [ :sources chisebib:kangxi ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x5253         ] ;
         .
@@ -3477,6 +3657,8 @@ a.ucs:0x23AA9
 a.ucs:0x6BC1
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x6BC1 ;
+    :denotation-of
+        a.ucs_iwds-1:0x6BC0  ;
     ideo:radical          79 ; # ⽎ 
     .
 
@@ -3492,7 +3674,7 @@ rep.cns11643-3:0x4226
     :eq rep.gb2312:0x3B59         ; # &C3-4226;
     :eq rep.ks-x1001:0x7D43       ; # &I-K0-7D43;
     :eq rep.daikanwa:16661        ; # &I-M-16661;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04509 ] ;
     :subsume
@@ -3621,9 +3803,9 @@ repi.hng-khi:04520
     ideo:total-strokes    13 ;
     isd:structure [ a idc:⿰ ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x65E7 ; # 旧
-                :below    a.ucs:0x738B   # 王
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x65E7 ; # 旧
+                isd:below    a.ucs:0x738B   # 王
             ]
         ] ;
         isd:right    rep.ucs-itaiji-001:0x6534   # &U-i001+6534;
@@ -3704,7 +3886,7 @@ a.ucs:0x23AB0
     ideo:total-strokes    14 ;
     :eq rep.cns11643-6:0x5E21     ; # &I-C6-5E21;
     :eq rep.daikanwa:16664        ; # &I-M-16664;
-    :from.same           [ :sources chisebib:kangxi ,
+    ideo:same-as         [ :sources chisebib:kangxi ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-5:17314 ] ;
     :subsume
@@ -3819,7 +4001,7 @@ a.ucs:0x23AB1
     rep.daikanwa:16666
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16666 ;
-        :from.wrong          [ :sources chisebib:zhengzitong ,
+        ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x6571         ] ;
         .
@@ -3976,7 +4158,7 @@ a.ucs:0x23AB3
     rep.daikanwa:16670
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16670 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:04033   ] ;
         .
@@ -4007,7 +4189,7 @@ rep.ucs_iso:0x23AB7
     ideo:total-strokes    14 ;
     :eq rep.cns11643-6:0x5E22     ; # &C6-5E22;
     :eq rep.daikanwa:16671        ; # &I-M-16671;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04509 ] ;
     :subsume
@@ -4404,7 +4586,7 @@ a.ucs:0x23AB8
     ideo:total-strokes    15 ;
     :eq rep.cns11643-7:0x242D     ; # &I-C7-242D;
     :eq rep.daikanwa:16675        ; # &I-M-16675;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9DC7         ] ;
     :subsume
@@ -4504,7 +4686,7 @@ a.ucs:0x23ABB
     rep.daikanwa:16678
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16678 ;
-        :from.wrong          [ :sources chisebib:zhengzitong ,
+        ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16708   ] ;
         .
@@ -4523,11 +4705,31 @@ a.ucs:0x6BC7
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x4286 ; # 䊆
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
     :eq rep.adobe-japan1-5:17899  ; # &I-AJ1-17899;
     :eq rep.cns11643-2:0x5770     ; # &I-C2-5770;
     :eq rep.jis-x0213-2:0x6E26    ; # &I-JX2-6E26;
     :eq a.big5:0xE9E5             ; # &I-B-E9E5;
     :eq rep.daikanwa:16679        ; # &I-M-16679;
+    :form-of             rep.mj:044390        ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  [ :target  a.ucs:0x25F66        ;
+                                      :sources chisebib:zhengzitong ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x25DB5        ;
+                                      :sources chisebib:zhengzitong ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x25F39        ;
+                                      :sources chisebib:jiyun ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x25F42        ;
+                                      :sources chisebib:kangxi ,
+                                               chisebib:daikanwa ] ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  rep.mj:044390        ] ;
     :subsume
         g2.adobe-japan1-5:17899 ,
         g2.ucs_unicode:0x6BC7 ;
@@ -4607,7 +4809,7 @@ a.ucs:0x23ABC
     rep.daikanwa:16680
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16680 ;
-        :from.wrong          [ :sources chisebib:jiyun-kaozheng ,
+        ideo:wrong-form-of   [ :sources chisebib:jiyun-kaozheng ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x22FE6        ] ;
         .
@@ -4710,7 +4912,7 @@ a.ucs:0x23ABD
     rep.daikanwa:16682
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16682 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x657D         ] ;
         .
@@ -4786,10 +4988,10 @@ a.ucs:0x3C87
         :abstract-glyph-of daikanwa:16685 ;
         :form-of             [ :sources chisebib:jiyun ;
                                :target  a.ucs:0x2A533        ] ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2A533        ] ;
-        :from.vulgar         [ :sources chisebib:zhengzitong ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:07453 ] ;
         .
@@ -4857,7 +5059,7 @@ a.ucs:0x23ABF
     rep.daikanwa:16687
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16687 ;
-        :from.wrong          [ :sources chisebib:jiyun-kaozheng ,
+        ideo:wrong-form-of   [ :sources chisebib:jiyun-kaozheng ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x22FE7        ] ;
         .
@@ -4920,7 +5122,7 @@ a.ucs:0x23AC1
     ideo:total-strokes    16 ;
     :eq rep.cns11643-7:0x2F22     ; # &I-C7-2F22;
     :eq rep.daikanwa:16689        ; # &I-M-16689;
-    :from.same           [ :sources chisebib:zihui-bu ,
+    ideo:same-as         [ :sources chisebib:zihui-bu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6572         ] ;
     :subsume
@@ -4956,6 +5158,90 @@ a.ucs:0x23AC1
                               :target     ucs:0x23AC1 ] ;
             .
 
+a.ucs:0x23AC2
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23AC2 ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    :subsume
+        g2.ucs_iso:0x23AC2   ;
+    .
+    g2.ucs_iso:0x23AC2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23AC2 ] ;
+        .
+
+a.ucs:0x23AC4
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23AC4 ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs-itaiji-001:0x6614 ; # &A-U-i001+6614;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
+rep.ucs_iso:0x23AC4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23AC4 ] ;
+    :denotation-of
+        a.ucs:0x23AC4        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.ucs-itaiji-002:0x6614 ; # &U-i002+6614;
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x23AC4   ;
+    .
+    g2.ucs_iso:0x23AC4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23AC4 ] ;
+        .
+
+a.ucs:0x23ACB
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x23ACB ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x28910 ; # 𨤐
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
+rep.ucs_iso:0x23ACB
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23ACB ] ;
+    :denotation-of
+        a.ucs:0x23ACB        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          12 ;
+    ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     rep.ucs_iso:0x28910 ; # &C5-3D27;
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :from.unknown        a.ucs:0x7A40         ;
+    :subsume
+        g2.ucs_iso:0x23ACB   ;
+    .
+    g2.ucs_iso:0x23ACB
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23ACB ] ;
+        .
+
 a.ucs:0x23AC9
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23AC9 ;
@@ -5024,7 +5310,7 @@ a.daikanwa:16692
     rep.daikanwa:16692
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16692 ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:07012   ] ;
         .
@@ -5093,7 +5379,7 @@ a.ucs:0x23AD0
     rep.daikanwa:16694
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16694 ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16639   ] ;
         .
@@ -5112,25 +5398,65 @@ a.ucs:0x23AD1
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7B97 ; # 算
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "saN" ) ;
+                         ] ;
+    .
+
+rep.ucs_iso:0x23AD1
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x23AD1 ] ;
+    :denotation-of
+        a.ucs:0x23AD1        ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          14 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x7B97 ; # 算
+        isd:right    rep.mj:014908   # &MJ014908;
+    ] ;
+    :eq rep.cns11643-7:0x4033     ; # &C7-4033;
+    :eq rep.daikanwa:16695        ; # &I-M-16695;
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
+                                    chisebib:daikanwa ;
+                           :target  rep.ucs_iso:0x23014  ] ;
     :subsume
-        rep.daikanwa:16695   ,
-        rep.ucs_iso:0x23AD1  ;
+        g2.daikanwa:16695    ,
+        g2.ucs_iso:0x23AD1   ;
     .
+    rep.cns11643-7:0x4033
+               :abstract-glyph-of     cns11643-7:0x4033  .
     rep.daikanwa:16695
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:16695 ;
-        :from.wrong          [ :sources chisebib:zhengzitong ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x23014        ] ;
+               :abstract-glyph-of       daikanwa:16695   .
+    g2.daikanwa:16695
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:16695 ;
         .
-    rep.ucs_iso:0x23AD1
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x23AD1 ] ;
-        :eq rep.cns11643-7:0x4033     ; # &C7-4033;
+    g2.ucs_iso:0x23AD1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x23AD1 ] ;
+        :eq g2.cns11643-7:0x4033      ; # &g2-IU-00023AD1;
+        :subsume
+            repi.cns11643-7:0x4033 ,
+            repi.ucs_iso:0x23AD1 ;
         .
-        rep.cns11643-7:0x4033
-                   :abstract-glyph-of     cns11643-7:0x4033  .
+        g2.cns11643-7:0x4033
+              :abstract-glyph-form-of     cns11643-7:0x4033  .
+        repi.cns11643-7:0x4033
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-7:0x4033 ;
+            .
+        repi.ucs_iso:0x23AD1
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x23AD1 ] ;
+            .
 
 a.ucs:0x23AD2
     a chisegg:abstract-character ;
@@ -5180,7 +5506,7 @@ a.daikanwa:16697
     rep.daikanwa:16697
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16697 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:47917   ] ;
         .
@@ -5205,25 +5531,74 @@ a.ucs:0x3C8A
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          14 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs_iwds-1:0x777F ; # &A-IWDSU+777F;
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    .
+
+rep.daikanwa:16698
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of daikanwa:16698 ;
+    :denotation-of
+        a.ucs:0x3C8A         ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          14 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x25220 ; # 𥈠
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    ideo:wrong-form-of   [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x53E1         ] ;
     :subsume
-        rep.daikanwa:16698   ,
-        rep.cns11643-3:0x5825 ;
+        g2.daikanwa:16698    ;
     .
-    rep.daikanwa:16698
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:16698 ;
-        :from.wrong          [ :sources chisebib:zihui-bu ,
-                                        chisebib:daikanwa ;
-                               :target  a.ucs:0x53E1         ] ;
+    g2.daikanwa:16698
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:16698 ;
         .
-    rep.cns11643-3:0x5825
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x5825 ;
-        :eq rep.ucs_unicode:0x3C8A    ; # &C3-5825;
+
+rep.cns11643-3:0x5825
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-3:0x5825 ;
+    :denotation-of
+        a.ucs:0x3C8A         ;
+    ideo:radical          79 ; # ⽎ 
+    ideo:strokes          14 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x777F ; # 睿
+        isd:right    a.ucs:0x6BB3   # 殳
+    ] ;
+    :eq rep.ucs_unicode:0x3C8A    ; # &C3-5825;
+    :subsume
+        g2.ucs_unicode:0x3C8A ;
+    .
+    rep.ucs_unicode:0x3C8A
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x3C8A  ] .
+    g2.ucs_unicode:0x3C8A
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3C8A  ] ;
+        :eq g2.cns11643-3:0x5825      ; # &g2-UU+3C8A;
+        :subsume
+            repi.cns11643-3:0x5825 ,
+            repi.ucs_unicode:0x3C8A ;
         .
-        rep.ucs_unicode:0x3C8A
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x3C8A  ] .
+        g2.cns11643-3:0x5825
+              :abstract-glyph-form-of     cns11643-3:0x5825  .
+        repi.cns11643-3:0x5825
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-3:0x5825 ;
+            .
+        repi.ucs_unicode:0x3C8A
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x3C8A  ] ;
+            .
 
 a.ucs:0x23AD7
     a chisegg:abstract-character ;
@@ -5423,7 +5798,7 @@ a.ucs:0x23AD8
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16702 ;
         :eq rep.cbeta:01083           ; # &I-CB01083;
-        :from.same           [ :sources chisebib:zihui-bu ,
+        ideo:same-as         [ :sources chisebib:zihui-bu ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:16693   ] ;
         .
@@ -5448,9 +5823,9 @@ repi.hng-khi:04510
     ideo:total-strokes    19 ;
     isd:structure [ a idc:⿱ ;
         isd:above    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x533B ; # 医
-                :right    rep.ucs-itaiji-001:0x20B1B   # &U-i001+20B1B;
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x533B ; # 医
+                isd:right    rep.ucs-itaiji-001:0x20B1B   # &U-i001+20B1B;
             ]
         ] ;
         isd:below    a.ucs:0x5750   # 坐
@@ -5489,9 +5864,9 @@ a.ucs:0x23ADA
     ideo:total-strokes    19 ;
     :eq rep.cns11643-7:0x474C     ; # &I-C7-474C;
     :eq rep.daikanwa:16704        ; # &I-M-16704;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  a.ucs:0x6BC5         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x6BC5         ] ;
     :subsume
         g2.daikanwa:16704    ,
         g2.ucs_iso:0x23ADA   ;
@@ -5592,7 +5967,7 @@ rep.mj:038948
     :eq rep.big5-cdp:0x8DD4       ; # &I-CDP-8DD4;
     :eq rep.koseki:189400         ; # &MJ038948;
     :eq rep.daikanwa:16707        ; # &I-M-16707;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07059 ] ;
     :subsume
@@ -5671,7 +6046,7 @@ rep.daikanwa:16708
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          16 ;
     ideo:total-strokes    20 ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.jis-x0212:0x5547 ] ;
     :subsume
@@ -5740,7 +6115,7 @@ a.ucs:0x23AE1
     rep.daikanwa:16709
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16709 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:25834   ] ;
         .
@@ -5838,7 +6213,7 @@ rep.ucs_iso:0x23AE2
     :eq rep.cns11643-4:0x6A4D     ; # &C4-6A4D;
     :eq rep.daikanwa:16710        ; # &I-M-16710;
     :eq rep.cbeta:02815           ; # &I-CB02815;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7C62         ] ;
     :subsume
@@ -5854,10 +6229,10 @@ rep.ucs_iso:0x23AE2
     g2.daikanwa:16710
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:16710 ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x7C3D ; # 簽
-        isd:right    g2.mj:014908   # &g2-MJ014908;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x7C3D ; # 簽
+            isd:right    g2.mj:014908   # &g2-MJ014908;
+        ] ;
         :eq g2.cbeta:02815            ; # &g2-M-16710;
         :subsume
             repi.daikanwa:16710  ,
@@ -5877,10 +6252,10 @@ rep.ucs_iso:0x23AE2
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x23AE2 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     a.ucs:0x7C3D ; # 簽
-        isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     a.ucs:0x7C3D ; # 簽
+            isd:right    g2.ucs_unicode:0x6BB3   # &g2-UU+6BB3;
+        ] ;
         :eq g2.cns11643-4:0x6A4D      ; # &g2-IU-00023AE2;
         :subsume
             repi.ucs_iso:0x23AE2 ,
@@ -5940,7 +6315,7 @@ a.ucs:0x23AE3
     rep.daikanwa:16712
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:16712 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x2A533        ] ;
         .
@@ -5966,7 +6341,7 @@ a.ucs:0x23AE4
     ] ;
     :eq rep.cns11643-7:0x5B64     ; # &I-C7-5B64;
     :eq rep.daikanwa:16713        ; # &I-M-16713;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9F1F         ] ;
     :subsume
@@ -5981,18 +6356,18 @@ a.ucs:0x23AE4
     g2.daikanwa:16713
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:16713 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_jis:0x6BB8 ; # &g2-JSP-4630;
-        isd:below    g2.ucs_unicode:0x767B   # &g2-AJ1-03146;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_jis:0x6BB8 ; # &g2-JSP-4630;
+            isd:below    g2.ucs_unicode:0x767B   # &g2-AJ1-03146;
+        ] ;
         .
     g2.cns11643-7:0x5B64
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-7:0x5B64 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x6BB8 ; # &g2-UU+6BB8;
-        isd:below    g2.ucs_unicode:0x767B   # &g2-AJ1-03146;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x6BB8 ; # &g2-UU+6BB8;
+            isd:below    g2.ucs_unicode:0x767B   # &g2-AJ1-03146;
+        ] ;
         :eq g2.ucs_cns:0x23AE4        ; # &g2-CU+23AE4;
         .
         g2.ucs_cns:0x23AE4
@@ -6012,7 +6387,7 @@ a.ucs:0x23AE6
     ideo:total-strokes    24 ;
     :eq rep.cns11643-7:0x5E73     ; # &I-C7-5E73;
     :eq rep.daikanwa:16715        ; # &I-M-16715;
-    :from.same           [ :sources chisebib:shuowen ,
+    ideo:same-as         [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01829 ] ;
     :subsume
@@ -6098,7 +6473,7 @@ a.ucs:0x23AE9
     ideo:total-strokes    25 ;
     :eq rep.cns11643-7:0x6076     ; # &I-C7-6076;
     :eq rep.daikanwa:16718        ; # &I-M-16718;
-    :from.same           [ :sources chisebib:longkanshoujian ,
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:07059 ] ;
     :subsume
@@ -6146,7 +6521,7 @@ rep.ucs_iso:0x23AEB
     ideo:strokes          23 ;
     ideo:total-strokes    27 ;
     :eq rep.daikanwa:16719        ; # &M-16719;
-    :from.same           [ :sources chisebib:sauzhenyujing ,
+    ideo:same-as         [ :sources chisebib:sauzhenyujing ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:038948        ] ;
     :subsume
@@ -6193,19 +6568,48 @@ a.ucs:0x23AEA
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x23AEA ;
     ideo:radical          79 ; # ⽎ 
-    ideo:strokes          23 ;
-    ideo:total-strokes    27 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x7A40 ; # 穀
+        isd:below    a.ucs:0x6703   # 會
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "wi" ) ;
+                         ] ;
     .
 
-rep.daikanwa:16720
+rep.mj:038958
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:16720 ;
+    :abstract-glyph-of mj:038958 ;
     :denotation-of
         a.ucs:0x23AEA        ;
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          23 ;
     ideo:total-strokes    27 ;
-    .
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x7A40 ; # &U-i001+7A40;
+        isd:below    rep.adobe-japan1-0:04171   # &AJ1-04171;
+    ] ;
+    :eq rep.koseki:189520         ; # &MJ038958;
+    :eq rep.daikanwa:16720        ; # &I-M-16720;
+    :subsume
+        g2.daikanwa:16720    ,
+        g2.mj:038958         ;
+    .
+    rep.koseki:189520
+               :abstract-glyph-of         koseki:189520  .
+    rep.daikanwa:16720
+               :abstract-glyph-of       daikanwa:16720   .
+    g2.daikanwa:16720
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:16720 ;
+        .
+    g2.mj:038958
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:038958 ;
+        :eq g2.koseki:189520          ; # &g2-MJ038958;
+        .
+        g2.koseki:189520
+              :abstract-glyph-form-of         koseki:189520  .
 
 rep.ucs_iso:0x23AEA
     a chisegg:abstract-glyph ;
@@ -6216,6 +6620,10 @@ rep.ucs_iso:0x23AEA
     ideo:radical          79 ; # ⽎ 
     ideo:strokes          23 ;
     ideo:total-strokes    27 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x2F959 ; # 穀
+        isd:below    rep.adobe-japan1-0:04171   # &AJ1-04171;
+    ] ;
     :subsume
         rep.cbeta:00751      ,
         rep.cbeta:00988      ,