X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R038-Woman.ttl;h=cf4e233f1843373a5b2c903ab01b05f6b7f2ce05;hb=cd05f4bc23b3ec0f2af9ca57b8a7737ecf5d8490;hp=ba20b9f5b3c465326f16e4d928e231a6cd1986c1;hpb=e420dab4e93406df5e8fbe10a9b05b6bc8098218;p=chise%2Fchiset.git

diff --git a/Ideograph-R038-Woman.ttl b/Ideograph-R038-Woman.ttl
index ba20b9f..cf4e233 100644
--- a/Ideograph-R038-Woman.ttl
+++ b/Ideograph-R038-Woman.ttl
@@ -213,8 +213,10 @@
 @prefix g2.ruimoku-v6: <http://www.chise.org/est/view/character/g2.ruimoku-v6=> .
 @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-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
+@prefix a.ucs-itaiji-001: <http://www.chise.org/est/view/character/a.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 @prefix 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=> .
@@ -272,6 +274,7 @@
 @prefix ruimoku-v6: <http://rdf.chise.org/data/ccs/ruimoku-v6/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-var-003: <http://rdf.chise.org/data/ccs/ucs-var-003/code-point/> .
 @prefix ucs-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
 @prefix ucs-itaiji-002: <http://rdf.chise.org/data/ccs/ucs-itaiji-002/code-point/> .
@@ -461,9 +464,9 @@ a.ucs:0x2F860
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes           2 ;
     ideo:total-strokes     5 ;
-    :from.same           [ :context domain:ucs     ;
+    ideo:same-as         [ :context domain:ucs     ;
                            :target  a.ucs:0x216A8        ] ;
-    :to.mistakable       a.ucs:0x216A8        ;
+    ideo:mistakable      a.ucs:0x216A8        ;
     :subsume
         rep.gt:07629         ,
         rep.ucs_iso:0x2F860  ;
@@ -476,10 +479,10 @@ a.ucs:0x2F860
         :from.Zhouwen        [ :sources chisebib:shuowen ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:04565 ] ;
-        :from.same           [ :sources chisebib:zihui-biansi-2char ,
+        ideo:same-as         [ :sources chisebib:zihui-biansi-2char ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:04565 ] ;
-        :to.mistakable       [ :sources chisebib:zihui-biansi-2char ,
+        ideo:mistakable      [ :sources chisebib:zihui-biansi-2char ,
                                         chisebib:daikanwa ;
                                :target  rep.daikanwa:06038   ] ;
         .
@@ -700,9 +703,9 @@ a.ucs:0x36A2
         :abstract-glyph-of daikanwa:00395 ;
         ideo:radical           9 ; # ⼈ 
         ideo:strokes           3 ;
-        :from.ancient        [ :sources chisebib:daikanwa ;
+        ideo:ancient-form-of [ :sources chisebib:daikanwa ;
                                :target  rep.adobe-japan1-4:13382 ] ;
-        :to.mistakable       rep.daikanwa:06040   ;
+        ideo:mistakable      rep.daikanwa:06040   ;
         :subsume
             g2.daikanwa:00395    ,
             g2.cns11643-3:0x2174 ;
@@ -724,10 +727,10 @@ a.ucs:0x36A2
         :abstract-glyph-of daikanwa:06040 ;
         ideo:radical          38 ; # â¼¥ 
         ideo:strokes           2 ;
-        :from.ancient        [ :sources chisebib:shuowen ,
+        ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x5974         ] ;
-        :to.mistakable       rep.daikanwa:00395   ;
+        ideo:mistakable      rep.daikanwa:00395   ;
         :subsume
             g2.daikanwa:06040    ,
             g2.ucs_unicode:0x36A2 ;
@@ -2283,8 +2286,8 @@ a.ucs:0x5986
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gb2312:0x5731 ;
         :eq rep.ucs_unicode:0x5986    ; # &G0-5731;
-        :from.simplified     [ :context domain:CN      ;
-                               :target  rep.adobe-japan1-0:04562 ] ;
+        ideo:simplified-form-of [ :context domain:CN      ;
+                                  :target  rep.adobe-japan1-0:04562 ] ;
         .
         rep.ucs_unicode:0x5986
                    :abstract-glyph-of [ :context domain:unicode ;
@@ -2313,8 +2316,8 @@ a.ucs:0x5988
     ideo:strokes           3 ;
     ideo:total-strokes     6 ;
     :eq rep.gb2312:0x4268         ; # &I-G0-4268;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04591 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04591 ] ;
     .
     rep.gb2312:0x4268
                :abstract-glyph-of         gb2312:0x4268  .
@@ -2674,12 +2677,12 @@ a.ucs:0x598D
     :eq rep.gt-pj-1:21803         ; # &I-GT-07670;
     :eq rep.daikanwa:06075        ; # &I-M-06075;
     :eq rep.shinjigen:1650        ; # 妍
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x59F8         ] ;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  a.ucs:0x59F8         ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  a.ucs:0x59F8         ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x59F8         ] ;
     :subsume
         g2.ucs_unicode:0x598D ,
@@ -4842,8 +4845,8 @@ a.ucs:0x59AA
     ideo:strokes           4 ;
     ideo:total-strokes     7 ;
     :eq rep.gb2312:0x657D         ; # &I-G0-657D;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:009917        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:009917        ] ;
     .
     rep.gb2312:0x657D
                :abstract-glyph-of         gb2312:0x657D  .
@@ -4856,8 +4859,8 @@ a.ucs:0x59AB
     ideo:total-strokes     7 ;
     :non-morohashi       ( 6119 9 3 ) ;
     :eq rep.gb2312:0x6623         ; # &I-G0-6623;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.cns11643-3:0x4B5E ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.cns11643-3:0x4B5E ] ;
     .
     rep.gb2312:0x6623
                :abstract-glyph-of         gb2312:0x6623  .
@@ -5150,7 +5153,7 @@ rep.ucs_unicode:0x59AD
     ideo:total-strokes     8 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x5973 ; # 女
-        isd:right    rep.ucs_unicode:0x72AE   # &UU+72AE;
+        isd:right    rep.big5-cdp:0x8A66   # &CDP-8A66;
     ] ;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :subsume
@@ -5859,9 +5862,9 @@ a.ucs:0x59B8
     :form-of             [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5A3F         ] ;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x5A40         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x5A40         ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5A3F         ] ;
     :subsume
@@ -7336,8 +7339,8 @@ a.ucs:0x59CA
     :eq rep.daikanwa:06164        ; # &I-M-06164;
     :eq rep.shinjigen:1629        ; # 姊
     :eq rep.jef-china3:0x49AB     ; # &I-JC3-49AB;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x59C9         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x59C9         ] ;
     :subsume
         g2.ucs_unicode:0x59CA ,
         g2.cns11643-1:0x4C70 ;
@@ -7441,7 +7444,7 @@ a.ucs:0x59C9
     :eq rep.daikanwa:06165        ; # &I-M-06165;
     :eq rep.shinjigen:1628        ; # 姉
     :eq rep.cbeta:00106           ; # &I-CB00106;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x59CA         ] ;
     :subsume
         g2.ucs_unicode:0x59C9 ,
@@ -7759,7 +7762,7 @@ rep.daikanwa:06167
         isd:left     a.ucs:0x5973 ; # 女
         isd:right    rep.mj:007307   # &MJ007307;
     ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.ucs_unicode:0x36A9 ] ;
     :subsume
@@ -8981,27 +8984,53 @@ a.ucs:0x21700
     rep.cns11643-5:0x2563
                :abstract-glyph-of     cns11643-5:0x2563  .
 
-rep.daikanwa:06195
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:06195 ;
-    :to.ucs		  a.ucs:0x216F9 ; # 𡛹
-    ideo:radical          38 ; # â¼¥ 
-    ideo:strokes           5 ;
-    ideo:total-strokes     8 ;
-    .
-
 a.ucs:0x216F9
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x216F9 ;
-
-    :morohashi-daikanwa	  (6195 0 0) ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.gt-k:01253 ; # &GT-K01253;
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
     :eq rep.cns11643-6:0x2A5E     ; # &I-C6-2A5E;
+    :eq rep.daikanwa:06195        ; # &I-M-06195;
+    ideo:same-as         [ :sources chisebib:longkanshoujian ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x7CB2         ] ;
+    :subsume
+        g2.daikanwa:06195    ,
+        g2.ucs_iso:0x216F9   ;
     .
     rep.cns11643-6:0x2A5E
                :abstract-glyph-of     cns11643-6:0x2A5E  .
+    rep.daikanwa:06195
+               :abstract-glyph-of       daikanwa:06195   .
+    g2.daikanwa:06195
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:06195 ;
+        .
+    g2.ucs_iso:0x216F9
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x216F9 ] ;
+        :eq g2.cns11643-6:0x2A5E      ; # &g2-IU-000216F9;
+        :subsume
+            repi.cns11643-6:0x2A5E ,
+            repi.ucs_iso:0x216F9 ;
+        .
+        g2.cns11643-6:0x2A5E
+              :abstract-glyph-form-of     cns11643-6:0x2A5E  .
+        repi.cns11643-6:0x2A5E
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2A5E ;
+            .
+        repi.ucs_iso:0x216F9
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x216F9 ] ;
+            .
 
 rep.daikanwa:06197
     a chisegg:abstract-glyph ;
@@ -9116,11 +9145,11 @@ a.ucs:0x59D8
     :eq rep.gb2312:0x6630         ; # &I-G0-6630;
     :eq rep.cns11643-1:0x505B     ; # &I-C1-505B;
     :eq rep.daikanwa:06199        ; # &I-M-06199;
-    :from.ancient        [ :context domain:s.:.wife ;
+    ideo:ancient-form-of [ :context domain:s.:.wife ;
                            :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04604 ] ;
-    :from.vulgar         [ :context domain:s.:.fuck ;
+    ideo:vulgar-form-of  [ :context domain:s.:.fuck ;
                            :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:06366   ] ;
@@ -9213,7 +9242,7 @@ a.ucs:0x59D9
         :eq rep.cbeta:00775           ; # &I-CB00775;
         :form-of             [ :sources chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:03291 ] ;
-        :from.same           [ :sources chisebib:zihui ,
+        ideo:same-as         [ :sources chisebib:zihui ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:03291 ] ;
         :subsume
@@ -9357,7 +9386,7 @@ a.ucs:0x2171F
     rep.daikanwa:06201
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:06201 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:03291 ] ;
         .
@@ -9974,7 +10003,7 @@ a.ucs:0x59E2
         :eq rep.daikanwa:06213        ; # &M-06213;
         :eq rep.shinjigen:1667        ; # &M-06213;
         :eq rep.cbeta:01006           ; # &I-CB01006;
-        :from.vulgar         [ :sources chisebib:zihui ,
+        ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                         chisebib:daikanwa ,
                                         chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:04574 ] ;
@@ -10769,9 +10798,9 @@ a.ucs:0x59EB
         :eq rep.gt-pj-1:18737         ; # &I-GT-07819;
         :eq rep.daikanwa:06229        ; # &I-M-06229;
         :eq rep.shinjigen:1664        ; # &AJ1-03491;
-        :from.simplified     [ :context domain:JP...Jouyou ;
-                               :target  rep.adobe-japan1-4:13998 ] ;
-        :to.mistakable       [ :sources chisebib:kangxi-biansi-2char ,
+        ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                                  :target  rep.adobe-japan1-4:13998 ] ;
+        ideo:mistakable      [ :sources chisebib:kangxi-biansi-2char ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-4:13998 ] ;
         .
@@ -13077,7 +13106,7 @@ a.ucs:0x5A04
     :eq rep.daikanwa:06278        ; # &I-M-06278;
     :eq rep.shinjigen:1699        ; # 娄
     :eq rep.hanziku-3:0xD5F3      ; # &I-HZK03-D5F3;
-    :from.vulgar         [ :sources chisebib:zhonghua-dazidian ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhonghua-dazidian ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04050 ] ;
@@ -13231,8 +13260,8 @@ a.ucs:0x5A07
     ideo:strokes           6 ;
     ideo:total-strokes     9 ;
     :eq rep.gb2312:0x3D3F         ; # &I-G0-3D3F;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04599 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04599 ] ;
     .
     rep.gb2312:0x3D3F
                :abstract-glyph-of         gb2312:0x3D3F  .
@@ -15719,7 +15748,7 @@ a.ucs:0x5A24
         :form-of             [ :sources chisebib:jiyun ,
                                         chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:04562 ] ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:04562 ] ;
         .
@@ -16244,8 +16273,8 @@ o.ucs_unicode:0x5A29
         :eq rep.hanyo-denshi...ja:0x4A5A ; # &I-HD-JA-4A5A;
         :eq rep.gt:08093              ; # &I-GT-08093;
         :eq rep.gt-pj-1:19034         ; # &I-GT-08093;
-        :from.simplified     [ :context domain:JP...extra...design ;
-                               :target  rep.mj:009734        ] ;
+        ideo:simplified-form-of [ :context domain:JP...extra...design ;
+                                  :target  rep.mj:009734        ] ;
         :subsume
             g2.mj:009735         ;
         .
@@ -18062,7 +18091,7 @@ a.ucs:0x5A40
     :eq rep.daikanwa:06382        ; # &I-M-06382;
     :eq rep.shinjigen:1678        ; # 婀
     :form-of             a.ucs:0x59B8         ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5A3F         ,
                                     a.ucs:0x59B8         ] ;
@@ -18167,7 +18196,7 @@ a.ucs_component:0x5A41
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
-    :eq a.iwds-1:0348             ; # &IWDS1-348;
+    :eq a.iwds-1:0348             ; # &A-compU+5A41;
     .
     a.iwds-1:0348
            :abstract-character-of         iwds-1:0348    .
@@ -18352,7 +18381,7 @@ rep.ucs_iso:0x21764
     :eq rep.gt-pj-2:27480         ; # &I-GT-08104;
     :eq rep.daikanwa:06384        ; # &I-M-06384;
     :eq rep.shinjigen:1700        ; # &GT-08104;
-    :from.vulgar         [ :sources chisebib:zihui ,
+    ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04050 ] ;
@@ -19418,26 +19447,63 @@ a.ucs:0x5A4F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5A4F ;
     ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x5154   # 兔
+    ] ;
+    .
+
+rep.cns11643-3:0x353B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-3:0x353B ;
+    :denotation-of
+        a.ucs:0x5A4F         ;
+    ideo:radical          38 ; # â¼¥ 
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.mj:007242   # &MJ007242;
+    ] ;
+    :eq rep.ucs_unicode:0x5A4F    ; # &C3-353B;
+    :eq rep.daikanwa:06403        ; # &I-M-06403;
+    :form-of             [ :sources chisebib:jiyun ;
+                           :target  rep.cns11643-2:0x565F ] ;
+    :form-of             [ :context domain:shuowen ;
+                           :target  rep.cns11643-2:0x565F ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:shuowen-tongxun-dingsheng ,
+                                            chisebib:daikanwa ;
+                                   :target  rep.ucs_iso:0x204D7  ] ;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-2:0x565F ] ;
     :subsume
-        rep.daikanwa:06403   ,
-        rep.ucs_unicode:0x5A4F ,
-        rep.cns11643-3:0x353B ;
+        g2.daikanwa:06403    ,
+        g2.ucs_unicode:0x5A4F ,
+        g2.cns11643-3:0x353B ;
     .
+    rep.ucs_unicode:0x5A4F
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5A4F  ] .
     rep.daikanwa:06403
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:06403 ;
+               :abstract-glyph-of       daikanwa:06403   .
+    g2.daikanwa:06403
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:06403 ;
         .
-    rep.ucs_unicode:0x5A4F
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x5A4F  ] ;
+    g2.ucs_unicode:0x5A4F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5A4F  ] ;
         .
-    rep.cns11643-3:0x353B
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x353B ;
+    g2.cns11643-3:0x353B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x353B ;
+        :eq g2.ucs_cns:0x5A4F         ; # &g2-CU+5A4F;
         .
+        g2.ucs_cns:0x5A4F
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x5A4F  ] .
 
 a.ucs:0x5A50
     a chisegg:abstract-character ;
@@ -19602,8 +19668,8 @@ g.ucs_iso:0x21769
         :abstract-glyph-of daikanwa:06409 ;
         :eq rep.shinjigen:1620        ; # &M-06409;
         :eq rep.cbeta:07847           ; # &I-CB07847;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  rep.adobe-japan1-0:03887 ] ;
+        ideo:original-form-of [ :sources chisebib:shinjigen ;
+                                :target  rep.adobe-japan1-0:03887 ] ;
         .
         rep.shinjigen:1620
                    :abstract-glyph-of      shinjigen:1620    .
@@ -19864,7 +19930,7 @@ rep.cns11643-3:0x3A78
     ideo:total-strokes    12 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x5973 ; # 女
-        isd:right    rep.ucs-itaiji-001:0x758C   # &GT-K06360;
+        isd:right    rep.ucs-itaiji-001:0x758C   # &U-i001+758C;
     ] ;
     :eq rep.ucs_unicode:0x5AAB    ; # &C3-3A78;
     :subsume
@@ -20108,7 +20174,7 @@ a.ucs:0x5A5A
         isd:left     a.ucs:0x5973 ; # 女
         isd:right    a.ucs:0x660F   # 昏
     ] ;
-    :eq rep.adobe-japan1-0:02071  ; # &AJ1-02071;
+    :eq rep.adobe-japan1-0:02071  ; # &I-AJ1-02071;
     :eq rep.jis-x0208:0x3A27      ; # &I-J90-3A27;
     :eq rep.gb2312:0x3B69         ; # &I-G0-3B69;
     :eq rep.ks-x1001:0x7B66       ; # &I-K0-7B66;
@@ -20607,7 +20673,7 @@ a.ucs:0x5A63
                                :target  rep.adobe-japan1-0:01213 ] ;
         :form-of             [ :sources chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:01213 ] ;
-        :from.same           [ :sources chisebib:shuowen ,
+        ideo:same-as         [ :sources chisebib:shuowen ,
                                         chisebib:daikanwa ;
                                :target  rep.adobe-japan1-0:01213 ] ;
         .
@@ -22044,8 +22110,8 @@ a.ucs:0x5A74
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
     :eq rep.gb2312:0x5324         ; # &I-G0-5324;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5B30         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5B30         ] ;
     .
     rep.gb2312:0x5324
                :abstract-glyph-of         gb2312:0x5324  .
@@ -22064,8 +22130,8 @@ a.ucs:0x5A75
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gb2312:0x663F ;
         :eq rep.ucs_unicode:0x5A75    ; # &G0-663F;
-        :from.simplified     [ :context domain:CN      ;
-                               :target  rep.adobe-japan1-0:04600 ] ;
+        ideo:simplified-form-of [ :context domain:CN      ;
+                                  :target  rep.adobe-japan1-0:04600 ] ;
         .
         rep.ucs_unicode:0x5A75
                    :abstract-glyph-of [ :context domain:unicode ;
@@ -22082,12 +22148,33 @@ a.ucs:0x5A76
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
     :eq rep.gb2312:0x4974         ; # &I-G0-4974;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x5B38 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x5B38 ] ;
     .
     rep.gb2312:0x4974
                :abstract-glyph-of         gb2312:0x4974  .
 
+a.ucs:0x2A982
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2A982 ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes           8 ;
+    ideo:total-strokes    11 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.ucs-itaiji-002:0x5965   # &U-i002+5965;
+    ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :target  a.ucs:0x3729         ] ;
+    :subsume
+        g2.ucs_iso:0x2A982   ;
+    .
+    g2.ucs_iso:0x2A982
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2A982 ] ;
+        .
+
 a.ucs:0x5A77
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5A77 ;
@@ -22596,7 +22683,7 @@ o.ucs_unicode:0x36EF
         ] ;
         :eq rep.ucs_unicode:0x36EF    ; # &C3-3A67;
         :eq rep.daikanwa:06465        ; # &I-M-06465;
-        :from.same           [ :context domain:pianhai ;
+        ideo:same-as         [ :context domain:pianhai ;
                                :sources chisebib:pianhai ,
                                         chisebib:daikanwa ;
                                :target  rep.mj:009734        ] ;
@@ -22641,7 +22728,7 @@ a.ucs:0x36F0
     :eq rep.cns11643-3:0x3A74     ; # &I-C3-3A74;
     :eq rep.daikanwa:06466        ; # &I-M-06466;
     :eq rep.shinjigen:1685        ; # 㛰
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5A5A         ] ;
     :subsume
         g2.ucs_unicode:0x36F0 ,
@@ -23316,8 +23403,8 @@ a.ucs:0x5A86
     :eq rep.daikanwa:06482        ; # &I-M-06482;
     :eq rep.shinjigen:1735        ; # 媆
     :eq rep.hanziku-3:0xD96A      ; # &I-HZK03-D96A;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x5AE9         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x5AE9         ] ;
     :subsume
         g2.ucs_unicode:0x5A86 ,
         g2.cns11643-3:0x3A77 ;
@@ -26495,12 +26582,21 @@ bucs:0x5ABC
     :super-abstract-character-of [ :context domain:bucs    ;
                                    :target     ucs:0x5ABC  ] ;
     ideo:radical          38 ; # â¼¥ 
+    .
+
+a.ucs_iwds-1:0x5ABC
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x5ABC  ] ;
+    :denotation-of
+        bucs:0x5ABC          ;
+    ideo:radical          38 ; # â¼¥ 
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x5973 ; # 女
-        isd:right    a.ucs_component:0x6637   # &IWDS1-320;
+        isd:right    a.ucs_iwds-1:0x6637   # &A-IWDSU+6637;
     ] ;
-    :eq rep.ucs_big5:0x5ABC       ; # &BUCS+5ABC;
-    :eq a.big5:0xB6FE             ; # &BUCS+5ABC;
+    :eq rep.ucs_big5:0x5ABC       ; # &A-IWDSU+5ABC;
+    :eq a.big5:0xB6FE             ; # &A-IWDSU+5ABC;
     .
     rep.ucs_big5:0x5ABC
                :abstract-glyph-of [ :context domain:big5    ;
@@ -26512,7 +26608,7 @@ a.ucs:0x5AAA
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5AAA ;
     :denotation-of
-        bucs:0x5ABC          ;
+        a.ucs_iwds-1:0x5ABC  ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
@@ -26523,7 +26619,7 @@ a.ucs:0x5AAA
     :eq rep.gb2312:0x6641         ; # &I-G0-6641;
     :eq rep.cns11643-3:0x3A79     ; # &I-C3-3A79;
     :eq rep.daikanwa:06565        ; # &I-M-06565;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5ABC         ] ;
     :subsume
         g2.ucs_unicode:0x5AAA ,
@@ -26681,7 +26777,7 @@ a.ucs:0x2F867
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
     :eq rep.cns11643-6:0x4761     ; # &I-C6-4761;
-    :from.same           [ :sources chisebib:ucs ;
+    ideo:same-as         [ :sources chisebib:ucs ;
                            :target  a.ucs:0x36EE         ] ;
     .
     rep.cns11643-6:0x4761
@@ -26751,8 +26847,6 @@ a.ucs:0x5AB1
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5AB1 ;
     ideo:radical          38 ; # â¼¥ 
-    ideo:strokes          10 ;
-    ideo:total-strokes    13 ;
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x5973 ; # 女
         isd:right    a.ucs:0x4343   # 䍃
@@ -26857,6 +26951,34 @@ rep.adobe-japan1-5:17506
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x5AB1  ] .
 
+rep.ucs-var-001:0x5AB1
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x5AB1 ;
+    :denotation-of
+        a.ucs:0x5AB1         ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.gt:36228   # &GT-36228;
+    ] ;
+    .
+
+rep.ucs-var-002:0x5AB1
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-002:0x5AB1 ;
+    :denotation-of
+        a.ucs:0x5AB1         ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.ucs-var-003:0x4343   # &U-v003+4343;
+    ] ;
+    .
+
 rep.ucs_unicode:0x5AB1
     a chisegg:abstract-glyph ;
     :abstract-glyph-of [ :context domain:unicode ;
@@ -26920,7 +27042,7 @@ a.ucs:0x3707
     :eq rep.cns11643-4:0x3C61     ; # &I-C4-3C61;
     :eq rep.daikanwa:06570        ; # &I-M-06570;
     :eq rep.shinjigen:2458        ; # 㜇
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04822 ] ;
     :subsume
         g2.ucs_unicode:0x3707 ,
@@ -27417,27 +27539,66 @@ a.ucs:0x5AB7
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5AB7 ;
     ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x8FB1   # è¾±
+    ] ;
+    .
+
+rep.cns11643-2:0x4246
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-2:0x4246 ;
+    :denotation-of
+        a.ucs:0x5AB7         ;
+    ideo:radical          38 ; # â¼¥ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.cns11643-1:0x5849   # &C1-5849;
+    ] ;
+    :eq rep.ucs_unicode:0x5AB7    ; # &C2-4246;
     :eq a.big5:0xDD40             ; # &I-B-DD40;
+    :eq rep.daikanwa:06578        ; # &I-M-06578;
     :subsume
-        rep.ucs_unicode:0x5AB7 ,
-        rep.cns11643-2:0x4246 ;
+        g2.ucs_unicode:0x5AB7 ,
+        g2.cns11643-2:0x4246 ;
     .
+    rep.ucs_unicode:0x5AB7
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5AB7  ] .
     a.big5:0xDD40
            :abstract-character-of           big5:0xDD40  .
-    rep.ucs_unicode:0x5AB7
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x5AB7  ] ;
-        :eq rep.daikanwa:06578        ; # &M-06578;
+    rep.daikanwa:06578
+               :abstract-glyph-of       daikanwa:06578   .
+    g2.ucs_unicode:0x5AB7
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5AB7  ] ;
+        :eq g2.daikanwa:06578         ; # &g2-M-06578;
+        :subsume
+            repi.daikanwa:06578  ,
+            repi.ucs_unicode:0x5AB7 ;
         .
-        rep.daikanwa:06578
-                   :abstract-glyph-of       daikanwa:06578   .
-    rep.cns11643-2:0x4246
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-2:0x4246 ;
+        g2.daikanwa:06578
+              :abstract-glyph-form-of       daikanwa:06578   .
+        repi.daikanwa:06578
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06578 ;
+            .
+        repi.ucs_unicode:0x5AB7
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x5AB7  ] ;
+            .
+    g2.cns11643-2:0x4246
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-2:0x4246 ;
+        :eq g2.ucs_cns:0x5AB7         ; # &g2-CU+5AB7;
         .
+        g2.ucs_cns:0x5AB7
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x5AB7  ] .
 
 a.ucs:0x5AB8
     a chisegg:abstract-character ;
@@ -27803,8 +27964,8 @@ a.ucs:0x5ABB
     :eq a.big5:0xDCFD             ; # &I-B-DCFD;
     :eq rep.daikanwa:06583        ; # &I-M-06583;
     :eq rep.shinjigen:1692        ; # 媻
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x5A46         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x5A46         ] ;
     :subsume
         g2.adobe-japan1-6:21421 ,
         g2.ucs_unicode:0x5ABB ,
@@ -27973,7 +28134,7 @@ a.ucs:0x5ABC
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5ABC ;
     :denotation-of
-        bucs:0x5ABC          ;
+        a.ucs_iwds-1:0x5ABC  ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
@@ -28233,7 +28394,7 @@ a.ucs:0x2F868
     rep.daikanwa:06594
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:06594 ;
-        :from.vulgar         [ :sources chisebib:zihui ,
+        ideo:vulgar-form-of  [ :sources chisebib:zihui ,
                                         chisebib:daikanwa ;
                                :target  rep.ucs_unicode:0x36FC ] ;
         .
@@ -30164,8 +30325,8 @@ rep.mj:009910
     :eq rep.gt:08275              ; # &I-GT-08275;
     :eq rep.gt-pj-1:14201         ; # &I-GT-08275;
     :eq rep.jef-china3:0x49EC     ; # &I-JC3-49EC;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:009909        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:009909        ] ;
     :subsume
         g2.mj:009910         ,
         g2.cns11643-1:0x6362 ;
@@ -30840,8 +31001,8 @@ a.ucs:0x5AD2
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
     :eq rep.gb2312:0x6648         ; # &I-G0-6648;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-5:19319 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-5:19319 ] ;
     .
     rep.gb2312:0x6648
                :abstract-glyph-of         gb2312:0x6648  .
@@ -30865,6 +31026,40 @@ a.ucs:0x5AD4
     rep.gb2312:0x6649
                :abstract-glyph-of         gb2312:0x6649  .
 
+a.ucs:0x2180C
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2180C ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x23B09   # 𣬉
+    ] ;
+    .
+
+rep.ucs_iso:0x2180C
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2180C ] ;
+    :denotation-of
+        a.ucs:0x2180C        ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    13 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.ucs-var-001:0x23B09   # &U-v001+23B09;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2180C   ;
+    .
+    g2.ucs_iso:0x2180C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2180C ] ;
+        .
+
 a.ucs:0x5AD5
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5AD5 ;
@@ -32346,7 +32541,7 @@ a.ucs:0x5AE5
     ideo:radical          38 ; # â¼¥ 
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x5973 ; # 女
-        isd:right    a.ucs_component:0x5C08   # &IWDS1-387;
+        isd:right    a.ucs_component:0x5C08   # &A-compU+5C08;
     ] ;
     .
 
@@ -32482,7 +32677,7 @@ a.ucs:0x5AE6
     :eq rep.gt-pj-1:21827         ; # &I-GT-08371;
     :eq rep.daikanwa:06663        ; # &I-M-06663;
     :eq rep.shinjigen:1654        ; # 嫦
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x59EE         ] ;
     :subsume
         g2.ucs_unicode:0x5AE6 ,
@@ -32617,30 +32812,65 @@ a.ucs:0x5AE8
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5AE8 ;
     ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x26C29   # 𦰩
+    ] ;
+    .
+
+rep.cns11643-2:0x4962
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-2:0x4962 ;
+    :denotation-of
+        a.ucs:0x5AE8         ;
+    ideo:radical          38 ; # â¼¥ 
     ideo:strokes          11 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.big5-cdp:0x8BD3   # &CDP-8BD3;
+    ] ;
+    :eq rep.ucs_unicode:0x5AE8    ; # &C2-4962;
     :eq a.big5:0xE17B             ; # &I-B-E17B;
+    :eq rep.daikanwa:06665        ; # &I-M-06665;
     :subsume
-        rep.ucs_unicode:0x5AE8 ,
-        rep.cns11643-2:0x4962 ;
+        g2.ucs_unicode:0x5AE8 ,
+        g2.cns11643-2:0x4962 ;
     .
+    rep.ucs_unicode:0x5AE8
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5AE8  ] .
     a.big5:0xE17B
            :abstract-character-of           big5:0xE17B  .
-    rep.ucs_unicode:0x5AE8
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x5AE8  ] ;
-        :eq rep.daikanwa:06665        ; # &M-06665;
+    rep.daikanwa:06665
+               :abstract-glyph-of       daikanwa:06665   .
+    g2.ucs_unicode:0x5AE8
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5AE8  ] ;
+        :eq g2.daikanwa:06665         ; # &g2-M-06665;
+        :subsume
+            repi.daikanwa:06665  ,
+            repi.ucs_unicode:0x5AE8 ;
         .
-        rep.daikanwa:06665
-                   :abstract-glyph-of       daikanwa:06665   .
-    rep.cns11643-2:0x4962
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-2:0x4962 ;
-        :eq rep.ucs_cns:0x5AE8        ; # &C2-4962;
+        g2.daikanwa:06665
+              :abstract-glyph-form-of       daikanwa:06665   .
+        repi.daikanwa:06665
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06665 ;
+            .
+        repi.ucs_unicode:0x5AE8
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x5AE8  ] ;
+            .
+    g2.cns11643-2:0x4962
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-2:0x4962 ;
+        :eq g2.ucs_cns:0x5AE8         ; # &g2-CU+5AE8;
         .
-        rep.ucs_cns:0x5AE8
-                   :abstract-glyph-of [ :context domain:cns     ;
+        g2.ucs_cns:0x5AE8
+              :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x5AE8  ] .
 
 a.ucs:0x5AE9
@@ -32792,7 +33022,7 @@ a.ucs:0x5AF0
     :eq rep.shinjigen:1736        ; # å«°
     :eq rep.cbeta:02393           ; # &I-CB02393;
     :eq rep.jef-china3:0x49DE     ; # &I-JC3-49DE;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5AE9         ] ;
     :subsume
         g2.adobe-japan1-5:17513 ,
@@ -34587,7 +34817,7 @@ a.ucs:0x5AFB
     rep.shinjigen:1743
         a chisegg:abstract-glyph ;
         :abstract-glyph-of shinjigen:1743 ;
-        :from.same           [ :sources chisebib:shinjigen ;
+        ideo:same-as         [ :sources chisebib:shinjigen ;
                                :target  rep.adobe-japan1-0:04597 ] ;
         .
     rep.cns11643-1:0x6C49
@@ -34917,8 +35147,8 @@ a.ucs:0x5AAF
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:unicode ;
                              :target     ucs:0x5AAF  ] ;
-        :from.simplified     [ :context domain:misc    ;
-                               :target  rep.adobe-japan1-4:14467 ] ;
+        ideo:simplified-form-of [ :context domain:misc    ;
+                                  :target  rep.adobe-japan1-4:14467 ] ;
         .
     rep.cns11643-2:0x3A77
         a chisegg:abstract-glyph ;
@@ -35435,35 +35665,100 @@ a.ucs:0x5B08
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x5B08  ] .
 
-rep.daikanwa:06735
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:06735 ;
-    :to.ucs		  a.ucs:0x21857 ; # 𡡗
+a.ucs:0x21857
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21857 ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x24514   # 𤔔
+    ] ;
     .
 
-a.ucs:0x21857
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x21857 ;
-
-    :morohashi-daikanwa	  (6735 0 2) ;
+rep.mj:033743
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:033743 ;
+    :denotation-of
+        a.ucs:0x21857        ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.gt:25282   # &GT-25282;
+    ] ;
+    :eq rep.koseki:076670         ; # &MJ033743;
+    :eq rep.daikanwa:06735        ; # &I-M-06735;
+    :form-of             rep.mj:037396        ;
+    :subsume
+        g2.mj:033743         ;
     .
+    rep.koseki:076670
+               :abstract-glyph-of         koseki:076670  .
+    rep.daikanwa:06735
+               :abstract-glyph-of       daikanwa:06735   .
+    g2.mj:033743
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:033743 ;
+        :eq g2.koseki:076670          ; # &g2-MJ033743;
+        :eq g2.daikanwa:06735         ; # &g2-MJ033743;
+        :subsume
+            repi.daikanwa:06735  ,
+            repi.mj:033743       ,
+            rep.hanziku-3:0xDCD3 ;
+        .
+        g2.koseki:076670
+              :abstract-glyph-form-of         koseki:076670  .
+        g2.daikanwa:06735
+              :abstract-glyph-form-of       daikanwa:06735   .
+        repi.daikanwa:06735
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06735 ;
+            .
+        repi.mj:033743
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:033743 ;
+            .
+        rep.hanziku-3:0xDCD3
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-3:0xDCD3 ;
+            .
 
-rep.cns11643-7:0x222C
+rep.ucs_iso:0x21857
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-7:0x222C ;
-    :to.ucs		  a.ucs:0x21857 ; # 𡡗
-
-    :morohashi-daikanwa	  (6735 0 3) ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21857 ] ;
+    :denotation-of
+        a.ucs:0x21857        ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.ucs_iso:0x24514   # &C4-386A;
+    ] ;
+    :eq rep.cns11643-7:0x222C     ; # &C7-222C;
+    :subsume
+        g2.ucs_iso:0x21857   ,
+        g2.cns11643-7:0x222C ;
     .
+    rep.cns11643-7:0x222C
+               :abstract-glyph-of     cns11643-7:0x222C  .
+    g2.ucs_iso:0x21857
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21857 ] ;
+        .
+    g2.cns11643-7:0x222C
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x222C ;
+        :eq g2.ucs_cns:0x21857        ; # &g2-CU+21857;
+        .
+        g2.ucs_cns:0x21857
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x21857 ] .
 
 a.ucs:0x5B09
     a chisegg:abstract-character ;
@@ -35647,30 +35942,89 @@ a.ucs:0x5B0C
         :abstract-glyph-of cns11643-1:0x6C4C ;
         .
 
+a.ucs_iwds-1:0x5B0E
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:iwds-1  ;
+                             :target     ucs:0x5B0E  ] ;
+    ideo:radical          38 ; # â¼¥ 
+    :eq rep.ucs_big5:0x5B14       ; # &A-IWDSU+5B0E;
+    :eq a.big5:0xE955             ; # &A-IWDSU+5B0E;
+    .
+    rep.ucs_big5:0x5B14
+               :abstract-glyph-of [ :context domain:big5    ;
+                                    :target     ucs:0x5B14  ] .
+    a.big5:0xE955
+           :abstract-character-of           big5:0xE955  .
+
 a.ucs:0x5B0E
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5B0E ;
+    :denotation-of
+        a.ucs_iwds-1:0x5B0E  ;
+    ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x5A29 ; # 娩
+        isd:filling  a.ucs:0x751F   # 生
+    ] ;
+    .
+
+rep.cns11643-3:0x4B5F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-3:0x4B5F ;
+    :denotation-of
+        a.ucs:0x5B0E         ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          12 ;
     ideo:total-strokes    15 ;
-    :subsume
-        rep.daikanwa:06740   ,
-        rep.cns11643-3:0x4B5F ,
-        rep.ucs_unicode:0x5B0E ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.mj:009734 ; # &MJ009734;
+        isd:filling  a.ucs:0x751F   # 生
+    ] ;
+    :eq rep.ucs_unicode:0x5B0E    ; # &C3-4B5F;
+    :eq rep.daikanwa:06740        ; # &I-M-06740;
+    :form-of             [ :sources chisebib:shuowen-tongxun-dingsheng ;
+                           :target  rep.cns11643-3:0x3054 ,
+                                    rep.mj:009734        ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:shuowen-tongxun-dingsheng ,
+                                            chisebib:daikanwa ;
+                                   :target  rep.cns11643-3:0x3054 ,
+                                            rep.mj:009734        ] ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
+                           :target  rep.cns11643-2:0x565F ] ;
+    :subsume
+        g2.daikanwa:06740    ,
+        g2.ucs_unicode:0x5B0E ,
+        g2.cns11643-3:0x4B5F ;
     .
+    rep.ucs_unicode:0x5B0E
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5B0E  ] .
     rep.daikanwa:06740
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:06740 ;
+               :abstract-glyph-of       daikanwa:06740   .
+    g2.daikanwa:06740
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:06740 ;
         .
-    rep.cns11643-3:0x4B5F
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x4B5F ;
+    g2.ucs_unicode:0x5B0E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5B0E  ] ;
+        :subsume
+            repi.ucs_unicode:0x5B0E ;
         .
-    rep.ucs_unicode:0x5B0E
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x5B0E  ] ;
+        repi.ucs_unicode:0x5B0E
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x5B0E  ] ;
+            .
+    g2.cns11643-3:0x4B5F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x4B5F ;
+        :eq g2.ucs_cns:0x5B0E         ; # &g2-CU+5B0E;
         .
+        g2.ucs_cns:0x5B0E
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x5B0E  ] .
 
 rep.daikanwa:06741
     a chisegg:abstract-glyph ;
@@ -35721,7 +36075,7 @@ rep.cns11643-3:0x4B5D
     :eq rep.ucs_unicode:0x5B0D    ; # &C3-4B5D;
     :rep.ucs_JP...hanazono     rdf:nil ;
     :eq rep.daikanwa:06742        ; # &I-M-06742;
-    :from.same           [ :sources chisebib:yunbao ,
+    ideo:same-as         [ :sources chisebib:yunbao ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:009881        ] ;
     :subsume
@@ -36265,7 +36619,7 @@ a.ucs:0x21883
     ideo:total-strokes    15 ;
     :eq rep.shinjigen:1744        ; # 𡢃
     :eq rep.cbeta:08135           ; # &I-CB08135;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04597 ] ;
     .
     rep.shinjigen:1744
@@ -36322,23 +36676,68 @@ a.ucs:0x3729
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3729 ;
     ideo:radical          38 ; # â¼¥ 
-    ideo:strokes          13 ;
-    ideo:total-strokes    16 ;
-    :eq rep.daikanwa:06763        ; # &I-M-06763;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs_iwds-1:0x5967   # &A-IWDSU+5967;
+    ] ;
     .
-    rep.daikanwa:06763
-               :abstract-glyph-of       daikanwa:06763   .
 
 rep.cns11643-3:0x5052
     a chisegg:abstract-glyph ;
     :abstract-glyph-of cns11643-3:0x5052 ;
-    :to.ucs		  a.ucs:0x3729 ; # 㜩
-
-    :morohashi-daikanwa	  (6763 0 0) ;
+    :denotation-of
+        a.ucs:0x3729         ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x5967   # 奧
+    ] ;
+    :eq rep.ucs_unicode:0x3729    ; # &C3-5052;
+    :eq rep.daikanwa:06763        ; # &I-M-06763;
+    :subsume
+        g2.ucs_unicode:0x3729 ,
+        rep.hanziku-3:0xDD72 ,
+        g2.cns11643-3:0x5052 ;
     .
+    rep.ucs_unicode:0x3729
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x3729  ] .
+    rep.daikanwa:06763
+               :abstract-glyph-of       daikanwa:06763   .
+    g2.ucs_unicode:0x3729
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x3729  ] ;
+        :eq g2.daikanwa:06763         ; # &g2-M-06763;
+        :subsume
+            repi.daikanwa:06763  ,
+            repi.ucs_unicode:0x3729 ;
+        .
+        g2.daikanwa:06763
+              :abstract-glyph-form-of       daikanwa:06763   .
+        repi.daikanwa:06763
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06763 ;
+            .
+        repi.ucs_unicode:0x3729
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x3729  ] ;
+            .
+    rep.hanziku-3:0xDD72
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of hanziku-3:0xDD72 ;
+        .
+    g2.cns11643-3:0x5052
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x5052 ;
+        :eq g2.ucs_cns:0x3729         ; # &g2-CU+3729;
+        .
+        g2.ucs_cns:0x3729
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x3729  ] .
 
 a.ucs:0x5B10
     a chisegg:abstract-character ;
@@ -36457,31 +36856,71 @@ a.ucs:0x5B13
 a.ucs:0x5B14
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5B14 ;
+    :denotation-of
+        a.ucs_iwds-1:0x5B0E  ;
+    ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:⿺ ;
+        isd:surround a.ucs:0x5A4F ; # 婏
+        isd:filling  a.ucs:0x751F   # 生
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "hu" ) ;
+                         ] ;
+    .
+
+rep.cns11643-2:0x565F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of cns11643-2:0x565F ;
+    :denotation-of
+        a.ucs:0x5B14         ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿺ ;
+        isd:surround rep.cns11643-3:0x353B ; # &C3-353B;
+        isd:filling  a.ucs:0x751F   # 生
+    ] ;
+    :eq rep.ucs_unicode:0x5B14    ; # &C2-565F;
+    :eq rep.daikanwa:06768        ; # &I-M-06768;
+    ideo:interchangeable-form-of [ :sources chisebib:erya-yishu ,
+                                            chisebib:daikanwa ;
+                                   :target  rep.cns11643-3:0x353B ] ;
     :subsume
-        rep.ucs_unicode:0x5B14 ,
-        rep.cns11643-2:0x565F ;
+        g2.ucs_unicode:0x5B14 ,
+        g2.cns11643-2:0x565F ;
     .
     rep.ucs_unicode:0x5B14
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x5B14  ] ;
-        :eq a.big5:0xE955             ; # &M-06768;
-        :eq rep.daikanwa:06768        ; # &I-M-06768;
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5B14  ] .
+    rep.daikanwa:06768
+               :abstract-glyph-of       daikanwa:06768   .
+    g2.ucs_unicode:0x5B14
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x5B14  ] ;
+        :eq g2.daikanwa:06768         ; # &g2-M-06768;
+        :subsume
+            repi.daikanwa:06768  ,
+            repi.ucs_unicode:0x5B14 ;
         .
-        a.big5:0xE955
-               :abstract-character-of           big5:0xE955  .
-        rep.daikanwa:06768
-                   :abstract-glyph-of       daikanwa:06768   .
-    rep.cns11643-2:0x565F
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-2:0x565F ;
-        :eq rep.ucs_cns:0x5B14        ; # &C2-565F;
+        g2.daikanwa:06768
+              :abstract-glyph-form-of       daikanwa:06768   .
+        repi.daikanwa:06768
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06768 ;
+            .
+        repi.ucs_unicode:0x5B14
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x5B14  ] ;
+            .
+    g2.cns11643-2:0x565F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-2:0x565F ;
+        :eq g2.ucs_cns:0x5B14         ; # &g2-CU+5B14;
         .
-        rep.ucs_cns:0x5B14
-                   :abstract-glyph-of [ :context domain:cns     ;
+        g2.ucs_cns:0x5B14
+              :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x5B14  ] .
 
 rep.daikanwa:06769
@@ -37582,35 +38021,82 @@ a.ucs:0x2189A
     ideo:total-strokes    16 ;
     .
 
-rep.daikanwa:06790
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:06790 ;
-    :to.ucs		  a.ucs:0x2189B ; # 𡢛
+a.ucs:0x2189B
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2189B ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs-itaiji-001:0x2452D ; # &A-U-i001+2452D;
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "reN" ) ;
+                         ] ;
     .
 
 rep.cns11643-7:0x2D2B
     a chisegg:abstract-glyph ;
     :abstract-glyph-of cns11643-7:0x2D2B ;
-    :to.ucs		  a.ucs:0x2189B ; # 𡢛
-
-    :morohashi-daikanwa	  (6790 0 0) ;
+    :denotation-of
+        a.ucs:0x2189B        ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-001:0x2452D ; # &U-i001+2452D;
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
+    :eq rep.ucs_cns:0x2189B       ; # &C7-2D2B;
+    :eq rep.daikanwa:06790        ; # &I-M-06790;
+    ideo:ancient-form-of [ :sources chisebib:zihui-bu ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-5:17519 ] ;
+    :form-of             rep.mj:033743        ;
+    :subsume
+        g2.daikanwa:06790    ,
+        g2.cns11643-7:0x2D2B ;
     .
+    rep.ucs_cns:0x2189B
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x2189B ] .
+    rep.daikanwa:06790
+               :abstract-glyph-of       daikanwa:06790   .
+    g2.daikanwa:06790
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:06790 ;
+        .
+    g2.cns11643-7:0x2D2B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x2D2B ;
+        :eq g2.ucs_cns:0x2189B        ; # &g2-CU+2189B;
+        .
+        g2.ucs_cns:0x2189B
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x2189B ] .
 
-a.ucs:0x2189B
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x2189B ;
-
-    :morohashi-daikanwa	  (6790 0 1) ;
+rep.ucs_iso:0x2189B
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2189B ] ;
+    :denotation-of
+        a.ucs:0x2189B        ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          13 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.ucs-itaiji-002:0x2452D ; # &U-i002+2452D;
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2189B   ;
     .
+    g2.ucs_iso:0x2189B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2189B ] ;
+        .
 
 rep.daikanwa:06791
     a chisegg:abstract-glyph ;
@@ -37893,6 +38379,69 @@ a.ucs:0x372B
     rep.daikanwa:06801
                :abstract-glyph-of       daikanwa:06801   .
 
+a.ucs:0x218AF
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x218AF ;
+    ideo:radical          38 ; # â¼¥ 
+    .
+
+rep.mj:033781
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of mj:033781 ;
+    :denotation-of
+        a.ucs:0x218AF        ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    16 ;
+    :eq rep.koseki:077350         ; # &MJ033781;
+    :eq rep.daikanwa:06802        ; # &I-M-06802;
+    :subsume
+        g2.mj:033781         ;
+    .
+    rep.koseki:077350
+               :abstract-glyph-of         koseki:077350  .
+    rep.daikanwa:06802
+               :abstract-glyph-of       daikanwa:06802   .
+    g2.mj:033781
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of mj:033781 ;
+        :eq g2.koseki:077350          ; # &g2-MJ033781;
+        :eq g2.daikanwa:06802         ; # &g2-MJ033781;
+        :subsume
+            repi.daikanwa:06802  ,
+            repi.mj:033781       ;
+        .
+        g2.koseki:077350
+              :abstract-glyph-form-of         koseki:077350  .
+        g2.daikanwa:06802
+              :abstract-glyph-form-of       daikanwa:06802   .
+        repi.daikanwa:06802
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06802 ;
+            .
+        repi.mj:033781
+            a chisegg:glyph-image ;
+            :glyph-image-of mj:033781 ;
+            .
+
+rep.ucs_iso:0x218AF
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x218AF ] ;
+    :denotation-of
+        a.ucs:0x218AF        ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          13 ;
+    ideo:total-strokes    16 ;
+    :subsume
+        g2.ucs_iso:0x218AF   ;
+    .
+    g2.ucs_iso:0x218AF
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x218AF ] ;
+        .
+
 a.ucs:0x218B2
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x218B2 ;
@@ -37957,7 +38506,7 @@ a.ucs:0x218A3
     ] ;
     :eq rep.cns11643-7:0x2D2C     ; # &I-C7-2D2C;
     :eq rep.daikanwa:06806        ; # &I-M-06806;
-    :from.same           [ :sources chisebib:zhonghua-dazidian ,
+    ideo:same-as         [ :sources chisebib:zhonghua-dazidian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:010019        ] ;
     :subsume
@@ -38111,8 +38660,8 @@ a.ucs:0x5B22
     :eq rep.gt:08529              ; # &I-GT-08529;
     :eq rep.gt-pj-1:15982         ; # &I-GT-08529;
     :eq rep.daikanwa...._.p:06807 ; # 嬢
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5B43         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5B43         ] ;
     :subsume
         g2.ucs_unicode:0x5B22 ,
         g2.cns11643-3:0x5056 ;
@@ -40817,7 +41366,7 @@ a.ucs:0x2F86B
     :eq rep.cns11643-7:0x4651     ; # &I-C7-4651;
     :eq rep.shinjigen:1766        ; # 嬾
     :eq rep.cbeta:04165           ; # &I-CB04165;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04606 ] ;
     :subsume
         g2.shinjigen:1766    ,
@@ -41210,6 +41759,38 @@ a.ucs:0x21909
                              :target     ucs:0x21909 ] ;
         .
 
+a.ucs:0x21904
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21904 ;
+    ideo:radical          38 ; # â¼¥ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x4535   # 䔵
+    ] ;
+    .
+
+rep.ucs_iso:0x21904
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21904 ] ;
+    :denotation-of
+        a.ucs:0x21904        ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          16 ;
+    ideo:total-strokes    19 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.cns11643-3:0x5257   # &C3-5257;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x21904   ;
+    .
+    g2.ucs_iso:0x21904
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21904 ] ;
+        .
+
 a.ucs:0x3736
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3736 ;
@@ -42446,21 +43027,57 @@ a.ucs:0x5B4C
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          19 ;
     ideo:total-strokes    22 ;
-    :eq rep.adobe-japan1-5:17519  ; # &I-AJ1-17519;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x470C ; # 䜌
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
+    .
+
+rep.adobe-japan1-5:17519
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-5:17519 ;
+    :denotation-of
+        a.ucs:0x5B4C         ;
+    ideo:radical          38 ; # â¼¥ 
+    ideo:strokes          19 ;
+    ideo:total-strokes    22 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    rep.adobe-japan1-5:18690 ; # &AJ1-18690;
+        isd:below    a.ucs:0x5973   # 女
+    ] ;
+    :eq rep.ucs_unicode:0x5B4C    ; # &AJ1-17519;
     :eq rep.jis-x0212:0x3A3C      ; # &I-JSP-3A3C;
     :eq rep.cns11643-2:0x6D4A     ; # &I-C2-6D4A;
     :eq rep.jis-x0213-2:0x2576    ; # &I-JX2-2576;
-    :eq rep.gb12345:0x662E        ; # 孌
+    :eq rep.gb12345:0x662E        ; # &AJ1-17519;
     :eq a.big5:0xF6DC             ; # &I-B-F6DC;
     :eq rep.daikanwa:06912        ; # &I-M-06912;
     :eq rep.jef-china3:0x48F6     ; # &I-JC3-48F6;
+    :form-of             [ :target  a.ucs:0x5971         ;
+                           :sources chisebib:jiyun ] ,
+                         rep.mj:033743        ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
+                           :target  [ :target  rep.mj:033743        ;
+                                      :sources chisebib:shuowen ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x373B         ;
+                                      :sources chisebib:jiyun ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  rep.adobe-japan1-0:04929 ;
+                                      :sources chisebib:shuowen-zhu ,
+                                               chisebib:daikanwa ] ,
+                                    [ :target  a.ucs:0x5971         ;
+                                      :sources chisebib:guangya ,
+                                               chisebib:jiyun ,
+                                               chisebib:daikanwa ] ] ;
     :subsume
         g2.adobe-japan1-5:17519 ,
         g2.ucs_unicode:0x5B4C ,
         g2.cns11643-2:0x6D4A ;
     .
-    rep.adobe-japan1-5:17519
-               :abstract-glyph-of adobe-japan1-5:17519   .
+    rep.ucs_unicode:0x5B4C
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x5B4C  ] .
     rep.jis-x0212:0x3A3C
                :abstract-glyph-of      jis-x0212:0x3A3C  .
     rep.cns11643-2:0x6D4A
@@ -42761,7 +43378,7 @@ rep.cns11643-3:0x6073
     :eq rep.daikanwa:06920        ; # &I-M-06920;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.adobe-japan1-0:04606 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:04606 ] ;
     :subsume
@@ -42986,13 +43603,46 @@ a.ucs:0x373B
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          23 ;
     ideo:total-strokes    26 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x6200   # 戀
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "reN" ) ;
+                         ] ;
     :eq rep.cns11643-3:0x6162     ; # &I-C3-6162;
     :eq rep.daikanwa:06925        ; # &I-M-06925;
+    ideo:same-as         [ :sources chisebib:jiyun ,
+                                    chisebib:kangxi ,
+                                    chisebib:daikanwa ;
+                           :target  rep.adobe-japan1-5:17519 ] ;
+    :subsume
+        g2.daikanwa:06925    ,
+        g2.ucs_unicode:0x373B ,
+        g2.cns11643-3:0x6162 ;
     .
     rep.cns11643-3:0x6162
                :abstract-glyph-of     cns11643-3:0x6162  .
     rep.daikanwa:06925
                :abstract-glyph-of       daikanwa:06925   .
+    g2.daikanwa:06925
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:06925 ;
+        .
+    g2.ucs_unicode:0x373B
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x373B  ] ;
+        :g2.ucs_JP...hanazono      rdf:nil ;
+        .
+    g2.cns11643-3:0x6162
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x6162 ;
+        :eq g2.ucs_cns:0x373B         ; # &g2-CU+373B;
+        .
+        g2.ucs_cns:0x373B
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x373B  ] .
 
 a.ucs:0x373C
     a chisegg:abstract-character ;
@@ -43030,35 +43680,76 @@ a.ucs:0x2193A
     rep.cns11643-5:0x7A65
                :abstract-glyph-of     cns11643-5:0x7A65  .
 
-rep.daikanwa:06928
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:06928 ;
-    :to.ucs		  a.ucs:0x21939 ; # 𡤹
+a.ucs:0x21939
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21939 ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          24 ;
     ideo:total-strokes    27 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    a.ucs:0x204D7   # 𠓗
+    ] ;
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "haN" ) ;
+                         ] ;
     .
 
-rep.cns11643-7:0x634D
+rep.ucs_iso:0x21939
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of cns11643-7:0x634D ;
-    :to.ucs		  a.ucs:0x21939 ; # 𡤹
-
-    :morohashi-daikanwa	  (6928 0 0) ;
-    ideo:radical          38 ; # â¼¥ 
-    ideo:strokes          24 ;
-    ideo:total-strokes    27 ;
-    .
-
-a.ucs:0x21939
-    a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x21939 ;
-
-    :morohashi-daikanwa	  (6928 0 1) ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21939 ] ;
+    :denotation-of
+        a.ucs:0x21939        ;
     ideo:radical          38 ; # â¼¥ 
     ideo:strokes          24 ;
     ideo:total-strokes    27 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x5973 ; # 女
+        isd:right    rep.ucs_iso:0x204D7   # &C5-7753;
+    ] ;
+    :eq rep.cns11643-7:0x634D     ; # &C7-634D;
+    :eq rep.daikanwa:06928        ; # &I-M-06928;
+    :form-of             rep.cns11643-3:0x4B5F ;
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-3:0x4B5F ] ;
+    :subsume
+        g2.ucs_iso:0x21939   ,
+        g2.cns11643-7:0x634D ;
     .
+    rep.cns11643-7:0x634D
+               :abstract-glyph-of     cns11643-7:0x634D  .
+    rep.daikanwa:06928
+               :abstract-glyph-of       daikanwa:06928   .
+    g2.ucs_iso:0x21939
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21939 ] ;
+        :eq g2.daikanwa:06928         ; # &g2-M-06928;
+        :subsume
+            repi.daikanwa:06928  ,
+            repi.ucs_iso:0x21939 ;
+        .
+        g2.daikanwa:06928
+              :abstract-glyph-form-of       daikanwa:06928   .
+        repi.daikanwa:06928
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:06928 ;
+            .
+        repi.ucs_iso:0x21939
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x21939 ] ;
+            .
+    g2.cns11643-7:0x634D
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-7:0x634D ;
+        :eq g2.ucs_cns:0x21939        ; # &g2-CU+21939;
+        .
+        g2.ucs_cns:0x21939
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x21939 ] .
 
 rep.daikanwa:06929
     a chisegg:abstract-glyph ;