X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R009-Man.ttl;h=6ead1d299712775a982a2368b2cc55cc69b04c23;hb=791f1e8e33209947cbec423cf1ba02b7121189b5;hp=b728144f88ff33eef0d454a81eaad9d38695be40;hpb=918c351067b9818b1ebfbedc2b37623a06375073;p=chise%2Fchiset.git

diff --git a/Ideograph-R009-Man.ttl b/Ideograph-R009-Man.ttl
index b728144..6ead1d2 100644
--- a/Ideograph-R009-Man.ttl
+++ b/Ideograph-R009-Man.ttl
@@ -7,6 +7,7 @@
 @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/> .
@@ -38,6 +39,7 @@
 @prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
 @prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
 @prefix g.ucs_jis: <http://www.chise.org/est/view/character/g.ucs@jis=> .
+@prefix g.ucs_ks: <http://www.chise.org/est/view/character/g.ucs@ks=> .
 @prefix g.ucs_cns: <http://www.chise.org/est/view/character/g.ucs@cns=> .
 @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=> .
@@ -67,6 +69,7 @@
 @prefix g2.adobe-japan1-5: <http://www.chise.org/est/view/character/g2.adobe-japan1-5=> .
 @prefix g2.adobe-japan1-6: <http://www.chise.org/est/view/character/g2.adobe-japan1-6=> .
 @prefix g.adobe-japan1-0: <http://www.chise.org/est/view/character/g.adobe-japan1-0=> .
+@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.jis-x0208_1978: <http://www.chise.org/est/view/character/rep.jis-x0208@1978=> .
 @prefix rep.jis-x0208_1978...-4X: <http://www.chise.org/est/view/character/rep.jis-x0208@1978...-4X=> .
@@ -107,6 +110,7 @@
 @prefix rep.cns11643-4: <http://www.chise.org/est/view/character/rep.cns11643-4=> .
 @prefix g2.cns11643-4: <http://www.chise.org/est/view/character/g2.cns11643-4=> .
 @prefix repi.cns11643-4: <http://www.chise.org/est/view/character/repi.cns11643-4=> .
+@prefix g.cns11643-1: <http://www.chise.org/est/view/character/g.cns11643-1=> .
 @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=> .
@@ -144,12 +148,12 @@
 @prefix o.adobe-japan1-0: <http://www.chise.org/est/view/character/o.adobe-japan1-0=> .
 @prefix o.adobe-japan1-4: <http://www.chise.org/est/view/character/o.adobe-japan1-4=> .
 @prefix o.adobe-japan1-5: <http://www.chise.org/est/view/character/o.adobe-japan1-5=> .
-@prefix o.adobe-japan1: <http://www.chise.org/est/view/character/o.adobe-japan1=> .
 @prefix o.adobe-japan1-6: <http://www.chise.org/est/view/character/o.adobe-japan1-6=> .
 @prefix g2.gb12345: <http://www.chise.org/est/view/character/g2.gb12345=> .
 @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 a.big5-cdp: <http://www.chise.org/est/view/character/a.big5-cdp=> .
 @prefix a.mj: <http://www.chise.org/est/view/character/a.mj=> .
 @prefix rep.hanyo-denshi...ja: <http://www.chise.org/est/view/character/rep.hanyo-denshi...ja=> .
 @prefix rep.hanyo-denshi...jb: <http://www.chise.org/est/view/character/rep.hanyo-denshi...jb=> .
@@ -182,6 +186,7 @@
 @prefix o.hanyo-denshi...ft: <http://www.chise.org/est/view/character/o.hanyo-denshi...ft=> .
 @prefix g.hanyo-denshi...ja: <http://www.chise.org/est/view/character/g.hanyo-denshi...ja=> .
 @prefix g.hanyo-denshi...jt: <http://www.chise.org/est/view/character/g.hanyo-denshi...jt=> .
+@prefix g.hanyo-denshi...ks: <http://www.chise.org/est/view/character/g.hanyo-denshi...ks=> .
 @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=> .
@@ -191,6 +196,7 @@
 @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 rep.gt-pj-1: <http://www.chise.org/est/view/character/rep.gt-pj-1=> .
 @prefix rep.gt-pj-2: <http://www.chise.org/est/view/character/rep.gt-pj-2=> .
 @prefix rep.gt-pj-9: <http://www.chise.org/est/view/character/rep.gt-pj-9=> .
@@ -235,10 +241,11 @@
 @prefix g2.ruimoku-v6: <http://www.chise.org/est/view/character/g2.ruimoku-v6=> .
 @prefix repi.ruimoku-v6: <http://www.chise.org/est/view/character/repi.ruimoku-v6=> .
 @prefix rep.big5-cdp-itaiji-001: <http://www.chise.org/est/view/character/rep.big5-cdp-itaiji-001=> .
+@prefix rep.big5-cdp-var-001: <http://www.chise.org/est/view/character/rep.big5-cdp-var-001=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
-@prefix rep.ucs-sip-var-003: <http://www.chise.org/est/view/character/rep.ucs-sip-var-003=> .
+@prefix rep.ucs-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
 @prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 @prefix rep.ucs-var-006: <http://www.chise.org/est/view/character/rep.ucs-var-006=> .
 @prefix rep.ucs-bmp-var-006: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-006=> .
@@ -248,10 +255,7 @@
 @prefix rep.ucs-itaiji-003: <http://www.chise.org/est/view/character/rep.ucs-itaiji-003=> .
 @prefix rep.ucs-itaiji-004: <http://www.chise.org/est/view/character/rep.ucs-itaiji-004=> .
 @prefix rep.ucs-itaiji-005: <http://www.chise.org/est/view/character/rep.ucs-itaiji-005=> .
-@prefix rep.ucs-bmp-itaiji-009: <http://www.chise.org/est/view/character/rep.ucs-bmp-itaiji-009=> .
-@prefix rep.ucs-bmp-cjk_gb: <http://www.chise.org/est/view/character/rep.ucs-bmp-cjk@gb=> .
-@prefix g2.ucs-bmp-cjk_gb: <http://www.chise.org/est/view/character/g2.ucs-bmp-cjk@gb=> .
-@prefix repi.ucs-bmp-cjk_gb: <http://www.chise.org/est/view/character/repi.ucs-bmp-cjk@gb=> .
+@prefix rep.ucs-itaiji-009: <http://www.chise.org/est/view/character/rep.ucs-itaiji-009=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -276,7 +280,6 @@
 @prefix jis-x0213-2: <http://rdf.chise.org/data/ccs/jis-x0213-2/code-point/> .
 @prefix gb12345: <http://rdf.chise.org/data/ccs/gb12345/code-point/> .
 @prefix big5: <http://rdf.chise.org/data/ccs/big5/code-point/> .
-@prefix adobe-japan1: <http://rdf.chise.org/data/ccs/adobe-japan1/code-point/> .
 @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...jb: <http://rdf.chise.org/data/ccs/hanyo-denshi...jb/code-point/> .
@@ -315,10 +318,11 @@
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
 @prefix ruimoku-v6: <http://rdf.chise.org/data/ccs/ruimoku-v6/code-point/> .
 @prefix big5-cdp-itaiji-001: <http://rdf.chise.org/data/ccs/big5-cdp-itaiji-001/code-point/> .
+@prefix big5-cdp-var-001: <http://rdf.chise.org/data/ccs/big5-cdp-var-001/code-point/> .
 @prefix 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-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
-@prefix ucs-sip-var-003: <http://rdf.chise.org/data/ccs/ucs-sip-var-003/code-point/> .
+@prefix ucs-var-003: <http://rdf.chise.org/data/ccs/ucs-var-003/code-point/> .
 @prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/code-point/> .
 @prefix ucs-var-006: <http://rdf.chise.org/data/ccs/ucs-var-006/code-point/> .
 @prefix ucs-bmp-var-006: <http://rdf.chise.org/data/ccs/ucs-bmp-var-006/code-point/> .
@@ -327,8 +331,7 @@
 @prefix ucs-itaiji-003: <http://rdf.chise.org/data/ccs/ucs-itaiji-003/code-point/> .
 @prefix ucs-itaiji-004: <http://rdf.chise.org/data/ccs/ucs-itaiji-004/code-point/> .
 @prefix ucs-itaiji-005: <http://rdf.chise.org/data/ccs/ucs-itaiji-005/code-point/> .
-@prefix ucs-bmp-itaiji-009: <http://rdf.chise.org/data/ccs/ucs-bmp-itaiji-009/code-point/> .
-@prefix ucs-bmp-cjk: <http://rdf.chise.org/data/ccs/ucs-bmp-cjk/code-point/> .
+@prefix ucs-itaiji-009: <http://rdf.chise.org/data/ccs/ucs-itaiji-009/code-point/> .
 
 a.ucs_component:0x4EBA
     a chisegg:abstract-character ;
@@ -2174,7 +2177,7 @@ rep.adobe-japan1-0:02067
                                         a.ucs:0xE0100        ] ;
     isd:structure [ a idc:⿱ ;
         isd:above    g2.ucs_iso:0x201A2 ; # &g2-AJ1-13857;
-        isd:below    rep.ucs-sip-var-003:0x2A70A   # &U-v003+2A70A;
+        isd:below    rep.ucs-var-003:0x2A70A   # &U-v003+2A70A;
     ] ;
         :eq g2.ucs_cns:0x4ECA         ; # &g2-AJ1-02067;
         :eq g2.ucs_jis:0x4ECA         ; # &g2-AJ1-02067;
@@ -7697,7 +7700,7 @@ rep.adobe-japan1-0:03290
                                         a.ucs:0xE0100        ] ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
-        isd:right    rep.adobe-japan1-0:02583   # &AJ1-02583;
+        isd:right    g2.ucs_unicode:0x58EC   # &g2-AJ1-02583;
     ] ;
         :eq g2.adobe-japan1-0:03290   ; # &g2-AJ1-03290;
         :eq g2.gb2312:0x484E          ; # &g2-AJ1-03290;
@@ -7794,7 +7797,7 @@ rep.cns11643-1:0x4736
         :abstract-glyph-form-of cns11643-1:0x4736 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
-        isd:right    rep.cns11643-1:0x4531   # &C1-4531;
+        isd:right    g2.cns11643-1:0x4531   # &g2-CU+58EC;
     ] ;
         :eq g2.ucs_cns:0x4EFB         ; # &g2-CU+4EFB;
         :subsume
@@ -16216,8 +16219,8 @@ a.ucs:0x4F4F
     :eq rep.daikanwa:00505        ; # &I-M-00505;
     :eq rep.shinjigen:0181        ; # 住
     :subsume
-        rep.mj:006633        ,
-        g2.mj:006632         ;
+        a.jis-x0208:0x3D3B   ,
+        rep.ucs-var-003:0x4F4F ;
     .
     rep.mj:006632
                :abstract-glyph-of             mj:006632  .
@@ -16251,166 +16254,233 @@ a.ucs:0x4F4F
                :abstract-glyph-of       daikanwa:00505   .
     rep.shinjigen:0181
                :abstract-glyph-of      shinjigen:0181    .
-    rep.mj:006633
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of mj:006633 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x4F4F         ,
-                                        a.ucs:0xE0101        ] ;
-        :rep.decomposition   [ :context domain:hanyo-denshi ;
-                               :target  a.ucs:0x4F4F         ,
-                                        a.ucs:0xE0103        ] ;
+    a.jis-x0208:0x3D3B
+        a chisegg:abstract-character ;
+        :abstract-character-of jis-x0208:0x3D3B ;
+        :eq g.ucs_unicode:0x4F4F      ; # &G-MJ006633;
+        :eq g.mj:006633               ; # &G-MJ006633;
+        :eq g.adobe-japan1-0:02373    ; # &G-MJ006633;
+        :eq g.adobe-japan1-4:13820    ; # &MJ006633;
+        :eq g.jis-x0208:0x3D3B        ; # &G-MJ006633;
+        :eq g.cns11643-1:0x486E       ; # &G-MJ006633;
+        :eq g.jis-x0213-1:0x3D3B      ; # &G-MJ006633;
+        :eq g.hanyo-denshi...ja:0x3D3B ; # &G-MJ006633;
+        :eq g.hanyo-denshi...jt:0xAD53 ; # &MJ006633;
+        :eq g.daikanwa:00505          ; # &MJ006633;
+        :subsume
+            rep.mj:006633        ,
+            g2.mj:006632         ;
+        .
+        g.ucs_unicode:0x4F4F
+                   :detailed-glyph-of [ :context domain:unicode ;
+                                        :target     ucs:0x4F4F  ] .
+        g.mj:006633
+                   :detailed-glyph-of             mj:006633  .
+        g.adobe-japan1-0:02373
+                   :detailed-glyph-of adobe-japan1-0:02373   .
+        g.adobe-japan1-4:13820
+                   :detailed-glyph-of adobe-japan1-4:13820   .
+        g.jis-x0208:0x3D3B
+                   :detailed-glyph-of      jis-x0208:0x3D3B  .
+        g.cns11643-1:0x486E
+                   :detailed-glyph-of     cns11643-1:0x486E  .
+        g.jis-x0213-1:0x3D3B
+                   :detailed-glyph-of    jis-x0213-1:0x3D3B  .
+        g.hanyo-denshi...ja:0x3D3B
+                   :detailed-glyph-of hanyo-denshi...ja:0x3D3B  .
+        g.hanyo-denshi...jt:0xAD53
+                   :detailed-glyph-of hanyo-denshi...jt:0xAD53  .
+        g.daikanwa:00505
+                   :detailed-glyph-of       daikanwa:00505   .
+        rep.mj:006633
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of mj:006633 ;
     isd:structure [ a idc:â¿° ;
-        isd:left     a.ucs:0x2E85 ; # ⺅
+        isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    rep.mj:006363   # &MJ006363;
     ] ;
-        :eq g2.adobe-japan1-4:13820   ; # &MJ006633;
-        :eq g2.hanyo-denshi...jt:0xAD53 ; # &MJ006633;
-        :eq g2.daikanwa:00505         ; # &MJ006633;
-        :eq rep.shinjigen:0182        ; # &MJ006633;
-        :eq rep.jef-china3:0x42A5     ; # &I-JC3-42A5;
-        :subsume
-            repi.daikanwa:00505  ,
-            repi.adobe-japan1-6:13820 ,
-            repi.hanyo-denshi...jt:0xAD53 ,
-            repi.mj:006633       ,
-            repi.jef-china3:0x42A5 ;
-        .
-        g2.adobe-japan1-4:13820
-              :abstract-glyph-form-of adobe-japan1-4:13820   .
-        g2.hanyo-denshi...jt:0xAD53
-              :abstract-glyph-form-of hanyo-denshi...jt:0xAD53  .
-        g2.daikanwa:00505
-              :abstract-glyph-form-of       daikanwa:00505   .
-        rep.shinjigen:0182
-                   :abstract-glyph-of      shinjigen:0182    .
-        rep.jef-china3:0x42A5
-                   :abstract-glyph-of     jef-china3:0x42A5  .
-        repi.daikanwa:00505
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:00505 ;
-            .
-        repi.adobe-japan1-4:13820
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-4:13820 ;
-            .
-        repi.hanyo-denshi...jt:0xAD53
-            a chisegg:glyph-image ;
-            :glyph-image-of hanyo-denshi...jt:0xAD53 ;
-            .
-        repi.mj:006633
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:006633 ;
-            .
-        repi.jef-china3:0x42A5
-            a chisegg:glyph-image ;
-            :glyph-image-of jef-china3:0x42A5 ;
-            .
-    g2.mj:006632
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of mj:006632 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x4F4F         ,
-                                        a.ucs:0xE0100        ] ;
-        :rep.decomposition   [ :context domain:hanyo-denshi ;
-                               :target  a.ucs:0x4F4F         ,
-                                        a.ucs:0xE0102        ] ;
+            :eq g.adobe-japan1-4:13820    ; # &MJ006633;
+            :eq g.hanyo-denshi...jt:0xAD53 ; # &MJ006633;
+            :eq g.daikanwa:00505          ; # &MJ006633;
+            :eq rep.shinjigen:0182        ; # &MJ006633;
+            :eq rep.jef-china3:0x42A5     ; # &I-JC3-42A5;
+            :subsume
+                g2.mj:006633         ;
+            .
+            g.adobe-japan1-4:13820
+                       :detailed-glyph-of adobe-japan1-4:13820   .
+            g.hanyo-denshi...jt:0xAD53
+                       :detailed-glyph-of hanyo-denshi...jt:0xAD53  .
+            g.daikanwa:00505
+                       :detailed-glyph-of       daikanwa:00505   .
+            rep.shinjigen:0182
+                       :abstract-glyph-of      shinjigen:0182    .
+            rep.jef-china3:0x42A5
+                       :abstract-glyph-of     jef-china3:0x42A5  .
+            g2.mj:006633
+                a chisegg:abstract-glyph-form ;
+                :abstract-glyph-form-of mj:006633 ;
+                :rep.decomposition   [ :context domain:cid     ;
+                                       :target  a.ucs:0x4F4F         ,
+                                                a.ucs:0xE0101        ] ;
+                :rep.decomposition   [ :context domain:hanyo-denshi ;
+                                       :target  a.ucs:0x4F4F         ,
+                                                a.ucs:0xE0103        ] ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x2E85 ; # ⺅
+        isd:right    g2.mj:006363   # &g2-MJ006363;
+    ] ;
+                :eq g2.adobe-japan1-4:13820   ; # &g2-MJ006633;
+                :eq g2.hanyo-denshi...jt:0xAD53 ; # &g2-MJ006633;
+                :eq g2.daikanwa:00505         ; # &g2-MJ006633;
+                :eq g2.shinjigen:0182         ; # &g2-MJ006633;
+                :eq g2.jef-china3:0x42A5      ; # &g2-MJ006633;
+                :subsume
+                    repi.daikanwa:00505  ,
+                    repi.adobe-japan1-6:13820 ,
+                    repi.hanyo-denshi...jt:0xAD53 ,
+                    repi.mj:006633       ,
+                    repi.jef-china3:0x42A5 ;
+                .
+                g2.adobe-japan1-4:13820
+                      :abstract-glyph-form-of adobe-japan1-4:13820   .
+                g2.hanyo-denshi...jt:0xAD53
+                      :abstract-glyph-form-of hanyo-denshi...jt:0xAD53  .
+                g2.daikanwa:00505
+                      :abstract-glyph-form-of       daikanwa:00505   .
+                g2.shinjigen:0182
+                      :abstract-glyph-form-of      shinjigen:0182    .
+                g2.jef-china3:0x42A5
+                      :abstract-glyph-form-of     jef-china3:0x42A5  .
+                repi.daikanwa:00505
+                    a chisegg:glyph-image ;
+                    :glyph-image-of daikanwa:00505 ;
+                    .
+                repi.adobe-japan1-4:13820
+                    a chisegg:glyph-image ;
+                    :glyph-image-of adobe-japan1-4:13820 ;
+                    .
+                repi.hanyo-denshi...jt:0xAD53
+                    a chisegg:glyph-image ;
+                    :glyph-image-of hanyo-denshi...jt:0xAD53 ;
+                    .
+                repi.mj:006633
+                    a chisegg:glyph-image ;
+                    :glyph-image-of mj:006633 ;
+                    .
+                repi.jef-china3:0x42A5
+                    a chisegg:glyph-image ;
+                    :glyph-image-of jef-china3:0x42A5 ;
+                    .
+        g2.mj:006632
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:006632 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x4F4F         ,
+                                            a.ucs:0xE0100        ] ;
+            :rep.decomposition   [ :context domain:hanyo-denshi ;
+                                   :target  a.ucs:0x4F4F         ,
+                                            a.ucs:0xE0102        ] ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
         isd:right    g2.mj:006362   # &g2-MJ006362;
     ] ;
-        :eq g2.ucs_unicode:0x4F4F     ; # &g2-MJ006632;
-        :eq g2.adobe-japan1-0:02373   ; # &g2-MJ006632;
-        :eq g2.gb2312:0x5721          ; # &g2-MJ006632;
-        :eq g2.ks-x1001:0x712C        ; # &g2-MJ006632;
-        :eq g2.jis-x0208:0x3D3B       ; # &g2-MJ006632;
-        :eq g2.cns11643-1:0x486E      ; # &g2-MJ006632;
-        :eq g2.jis-x0213-1:0x3D3B     ; # &g2-MJ006632;
-        :eq g2.hanyo-denshi...ja:0x3D3B ; # &g2-MJ006632;
-        :eq g2.gt:00649               ; # &g2-MJ006632;
-        :eq g2.gt-k:02572             ; # &g2-MJ006632;
-        :eq g2.shinjigen:0181         ; # &g2-MJ006632;
-        :subsume
-            repi.jis-x0208:0x3D3B ,
-            repi.adobe-japan1-6:02373 ,
-            repi.mj:006632       ,
-            repi.ks-x1001:0x712C ,
-            repi.ucs_unicode:0x4F4F ,
-            repi.cns11643-1:0x486E ,
-            repi.gt:00649        ,
-            repi.hng-khi:02510   ,
-            repi.hng-khm:01980   ;
-        .
-        g2.ucs_unicode:0x4F4F
-              :abstract-glyph-form-of [ :context domain:unicode ;
-                                        :target     ucs:0x4F4F  ] .
-        g2.adobe-japan1-0:02373
-              :abstract-glyph-form-of adobe-japan1-0:02373   .
-        g2.gb2312:0x5721
-              :abstract-glyph-form-of         gb2312:0x5721  .
-        g2.ks-x1001:0x712C
-              :abstract-glyph-form-of       ks-x1001:0x712C  .
-        g2.jis-x0208:0x3D3B
-              :abstract-glyph-form-of      jis-x0208:0x3D3B  .
-        g2.cns11643-1:0x486E
-              :abstract-glyph-form-of     cns11643-1:0x486E  .
-        g2.jis-x0213-1:0x3D3B
-              :abstract-glyph-form-of    jis-x0213-1:0x3D3B  .
-        g2.hanyo-denshi...ja:0x3D3B
-              :abstract-glyph-form-of hanyo-denshi...ja:0x3D3B  .
-        g2.gt:00649
-              :abstract-glyph-form-of             gt:00649   .
-        g2.gt-k:02572
-              :abstract-glyph-form-of           gt-k:02572   .
-        g2.shinjigen:0181
-              :abstract-glyph-form-of      shinjigen:0181    .
-        repi.jis-x0208:0x3D3B
-            a chisegg:glyph-image ;
-            :glyph-image-of jis-x0208:0x3D3B ;
-            :eq repi.jis-x0213-1:0x3D3B   ; # &R-J0-3D3B;
-            .
-            repi.jis-x0213-1:0x3D3B
-                          :glyph-image-of    jis-x0213-1:0x3D3B  .
-        repi.adobe-japan1-0:02373
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-0:02373 ;
-            .
-        repi.mj:006632
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:006632 ;
-            .
-        repi.ks-x1001:0x712C
-            a chisegg:glyph-image ;
-            :glyph-image-of ks-x1001:0x712C ;
-            :eq repi.ucs_ks:0x4F4F        ; # &R-K0-712C;
-            .
-            repi.ucs_ks:0x4F4F
-                          :glyph-image-of [ :context domain:ks      ;
+            :eq g2.ucs_unicode:0x4F4F     ; # &g2-MJ006632;
+            :eq g2.adobe-japan1-0:02373   ; # &g2-MJ006632;
+            :eq g2.gb2312:0x5721          ; # &g2-MJ006632;
+            :eq g2.ks-x1001:0x712C        ; # &g2-MJ006632;
+            :eq g2.jis-x0208:0x3D3B       ; # &g2-MJ006632;
+            :eq g2.cns11643-1:0x486E      ; # &g2-MJ006632;
+            :eq g2.jis-x0213-1:0x3D3B     ; # &g2-MJ006632;
+            :eq g2.hanyo-denshi...ja:0x3D3B ; # &g2-MJ006632;
+            :eq g2.gt:00649               ; # &g2-MJ006632;
+            :eq g2.gt-k:02572             ; # &g2-MJ006632;
+            :eq g2.shinjigen:0181         ; # &g2-MJ006632;
+            :subsume
+                repi.jis-x0208:0x3D3B ,
+                repi.adobe-japan1-6:02373 ,
+                repi.mj:006632       ,
+                repi.ks-x1001:0x712C ,
+                repi.ucs_unicode:0x4F4F ,
+                repi.cns11643-1:0x486E ,
+                repi.gt:00649        ,
+                repi.hng-khi:02510   ,
+                repi.hng-khm:01980   ;
+            .
+            g2.ucs_unicode:0x4F4F
+                  :abstract-glyph-form-of [ :context domain:unicode ;
                                             :target     ucs:0x4F4F  ] .
-        repi.ucs_unicode:0x4F4F
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x4F4F  ] ;
-            .
-        repi.cns11643-1:0x486E
-            a chisegg:glyph-image ;
-            :glyph-image-of cns11643-1:0x486E ;
-            .
-        repi.gt:00649
-            a chisegg:glyph-image ;
-            :glyph-image-of gt:00649 ;
-            :eq repi.gt-k:02572           ; # &R-GT-00649;
-            .
-            repi.gt-k:02572
-                          :glyph-image-of           gt-k:02572   .
-        repi.hng-khi:02510
-            a chisegg:glyph-image ;
-            :glyph-image-of hng-khi:02510 ;
-            .
-        repi.hng-khm:01980
-            a chisegg:glyph-image ;
-            :glyph-image-of hng-khm:01980 ;
-            .
+            g2.adobe-japan1-0:02373
+                  :abstract-glyph-form-of adobe-japan1-0:02373   .
+            g2.gb2312:0x5721
+                  :abstract-glyph-form-of         gb2312:0x5721  .
+            g2.ks-x1001:0x712C
+                  :abstract-glyph-form-of       ks-x1001:0x712C  .
+            g2.jis-x0208:0x3D3B
+                  :abstract-glyph-form-of      jis-x0208:0x3D3B  .
+            g2.cns11643-1:0x486E
+                  :abstract-glyph-form-of     cns11643-1:0x486E  .
+            g2.jis-x0213-1:0x3D3B
+                  :abstract-glyph-form-of    jis-x0213-1:0x3D3B  .
+            g2.hanyo-denshi...ja:0x3D3B
+                  :abstract-glyph-form-of hanyo-denshi...ja:0x3D3B  .
+            g2.gt:00649
+                  :abstract-glyph-form-of             gt:00649   .
+            g2.gt-k:02572
+                  :abstract-glyph-form-of           gt-k:02572   .
+            g2.shinjigen:0181
+                  :abstract-glyph-form-of      shinjigen:0181    .
+            repi.jis-x0208:0x3D3B
+                a chisegg:glyph-image ;
+                :glyph-image-of jis-x0208:0x3D3B ;
+                :eq repi.jis-x0213-1:0x3D3B   ; # &R-J0-3D3B;
+                .
+                repi.jis-x0213-1:0x3D3B
+                              :glyph-image-of    jis-x0213-1:0x3D3B  .
+            repi.adobe-japan1-0:02373
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-0:02373 ;
+                .
+            repi.mj:006632
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:006632 ;
+                .
+            repi.ks-x1001:0x712C
+                a chisegg:glyph-image ;
+                :glyph-image-of ks-x1001:0x712C ;
+                :eq repi.ucs_ks:0x4F4F        ; # &R-K0-712C;
+                .
+                repi.ucs_ks:0x4F4F
+                              :glyph-image-of [ :context domain:ks      ;
+                                                :target     ucs:0x4F4F  ] .
+            repi.ucs_unicode:0x4F4F
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x4F4F  ] ;
+                .
+            repi.cns11643-1:0x486E
+                a chisegg:glyph-image ;
+                :glyph-image-of cns11643-1:0x486E ;
+                .
+            repi.gt:00649
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:00649 ;
+                :eq repi.gt-k:02572           ; # &R-GT-00649;
+                .
+                repi.gt-k:02572
+                              :glyph-image-of           gt-k:02572   .
+            repi.hng-khi:02510
+                a chisegg:glyph-image ;
+                :glyph-image-of hng-khi:02510 ;
+                .
+            repi.hng-khm:01980
+                a chisegg:glyph-image ;
+                :glyph-image-of hng-khm:01980 ;
+                .
+    rep.ucs-var-003:0x4F4F
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-003:0x4F4F ;
+        .
 
 a.ucs:0x4F50
     a chisegg:abstract-character ;
@@ -19441,6 +19511,20 @@ a.ucs:0x2A72C
                                   :target     ucs:0x2A72C ] ;
         .
 
+rep.big5-cdp-var-001:0x8C62
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp-var-001:0x8C62 ;
+    :denotation-of
+        a.big5-cdp:0x8C62    ;
+    ideo:radical           9 ; # ⼈ 
+    ideo:strokes           5 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:â¿» ;
+        isd:underlying a.ucs:0x5DFE ; # å·¾
+        isd:overlaying a.ucs:0x4ECE   # 从
+    ] ;
+    .
+
 a.ucs:0x20203
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20203 ;
@@ -21162,7 +21246,7 @@ a.ucs:0x4F79
     :eq a.big5:0xCBC1             ; # &I-B-CBC1;
     :subsume
         rep.adobe-japan1-6:21102 ,
-        g2.shinjigen:0214    ;
+        rep.shinjigen:0214   ;
     .
     a.big5:0xCBC1
            :abstract-character-of           big5:0xCBC1  .
@@ -21190,13 +21274,10 @@ a.ucs:0x4F79
                    :abstract-glyph-of     cns11643-2:0x2541  .
         rep.daikanwa:00566
                    :abstract-glyph-of       daikanwa:00566   .
-    g2.shinjigen:0214
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0214 ;
-        :eq rep.shinjigen:0214        ; # &SJG2-0214;
+    rep.shinjigen:0214
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0214 ;
         .
-        rep.shinjigen:0214
-                   :abstract-glyph-of      shinjigen:0214    .
 
 a.ucs:0x20208
     a chisegg:abstract-character ;
@@ -24659,10 +24740,10 @@ rep.cns11643-3:0x2745
             :abstract-glyph-of hanziku-1:0xC27A ;
             .
 
-rep.ucs-bmp-cjk_gb:0x344D
+rep.ucs_gb:0x344D
     a chisegg:abstract-glyph ;
     :abstract-glyph-of [ :context domain:gb      ;
-                         :target ucs-bmp-cjk:0x344D  ] ;
+                         :target     ucs:0x344D  ] ;
     :denotation-of
         a.ucs:0x344D         ;
     ideo:radical           9 ; # ⼈ 
@@ -24672,13 +24753,9 @@ rep.ucs-bmp-cjk_gb:0x344D
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    rep.gb2312:0x7167   # &HD-FT-384C;
     ] ;
-    :eq rep.ucs_gb:0x344D         ; # &GU+344D;
     :subsume
-        g2.ucs-bmp-cjk_gb:0x344D ;
+        g2.ucs_gb:0x344D     ;
     .
-    rep.ucs_gb:0x344D
-               :abstract-glyph-of [ :context domain:gb      ;
-                                    :target     ucs:0x344D  ] .
     g2.ucs_gb:0x344D
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:gb      ;
@@ -33037,12 +33114,15 @@ a.jis-x0208:0x5141
     ideo:total-strokes     9 ;
     :eq bucs:0x516A               ; # &J97-5141;
     :eq a.jis-x0213-1:0x5141      ; # &J97-5141;
+    :eq a.iwds-1:0384             ; # &J97-5141;
     .
     bucs:0x516A
         :super-abstract-character-of [ :context domain:bucs    ;
                                        :target     ucs:0x516A  ] .
     a.jis-x0213-1:0x5141
            :abstract-character-of    jis-x0213-1:0x5141  .
+    a.iwds-1:0384
+           :abstract-character-of         iwds-1:0384    .
 
 a.ucs:0x4FDE
     a chisegg:abstract-character ;
@@ -38404,7 +38484,7 @@ a.ucs:0x500D
     :eq rep.shinjigen:0313        ; # 倍
     :subsume
         g2.ucs_unicode:0x500D ,
-        g2.shinjigen:0314    ;
+        rep.shinjigen:0314   ;
     .
     rep.adobe-japan1-0:03346
                :abstract-glyph-of adobe-japan1-0:03346   .
@@ -38534,17 +38614,14 @@ a.ucs:0x500D
             a chisegg:glyph-image ;
             :glyph-image-of hng-kar:00090 ;
             .
-    g2.shinjigen:0314
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0314 ;
+    rep.shinjigen:0314
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0314 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
         isd:right    rep.jef-china3:0x46A1   # &JC3-46A1;
     ] ;
-        :eq rep.shinjigen:0314        ; # &SJG2-0314;
         .
-        rep.shinjigen:0314
-                   :abstract-glyph-of      shinjigen:0314    .
 
 a.ucs:0x500E
     a chisegg:abstract-character ;
@@ -41518,15 +41595,15 @@ a.ucs:0x5025
         isd:left     a.ucs:0x2E85 ; # ⺅
         isd:right    a.jis-x0208:0x3675   # &G-J0-3675;
     ] ;
-        :eq g.ucs_jis:0x5025          ; # &G-AJ1-04158;
-        :eq g.ucs_cns:0x5025          ; # &G-AJ1-04158;
-        :eq g.mj:006856               ; # &G-AJ1-04158;
-        :eq g.adobe-japan1-0:04158    ; # &G-AJ1-04158;
-        :eq g.jis-x0208:0x5065        ; # &G-AJ1-04158;
-        :eq g.jis-x0213-1:0x5065      ; # &G-AJ1-04158;
-        :eq g.hanyo-denshi...ja:0x5065 ; # &G-AJ1-04158;
-        :eq g.gt:00969                ; # &G-AJ1-04158;
-        :eq g.daikanwa:00787          ; # &G-AJ1-04158;
+        :eq g.ucs_jis:0x5025          ; # &G-MJ006856;
+        :eq g.ucs_cns:0x5025          ; # &G-MJ006856;
+        :eq g.mj:006856               ; # &G-MJ006856;
+        :eq g.adobe-japan1-0:04158    ; # &G-MJ006856;
+        :eq g.jis-x0208:0x5065        ; # &G-MJ006856;
+        :eq g.jis-x0213-1:0x5065      ; # &G-MJ006856;
+        :eq g.hanyo-denshi...ja:0x5065 ; # &G-MJ006856;
+        :eq g.gt:00969                ; # &G-MJ006856;
+        :eq g.daikanwa:00787          ; # &G-MJ006856;
         :subsume
             g2.mj:006856         ,
             g2.cns11643-1:0x5426 ;
@@ -46471,7 +46548,7 @@ a.ucs:0x5049
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    a.ucs:0x97CB   # 韋
     ] ;
-    :eq rep.mj:006898             ; # &I-MJ006898;
+    :eq rep.mj:006899             ; # &I-MJ006899;
     :eq rep.adobe-japan1-0:01170  ; # &I-AJ1-01170;
     :eq rep.adobe-japan1-4:13409  ; # &I-AJ1-13409;
     :eq rep.jis-x0208:0x304E      ; # &I-J90-304E;
@@ -46488,12 +46565,11 @@ a.ucs:0x5049
     :eq rep.daikanwa:00837        ; # &I-M-00837;
     :eq rep.shinjigen:0352        ; # 偉
     :subsume
-        g2.mj:006898         ,
-        g2.adobe-japan1-4:13409 ,
-        rep.mj:006899        ;
+        rep.mj:006898        ,
+        a.jis-x0208:0x304E   ;
     .
-    rep.mj:006898
-               :abstract-glyph-of             mj:006898  .
+    rep.mj:006899
+               :abstract-glyph-of             mj:006899  .
     rep.adobe-japan1-0:01170
                :abstract-glyph-of adobe-japan1-0:01170   .
     rep.adobe-japan1-4:13409
@@ -46524,202 +46600,261 @@ a.ucs:0x5049
                :abstract-glyph-of       daikanwa:00837   .
     rep.shinjigen:0352
                :abstract-glyph-of      shinjigen:0352    .
-    g2.mj:006898
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of mj:006898 ;
+    rep.mj:006898
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of mj:006898 ;
         ideo:strokes           9 ;
         ideo:total-strokes    11 ;
-        :rep.decomposition   [ :context domain:hanyo-denshi ;
-                               :target  a.ucs:0x5049         ,
-                                        a.ucs:0xE0103        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     a.ucs:0x2E85 ; # ⺅
-        isd:right    g2.ucs_unicode:0x97CB   # &g2-GT-57812;
-    ] ;
-        :eq g2.ucs_unicode:0x5049     ; # &g2-MJ006898;
-        :g2.ucs_JP...hanazono      rdf:nil ;
-        :eq g2.cns11643-1:0x5879      ; # &g2-MJ006898;
-        :eq g2.gb12345:0x4E30         ; # &g2-MJ006898;
-        :eq g2.hanyo-denshi...ks:009840 ; # &g2-MJ006898;
-        :eq g2.daikanwa:00837         ; # &g2-MJ006898;
-        :eq rep.shinjigen:0353        ; # &g2-MJ006898;
-        :subsume
-            repi.daikanwa:00837  ,
-            repi.hanyo-denshi...ks:009840 ,
-            repi.mj:006898       ,
-            repi.ucs_unicode:0x5049 ,
+        :eq g.ucs_unicode:0x5049      ; # &MJ006898;
+        :eq g.cns11643-1:0x5879       ; # &MJ006898;
+        :eq g.hanyo-denshi...ks:009840 ; # &MJ006898;
+        :eq g.daikanwa:00837          ; # &MJ006898;
+        :eq rep.shinjigen:0353        ; # &MJ006898;
+        :subsume
+            g2.mj:006898         ,
             repi.cns11643-1:0x5879 ;
         .
-        g2.ucs_unicode:0x5049
-              :abstract-glyph-form-of [ :context domain:unicode ;
+        g.ucs_unicode:0x5049
+                   :detailed-glyph-of [ :context domain:unicode ;
                                         :target     ucs:0x5049  ] .
-        g2.cns11643-1:0x5879
-              :abstract-glyph-form-of     cns11643-1:0x5879  .
-        g2.gb12345:0x4E30
-              :abstract-glyph-form-of        gb12345:0x4E30  .
-        g2.hanyo-denshi...ks:009840
-              :abstract-glyph-form-of hanyo-denshi...ks:009840  .
-        g2.daikanwa:00837
-              :abstract-glyph-form-of       daikanwa:00837   .
+        g.cns11643-1:0x5879
+                   :detailed-glyph-of     cns11643-1:0x5879  .
+        g.hanyo-denshi...ks:009840
+                   :detailed-glyph-of hanyo-denshi...ks:009840  .
+        g.daikanwa:00837
+                   :detailed-glyph-of       daikanwa:00837   .
         rep.shinjigen:0353
                    :abstract-glyph-of      shinjigen:0353    .
-        repi.daikanwa:00837
-            a chisegg:glyph-image ;
-            :glyph-image-of daikanwa:00837 ;
-            .
-        repi.hanyo-denshi...ks:009840
-            a chisegg:glyph-image ;
-            :glyph-image-of hanyo-denshi...ks:009840 ;
-            :eq rep.hanyo-denshi...ks...mf:000984 ; # &R-HD-KS-009840;
-            .
-            rep.hanyo-denshi...ks...mf:000984
-                       :abstract-glyph-of hanyo-denshi...ks...mf:000984  .
-        repi.mj:006898
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:006898 ;
-            .
-        repi.ucs_unicode:0x5049
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:unicode ;
-                              :target     ucs:0x5049  ] ;
+        g2.mj:006898
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:006898 ;
+            :rep.decomposition   [ :context domain:hanyo-denshi ;
+                                   :target  a.ucs:0x5049         ,
+                                            a.ucs:0xE0103        ] ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x2E85 ; # ⺅
+        isd:right    g2.ucs_unicode:0x97CB   # &g2-GT-57812;
+    ] ;
+            :eq g2.ucs_unicode:0x5049     ; # &g2-MJ006898;
+            :g2.ucs_JP...hanazono      rdf:nil ;
+            :eq g2.cns11643-1:0x5879      ; # &g2-MJ006898;
+            :eq g2.gb12345:0x4E30         ; # &g2-MJ006898;
+            :eq g2.hanyo-denshi...ks:009840 ; # &g2-MJ006898;
+            :eq g2.daikanwa:00837         ; # &g2-MJ006898;
+            :eq g2.shinjigen:0353         ; # &g2-MJ006898;
+            :subsume
+                repi.daikanwa:00837  ,
+                repi.hanyo-denshi...ks:009840 ,
+                repi.mj:006898       ,
+                repi.ucs_unicode:0x5049 ;
             .
+            g2.ucs_unicode:0x5049
+                  :abstract-glyph-form-of [ :context domain:unicode ;
+                                            :target     ucs:0x5049  ] .
+            g2.cns11643-1:0x5879
+                  :abstract-glyph-form-of     cns11643-1:0x5879  .
+            g2.gb12345:0x4E30
+                  :abstract-glyph-form-of        gb12345:0x4E30  .
+            g2.hanyo-denshi...ks:009840
+                  :abstract-glyph-form-of hanyo-denshi...ks:009840  .
+            g2.daikanwa:00837
+                  :abstract-glyph-form-of       daikanwa:00837   .
+            g2.shinjigen:0353
+                  :abstract-glyph-form-of      shinjigen:0353    .
+            repi.daikanwa:00837
+                a chisegg:glyph-image ;
+                :glyph-image-of daikanwa:00837 ;
+                .
+            repi.hanyo-denshi...ks:009840
+                a chisegg:glyph-image ;
+                :glyph-image-of hanyo-denshi...ks:009840 ;
+                :eq rep.hanyo-denshi...ks...mf:000984 ; # &R-HD-KS-009840;
+                .
+                rep.hanyo-denshi...ks...mf:000984
+                           :abstract-glyph-of hanyo-denshi...ks...mf:000984  .
+            repi.mj:006898
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:006898 ;
+                .
+            repi.ucs_unicode:0x5049
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:unicode ;
+                                  :target     ucs:0x5049  ] ;
+                .
         repi.cns11643-1:0x5879
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-1:0x5879 ;
             .
-    g2.adobe-japan1-4:13409
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of adobe-japan1-4:13409 ;
+    a.jis-x0208:0x304E
+        a chisegg:abstract-character ;
+        :abstract-character-of jis-x0208:0x304E ;
         ideo:strokes          10 ;
         ideo:total-strokes    12 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x5049         ,
-                                        a.ucs:0xE0101        ] ;
+        :eq g.ucs_jis:0x5049          ; # &G-MJ006899;
+        :eq g.ucs_ks:0x5049           ; # &G-MJ006899;
+        :eq g.mj:006899               ; # &G-MJ006899;
+        :eq g.adobe-japan1-0:01170    ; # &G-MJ006899;
+        :eq g.adobe-japan1-4:13409    ; # &G-MJ006899;
+        :eq g.jis-x0208:0x304E        ; # &G-MJ006899;
+        :eq g.jis-x0213-1:0x304E      ; # &G-MJ006899;
+        :eq g.hanyo-denshi...ja:0x304E ; # &G-MJ006899;
+        :eq g.gt:01188                ; # &G-MJ006899;
+        :eq g.gt-k:08991              ; # &G-MJ006899;
+        :subsume
+            g2.adobe-japan1-4:13409 ,
+            g2.mj:006899         ;
+        .
+        g.ucs_jis:0x5049
+                   :detailed-glyph-of [ :context domain:jis     ;
+                                        :target     ucs:0x5049  ] .
+        g.ucs_ks:0x5049
+                   :detailed-glyph-of [ :context domain:ks      ;
+                                        :target     ucs:0x5049  ] .
+        g.mj:006899
+                   :detailed-glyph-of             mj:006899  .
+        g.adobe-japan1-0:01170
+                   :detailed-glyph-of adobe-japan1-0:01170   .
+        g.adobe-japan1-4:13409
+                   :detailed-glyph-of adobe-japan1-4:13409   .
+        g.jis-x0208:0x304E
+                   :detailed-glyph-of      jis-x0208:0x304E  .
+        g.jis-x0213-1:0x304E
+                   :detailed-glyph-of    jis-x0213-1:0x304E  .
+        g.hanyo-denshi...ja:0x304E
+                   :detailed-glyph-of hanyo-denshi...ja:0x304E  .
+        g.gt:01188
+                   :detailed-glyph-of             gt:01188   .
+        g.gt-k:08991
+                   :detailed-glyph-of           gt-k:08991   .
+        g2.adobe-japan1-4:13409
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of adobe-japan1-4:13409 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x5049         ,
+                                            a.ucs:0xE0101        ] ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
-        isd:right    g2.adobe-japan1-0:07171   # &g2-AJ1-07171;
+        isd:right    g2.mj:028060   # &g2-MJ028060;
     ] ;
-        :eq g2.jis-x0208_1978:0x304E  ; # &g2-AJ1-13409;
-        :eq g2.jis-x0208_1983:0x304E  ; # &g2-AJ1-13409;
-        :subsume
-            repi.jis-x0208_1978:0x304E ,
-            repi.jis-x0208_1983:0x304E ,
-            repi.adobe-japan1-6:13409 ;
-        .
-        g2.jis-x0208_1978:0x304E
-              :abstract-glyph-form-of [ :context domain:1978    ;
-                                        :target jis-x0208:0x304E  ] .
-        g2.jis-x0208_1983:0x304E
-              :abstract-glyph-form-of [ :context domain:1983    ;
-                                        :target jis-x0208:0x304E  ] .
-        repi.jis-x0208_1978:0x304E
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:1978    ;
-                              :target jis-x0208:0x304E  ] ;
-            .
-        repi.jis-x0208_1983:0x304E
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:1983    ;
-                              :target jis-x0208:0x304E  ] ;
-            .
-        repi.adobe-japan1-4:13409
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-4:13409 ;
-            .
-    rep.mj:006899
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of mj:006899 ;
-        ideo:strokes          10 ;
-        ideo:total-strokes    12 ;
-        :rep.decomposition   [ :context domain:cid     ;
-                               :target  a.ucs:0x5049         ,
-                                        a.ucs:0xE0100        ] ;
-        :rep.decomposition   [ :context domain:hanyo-denshi ;
-                               :target  a.ucs:0x5049         ,
-                                        a.ucs:0xE0102        ] ;
+            :eq g2.jis-x0208_1978:0x304E  ; # &g2-AJ1-13409;
+            :eq g2.jis-x0208_1983:0x304E  ; # &g2-AJ1-13409;
+            :subsume
+                repi.jis-x0208_1978:0x304E ,
+                repi.jis-x0208_1983:0x304E ,
+                repi.adobe-japan1-6:13409 ;
+            .
+            g2.jis-x0208_1978:0x304E
+                  :abstract-glyph-form-of [ :context domain:1978    ;
+                                            :target jis-x0208:0x304E  ] .
+            g2.jis-x0208_1983:0x304E
+                  :abstract-glyph-form-of [ :context domain:1983    ;
+                                            :target jis-x0208:0x304E  ] .
+            repi.jis-x0208_1978:0x304E
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:1978    ;
+                                  :target jis-x0208:0x304E  ] ;
+                .
+            repi.jis-x0208_1983:0x304E
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:1983    ;
+                                  :target jis-x0208:0x304E  ] ;
+                .
+            repi.adobe-japan1-4:13409
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-4:13409 ;
+                .
+        g2.mj:006899
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of mj:006899 ;
+            :rep.decomposition   [ :context domain:cid     ;
+                                   :target  a.ucs:0x5049         ,
+                                            a.ucs:0xE0100        ] ;
+            :rep.decomposition   [ :context domain:hanyo-denshi ;
+                                   :target  a.ucs:0x5049         ,
+                                            a.ucs:0xE0102        ] ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
         isd:right    g2.ks-x1001:0x6A5F   # &g2-K0-6A5F;
     ] ;
-        :eq g2.ucs_jis...1990:0x5049  ; # &MJ006899;
-        :eq g2.ucs_jis...2000:0x5049  ; # &MJ006899;
-        :eq g2.ucs_jis...2004:0x5049  ; # &MJ006899;
-        :eq g2.ucs_ks:0x5049          ; # &MJ006899;
-        :eq g2.adobe-japan1-0:01170   ; # &MJ006899;
-        :eq g2.ks-x1001:0x6A49        ; # &MJ006899;
-        :eq g2.jis-x0208_1990:0x304E  ; # &MJ006899;
-        :eq g2.jis-x0213-1:0x304E     ; # &MJ006899;
-        :eq g2.hanyo-denshi...ja:0x304E ; # &MJ006899;
-        :eq g2.gt:01188               ; # &MJ006899;
-        :eq g2.gt-k:08991             ; # &MJ006899;
-        :eq g2.shinjigen:0352         ; # &MJ006899;
-        :subsume
-            repi.jis-x0208_1990:0x304E ,
-            repi.adobe-japan1-6:01170 ,
-            repi.mj:006899       ,
-            repi.ks-x1001:0x6A49 ,
-            repi.gt:01188        ;
-        .
-        g2.ucs_jis...1990:0x5049
-              :abstract-glyph-form-of [ :context domain:jis...1990 ;
-                                        :target     ucs:0x5049  ] .
-        g2.ucs_jis...2000:0x5049
-              :abstract-glyph-form-of [ :context domain:jis...2000 ;
-                                        :target     ucs:0x5049  ] .
-        g2.ucs_jis...2004:0x5049
-              :abstract-glyph-form-of [ :context domain:jis...2004 ;
-                                        :target     ucs:0x5049  ] .
-        g2.ucs_ks:0x5049
-              :abstract-glyph-form-of [ :context domain:ks      ;
-                                        :target     ucs:0x5049  ] .
-        g2.adobe-japan1-0:01170
-              :abstract-glyph-form-of adobe-japan1-0:01170   .
-        g2.ks-x1001:0x6A49
-              :abstract-glyph-form-of       ks-x1001:0x6A49  .
-        g2.jis-x0208_1990:0x304E
-              :abstract-glyph-form-of [ :context domain:1990    ;
-                                        :target jis-x0208:0x304E  ] .
-        g2.jis-x0213-1:0x304E
-              :abstract-glyph-form-of    jis-x0213-1:0x304E  .
-        g2.hanyo-denshi...ja:0x304E
-              :abstract-glyph-form-of hanyo-denshi...ja:0x304E  .
-        g2.gt:01188
-              :abstract-glyph-form-of             gt:01188   .
-        g2.gt-k:08991
-              :abstract-glyph-form-of           gt-k:08991   .
-        g2.shinjigen:0352
-              :abstract-glyph-form-of      shinjigen:0352    .
-        repi.jis-x0208_1990:0x304E
-            a chisegg:glyph-image ;
-            :glyph-image-of [ :context domain:1990    ;
-                              :target jis-x0208:0x304E  ] ;
-            :eq repi.jis-x0213-1:0x304E   ; # &R-J90-304E;
-            .
-            repi.jis-x0213-1:0x304E
-                          :glyph-image-of    jis-x0213-1:0x304E  .
-        repi.adobe-japan1-0:01170
-            a chisegg:glyph-image ;
-            :glyph-image-of adobe-japan1-0:01170 ;
-            .
-        repi.mj:006899
-            a chisegg:glyph-image ;
-            :glyph-image-of mj:006899 ;
-            .
-        repi.ks-x1001:0x6A49
-            a chisegg:glyph-image ;
-            :glyph-image-of ks-x1001:0x6A49 ;
-            :eq repi.ucs_ks:0x5049        ; # &R-K0-6A49;
-            .
-            repi.ucs_ks:0x5049
-                          :glyph-image-of [ :context domain:ks      ;
+            :eq g2.ucs_jis...1990:0x5049  ; # &g2-MJ006899;
+            :eq g2.ucs_jis...2000:0x5049  ; # &g2-MJ006899;
+            :eq g2.ucs_jis...2004:0x5049  ; # &g2-MJ006899;
+            :eq g2.ucs_ks:0x5049          ; # &g2-MJ006899;
+            :eq g2.adobe-japan1-0:01170   ; # &g2-MJ006899;
+            :eq g2.ks-x1001:0x6A49        ; # &g2-MJ006899;
+            :eq g2.jis-x0208_1990:0x304E  ; # &g2-MJ006899;
+            :eq g2.jis-x0213-1:0x304E     ; # &g2-MJ006899;
+            :eq g2.hanyo-denshi...ja:0x304E ; # &g2-MJ006899;
+            :eq g2.gt:01188               ; # &g2-MJ006899;
+            :eq g2.gt-k:08991             ; # &g2-MJ006899;
+            :eq g2.shinjigen:0352         ; # &g2-MJ006899;
+            :subsume
+                repi.jis-x0208_1990:0x304E ,
+                repi.adobe-japan1-6:01170 ,
+                repi.mj:006899       ,
+                repi.ks-x1001:0x6A49 ,
+                repi.gt:01188        ;
+            .
+            g2.ucs_jis...1990:0x5049
+                  :abstract-glyph-form-of [ :context domain:jis...1990 ;
                                             :target     ucs:0x5049  ] .
-        repi.gt:01188
-            a chisegg:glyph-image ;
-            :glyph-image-of gt:01188 ;
-            :eq repi.gt-k:08991           ; # &R-GT-01188;
-            .
-            repi.gt-k:08991
-                          :glyph-image-of           gt-k:08991   .
+            g2.ucs_jis...2000:0x5049
+                  :abstract-glyph-form-of [ :context domain:jis...2000 ;
+                                            :target     ucs:0x5049  ] .
+            g2.ucs_jis...2004:0x5049
+                  :abstract-glyph-form-of [ :context domain:jis...2004 ;
+                                            :target     ucs:0x5049  ] .
+            g2.ucs_ks:0x5049
+                  :abstract-glyph-form-of [ :context domain:ks      ;
+                                            :target     ucs:0x5049  ] .
+            g2.adobe-japan1-0:01170
+                  :abstract-glyph-form-of adobe-japan1-0:01170   .
+            g2.ks-x1001:0x6A49
+                  :abstract-glyph-form-of       ks-x1001:0x6A49  .
+            g2.jis-x0208_1990:0x304E
+                  :abstract-glyph-form-of [ :context domain:1990    ;
+                                            :target jis-x0208:0x304E  ] .
+            g2.jis-x0213-1:0x304E
+                  :abstract-glyph-form-of    jis-x0213-1:0x304E  .
+            g2.hanyo-denshi...ja:0x304E
+                  :abstract-glyph-form-of hanyo-denshi...ja:0x304E  .
+            g2.gt:01188
+                  :abstract-glyph-form-of             gt:01188   .
+            g2.gt-k:08991
+                  :abstract-glyph-form-of           gt-k:08991   .
+            g2.shinjigen:0352
+                  :abstract-glyph-form-of      shinjigen:0352    .
+            repi.jis-x0208_1990:0x304E
+                a chisegg:glyph-image ;
+                :glyph-image-of [ :context domain:1990    ;
+                                  :target jis-x0208:0x304E  ] ;
+                :eq repi.jis-x0213-1:0x304E   ; # &R-J90-304E;
+                .
+                repi.jis-x0213-1:0x304E
+                              :glyph-image-of    jis-x0213-1:0x304E  .
+            repi.adobe-japan1-0:01170
+                a chisegg:glyph-image ;
+                :glyph-image-of adobe-japan1-0:01170 ;
+                .
+            repi.mj:006899
+                a chisegg:glyph-image ;
+                :glyph-image-of mj:006899 ;
+                .
+            repi.ks-x1001:0x6A49
+                a chisegg:glyph-image ;
+                :glyph-image-of ks-x1001:0x6A49 ;
+                :eq repi.ucs_ks:0x5049        ; # &R-K0-6A49;
+                .
+                repi.ucs_ks:0x5049
+                              :glyph-image-of [ :context domain:ks      ;
+                                                :target     ucs:0x5049  ] .
+            repi.gt:01188
+                a chisegg:glyph-image ;
+                :glyph-image-of gt:01188 ;
+                :eq repi.gt-k:08991           ; # &R-GT-01188;
+                .
+                repi.gt-k:08991
+                              :glyph-image-of           gt-k:08991   .
 
 a.ucs:0x4F1F
     a chisegg:abstract-character ;
@@ -52288,6 +52423,10 @@ rep.ucs_iso:0x202E8
     ideo:strokes           9 ;
     ideo:total-strokes    11 ;
     ideo:hanyu-dazidian  ( 1 191 7 ) ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x4EBB ; # 亻
+        isd:right    rep.gt-k:06154   # &GT-K06154;
+    ] ;
     :eq rep.cns11643-5:0x307E     ; # &C5-307E;
     :eq rep.daikanwa:00907        ; # &I-M-00907;
     :subsume
@@ -55326,7 +55465,7 @@ a.ucs:0x508D
     :eq rep.shinjigen:0366        ; # 傍
     :subsume
         g2.ucs_unicode:0x508D ,
-        g2.shinjigen:0367    ;
+        rep.shinjigen:0367   ;
     .
     rep.adobe-japan1-0:03683
                :abstract-glyph-of adobe-japan1-0:03683   .
@@ -55433,17 +55572,14 @@ a.ucs:0x508D
             a chisegg:glyph-image ;
             :glyph-image-of cns11643-1:0x5E2A ;
             .
-    g2.shinjigen:0367
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of shinjigen:0367 ;
+    rep.shinjigen:0367
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of shinjigen:0367 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
         isd:right    g2.shinjigen:3247   # &g2-SJG2-3247;
     ] ;
-        :eq rep.shinjigen:0367        ; # &SJG2-0367;
         .
-        rep.shinjigen:0367
-                   :abstract-glyph-of      shinjigen:0367    .
 
 a.ucs:0x3475
     a chisegg:abstract-character ;
@@ -55605,9 +55741,10 @@ a.ucs:0x508E
     a.big5:0xD859
            :abstract-character-of           big5:0xD859  .
 
-a.gt:01257
-    a chisegg:abstract-character ;
-    :abstract-character-of gt:01257 ;
+o.ucs_jis:0x508E
+    a chisegg:unified-glyph ;
+    :unified-glyph-of [ :context domain:jis     ;
+                        :target     ucs:0x508E  ] ;
     :denotation-of
         a.ucs:0x508E         ;
     ideo:radical           9 ; # ⼈ 
@@ -55617,15 +55754,11 @@ a.gt:01257
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    a.ucs:0x771E   # 眞
     ] ;
-    :eq o.ucs_jis:0x508E          ; # &o-AJ1-19159;
     :eq o.adobe-japan1-5:19159    ; # &o-AJ1-19159;
     :eq o.gt:01257                ; # &o-AJ1-19159;
     :subsume
         rep.adobe-japan1-5:19159 ;
     .
-    o.ucs_jis:0x508E
-                :unified-glyph-of [ :context domain:jis     ;
-                                    :target     ucs:0x508E  ] .
     o.adobe-japan1-5:19159
                 :unified-glyph-of adobe-japan1-5:19159   .
     o.gt:01257
@@ -56869,7 +57002,7 @@ rep.mj:006991
     ideo:total-strokes    12 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x4EBB ; # 亻
-        isd:right    rep.gt:01936   # &GT-01936;
+        isd:right    rep.mj:056985   # &MJ056985;
     ] ;
     :eq rep.ucs_jis:0x5094        ; # &MJ006991;
     :eq rep.adobe-japan1-2:08390  ; # &I-AJ1-08390;
@@ -57734,7 +57867,7 @@ rep.ucs-var-001:0x5099
     ideo:total-strokes    13 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x4EBB ; # 亻
-        isd:right    rep.ucs-sip-var-003:0x24C07   # &U-v003+24C07;
+        isd:right    rep.ucs-var-003:0x24C07   # &U-v003+24C07;
     ] ;
     :subsume
         repi.hng-kak:02730   ,
@@ -66724,7 +66857,7 @@ a.ucs:0x2035E
         :abstract-glyph-form-of daikanwa:49471 ;
     isd:structure [ a idc:⿸ ;
         isd:surround g2.mj:057582 ; # &g2-MJ057582;
-        isd:filling  g2.adobe-japan1-0:02227   # &g2-AJ1-02227;
+        isd:filling  g2.gt:35079   # &g2-GT-35079;
     ] ;
         .
     g2.cns11643-6:0x564E
@@ -68583,9 +68716,9 @@ a.ucs:0x50D9
     ] ;
     .
 
-o.ucs_cns:0x50D9
+o.ucs_jis:0x50D9
     a chisegg:unified-glyph ;
-    :unified-glyph-of [ :context domain:cns     ;
+    :unified-glyph-of [ :context domain:jis     ;
                         :target     ucs:0x50D9  ] ;
     :denotation-of
         a.ucs:0x50D9         ;
@@ -68596,15 +68729,15 @@ o.ucs_cns:0x50D9
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    a.ucs:0x9EC3   # 黃
     ] ;
-    :eq o.ucs_jis:0x50D9          ; # &o-JX2-217B;
+    :eq o.ucs_cns:0x50D9          ; # &o-JX2-217B;
     :eq o.jis-x0213-2:0x217B      ; # &o-JX2-217B;
     :eq o.adobe-japan1-4:15408    ; # &o-JX2-217B;
     :subsume
         rep.adobe-japan1-4:15408 ,
         rep.cns11643-3:0x456C ;
     .
-    o.ucs_jis:0x50D9
-                :unified-glyph-of [ :context domain:jis     ;
+    o.ucs_cns:0x50D9
+                :unified-glyph-of [ :context domain:cns     ;
                                     :target     ucs:0x50D9  ] .
     o.jis-x0213-2:0x217B
                 :unified-glyph-of    jis-x0213-2:0x217B  .
@@ -70171,7 +70304,7 @@ a.ucs:0x50E6
         :eq g2.jef-china3:0x43B6      ; # &g2-AJ1-14341;
         :subsume
             repi.daikanwa:01115  ,
-            repi.ucs-bmp-cjk_gb:0x50E6 ,
+            repi.ucs_gb:0x50E6   ,
             repi.jis-x0213-1:0x2E48 ,
             repi.adobe-japan1-6:14341 ,
             repi.jef-china3:0x43B6 ,
@@ -70198,15 +70331,11 @@ a.ucs:0x50E6
             a chisegg:glyph-image ;
             :glyph-image-of daikanwa:01115 ;
             .
-        repi.ucs-bmp-cjk_gb:0x50E6
+        repi.ucs_gb:0x50E6
             a chisegg:glyph-image ;
             :glyph-image-of [ :context domain:gb      ;
-                              :target ucs-bmp-cjk:0x50E6  ] ;
-            :eq repi.ucs_gb:0x50E6        ; # &R-GU+50E6;
+                              :target     ucs:0x50E6  ] ;
             .
-            repi.ucs_gb:0x50E6
-                          :glyph-image-of [ :context domain:gb      ;
-                                            :target     ucs:0x50E6  ] .
         repi.jis-x0212:0x3241
             a chisegg:glyph-image ;
             :glyph-image-of jis-x0212:0x3241 ;
@@ -71491,7 +71620,7 @@ rep.ucs_iso:0x20378
     ideo:total-strokes    14 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x4EBB ; # 亻
-        isd:right    rep.ucs-bmp-itaiji-009:0x8846   # &U-i009+8846;
+        isd:right    rep.ucs-itaiji-009:0x8846   # &U-i009+8846;
     ] ;
     :eq rep.cns11643-6:0x5A74     ; # &C6-5A74;
     :eq rep.daikanwa:01131        ; # &I-M-01131;
@@ -73412,7 +73541,7 @@ rep.cns11643-3:0x4B29
         :abstract-glyph-form-of daikanwa:01160 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x2E85 ; # ⺅
-        isd:right    g2.ks-x1001:0x6728   # &g2-M-31387;
+        isd:right    g2.daikanwa:31387   # &g2-M-31387;
     ] ;
         .
     g2.cns11643-3:0x4B29
@@ -75986,9 +76115,9 @@ rep.adobe-japan1-4:14344
     rep.shinjigen:0405
                :abstract-glyph-of      shinjigen:0405    .
 
-g2.shinjigen:0406
-    a chisegg:abstract-glyph-form ;
-    :abstract-glyph-form-of shinjigen:0406 ;
+rep.shinjigen:0406
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of shinjigen:0406 ;
     :denotation-of
         a.ucs:0x5108         ;
     ideo:radical           9 ; # ⼈ 
@@ -75998,12 +76127,9 @@ g2.shinjigen:0406
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    rep.mj:013511   # &MJ013511;
     ] ;
-    :eq rep.shinjigen:0406        ; # &SJG2-0406;
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-4:14344 ] ;
     .
-    rep.shinjigen:0406
-               :abstract-glyph-of      shinjigen:0406    .
 
 a.ucs:0x4FA9
     a chisegg:abstract-character ;
@@ -77827,9 +77953,9 @@ a.ucs:0x50A7
     rep.hanziku-1:0xD0C0
                :abstract-glyph-of      hanziku-1:0xD0C0  .
 
-g2.shinjigen:0429
-    a chisegg:abstract-glyph-form ;
-    :abstract-glyph-form-of shinjigen:0429 ;
+rep.shinjigen:0429
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of shinjigen:0429 ;
     :denotation-of
         bucs:0x5110          ;
     ideo:radical           9 ; # ⼈ 
@@ -77839,14 +77965,11 @@ g2.shinjigen:0429
         isd:left     a.ucs:0x4EBB ; # 亻
         isd:right    a.ucs:0x8CD4   # 賔
     ] ;
-    :eq rep.shinjigen:0429        ; # &SJG2-0429;
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-4:14346 ] ;
     :subsume
         g2.shinjigen:0429    ;
     .
-    rep.shinjigen:0429
-               :abstract-glyph-of      shinjigen:0429    .
     g2.shinjigen:0429
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of shinjigen:0429 ;
@@ -81384,20 +81507,20 @@ a.ucs:0x5123
     ] ;
     .
 
-o.ucs_cns:0x5123
+o.ucs_jis:0x5123
     a chisegg:unified-glyph ;
-    :unified-glyph-of [ :context domain:cns     ;
+    :unified-glyph-of [ :context domain:jis     ;
                         :target     ucs:0x5123  ] ;
     :denotation-of
         a.ucs:0x5123         ;
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          15 ;
     ideo:total-strokes    17 ;
-    :eq o.ucs_jis:0x5123          ; # &o-AJ1-21168;
+    :eq o.ucs_cns:0x5123          ; # &o-AJ1-21168;
     :eq o.adobe-japan1-6:21168    ; # &o-AJ1-21168;
     .
-    o.ucs_jis:0x5123
-                :unified-glyph-of [ :context domain:jis     ;
+    o.ucs_cns:0x5123
+                :unified-glyph-of [ :context domain:cns     ;
                                     :target     ucs:0x5123  ] .
     o.adobe-japan1-6:21168
                 :unified-glyph-of adobe-japan1-6:21168   .
@@ -81406,7 +81529,7 @@ rep.adobe-japan1-6:21168
     a chisegg:abstract-glyph ;
     :abstract-glyph-of adobe-japan1-6:21168 ;
     :denotation-of
-        o.ucs_cns:0x5123     ;
+        o.ucs_jis:0x5123     ;
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          15 ;
     ideo:total-strokes    17 ;
@@ -81436,7 +81559,7 @@ rep.cns11643-4:0x5565
     a chisegg:abstract-glyph ;
     :abstract-glyph-of cns11643-4:0x5565 ;
     :denotation-of
-        o.ucs_cns:0x5123     ;
+        o.ucs_jis:0x5123     ;
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          15 ;
     ideo:total-strokes    17 ;
@@ -83124,23 +83247,20 @@ a.ucs:0x512F
     ] ;
     .
 
-o.adobe-japan1:21173
+o.ucs_jis:0x512F
     a chisegg:unified-glyph ;
-    :unified-glyph-of adobe-japan1:21173 ;
+    :unified-glyph-of [ :context domain:jis     ;
+                        :target     ucs:0x512F  ] ;
     :denotation-of
         a.ucs:0x512F         ;
     ideo:radical           9 ; # ⼈ 
     ideo:strokes          16 ;
     ideo:total-strokes    18 ;
-    :eq o.ucs_jis:0x512F          ; # &o-AJ1-21173;
     :eq o.adobe-japan1-6:21173    ; # &o-AJ1-21173;
     :subsume
         rep.adobe-japan1-6:21173 ,
         rep.hanziku-1:0xD6DC ;
     .
-    o.ucs_jis:0x512F
-                :unified-glyph-of [ :context domain:jis     ;
-                                    :target     ucs:0x512F  ] .
     o.adobe-japan1-6:21173
                 :unified-glyph-of adobe-japan1-6:21173   .
     rep.adobe-japan1-6:21173
@@ -85004,7 +85124,7 @@ o.ucs_cns:0x34A1
     ideo:total-strokes    19 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x4EBB ; # 亻
-        isd:right    o.ucs_cns:0x7E47   # &o-JX1-7A34;
+        isd:right    o.ucs_jis:0x7E47   # &o-JX1-7A34;
     ] ;
     :subsume
         rep.daikanwa:01300   ,