X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R172-Short-Tailed-Bird.ttl;h=9353ffe928eb9bd71df2af3f40f6a4a0beb5ed86;hb=70865e670200282d01aa9cba0e20a366a7d57a57;hp=9e15ab521c70f435e7903eeed97a064d67974fe3;hpb=3b1a2d01fa4a54cef5ea4436773f3a285f61ca69;p=chise%2Fchiset.git

diff --git a/Ideograph-R172-Short-Tailed-Bird.ttl b/Ideograph-R172-Short-Tailed-Bird.ttl
index 9e15ab5..9353ffe 100644
--- a/Ideograph-R172-Short-Tailed-Bird.ttl
+++ b/Ideograph-R172-Short-Tailed-Bird.ttl
@@ -14,6 +14,7 @@
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_cognate: <http://www.chise.org/est/view/character/a.ucs@cognate=> .
 @prefix a.ucs_component: <http://www.chise.org/est/view/character/a.ucs@component=> .
 @prefix a.ucs_unicode: <http://www.chise.org/est/view/character/a.ucs@unicode=> .
 @prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
@@ -33,6 +34,7 @@
 @prefix g2.ucs_jis...1990: <http://www.chise.org/est/view/character/g2.ucs@jis...1990=> .
 @prefix g2.ucs_jis...2000: <http://www.chise.org/est/view/character/g2.ucs@jis...2000=> .
 @prefix g2.ucs_jis...2004: <http://www.chise.org/est/view/character/g2.ucs@jis...2004=> .
+@prefix g2.ucs_JP...hanazono: <http://www.chise.org/est/view/character/g2.ucs@JP...hanazono=> .
 @prefix g2.ucs_ks: <http://www.chise.org/est/view/character/g2.ucs@ks=> .
 @prefix repi.ucs_iso: <http://www.chise.org/est/view/character/repi.ucs@iso=> .
 @prefix repi.ucs_unicode: <http://www.chise.org/est/view/character/repi.ucs@unicode=> .
@@ -42,6 +44,7 @@
 @prefix rep.adobe-japan1-0: <http://www.chise.org/est/view/character/rep.adobe-japan1-0=> .
 @prefix rep.adobe-japan1-4: <http://www.chise.org/est/view/character/rep.adobe-japan1-4=> .
 @prefix rep.adobe-japan1-5: <http://www.chise.org/est/view/character/rep.adobe-japan1-5=> .
+@prefix rep.adobe-japan1-6: <http://www.chise.org/est/view/character/rep.adobe-japan1-6=> .
 @prefix g2.adobe-japan1-0: <http://www.chise.org/est/view/character/g2.adobe-japan1-0=> .
 @prefix g2.adobe-japan1-4: <http://www.chise.org/est/view/character/g2.adobe-japan1-4=> .
 @prefix rep.jis-x0208: <http://www.chise.org/est/view/character/rep.jis-x0208=> .
@@ -148,6 +151,7 @@
 @prefix rep.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
 @prefix g2.ruimoku-v6: <http://www.chise.org/est/view/character/g2.ruimoku-v6=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
+@prefix rep.ucs-var-001: <http://www.chise.org/est/view/character/rep.ucs-var-001=> .
 @prefix rep.ucs-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 @prefix rep.ucs-itaiji-002: <http://www.chise.org/est/view/character/rep.ucs-itaiji-002=> .
 
@@ -156,6 +160,7 @@
 @prefix adobe-japan1-0: <http://rdf.chise.org/data/ccs/adobe-japan1-0/code-point/> .
 @prefix adobe-japan1-4: <http://rdf.chise.org/data/ccs/adobe-japan1-4/code-point/> .
 @prefix adobe-japan1-5: <http://rdf.chise.org/data/ccs/adobe-japan1-5/code-point/> .
+@prefix adobe-japan1-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/code-point/> .
 @prefix jis-x0208: <http://rdf.chise.org/data/ccs/jis-x0208/code-point/> .
 @prefix gb2312: <http://rdf.chise.org/data/ccs/gb2312/code-point/> .
 @prefix ks-x1001: <http://rdf.chise.org/data/ccs/ks-x1001/code-point/> .
@@ -172,7 +177,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-6: <http://rdf.chise.org/data/ccs/adobe-japan1-6/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/> .
@@ -196,6 +200,7 @@
 @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 iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
+@prefix ucs-var-001: <http://rdf.chise.org/data/ccs/ucs-var-001/code-point/> .
 @prefix ucs-itaiji-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/> .
 
@@ -377,9 +382,13 @@ rep.cns11643-6:0x3C70
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           2 ;
     ideo:total-strokes    10 ;
+    :eq rep.ucs_cns:0x28F85       ; # &C6-3C70;
     :subsume
         g2.cns11643-6:0x3C70 ;
     .
+    rep.ucs_cns:0x28F85
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28F85 ] .
     g2.cns11643-6:0x3C70
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x3C70 ;
@@ -394,7 +403,7 @@ a.ucs_component:0x96BA
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x96BA  ] ;
     ideo:radical         172 ; # ⾫ 
-    :eq a.iwds-1:0304             ; # &IWDS1-304;
+    :eq a.iwds-1:0304             ; # &A-compU+96BA;
     .
     a.iwds-1:0304
            :abstract-character-of         iwds-1:0304    .
@@ -819,7 +828,7 @@ a.ucs:0x96BD
     :eq rep.daikanwa:41945        ; # &I-M-41945;
     :eq rep.shinjigen:8957        ; # 隽
     :eq rep.cbeta:05014           ; # &I-CB05014;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x96CB         ] ;
     :subsume
         g2.ucs_unicode:0x96BD ;
@@ -1003,7 +1012,7 @@ a.ucs:0x96BF
     :eq rep.cns11643-2:0x3A30     ; # &I-C2-3A30;
     :eq a.big5:0xD84C             ; # &I-B-D84C;
     :eq rep.daikanwa:41950        ; # &I-M-41950;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5F0B         ] ;
     :subsume
@@ -1118,13 +1127,25 @@ a.ucs:0x96C0
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x96C0 ;
     ideo:radical         172 ; # ⾫ 
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs_component:0x23942 ; # &A-compU+23942;
+        isd:below    a.ucs:0x96B9   # 隹
+    ] ;
+    .
+
+rep.adobe-japan1-0:02627
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-0:02627 ;
+    :denotation-of
+        a.ucs:0x96C0         ;
+    ideo:radical         172 ; # ⾫ 
     ideo:strokes           3 ;
     ideo:total-strokes    11 ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x5C11 ; # 少
         isd:below    a.ucs:0x96B9   # 隹
     ] ;
-    :eq rep.adobe-japan1-0:02627  ; # &I-AJ1-02627;
+    :eq rep.ucs_unicode:0x96C0    ; # &AJ1-02627;
     :eq rep.jis-x0208:0x3F7D      ; # &I-J90-3F7D;
     :eq rep.gb2312:0x4838         ; # &I-G0-4838;
     :eq rep.ks-x1001:0x6D4D       ; # &I-K0-6D4D;
@@ -1135,13 +1156,14 @@ a.ucs:0x96C0
     :eq rep.gt-k:07803            ; # &I-GT-K07803;
     :eq rep.gt-pj-1:16253         ; # &I-GT-56369;
     :eq rep.daikanwa:41954        ; # &I-M-41954;
-    :eq rep.shinjigen:8942        ; # 雀
+    :eq rep.shinjigen:8942        ; # &AJ1-02627;
     :subsume
         g2.adobe-japan1-0:02627 ,
         g2.ucs_unicode:0x96C0 ;
     .
-    rep.adobe-japan1-0:02627
-               :abstract-glyph-of adobe-japan1-0:02627   .
+    rep.ucs_unicode:0x96C0
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x96C0  ] .
     rep.jis-x0208:0x3F7D
                :abstract-glyph-of      jis-x0208:0x3F7D  .
     rep.gb2312:0x4838
@@ -1258,6 +1280,20 @@ a.ucs:0x96C0
                               :target     ucs:0x96C0  ] ;
             .
 
+rep.ucs-var-001:0x96C0
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x96C0 ;
+    :denotation-of
+        a.ucs:0x96C0         ;
+    ideo:radical         172 ; # ⾫ 
+    ideo:strokes           2 ;
+    ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x23942 ; # 𣥂
+        isd:below    a.ucs:0x96B9   # 隹
+    ] ;
+    .
+
 a.ucs:0x28F91
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x28F91 ;
@@ -1333,9 +1369,9 @@ rep.ucs_iso:0x28F8F
     rep.cns11643-6:0x4630
                :abstract-glyph-of     cns11643-6:0x4630  .
 
-rep.mj:058978
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of mj:058978 ;
+a.ucs:0x2E976
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2E976 ;
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           3 ;
     ideo:total-strokes    11 ;
@@ -1348,17 +1384,20 @@ rep.mj:058978
         ] ;
         isd:overlaying a.ucs:0x96B9   # 隹
     ] ;
-    :eq rep.koseki:475830         ; # &MJ058978;
+    :eq rep.mj:058978             ; # &I-MJ058978;
+    :eq rep.koseki:475830         ; # 𮥶
     :eq rep.gt:56364              ; # &I-GT-56364;
     :eq rep.gt-k:08651            ; # &I-GT-K08651;
     :eq rep.gt-pj-9:19531         ; # &I-GT-56364;
     :form-of             [ :sources chisebib:koseki ;
                            :target  rep.jis-x0213-2:0x7B73 ] ;
-    :from.simplified     [ :context domain:component ;
-                           :target  rep.jis-x0212:0x6676 ] ;
+    ideo:simplified-form-of [ :context domain:component ;
+                              :target  rep.jis-x0212:0x6676 ] ;
     :subsume
         g2.mj:058978         ;
     .
+    rep.mj:058978
+               :abstract-glyph-of             mj:058978  .
     rep.koseki:475830
                :abstract-glyph-of         koseki:475830  .
     rep.gt:56364
@@ -1370,6 +1409,7 @@ rep.mj:058978
     g2.mj:058978
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of mj:058978 ;
+        :eq g2.ucs_JP...hanazono:0x2E976 ; # &g2-MJ058978;
         :eq g2.koseki:475830          ; # &g2-MJ058978;
         :eq g2.gt:56364               ; # &g2-MJ058978;
         :eq g2.gt-k:08651             ; # &g2-MJ058978;
@@ -1377,6 +1417,9 @@ rep.mj:058978
             repi.mj:058978       ,
             repi.gt:56364        ;
         .
+        g2.ucs_JP...hanazono:0x2E976
+              :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                        :target     ucs:0x2E976 ] .
         g2.koseki:475830
               :abstract-glyph-form-of         koseki:475830  .
         g2.gt:56364
@@ -1833,9 +1876,13 @@ rep.cns11643-6:0x502B
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           4 ;
     ideo:total-strokes    12 ;
+    :eq rep.ucs_cns:0x28F99       ; # &C6-502B;
     :subsume
         g2.cns11643-6:0x502B ;
     .
+    rep.ucs_cns:0x28F99
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28F99 ] .
     g2.cns11643-6:0x502B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-6:0x502B ;
@@ -1910,7 +1957,7 @@ rep.cns11643-2:0x414B
     :eq rep.ucs_unicode:0x96C3    ; # &C2-414B;
     :eq a.big5:0xDCA6             ; # &I-B-DCA6;
     :eq rep.daikanwa:41971        ; # &I-M-41971;
-    :from.wrong          [ :sources chisebib:zhengzitong ,
+    ideo:wrong-form-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:42015   ] ;
     :subsume
@@ -2825,7 +2872,7 @@ a.ucs:0x96C8
     :eq rep.cns11643-2:0x414A     ; # &I-C2-414A;
     :eq a.big5:0xDCA5             ; # &I-B-DCA5;
     :eq rep.daikanwa:41980        ; # &I-M-41980;
-    :to.mistakable       [ :sources chisebib:zhonghua-dazidian ;
+    ideo:mistakable      [ :sources chisebib:zhonghua-dazidian ;
                            :target  rep.daikanwa:32021   ,
                                     rep.cns11643-2:0x3F60 ] ;
     :subsume
@@ -4127,7 +4174,7 @@ a.ucs:0x49FA
     :eq rep.jis-x0213-2:0x7B70    ; # &I-JX2-7B70;
     :eq rep.daikanwa:42004        ; # &I-M-42004;
     :eq rep.shinjigen:8950        ; # 䧺
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x96C4         ] ;
     :subsume
         g2.ucs_unicode:0x49FA ;
@@ -4439,24 +4486,59 @@ a.ucs:0x96D0
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x864D ; # 虍
+        isd:filling  a.ucs:0x96B9   # 隹
+    ] ;
+    :eq rep.cns11643-3:0x4A47     ; # &I-C3-4A47;
+    :eq rep.big5-cdp:0x8D73       ; # &I-CDP-8D73;
+    :eq rep.daikanwa:42016        ; # &I-M-42016;
     :subsume
-        rep.daikanwa:42016   ,
-        rep.ucs_unicode:0x96D0 ,
-        rep.cns11643-3:0x4A47 ;
+        g2.ucs_unicode:0x96D0 ,
+        g2.cns11643-3:0x4A47 ;
     .
+    rep.cns11643-3:0x4A47
+               :abstract-glyph-of     cns11643-3:0x4A47  .
+    rep.big5-cdp:0x8D73
+               :abstract-glyph-of       big5-cdp:0x8D73  .
     rep.daikanwa:42016
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:42016 ;
-        .
-    rep.ucs_unicode:0x96D0
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:unicode ;
-                             :target     ucs:0x96D0  ] ;
+               :abstract-glyph-of       daikanwa:42016   .
+    g2.ucs_unicode:0x96D0
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x96D0  ] ;
+        :eq g2.big5-cdp:0x8D73        ; # &g2-CDP-8D73;
+        :eq g2.daikanwa:42016         ; # &g2-CDP-8D73;
+        :subsume
+            repi.daikanwa:42016  ,
+            repi.big5-cdp:0x8D73 ,
+            repi.ucs_unicode:0x96D0 ;
         .
-    rep.cns11643-3:0x4A47
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-3:0x4A47 ;
+        g2.big5-cdp:0x8D73
+              :abstract-glyph-form-of       big5-cdp:0x8D73  .
+        g2.daikanwa:42016
+              :abstract-glyph-form-of       daikanwa:42016   .
+        repi.daikanwa:42016
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:42016 ;
+            .
+        repi.big5-cdp:0x8D73
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8D73 ;
+            .
+        repi.ucs_unicode:0x96D0
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x96D0  ] ;
+            .
+    g2.cns11643-3:0x4A47
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-3:0x4A47 ;
+        :eq g2.ucs_cns:0x96D0         ; # &g2-CU+96D0;
         .
+        g2.ucs_cns:0x96D0
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x96D0  ] .
 
 a.ucs:0x28FB6
     a chisegg:abstract-character ;
@@ -4596,8 +4678,8 @@ a.ucs:0x96D1
     :eq rep.gt-pj-1:15144         ; # &I-GT-56442;
     :eq rep.daikanwa:42022        ; # &I-M-42022;
     :eq rep.shinjigen:8961        ; # 雑
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x96DC         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x96DC         ] ;
     :subsume
         g2.adobe-japan1-0:02166 ,
         g2.ucs_unicode:0x96D1 ;
@@ -4931,6 +5013,10 @@ a.ucs:0x28FC1
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x244F3 ; # 𤓳
+        isd:right    a.ucs:0x96B9   # 隹
+    ] ;
     .
 
 rep.daikanwa:42030
@@ -4941,6 +5027,10 @@ rep.daikanwa:42030
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     rep.daikanwa:19658 ; # &M-19658;
+        isd:right    a.ucs:0x96B9   # 隹
+    ] ;
     .
 
 rep.ucs_iso:0x28FC1
@@ -4952,6 +5042,10 @@ rep.ucs_iso:0x28FC1
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     rep.ucs_iso:0x244F3 ; # &C6-284E;
+        isd:right    a.ucs:0x96B9   # 隹
+    ] ;
     :eq rep.cns11643-5:0x4A7D     ; # &C5-4A7D;
     :subsume
         g2.ucs_iso:0x28FC1   ,
@@ -4979,6 +5073,10 @@ a.ucs:0x28FC2
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x4EFB ; # ä»»
+        isd:right    a.ucs:0x96B9   # 隹
+    ] ;
     .
 
 rep.ucs_iso:0x28FC2
@@ -5015,9 +5113,13 @@ rep.cns11643-4:0x482B
     ideo:radical         172 ; # ⾫ 
     ideo:strokes           6 ;
     ideo:total-strokes    14 ;
+    :eq rep.ucs_cns:0x28FC2       ; # &C4-482B;
     :subsume
         g2.cns11643-4:0x482B ;
     .
+    rep.ucs_cns:0x28FC2
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28FC2 ] .
     g2.cns11643-4:0x482B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-4:0x482B ;
@@ -5877,8 +5979,8 @@ rep.ucs_iso:0x28FE1
     :eq rep.cns11643-4:0x5455     ; # &C4-5455;
     :eq rep.daikanwa:42058        ; # &I-M-42058;
     :eq rep.shinjigen:9707        ; # &C4-5455;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:07387 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:07387 ] ;
     :subsume
         g2.ucs_iso:0x28FE1   ;
     .
@@ -6200,8 +6302,8 @@ a.ucs:0x49FF
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:42070 ;
         :eq rep.shinjigen:9705        ; # &M-42070;
-        :from.original       [ :sources chisebib:shinjigen ;
-                               :target  a.ucs:0x9D72         ] ;
+        ideo:original-form-of [ :sources chisebib:shinjigen ;
+                                :target  a.ucs:0x9D72         ] ;
         .
         rep.shinjigen:9705
                    :abstract-glyph-of      shinjigen:9705    .
@@ -6810,15 +6912,15 @@ a.ucs:0x28FF3
         rep.daikanwa:42081
             a chisegg:abstract-glyph ;
             :abstract-glyph-of daikanwa:42081 ;
-            :from.original       [ :sources chisebib:kangxi ,
-                                            chisebib:daikanwa ;
-                                   :target  rep.big5-cdp:0x8BD2  ] ;
+            ideo:original-form-of [ :sources chisebib:kangxi ,
+                                             chisebib:daikanwa ;
+                                    :target  rep.big5-cdp:0x8BD2  ] ;
             .
         rep.daikanwa:49854
             a chisegg:abstract-glyph ;
             :abstract-glyph-of daikanwa:49854 ;
-            :from.original       [ :sources chisebib:daikanwa ;
-                                   :target  a.ucs:0x9DF9         ] ;
+            ideo:original-form-of [ :sources chisebib:daikanwa ;
+                                    :target  a.ucs:0x9DF9         ] ;
             .
         repi.mj:052611
             a chisegg:glyph-image ;
@@ -6938,7 +7040,7 @@ a.ucs:0x28FFD
     :eq rep.cns11643-7:0x352E     ; # &I-C7-352E;
     :eq rep.daikanwa:42086        ; # &I-M-42086;
     :eq rep.shinjigen:7252        ; # 𨿽
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x96D6         ] ;
     :subsume
         g2.ucs_iso:0x28FFD   ;
@@ -8032,6 +8134,10 @@ a.ucs:0x96D7
     ideo:radical         172 ; # ⾫ 
     ideo:strokes          10 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x501D ; # 倝
+        isd:filling  a.ucs:0x96B9   # 隹
+    ] ;
     .
 
 rep.cns11643-2:0x643C
@@ -8042,6 +8148,10 @@ rep.cns11643-2:0x643C
     ideo:radical         172 ; # ⾫ 
     ideo:strokes          10 ;
     ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.adobe-japan1-6:21127 ; # &AJ1-21127;
+        isd:filling  a.ucs:0x96B9   # 隹
+    ] ;
     :eq rep.ucs_cns:0x96D7        ; # &C2-643C;
     :eq a.big5:0xF170             ; # &I-B-F170;
     :eq rep.daikanwa:42111        ; # &I-M-42111;
@@ -8976,8 +9086,8 @@ a.ucs:0x96DD
     :eq rep.daikanwa:42123        ; # &I-M-42123;
     :eq rep.shinjigen:8960        ; # 雝
     :eq rep.jef-china3:0x8EBC     ; # &I-JC3-8EBC;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x96CD         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x96CD         ] ;
     :subsume
         g2.ucs_unicode:0x96DD ;
     .
@@ -9081,8 +9191,8 @@ rep.jis-x0213-1:0x7D62
     :eq rep.daikanwa:42124        ; # &I-M-42124;
     :eq rep.shinjigen:9700        ; # &JX1-7D62;
     :eq rep.jef-china3:0x6BFC     ; # &I-JC3-6BFC;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:07396 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:07396 ] ;
     :subsume
         g2.ucs_jis:0x96DE    ;
     .
@@ -9415,7 +9525,7 @@ rep.daikanwa:42129
     :sound               [ :context domain:ja...on ;
                            :target  ( "baku" ) ;
                          ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:47248   ] ;
     .
@@ -10022,34 +10132,30 @@ a.ucs:0x4A04
     ideo:total-strokes    19 ;
     .
 
-a.ucs:0x96E3
+a.ucs_cognate:0x96E3
     a chisegg:abstract-character ;
-    :abstract-character-of ucs:0x96E3 ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x96E3  ] ;
     ideo:radical         172 ; # ⾫ 
     .
 
-a.ucs_iwds-1:0x96E3
+a.ucs:0x96E3
     a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:iwds-1  ;
-                             :target     ucs:0x96E3  ] ;
+    :abstract-character-of ucs:0x96E3 ;
     :denotation-of
-        a.ucs:0x96E3         ;
+        a.ucs_cognate:0x96E3 ;
     ideo:radical         172 ; # ⾫ 
     isd:structure [ a idc:â¿° ;
         isd:left     a.ucs:0x26C29 ; # 𦰩
         isd:right    a.ucs:0x96B9   # 隹
     ] ;
-    :eq a.ucs_unicode:0x96E3      ; # &A-IWDSU+96E3;
     .
-    a.ucs_unicode:0x96E3
-           :abstract-character-of [ :context domain:unicode ;
-                                    :target     ucs:0x96E3  ] .
 
 a.ucs:0xFA68
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0xFA68 ;
     :denotation-of
-        a.ucs_iwds-1:0x96E3  ;
+        a.ucs:0x96E3         ;
     :to.canonical-ucs	a.ucs:0x96E3 ; # 難
     ideo:radical         172 ; # ⾫ 
     ideo:strokes          11 ;
@@ -10164,7 +10270,7 @@ rep.adobe-japan1-0:03273
     a chisegg:abstract-glyph ;
     :abstract-glyph-of adobe-japan1-0:03273 ;
     :denotation-of
-        a.ucs_iwds-1:0x96E3  ;
+        a.ucs:0x96E3         ;
     ideo:radical         172 ; # ⾫ 
     ideo:strokes          10 ;
     ideo:total-strokes    18 ;
@@ -10178,8 +10284,8 @@ rep.adobe-japan1-0:03273
     :eq rep.hanyo-denshi...ja:0x4671 ; # &I-HD-JA-4671;
     :eq rep.gt:56577              ; # &I-GT-56577;
     :eq rep.gt-pj-1:18033         ; # &I-GT-56577;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0xFA68         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0xFA68         ] ;
     :subsume
         g2.adobe-japan1-0:03273 ,
         repi.hng-khi:06110   ,
@@ -10257,7 +10363,7 @@ rep.hanyo-denshi...ib:0x2A3E
     a chisegg:abstract-glyph ;
     :abstract-glyph-of hanyo-denshi...ib:0x2A3E ;
     :denotation-of
-        a.ucs:0x96E3         ;
+        a.ucs_cognate:0x96E3 ;
     ideo:radical         172 ; # ⾫ 
     ideo:strokes          11 ;
     ideo:total-strokes    19 ;
@@ -11987,8 +12093,8 @@ a.ucs:0x96E7
     :eq rep.cns11643-3:0x622F     ; # &I-C3-622F;
     :eq rep.daikanwa:42205        ; # &I-M-42205;
     :eq rep.shinjigen:8948        ; # 雧
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x96C6         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x96C6         ] ;
     :subsume
         g2.ucs_unicode:0x96E7 ,
         g2.cns11643-3:0x622F ;