X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R003-Dot.ttl;h=9da415e007de5b8ce9e7b7cc7a3b82b856f2cdb7;hb=ba34938135834261570fc113f862b8291373117a;hp=3e1d1ab4bd7ce8c1f4d5848f42ff18f23b77fffe;hpb=692422a29158f6e6ecf7bf1617ca387975125018;p=chise%2Fchiset.git

diff --git a/Ideograph-R003-Dot.ttl b/Ideograph-R003-Dot.ttl
index 3e1d1ab..9da415e 100644
--- a/Ideograph-R003-Dot.ttl
+++ b/Ideograph-R003-Dot.ttl
@@ -7,12 +7,14 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
+@prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
+@prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix 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=> .
@@ -26,8 +28,10 @@
 @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=> .
+@prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
 @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 g.adobe-japan1-4: <http://www.chise.org/est/view/character/g.adobe-japan1-4=> .
 @prefix rep.jis-x0208: <http://www.chise.org/est/view/character/rep.jis-x0208=> .
 @prefix rep.gb2312: <http://www.chise.org/est/view/character/rep.gb2312=> .
 @prefix g2.gb2312: <http://www.chise.org/est/view/character/g2.gb2312=> .
@@ -46,6 +50,8 @@
 @prefix g2.cns11643-3: <http://www.chise.org/est/view/character/g2.cns11643-3=> .
 @prefix repi.cns11643-3: <http://www.chise.org/est/view/character/repi.cns11643-3=> .
 @prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
+@prefix g2.cns11643-5: <http://www.chise.org/est/view/character/g2.cns11643-5=> .
+@prefix repi.cns11643-5: <http://www.chise.org/est/view/character/repi.cns11643-5=> .
 @prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
 @prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
 @prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
@@ -66,8 +72,11 @@
 @prefix rep.hanyo-denshi...jt: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jt=> .
 @prefix g2.hanyo-denshi...ja: <http://www.chise.org/est/view/character/g2.hanyo-denshi...ja=> .
 @prefix g2.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g2.hanyo-denshi...jt=> .
+@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...jt: <http://www.chise.org/est/view/character/repi.hanyo-denshi...jt=> .
 @prefix repi.mj: <http://www.chise.org/est/view/character/repi.mj=> .
+@prefix g.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g.hanyo-denshi...jt=> .
 @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=> .
@@ -79,10 +88,12 @@
 @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=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.gt-pj-k2: <http://www.chise.org/est/view/character/rep.gt-pj-k2=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
+@prefix g.daikanwa: <http://www.chise.org/est/view/character/g.daikanwa=> .
 @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=> .
@@ -103,16 +114,17 @@
 @prefix repi.hng-skk: <http://www.chise.org/est/view/character/repi.hng-skk=> .
 @prefix rep.cbeta: <http://www.chise.org/est/view/character/rep.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 a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
-@prefix rep.ucs-sip-var-003: <http://www.chise.org/est/view/character/rep.ucs-sip-var-003=> .
 @prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
 @prefix adobe-japan1-0: <http://rdf.chise.org/data/ccs/adobe-japan1-0/code-point/> .
 @prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
+@prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
 @prefix gb2312: <http://rdf.chise.org/data/ccs/gb2312/code-point/> .
 @prefix ks-x1001: <http://rdf.chise.org/data/ccs/ks-x1001/code-point/> .
@@ -129,6 +141,7 @@
 @prefix big5-cdp: <http://rdf.chise.org/data/ccs/big5-cdp/code-point/> .
 @prefix hanyo-denshi...ja: <http://rdf.chise.org/data/ccs/hanyo-denshi...ja/code-point/> .
 @prefix hanyo-denshi...jt: <http://rdf.chise.org/data/ccs/hanyo-denshi...jt/code-point/> .
+@prefix koseki: <http://rdf.chise.org/data/ccs/koseki/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/> .
@@ -154,7 +167,6 @@
 @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-003: <http://rdf.chise.org/data/ccs/ucs-var-003/code-point/> .
-@prefix ucs-sip-var-003: <http://rdf.chise.org/data/ccs/ucs-sip-var-003/code-point/> .
 @prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/code-point/> .
 
 a.ucs:0x4E36
@@ -279,19 +291,75 @@ a.ucs:0x4E36
                               :target     ucs:0x4E36  ] ;
             .
 
-rep.gt:00129
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of gt:00129 ;
+a.ucs:0x303B
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x303B ;
+    :name                 "VERTICAL IDEOGRAPHIC ITERATION MARK" ;
     ideo:radical           3 ; # ⼂ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq rep.gt-pj-2:12392         ; # &GT-00129;
+    :eq rep.mj:000003             ; # &I-MJ000003;
+    :eq rep.jis-x0213-1:0x2236    ; # &I-JX1-2236;
+    :eq rep.koseki:001070         ; # 〻
+    :eq rep.gt:00129              ; # &I-GT-00129;
+    :eq rep.gt-pj-2:12392         ; # &I-GT-00129;
     :eq rep.daikanwa:00092        ; # &I-M-00092;
+    :subsume
+        g2.daikanwa:00092    ,
+        g2.ucs_unicode:0x303B ,
+        g2.mj:000003         ;
     .
+    rep.mj:000003
+               :abstract-glyph-of             mj:000003  .
+    rep.jis-x0213-1:0x2236
+               :abstract-glyph-of    jis-x0213-1:0x2236  .
+    rep.koseki:001070
+               :abstract-glyph-of         koseki:001070  .
+    rep.gt:00129
+               :abstract-glyph-of             gt:00129   .
     rep.gt-pj-2:12392
                :abstract-glyph-of        gt-pj-2:12392   .
     rep.daikanwa:00092
                :abstract-glyph-of       daikanwa:00092   .
+    g2.daikanwa:00092
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:00092 ;
+        .
+    g2.ucs_unicode:0x303B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x303B  ] ;
+        :eq g2.jis-x0213-1:0x2236     ; # &g2-GT-00129;
+        :eq g2.koseki:001070          ; # &g2-GT-00129;
+        :eq g2.gt:00129               ; # &g2-GT-00129;
+        :subsume
+            repi.jis-x0213-1:0x2236 ,
+            repi.gt:00129        ,
+            repi.ucs_unicode:0x303B ;
+        .
+        g2.jis-x0213-1:0x2236
+              :abstract-glyph-form-of    jis-x0213-1:0x2236  .
+        g2.koseki:001070
+              :abstract-glyph-form-of         koseki:001070  .
+        g2.gt:00129
+              :abstract-glyph-form-of             gt:00129   .
+        repi.jis-x0213-1:0x2236
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0213-1:0x2236 ;
+            .
+        repi.gt:00129
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00129 ;
+            .
+        repi.ucs_unicode:0x303B
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x303B  ] ;
+            .
+    g2.mj:000003
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:000003 ;
+        .
 
 a.ucs:0x4E37
     a chisegg:abstract-character ;
@@ -312,7 +380,7 @@ a.ucs:0x4E37
     :eq rep.gt-pj-k1:12873        ; # 丷
     :subsume
         g2.ucs_unicode:0x4E37 ,
-        repi.gt-k:00150      ;
+        g2.gt-k:00150        ;
     .
     rep.adobe-japan1-4:13981
                :abstract-glyph-of adobe-japan1-4:13981   .
@@ -355,61 +423,64 @@ a.ucs:0x4E37
             :glyph-image-of [ :context domain:unicode ;
                               :target     ucs:0x4E37  ] ;
             .
-    repi.gt-k:00150
-        a chisegg:glyph-image ;
-        :glyph-image-of gt-k:00150 ;
-        :eq g2.gt-k:00150             ; # &g2-GT-K00150;
+    g2.gt-k:00150
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:00150 ;
         .
-        g2.gt-k:00150
-              :abstract-glyph-form-of           gt-k:00150   .
 
 a.ucs:0x2A70A
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2A70A ;
-    ideo:radical           3 ; # ⼂ 
-    .
-
-rep.ucs_iso:0x2A70A
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of [ :context domain:iso     ;
-                         :target     ucs:0x2A70A ] ;
     :denotation-of
-        a.ucs:0x2A70A        ;
+        a.ucs_component:0x2A70A ;
     ideo:radical           3 ; # ⼂ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.ucs_iwds-1:0x2A70A      ; # &A-IWDSU+2A70A;
-    :eq o.ucs_iso:0x2A70A         ; # &A-IWDSU+2A70A;
     :subsume
         rep.ucs_iso:0x2A70A  ,
-        rep.ucs-sip-var-003:0x2A70A ;
+        rep.gt-k:00151       ,
+        rep.ucs-var-003:0x2A70A ;
     .
-    a.ucs_iwds-1:0x2A70A
-           :abstract-character-of [ :context domain:iwds-1  ;
-                                    :target     ucs:0x2A70A ] .
-    o.ucs_iso:0x2A70A
-                :unified-glyph-of [ :context domain:iso     ;
-                                    :target     ucs:0x2A70A ] .
     rep.ucs_iso:0x2A70A
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2A70A ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E36 ; # 丶
-        isd:below    rep.gt-k:00025   # &GT-K00025;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E36 ; # 丶
+            isd:below    a.ucs:0x31C7   # ㇇
+        ] ;
+        :subsume
+            g2.ucs_iso:0x2A70A   ;
         .
-    rep.ucs-sip-var-003:0x2A70A
+        g2.ucs_iso:0x2A70A
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x2A70A ] ;
+            .
+    rep.gt-k:00151
         a chisegg:abstract-glyph ;
-        :abstract-glyph-of ucs-sip-var-003:0x2A70A ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:below    rep.gt-k:00022   # &GT-K00022;
-    ] ;
-        :eq rep.ucs-var-003:0x2A70A   ; # &U-v003+2A70A;
+        :abstract-glyph-of gt-k:00151 ;
+        :eq rep.gt-pj-k1:16937        ; # &GT-K00151;
+        :subsume
+            g2.gt-k:00151        ;
+        .
+        rep.gt-pj-k1:16937
+                   :abstract-glyph-of       gt-pj-k1:16937   .
+        g2.gt-k:00151
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of gt-k:00151 ;
+            :eq g2.gt-pj-k1:16937         ; # &g2-GT-K00151;
+            .
+            g2.gt-pj-k1:16937
+                  :abstract-glyph-form-of       gt-pj-k1:16937   .
+    rep.ucs-var-003:0x2A70A
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-003:0x2A70A ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E00 ; # 一
+            isd:below    rep.gt-k:00022   # &GT-K00022;
+        ] ;
         .
-        rep.ucs-var-003:0x2A70A
-                   :abstract-glyph-of    ucs-var-003:0x2A70A .
 
 a.ucs_component:0x4E37
     a chisegg:abstract-character ;
@@ -418,10 +489,17 @@ a.ucs_component:0x4E37
     ideo:radical           3 ; # ⼂ 
     ideo:strokes           1 ;
     ideo:total-strokes     2 ;
-    :eq a.iwds-1:0x16             ; # &IWDS1-022;
+    :eq a.iwds-1:0022             ; # &A-compU+4E37;
+    .
+    a.iwds-1:0022
+           :abstract-character-of         iwds-1:0022    .
+
+a.ucs_component:0x2A70A
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:component ;
+                             :target     ucs:0x2A70A ] ;
+    ideo:radical           3 ; # ⼂ 
     .
-    a.iwds-1:0x16
-           :abstract-character-of         iwds-1:0x16    .
 
 a.ucs:0x2007C
     a chisegg:abstract-character ;
@@ -433,9 +511,9 @@ a.ucs:0x2007C
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E36 ; # 丶
         isd:below    [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x4E36 ; # 丶
-                :right    a.ucs:0x4E36   # 丶
+            isd:structure [ a idc:â¿° ;
+                isd:left     a.ucs:0x4E36 ; # 丶
+                isd:right    a.ucs:0x4E36   # 丶
             ]
         ]
     ] ;
@@ -469,12 +547,12 @@ a.ucs:0x4E38
                            :target  ( "gan" ) ;
                          ] ;
     :eq a.big5:0xA459             ; # &I-B-A459;
-    :eq a.iwds-1:0x68             ; # 丸
+    :eq a.iwds-1:0104             ; # 丸
     .
     a.big5:0xA459
            :abstract-character-of           big5:0xA459  .
-    a.iwds-1:0x68
-           :abstract-character-of         iwds-1:0x68    .
+    a.iwds-1:0104
+           :abstract-character-of         iwds-1:0104    .
 
 a.ucs:0x2F801
     a chisegg:abstract-character ;
@@ -497,7 +575,7 @@ a.ucs:0x2F801
     :eq rep.gt-k:00161            ; # &I-GT-K00161;
     :eq rep.gt-pj-1:13405         ; # &I-GT-00131;
     :eq rep.daikanwa:00094        ; # &I-M-00094;
-    :eq rep.shinjigen:00039       ; # 丸
+    :eq rep.shinjigen:0039        ; # 丸
     :subsume
         g2.ucs_iso:0x2F801   ;
     .
@@ -527,8 +605,8 @@ a.ucs:0x2F801
                :abstract-glyph-of        gt-pj-1:13405   .
     rep.daikanwa:00094
                :abstract-glyph-of       daikanwa:00094   .
-    rep.shinjigen:00039
-               :abstract-glyph-of      shinjigen:00039   .
+    rep.shinjigen:0039
+               :abstract-glyph-of      shinjigen:0039    .
     g2.ucs_iso:0x2F801
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
@@ -547,7 +625,7 @@ a.ucs:0x2F801
         :eq g2.gt:00131               ; # &g2-AJ1-01561;
         :eq g2.gt-k:00161             ; # &g2-AJ1-01561;
         :eq g2.daikanwa:00094         ; # &g2-AJ1-01561;
-        :eq g2.shinjigen:00039        ; # &g2-AJ1-01561;
+        :eq g2.shinjigen:0039         ; # &g2-AJ1-01561;
         :subsume
             repi.daikanwa:00094  ,
             repi.jis-x0208:0x345D ,
@@ -582,8 +660,8 @@ a.ucs:0x2F801
               :abstract-glyph-form-of           gt-k:00161   .
         g2.daikanwa:00094
               :abstract-glyph-form-of       daikanwa:00094   .
-        g2.shinjigen:00039
-              :abstract-glyph-form-of      shinjigen:00039   .
+        g2.shinjigen:0039
+              :abstract-glyph-form-of      shinjigen:0039    .
         repi.daikanwa:00094
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00094 ;
@@ -629,6 +707,22 @@ a.ucs:0x2F801
                               :target     ucs:0x2F801 ] ;
             .
 
+rep.big5-cdp:0x8753
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x8753 ;
+    :denotation-of
+        a.ucs:0x4E38         ;
+    ideo:radical           3 ; # ⼂ 
+    ideo:strokes           2 ;
+    ideo:total-strokes     3 ;
+    :subsume
+        g2.big5-cdp:0x8753   ;
+    .
+    g2.big5-cdp:0x8753
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8753 ;
+        .
+
 rep.gt:00132
     a chisegg:abstract-glyph ;
     :abstract-glyph-of gt:00132 ;
@@ -644,7 +738,7 @@ rep.gt:00132
     :eq rep.gt-pj-2:12394         ; # &I-GT-00132;
     :eq rep.daikanwa:00095        ; # &I-M-00095;
     :subsume
-        repi.gt:00132        ;
+        g2.gt:00132          ;
     .
     rep.ucs_cns:0x4E38
                :abstract-glyph-of [ :context domain:cns     ;
@@ -657,12 +751,11 @@ rep.gt:00132
                :abstract-glyph-of        gt-pj-2:12394   .
     rep.daikanwa:00095
                :abstract-glyph-of       daikanwa:00095   .
-    repi.gt:00132
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00132 ;
+    g2.gt:00132
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00132 ;
         :eq g2.ucs_cns:0x4E38         ; # &g2-GT-00132;
         :eq g2.cns11643-1:0x443A      ; # &g2-GT-00132;
-        :eq g2.gt:00132               ; # &g2-GT-00132;
         :eq g2.gt-k:00162             ; # &g2-GT-00132;
         :eq g2.daikanwa:00095         ; # &g2-GT-00132;
         :subsume
@@ -676,8 +769,6 @@ rep.gt:00132
                                         :target     ucs:0x4E38  ] .
         g2.cns11643-1:0x443A
               :abstract-glyph-form-of     cns11643-1:0x443A  .
-        g2.gt:00132
-              :abstract-glyph-form-of             gt:00132   .
         g2.gt-k:00162
               :abstract-glyph-form-of           gt-k:00162   .
         g2.daikanwa:00095
@@ -720,11 +811,11 @@ a.ucs:0x2007D
         :eq rep.big5-cdp:0x87B9       ; # &I-CDP-87B9;
         :eq rep.gt-pj-2:12395         ; # &I-GT-00133;
         :eq rep.daikanwa:00096        ; # &I-M-00096;
-        :eq rep.shinjigen:00040       ; # &GT-00133;
-        :from.original       [ :sources chisebib:zhonghua-dazidian ,
-                                        chisebib:daikanwa ,
-                                        chisebib:shinjigen ;
-                               :target  a.ucs:0x2F801        ] ;
+        :eq rep.shinjigen:0040        ; # &GT-00133;
+        ideo:original-form-of [ :sources chisebib:zhonghua-dazidian ,
+                                         chisebib:daikanwa ,
+                                         chisebib:shinjigen ;
+                                :target  a.ucs:0x2F801        ] ;
         .
         rep.cns11643-6:0x2132
                    :abstract-glyph-of     cns11643-6:0x2132  .
@@ -734,8 +825,8 @@ a.ucs:0x2007D
                    :abstract-glyph-of        gt-pj-2:12395   .
         rep.daikanwa:00096
                    :abstract-glyph-of       daikanwa:00096   .
-        rep.shinjigen:00040
-                   :abstract-glyph-of      shinjigen:00040   .
+        rep.shinjigen:0040
+                   :abstract-glyph-of      shinjigen:0040    .
     rep.ucs_iso:0x2007D
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
@@ -763,7 +854,7 @@ a.ucs:0x206A4
     :eq rep.gt-pj-2:12396         ; # &I-GT-00135;
     :eq rep.daikanwa:00097        ; # &I-M-00097;
     :eq rep.cbeta:02728           ; # &I-CB02728;
-    :from.same           a.ucs:0x3005         ;
+    ideo:same-as         a.ucs:0x3005         ;
     .
     rep.gt:00135
                :abstract-glyph-of             gt:00135   .
@@ -823,7 +914,7 @@ rep.gt:00142
                              :target  5 ] ;
     :eq rep.gt-pj-2:12397         ; # &GT-00142;
     :eq rep.daikanwa:00098        ; # &I-M-00098;
-    :from.original       rep.gt:00038         ;
+    ideo:original-form-of rep.gt:00038         ;
     .
     rep.gt-pj-2:12397
                :abstract-glyph-of        gt-pj-2:12397   .
@@ -844,32 +935,94 @@ a.ucs:0x2007E
     ideo:strokes           [ :context domain:daikanwa ;
                              :target  1 ] ;
     ideo:total-strokes     3 ;
-    ideo:hanyu-dazidian  ( 1 52 1 ) ;
-    :eq rep.cns11643-5:0x212D     ; # &I-C5-212D;
-    :eq rep.daikanwa:02840        ; # &I-M-02840;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "su" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "sou" ) ;
+                         ] ;
     .
-    rep.cns11643-5:0x212D
-               :abstract-glyph-of     cns11643-5:0x212D  .
-    rep.daikanwa:02840
-               :abstract-glyph-of       daikanwa:02840   .
 
-rep.big5-cdp:0x87D2
+rep.ucs_iso:0x2007E
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of big5-cdp:0x87D2 ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2007E ] ;
     :denotation-of
         a.ucs:0x2007E        ;
-    ideo:radical           3 ; # ⼂ 
-    ideo:strokes           3 ;
-    ideo:total-strokes     4 ;
+    ideo:radical           [ :context domain:ucs     ;
+                             :target            3 ; # ⼂
+                           ] ;
+    ideo:strokes           [ :context domain:ucs     ;
+                             :target  2 ] ;
+    ideo:radical           [ :context domain:daikanwa ;
+                             :target           26 ; # ⼙
+                           ] ;
+    ideo:strokes           [ :context domain:daikanwa ;
+                             :target  1 ] ;
+    ideo:total-strokes     3 ;
     ideo:hanyu-dazidian  ( 1 52 1 ) ;
-    :from.same           a.ucs:0x2007E        ;
+    :eq rep.cns11643-5:0x212D     ; # &C5-212D;
+    :eq rep.big5-cdp:0x87D2       ; # &I-CDP-87D2;
+    :eq rep.daikanwa:02840        ; # &I-M-02840;
+    :form-of             [ :context domain:flipped-horizontally ;
+                           :target  a.ucs:0x536A         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ;
+                            :target  rep.adobe-japan1-5:20103 ] ;
+    ideo:same-as         [ :sources chisebib:shuowen-tongxun-dingsheng ,
+                                    chisebib:zhengzitong ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-5:20103 ] ;
+    :subsume
+        g2.ucs_iso:0x2007E   ,
+        g2.big5-cdp:0x87D2   ;
     .
+    rep.cns11643-5:0x212D
+               :abstract-glyph-of     cns11643-5:0x212D  .
+    rep.big5-cdp:0x87D2
+               :abstract-glyph-of       big5-cdp:0x87D2  .
+    rep.daikanwa:02840
+               :abstract-glyph-of       daikanwa:02840   .
+    g2.ucs_iso:0x2007E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2007E ] ;
+        :eq g2.cns11643-5:0x212D      ; # &g2-M-02840;
+        :eq g2.daikanwa:02840         ; # &g2-M-02840;
+        :subsume
+            repi.daikanwa:02840  ,
+            repi.cns11643-5:0x212D ,
+            repi.ucs_iso:0x2007E ;
+        .
+        g2.cns11643-5:0x212D
+              :abstract-glyph-form-of     cns11643-5:0x212D  .
+        g2.daikanwa:02840
+              :abstract-glyph-form-of       daikanwa:02840   .
+        repi.daikanwa:02840
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:02840 ;
+            .
+        repi.cns11643-5:0x212D
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x212D ;
+            .
+        repi.ucs_iso:0x2007E
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2007E ] ;
+            .
+    g2.big5-cdp:0x87D2
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x87D2 ;
+        ideo:radical           3 ; # ⼂ 
+        ideo:strokes           3 ;
+        ideo:total-strokes     4 ;
+        .
 
 rep.ucs-var-004:0x2A70A
     a chisegg:abstract-glyph ;
     :abstract-glyph-of ucs-var-004:0x2A70A ;
     :denotation-of
-        a.ucs:0x2A70A        ;
+        a.ucs_component:0x2A70A ;
     ideo:radical           3 ; # ⼂ 
     ideo:strokes           2 ;
     ideo:total-strokes     3 ;
@@ -923,7 +1076,7 @@ rep.adobe-japan1-0:02926
     :eq rep.gt-k:00460            ; # &I-GT-K00460;
     :eq rep.gt-pj-1:17200         ; # &I-GT-00136;
     :eq rep.daikanwa:00099        ; # &I-M-00099;
-    :eq rep.shinjigen:00041       ; # &AJ1-02926;
+    :eq rep.shinjigen:0041        ; # &AJ1-02926;
     :subsume
         g2.ucs_unicode:0x4E39 ;
     .
@@ -953,8 +1106,8 @@ rep.adobe-japan1-0:02926
                :abstract-glyph-of        gt-pj-1:17200   .
     rep.daikanwa:00099
                :abstract-glyph-of       daikanwa:00099   .
-    rep.shinjigen:00041
-               :abstract-glyph-of      shinjigen:00041   .
+    rep.shinjigen:0041
+               :abstract-glyph-of      shinjigen:0041    .
     g2.ucs_unicode:0x4E39
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -971,7 +1124,7 @@ rep.adobe-japan1-0:02926
         :eq g2.gt:00136               ; # &g2-AJ1-02926;
         :eq g2.gt-k:00460             ; # &g2-AJ1-02926;
         :eq g2.daikanwa:00099         ; # &g2-AJ1-02926;
-        :eq g2.shinjigen:00041        ; # &g2-AJ1-02926;
+        :eq g2.shinjigen:0041         ; # &g2-AJ1-02926;
         :subsume
             repi.daikanwa:00099  ,
             repi.jis-x0208:0x4330 ,
@@ -1001,8 +1154,8 @@ rep.adobe-japan1-0:02926
               :abstract-glyph-form-of           gt-k:00460   .
         g2.daikanwa:00099
               :abstract-glyph-form-of       daikanwa:00099   .
-        g2.shinjigen:00041
-              :abstract-glyph-form-of      shinjigen:00041   .
+        g2.shinjigen:0041
+              :abstract-glyph-form-of      shinjigen:0041    .
         repi.daikanwa:00099
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00099 ;
@@ -1144,8 +1297,8 @@ a.ucs:0x4E3A
     ideo:hanyu-dazidian  ( 1 44 2 ) ;
     :eq rep.gb2312:0x4E2A         ; # &I-G0-4E2A;
     :eq rep.big5-cdp:0x89D0       ; # &I-CDP-89D0;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gb12345:0x4E2A   ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gb12345:0x4E2A   ] ;
     .
     rep.gb2312:0x4E2A
                :abstract-glyph-of         gb2312:0x4E2A  .
@@ -1185,8 +1338,8 @@ a.ucs:0x4E3B
     :eq rep.gt-k:00949            ; # &I-GT-K00949;
     :eq rep.gt-pj-1:15463         ; # &I-GT-00138;
     :eq rep.daikanwa:00100        ; # &I-M-00100;
-    :eq rep.shinjigen_1ed:00042   ; # 主
-    :eq rep.shinjigen_rev:00043   ; # 主
+    :eq rep.shinjigen_1ed:0042    ; # 主
+    :eq rep.shinjigen_rev:0043    ; # 主
     :subsume
         rep.mj:006363        ,
         g2.mj:006362         ,
@@ -1222,94 +1375,126 @@ a.ucs:0x4E3B
                :abstract-glyph-of        gt-pj-1:15463   .
     rep.daikanwa:00100
                :abstract-glyph-of       daikanwa:00100   .
-    rep.shinjigen_1ed:00042
+    rep.shinjigen_1ed:0042
                :abstract-glyph-of [ :context domain:1ed     ;
-                                    :target shinjigen:00042   ] .
-    rep.shinjigen_rev:00043
+                                    :target shinjigen:0042    ] .
+    rep.shinjigen_rev:0043
                :abstract-glyph-of [ :context domain:rev     ;
-                                    :target shinjigen:00043   ] .
+                                    :target shinjigen:0043    ] .
     rep.mj:006363
         a chisegg:abstract-glyph ;
         :abstract-glyph-of mj:006363 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x4E3B         ,
-                                        a.ucs:0xE0101        ] ;
-        :rep.decomposition   [ :context domain:hanyo-denshi ;
-                               :target  a.ucs:0x4E3B         ,
-                                        a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E28 ; # 丨
-        isd:below    a.ucs:0x738B   # 王
-    ] ;
-        :eq g2.adobe-japan1-4:13812   ; # &MJ006363;
-        :eq g2.hanyo-denshi...jt:0xAD1E ; # &MJ006363;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E28 ; # 丨
+            isd:below    a.ucs:0x738B   # 王
+        ] ;
+        :eq g.adobe-japan1-4:13812    ; # &MJ006363;
+        :eq g.hanyo-denshi...jt:0xAD1E ; # &MJ006363;
         :eq rep.gt:00137              ; # &I-GT-00137;
         :eq rep.gt-k:00948            ; # &I-GT-K00948;
         :eq rep.gt-pj-2:12398         ; # &I-GT-00137;
-        :eq g2.daikanwa:00100         ; # &MJ006363;
-        :eq rep.shinjigen_1ed:00043   ; # &MJ006363;
-        :eq rep.shinjigen_rev:00044   ; # &MJ006363;
+        :eq g.daikanwa:00100          ; # &MJ006363;
+        :eq rep.shinjigen_1ed:0043    ; # &MJ006363;
+        :eq rep.shinjigen_rev:0044    ; # &MJ006363;
         :eq rep.jef-china3:0x41B3     ; # &I-JC3-41B3;
         :subsume
-            repi.daikanwa:00100  ,
-            repi.adobe-japan1-6:13812 ,
-            repi.hanyo-denshi...jt:0xAD1E ,
-            repi.mj:006363       ,
-            repi.gt:00137        ,
-            repi.jef-china3:0x41B3 ,
-            repi.hng-skk:00010   ;
+            g2.mj:006363         ;
         .
-        g2.adobe-japan1-4:13812
-              :abstract-glyph-form-of adobe-japan1-4:13812   .
-        g2.hanyo-denshi...jt:0xAD1E
-              :abstract-glyph-form-of hanyo-denshi...jt:0xAD1E  .
+        g.adobe-japan1-4:13812
+                   :detailed-glyph-of adobe-japan1-4:13812   .
+        g.hanyo-denshi...jt:0xAD1E
+                   :detailed-glyph-of hanyo-denshi...jt:0xAD1E  .
         rep.gt:00137
                    :abstract-glyph-of             gt:00137   .
         rep.gt-k:00948
                    :abstract-glyph-of           gt-k:00948   .
         rep.gt-pj-2:12398
                    :abstract-glyph-of        gt-pj-2:12398   .
-        g2.daikanwa:00100
-              :abstract-glyph-form-of       daikanwa:00100   .
-        rep.shinjigen_1ed:00043
+        g.daikanwa:00100
+                   :detailed-glyph-of       daikanwa:00100   .
+        rep.shinjigen_1ed:0043
                    :abstract-glyph-of [ :context domain:1ed     ;
-                                        :target shinjigen:00043   ] .
-        rep.shinjigen_rev:00044
+                                        :target shinjigen:0043    ] .
+        rep.shinjigen_rev:0044
                    :abstract-glyph-of [ :context domain:rev     ;
-                                        :target shinjigen:00044   ] .
+                                        :target shinjigen:0044    ] .
         rep.jef-china3:0x41B3
                    :abstract-glyph-of     jef-china3:0x41B3  .
-        repi.daikanwa:00100
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:00100 ;
-            .
-        repi.adobe-japan1-4:13812
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-4:13812 ;
-            .
-        repi.hanyo-denshi...jt:0xAD1E
-            a chisegg:glyph-image ;
-            :glyph-image-of hanyo-denshi...jt:0xAD1E ;
-            .
-        repi.mj:006363
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:006363 ;
-            .
-        repi.gt:00137
-            a chisegg:glyph-image ;
-            :glyph-image-of gt:00137 ;
-            :eq repi.gt-k:00948           ; # &R-GT-00137;
-            .
-            repi.gt-k:00948
-                          :glyph-image-of           gt-k:00948   .
-        repi.jef-china3:0x41B3
-            a chisegg:glyph-image ;
-            :glyph-image-of jef-china3:0x41B3 ;
-            .
-        repi.hng-skk:00010
-            a chisegg:glyph-image ;
-            :glyph-image-of hng-skk:00010 ;
-            .
+        g2.mj:006363
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:006363 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x4E3B         ,
+                                            a.ucs:0xE0101        ] ;
+            :rep.decomposition   [ :context domain:hanyo-denshi ;
+                                   :target  a.ucs:0x4E3B         ,
+                                            a.ucs:0xE0103        ] ;
+            :eq g2.adobe-japan1-4:13812   ; # &g2-MJ006363;
+            :eq g2.hanyo-denshi...jt:0xAD1E ; # &g2-MJ006363;
+            :eq g2.gt:00137               ; # &g2-MJ006363;
+            :eq g2.gt-k:00948             ; # &g2-MJ006363;
+            :eq g2.daikanwa:00100         ; # &g2-MJ006363;
+            :eq g2.shinjigen_1ed:0043     ; # &g2-MJ006363;
+            :eq g2.shinjigen_rev:0044     ; # &g2-MJ006363;
+            :eq g2.jef-china3:0x41B3      ; # &g2-MJ006363;
+            :subsume
+                repi.daikanwa:00100  ,
+                repi.adobe-japan1-6:13812 ,
+                repi.hanyo-denshi...jt:0xAD1E ,
+                repi.mj:006363       ,
+                repi.gt:00137        ,
+                repi.jef-china3:0x41B3 ,
+                repi.hng-skk:00010   ;
+            .
+            g2.adobe-japan1-4:13812
+                  :abstract-glyph-form-of adobe-japan1-4:13812   .
+            g2.hanyo-denshi...jt:0xAD1E
+                  :abstract-glyph-form-of hanyo-denshi...jt:0xAD1E  .
+            g2.gt:00137
+                  :abstract-glyph-form-of             gt:00137   .
+            g2.gt-k:00948
+                  :abstract-glyph-form-of           gt-k:00948   .
+            g2.daikanwa:00100
+                  :abstract-glyph-form-of       daikanwa:00100   .
+            g2.shinjigen_1ed:0043
+                  :abstract-glyph-form-of [ :context domain:1ed     ;
+                                            :target shinjigen:0043    ] .
+            g2.shinjigen_rev:0044
+                  :abstract-glyph-form-of [ :context domain:rev     ;
+                                            :target shinjigen:0044    ] .
+            g2.jef-china3:0x41B3
+                  :abstract-glyph-form-of     jef-china3:0x41B3  .
+            repi.daikanwa:00100
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:00100 ;
+                .
+            repi.adobe-japan1-4:13812
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-4:13812 ;
+                .
+            repi.hanyo-denshi...jt:0xAD1E
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...jt:0xAD1E ;
+                .
+            repi.mj:006363
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:006363 ;
+                .
+            repi.gt:00137
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:00137 ;
+                :eq repi.gt-k:00948           ; # &R-GT-00137;
+                .
+                repi.gt-k:00948
+                              :glyph-image-of           gt-k:00948   .
+            repi.jef-china3:0x41B3
+                a chisegg:glyph-image ;
+                :glyph-image-of jef-china3:0x41B3 ;
+                .
+            repi.hng-skk:00010
+                a chisegg:glyph-image ;
+                :glyph-image-of hng-skk:00010 ;
+                .
     g2.mj:006362
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:006362 ;
@@ -1319,10 +1504,10 @@ a.ucs:0x4E3B
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x4E3B         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E36 ; # 丶
-        isd:below    a.ucs:0x738B   # 王
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E36 ; # 丶
+            isd:below    a.ucs:0x738B   # 王
+        ] ;
         :eq g2.ucs_unicode:0x4E3B     ; # &g2-MJ006362;
         :eq g2.adobe-japan1-0:02323   ; # &g2-MJ006362;
         :eq g2.gb2312:0x5677          ; # &g2-MJ006362;
@@ -1333,8 +1518,8 @@ a.ucs:0x4E3B
         :eq g2.hanyo-denshi...ja:0x3C67 ; # &g2-MJ006362;
         :eq g2.gt:00138               ; # &g2-MJ006362;
         :eq g2.gt-k:00949             ; # &g2-MJ006362;
-        :eq g2.shinjigen_1ed:00042    ; # &g2-MJ006362;
-        :eq g2.shinjigen_rev:00043    ; # &g2-MJ006362;
+        :eq g2.shinjigen_1ed:0042     ; # &g2-MJ006362;
+        :eq g2.shinjigen_rev:0043     ; # &g2-MJ006362;
         :subsume
             repi.jis-x0208:0x3C67 ,
             repi.adobe-japan1-6:02323 ,
@@ -1372,12 +1557,12 @@ a.ucs:0x4E3B
               :abstract-glyph-form-of             gt:00138   .
         g2.gt-k:00949
               :abstract-glyph-form-of           gt-k:00949   .
-        g2.shinjigen_1ed:00042
+        g2.shinjigen_1ed:0042
               :abstract-glyph-form-of [ :context domain:1ed     ;
-                                        :target shinjigen:00042   ] .
-        g2.shinjigen_rev:00043
+                                        :target shinjigen:0042    ] .
+        g2.shinjigen_rev:0043
               :abstract-glyph-form-of [ :context domain:rev     ;
-                                        :target shinjigen:00043   ] .
+                                        :target shinjigen:0043    ] .
         repi.jis-x0208:0x3C67
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0208:0x3C67 ;
@@ -1476,7 +1661,7 @@ a.ucs:0x4E3C
     :eq rep.gt-k:01026            ; # &I-GT-K01026;
     :eq rep.gt-pj-1:20519         ; # &I-GT-00139;
     :eq rep.daikanwa:00101        ; # &I-M-00101;
-    :eq rep.shinjigen:00044       ; # 丼
+    :eq rep.shinjigen:0044        ; # 丼
     :subsume
         g2.ucs_unicode:0x4E3C ;
     .
@@ -1498,8 +1683,8 @@ a.ucs:0x4E3C
                :abstract-glyph-of        gt-pj-1:20519   .
     rep.daikanwa:00101
                :abstract-glyph-of       daikanwa:00101   .
-    rep.shinjigen:00044
-               :abstract-glyph-of      shinjigen:00044   .
+    rep.shinjigen:0044
+               :abstract-glyph-of      shinjigen:0044    .
     g2.ucs_unicode:0x4E3C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
@@ -1511,7 +1696,7 @@ a.ucs:0x4E3C
         :eq g2.gt:00139               ; # &g2-AJ1-04096;
         :eq g2.gt-k:01026             ; # &g2-AJ1-04096;
         :eq g2.daikanwa:00101         ; # &g2-AJ1-04096;
-        :eq g2.shinjigen:00044        ; # &g2-AJ1-04096;
+        :eq g2.shinjigen:0044         ; # &g2-AJ1-04096;
         :subsume
             repi.daikanwa:00101  ,
             repi.jis-x0208:0x5027 ,
@@ -1534,8 +1719,8 @@ a.ucs:0x4E3C
               :abstract-glyph-form-of           gt-k:01026   .
         g2.daikanwa:00101
               :abstract-glyph-form-of       daikanwa:00101   .
-        g2.shinjigen:00044
-              :abstract-glyph-form-of      shinjigen:00044   .
+        g2.shinjigen:0044
+              :abstract-glyph-form-of      shinjigen:0044    .
         repi.daikanwa:00101
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:00101 ;
@@ -1622,19 +1807,16 @@ rep.gt:00141
     :form-of             a.ucs:0x4E39         ,
                          a.ucs:0x821F         ;
     :subsume
-        repi.gt:00141        ,
+        g2.gt:00141          ,
         repi.hng-ink:00010   ,
         repi.hng-nto:00020   ;
     .
     rep.gt-pj-11:19035
                :abstract-glyph-of       gt-pj-11:19035   .
-    repi.gt:00141
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00141 ;
-        :eq g2.gt:00141               ; # &g2-GT-00141;
+    g2.gt:00141
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00141 ;
         .
-        g2.gt:00141
-              :abstract-glyph-form-of             gt:00141   .
     repi.hng-ink:00010
         a chisegg:glyph-image ;
         :glyph-image-of hng-ink:00010 ;
@@ -1716,9 +1898,9 @@ rep.gt:00145
     :eq rep.big5-cdp:0x8CB7       ; # &I-CDP-8CB7;
     :eq rep.gt-pj-2:12401         ; # &I-GT-00145;
     :eq rep.daikanwa:00104        ; # &I-M-00104;
-    :from.ancient        [ :sources chisebib:daikanwa ;
+    ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04023 ] ;
-    :from.same           a.ucs:0x2F800        ;
+    ideo:same-as         a.ucs:0x2F800        ;
     .
     rep.ucs_cns:0x4E3D
                :abstract-glyph-of [ :context domain:cns     ;
@@ -1744,17 +1926,17 @@ rep.gb2312:0x4076
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    [
-            :structure [ a idc:â¿° ;
-                :left     [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x4E36   # 丶
+            isd:structure [ a idc:â¿° ;
+                isd:left     [
+                    isd:structure [ a idc:⿵ ;
+                        isd:surround a.ucs:0x5182 ; # 冂
+                        isd:filling  a.ucs:0x4E36   # 丶
                     ]
                 ] ;
-                :right    [
-                    :structure [ a idc:⿵ ;
-                        :surround a.ucs:0x5182 ; # 冂
-                        :filling  a.ucs:0x4E36   # 丶
+                isd:right    [
+                    isd:structure [ a idc:⿵ ;
+                        isd:surround a.ucs:0x5182 ; # 冂
+                        isd:filling  a.ucs:0x4E36   # 丶
                     ]
                 ]
             ]
@@ -1762,8 +1944,8 @@ rep.gb2312:0x4076
     ] ;
     :eq rep.ucs_unicode:0x4E3D    ; # &G0-4076;
     :eq rep.hanziku-1:0xA86E      ; # &I-HZK01-A86E;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04023 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04023 ] ;
     .
     rep.ucs_unicode:0x4E3D
                :abstract-glyph-of [ :context domain:unicode ;
@@ -1800,15 +1982,15 @@ a.ucs:0x2592C
         a chisegg:abstract-glyph ;
         :abstract-glyph-of hanziku-1:0xADBE ;
         ideo:hanyu-dazidian  ( 1 47 2 ) ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x4E36 ; # 丶
-                :below    rep.big5-cdp:0x8C58   # &CDP-8C58;
-            ]
+        isd:structure [ a idc:⿵ ;
+            isd:surround [
+                isd:structure [ a idc:⿱ ;
+                    isd:above    a.ucs:0x4E36 ; # 丶
+                    isd:below    rep.big5-cdp:0x8C58   # &CDP-8C58;
+                ]
+            ] ;
+            isd:filling  a.ucs:0x5EFE   # 廾
         ] ;
-        isd:filling  a.ucs:0x5EFE   # 廾
-    ] ;
         .
     rep.ucs_iso:0x2592C
         a chisegg:abstract-glyph ;
@@ -1828,8 +2010,8 @@ a.ucs:0x4E3E
         isd:filling  rep.big5-cdp:0x8BF1   # &CDP-8BF1;
     ] ;
     :eq rep.gb2312:0x3E59         ; # &I-G0-3E59;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8209         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8209         ] ;
     :subsume
         g2.ucs_unicode:0x4E3E ;
     .
@@ -1878,7 +2060,7 @@ rep.ucs_iso:0x20084
     :eq rep.daikanwa:00105        ; # &I-M-00105;
     :eq rep.hanziku-4:0xE461      ; # &I-HZK04-E461;
     :subsume
-        repi.gt:00147        ,
+        g2.gt:00147          ,
         g2.ucs_iso:0x20084   ;
     .
     rep.cns11643-6:0x5050
@@ -1891,17 +2073,14 @@ rep.ucs_iso:0x20084
                :abstract-glyph-of       daikanwa:00105   .
     rep.hanziku-4:0xE461
                :abstract-glyph-of      hanziku-4:0xE461  .
-    repi.gt:00147
-        a chisegg:glyph-image ;
-        :glyph-image-of gt:00147 ;
-        :eq g2.gt:00147               ; # &g2-GT-00147;
+    g2.gt:00147
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00147 ;
         :eq g2.daikanwa:00105         ; # &g2-GT-00147;
         :subsume
             repi.daikanwa:00105  ,
             repi.gt:00147        ;
         .
-        g2.gt:00147
-              :abstract-glyph-form-of             gt:00147   .
         g2.daikanwa:00105
               :abstract-glyph-form-of       daikanwa:00105   .
         repi.daikanwa:00105
@@ -1951,8 +2130,8 @@ a.ucs_component:0x4E3B
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E3B  ] ;
     ideo:radical           3 ; # ⼂ 
-    :eq a.iwds-1:0xC9             ; # &IWDS1-201;
+    :eq a.iwds-1:0201             ; # &A-compU+4E3B;
     .
-    a.iwds-1:0xC9
-           :abstract-character-of         iwds-1:0xC9    .
+    a.iwds-1:0201
+           :abstract-character-of         iwds-1:0201    .