- Use `ideo:original-form-of' instead of `:from.original'.
[chise/chiset.git] / Ideograph-R040-Roof.ttl
index 2e38ebd..2de6151 100644 (file)
@@ -7,6 +7,7 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
 @prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 @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-bmp-var-003: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-003=> .
-@prefix rep.ucs-sip-var-003: <http://www.chise.org/est/view/character/rep.ucs-sip-var-003=> .
+@prefix rep.ucs-var-004: <http://www.chise.org/est/view/character/rep.ucs-var-004=> .
 @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 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-bmp-var-003: <http://rdf.chise.org/data/ccs/ucs-bmp-var-003/code-point/> .
-@prefix ucs-sip-var-003: <http://rdf.chise.org/data/ccs/ucs-sip-var-003/code-point/> .
+@prefix ucs-var-004: <http://rdf.chise.org/data/ccs/ucs-var-004/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/> .
 @prefix ucs-itaiji-004: <http://rdf.chise.org/data/ccs/ucs-itaiji-004/code-point/> .
@@ -424,10 +423,10 @@ a.ucs:0x3749
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x3749  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:below    g2.ucs_unicode:0x4E00   # &g2-AJ1-01200;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:below    g2.ucs_unicode:0x4E00   # &g2-AJ1-01200;
+        ] ;
         :subsume
             repi.ucs_unicode:0x3749 ;
         .
@@ -1338,7 +1337,7 @@ rep.ucs_iso:0x219C8
     ideo:total-strokes     6 ;
     :eq rep.cns11643-6:0x2447     ; # &C6-2447;
     :eq rep.daikanwa:07068        ; # &I-M-07068;
-    :from.same           [ :sources chisebib:pianhai-leibian ,
+    ideo:same-as         [ :sources chisebib:pianhai-leibian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5B87         ] ;
     :subsume
@@ -1388,7 +1387,7 @@ a.ucs:0x2F86C
     ideo:total-strokes     6 ;
     :eq rep.cns11643-6:0x2448     ; # &I-C6-2448;
     :eq rep.daikanwa:07069        ; # &I-M-07069;
-    :from.Small-Seal     [ :sources chisebib:zhengzitong ,
+    ideo:Small-Seal-of   [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5B87         ] ;
     :subsume
@@ -2699,9 +2698,9 @@ rep.adobe-japan1-6:21432
     :eq rep.jis-x0212:0x3A4C      ; # &I-JSP-3A4C;
     :eq rep.daikanwa:07089        ; # &I-M-07089;
     :eq rep.shinjigen_rev:1817    ; # &AJ1-21432;
-    :from.original       [ :sources chisebib:daikanwa ,
-                                    chisebib:shinjigen_rev ;
-                           :target  rep.adobe-japan1-0:01619 ] ;
+    ideo:original-form-of [ :sources chisebib:daikanwa ,
+                                     chisebib:shinjigen_rev ;
+                            :target  rep.adobe-japan1-0:01619 ] ;
     :subsume
         g2.ucs_unicode:0x5B90 ;
     .
@@ -2781,8 +2780,8 @@ rep.cns11643-4:0x225B
         isd:below    rep.adobe-japan1-0:04779   # &AJ1-04779;
     ] ;
     :eq rep.shinjigen_1ed:1817    ; # &C4-225B;
-    :from.original       [ :sources chisebib:shinjigen_1ed ;
-                           :target  rep.adobe-japan1-0:01619 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen_1ed ;
+                            :target  rep.adobe-japan1-0:01619 ] ;
     :subsume
         g2.cns11643-4:0x225B ;
     .
@@ -3042,6 +3041,99 @@ repi.hng-khm:02830
     :form-of             a.ucs:0x5B9A         ;
     .
 
+a.ucs:0x2BCB8
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2BCB8 ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    .
+
+rep.ucs-var-001:0x2BCB8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-001:0x2BCB8 ;
+    :denotation-of
+        a.ucs:0x2BCB8        ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x5B80 ; # 宀
+        isd:below    a.ucs:0x4E2F   # 丯
+    ] ;
+    .
+
+rep.ucs_iso:0x2BCB8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x2BCB8 ] ;
+    :denotation-of
+        a.ucs:0x2BCB8        ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x5B80 ; # 宀
+        isd:below    rep.mj:006350   # &MJ006350;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2BCB8   ,
+        rep.ucs-var-002:0x2BCB8 ;
+    .
+    g2.ucs_iso:0x2BCB8
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2BCB8 ] ;
+        .
+    rep.ucs-var-002:0x2BCB8
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of ucs-var-002:0x2BCB8 ;
+        .
+
+rep.ucs-var-003:0x2BCB8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-003:0x2BCB8 ;
+    :denotation-of
+        a.ucs:0x2BCB8        ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x5B80 ; # 宀
+        isd:below    rep.mj:006351   # &MJ006351;
+    ] ;
+    .
+
+rep.ucs-var-004:0x2BCB8
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of ucs-var-004:0x2BCB8 ;
+    :denotation-of
+        a.ucs:0x2BCB8        ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:⿱ ;
+        isd:above    a.ucs:0x5B80 ; # 宀
+        isd:below    a.ucs:0x9FB6   # 龶
+    ] ;
+    .
+
+rep.big5-cdp:0x8BF6
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of big5-cdp:0x8BF6 ;
+    :denotation-of
+        a.ucs:0x2BCB8        ;
+    ideo:radical          40 ; # ⼧ 
+    ideo:strokes           4 ;
+    ideo:total-strokes     7 ;
+    :subsume
+        g2.big5-cdp:0x8BF6   ;
+    .
+    g2.big5-cdp:0x8BF6
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of big5-cdp:0x8BF6 ;
+        .
+
 a.ucs:0x5B93
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x5B93 ;
@@ -4396,13 +4488,13 @@ rep.gt:08924
     ideo:total-strokes     8 ;
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x5B80 ; # 宀
-        isd:below    rep.ucs-bmp-var-003:0x4E92   # &U-v003+4E92;
+        isd:below    rep.ucs-var-003:0x4E92   # &U-v003+4E92;
     ] ;
     :eq rep.ucs_cns:0x5B90        ; # &GT-08924;
     :eq rep.cns11643-4:0x2625     ; # &GT-08924;
     :eq rep.gt-pj-2:29274         ; # &I-GT-08924;
     :eq rep.daikanwa:07112        ; # &I-M-07112;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.adobe-japan1-0:01619 ] ;
     :subsume
         g2.gt:08924          ;
@@ -4530,10 +4622,10 @@ a.ucs:0x5B9D
     :eq rep.gt-pj-1:19061         ; # &I-GT-08946;
     :eq rep.daikanwa:07122        ; # &I-M-07122;
     :eq rep.shinjigen:1825        ; # 宝
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04638 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04638 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04638 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04638 ] ;
     :subsume
         g2.ucs_unicode:0x5B9D ;
     .
@@ -4641,8 +4733,8 @@ a.ucs:0x5B9E
     :eq rep.cns11643-3:0x284B     ; # &I-C3-284B;
     :eq rep.daikanwa:07123        ; # &I-M-07123;
     :eq rep.jef-china3:0x81C6     ; # &I-JC3-81C6;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:04632 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:04632 ] ;
     :subsume
         g2.ucs_unicode:0x5B9E ,
         g2.cns11643-3:0x284B ;
@@ -4709,8 +4801,8 @@ a.ucs:0x5B9F
     :eq rep.gt-pj-1:15426         ; # &I-GT-08931;
     :eq rep.daikanwa:07124        ; # &I-M-07124;
     :eq rep.shinjigen:1818        ; # 実
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04632 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04632 ] ;
     :subsume
         g2.ucs_unicode:0x5B9F ;
     .
@@ -6149,8 +6241,8 @@ a.ucs:0x5BAA
     ideo:total-strokes     9 ;
     :eq rep.gb2312:0x4F5C         ; # &I-G0-4F5C;
     :eq rep.daikanwa:07148        ; # &I-M-07148;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_iso:0x2F8AC  ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_iso:0x2F8AC  ] ;
     :subsume
         g2.ucs_unicode:0x5BAA ;
     .
@@ -7022,7 +7114,7 @@ a.ucs:0x21A03
     :eq rep.cns11643-4:0x2C44     ; # &I-C4-2C44;
     :eq rep.daikanwa:07161        ; # &I-M-07161;
     :form-of             rep.mj:025914        ;
-    :from.same           [ :sources chisebib:yupian ,
+    ideo:same-as         [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:015049        ] ;
     :subsume
@@ -8457,10 +8549,10 @@ rep.adobe-japan1-0:03888
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5BB9         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:below    a.ucs:0x8C37   # 谷
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:below    a.ucs:0x8C37   # 谷
+        ] ;
         :eq g2.adobe-japan1-0:03888   ; # &g2-AJ1-03888;
         :eq g2.gb2312:0x485D          ; # &g2-AJ1-03888;
         :eq g2.ks-x1001:0x693B        ; # &g2-AJ1-03888;
@@ -9053,7 +9145,7 @@ rep.ucs_iso:0x21A1C
     :eq a.ucs_iwds-1:0x21A1C      ; # &C6-365A;
     :eq rep.cns11643-6:0x365A     ; # &C6-365A;
     :eq rep.daikanwa:07192        ; # &I-M-07192;
-    :from.vulgar         [ :sources chisebib:songyuan-yilai-suzipu ,
+    ideo:vulgar-form-of  [ :sources chisebib:songyuan-yilai-suzipu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5BC2         ] ;
     :subsume
@@ -9156,11 +9248,11 @@ a.ucs:0x2BCCD
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2BCCD ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:middle   rep.adobe-japan1-4:13834 ; # &AJ1-13834;
-        isd:below    a.ucs:0x6728   # 木
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:middle   rep.adobe-japan1-4:13834 ; # &AJ1-13834;
+            isd:below    a.ucs:0x6728   # 木
+        ] ;
         :eq g2.gt:08980               ; # &g2-GT-08980;
         :eq g2.daikanwa...ho:0130     ; # &g2-GT-08980;
         :subsume
@@ -9482,12 +9574,12 @@ a.ucs:0x375B
     :eq rep.cns11643-3:0x3542     ; # &I-C3-3542;
     :eq rep.daikanwa:07196        ; # &I-M-07196;
     :eq rep.shinjigen:1847        ; # 㝛
-    :from.ancient        [ :sources chisebib:shinjigen_1ed ;
-                           :target  a.ucs:0x5BBF         ] ;
-    :from.original       [ :sources chisebib:zhengzitong ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen_rev ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen_1ed ;
                            :target  a.ucs:0x5BBF         ] ;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ,
+                                     chisebib:shinjigen_rev ;
+                            :target  a.ucs:0x5BBF         ] ;
     :subsume
         g2.ucs_unicode:0x375B ;
     .
@@ -10011,7 +10103,7 @@ rep.adobe-japan1-0:04626
     :eq rep.gt-pj-1:21859         ; # &I-GT-09035;
     :eq rep.daikanwa:07202        ; # &I-M-07202;
     :eq rep.jef-china3:0x4AC8     ; # &I-JC3-4AC8;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x2F818        ] ;
     :subsume
@@ -10531,10 +10623,10 @@ rep.hanyo-denshi...tk:01022120
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x5B80 ; # 宀
         isd:below    [
-            :structure [ a idc:⿳ ;
-                :above    a.ucs:0x4E00 ; # 一
-                :middle   a.ucs:0x7530 ; # 田
-                :below    rep.gt-k:00059   # &GT-K00059;
+            isd:structure [ a idc:⿳ ;
+                isd:above    a.ucs:0x4E00 ; # 一
+                isd:middle   a.ucs:0x7530 ; # 田
+                isd:below    rep.gt-k:00059   # &GT-K00059;
             ]
         ]
     ] ;
@@ -10730,7 +10822,7 @@ a.ucs:0x21A25
     :eq rep.daikanwa:07208        ; # &I-M-07208;
     :eq rep.shinjigen:3172        ; # 𡨥
     :eq rep.cbeta:02480           ; # &I-CB02480;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  [ :target  rep.shinjigen_1ed:3171 ;
                                       :sources chisebib:shinjigen_1ed ] ,
                                     [ :target  rep.adobe-japan1-0:04627 ;
@@ -11299,7 +11391,7 @@ a.ucs:0x5BC9
     :eq rep.gt-pj-1:21861         ; # &I-GT-09066;
     :eq rep.daikanwa...ho:0133    ; # 寉
     :eq rep.cbeta:05265           ; # &I-CB05265;
-    :from.vulgar         [ :sources chisebib:daikanwa ;
+    ideo:vulgar-form-of  [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x96BA         ] ;
     :subsume
         g2.ucs_unicode:0x5BC9 ;
@@ -12321,12 +12413,16 @@ rep.gt:09103
         isd:above    a.ucs:0x5B80 ; # 宀
         isd:below    rep.adobe-japan1-4:13851   # &AJ1-13851;
     ] ;
-    :eq rep.cns11643-2:0x3B38     ; # &I-C2-3B38;
+    :eq rep.ucs_cns:0x5BD1        ; # &GT-09103;
+    :eq rep.cns11643-2:0x3B38     ; # &GT-09103;
     :eq rep.gt-k:09680            ; # &I-GT-K09680;
-    :eq rep.gt-pj-9:22362         ; # &GT-09103;
+    :eq rep.gt-pj-9:22362         ; # &I-GT-09103;
     :subsume
         g2.gt:09103          ;
     .
+    rep.ucs_cns:0x5BD1
+               :abstract-glyph-of [ :context domain:cns     ;
+                                    :target     ucs:0x5BD1  ] .
     rep.cns11643-2:0x3B38
                :abstract-glyph-of     cns11643-2:0x3B38  .
     rep.gt-k:09680
@@ -12340,8 +12436,8 @@ rep.gt:09103
         :eq g2.cns11643-2:0x3B38      ; # &g2-GT-09103;
         :eq g2.gt-k:09680             ; # &g2-GT-09103;
         :subsume
-            repi.cns11643-2:0x3B38 ,
-            repi.gt:09103        ;
+            repi.gt:09103        ,
+            repi.cns11643-2:0x3B38 ;
         .
         g2.ucs_cns:0x5BD1
               :abstract-glyph-form-of [ :context domain:cns     ;
@@ -12350,10 +12446,6 @@ rep.gt:09103
               :abstract-glyph-form-of     cns11643-2:0x3B38  .
         g2.gt-k:09680
               :abstract-glyph-form-of           gt-k:09680   .
-        repi.cns11643-2:0x3B38
-            a chisegg:glyph-image ;
-            :glyph-image-of cns11643-2:0x3B38 ;
-            .
         repi.gt:09103
             a chisegg:glyph-image ;
             :glyph-image-of gt:09103 ;
@@ -12361,6 +12453,10 @@ rep.gt:09103
             .
             repi.gt-k:09680
                           :glyph-image-of           gt-k:09680   .
+        repi.cns11643-2:0x3B38
+            a chisegg:glyph-image ;
+            :glyph-image-of cns11643-2:0x3B38 ;
+            .
 
 a.ucs:0x5BD2
     a chisegg:abstract-character ;
@@ -13076,10 +13172,10 @@ a.ucs:0x21A46
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x21A46 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     rep.gt-k:02598 ; # &GT-K02598;
-        isd:right    g2.ucs_unicode:0x5B83   # &g2-AJ1-04623;
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     rep.gt-k:02598 ; # &GT-K02598;
+            isd:right    g2.ucs_unicode:0x5B83   # &g2-AJ1-04623;
+        ] ;
         :eq g2.cns11643-4:0x3725      ; # &g2-M-07246;
         :eq g2.daikanwa:07246         ; # &g2-M-07246;
         :eq g2.cbeta:01985            ; # &g2-M-07246;
@@ -13235,7 +13331,7 @@ rep.gt:09094
     ] ;
     :eq rep.gt-pj-11:17492        ; # &GT-09094;
     :eq rep.daikanwa...ho:0134    ; # &GT-09094;
-    :from.vulgar         [ :sources chisebib:ruijumyougishou ,
+    ideo:vulgar-form-of  [ :sources chisebib:ruijumyougishou ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5BC4         ] ;
     :subsume
@@ -13248,10 +13344,10 @@ rep.gt:09094
     g2.gt:09094
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:09094 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:below    g2.ucs_unicode:0x7AD2   # &g2-AJ1-04549;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:below    g2.ucs_unicode:0x7AD2   # &g2-AJ1-04549;
+        ] ;
         :eq g2.daikanwa...ho:0134     ; # &g2-GT-09094;
         :subsume
             repi.daikanwa...ho:0134 ,
@@ -13293,9 +13389,9 @@ a.ucs:0x21A5C
     ideo:total-strokes    12 ;
     .
 
-rep.ucs-sip-var-003:0x21A5C
+rep.ucs-var-003:0x21A5C
     a chisegg:abstract-glyph ;
-    :abstract-glyph-of ucs-sip-var-003:0x21A5C ;
+    :abstract-glyph-of ucs-var-003:0x21A5C ;
     :denotation-of
         a.ucs:0x21A5C        ;
     ideo:radical          40 ; # ⼧ 
@@ -13306,10 +13402,7 @@ rep.ucs-sip-var-003:0x21A5C
         isd:middle   a.ucs:0x4E2F ; # 丯
         isd:below    a.ucs:0x2EAB   # ⺫
     ] ;
-    :eq rep.ucs-var-003:0x21A5C   ; # &U-v003+21A5C;
     .
-    rep.ucs-var-003:0x21A5C
-               :abstract-glyph-of    ucs-var-003:0x21A5C .
 
 rep.ucs_iso:0x21A5C
     a chisegg:abstract-glyph ;
@@ -13336,11 +13429,11 @@ rep.ucs_iso:0x21A5C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x21A5C ] ;
-    isd:structure [ a idc:⿳ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:middle   g2.gt-k:00586 ; # &g2-GT-K00586;
-        isd:below    g2.big5-cdp:0x8B48   # &g2-CDP-8B48;
-    ] ;
+        isd:structure [ a idc:⿳ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:middle   g2.gt-k:00586 ; # &g2-GT-K00586;
+            isd:below    g2.big5-cdp:0x8B48   # &g2-CDP-8B48;
+        ] ;
         :eq g2.ruimoku-v6:0xE009      ; # &g2-IU-00021A5C;
         :subsume
             repi.ruimoku-v6:0xE009 ,
@@ -13638,10 +13731,10 @@ rep.adobe-japan1-5:19322
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x5BD7         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B93 ; # &g2-AJ1-16835;
-        isd:below    rep.mj:007307   # &MJ007307;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B93 ; # &g2-AJ1-16835;
+            isd:below    rep.mj:007307   # &MJ007307;
+        ] ;
         :eq g2.ucs_cns:0x5BD7         ; # &g2-AJ1-19322;
         :eq g2.ucs_jis:0x5BD7         ; # &g2-AJ1-19322;
         :eq g2.jis-x0212:0x3A60       ; # &g2-AJ1-19322;
@@ -13717,10 +13810,10 @@ rep.ks-x1001:0x523C
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x5BD7  ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B93 ; # &g2-AJ1-16835;
-        isd:below    rep.mj:007308   # &MJ007308;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B93 ; # &g2-AJ1-16835;
+            isd:below    rep.mj:007308   # &MJ007308;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.ks-x1001:0x523C        ; # &g2-K0-523C;
         :eq g2.cbeta:02248            ; # &g2-K0-523C;
@@ -14470,8 +14563,8 @@ rep.adobe-japan1-0:01518
     :eq rep.gt-pj-1:13362         ; # &I-GT-09123;
     :eq rep.daikanwa:07276        ; # &I-M-07276;
     :eq rep.shinjigen:1854        ; # &AJ1-01518;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-2:08436 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-2:08436 ] ;
     :subsume
         g2.ucs_unicode:0x5BDB ;
     .
@@ -14677,10 +14770,10 @@ rep.adobe-japan1-0:02552
     :eq rep.gt:09138              ; # &I-GT-09138;
     :eq rep.gt-pj-1:16178         ; # &I-GT-09138;
     :eq rep.daikanwa...._.p:07278 ; # &AJ1-02552;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.ucs_unicode:0x5BE2 ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04633 ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.ucs_unicode:0x5BE2 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04633 ] ;
     :subsume
         g2.ucs_unicode:0x5BDD ;
     .
@@ -14848,9 +14941,9 @@ rep.gt:09129
     isd:structure [ a idc:⿱ ;
         isd:above    a.ucs:0x5B80 ; # 宀
         isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     a.ucs:0x723F ; # 爿
-                :right    a.ucs:0x5408   # 合
+            isd:structure [ a idc:⿰ ;
+                isd:left     a.ucs:0x723F ; # 爿
+                isd:right    a.ucs:0x5408   # 合
             ]
         ]
     ] ;
@@ -14866,15 +14959,15 @@ rep.gt:09129
     g2.gt:09129
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of gt:09129 ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:below    [
-            :structure [ a idc:⿰ ;
-                :left     g2.ucs_unicode:0x723F ; # &g2-AJ1-05606;
-                :right    a.ucs:0x5408   # 合
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:below    [
+                isd:structure [ a idc:⿰ ;
+                    isd:left     g2.ucs_unicode:0x723F ; # &g2-AJ1-05606;
+                    isd:right    a.ucs:0x5408   # 合
+                ]
             ]
-        ]
-    ] ;
+        ] ;
         :eq g2.daikanwa...ho:0135     ; # &g2-GT-09129;
         :subsume
             repi.daikanwa...ho:0135 ,
@@ -14983,6 +15076,14 @@ rep.hanyo-denshi...ks:082790
     :eq rep.ucs_cns:0x5BDE        ; # &HD-KS-082790;
     :eq rep.cns11643-1:0x684E     ; # &HD-KS-082790;
     :eq rep.daikanwa:07282        ; # &I-M-07282;
+    :form-of             [ :sources chisebib:chuci-jizhu ;
+                           :target  rep.mj:015839        ] ;
+    ideo:interchangeable-form-of [ :sources chisebib:chuci-jizhu ,
+                                            chisebib:daikanwa ;
+                                   :target  rep.mj:015839        ] ;
+    ideo:same-as         [ :sources chisebib:guangyun ,
+                                    chisebib:daikanwa ;
+                           :target  rep.cns11643-2:0x4932 ] ;
     :subsume
         g2.hanyo-denshi...ks:082790 ,
         g2.cns11643-1:0x684E ;
@@ -17180,10 +17281,10 @@ rep.ruimoku-v6:0xE03B
     g2.ruimoku-v6:0xE03B
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of ruimoku-v6:0xE03B ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
-        isd:below    g2.ruimoku-v6:0xE03C   # &g2-RUI6-E03C;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.ucs_unicode:0x5B80 ; # &g2-AJ1-04622;
+            isd:below    g2.ruimoku-v6:0xE03C   # &g2-RUI6-E03C;
+        ] ;
         .
 
 rep.daikanwa:07313
@@ -19248,7 +19349,7 @@ rep.adobe-japan1-0:04639
     :eq rep.gt-pj-1:21872         ; # &I-GT-09272;
     :eq rep.daikanwa:07366        ; # &I-M-07366;
     :eq rep.shinjigen:1827        ; # &AJ1-04639;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:04638 ] ;
     :subsume
         g2.ucs_unicode:0x5BF3 ,
@@ -19956,10 +20057,10 @@ rep.ucs_iso:0x21AF8
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x21AF8 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:010230 ; # &g2-MJ010230;
-        isd:right    a.ucs:0x5409   # 吉
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:010230 ; # &g2-MJ010230;
+            isd:right    a.ucs:0x5409   # 吉
+        ] ;
         :eq g2.daikanwa:07379         ; # &g2-M-07379;
         :subsume
             repi.daikanwa:07379  ,
@@ -20538,10 +20639,10 @@ rep.ucs_iso:0x21B17
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x21B17 ] ;
-    isd:structure [ a idc:⿰ ;
-        isd:left     g2.mj:010230 ; # &g2-MJ010230;
-        isd:right    a.ucs:0x58F9   # 壹
-    ] ;
+        isd:structure [ a idc:⿰ ;
+            isd:left     g2.mj:010230 ; # &g2-MJ010230;
+            isd:right    a.ucs:0x58F9   # 壹
+        ] ;
         :eq g2.daikanwa:07404         ; # &g2-M-07404;
         :subsume
             repi.daikanwa:07404  ,