X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R169-Gate.ttl;h=b17733495477c47fc396a8c2b77f0521149f911b;hb=eb648d154c6ff035d462455b1359519c456fff9d;hp=dbbf9e49597b709bd32a29e4ec9a523a4c62c70d;hpb=a947054c7eb3438ee6f2914b147a8cf94c65094c;p=chise%2Fchiset.git

diff --git a/Ideograph-R169-Gate.ttl b/Ideograph-R169-Gate.ttl
index dbbf9e4..b177334 100644
--- a/Ideograph-R169-Gate.ttl
+++ b/Ideograph-R169-Gate.ttl
@@ -24,6 +24,7 @@
 @prefix rep.ucs_unicode: <http://www.chise.org/est/view/character/rep.ucs@unicode=> .
 @prefix rep.ucs_cns: <http://www.chise.org/est/view/character/rep.ucs@cns=> .
 @prefix rep.ucs_jis: <http://www.chise.org/est/view/character/rep.ucs@jis=> .
+@prefix rep.ucs_JP...hanazono: <http://www.chise.org/est/view/character/rep.ucs@JP...hanazono=> .
 @prefix g.ucs_iso: <http://www.chise.org/est/view/character/g.ucs@iso=> .
 @prefix g.ucs_unicode: <http://www.chise.org/est/view/character/g.ucs@unicode=> .
 @prefix g.ucs_cns: <http://www.chise.org/est/view/character/g.ucs@cns=> .
@@ -34,6 +35,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=> .
@@ -89,6 +91,7 @@
 @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 g2.cns11643-5: <http://www.chise.org/est/view/character/g2.cns11643-5=> .
+@prefix repi.cns11643-5: <http://www.chise.org/est/view/character/repi.cns11643-5=> .
 @prefix rep.cns11643-6: <http://www.chise.org/est/view/character/rep.cns11643-6=> .
 @prefix g2.cns11643-6: <http://www.chise.org/est/view/character/g2.cns11643-6=> .
 @prefix repi.cns11643-6: <http://www.chise.org/est/view/character/repi.cns11643-6=> .
@@ -131,6 +134,8 @@
 @prefix rep.gt-pj-1: <http://www.chise.org/est/view/character/rep.gt-pj-1=> .
 @prefix rep.gt-pj-7: <http://www.chise.org/est/view/character/rep.gt-pj-7=> .
 @prefix rep.gt-pj-10: <http://www.chise.org/est/view/character/rep.gt-pj-10=> .
+@prefix rep.gt-pj-k1: <http://www.chise.org/est/view/character/rep.gt-pj-k1=> .
+@prefix g2.gt-pj-k1: <http://www.chise.org/est/view/character/g2.gt-pj-k1=> .
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix rep.daikanwa...._.p: <http://www.chise.org/est/view/character/rep.daikanwa...+p=> .
 @prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
@@ -154,6 +159,9 @@
 @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 repi.ruimoku-v6: <http://www.chise.org/est/view/character/repi.ruimoku-v6=> .
+@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-itaiji-001: <http://www.chise.org/est/view/character/rep.ucs-itaiji-001=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -188,6 +196,7 @@
 @prefix gt-pj-1: <http://rdf.chise.org/data/ccs/gt-pj-1/code-point/> .
 @prefix gt-pj-7: <http://rdf.chise.org/data/ccs/gt-pj-7/code-point/> .
 @prefix gt-pj-10: <http://rdf.chise.org/data/ccs/gt-pj-10/code-point/> .
+@prefix gt-pj-k1: <http://rdf.chise.org/data/ccs/gt-pj-k1/code-point/> .
 @prefix daikanwa: <http://rdf.chise.org/data/ccs/daikanwa/code-point/> .
 @prefix daikanwa...._.p: <http://rdf.chise.org/data/ccs/daikanwa...+p/code-point/> .
 @prefix shinjigen: <http://rdf.chise.org/data/ccs/shinjigen/code-point/> .
@@ -198,6 +207,9 @@
 @prefix cbeta: <http://rdf.chise.org/data/ccs/cbeta/code-point/> .
 @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 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-itaiji-001: <http://rdf.chise.org/data/ccs/ucs-itaiji-001/code-point/> .
 
 a.ucs:0x9580
     a chisegg:abstract-character ;
@@ -343,13 +355,13 @@ a.ucs:0x2ED4
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x2ED4 ;
     :denotation-of
-        a.ucs:0x95E8         ;
+        rep.gb2312:0x4345    ;
     :name                 "CJK RADICAL C-SIMPLIFIED GATE" ;
     :general-category     "(symbol other)" ; # Informative Category
     :bidi-category        "ON" ;
     :mirrored             "nil" ;
     :from.identical      [ :context domain:component ;
-                           :target  a.ucs:0x95E8         ] ;
+                           :target  rep.gb2312:0x4345    ] ;
     .
 
 a.ucs:0x95E8
@@ -358,15 +370,65 @@ a.ucs:0x95E8
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           0 ;
     ideo:total-strokes     3 ;
-    :eq rep.gb2312:0x4345         ; # &I-G0-4345;
+    .
+
+rep.gb2312:0x4345
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gb2312:0x4345 ;
+    :denotation-of
+        a.ucs:0x95E8         ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     3 ;
+    :eq rep.ucs_unicode:0x95E8    ; # &G0-4345;
     :eq rep.big5-cdp:0x896B       ; # &I-CDP-896B;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x9580         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x9580         ] ;
+    :subsume
+        g2.ucs_unicode:0x95E8 ;
     .
-    rep.gb2312:0x4345
-               :abstract-glyph-of         gb2312:0x4345  .
+    rep.ucs_unicode:0x95E8
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x95E8  ] .
     rep.big5-cdp:0x896B
                :abstract-glyph-of       big5-cdp:0x896B  .
+    g2.ucs_unicode:0x95E8
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x95E8  ] ;
+        :eq g2.gb2312:0x4345          ; # &g2-CDP-896B;
+        :eq g2.big5-cdp:0x896B        ; # &g2-CDP-896B;
+        :subsume
+            repi.big5-cdp:0x896B ,
+            repi.ucs_unicode:0x95E8 ;
+        .
+        g2.gb2312:0x4345
+              :abstract-glyph-form-of         gb2312:0x4345  .
+        g2.big5-cdp:0x896B
+              :abstract-glyph-form-of       big5-cdp:0x896B  .
+        repi.big5-cdp:0x896B
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x896B ;
+            .
+        repi.ucs_unicode:0x95E8
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x95E8  ] ;
+            .
+
+rep.ucs-var-001:0x5B80
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x5B80 ;
+    :denotation-of
+        a.ucs:0x95E8         ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           0 ;
+    ideo:total-strokes     3 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x4E36 ; # 丶
+        isd:below    a.ucs:0x5182   # 冂
+    ] ;
+    .
 
 a.ucs:0x9581
     a chisegg:abstract-character ;
@@ -528,8 +590,8 @@ a.ucs:0x95E9
     ideo:strokes           1 ;
     ideo:total-strokes     4 ;
     :eq rep.gb2312:0x6345         ; # &I-G0-6345;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x9582         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x9582         ] ;
     .
     rep.gb2312:0x6345
                :abstract-glyph-of         gb2312:0x6345  .
@@ -717,22 +779,55 @@ a.ucs:0x28CCC
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           2 ;
     ideo:total-strokes    10 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x2011F ; # 𠄟
+        isd:below    a.ucs:0x9580   # 門
+    ] ;
+    :eq rep.cns11643-5:0x3069     ; # &I-C5-3069;
+    :eq rep.big5-cdp:0x8AC9       ; # &I-CDP-8AC9;
+    :eq rep.daikanwa:41215        ; # &I-M-41215;
     :subsume
-        rep.daikanwa:41215   ,
-        rep.ucs_iso:0x28CCC  ;
+        g2.daikanwa:41215    ,
+        g2.ucs_iso:0x28CCC   ;
     .
+    rep.cns11643-5:0x3069
+               :abstract-glyph-of     cns11643-5:0x3069  .
+    rep.big5-cdp:0x8AC9
+               :abstract-glyph-of       big5-cdp:0x8AC9  .
     rep.daikanwa:41215
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:41215 ;
+               :abstract-glyph-of       daikanwa:41215   .
+    g2.daikanwa:41215
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:41215 ;
         .
-    rep.ucs_iso:0x28CCC
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x28CCC ] ;
-        :eq rep.cns11643-5:0x3069     ; # &C5-3069;
+    g2.ucs_iso:0x28CCC
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28CCC ] ;
+        :eq g2.cns11643-5:0x3069      ; # &g2-CDP-8AC9;
+        :eq g2.big5-cdp:0x8AC9        ; # &g2-CDP-8AC9;
+        :subsume
+            repi.big5-cdp:0x8AC9 ,
+            repi.cns11643-5:0x3069 ,
+            repi.ucs_iso:0x28CCC ;
         .
-        rep.cns11643-5:0x3069
-                   :abstract-glyph-of     cns11643-5:0x3069  .
+        g2.cns11643-5:0x3069
+              :abstract-glyph-form-of     cns11643-5:0x3069  .
+        g2.big5-cdp:0x8AC9
+              :abstract-glyph-form-of       big5-cdp:0x8AC9  .
+        repi.big5-cdp:0x8AC9
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8AC9 ;
+            .
+        repi.cns11643-5:0x3069
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-5:0x3069 ;
+            .
+        repi.ucs_iso:0x28CCC
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x28CCC ] ;
+            .
 
 a.ucs:0x9584
     a chisegg:abstract-character ;
@@ -785,7 +880,7 @@ a.ucs:0x28CCF
     :form-of             [ :context domain:shuowen-zhu ;
                            :sources chisebib:shuowen-zhu ,
                                     chisebib:daikanwa ;
-                           :target  rep.daikanwa:41215   ] ;
+                           :target  a.ucs:0x28CCC        ] ;
     :subsume
         rep.ucs_iso:0x28CCF  ,
         rep.cns11643-6:0x3C66 ;
@@ -1086,24 +1181,56 @@ a.ucs:0x28CD0
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           3 ;
     ideo:total-strokes    11 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x5973   # 女
+    ] ;
+    :eq rep.cns11643-5:0x3642     ; # &I-C5-3642;
+    :eq rep.big5-cdp:0x8AD3       ; # &I-CDP-8AD3;
+    :eq rep.daikanwa:41223        ; # &I-M-41223;
     :subsume
-        rep.daikanwa:41223   ,
-        rep.ucs_iso:0x28CD0  ,
-        rep.cns11643-5:0x3642 ;
+        g2.daikanwa:41223    ,
+        g2.ucs_iso:0x28CD0   ,
+        g2.cns11643-5:0x3642 ;
     .
+    rep.cns11643-5:0x3642
+               :abstract-glyph-of     cns11643-5:0x3642  .
+    rep.big5-cdp:0x8AD3
+               :abstract-glyph-of       big5-cdp:0x8AD3  .
     rep.daikanwa:41223
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of daikanwa:41223 ;
+               :abstract-glyph-of       daikanwa:41223   .
+    g2.daikanwa:41223
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of daikanwa:41223 ;
         .
-    rep.ucs_iso:0x28CD0
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x28CD0 ] ;
+    g2.ucs_iso:0x28CD0
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28CD0 ] ;
+        :eq g2.big5-cdp:0x8AD3        ; # &g2-CDP-8AD3;
+        :subsume
+            repi.big5-cdp:0x8AD3 ,
+            repi.ucs_iso:0x28CD0 ;
         .
-    rep.cns11643-5:0x3642
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-5:0x3642 ;
+        g2.big5-cdp:0x8AD3
+              :abstract-glyph-form-of       big5-cdp:0x8AD3  .
+        repi.big5-cdp:0x8AD3
+            a chisegg:glyph-image ;
+            :glyph-image-of big5-cdp:0x8AD3 ;
+            .
+        repi.ucs_iso:0x28CD0
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x28CD0 ] ;
+            .
+    g2.cns11643-5:0x3642
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-5:0x3642 ;
+        :eq g2.ucs_cns:0x28CD0        ; # &g2-CU+28CD0;
         .
+        g2.ucs_cns:0x28CD0
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x28CD0 ] .
 
 a.ucs:0x498D
     a chisegg:abstract-character ;
@@ -1558,8 +1685,8 @@ a.ucs:0x2B52D
         isd:surround a.ucs:0x95E8 ; # 门
         isd:filling  a.ucs:0x5F00   # 开
     ] ;
-    :from.simplified     [ :context domain:CN...component ;
-                           :target  rep.adobe-japan1-0:01417 ] ;
+    ideo:simplified-form-of [ :context domain:CN...component ;
+                              :target  rep.adobe-japan1-0:01417 ] ;
     .
 
 a.ucs:0x5F00
@@ -1590,8 +1717,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 ;
     .
@@ -1709,6 +1836,10 @@ a.ucs:0x28CDB
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           4 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x53CA   # 及
+    ] ;
     .
 
 rep.cns11643-5:0x3D30
@@ -1719,11 +1850,19 @@ rep.cns11643-5:0x3D30
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           4 ;
     ideo:total-strokes    12 ;
-    :eq rep.daikanwa:41236        ; # &C5-3D30;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  rep.mj:007989   # &MJ007989;
+    ] ;
+    :eq rep.ucs_cns:0x28CDB       ; # &C5-3D30;
+    :eq rep.daikanwa:41236        ; # &I-M-41236;
     :subsume
         g2.daikanwa:41236    ,
         g2.cns11643-5:0x3D30 ;
     .
+    rep.ucs_cns:0x28CDB
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x28CDB ] .
     rep.daikanwa:41236
                :abstract-glyph-of       daikanwa:41236   .
     g2.daikanwa:41236
@@ -1748,6 +1887,10 @@ rep.ucs_iso:0x28CDB
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           4 ;
     ideo:total-strokes    12 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x2F836   # 及
+    ] ;
     :subsume
         g2.ucs_iso:0x28CDB   ;
     .
@@ -2063,7 +2206,7 @@ rep.ucs_iso:0x28CDD
         isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
     ] ;
     :eq rep.daikanwa:41243        ; # &M-41243;
-    :from.wrong          [ :context domain:s.:.intercalary ;
+    ideo:wrong-form-of   [ :context domain:s.:.intercalary ;
                            :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x958F         ] ;
@@ -2076,19 +2219,19 @@ rep.ucs_iso:0x28CDD
     g2.daikanwa:41243
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:41243 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
+        ] ;
         .
     g2.ucs_iso:0x28CDD
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x28CDD ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
+        ] ;
         .
 
 a.ucs_cns:0x28CDD
@@ -2149,10 +2292,10 @@ rep.gt:55472
     g2.gt:55472
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:55472 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  rep.adobe-japan1-0:02583   # &AJ1-02583;
+        ] ;
         :eq g2.ucs_cns:0x28CDD        ; # &g2-GT-55472;
         :eq g2.jis-x0208_1978...1pr:0x313C ; # &g2-GT-55472;
         :eq g2.cns11643-3:0x3F6D      ; # &g2-GT-55472;
@@ -2651,7 +2794,7 @@ a.ucs:0x9593
     :eq rep.gt-pj-1:13398         ; # &I-GT-55457;
     :eq rep.daikanwa:41249        ; # &I-M-41249;
     :eq rep.shinjigen:8802        ; # 間
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x9592         ] ;
     :subsume
@@ -3174,18 +3317,18 @@ a.ucs:0x9596
     g2.daikanwa...._.p:41260
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa...._.p:41260 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  g2.ucs_unicode:0x6C34   # &g2-AJ1-02603;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  g2.ucs_unicode:0x6C34   # &g2-AJ1-02603;
+        ] ;
         .
     g2.adobe-japan1-0:07064
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of adobe-japan1-0:07064 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  g2.ucs_unicode:0x6C34   # &g2-AJ1-02603;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  g2.ucs_unicode:0x6C34   # &g2-AJ1-02603;
+        ] ;
         :eq g2.ucs_jis:0x9596         ; # &g2-AJ1-07064;
         :eq g2.jis-x0208:0x6F5D       ; # &g2-AJ1-07064;
         :eq g2.jis-x0213-1:0x6F5D     ; # &g2-AJ1-07064;
@@ -3285,10 +3428,77 @@ a.ucs:0x95F4
     ideo:radical         169 ; # ⾨ 
     ideo:strokes           4 ;
     ideo:total-strokes     7 ;
-    :eq rep.gb2312:0x3C64         ; # &I-G0-3C64;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x95E8 ; # 门
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
+    .
+
+rep.ucs-itaiji-001:0x95F4
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-itaiji-001:0x95F4 ;
+    :denotation-of
+        a.ucs:0x95F4         ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround rep.ucs-var-001:0x5B80 ; # &U-v001+5B80;
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
+    .
+
+rep.gb2312:0x3C64
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gb2312:0x3C64 ;
+    :denotation-of
+        a.ucs:0x95F4         ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround rep.gb2312:0x4345 ; # &G0-4345;
+        isd:filling  a.ucs:0x65E5   # 日
+    ] ;
+    :eq rep.ucs_unicode:0x95F4    ; # &G0-3C64;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x9593         ] ;
+    :subsume
+        g2.ucs_unicode:0x95F4 ;
+    .
+    rep.ucs_unicode:0x95F4
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x95F4  ] .
+    g2.ucs_unicode:0x95F4
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x95F4  ] ;
+        :eq g2.gb2312:0x3C64          ; # &g2-UU+95F4;
+        .
+        g2.gb2312:0x3C64
+              :abstract-glyph-form-of         gb2312:0x3C64  .
+
+rep.gt-k:03214
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of gt-k:03214 ;
+    :denotation-of
+        a.ucs:0x95F4         ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    :eq rep.gt-pj-k1:16239        ; # &GT-K03214;
+    :subsume
+        g2.gt-k:03214        ;
     .
-    rep.gb2312:0x3C64
-               :abstract-glyph-of         gb2312:0x3C64  .
+    rep.gt-pj-k1:16239
+               :abstract-glyph-of       gt-pj-k1:16239   .
+    g2.gt-k:03214
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of gt-k:03214 ;
+        :eq g2.gt-pj-k1:16239         ; # &g2-GT-K03214;
+        .
+        g2.gt-pj-k1:16239
+              :abstract-glyph-form-of       gt-pj-k1:16239   .
 
 a.ucs:0x95F5
     a chisegg:abstract-character ;
@@ -3496,7 +3706,7 @@ a.ucs:0x9599
     :eq rep.gt-pj-1:28511         ; # &I-GT-55511;
     :eq rep.daikanwa:41264        ; # &I-M-41264;
     :eq rep.shinjigen:9494        ; # 閙
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x9B27         ] ;
     :subsume
         g2.daikanwa:41264    ,
@@ -4474,8 +4684,8 @@ a.ucs:0x95A2
     :eq rep.gt-pj-1:13400         ; # &I-GT-55529;
     :eq rep.daikanwa:41297        ; # &I-M-41297;
     :eq rep.shinjigen:8812        ; # 関
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x95DC         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x95DC         ] ;
     :subsume
         g2.daikanwa:41297    ,
         g2.adobe-japan1-0:01556 ,
@@ -4581,9 +4791,9 @@ a.ucs:0x2F9EE
     ideo:total-strokes    14 ;
     :eq rep.cns11643-6:0x6358     ; # &I-C6-6358;
     :eq rep.daikanwa:41298        ; # &I-M-41298;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ;
-                           :target  rep.adobe-japan1-0:01417 ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.adobe-japan1-0:01417 ] ;
     :subsume
         g2.daikanwa:41298    ,
         g2.ucs_iso:0x2F9EE   ;
@@ -6388,7 +6598,7 @@ a.ucs:0x95B2
     :eq rep.gt-k:11892            ; # &I-GT-K11892;
     :eq rep.gt-pj-1:12636         ; # &I-GT-55563;
     :eq rep.daikanwa...._.p:41341 ; # 閲
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.daikanwa:41341   ] ;
     .
     rep.adobe-japan1-0:01278
@@ -6873,10 +7083,10 @@ a.ucs:0x2B522
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2B522 ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  a.ucs:0x4E32   # 串
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  a.ucs:0x4E32   # 串
+        ] ;
         :eq g2.ruimoku-v6:0xE01D      ; # &g2-IU-0002B522;
         :subsume
             repi.ucs_iso:0x2B522 ,
@@ -8167,9 +8377,9 @@ rep.ucs_iso:0x2F9EF
     rep.daikanwa:41396
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:41396 ;
-        :from.original       [ :sources chisebib:zhengzitong ,
-                                        chisebib:daikanwa ;
-                               :target  rep.daikanwa:41290   ] ;
+        ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                         chisebib:daikanwa ;
+                                :target  rep.daikanwa:41290   ] ;
         .
     a.ucs:0x2F9EF
         a chisegg:abstract-character ;
@@ -8310,7 +8520,7 @@ rep.ucs_iso:0x2F9F0
     rep.daikanwa:49838
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:49838 ;
-        :from.wrong          [ :sources chisebib:daikanwa ;
+        ideo:wrong-form-of   [ :sources chisebib:daikanwa ;
                                :target  rep.daikanwa:41407   ] ;
         .
     a.ucs:0x2F9F0
@@ -8988,10 +9198,10 @@ a.ucs:0x95C7
     g2.daikanwa:41421
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:41421 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
+        ] ;
         .
     g2.ucs_unicode:0x95C7
         a chisegg:abstract-glyph-form ;
@@ -9000,10 +9210,10 @@ a.ucs:0x95C7
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x95C7         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  g2.ucs_unicode:0x97F3   # &g2-AJ1-01339;
+        ] ;
         :eq g2.adobe-japan1-0:01163   ; # &g2-AJ1-01163;
         :eq g2.ks-x1001:0x6461        ; # &g2-AJ1-01163;
         :eq g2.jis-x0208:0x3047       ; # &g2-AJ1-01163;
@@ -9068,10 +9278,10 @@ a.ucs:0x95C7
     g2.shinjigen:8829
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of shinjigen:8829 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  rep.gt:58108   # &GT-58108;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  rep.gt:58108   # &GT-58108;
+        ] ;
         .
 
 a.ucs:0x28D69
@@ -9966,9 +10176,9 @@ a.ucs:0x28D7B
     isd:structure [ a idc:⿵ ;
         isd:surround a.ucs:0x9580 ; # 門
         isd:filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x722B ; # 爫
-                :below    a.ucs:0x65E7   # 旧
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x722B ; # 爫
+                isd:below    a.ucs:0x65E7   # 旧
             ]
         ]
     ] ;
@@ -9986,9 +10196,9 @@ rep.ucs_iso:0x28D7B
     isd:structure [ a idc:⿵ ;
         isd:surround a.ucs:0x9580 ; # 門
         isd:filling  [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x2EA4 ; # ⺤
-                :below    a.ucs:0x65E7   # 旧
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x2EA4 ; # ⺤
+                isd:below    a.ucs:0x65E7   # 旧
             ]
         ]
     ] ;
@@ -10014,6 +10224,38 @@ rep.ucs_iso:0x28D7B
             :form-of             a.ucs:0x95BB         ;
             .
 
+a.ucs:0x28D7F
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28D7F ;
+    ideo:radical         169 ; # ⾨ 
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x221C2   # 𢇂
+    ] ;
+    .
+
+rep.ucs_iso:0x28D7F
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28D7F ] ;
+    :denotation-of
+        a.ucs:0x28D7F        ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes           9 ;
+    ideo:total-strokes    17 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  rep.ucs_iso:0x221C2   # &U-000221C2;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28D7F   ;
+    .
+    g2.ucs_iso:0x28D7F
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28D7F ] ;
+        .
+
 a.ucs:0x28D80
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x28D80 ;
@@ -10270,19 +10512,19 @@ rep.jis-x0212:0x663A
     g2.daikanwa:41450
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:41450 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  rep.daikanwa:28634   # &M-28634;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  rep.daikanwa:28634   # &M-28634;
+        ] ;
         .
     g2.ucs_jis:0x95D2
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:jis     ;
                                   :target     ucs:0x95D2  ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  rep.daikanwa:28634   # &M-28634;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  rep.daikanwa:28634   # &M-28634;
+        ] ;
         :eq g2.jis-x0212:0x663A       ; # &g2-JSP-663A;
         .
         g2.jis-x0212:0x663A
@@ -10923,8 +11165,8 @@ a.ucs:0x95D8
     :eq rep.gt-pj-1:17966         ; # &I-GT-61399;
     :eq rep.daikanwa...._.p:45649 ; # 闘
     :eq rep.shinjigen:9497        ; # 闘
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.jis-x0213-1:0x7E3F ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.jis-x0213-1:0x7E3F ] ;
     .
     rep.adobe-japan1-0:03206
                :abstract-glyph-of adobe-japan1-0:03206   .
@@ -10978,8 +11220,8 @@ a.ucs:0x28D9A
     ] ;
     :eq rep.cns11643-7:0x4447     ; # &I-C7-4447;
     :eq rep.daikanwa:49840        ; # &I-M-49840;
-    :from.original       [ :sources chisebib:daikanwa ;
-                           :target  a.ucs:0x95DC         ] ;
+    ideo:original-form-of [ :sources chisebib:daikanwa ;
+                            :target  a.ucs:0x95DC         ] ;
     :subsume
         g2.daikanwa:49840    ,
         repi.hng-kar:13730   ,
@@ -10992,10 +11234,10 @@ a.ucs:0x28D9A
     g2.daikanwa:49840
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:49840 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  g2.ucs_iso:0x221C5   # &g2-IU-000221C5;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  g2.ucs_iso:0x221C5   # &g2-IU-000221C5;
+        ] ;
         .
     repi.hng-kar:13730
         a chisegg:glyph-image ;
@@ -11096,6 +11338,38 @@ rep.hanziku-11:0xD672
     ideo:total-strokes    18 ;
     .
 
+a.ucs:0x28D98
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28D98 ;
+    ideo:radical         169 ; # ⾨ 
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x22045   # 𢁅
+    ] ;
+    .
+
+rep.ucs_iso:0x28D98
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28D98 ] ;
+    :denotation-of
+        a.ucs:0x28D98        ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    18 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  rep.ucs-var-002:0x22045   # &U-v002+22045;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28D98   ;
+    .
+    g2.ucs_iso:0x28D98
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28D98 ] ;
+        .
+
 a.ucs:0x95D9
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x95D9 ;
@@ -11539,6 +11813,68 @@ a.ucs:0x961A
     rep.gb2312:0x635B
                :abstract-glyph-of         gb2312:0x635B  .
 
+a.ucs:0x28DAA
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x28DAA ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  a.ucs:0x7FCF   # 翏
+    ] ;
+    .
+
+rep.ucs_JP...hanazono:0x28DAA
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:JP...hanazono ;
+                         :target     ucs:0x28DAA ] ;
+    :denotation-of
+        a.ucs:0x28DAA        ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  rep.adobe-japan1-5:18400   # &AJ1-18400;
+    ] ;
+    :subsume
+        g2.ucs_JP...hanazono:0x28DAA ;
+    .
+    g2.ucs_JP...hanazono:0x28DAA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:JP...hanazono ;
+                                  :target     ucs:0x28DAA ] ;
+        :subsume
+            rep.hanziku-11:0xD6F6 ;
+        .
+        rep.hanziku-11:0xD6F6
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-11:0xD6F6 ;
+            .
+
+rep.ucs_iso:0x28DAA
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x28DAA ] ;
+    :denotation-of
+        a.ucs:0x28DAA        ;
+    ideo:radical         169 ; # ⾨ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿵ ;
+        isd:surround a.ucs:0x9580 ; # 門
+        isd:filling  rep.cns11643-2:0x3841   # &C2-3841;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x28DAA   ;
+    .
+    g2.ucs_iso:0x28DAA
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x28DAA ] ;
+        .
+
 rep.daikanwa:41478
     a chisegg:abstract-glyph ;
     :abstract-glyph-of daikanwa:41478 ;
@@ -12461,19 +12797,19 @@ rep.jis-x0212:0x6642
     g2.daikanwa:41506
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:41506 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  rep.gt-k:10416   # &GT-K10416;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  rep.gt-k:10416   # &GT-K10416;
+        ] ;
         .
     g2.ucs_jis:0x95E4
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:jis     ;
                                   :target     ucs:0x95E4  ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  rep.gt-k:10416   # &GT-K10416;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  rep.gt-k:10416   # &GT-K10416;
+        ] ;
         :eq g2.jis-x0212:0x6642       ; # &g2-JSP-6642;
         .
         g2.jis-x0212:0x6642
@@ -12597,10 +12933,10 @@ rep.adobe-japan1-0:07085
     g2.daikanwa:41508
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of daikanwa:41508 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
-        isd:filling  g2.adobe-japan1-4:13912   # &g2-AJ1-13912;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.daikanwa:41208 ; # &g2-M-41208;
+            isd:filling  g2.adobe-japan1-4:13912   # &g2-AJ1-13912;
+        ] ;
         .
     g2.adobe-japan1-0:07085
         a chisegg:abstract-glyph-form ;
@@ -12608,10 +12944,10 @@ rep.adobe-japan1-0:07085
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x95E5         ,
                                         a.ucs:0xE0101        ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  g2.adobe-japan1-4:13912   # &g2-AJ1-13912;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  g2.adobe-japan1-4:13912   # &g2-AJ1-13912;
+        ] ;
         :eq g2.ucs_jis:0x95E5         ; # &g2-AJ1-07085;
         :eq g2.jis-x0208:0x6F72       ; # &g2-AJ1-07085;
         :eq g2.jis-x0213-1:0x6F72     ; # &g2-AJ1-07085;
@@ -12674,10 +13010,10 @@ rep.cns11643-2:0x6C59
     g2.cns11643-2:0x6C59
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of cns11643-2:0x6C59 ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  g2.cns11643-1:0x672E   # &g2-CU+9054;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  g2.cns11643-1:0x672E   # &g2-CU+9054;
+        ] ;
         :eq g2.ucs_cns:0x95E5         ; # &g2-CU+95E5;
         .
         g2.ucs_cns:0x95E5
@@ -12720,10 +13056,10 @@ rep.gt:55771
         :rep.decomposition   [ :context domain:hanyo-denshi ;
                                :target  a.ucs:0x95E5         ,
                                         a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:⿵ ;
-        isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
-        isd:filling  g2.mj:026060   # &g2-MJ026060;
-    ] ;
+        isd:structure [ a idc:⿵ ;
+            isd:surround g2.ucs_unicode:0x9580 ; # &g2-AJ1-03827;
+            isd:filling  g2.mj:026060   # &g2-MJ026060;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb12345:0x634B         ; # &g2-HD-FT-3A5D;
         :eq g2.hanyo-denshi...ft:0x3A5D ; # &g2-HD-FT-3A5D;
@@ -12762,8 +13098,8 @@ a.ucs:0x95FC
     ideo:strokes           6 ;
     ideo:total-strokes     9 ;
     :eq rep.gb2312:0x634B         ; # &I-G0-634B;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gt:55771         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gt:55771         ] ;
     .
     rep.gb2312:0x634B
                :abstract-glyph-of         gb2312:0x634B  .