X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R007-Two.ttl;h=63545cfee65fa276f3246cb523b3f7505db5b24c;hb=0778a1702c0ec73c63f24372496cd7e253f4c654;hp=061cc39774da46ab8c138e4783e621a588561052;hpb=c69ee590ba4de3510d03f6777579e08c920bc603;p=chise%2Fchiset.git

diff --git a/Ideograph-R007-Two.ttl b/Ideograph-R007-Two.ttl
index 061cc39..63545cf 100644
--- a/Ideograph-R007-Two.ttl
+++ b/Ideograph-R007-Two.ttl
@@ -14,6 +14,8 @@
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
 @prefix bucs: <http://www.chise.org/est/view/character/a2.ucs@bucs=> .
+@prefix a.ucs_iwds-1: <http://www.chise.org/est/view/character/a.ucs@iwds-1=> .
+@prefix a.ucs_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 rep.ucs_iso: <http://www.chise.org/est/view/character/rep.ucs@iso=> .
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
@@ -24,6 +26,7 @@
 @prefix g2.ucs_unicode: <http://www.chise.org/est/view/character/g2.ucs@unicode=> .
 @prefix g2.ucs_cns: <http://www.chise.org/est/view/character/g2.ucs@cns=> .
 @prefix g2.ucs_jis: <http://www.chise.org/est/view/character/g2.ucs@jis=> .
+@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=> .
 @prefix repi.ucs_ks: <http://www.chise.org/est/view/character/repi.ucs@ks=> .
 @prefix rep.mj: <http://www.chise.org/est/view/character/rep.mj=> .
@@ -59,6 +62,8 @@
 @prefix repi.cns11643-4: <http://www.chise.org/est/view/character/repi.cns11643-4=> .
 @prefix rep.cns11643-5: <http://www.chise.org/est/view/character/rep.cns11643-5=> .
 @prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
+@prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
+@prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
 @prefix g2.jis-x0213-1: <http://www.chise.org/est/view/character/g2.jis-x0213-1=> .
 @prefix repi.jis-x0213-1: <http://www.chise.org/est/view/character/repi.jis-x0213-1=> .
@@ -115,8 +120,8 @@
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
 @prefix a.iwds-1: <http://www.chise.org/est/view/character/a.iwds-1=> .
 @prefix rep.ucs-var-003: <http://www.chise.org/est/view/character/rep.ucs-var-003=> .
-@prefix rep.ucs-bmp-var-003: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-003=> .
 @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=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -170,8 +175,8 @@
 @prefix jef-china3: <http://rdf.chise.org/data/ccs/jef-china3/code-point/> .
 @prefix iwds-1: <http://rdf.chise.org/data/ccs/iwds-1/code-point/> .
 @prefix ucs-var-003: <http://rdf.chise.org/data/ccs/ucs-var-003/code-point/> .
-@prefix ucs-bmp-var-003: <http://rdf.chise.org/data/ccs/ucs-bmp-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/> .
 
 bucs:0x4E8C
     a chisegg:super-abstract-character ;
@@ -187,7 +192,7 @@ a.ucs:0x4E8C
         bucs:0x4E8C          ;
     :from.denotational_component
         a.ucs_component:0x4E8C ,
-        a.ucs_component:0x4EA0 ;
+        a.ucs:0x4EA0         ;
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           0 ;
     ideo:total-strokes     2 ;
@@ -423,7 +428,7 @@ a.ucs:0x2011E
     :eq rep.gt:00328              ; # &I-GT-00328;
     :eq rep.gt-pj-2:12844         ; # &I-GT-00328;
     :eq rep.daikanwa:00248        ; # &I-M-00248;
-    :from.ancient        [ :sources chisebib:zhengzitong ,
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4E0A         ] ;
     .
@@ -449,7 +454,7 @@ a.ucs:0x2011F
     :eq rep.gt-k:00155            ; # &I-GT-K00155;
     :eq rep.gt-pj-2:12845         ; # &I-GT-00327;
     :eq rep.daikanwa:00249        ; # &I-M-00249;
-    :from.ancient        [ :sources chisebib:zhengzitong ,
+    ideo:ancient-form-of [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x4E0B         ] ;
     .
@@ -721,16 +726,16 @@ a.ucs:0x4E8E
             :glyph-image-of hng-gok:04790 ;
             .
 
-a.ucs_component:0x4E8F
+a.ucs_iwds-1:0x4E8F
     a chisegg:abstract-character ;
-    :abstract-character-of [ :context domain:component ;
+    :abstract-character-of [ :context domain:iwds-1  ;
                              :target     ucs:0x4E8F  ] ;
     :denotation-of
         bucs:0x4E8E          ;
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           1 ;
     ideo:total-strokes     3 ;
-    :eq a.iwds-1:0093             ; # &IWDS1-093;
+    :eq a.iwds-1:0093             ; # &A-IWDSU+4E8F;
     .
     a.iwds-1:0093
            :abstract-character-of         iwds-1:0093    .
@@ -739,7 +744,7 @@ a.ucs:0x4E8F
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E8F ;
     :denotation-of
-        a.ucs_component:0x4E8F ;
+        a.ucs_iwds-1:0x4E8F  ;
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           1 ;
     ideo:total-strokes     3 ;
@@ -755,10 +760,10 @@ a.ucs:0x4E8F
     :eq rep.gt-pj-2:12848         ; # &I-GT-00332;
     :eq rep.daikanwa:00253        ; # &I-M-00253;
     :eq rep.shinjigen:0076        ; # 亏
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen ;
-                           :target  a.ucs:0x4E8E         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen ;
+                            :target  a.ucs:0x4E8E         ] ;
     .
     rep.gb2312:0x3F77
                :abstract-glyph-of         gb2312:0x3F77  .
@@ -779,7 +784,7 @@ a.ucs:0x4E90
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x4E90 ;
     :denotation-of
-        a.ucs_component:0x4E8F ;
+        a.ucs_iwds-1:0x4E8F  ;
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           1 ;
     ideo:total-strokes     3 ;
@@ -1156,9 +1161,9 @@ rep.adobe-japan1-0:01939
             :glyph-image-of hng-kar:00020 ;
             .
 
-rep.ucs-bmp-var-003:0x4E92
+rep.ucs-var-003:0x4E92
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of ucs-bmp-var-003:0x4E92 ;
+    :abstract-glyph-of ucs-var-003:0x4E92 ;
     :denotation-of
         a.ucs:0x4E92         ;
     ideo:radical           7 ; # ⼆ 
@@ -1168,10 +1173,7 @@ rep.ucs-bmp-var-003:0x4E92
         isd:above    a.ucs:0x4E00 ; # 一
         isd:below    rep.ucs-itaiji-001:0x5F51   # &U-i001+5F51;
     ] ;
-    :eq rep.ucs-var-003:0x4E92    ; # &U-v003+4E92;
     .
-    rep.ucs-var-003:0x4E92
-               :abstract-glyph-of    ucs-var-003:0x4E92  .
 
 a.ucs:0x4E93
     a chisegg:abstract-character ;
@@ -1566,8 +1568,8 @@ a.ucs:0x5F00
     :eq rep.cns11643-4:0x214D     ; # &I-C4-214D;
     :eq rep.jis-x0213-1:0x7431    ; # &I-JX1-7431;
     :eq rep.big5-cdp:0x8B6F       ; # &I-CDP-8B6F;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:01417 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:01417 ] ;
     :subsume
         g2.ucs_unicode:0x5F00 ;
     .
@@ -1736,16 +1738,46 @@ a.ucs:0x4E98
     rep.cbeta:00040
                :abstract-glyph-of          cbeta:00040   .
 
+a.ucs_cognate:0x20122
+    a chisegg:abstract-character ;
+    :abstract-character-of [ :context domain:cognate ;
+                             :target     ucs:0x20122 ] ;
+    ideo:radical           7 ; # ⼆ 
+    .
+
 a.ucs:0x20122
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x20122 ;
+    :denotation-of
+        a.ucs_cognate:0x20122 ;
+    ideo:radical           7 ; # ⼆ 
+    :sound               [ :context domain:ja...on ;
+                           :target  ( "seN" ) ;
+                         ] ;
+    :eq a.iwds-1:0130             ; # 𠄢
+    .
+    a.iwds-1:0130
+           :abstract-character-of         iwds-1:0130    .
+
+rep.ucs_iso:0x20122
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x20122 ] ;
+    :denotation-of
+        a.ucs:0x20122        ;
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           4 ;
     ideo:total-strokes     6 ;
-    :eq rep.cns11643-6:0x2565     ; # &I-C6-2565;
+    :eq rep.cns11643-6:0x2565     ; # &GT-00354;
     :eq rep.gt:00354              ; # &I-GT-00354;
     :eq rep.gt-pj-2:12853         ; # &I-GT-00354;
     :eq rep.daikanwa:00263        ; # &I-M-00263;
+    ideo:original-form-of [ :sources chisebib:kangxi ,
+                                     chisebib:daikanwa ;
+                            :target  a.ucs:0x4E98         ] ;
+    :subsume
+        g2.cns11643-6:0x2565 ,
+        g2.ucs_iso:0x20122   ;
     .
     rep.cns11643-6:0x2565
                :abstract-glyph-of     cns11643-6:0x2565  .
@@ -1755,6 +1787,64 @@ a.ucs:0x20122
                :abstract-glyph-of        gt-pj-2:12853   .
     rep.daikanwa:00263
                :abstract-glyph-of       daikanwa:00263   .
+    g2.cns11643-6:0x2565
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-6:0x2565 ;
+        :eq g2.ucs_cns:0x20122        ; # &g2-M-00263;
+        :eq g2.daikanwa:00263         ; # &g2-M-00263;
+        :subsume
+            repi.daikanwa:00263  ,
+            repi.cns11643-6:0x2565 ,
+            repi.gt:00354        ;
+        .
+        g2.ucs_cns:0x20122
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x20122 ] .
+        g2.daikanwa:00263
+              :abstract-glyph-form-of       daikanwa:00263   .
+        repi.daikanwa:00263
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00263 ;
+            .
+        repi.cns11643-6:0x2565
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2565 ;
+            .
+        repi.gt:00354
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00354 ;
+            .
+    g2.ucs_iso:0x20122
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x20122 ] ;
+        :eq g2.gt:00354               ; # &g2-GT-00354;
+        :subsume
+            repi.ucs_iso:0x20122 ;
+        .
+        g2.gt:00354
+              :abstract-glyph-form-of             gt:00354   .
+        repi.ucs_iso:0x20122
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x20122 ] ;
+            .
+
+rep.ucs-itaiji-001:0x20122
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x20122 ;
+    :denotation-of
+        a.ucs_cognate:0x20122 ;
+    ideo:radical           7 ; # ⼆ 
+    ideo:strokes           6 ;
+    ideo:total-strokes     8 ;
+    isd:structure [ a idc:â¿´ ;
+        isd:surround a.ucs:0x4E8C ; # 二
+        isd:filling  rep.ucs-itaiji-002:0x56DE   # &U-i002+56DE;
+    ] ;
+    :form-of             [ :context domain:component ;
+                           :target  a.ucs:0x20122        ] ;
+    .
 
 a.ucs:0x20123
     a chisegg:abstract-character ;
@@ -1781,10 +1871,10 @@ a.ucs:0x20123
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20123 ] ;
         ideo:hanyu-dazidian  ( 1 19 4 ) ;
-    isd:structure [ a idc:â¿´ ;
-        isd:surround a.ucs:0x4E8C ; # 二
-        isd:filling  rep.big5-cdp:0x87EC   # &CDP-87EC;
-    ] ;
+        isd:structure [ a idc:â¿´ ;
+            isd:surround a.ucs:0x4E8C ; # 二
+            isd:filling  rep.big5-cdp:0x87EC   # &CDP-87EC;
+        ] ;
         :eq rep.cns11643-6:0x2348     ; # &C6-2348;
         :eq rep.hanziku-1:0xA7EE      ; # &I-HZK01-A7EE;
         .
@@ -1862,10 +1952,10 @@ a.ucs:0x20124
         a chisegg:abstract-glyph ;
         :abstract-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x20124 ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    rep.adobe-japan1-0:03246 ; # &AJ1-03246;
-        isd:below    a.ucs:0x4E8C   # 二
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    rep.adobe-japan1-0:03246 ; # &AJ1-03246;
+            isd:below    a.ucs:0x4E8C   # 二
+        ] ;
         :eq rep.cns11643-6:0x2349     ; # &GT-00349;
         :eq rep.gt:00349              ; # &I-GT-00349;
         :eq rep.gt-pj-2:12855         ; # &I-GT-00349;
@@ -2001,10 +2091,10 @@ a.ucs:0x4E9B
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x4E9B         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x6B64 ; # &g2-AJ1-02065;
-        isd:below    a.ucs:0x4E8C   # 二
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x6B64 ; # &g2-AJ1-02065;
+            isd:below    a.ucs:0x4E8C   # 二
+        ] ;
         :eq g2.adobe-japan1-0:02083   ; # &g2-AJ1-02083;
         :eq g2.gb2312:0x5029          ; # &g2-AJ1-02083;
         :eq g2.ks-x1001:0x5E41        ; # &g2-AJ1-02083;
@@ -2080,10 +2170,10 @@ a.ucs:0x4E9B
         :abstract-glyph-form-of cns11643-1:0x4B68 ;
         ideo:strokes           6 ;
         ideo:total-strokes     8 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x483A ; # &g2-CU+6B64;
-        isd:below    a.ucs:0x4E8C   # 二
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x483A ; # &g2-CU+6B64;
+            isd:below    a.ucs:0x4E8C   # 二
+        ] ;
         :eq g2.ucs_cns:0x4E9B         ; # &g2-CU+4E9B;
         .
         g2.ucs_cns:0x4E9B
@@ -2111,7 +2201,7 @@ rep.gt:00353
     ideo:total-strokes     7 ;
     :eq rep.gt-pj-2:12857         ; # &GT-00353;
     :eq rep.daikanwa:00269        ; # &I-M-00269;
-    :from.ancient        [ :sources chisebib:shuowen ,
+    ideo:ancient-form-of [ :sources chisebib:shuowen ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6046         ] ;
     :form-of             [ :context domain:shuowen ;
@@ -2175,44 +2265,88 @@ a.ucs:0x20025
 a.ucs:0x2F803
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2F803 ;
+    :denotation-of
+        a.ucs:0x20122        ;
     :to.canonical-ucs	a.ucs:0x20122 ; # 𠄢
     ideo:radical           7 ; # ⼆ 
     ideo:strokes           5 ;
     ideo:total-strokes     7 ;
+    ideo:hanyu-dazidian  ( 1 21 4 ) ;
+    isd:structure [ a idc:â¿´ ;
+        isd:surround a.ucs:0x4E8C ; # 二
+        isd:filling  a.ucs:0x56D8   # 囘
+    ] ;
+    :eq rep.cns11643-6:0x2566     ; # &I-C6-2566;
+    :eq rep.gt:00356              ; # &I-GT-00356;
+    :eq rep.gt-k:03016            ; # &I-GT-K03016;
+    :eq rep.gt-pj-2:12859         ; # &I-GT-00356;
+    :eq rep.daikanwa:00271        ; # &I-M-00271;
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
+                                    chisebib:daikanwa ;
+                           :target  a.ucs:0x4E98         ] ;
     :subsume
-        rep.gt:00356         ,
-        rep.ucs_iso:0x2F803  ;
+        g2.gt:00356          ,
+        g2.ucs_iso:0x2F803   ;
     .
+    rep.cns11643-6:0x2566
+               :abstract-glyph-of     cns11643-6:0x2566  .
     rep.gt:00356
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of gt:00356 ;
-        :eq rep.gt-k:03016            ; # &I-GT-K03016;
-        :eq rep.gt-pj-2:12859         ; # &GT-00356;
-        :eq rep.daikanwa:00271        ; # &I-M-00271;
+               :abstract-glyph-of             gt:00356   .
+    rep.gt-k:03016
+               :abstract-glyph-of           gt-k:03016   .
+    rep.gt-pj-2:12859
+               :abstract-glyph-of        gt-pj-2:12859   .
+    rep.daikanwa:00271
+               :abstract-glyph-of       daikanwa:00271   .
+    g2.gt:00356
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt:00356 ;
+        :eq g2.gt-k:03016             ; # &g2-GT-00356;
+        :eq g2.daikanwa:00271         ; # &g2-GT-00356;
+        :subsume
+            repi.daikanwa:00271  ,
+            repi.gt:00356        ;
         .
-        rep.gt-k:03016
-                   :abstract-glyph-of           gt-k:03016   .
-        rep.gt-pj-2:12859
-                   :abstract-glyph-of        gt-pj-2:12859   .
-        rep.daikanwa:00271
-                   :abstract-glyph-of       daikanwa:00271   .
-    rep.ucs_iso:0x2F803
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x2F803 ] ;
-        ideo:hanyu-dazidian  ( 1 21 4 ) ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    a.ucs:0x4E00 ; # 一
-        isd:middle   rep.hanziku-2:0xE47C ; # &HZK02-E47C;
-        isd:below    a.ucs:0x4E00   # 一
-    ] ;
-        :eq rep.cns11643-6:0x2566     ; # &C6-2566;
-        :eq rep.hanziku-1:0xA86F      ; # &I-HZK01-A86F;
+        g2.gt-k:03016
+              :abstract-glyph-form-of           gt-k:03016   .
+        g2.daikanwa:00271
+              :abstract-glyph-form-of       daikanwa:00271   .
+        repi.daikanwa:00271
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:00271 ;
+            .
+        repi.gt:00356
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:00356 ;
+            :eq repi.gt-k:03016           ; # &R-GT-00356;
+            .
+            repi.gt-k:03016
+                          :glyph-image-of           gt-k:03016   .
+    g2.ucs_iso:0x2F803
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2F803 ] ;
+        :eq g2.cns11643-6:0x2566      ; # &g2-IU-0002F803;
+        :subsume
+            repi.cns11643-6:0x2566 ,
+            repi.ucs_iso:0x2F803 ,
+            rep.hanziku-1:0xA86F ;
         .
-        rep.cns11643-6:0x2566
-                   :abstract-glyph-of     cns11643-6:0x2566  .
+        g2.cns11643-6:0x2566
+              :abstract-glyph-form-of     cns11643-6:0x2566  .
+        repi.cns11643-6:0x2566
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-6:0x2566 ;
+            .
+        repi.ucs_iso:0x2F803
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2F803 ] ;
+            .
         rep.hanziku-1:0xA86F
-                   :abstract-glyph-of      hanziku-1:0xA86F  .
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-1:0xA86F ;
+            .
 
 bucs:0x4E9E
     a chisegg:super-abstract-character ;
@@ -2243,8 +2377,8 @@ a.ucs:0x4E9C
     :eq rep.gt-pj-1:12321         ; # &I-GT-00350;
     :eq rep.daikanwa:00272        ; # &I-M-00272;
     :eq rep.shinjigen:0084        ; # 亜
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x4E9E         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x4E9E         ] ;
     .
     rep.adobe-japan1-0:01125
                :abstract-glyph-of adobe-japan1-0:01125   .
@@ -2278,8 +2412,8 @@ a.ucs:0x4E9A
     ideo:hanyu-dazidian  ( 1 17 14 ) ;
     :eq rep.gb2312:0x5147         ; # &I-G0-5147;
     :eq rep.big5-cdp:0x89B7       ; # &I-CDP-89B7;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x4E9E         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x4E9E         ] ;
     .
     rep.gb2312:0x5147
                :abstract-glyph-of         gb2312:0x5147  .
@@ -2555,9 +2689,9 @@ a.ucs:0x2012E
     isd:structure [ a idc:⿳ ;
         isd:above    a.ucs:0x4E00 ; # 一
         isd:middle   [
-            :structure [ a idc:â¿° ;
-                :left     a.ucs:0x5E7A ; # 幺
-                :right    a.ucs:0x5E7A   # 幺
+            isd:structure [ a idc:â¿° ;
+                isd:left     a.ucs:0x5E7A ; # 幺
+                isd:right    a.ucs:0x5E7A   # 幺
             ]
         ] ;
         isd:below    a.ucs:0x4E00   # 一
@@ -2834,10 +2968,10 @@ a.ucs:0x20130
         a chisegg:abstract-glyph ;
         :abstract-glyph-of gt:00366 ;
         ideo:hanyu-dazidian  ( 1 25 4 ) ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E8C ; # 二
-        isd:below    a.ucs:0x211C2   # 𡇂
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E8C ; # 二
+            isd:below    a.ucs:0x211C2   # 𡇂
+        ] ;
         :eq rep.gt-pj-2:12865         ; # &GT-00366;
         :eq rep.daikanwa:00280        ; # &I-M-00280;
         :eq rep.hanziku-1:0xA952      ; # &I-HZK01-A952;
@@ -3026,10 +3160,10 @@ a.ucs:0x2013F
         a chisegg:detailed-glyph ;
         :detailed-glyph-of [ :context domain:iso     ;
                              :target     ucs:0x2013F ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E8C ; # 二
-        isd:below    a.jis-x0208:0x5423   # &G-MJ008868;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    a.ucs:0x4E8C ; # 二
+            isd:below    a.jis-x0208:0x5423   # &G-MJ008868;
+        ] ;
         :eq g.daikanwa:00285          ; # &G-IU+2013F;
         :subsume
             g2.daikanwa:00285    ,
@@ -3040,10 +3174,10 @@ a.ucs:0x2013F
         g2.daikanwa:00285
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of daikanwa:00285 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E8C ; # 二
-        isd:below    g2.adobe-japan1-4:13528   # &g2-AJ1-13528;
-    ] ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E8C ; # 二
+                isd:below    g2.adobe-japan1-4:13528   # &g2-AJ1-13528;
+            ] ;
             :subsume
                 repi.daikanwa:00285  ,
                 rep.hanziku-1:0xA9A1 ;
@@ -3060,10 +3194,10 @@ a.ucs:0x2013F
             a chisegg:abstract-glyph-form ;
             :abstract-glyph-form-of [ :context domain:iso     ;
                                       :target     ucs:0x2013F ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    a.ucs:0x4E8C ; # 二
-        isd:below    g2.mj:008868   # &g2-MJ008868;
-    ] ;
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x4E8C ; # 二
+                isd:below    g2.mj:008868   # &g2-MJ008868;
+            ] ;
             .
     g2.gt:00373
         a chisegg:abstract-glyph-form ;
@@ -3075,7 +3209,7 @@ a.ucs_component:0x4E8C
     :abstract-character-of [ :context domain:component ;
                              :target     ucs:0x4E8C  ] ;
     ideo:radical           7 ; # ⼆ 
-    :eq a.iwds-1:0047             ; # &IWDS1-047;
+    :eq a.iwds-1:0047             ; # &A-compU+4E8C;
     .
     a.iwds-1:0047
            :abstract-character-of         iwds-1:0047    .