From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 16 May 2018 02:58:24 +0000 (+0900)
Subject: Sync up with the current environment.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360b950bee5b38a5ac29d2a65feb838fcf775920;p=chise%2Fchiset.git

Sync up with the current environment.
---

diff --git a/Ideograph-R005-Second.ttl b/Ideograph-R005-Second.ttl
index aef2491..99d0cdd 100644
--- a/Ideograph-R005-Second.ttl
+++ b/Ideograph-R005-Second.ttl
@@ -14,13 +14,17 @@
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
+@prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
+@prefix o.ucs_iso: <http://www.chise.org/est/view/character/o.ucs@iso=> .
 @prefix rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @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 g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
 @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=> .
@@ -89,16 +93,24 @@
 @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...ks: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks=> .
+@prefix g2.hanyo-denshi...ks: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ks=> .
 @prefix rep.koseki: <http://www.chise.org/est/view/character/rep.koseki=> .
 @prefix g2.koseki: <http://www.chise.org/est/view/character/g2.koseki=> .
+@prefix repi.hanyo-denshi...ks: <http://www.chise.org/est/view/character/repi.hanyo-denshi...ks=> .
+@prefix rep.hanyo-denshi...ks...mf: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ks...mf=> .
 @prefix repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
 @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 o.gt: <http://www.chise.org/est/view/character/o.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=> .
@@ -145,8 +157,13 @@
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
 @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-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
-@prefix g2.ucs-itaiji-003: <http://www.chise.org/est/view/character/g2.ucs-itaiji-003=> .
+@prefix rep.ucs-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 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 g2.ucs-itaiji-002: <http://www.chise.org/est/view/character/g2.ucs-itaiji-002=> .
+@prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -171,7 +188,9 @@
 @prefix big5: <http://rdf.chise.org/data/ccs/big5/code-point/> .
 @prefix big5-eten: <http://rdf.chise.org/data/ccs/big5-eten/code-point/> .
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
+@prefix hanyo-denshi...ks: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks/code-point/> .
 @prefix koseki: <http://rdf.chise.org/data/ccs/koseki/code-point/> .
+@prefix hanyo-denshi...ks...mf: <http://rdf.chise.org/data/ccs/hanyo-denshi...ks...mf/code-point/> .
 @prefix gt: <http://rdf.chise.org/data/ccs/gt/code-point/> .
 @prefix gt-k: <http://rdf.chise.org/data/ccs/gt-k/code-point/> .
 @prefix gt-pj-1: <http://rdf.chise.org/data/ccs/gt-pj-1/code-point/> .
@@ -207,7 +226,10 @@
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/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-003: <http://rdf.chise.org/data/ccs/ucs-itaiji-003/code-point/> .
+@prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
+@prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
+@prefix ucs-itaiji-002: <http://rdf.chise.org/data/ccs/ucs-itaiji-002/code-point/> .
+@prefix ucs-itaiji-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
 
 a.ucs_component:0x4E59
     a chisegg:abstract-character ;
@@ -679,6 +701,80 @@ a.ucs:0x200CC
     rep.daikanwa...ho:0006
                :abstract-glyph-of  daikanwa...ho:0006    .
 
+a.ucs:0x31C7
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x31C7 ;
+    :name                 "CJK STROKE HP" ;
+    :general-category     "(symbol other)" ; # Informative Category
+    :bidi-category        "ON" ;
+    :mirrored             "nil" ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     1 ;
+    :eq rep.big5-cdp:0x8BA2       ; # &I-CDP-8BA2;
+    :eq rep.gt-k:00025            ; # &I-GT-K00025;
+    :eq rep.gt-pj-k1:12337        ; # ㇇
+    :subsume
+        a.gt-k:00025         ,
+        rep.gt-k:00022       ;
+    .
+    rep.big5-cdp:0x8BA2
+               :abstract-glyph-of       big5-cdp:0x8BA2  .
+    rep.gt-k:00025
+               :abstract-glyph-of           gt-k:00025   .
+    rep.gt-pj-k1:12337
+               :abstract-glyph-of       gt-pj-k1:12337   .
+    a.gt-k:00025
+        a chisegg:abstract-character ;
+        :abstract-character-of gt-k:00025 ;
+        :eq g.ucs_unicode:0x31C7      ; # &G-CDP-8BA2;
+        :eq g.big5-cdp:0x8BA2         ; # &G-CDP-8BA2;
+        :eq g.gt-k:00025              ; # &G-CDP-8BA2;
+        :subsume
+            g2.gt-k:00025        ,
+            g2.big5-cdp:0x8BA2   ,
+            g2.ucs_unicode:0x31C7 ;
+        .
+        g.ucs_unicode:0x31C7
+                   :detailed-glyph-of [ :context domain:unicode ;
+                                        :target     ucs:0x31C7  ] .
+        g.big5-cdp:0x8BA2
+                   :detailed-glyph-of       big5-cdp:0x8BA2  .
+        g.gt-k:00025
+                   :detailed-glyph-of           gt-k:00025   .
+        g2.gt-k:00025
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00025 ;
+            :eq g2.gt-pj-k1:12337         ; # &g2-GT-K00025;
+            .
+            g2.gt-pj-k1:12337
+                  :abstract-glyph-form-of       gt-pj-k1:12337   .
+        g2.big5-cdp:0x8BA2
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of big5-cdp:0x8BA2 ;
+            .
+        g2.ucs_unicode:0x31C7
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x31C7  ] ;
+            .
+    rep.gt-k:00022
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of gt-k:00022 ;
+        :eq rep.gt-pj-k1:12326        ; # &GT-K00022;
+        :subsume
+            g2.gt-k:00022        ;
+        .
+        rep.gt-pj-k1:12326
+                   :abstract-glyph-of       gt-pj-k1:12326   .
+        g2.gt-k:00022
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00022 ;
+            :eq g2.gt-pj-k1:12326         ; # &g2-GT-K00022;
+            .
+            g2.gt-pj-k1:12326
+                  :abstract-glyph-form-of       gt-pj-k1:12326   .
+
 a.ucs:0x4E5B
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E5B ;
@@ -726,45 +822,78 @@ a.ucs:0x200CA
     ideo:total-strokes     1 ;
     ideo:hanyu-dazidian  ( 1 47 5 ) ;
     :eq rep.big5-cdp:0x8C7B       ; # &I-CDP-8C7B;
+    :eq rep.gt-k:00029            ; # &I-GT-K00029;
+    :eq rep.gt-pj-k1:12346        ; # 𠃊
     :subsume
-        rep.gt-k:00029       ,
+        a.gt-k:00029         ,
         rep.gt-k:00027       ;
     .
     rep.big5-cdp:0x8C7B
                :abstract-glyph-of       big5-cdp:0x8C7B  .
     rep.gt-k:00029
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:00029 ;
-        :eq g2.ucs_iso:0x200CA        ; # &g2-CDP-8C7B;
-        :eq g2.big5-cdp:0x8C7B        ; # &g2-CDP-8C7B;
-        :eq rep.gt-pj-k1:12346        ; # &g2-CDP-8C7B;
+               :abstract-glyph-of           gt-k:00029   .
+    rep.gt-pj-k1:12346
+               :abstract-glyph-of       gt-pj-k1:12346   .
+    a.gt-k:00029
+        a chisegg:abstract-character ;
+        :abstract-character-of gt-k:00029 ;
+        :eq g.ucs_iso:0x200CA         ; # &G-CDP-8C7B;
+        :eq g.big5-cdp:0x8C7B         ; # &G-CDP-8C7B;
+        :eq g.gt-k:00029              ; # &G-CDP-8C7B;
         :subsume
-            repi.big5-cdp:0x8C7B ,
-            repi.ucs_iso:0x200CA ;
+            g2.ucs_iso:0x200CA   ;
         .
-        g2.ucs_iso:0x200CA
-              :abstract-glyph-form-of [ :context domain:iso     ;
+        g.ucs_iso:0x200CA
+                   :detailed-glyph-of [ :context domain:iso     ;
                                         :target     ucs:0x200CA ] .
-        g2.big5-cdp:0x8C7B
-              :abstract-glyph-form-of       big5-cdp:0x8C7B  .
-        rep.gt-pj-k1:12346
-                   :abstract-glyph-of       gt-pj-k1:12346   .
-        repi.big5-cdp:0x8C7B
-            a chisegg:glyph-image ;
-            :glyph-image-of big5-cdp:0x8C7B ;
-            .
-        repi.ucs_iso:0x200CA
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:iso     ;
-                              :target     ucs:0x200CA ] ;
-            .
+        g.big5-cdp:0x8C7B
+                   :detailed-glyph-of       big5-cdp:0x8C7B  .
+        g.gt-k:00029
+                   :detailed-glyph-of           gt-k:00029   .
+        g2.ucs_iso:0x200CA
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x200CA ] ;
+            :eq g2.big5-cdp:0x8C7B        ; # &g2-CDP-8C7B;
+            :eq g2.gt-k:00029             ; # &g2-CDP-8C7B;
+            :subsume
+                repi.big5-cdp:0x8C7B ,
+                repi.ucs_iso:0x200CA ,
+                repi.gt-k:00029      ;
+            .
+            g2.big5-cdp:0x8C7B
+                  :abstract-glyph-form-of       big5-cdp:0x8C7B  .
+            g2.gt-k:00029
+                  :abstract-glyph-form-of           gt-k:00029   .
+            repi.big5-cdp:0x8C7B
+                a chisegg:glyph-image ;
+                :glyph-image-of big5-cdp:0x8C7B ;
+                .
+            repi.ucs_iso:0x200CA
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x200CA ] ;
+                .
+            repi.gt-k:00029
+                a chisegg:glyph-image ;
+                :glyph-image-of gt-k:00029 ;
+                .
     rep.gt-k:00027
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt-k:00027 ;
         :eq rep.gt-pj-k1:12330        ; # &GT-K00027;
+        :subsume
+            g2.gt-k:00027        ;
         .
         rep.gt-pj-k1:12330
                    :abstract-glyph-of       gt-pj-k1:12330   .
+        g2.gt-k:00027
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00027 ;
+            :eq g2.gt-pj-k1:12330         ; # &g2-GT-K00027;
+            .
+            g2.gt-pj-k1:12330
+                  :abstract-glyph-form-of       gt-pj-k1:12330   .
 
 a.ucs:0x200CD
     a chisegg:abstract-character ;
@@ -790,42 +919,6 @@ a.ucs:0x200CD
         g2.gt-k:00020
               :abstract-glyph-form-of           gt-k:00020   .
 
-rep.big5-cdp:0x8BA2
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of big5-cdp:0x8BA2 ;
-    ideo:radical           5 ; # ⼄ 
-    ideo:strokes           0 ;
-    ideo:total-strokes     1 ;
-    :eq rep.gt-k:00025            ; # &I-GT-K00025;
-    :eq rep.gt-pj-k1:12337        ; # &CDP-8BA2;
-    :subsume
-        g2.gt-k:00025        ,
-        g2.big5-cdp:0x8BA2   ,
-        rep.gt-k:00022       ;
-    .
-    rep.gt-k:00025
-               :abstract-glyph-of           gt-k:00025   .
-    rep.gt-pj-k1:12337
-               :abstract-glyph-of       gt-pj-k1:12337   .
-    g2.gt-k:00025
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of gt-k:00025 ;
-        :eq g2.gt-pj-k1:12337         ; # &g2-GT-K00025;
-        .
-        g2.gt-pj-k1:12337
-              :abstract-glyph-form-of       gt-pj-k1:12337   .
-    g2.big5-cdp:0x8BA2
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of big5-cdp:0x8BA2 ;
-        .
-    rep.gt-k:00022
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt-k:00022 ;
-        :eq rep.gt-pj-k1:12326        ; # &GT-K00022;
-        .
-        rep.gt-pj-k1:12326
-                   :abstract-glyph-of       gt-pj-k1:12326   .
-
 a.ucs:0x4E5C
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E5C ;
@@ -886,6 +979,7 @@ a.ucs:0x4E5D
     :abstract-character-of ucs:0x4E5D ;
     :from.denotational_component
         a.ucs_component:0x4E5D ,
+        a.ucs_iwds-1:0x4E5D  ,
         a.ucs_component:0x4E38 ;
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           1 ;
@@ -1173,16 +1267,59 @@ a.ucs:0x200D0
 a.ucs:0x9FB4
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x9FB4 ;
+    :from.denotational_component
+        a.big5-cdp:0x8A60    ;
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
     :eq rep.adobe-japan1-4:14048  ; # &I-AJ1-14048;
     :eq rep.big5-cdp:0x8B69       ; # &I-CDP-8B69;
+    :subsume
+        g2.big5-cdp:0x8B69   ,
+        g2.adobe-japan1-4:14048 ;
     .
     rep.adobe-japan1-4:14048
                :abstract-glyph-of adobe-japan1-4:14048   .
     rep.big5-cdp:0x8B69
                :abstract-glyph-of       big5-cdp:0x8B69  .
+    g2.big5-cdp:0x8B69
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8B69 ;
+        .
+    g2.adobe-japan1-4:14048
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of adobe-japan1-4:14048 ;
+        :eq g2.ucs_JP...hanazono:0x9FB4 ; # &g2-AJ1-14048;
+        :subsume
+            repi.adobe-japan1-6:14048 ;
+        .
+        g2.ucs_JP...hanazono:0x9FB4
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x9FB4  ] .
+        repi.adobe-japan1-4:14048
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-4:14048 ;
+            .
+
+rep.ucs-itaiji-001:0x2008B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x2008B ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           1 ;
+    ideo:total-strokes     2 ;
+    isd:structure [ a idc:⿹ ;
+        isd:surround a.ucs:0x200CC ; # 𠃌
+        isd:filling  a.ucs:0x4E00   # 一
+    ] ;
+    :form-of             [ :context domain:flipped-horizontally ;
+                           :target  a.ucs:0x2008B        ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x2008B ;
+    .
+    g2.ucs-itaiji-001:0x2008B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2008B ;
+        .
 
 rep.big5-cdp:0x8871
     a chisegg:abstract-glyph ;
@@ -1693,75 +1830,78 @@ a.ucs:0x200D4
 a.ucs:0x2CF16
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2CF16 ;
-    ideo:radical           [ :context domain:ucs     ;
-                             :target            5 ; # ⼄
-                           ] ;
-    ideo:strokes           [ :context domain:ucs     ;
-                             :target  2 ] ;
-    ideo:radical           [ :context domain:misc    ;
-                             :target           87 ; # ⽖
-                           ] ;
-    ideo:strokes           [ :context domain:misc    ;
-                             :target  0 ] ;
+    :from.denotational_component
+        a.ucs_component:0x2CF16 ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
     ideo:total-strokes     3 ;
-    :eq a.big5-cdp:0x8DC1         ; # 𬼖
-    :eq a.iwds-1:0082             ; # 𬼖
-    :form-of             [ :context domain:component ;
-                           :target  a.ucs:0x722A         ,
-                                    a.ucs:0x4EA1         ,
-                                    a.ucs:0x5C71         ] ;
     .
-    a.big5-cdp:0x8DC1
-           :abstract-character-of       big5-cdp:0x8DC1  .
-    a.iwds-1:0082
-           :abstract-character-of         iwds-1:0082    .
 
-rep.mj:056865
+rep.ucs-itaiji-001:0x2CF16
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:056865 ;
+    :abstract-glyph-of ucs-itaiji-001:0x2CF16 ;
     :denotation-of
         a.ucs:0x2CF16        ;
-    ideo:radical           [ :context domain:ucs     ;
-                             :target            5 ; # ⼄
-                           ] ;
-    ideo:strokes           [ :context domain:ucs     ;
-                             :target  2 ] ;
-    ideo:radical           [ :context domain:misc    ;
-                             :target           87 ; # ⽖
-                           ] ;
-    ideo:strokes           [ :context domain:misc    ;
-                             :target  0 ] ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
     ideo:total-strokes     3 ;
-    :eq rep.ucs_iso:0x2CF16       ; # &MJ056865;
-    :eq rep.big5-cdp:0x89E3       ; # &I-CDP-89E3;
-    :eq rep.koseki:002080         ; # &MJ056865;
-    :eq rep.gt-k:00278            ; # &I-GT-K00278;
-    :eq rep.gt-pj-k1:13683        ; # &MJ056865;
+    :eq rep.koseki:002080         ; # &KOSEKI-002080;
     :form-of             [ :sources chisebib:koseki ;
                            :target  rep.mj:006462        ] ;
-    :form-of             [ :context domain:component ;
-                           :target  a.ucs:0x722A         ] ;
+    :form-of             [ :context domain:koseki  ;
+                           :target  rep.mj:056865        ] ;
     :subsume
         g2.koseki:002080     ,
-        g2.mj:056865         ,
-        rep.ucs-itaiji-003:0x722A ,
-        g2.gt-k:00278        ;
+        g2.ucs-itaiji-001:0x2CF16 ;
     .
-    rep.ucs_iso:0x2CF16
-               :abstract-glyph-of [ :context domain:iso     ;
-                                    :target     ucs:0x2CF16 ] .
-    rep.big5-cdp:0x89E3
-               :abstract-glyph-of       big5-cdp:0x89E3  .
     rep.koseki:002080
                :abstract-glyph-of         koseki:002080  .
-    rep.gt-k:00278
-               :abstract-glyph-of           gt-k:00278   .
-    rep.gt-pj-k1:13683
-               :abstract-glyph-of       gt-pj-k1:13683   .
     g2.koseki:002080
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of koseki:002080 ;
         .
+    g2.ucs-itaiji-001:0x2CF16
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x2CF16 ;
+        .
+
+rep.ucs-var-002:0x2CF16
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x2CF16 ;
+    :denotation-of
+        a.ucs:0x2CF16        ;
+    :from.denotational_component
+        a.gt-k:00278         ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :subsume
+        g2.ucs-var-002:0x2CF16 ;
+    .
+    g2.ucs-var-002:0x2CF16
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-var-002:0x2CF16 ;
+        .
+
+rep.mj:056865
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:056865 ;
+    :denotation-of
+        a.ucs:0x2CF16        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :eq rep.ucs_iso:0x2CF16       ; # &MJ056865;
+    :form-of             [ :sources chisebib:koseki_mj ;
+                           :target  rep.mj:006462        ] ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x722A         ] ;
+    :subsume
+        g2.mj:056865         ;
+    .
+    rep.ucs_iso:0x2CF16
+               :abstract-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x2CF16 ] .
     g2.mj:056865
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:056865 ;
@@ -1787,35 +1927,73 @@ rep.mj:056865
             a chisegg:glyph-image ;
             :glyph-image-of hng-nkk:03300 ;
             .
-    rep.ucs-itaiji-003:0x722A
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of ucs-itaiji-003:0x722A ;
-        :subsume
-            g2.ucs-itaiji-003:0x722A ;
-        .
-        g2.ucs-itaiji-003:0x722A
-            a chisegg:abstract-glyph-form ;
-            :abstract-glyph-form-of ucs-itaiji-003:0x722A ;
-            .
-    g2.gt-k:00278
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of gt-k:00278 ;
-        :eq g2.big5-cdp:0x89E3        ; # &g2-CDP-89E3;
-        :eq g2.gt-pj-k1:13683         ; # &g2-CDP-89E3;
-        .
-        g2.big5-cdp:0x89E3
-              :abstract-glyph-form-of       big5-cdp:0x89E3  .
-        g2.gt-pj-k1:13683
-              :abstract-glyph-form-of       gt-pj-k1:13683   .
+
+a.ucs:0x2CF17
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2CF17 ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            5 ; # ⼄
+                           ] ;
+    ideo:radical           [ :context domain:gt      ;
+                             :target            4 ; # ⼃
+                           ] ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.big5-cdp:0x8CBD ; # &CDP-8CBD;
+        isd:filling  a.ucs:0x4E5A   # 乚
+    ] ;
+    :sound               [ :context domain:ja...kun ;
+                           :note   ("grain") ;
+                           :target  ( "gureiN" ) ;
+                         ] ;
+    .
+
+a.ucs_component:0x2CF16
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x2CF16 ] ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            5 ; # ⼄
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  2 ] ;
+    ideo:radical           [ :context domain:misc    ;
+                             :target           87 ; # ⽖
+                           ] ;
+    ideo:strokes           [ :context domain:misc    ;
+                             :target  0 ] ;
+    ideo:total-strokes     3 ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x722A         ,
+                                    a.ucs:0x4EA1         ,
+                                    a.ucs:0x5C71         ] ;
+    .
+
+rep.ucs-itaiji-001:0x4EBE
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x4EBE ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x200CA ; # 𠃊
+        isd:filling  a.ucs:0x3405   # 㐅
+    ] ;
+    :form-of             a.ucs:0x4EBE         ,
+                         a.ucs:0x5166         ,
+                         rep.mj:006462        ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  a.ucs:0x51F6         ] ;
+    .
 
 rep.big5-cdp:0x88B9
     a chisegg:abstract-glyph ;
     :abstract-glyph-of big5-cdp:0x88B9 ;
-    :denotation-of
-        a.ucs:0x2CF16        ;
+    :from.denotational_component
+        a.ucs_component:0x2CF16 ;
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
+    ideo:mistakable      a.ucs:0x20009        ;
     :subsume
         g2.big5-cdp:0x88B9   ;
     .
@@ -2145,6 +2323,30 @@ rep.big5-cdp:0x87D1
     ideo:hanyu-dazidian  ( 1 52 3 ) ;
     .
 
+rep.mj:056864
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:056864 ;
+    :denotation-of
+        a.ucs:0x2CF17        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     4 ;
+    :eq rep.ucs_JP...hanazono:0x2CF17 ; # &MJ056864;
+    :subsume
+        g2.mj:056864         ;
+    .
+    rep.ucs_JP...hanazono:0x2CF17
+               :abstract-glyph-of [ :context domain:JP...hanazono ;
+                                    :target     ucs:0x2CF17 ] .
+    g2.mj:056864
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:056864 ;
+        :eq g2.ucs_JP...hanazono:0x2CF17 ; # &g2-MJ056864;
+        .
+        g2.ucs_JP...hanazono:0x2CF17
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2CF17 ] .
+
 a.gt-k:00383
     a chisegg:abstract-character ;
     :abstract-character-of gt-k:00383 ;
@@ -2618,36 +2820,229 @@ a.ucs:0x200E4
     ideo:radical           5 ; # ⼄ 
     ideo:strokes           5 ;
     ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x2CF16 ; # &A-compU+2CF16;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    .
+
+rep.ucs_iso:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x200E4 ] ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.gt-k:00594 ; # &A-GT-K00594;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :eq o.ucs_iso:0x200E4         ; # &o-GT-00244;
+    :eq a.mj:030427               ; # &o-GT-00244;
+    :eq o.gt:00244                ; # &o-GT-00244;
     :subsume
-        rep.ucs_iso:0x200E4  ,
+        rep.mj:030427        ,
         rep.cns11643-6:0x2346 ;
     .
-    rep.ucs_iso:0x200E4
+    o.ucs_iso:0x200E4
+                :unified-glyph-of [ :context domain:iso     ;
+                                    :target     ucs:0x200E4 ] .
+    a.mj:030427
+           :abstract-character-of             mj:030427  .
+    o.gt:00244
+                :unified-glyph-of             gt:00244   .
+    rep.mj:030427
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x200E4 ] ;
+        :abstract-glyph-of mj:030427 ;
         ideo:hanyu-dazidian  ( 1 38 11 ) ;
-        :eq rep.gt:00244              ; # &GT-00244;
-        :eq rep.gt-pj-2:12627         ; # &GT-00244;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.gt-k:00594 ; # &GT-K00594;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
+        :eq rep.ucs_iso:0x200E4       ; # &MJ030427;
+        :eq rep.hanyo-denshi...ks:002230 ; # &MJ030427;
+        :eq rep.gt:00244              ; # &I-GT-00244;
+        :eq rep.gt-pj-2:12627         ; # &I-GT-00244;
         :eq rep.daikanwa:00183        ; # &I-M-00183;
-        :eq rep.hanziku-1:0xABE1      ; # &I-HZK01-ABE1;
+        ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
+                                        chisebib:daikanwa ;
+                               :target  rep.hanyo-denshi...ks:346980 ] ;
+        :form-of             [ :sources chisebib:koseki ,
+                                        chisebib:mj ;
+                               :target  [ :target  rep.hanyo-denshi...ks:346980 ;
+                                          :sources chisebib:koseki ] ,
+                                        [ :target  rep.mj:021897        ;
+                                          :sources chisebib:koseki_mj ] ] ;
+        :subsume
+            g2.mj:030427         ;
         .
+        rep.ucs_iso:0x200E4
+                   :abstract-glyph-of [ :context domain:iso     ;
+                                        :target     ucs:0x200E4 ] .
+        rep.hanyo-denshi...ks:002230
+                   :abstract-glyph-of hanyo-denshi...ks:002230  .
         rep.gt:00244
                    :abstract-glyph-of             gt:00244   .
         rep.gt-pj-2:12627
                    :abstract-glyph-of        gt-pj-2:12627   .
         rep.daikanwa:00183
                    :abstract-glyph-of       daikanwa:00183   .
-        rep.hanziku-1:0xABE1
-                   :abstract-glyph-of      hanziku-1:0xABE1  .
+        g2.mj:030427
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:030427 ;
+            :eq g2.ucs_iso:0x200E4        ; # &g2-MJ030427;
+            :eq g2.hanyo-denshi...ks:002230 ; # &g2-MJ030427;
+            :eq g2.gt:00244               ; # &g2-MJ030427;
+            :eq g2.daikanwa:00183         ; # &g2-MJ030427;
+            :subsume
+                repi.daikanwa:00183  ,
+                repi.hanyo-denshi...ks:002230 ,
+                repi.mj:030427       ,
+                repi.gt:00244        ,
+                repi.ucs_iso:0x200E4 ,
+                rep.hanziku-1:0xABE1 ;
+            .
+            g2.ucs_iso:0x200E4
+                  :abstract-glyph-form-of [ :context domain:iso     ;
+                                            :target     ucs:0x200E4 ] .
+            g2.hanyo-denshi...ks:002230
+                  :abstract-glyph-form-of hanyo-denshi...ks:002230  .
+            g2.gt:00244
+                  :abstract-glyph-form-of             gt:00244   .
+            g2.daikanwa:00183
+                  :abstract-glyph-form-of       daikanwa:00183   .
+            repi.daikanwa:00183
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:00183 ;
+                .
+            repi.hanyo-denshi...ks:002230
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...ks:002230 ;
+                :eq rep.hanyo-denshi...ks...mf:000223 ; # &R-HD-KS-002230;
+                .
+                rep.hanyo-denshi...ks...mf:000223
+                           :abstract-glyph-of hanyo-denshi...ks...mf:000223  .
+            repi.mj:030427
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:030427 ;
+                .
+            repi.gt:00244
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:00244 ;
+                .
+            repi.ucs_iso:0x200E4
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:iso     ;
+                                  :target     ucs:0x200E4 ] ;
+                .
+            rep.hanziku-1:0xABE1
+                a chisegg:abstract-glyph ;
+                :abstract-glyph-of hanziku-1:0xABE1 ;
+                .
     rep.cns11643-6:0x2346
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-6:0x2346 ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.ucs-itaiji-002:0x20009 ; # &U-i002+20009;
+            isd:below    a.ucs:0x2BDA7   # 𫶧
+        ] ;
         :eq rep.ucs_cns:0x200E4       ; # &C6-2346;
+        :subsume
+            g2.cns11643-6:0x2346 ;
         .
         rep.ucs_cns:0x200E4
                    :abstract-glyph-of [ :context domain:cns     ;
                                         :target     ucs:0x200E4 ] .
+        g2.cns11643-6:0x2346
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of cns11643-6:0x2346 ;
+            :eq g2.ucs_cns:0x200E4        ; # &g2-CU+200E4;
+            .
+            g2.ucs_cns:0x200E4
+                  :abstract-glyph-form-of [ :context domain:cns     ;
+                                            :target     ucs:0x200E4 ] .
+
+rep.ucs-itaiji-001:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x200E4 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.big5-cdp:0x89E3 ; # &CDP-89E3;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x200E4 ;
+    .
+    g2.ucs-itaiji-001:0x200E4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x200E4 ;
+        .
+
+rep.ucs-itaiji-002:0x200E4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-002:0x200E4 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-var-002:0x2CF16 ; # &U-v002+2CF16;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :subsume
+        g2.ucs-itaiji-002:0x200E4 ;
+    .
+    g2.ucs-itaiji-002:0x200E4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-002:0x200E4 ;
+        .
+
+rep.mj:057398
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:057398 ;
+    :denotation-of
+        a.ucs:0x200E4        ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     6 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x2CF16 ; # &KOSEKI-002080;
+        isd:below    a.ucs:0x2BDA7   # 𫶧
+    ] ;
+    :eq rep.hanyo-denshi...ks:098160 ; # &MJ057398;
+    :subsume
+        g2.mj:057398         ;
+    .
+    rep.hanyo-denshi...ks:098160
+               :abstract-glyph-of hanyo-denshi...ks:098160  .
+    g2.mj:057398
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:057398 ;
+        :eq g2.hanyo-denshi...ks:098160 ; # &g2-MJ057398;
+        :subsume
+            repi.hanyo-denshi...ks:098160 ,
+            repi.mj:057398       ;
+        .
+        g2.hanyo-denshi...ks:098160
+              :abstract-glyph-form-of hanyo-denshi...ks:098160  .
+        repi.hanyo-denshi...ks:098160
+            a chisegg:glyph-image ;
+            :glyph-image-of hanyo-denshi...ks:098160 ;
+            :eq rep.hanyo-denshi...ks...mf:009816 ; # &R-HD-KS-098160;
+            .
+            rep.hanyo-denshi...ks...mf:009816
+                       :abstract-glyph-of hanyo-denshi...ks...mf:009816  .
+        repi.mj:057398
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:057398 ;
+            .
 
 a.ucs:0x200E5
     a chisegg:abstract-character ;
@@ -3159,9 +3554,10 @@ a.ucs:0x209DD
         ideo:strokes           5 ;
         .
 
-a.ucs:0x8034
+a.ucs_component:0x8034
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x8034 ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x8034  ] ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -3175,11 +3571,11 @@ a.ucs:0x8034
     ideo:total-strokes     7 ;
     .
 
-rep.adobe-japan1-6:22250
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of adobe-japan1-6:22250 ;
+a.ucs:0x8034
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x8034 ;
     :denotation-of
-        a.ucs:0x8034         ;
+        a.ucs_component:0x8034 ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -3191,19 +3587,25 @@ rep.adobe-japan1-6:22250
     ideo:strokes           [ :context domain:gt      ;
                              :target  6 ] ;
     ideo:total-strokes     7 ;
-    :eq rep.ucs_unicode:0x8034    ; # &AJ1-22250;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x8033 ; # 耳
+        isd:right    a.ucs:0x4E5A   # 乚
+    ] ;
+    :eq rep.adobe-japan1-6:22250  ; # &I-AJ1-22250;
     :eq rep.jis-x0212:0x555B      ; # &I-JSP-555B;
     :eq rep.cns11643-2:0x2473     ; # &I-C2-2473;
     :eq a.big5:0xCB73             ; # &I-B-CB73;
     :eq rep.daikanwa:29001        ; # &I-M-29001;
-    :eq rep.shinjigen:6375        ; # &AJ1-22250;
+    :eq rep.shinjigen:6375        ; # 耴
+    ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
+                                    chisebib:daikanwa ;
+                           :target  rep.gt:37566         ] ;
     :subsume
         rep.gt:37567         ,
         rep.gt:00250         ;
     .
-    rep.ucs_unicode:0x8034
-               :abstract-glyph-of [ :context domain:unicode ;
-                                    :target     ucs:0x8034  ] .
+    rep.adobe-japan1-6:22250
+               :abstract-glyph-of adobe-japan1-6:22250   .
     rep.jis-x0212:0x555B
                :abstract-glyph-of      jis-x0212:0x555B  .
     rep.cns11643-2:0x2473
@@ -3314,11 +3716,11 @@ rep.adobe-japan1-6:22250
             :glyph-image-of gt:00250 ;
             .
 
-rep.gt:37568
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:37568 ;
+a.ucs:0x2652E
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2652E ;
     :denotation-of
-        a.ucs:0x8034         ;
+        a.ucs_component:0x8034 ;
     ideo:radical           [ :context domain:ucs     ;
                              :target          128 ; # ⽿
                            ] ;
@@ -3330,13 +3732,35 @@ rep.gt:37568
     ideo:strokes           [ :context domain:gt      ;
                              :target  6 ] ;
     ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x8033 ; # 耳
+        isd:filling  a.ucs:0x4E5A   # 乚
+    ] ;
+    :eq rep.gt:37568              ; # &I-GT-37568;
     :eq rep.gt-k:02776            ; # &I-GT-K02776;
-    :eq rep.gt-pj-9:19325         ; # &GT-37568;
+    :eq rep.gt-pj-9:19325         ; # &I-GT-37568;
+    :subsume
+        g2.gt:37568          ,
+        g2.ucs_iso:0x2652E   ;
     .
+    rep.gt:37568
+               :abstract-glyph-of             gt:37568   .
     rep.gt-k:02776
                :abstract-glyph-of           gt-k:02776   .
     rep.gt-pj-9:19325
                :abstract-glyph-of        gt-pj-9:19325   .
+    g2.gt:37568
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:37568 ;
+        :eq g2.gt-k:02776             ; # &g2-GT-37568;
+        .
+        g2.gt-k:02776
+              :abstract-glyph-form-of           gt-k:02776   .
+    g2.ucs_iso:0x2652E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2652E ] ;
+        .
 
 a.ucs:0x4E72
     a chisegg:abstract-character ;
@@ -3376,10 +3800,41 @@ a.ucs:0x200EC
     ideo:strokes           6 ;
     ideo:total-strokes     7 ;
     ideo:hanyu-dazidian  ( 1 53 16 ) ;
+    isd:structure [ a idc:â¿· ;
+        isd:surround [
+            isd:structure [ a idc:â¿´ ;
+                isd:surround a.ucs:0x5DF1 ; # å·±
+                isd:filling  rep.big5-cdp:0x8C78   # &CDP-8C78;
+            ]
+        ] ;
+        isd:filling  a.ucs:0x531A   # 匚
+    ] ;
     :eq rep.big5-cdp:0x88E3       ; # &I-CDP-88E3;
+    :subsume
+        g2.ucs_iso:0x200EC   ;
     .
     rep.big5-cdp:0x88E3
                :abstract-glyph-of       big5-cdp:0x88E3  .
+    g2.ucs_iso:0x200EC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x200EC ] ;
+        :eq g2.big5-cdp:0x88E3        ; # &g2-CDP-88E3;
+        :subsume
+            repi.big5-cdp:0x88E3 ,
+            repi.ucs_iso:0x200EC ;
+        .
+        g2.big5-cdp:0x88E3
+              :abstract-glyph-form-of       big5-cdp:0x88E3  .
+        repi.big5-cdp:0x88E3
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x88E3 ;
+            .
+        repi.ucs_iso:0x200EC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x200EC ] ;
+            .
 
 a.gt-k:03520
     a chisegg:abstract-character ;
@@ -4942,7 +5397,7 @@ rep.adobe-japan1-4:14306
     ideo:strokes          10 ;
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:07307 ; # &GT-K07307;
+        isd:left     rep.ucs-itaiji-005:0x24514 ; # &U-i005+24514;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
     :eq rep.ucs_jis:0x4E7F        ; # &AJ1-14306;
@@ -5026,12 +5481,7 @@ rep.gt:00277
     ideo:strokes          10 ;
     ideo:total-strokes    11 ;
     isd:structure [ a idc:â¿° ;
-        isd:left     [
-            isd:structure [ a idc:⿱ ;
-                isd:above    a.ucs:0x2EA4 ; # ⺤
-                isd:below    a.ucs:0x7CF8   # 糸
-            ]
-        ] ;
+        isd:left     rep.gt-k:07395 ; # &GT-K07395;
         isd:right    a.ucs:0x4E5A   # 乚
     ] ;
     :eq rep.ucs_unicode:0x4E7F    ; # &GT-00277;
@@ -5052,15 +5502,6 @@ rep.gt:00277
     g2.gt:00277
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:00277 ;
-        isd:structure [ a idc:â¿° ;
-            isd:left     [
-                isd:structure [ a idc:⿱ ;
-                    isd:above    a.ucs:0x2EA4 ; # ⺤
-                    isd:below    g2.gt:35079   # &g2-GT-35079;
-                ]
-            ] ;
-            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
-        ] ;
         :eq g2.ucs_cns:0x4E7F         ; # &g2-GT-00277;
         :eq g2.cns11643-2:0x334E      ; # &g2-GT-00277;
         :subsume
@@ -5084,15 +5525,6 @@ rep.gt:00277
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x4E7F  ] ;
-        isd:structure [ a idc:â¿° ;
-            isd:left     [
-                isd:structure [ a idc:⿱ ;
-                    isd:above    a.ucs:0x2EA4 ; # ⺤
-                    isd:below    g2.ucs_unicode:0x7CF8   # &g2-UU+7CF8;
-                ]
-            ] ;
-            isd:right    g2.ucs_unicode:0x4E5A   # &g2-AJ1-14305;
-        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         .
 
@@ -5554,6 +5986,30 @@ rep.hanziku-1:0xAFC5
     ] ;
     .
 
+rep.ucs-itaiji-001:0x200EC
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x200EC ;
+    ideo:radical           5 ; # ⼄ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    [
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x4E5B ; # 乛
+                isd:middle   rep.adobe-japan1-0:01979 ; # &AJ1-01979;
+                isd:below    a.ucs:0x4E00   # 一
+            ]
+        ] ;
+        isd:below    a.ucs:0x540B   # 吋
+    ] ;
+    :subsume
+        g2.ucs-itaiji-001:0x200EC ;
+    .
+    g2.ucs-itaiji-001:0x200EC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of ucs-itaiji-001:0x200EC ;
+        .
+
 a.ucs:0x3424
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3424 ;
@@ -6410,7 +6866,14 @@ a.ucs_component:0x4E5D
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E5D  ] ;
     ideo:radical           5 ; # ⼄ 
-    :eq a.iwds-1:0203             ; # &A-compU+4E5D;
+    .
+
+a.ucs_iwds-1:0x4E5D
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x4E5D  ] ;
+    ideo:radical           5 ; # ⼄ 
+    :eq a.iwds-1:0203             ; # &A-IWDSU+4E5D;
     .
     a.iwds-1:0203
            :abstract-character-of         iwds-1:0203    .