From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 16 May 2018 03:05:01 +0000 (+0900)
Subject: Sync up with the current environment.
X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fchiset.git;a=commitdiff_plain;h=8ad23daa61e505cd7b0031d2530e8260cb6d0978

Sync up with the current environment.
---

diff --git a/Ideograph-R013-Down-Box.ttl b/Ideograph-R013-Down-Box.ttl
index eeb13ea..6aee7fe 100644
--- a/Ideograph-R013-Down-Box.ttl
+++ b/Ideograph-R013-Down-Box.ttl
@@ -15,6 +15,7 @@
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_iso: <http://www.chise.org/est/view/character/a.ucs@iso=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
@@ -29,6 +30,9 @@
 @prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix rep.ucs_ks: <http://www.chise.org/est/view/character/rep.ucs@ks=> .
 @prefix rep.ucs_big5: <http://www.chise.org/est/view/character/rep.ucs@big5=> .
+@prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
+@prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
+@prefix g.ucs_jis: <http://www.chise.org/est/view/character/g.ucs@jis=> .
 @prefix g2.ucs_iso: <http://www.chise.org/est/view/character/g2.ucs@iso=> .
 @prefix g2.ucs_unicode: <http://www.chise.org/est/view/character/g2.ucs@unicode=> .
 @prefix g2.ucs_cns: <http://www.chise.org/est/view/character/g2.ucs@cns=> .
@@ -39,6 +43,7 @@
 @prefix repi.ucs_unicode: <http://www.chise.org/est/view/character/repi.ucs@unicode=> .
 @prefix repi.ucs_ks: <http://www.chise.org/est/view/character/repi.ucs@ks=> .
 @prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
+@prefix g.mj: <http://www.chise.org/est/view/character/g.mj=> .
 @prefix g2.mj: <http://www.chise.org/est/view/character/g2.mj=> .
 @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=> .
@@ -47,6 +52,7 @@
 @prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
 @prefix g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
 @prefix g2.adobe-japan1-5: <http://www.chise.org/est/view/character/g2.adobe-japan1-5=> .
+@prefix g.adobe-japan1-5: <http://www.chise.org/est/view/character/g.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 rep.jis-x0208_1978...-4pr: <http://www.chise.org/est/view/character/rep.jis-x0208@1978...-4pr=> .
@@ -64,6 +70,8 @@
 @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=> .
 @prefix rep.jis-x0212: <http://www.chise.org/est/view/character/rep.jis-x0212=> .
+@prefix g2.jis-x0212: <http://www.chise.org/est/view/character/g2.jis-x0212=> .
+@prefix repi.jis-x0212: <http://www.chise.org/est/view/character/repi.jis-x0212=> .
 @prefix rep.iso-ir165: <http://www.chise.org/est/view/character/rep.iso-ir165=> .
 @prefix g2.iso-ir165: <http://www.chise.org/est/view/character/g2.iso-ir165=> .
 @prefix rep.jis-x0208_1990: <http://www.chise.org/est/view/character/rep.jis-x0208@1990=> .
@@ -85,6 +93,7 @@
 @prefix rep.cns11643-4: <http://www.chise.org/est/view/character/rep.cns11643-4=> .
 @prefix g2.cns11643-4: <http://www.chise.org/est/view/character/g2.cns11643-4=> .
 @prefix repi.cns11643-4: <http://www.chise.org/est/view/character/repi.cns11643-4=> .
+@prefix g.cns11643-4: <http://www.chise.org/est/view/character/g.cns11643-4=> .
 @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=> .
@@ -101,6 +110,7 @@
 @prefix rep.jis-x0213-2: <http://www.chise.org/est/view/character/rep.jis-x0213-2=> .
 @prefix g2.jis-x0213-2: <http://www.chise.org/est/view/character/g2.jis-x0213-2=> .
 @prefix repi.jis-x0213-2: <http://www.chise.org/est/view/character/repi.jis-x0213-2=> .
+@prefix g.jis-x0213-2: <http://www.chise.org/est/view/character/g.jis-x0213-2=> .
 @prefix a.jis-x0213-2: <http://www.chise.org/est/view/character/a.jis-x0213-2=> .
 @prefix a.big5: <http://www.chise.org/est/view/character/rep.big5=> .
 @prefix repi.adobe-japan1-0: <http://www.chise.org/est/view/character/repi.adobe-japan1-0=> .
@@ -112,6 +122,7 @@
 @prefix rep.big5-cdp: <http://www.chise.org/est/view/character/rep.big5-cdp=> .
 @prefix g2.big5-cdp: <http://www.chise.org/est/view/character/g2.big5-cdp=> .
 @prefix repi.big5-cdp: <http://www.chise.org/est/view/character/repi.big5-cdp=> .
+@prefix g.big5-cdp: <http://www.chise.org/est/view/character/g.big5-cdp=> .
 @prefix a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
 @prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
@@ -129,14 +140,17 @@
 @prefix rep.gt: <http://www.chise.org/est/view/character/rep.gt=> .
 @prefix g2.gt: <http://www.chise.org/est/view/character/g2.gt=> .
 @prefix repi.gt: <http://www.chise.org/est/view/character/repi.gt=> .
+@prefix g.gt: <http://www.chise.org/est/view/character/g.gt=> .
 @prefix o.gt: <http://www.chise.org/est/view/character/o.gt=> .
 @prefix a.gt: <http://www.chise.org/est/view/character/a.gt=> .
 @prefix rep.gt-k: <http://www.chise.org/est/view/character/rep.gt-k=> .
 @prefix g2.gt-k: <http://www.chise.org/est/view/character/g2.gt-k=> .
 @prefix repi.gt-k: <http://www.chise.org/est/view/character/repi.gt-k=> .
+@prefix g.gt-k: <http://www.chise.org/est/view/character/g.gt-k=> .
 @prefix a.gt-k: <http://www.chise.org/est/view/character/a.gt-k=> .
 @prefix rep.gt-pj-1: <http://www.chise.org/est/view/character/rep.gt-pj-1=> .
 @prefix rep.gt-pj-2: <http://www.chise.org/est/view/character/rep.gt-pj-2=> .
+@prefix rep.gt-pj-5: <http://www.chise.org/est/view/character/rep.gt-pj-5=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
 @prefix rep.gt-pj-11: <http://www.chise.org/est/view/character/rep.gt-pj-11=> .
 @prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
@@ -151,6 +165,8 @@
 @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 repi.daikanwa...ho: <http://www.chise.org/est/view/character/repi.daikanwa...ho=> .
+@prefix g.daikanwa: <http://www.chise.org/est/view/character/g.daikanwa=> .
+@prefix g.daikanwa...ho: <http://www.chise.org/est/view/character/g.daikanwa...ho=> .
 @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 rep.shinjigen_1ed: <http://www.chise.org/est/view/character/rep.shinjigen@1ed=> .
@@ -168,15 +184,25 @@
 @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.cbeta: <http://www.chise.org/est/view/character/a.cbeta=> .
 @prefix rep.jef-china3: <http://www.chise.org/est/view/character/rep.jef-china3=> .
+@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 g2.ruimoku-v6: <http://www.chise.org/est/view/character/g2.ruimoku-v6=> .
 @prefix rep.big5-cdp-itaiji-001: <http://www.chise.org/est/view/character/rep.big5-cdp-itaiji-001=> .
 @prefix rep.big5-cdp-var-001: <http://www.chise.org/est/view/character/rep.big5-cdp-var-001=> .
 @prefix rep.big5-cdp-var-005: <http://www.chise.org/est/view/character/rep.big5-cdp-var-005=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
+@prefix g2.ucs-var-002: <http://www.chise.org/est/view/character/g2.ucs-var-002=> .
 @prefix rep.ucs-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 g2.ucs-itaiji-001: <http://www.chise.org/est/view/character/g2.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
+@prefix a.ucs-itaiji-002: <http://www.chise.org/est/view/character/a.ucs-itaiji-002=> .
+@prefix g2.ucs-itaiji-002: <http://www.chise.org/est/view/character/g2.ucs-itaiji-002=> .
 @prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 @prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 @prefix g2.ucs-itaiji-005: <http://www.chise.org/est/view/character/g2.ucs-itaiji-005=> .
@@ -213,6 +239,7 @@
 @prefix gt-k: <http://rdf.chise.org/data/ccs/gt-k/code-point/> .
 @prefix gt-pj-1: <http://rdf.chise.org/data/ccs/gt-pj-1/code-point/> .
 @prefix gt-pj-2: <http://rdf.chise.org/data/ccs/gt-pj-2/code-point/> .
+@prefix gt-pj-5: <http://rdf.chise.org/data/ccs/gt-pj-5/code-point/> .
 @prefix gt-pj-9: <http://rdf.chise.org/data/ccs/gt-pj-9/code-point/> .
 @prefix gt-pj-11: <http://rdf.chise.org/data/ccs/gt-pj-11/code-point/> .
 @prefix gt-pj-k1: <http://rdf.chise.org/data/ccs/gt-pj-k1/code-point/> .
@@ -233,6 +260,7 @@
 @prefix hng-kar: <http://rdf.chise.org/data/ccs/hng-kar/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-itaiji-001: <http://rdf.chise.org/data/ccs/big5-cdp-itaiji-001/code-point/> .
 @prefix big5-cdp-var-001: <http://rdf.chise.org/data/ccs/big5-cdp-var-001/code-point/> .
 @prefix big5-cdp-var-005: <http://rdf.chise.org/data/ccs/big5-cdp-var-005/code-point/> .
@@ -251,11 +279,21 @@ bucs:0x5182
     ideo:radical          13 ; # ⼌ 
     .
 
+a.ucs_component:0x5182
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x5182  ] ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           0 ;
+    .
+
 a.ucs:0x5182
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5182 ;
     :denotation-of
         bucs:0x5182          ;
+    :from.denotational_component
+        a.ucs_component:0x5182 ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           0 ;
     ideo:total-strokes     2 ;
@@ -448,10 +486,9 @@ a.ucs:0x5183
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
-    ideo:hanyu-dazidian  ( 1 96 15 ) ;
     isd:structure [ a idc:â¿´ ;
         isd:surround a.ucs:0x5182 ; # 冂
-        isd:filling  a.ucs:0x20120   # 𠄠
+        isd:filling  a.ucs_iwds-1:0x4E8C   # &A-IWDSU+4E8C;
     ] ;
     :sound               [ :context domain:ja...on...go ;
                            :target  ( "mou" "mo" ) ;
@@ -459,16 +496,39 @@ a.ucs:0x5183
     :sound               [ :context domain:ja...on...kan ;
                            :target  ( "bAu" "bou" ) ;
                          ] ;
+    .
+
+rep.mj:007302
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:007302 ;
+    :denotation-of
+        a.ucs:0x5183         ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     4 ;
+    ideo:hanyu-dazidian  ( 1 96 15 ) ;
+    isd:structure [ a idc:â¿´ ;
+        isd:surround a.ucs:0x5182 ; # 冂
+        isd:filling  a.ucs_component:0x4E8C   # &A-compU+4E8C;
+    ] ;
+    :eq rep.ucs_unicode:0x5183    ; # &MJ007302;
     :eq rep.adobe-japan1-5:17301  ; # &I-AJ1-17301;
     :eq rep.jis-x0212:0x3270      ; # &I-JSP-3270;
     :eq rep.cns11643-4:0x213E     ; # &I-C4-213E;
     :eq rep.jis-x0213-2:0x2329    ; # &I-JX2-2329;
     :eq rep.big5-cdp:0x88F3       ; # &I-CDP-88F3;
+    :eq rep.koseki:017780         ; # &MJ007302;
     :eq rep.gt:01984              ; # &I-GT-01984;
     :eq rep.gt-k:00548            ; # &I-GT-K00548;
     :eq rep.gt-pj-2:15656         ; # &I-GT-01984;
     :eq rep.daikanwa:01508        ; # &I-M-01508;
+    :subsume
+        rep.ucs-var-001:0x5183 ,
+        g.ucs_unicode:0x5183 ;
     .
+    rep.ucs_unicode:0x5183
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5183  ] .
     rep.adobe-japan1-5:17301
                :abstract-glyph-of adobe-japan1-5:17301   .
     rep.jis-x0212:0x3270
@@ -479,6 +539,8 @@ a.ucs:0x5183
                :abstract-glyph-of    jis-x0213-2:0x2329  .
     rep.big5-cdp:0x88F3
                :abstract-glyph-of       big5-cdp:0x88F3  .
+    rep.koseki:017780
+               :abstract-glyph-of         koseki:017780  .
     rep.gt:01984
                :abstract-glyph-of             gt:01984   .
     rep.gt-k:00548
@@ -487,6 +549,136 @@ a.ucs:0x5183
                :abstract-glyph-of        gt-pj-2:15656   .
     rep.daikanwa:01508
                :abstract-glyph-of       daikanwa:01508   .
+    rep.ucs-var-001:0x5183
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-001:0x5183 ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x5182 ; # 冂
+            isd:filling  a.ucs:0x4E8C   # 二
+        ] ;
+        :eq g.ucs_jis:0x5183          ; # &U-v001+5183;
+        :eq g.adobe-japan1-5:17301    ; # &U-v001+5183;
+        :eq g.jis-x0213-2:0x2329      ; # &U-v001+5183;
+        :eq g.gt:01984                ; # &U-v001+5183;
+        :eq g.gt-k:00548              ; # &U-v001+5183;
+        :eq g.daikanwa:01508          ; # &U-v001+5183;
+        :subsume
+            g2.koseki:017780     ,
+            g2.gt:01984          ,
+            g2.adobe-japan1-5:17301 ;
+        .
+        g.ucs_jis:0x5183
+                   :detailed-glyph-of [ :context domain:jis     ;
+                                        :target     ucs:0x5183  ] .
+        g.adobe-japan1-5:17301
+                   :detailed-glyph-of adobe-japan1-5:17301   .
+        g.jis-x0213-2:0x2329
+                   :detailed-glyph-of    jis-x0213-2:0x2329  .
+        g.gt:01984
+                   :detailed-glyph-of             gt:01984   .
+        g.gt-k:00548
+                   :detailed-glyph-of           gt-k:00548   .
+        g.daikanwa:01508
+                   :detailed-glyph-of       daikanwa:01508   .
+        g2.koseki:017780
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of koseki:017780 ;
+            :eq g2.daikanwa:01508         ; # &g2-M-01508;
+            .
+            g2.daikanwa:01508
+                  :abstract-glyph-form-of       daikanwa:01508   .
+        g2.gt:01984
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt:01984 ;
+            :eq g2.gt-k:00548             ; # &g2-GT-01984;
+            .
+            g2.gt-k:00548
+                  :abstract-glyph-form-of           gt-k:00548   .
+        g2.adobe-japan1-5:17301
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of adobe-japan1-5:17301 ;
+            :eq g2.ucs_jis:0x5183         ; # &g2-AJ1-17301;
+            :eq g2.jis-x0212:0x3270       ; # &g2-AJ1-17301;
+            :eq g2.jis-x0213-2:0x2329     ; # &g2-AJ1-17301;
+            :subsume
+                repi.jis-x0213-2:0x2329 ,
+                repi.adobe-japan1-6:17301 ;
+            .
+            g2.ucs_jis:0x5183
+                  :abstract-glyph-form-of [ :context domain:jis     ;
+                                            :target     ucs:0x5183  ] .
+            g2.jis-x0212:0x3270
+                  :abstract-glyph-form-of      jis-x0212:0x3270  .
+            g2.jis-x0213-2:0x2329
+                  :abstract-glyph-form-of    jis-x0213-2:0x2329  .
+            repi.jis-x0212:0x3270
+                a chisegg:glyph-image ;
+                :glyph-image-of jis-x0212:0x3270 ;
+                :eq repi.jis-x0213-2:0x2329   ; # &R-JX2-2329;
+                .
+                repi.jis-x0213-2:0x2329
+                              :glyph-image-of    jis-x0213-2:0x2329  .
+            repi.adobe-japan1-5:17301
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-5:17301 ;
+                .
+    g.ucs_unicode:0x5183
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:unicode ;
+                             :target     ucs:0x5183  ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x5182 ; # 冂
+            isd:filling  a.ucs:0x20120   # 𠄠
+        ] ;
+        :eq g.mj:007302               ; # &G-MJ007302;
+        :eq g.cns11643-4:0x213E       ; # &G-MJ007302;
+        :eq g.big5-cdp:0x88F3         ; # &G-MJ007302;
+        :subsume
+            g2.mj:007302         ;
+        .
+        g.mj:007302
+                   :detailed-glyph-of             mj:007302  .
+        g.cns11643-4:0x213E
+                   :detailed-glyph-of     cns11643-4:0x213E  .
+        g.big5-cdp:0x88F3
+                   :detailed-glyph-of       big5-cdp:0x88F3  .
+        g2.mj:007302
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:007302 ;
+            :eq g2.ucs_unicode:0x5183     ; # &g2-MJ007302;
+            :g2.ucs_JP...hanazono      rdf:nil ;
+            :eq g2.cns11643-4:0x213E      ; # &g2-MJ007302;
+            :eq g2.big5-cdp:0x88F3        ; # &g2-MJ007302;
+            :subsume
+                repi.mj:007302       ,
+                repi.big5-cdp:0x88F3 ,
+                repi.cns11643-4:0x213E ,
+                repi.ucs_unicode:0x5183 ;
+            .
+            g2.ucs_unicode:0x5183
+                  :abstract-glyph-form-of [ :context domain:unicode ;
+                                            :target     ucs:0x5183  ] .
+            g2.cns11643-4:0x213E
+                  :abstract-glyph-form-of     cns11643-4:0x213E  .
+            g2.big5-cdp:0x88F3
+                  :abstract-glyph-form-of       big5-cdp:0x88F3  .
+            repi.mj:007302
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:007302 ;
+                .
+            repi.big5-cdp:0x88F3
+                a chisegg:glyph-image ;
+                :glyph-image-of big5-cdp:0x88F3 ;
+                .
+            repi.cns11643-4:0x213E
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-4:0x213E ;
+                .
+            repi.ucs_unicode:0x5183
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x5183  ] ;
+                .
 
 a.ucs:0x2E9C
     a chisegg:abstract-character ;
@@ -502,6 +694,10 @@ a.ucs:0x2E9C
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           2 ;
     ideo:total-strokes     4 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x5182 ; # 冂
+        isd:filling  a.ucs:0x20120   # 𠄠
+    ] ;
     :eq rep.big5-cdp:0x8A78       ; # &I-CDP-8A78;
     :eq rep.gt-k:00565            ; # &I-GT-K00565;
     :eq rep.gt-pj-k1:12841        ; # ⺜
@@ -679,6 +875,8 @@ a.ucs:0x2053E
 a.jis-x0208:0x4662
     a chisegg:abstract-character ;
     :abstract-character-of jis-x0208:0x4662 ;
+    :denotation-of
+        bucs:0x5167          ;
     ideo:radical           [ :context domain:ucs     ;
                              :target           13 ; # ⼌
                            ] ;
@@ -695,16 +893,16 @@ a.jis-x0208:0x4662
     ideo:strokes           [ :context domain:cns-3   ;
                              :target  2 ] ;
     ideo:total-strokes     4 ;
-    :eq bucs:0x5167               ; # &J97-4662;
+    :eq a.ucs_iwds-1:0x5167       ; # &J97-4662;
     :eq a.ucs_jis:0x5185          ; # &J97-4662;
     :eq rep.ucs_big5:0x5167       ; # &J97-4662;
     :eq a.jis-x0213-1:0x4662      ; # &J97-4662;
     :eq a.big5:0xA4BA             ; # &I-B-A4BA;
     :eq a.iwds-1:0148             ; # &J97-4662;
     .
-    bucs:0x5167
-        :super-abstract-character-of [ :context domain:bucs    ;
-                                       :target     ucs:0x5167  ] .
+    a.ucs_iwds-1:0x5167
+           :abstract-character-of [ :context domain:iwds-1  ;
+                                    :target     ucs:0x5167  ] .
     a.ucs_jis:0x5185
            :abstract-character-of [ :context domain:jis     ;
                                     :target     ucs:0x5185  ] .
@@ -1084,17 +1282,21 @@ a.ucs:0x5188
     :eq rep.cns11643-4:0x2152     ; # &I-C4-2152;
     :eq rep.big5-eten:0xC8A2      ; # &I-B-C8A2;
     :eq rep.big5-cdp:0x85BE       ; # &I-CDP-85BE;
+    :eq rep.gt:36323              ; # &I-GT-36323;
+    :eq rep.gt-k:00560            ; # &I-GT-K00560;
+    :eq rep.gt-pj-5:29285         ; # &I-GT-36323;
     :eq rep.daikanwa:28201        ; # &I-M-28201;
     :eq rep.cbeta:00648           ; # &I-CB00648;
     :form-of             [ :context domain:component...connect-below ;
                            :sources chisebib:zihui...char-index ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x7F51         ] ;
-    ideo:simplified-form-of [ :sources chisebib:zhengzitong ,
-                                       chisebib:daikanwa ;
-                              :target  a.ucs:0x7F51         ] ;
     ideo:simplified-form-of [ :context domain:CN      ;
                               :target  a.ucs:0x5CA1         ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:zhengzitong ,
+                                       chisebib:daikanwa ;
+                              :target  a.ucs:0x7F51         ] ;
     :subsume
         g2.ucs_unicode:0x5188 ;
     .
@@ -1106,6 +1308,12 @@ a.ucs:0x5188
                :abstract-glyph-of      big5-eten:0xC8A2  .
     rep.big5-cdp:0x85BE
                :abstract-glyph-of       big5-cdp:0x85BE  .
+    rep.gt:36323
+               :abstract-glyph-of             gt:36323   .
+    rep.gt-k:00560
+               :abstract-glyph-of           gt-k:00560   .
+    rep.gt-pj-5:29285
+               :abstract-glyph-of        gt-pj-5:29285   .
     rep.daikanwa:28201
                :abstract-glyph-of       daikanwa:28201   .
     rep.cbeta:00648
@@ -1114,16 +1322,19 @@ a.ucs:0x5188
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x5188  ] ;
-        :eq g2.gb2312:0x3854          ; # &g2-CDP-85BE;
-        :eq g2.cns11643-4:0x2152      ; # &g2-CDP-85BE;
-        :eq g2.big5-cdp:0x85BE        ; # &g2-CDP-85BE;
-        :eq g2.daikanwa:28201         ; # &g2-CDP-85BE;
-        :eq g2.cbeta:00648            ; # &g2-CDP-85BE;
+        :eq g2.gb2312:0x3854          ; # &g2-GT-36323;
+        :eq g2.cns11643-4:0x2152      ; # &g2-GT-36323;
+        :eq g2.big5-cdp:0x85BE        ; # &g2-GT-36323;
+        :eq g2.gt:36323               ; # &g2-GT-36323;
+        :eq g2.gt-k:00560             ; # &g2-GT-36323;
+        :eq g2.daikanwa:28201         ; # &g2-GT-36323;
+        :eq g2.cbeta:00648            ; # &g2-GT-36323;
         :subsume
             repi.daikanwa:28201  ,
             repi.big5-cdp:0x85BE ,
             repi.cns11643-4:0x2152 ,
             repi.ucs_unicode:0x5188 ,
+            repi.gt:36323        ,
             repi.cbeta:00648     ;
         .
         g2.gb2312:0x3854
@@ -1132,6 +1343,10 @@ a.ucs:0x5188
               :abstract-glyph-form-of     cns11643-4:0x2152  .
         g2.big5-cdp:0x85BE
               :abstract-glyph-form-of       big5-cdp:0x85BE  .
+        g2.gt:36323
+              :abstract-glyph-form-of             gt:36323   .
+        g2.gt-k:00560
+              :abstract-glyph-form-of           gt-k:00560   .
         g2.daikanwa:28201
               :abstract-glyph-form-of       daikanwa:28201   .
         g2.cbeta:00648
@@ -1153,6 +1368,13 @@ a.ucs:0x5188
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x5188  ] ;
             .
+        repi.gt:36323
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:36323 ;
+            :eq repi.gt-k:00560           ; # &R-GT-36323;
+            .
+            repi.gt-k:00560
+                          :glyph-image-of           gt-k:00560   .
         repi.cbeta:00648
             a chisegg:glyph-image ;
             :glyph-image-of cbeta:00648 ;
@@ -1322,21 +1544,35 @@ rep.big5-cdp:0x8C58
             :glyph-image-of big5-cdp:0x8C58 ;
             .
 
+a.ucs_component:0x5189
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x5189  ] ;
+    :denotation-of
+        bucs:0x5189          ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    .
+
 a.ucs:0x5189
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5189 ;
     :denotation-of
-        bucs:0x5189          ;
+        a.ucs_component:0x5189 ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           3 ;
     ideo:total-strokes     5 ;
     :eq a.jis-x0208:0x5147        ; # 冉
     :eq a.jis-x0213-1:0x5147      ; # 冉
+    :eq a.iwds-1:0075             ; # 冉
     .
     a.jis-x0208:0x5147
            :abstract-character-of      jis-x0208:0x5147  .
     a.jis-x0213-1:0x5147
            :abstract-character-of    jis-x0213-1:0x5147  .
+    a.iwds-1:0075
+           :abstract-character-of         iwds-1:0075    .
 
 rep.mj:007307
     a chisegg:abstract-glyph ;
@@ -1447,15 +1683,158 @@ rep.mj:007307
         :glyph-image-of hng-kar:05920 ;
         .
 
+a.ucs:0x2D060
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2D060 ;
+    :denotation-of
+        a.ucs_component:0x5189 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :eq a.big5-cdp:0x877E         ; # 𭁠
+    :eq a.mj:057001               ; # 𭁠
+    .
+    a.big5-cdp:0x877E
+           :abstract-character-of       big5-cdp:0x877E  .
+    a.mj:057001
+           :abstract-character-of             mj:057001  .
+
+rep.big5-cdp-var-005:0x877E
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp-var-005:0x877E ;
+    :denotation-of
+        a.ucs:0x2D060        ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    .
+
+rep.mj:057001
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:057001 ;
+    :denotation-of
+        a.ucs:0x2D060        ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :eq rep.ucs_JP...hanazono:0x2D060 ; # &MJ057001;
+    :eq rep.big5-cdp:0x877E       ; # &I-CDP-877E;
+    :eq rep.koseki:017950         ; # &MJ057001;
+    :form-of             [ :target  rep.mj:007307        ;
+                           :sources chisebib:koseki ] ,
+                         [ :target  rep.mj:007308        ;
+                           :sources chisebib:koseki_mj ] ;
+    :subsume
+        g2.mj:057001         ;
+    .
+    rep.ucs_JP...hanazono:0x2D060
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x2D060 ] .
+    rep.big5-cdp:0x877E
+               :abstract-glyph-of       big5-cdp:0x877E  .
+    rep.koseki:017950
+               :abstract-glyph-of         koseki:017950  .
+    g2.mj:057001
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057001 ;
+        :eq g2.ucs_JP...hanazono:0x2D060 ; # &g2-MJ057001;
+        :eq g2.big5-cdp:0x877E        ; # &g2-MJ057001;
+        :eq g2.koseki:017950          ; # &g2-MJ057001;
+        :subsume
+            repi.mj:057001       ,
+            repi.big5-cdp:0x877E ;
+        .
+        g2.ucs_JP...hanazono:0x2D060
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2D060 ] .
+        g2.big5-cdp:0x877E
+              :abstract-glyph-form-of       big5-cdp:0x877E  .
+        g2.koseki:017950
+              :abstract-glyph-form-of         koseki:017950  .
+        repi.mj:057001
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:057001 ;
+            .
+        repi.big5-cdp:0x877E
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x877E ;
+            .
+
+a.ucs-itaiji-001:0x2D060
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs-itaiji-001:0x2D060 ;
+    :denotation-of
+        a.ucs_component:0x5189 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :eq a.cbeta:07668             ; # &A-CB07668;
+    .
+    a.cbeta:07668
+           :abstract-character-of          cbeta:07668   .
+
 rep.ucs-var-002:0x5189
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-var-002:0x5189 ;
     :denotation-of
-        a.ucs:0x5189         ;
+        a.ucs-itaiji-001:0x2D060 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :subsume
+        g2.ucs-var-002:0x5189 ;
+    .
+    g2.ucs-var-002:0x5189
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-var-002:0x5189 ;
+        .
+
+rep.ucs-itaiji-002:0x2D060
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x2D060 ;
+    :denotation-of
+        a.ucs-itaiji-001:0x2D060 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     5 ;
+    :subsume
+        g2.ucs-itaiji-002:0x2D060 ;
+    .
+    g2.ucs-itaiji-002:0x2D060
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x2D060 ;
+        .
+
+rep.ucs-itaiji-001:0x2D060
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x2D060 ;
+    :denotation-of
+        a.ucs-itaiji-001:0x2D060 ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           3 ;
     ideo:total-strokes     5 ;
+    :eq rep.cbeta:07668           ; # &U-v001+5189;
+    :eq rep.ucs-var-001:0x5189    ; # &U-v001+5189;
+    :subsume
+        g2.ucs-itaiji-001:0x2D060 ;
     .
+    rep.cbeta:07668
+               :abstract-glyph-of          cbeta:07668   .
+    rep.ucs-var-001:0x5189
+               :abstract-glyph-of    ucs-var-001:0x5189  .
+    g2.ucs-itaiji-001:0x2D060
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2D060 ;
+        :eq g2.cbeta:07668            ; # &g2-U-i001+2D060;
+        :subsume
+            repi.cbeta:07668     ;
+        .
+        g2.cbeta:07668
+              :abstract-glyph-form-of          cbeta:07668   .
+        repi.cbeta:07668
+            a chisegg:glyph-image ;
+            :glyph-image-of cbeta:07668 ;
+            .
 
 a.iwds-1:0176
     a chisegg:abstract-character ;
@@ -2252,78 +2631,6 @@ rep.gt-k:01266
         g2.gt-pj-k2:16674
               :abstract-glyph-form-of       gt-pj-k2:16674   .
 
-a.ucs:0x2D060
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x2D060 ;
-    ideo:radical          13 ; # ⼌ 
-    ideo:strokes           3 ;
-    ideo:total-strokes     5 ;
-    :eq a.big5-cdp:0x877E         ; # 𭁠
-    :eq a.mj:057001               ; # 𭁠
-    .
-    a.big5-cdp:0x877E
-           :abstract-character-of       big5-cdp:0x877E  .
-    a.mj:057001
-           :abstract-character-of             mj:057001  .
-
-rep.big5-cdp-var-005:0x877E
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of big5-cdp-var-005:0x877E ;
-    :denotation-of
-        a.ucs:0x2D060        ;
-    ideo:radical          13 ; # ⼌ 
-    ideo:strokes           3 ;
-    ideo:total-strokes     5 ;
-    .
-
-rep.mj:057001
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:057001 ;
-    :denotation-of
-        a.ucs:0x2D060        ;
-    ideo:radical          13 ; # ⼌ 
-    ideo:strokes           3 ;
-    ideo:total-strokes     5 ;
-    :eq rep.ucs_JP...hanazono:0x2D060 ; # &MJ057001;
-    :eq rep.big5-cdp:0x877E       ; # &I-CDP-877E;
-    :eq rep.koseki:017950         ; # &MJ057001;
-    :form-of             a.ucs:0x5189         ;
-    :subsume
-        g2.mj:057001         ;
-    .
-    rep.ucs_JP...hanazono:0x2D060
-               :abstract-glyph-of [ :context domain:JP...hanazono ;
-                                    :target     ucs:0x2D060 ] .
-    rep.big5-cdp:0x877E
-               :abstract-glyph-of       big5-cdp:0x877E  .
-    rep.koseki:017950
-               :abstract-glyph-of         koseki:017950  .
-    g2.mj:057001
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of mj:057001 ;
-        :eq g2.ucs_JP...hanazono:0x2D060 ; # &g2-MJ057001;
-        :eq g2.big5-cdp:0x877E        ; # &g2-MJ057001;
-        :eq g2.koseki:017950          ; # &g2-MJ057001;
-        :subsume
-            repi.mj:057001       ,
-            repi.big5-cdp:0x877E ;
-        .
-        g2.ucs_JP...hanazono:0x2D060
-              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
-                                        :target     ucs:0x2D060 ] .
-        g2.big5-cdp:0x877E
-              :abstract-glyph-form-of       big5-cdp:0x877E  .
-        g2.koseki:017950
-              :abstract-glyph-form-of         koseki:017950  .
-        repi.mj:057001
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:057001 ;
-            .
-        repi.big5-cdp:0x877E
-            a chisegg:glyph-image ;
-            :glyph-image-of big5-cdp:0x877E ;
-            .
-
 rep.ucs-itaiji-001:0x56DF
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-itaiji-001:0x56DF ;
@@ -3637,10 +3944,18 @@ a.ucs:0x20559
     ideo:strokes           6 ;
     ideo:total-strokes     8 ;
     ideo:hanyu-dazidian  ( 8 8 9 ) ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x5183 ; # 冃
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
     :eq rep.gt:02017              ; # &I-GT-02017;
     :eq rep.gt-pj-11:17227        ; # &I-GT-02017;
     :eq rep.daikanwa...ho:0039    ; # 𠕙
-    :eq rep.hanziku-12:0xEB60     ; # &I-HZK12-EB60;
+    ideo:ancient-form-of [ :sources chisebib:leipian ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-1:0x5023 ] ;
+    :subsume
+        a.gt:02017           ;
     .
     rep.gt:02017
                :abstract-glyph-of             gt:02017   .
@@ -3648,8 +3963,166 @@ a.ucs:0x20559
                :abstract-glyph-of       gt-pj-11:17227   .
     rep.daikanwa...ho:0039
                :abstract-glyph-of  daikanwa...ho:0039    .
-    rep.hanziku-12:0xEB60
-               :abstract-glyph-of     hanziku-12:0xEB60  .
+    a.gt:02017
+        a chisegg:abstract-character ;
+        :abstract-character-of gt:02017 ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround rep.ucs-var-001:0x5183 ; # &U-v001+5183;
+            isd:filling  a.ucs:0x65E5   # 日
+        ] ;
+        :eq g.ucs_iso:0x20559         ; # &G-GT-02017;
+        :eq g.gt:02017                ; # &G-GT-02017;
+        :eq g.daikanwa...ho:0039      ; # &G-GT-02017;
+        :subsume
+            g2.ucs_iso:0x20559   ;
+        .
+        g.ucs_iso:0x20559
+                   :detailed-glyph-of [ :context domain:iso     ;
+                                        :target     ucs:0x20559 ] .
+        g.gt:02017
+                   :detailed-glyph-of             gt:02017   .
+        g.daikanwa...ho:0039
+                   :detailed-glyph-of  daikanwa...ho:0039    .
+        g2.ucs_iso:0x20559
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x20559 ] ;
+            :eq g2.gt:02017               ; # &g2-GT-02017;
+            :eq g2.daikanwa...ho:0039     ; # &g2-GT-02017;
+            :subsume
+                repi.daikanwa...ho:0039 ,
+                repi.gt:02017        ,
+                repi.ucs_iso:0x20559 ,
+                rep.hanziku-12:0xEB60 ;
+            .
+            g2.gt:02017
+                  :abstract-glyph-form-of             gt:02017   .
+            g2.daikanwa...ho:0039
+                  :abstract-glyph-form-of  daikanwa...ho:0039    .
+            repi.daikanwa...ho:0039
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa...ho:0039 ;
+                .
+            repi.gt:02017
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:02017 ;
+                .
+            repi.ucs_iso:0x20559
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x20559 ] ;
+                .
+            rep.hanziku-12:0xEB60
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of hanziku-12:0xEB60 ;
+                .
+
+a.ucs:0x2D063
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2D063 ;
+    :denotation-of
+        a.ucs_component:0x2D063 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x4E00 ; # 一
+        isd:middle   a.ucs_component:0x4E37 ; # &A-compU+4E37;
+        isd:below    a.ucs-itaiji-001:0x2D060   # &A-CB07668;
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x2D063
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x2D063 ] ;
+    :denotation-of
+        a.ucs:0x2D063        ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿳ ;
+        isd:above    a.ucs:0x4E00 ; # 一
+        isd:middle   a.ucs:0x4E37 ; # 丷
+        isd:below    rep.ucs-itaiji-001:0x2D060   # &U-v001+5189;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x2D063 ;
+    .
+    g2.ucs_JP...hanazono:0x2D063
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2D063 ] ;
+        .
+
+a.ucs_component:0x2D063
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x2D063 ] ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    .
+
+a.ucs-itaiji-001:0x2D063
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs-itaiji-001:0x2D063 ;
+    :denotation-of
+        a.ucs_component:0x2D063 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    .
+
+rep.ucs-itaiji-001:0x2D063
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x2D063 ;
+    :denotation-of
+        a.ucs-itaiji-001:0x2D063 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    :form-of             [ :context domain:component ;
+                           :target  rep.mj:016762        ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x2D063 ;
+    .
+    g2.ucs-itaiji-001:0x2D063
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2D063 ;
+        .
+
+a.ucs-itaiji-002:0x2D063
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs-itaiji-002:0x2D063 ;
+    :denotation-of
+        a.ucs_component:0x2D063 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    .
+
+rep.ucs-itaiji-002:0x2D063
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x2D063 ;
+    :denotation-of
+        a.ucs-itaiji-002:0x2D063 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.gt-k:00264 ; # &GT-K00264;
+        isd:below    rep.mj:007308   # &MJ007308;
+    ] ;
+    :form-of             [ :context domain:component ;
+                           :target  rep.mj:016762        ] ;
+    :subsume
+        g2.ucs-itaiji-002:0x2D063 ;
+    .
+    g2.ucs-itaiji-002:0x2D063
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x2D063 ;
+        .
 
 a.ucs:0x5191
     a chisegg:abstract-character ;
@@ -3864,6 +4337,8 @@ o.ucs_unicode:0x5192
         :eq rep.daikanwa:01538        ; # &I-M-01538;
         :eq rep.shinjigen:5287        ; # &C1-5023;
         :eq rep.jef-china3:0x5BBC     ; # &I-JC3-5BBC;
+        :subsume
+            g2.ucs_unicode:0x5192 ;
         .
         rep.ucs_unicode:0x5192
                    :abstract-glyph-of [ :context domain:unicode ;
@@ -3880,13 +4355,74 @@ o.ucs_unicode:0x5192
                    :abstract-glyph-of      shinjigen:5287    .
         rep.jef-china3:0x5BBC
                    :abstract-glyph-of     jef-china3:0x5BBC  .
+        g2.ucs_unicode:0x5192
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x5192  ] ;
+            :g2.ucs_JP...hanazono      rdf:nil ;
+            :eq g2.gb2312:0x4330          ; # &g2-M-01538;
+            :eq g2.ks-x1001:0x5933        ; # &g2-M-01538;
+            :eq g2.cns11643-1:0x5023      ; # &g2-M-01538;
+            :eq g2.daikanwa:01538         ; # &g2-M-01538;
+            :eq g2.shinjigen:5287         ; # &g2-M-01538;
+            :eq g2.jef-china3:0x5BBC      ; # &g2-M-01538;
+            :subsume
+                repi.daikanwa:01538  ,
+                repi.cns11643-1:0x5023 ,
+                repi.jef-china3:0x5BBC ,
+                repi.ks-x1001:0x5933 ,
+                repi.ucs_unicode:0x5192 ;
+            .
+            g2.gb2312:0x4330
+                  :abstract-glyph-form-of         gb2312:0x4330  .
+            g2.ks-x1001:0x5933
+                  :abstract-glyph-form-of       ks-x1001:0x5933  .
+            g2.cns11643-1:0x5023
+                  :abstract-glyph-form-of     cns11643-1:0x5023  .
+            g2.daikanwa:01538
+                  :abstract-glyph-form-of       daikanwa:01538   .
+            g2.shinjigen:5287
+                  :abstract-glyph-form-of      shinjigen:5287    .
+            g2.jef-china3:0x5BBC
+                  :abstract-glyph-form-of     jef-china3:0x5BBC  .
+            repi.daikanwa:01538
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:01538 ;
+                .
+            repi.cns11643-1:0x5023
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-1:0x5023 ;
+                .
+            repi.jef-china3:0x5BBC
+                a chisegg:glyph-image ;
+                :glyph-image-of jef-china3:0x5BBC ;
+                .
+            repi.ks-x1001:0x5933
+                a chisegg:glyph-image ;
+                :glyph-image-of ks-x1001:0x5933 ;
+                :eq repi.ucs_ks:0x5192        ; # &R-K0-5933;
+                .
+                repi.ucs_ks:0x5192
+                              :glyph-image-of [ :context domain:ks      ;
+                                                :target     ucs:0x5192  ] .
+            repi.ucs_unicode:0x5192
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x5192  ] ;
+                .
     rep.adobe-japan1-4:14038
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-4:14038 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x5192         ,
-                                        a.ucs:0xE0101        ] ;
+        :subsume
+            g2.adobe-japan1-4:14038 ;
         .
+        g2.adobe-japan1-4:14038
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of adobe-japan1-4:14038 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x5192         ,
+                                            a.ucs:0xE0101        ] ;
+            .
 
 a.ucs:0x2055B
     a chisegg:abstract-character ;
@@ -3933,33 +4469,33 @@ rep.big5-cdp:0x8CBF
     ideo:total-strokes     9 ;
     .
 
-a.ucs:0x5193
+a.ucs_cognate:0x5193
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x5193 ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x5193  ] ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x2000E ; # 𠀎
+        isd:above    a.ucs_component:0x2000E ; # &A-compU+2000E;
         isd:below    a.ucs:0x5189   # 冉
     ] ;
     .
 
-a.ucs_iwds-1:0x5193
+a.ucs:0x5193
     a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:iwds-1  ;
-                             :target     ucs:0x5193  ] ;
+    :abstract-character-of ucs:0x5193 ;
     :denotation-of
-        a.ucs:0x5193         ;
+        a.ucs_cognate:0x5193 ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     ideo:hanyu-dazidian  ( 1 100 17 ) ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:above    a.ucs:0x2000E ; # 𠀎
         isd:below    a.ucs:0x5189   # 冉
     ] ;
-    :eq a.big5:0xD0E0             ; # &A-IWDSU+5193;
+    :eq a.big5:0xD0E0             ; # &I-B-D0E0;
     .
     a.big5:0xD0E0
            :abstract-character-of           big5:0xD0E0  .
@@ -3968,12 +4504,12 @@ a.mj:007320
     a chisegg:abstract-character ;
     :abstract-character-of mj:007320 ;
     :denotation-of
-        a.ucs_iwds-1:0x5193  ;
+        a.ucs:0x5193         ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:â¿» ;
-        isd:underlying rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:underlying a.ucs:0x2000E ; # 𠀎
         isd:overlaying a.ucs:0x5189   # 冉
     ] ;
     :eq a.gt:02023                ; # &A-GT-02023;
@@ -3990,7 +4526,7 @@ rep.mj:007320
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:â¿» ;
-        isd:underlying rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:underlying a.ucs:0x2000E ; # 𠀎
         isd:overlaying rep.mj:007307   # &MJ007307;
     ] ;
     :eq rep.hanyo-denshi...ks:018290 ; # &MJ007320;
@@ -4058,7 +4594,7 @@ rep.gt:02026
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:â¿» ;
-        isd:underlying rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:underlying a.ucs:0x2000E ; # 𠀎
         isd:overlaying rep.mj:007308   # &MJ007308;
     ] ;
     :eq rep.gt-pj-9:21047         ; # &GT-02026;
@@ -4070,12 +4606,12 @@ a.mj:007321
     a chisegg:abstract-character ;
     :abstract-character-of mj:007321 ;
     :denotation-of
-        a.ucs_iwds-1:0x5193  ;
+        a.ucs:0x5193         ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:above    a.ucs:0x2000E ; # 𠀎
         isd:below    a.ucs:0x5189   # 冉
     ] ;
     :eq a.ucs_unicode:0x5193      ; # &A-GT-02025;
@@ -4099,13 +4635,15 @@ rep.gt:02025
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:above    a.ucs:0x2000E ; # 𠀎
         isd:below    rep.mj:007307   # &MJ007307;
     ] ;
     :eq rep.gt-k:06707            ; # &I-GT-K06707;
     :eq rep.gt-pj-9:13170         ; # &GT-02025;
     :eq rep.shinjigen:0522        ; # &GT-02025;
     :eq rep.jef-china3:0x43ED     ; # &I-JC3-43ED;
+    :subsume
+        g2.gt:02025          ;
     .
     rep.gt-k:06707
                :abstract-glyph-of           gt-k:06707   .
@@ -4115,6 +4653,33 @@ rep.gt:02025
                :abstract-glyph-of      shinjigen:0522    .
     rep.jef-china3:0x43ED
                :abstract-glyph-of     jef-china3:0x43ED  .
+    g2.gt:02025
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:02025 ;
+        :eq g2.gt-k:06707             ; # &g2-GT-02025;
+        :eq g2.shinjigen:0522         ; # &g2-GT-02025;
+        :eq g2.jef-china3:0x43ED      ; # &g2-GT-02025;
+        :subsume
+            repi.gt:02025        ,
+            repi.jef-china3:0x43ED ;
+        .
+        g2.gt-k:06707
+              :abstract-glyph-form-of           gt-k:06707   .
+        g2.shinjigen:0522
+              :abstract-glyph-form-of      shinjigen:0522    .
+        g2.jef-china3:0x43ED
+              :abstract-glyph-form-of     jef-china3:0x43ED  .
+        repi.gt:02025
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:02025 ;
+            :eq repi.gt-k:06707           ; # &R-GT-02025;
+            .
+            repi.gt-k:06707
+                          :glyph-image-of           gt-k:06707   .
+        repi.jef-china3:0x43ED
+            a chisegg:glyph-image ;
+            :glyph-image-of jef-china3:0x43ED ;
+            .
 
 rep.mj:007321
     a chisegg:abstract-glyph ;
@@ -4125,7 +4690,7 @@ rep.mj:007321
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
     isd:structure [ a idc:⿱ ;
-        isd:above    rep.ucs_iso:0x2000E ; # &CDP-8BB7;
+        isd:above    a.ucs:0x2000E ; # 𠀎
         isd:below    rep.mj:007308   # &MJ007308;
     ] ;
     :eq rep.ucs_unicode:0x5193    ; # &MJ007321;
@@ -4235,6 +4800,7 @@ rep.mj:007321
         :eq g2.gt:02024               ; # &g2-AJ1-13521;
         :eq g2.gt-k:06574             ; # &g2-AJ1-13521;
         :subsume
+            repi.jis-x0208_1978:0x514A ,
             repi.jis-x0208_1983:0x514A ,
             repi.adobe-japan1-6:13521 ,
             repi.cns11643-2:0x2E23 ,
@@ -4259,11 +4825,12 @@ rep.mj:007321
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:1978    ;
                               :target jis-x0208:0x514A  ] ;
-            :eq repi.jis-x0208_1983:0x514A ; # &R-J83-514A;
             .
-            repi.jis-x0208_1983:0x514A
-                          :glyph-image-of [ :context domain:1983    ;
-                                            :target jis-x0208:0x514A  ] .
+        repi.jis-x0208_1983:0x514A
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:1983    ;
+                              :target jis-x0208:0x514A  ] ;
+            .
         repi.adobe-japan1-4:13521
             a chisegg:glyph-image ;
             :glyph-image-of adobe-japan1-4:13521 ;
@@ -4284,7 +4851,7 @@ rep.ucs-itaiji-002:0x5193
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-itaiji-002:0x5193 ;
     :denotation-of
-        a.ucs:0x5193         ;
+        a.ucs_cognate:0x5193 ;
     ideo:radical          13 ; # ⼌ 
     ideo:strokes           8 ;
     ideo:total-strokes    10 ;
@@ -4292,7 +4859,13 @@ rep.ucs-itaiji-002:0x5193
         isd:above    rep.big5-cdp:0x86B1 ; # &CDP-86B1;
         isd:below    rep.mj:007307   # &MJ007307;
     ] ;
+    :subsume
+        g2.ucs-itaiji-002:0x5193 ;
     .
+    g2.ucs-itaiji-002:0x5193
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x5193 ;
+        .
 
 a.ucs:0x2055D
     a chisegg:abstract-character ;
@@ -6014,6 +6587,33 @@ a.ucs:0x20567
     rep.hanziku-7:0xC04A
                :abstract-glyph-of      hanziku-7:0xC04A  .
 
+a.ucs:0x2B937
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2B937 ;
+    ideo:radical          13 ; # ⼌ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5CA1 ; # 岡
+        isd:right    a.ucs:0x53BB   # 去
+    ] ;
+    :eq rep.ruimoku-v6:0xE16C     ; # &I-RUI6-E16C;
+    :subsume
+        g2.ucs_JP...hanazono:0x2B937 ,
+        g2.ruimoku-v6:0xE16C ;
+    .
+    rep.ruimoku-v6:0xE16C
+               :abstract-glyph-of     ruimoku-v6:0xE16C  .
+    g2.ucs_JP...hanazono:0x2B937
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x2B937 ] ;
+        .
+    g2.ruimoku-v6:0xE16C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ruimoku-v6:0xE16C ;
+        .
+
 a.ucs:0x20568
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20568 ;