X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Ideograph-R068-Dipper.ttl;h=0526f497544450d764ccde6429c170c20d0f1090;hb=dc940220d96db3dc72d71788e4699d3768a218a2;hp=c928f2018a13cc9cf33a9a596ed14656a98f36c4;hpb=ce35f3cdb2aca22891bb2f1e1192b13e8deea2f5;p=chise%2Fchiset.git

diff --git a/Ideograph-R068-Dipper.ttl b/Ideograph-R068-Dipper.ttl
index c928f20..0526f49 100644
--- a/Ideograph-R068-Dipper.ttl
+++ b/Ideograph-R068-Dipper.ttl
@@ -13,6 +13,7 @@
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .
 
 @prefix a.ucs: <http://www.chise.org/est/view/character/rep.ucs=> .
+@prefix o.ucs_unicode: <http://www.chise.org/est/view/character/o.ucs@unicode=> .
 @prefix o.ucs_cns: <http://www.chise.org/est/view/character/o.ucs@cns=> .
 @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=> .
@@ -53,6 +54,7 @@
 @prefix g2.iso-ir165: <http://www.chise.org/est/view/character/g2.iso-ir165=> .
 @prefix g2.jis-x0208: <http://www.chise.org/est/view/character/g2.jis-x0208=> .
 @prefix repi.jis-x0208: <http://www.chise.org/est/view/character/repi.jis-x0208=> .
+@prefix a.jis-x0208_1997: <http://www.chise.org/est/view/character/a.jis-x0208@1997=> .
 @prefix rep.cns11643-1: <http://www.chise.org/est/view/character/rep.cns11643-1=> .
 @prefix g2.cns11643-1: <http://www.chise.org/est/view/character/g2.cns11643-1=> .
 @prefix repi.cns11643-1: <http://www.chise.org/est/view/character/repi.cns11643-1=> .
@@ -63,6 +65,7 @@
 @prefix g2.cns11643-4: <http://www.chise.org/est/view/character/g2.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 rep.cns11643-7: <http://www.chise.org/est/view/character/rep.cns11643-7=> .
 @prefix g2.cns11643-7: <http://www.chise.org/est/view/character/g2.cns11643-7=> .
 @prefix rep.jis-x0213-1: <http://www.chise.org/est/view/character/rep.jis-x0213-1=> .
@@ -90,6 +93,8 @@
 @prefix rep.daikanwa: <http://www.chise.org/est/view/character/rep.daikanwa=> .
 @prefix g2.daikanwa: <http://www.chise.org/est/view/character/g2.daikanwa=> .
 @prefix repi.daikanwa: <http://www.chise.org/est/view/character/repi.daikanwa=> .
+@prefix g.daikanwa: <http://www.chise.org/est/view/character/g.daikanwa=> .
+@prefix a.daikanwa: <http://www.chise.org/est/view/character/a.daikanwa=> .
 @prefix rep.shinjigen: <http://www.chise.org/est/view/character/rep.shinjigen=> .
 @prefix g2.shinjigen: <http://www.chise.org/est/view/character/g2.shinjigen=> .
 @prefix rep.hanziku-6: <http://www.chise.org/est/view/character/rep.hanziku-6=> .
@@ -100,7 +105,8 @@
 @prefix g2.jef-china3: <http://www.chise.org/est/view/character/g2.jef-china3=> .
 @prefix repi.jef-china3: <http://www.chise.org/est/view/character/repi.jef-china3=> .
 @prefix rep.ruimoku-v6: <http://www.chise.org/est/view/character/rep.ruimoku-v6=> .
-@prefix rep.ucs-bmp-var-006: <http://www.chise.org/est/view/character/rep.ucs-bmp-var-006=> .
+@prefix rep.ucs-var-002: <http://www.chise.org/est/view/character/rep.ucs-var-002=> .
+@prefix rep.ucs-var-006: <http://www.chise.org/est/view/character/rep.ucs-var-006=> .
 
 @prefix ucs: <http://rdf.chise.org/data/ccs/ucs/code-point/> .
 @prefix mj: <http://rdf.chise.org/data/ccs/mj/code-point/> .
@@ -135,7 +141,8 @@
 @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-bmp-var-006: <http://rdf.chise.org/data/ccs/ucs-bmp-var-006/code-point/> .
+@prefix ucs-var-002: <http://rdf.chise.org/data/ccs/ucs-var-002/code-point/> .
+@prefix ucs-var-006: <http://rdf.chise.org/data/ccs/ucs-var-006/code-point/> .
 
 a.ucs:0x6597
     a chisegg:abstract-character ;
@@ -298,9 +305,9 @@ rep.ruimoku-v6:0xE06A
     ideo:total-strokes     4 ;
     isd:structure [ a idc:â¿° ;
         isd:left     [
-            :structure [ a idc:⿱ ;
-                :above    a.ucs:0x81FE ; # 臾
-                :below    rep.big5-cdp:0x8958   # &CDP-8958;
+            isd:structure [ a idc:⿱ ;
+                isd:above    a.ucs:0x81FE ; # 臾
+                isd:below    rep.big5-cdp:0x8958   # &CDP-8958;
             ]
         ] ;
         isd:right    a.ucs:0x6597   # 斗
@@ -377,6 +384,37 @@ a.ucs:0x6598
               :abstract-glyph-form-of [ :context domain:cns     ;
                                         :target     ucs:0x6598  ] .
 
+a.ucs:0x2306D
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x2306D ;
+    ideo:radical          68 ; # ⽃ 
+    ideo:strokes           3 ;
+    ideo:total-strokes     7 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x200D4 ; # 𠃔
+        isd:right    a.ucs:0x6597   # 斗
+    ] ;
+    :subsume
+        g2.ucs_iso:0x2306D   ;
+    .
+    g2.ucs_iso:0x2306D
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x2306D ] ;
+        :subsume
+            repi.ucs_iso:0x2306D ,
+            rep.hanziku-6:0xD1F2 ;
+        .
+        repi.ucs_iso:0x2306D
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:iso     ;
+                              :target     ucs:0x2306D ] ;
+            .
+        rep.hanziku-6:0xD1F2
+            a chisegg:abstract-glyph ;
+            :abstract-glyph-of hanziku-6:0xD1F2 ;
+            .
+
 a.ucs:0x3AB4
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3AB4 ;
@@ -903,10 +941,10 @@ rep.adobe-japan1-0:05076
         :rep.decomposition   [ :context domain:cid     ;
                                :target  a.ucs:0x659B         ,
                                         a.ucs:0xE0100        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.adobe-japan1-0:01455 ; # &g2-AJ1-01455;
-        isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.adobe-japan1-0:01455 ; # &g2-AJ1-01455;
+            isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
+        ] ;
         :eq g2.ucs_jis:0x659B         ; # &g2-AJ1-05076;
         :eq g2.ucs_ks:0x659B          ; # &g2-AJ1-05076;
         :eq g2.ks-x1001:0x4D57        ; # &g2-AJ1-05076;
@@ -1006,10 +1044,10 @@ rep.gb2312:0x757A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:unicode ;
                                   :target     ucs:0x659B  ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     g2.mj:024282 ; # &g2-MJ024282;
-        isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     g2.mj:024282 ; # &g2-MJ024282;
+            isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
+        ] ;
         :g2.ucs_JP...hanazono      rdf:nil ;
         :eq g2.gb2312:0x757A          ; # &g2-UU+659B;
         .
@@ -1036,10 +1074,10 @@ a.ucs:0x659C
     rep.adobe-japan1-4:13805
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-4:13805 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.ucs-bmp-var-006:0x4F59 ; # &U-v006+4F59;
-        isd:right    a.ucs:0x6597   # 斗
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.ucs-var-006:0x4F59 ; # &U-v006+4F59;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
         :eq rep.hanyo-denshi...ks:151460 ; # &AJ1-13805;
         :eq rep.daikanwa:13509        ; # &I-M-13509;
         :subsume
@@ -1084,10 +1122,10 @@ a.ucs:0x659C
     rep.adobe-japan1-0:02300
         a chisegg:abstract-glyph ;
         :abstract-glyph-of adobe-japan1-0:02300 ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.adobe-japan1-0:03880 ; # &AJ1-03880;
-        isd:right    a.ucs:0x6597   # 斗
-    ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.adobe-japan1-0:03880 ; # &AJ1-03880;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
         :eq rep.ucs_unicode:0x659C    ; # &AJ1-02300;
         :eq rep.jis-x0208:0x3C50      ; # &I-J90-3C50;
         :eq rep.gb2312:0x5031         ; # &I-G0-5031;
@@ -1133,10 +1171,10 @@ a.ucs:0x659C
             :rep.decomposition   [ :context domain:hanyo-denshi ;
                                    :target  a.ucs:0x659C         ,
                                             a.ucs:0xE0102        ] ;
-    isd:structure [ a idc:â¿° ;
-        isd:left     rep.gt-k:02663 ; # &GT-K02663;
-        isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
-    ] ;
+            isd:structure [ a idc:â¿° ;
+                isd:left     rep.gt-k:02663 ; # &GT-K02663;
+                isd:right    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
+            ] ;
             :eq g2.adobe-japan1-0:02300   ; # &g2-AJ1-02300;
             :eq g2.gb2312:0x5031          ; # &g2-AJ1-02300;
             :eq g2.ks-x1001:0x5E58        ; # &g2-AJ1-02300;
@@ -1338,40 +1376,65 @@ a.ucs:0x2307C
     ideo:radical          68 ; # ⽃ 
     ideo:strokes           8 ;
     ideo:total-strokes    12 ;
-    .
-
-rep.daikanwa:13513
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of daikanwa:13513 ;
-    :denotation-of
-        a.ucs:0x2307C        ;
-    ideo:radical          68 ; # ⽃ 
-    ideo:strokes           8 ;
-    ideo:total-strokes    12 ;
-    .
-
-g.ucs_iso:0x2307C
-    a chisegg:detailed-glyph ;
-    :detailed-glyph-of [ :context domain:iso     ;
-                         :target     ucs:0x2307C ] ;
-    :denotation-of
-        a.ucs:0x2307C        ;
-    ideo:radical          68 ; # ⽃ 
-    ideo:strokes           8 ;
-    ideo:total-strokes    12 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x3AC4 ; # 㫄
+        isd:right    a.ucs:0x6597   # 斗
+    ] ;
+    :eq rep.cns11643-6:0x495D     ; # &I-C6-495D;
+    :eq rep.daikanwa:13513        ; # &I-M-13513;
+    ideo:original-form-of [ :sources chisebib:zhengzitong ,
+                                     chisebib:daikanwa ;
+                            :target  rep.daikanwa:13523   ] ;
     :subsume
-        rep.ucs_iso:0x2307C  ,
-        rep.cns11643-6:0x495D ;
+        a.daikanwa:13513     ,
+        g.ucs_iso:0x2307C    ;
     .
-    rep.ucs_iso:0x2307C
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of [ :context domain:iso     ;
-                             :target     ucs:0x2307C ] ;
-        .
     rep.cns11643-6:0x495D
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of cns11643-6:0x495D ;
+               :abstract-glyph-of     cns11643-6:0x495D  .
+    rep.daikanwa:13513
+               :abstract-glyph-of       daikanwa:13513   .
+    a.daikanwa:13513
+        a chisegg:abstract-character ;
+        :abstract-character-of daikanwa:13513 ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.adobe-japan1-5:20135 ; # &AJ1-20135;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
+        :eq g.daikanwa:13513          ; # &G-M-13513;
+        :subsume
+            g2.daikanwa:13513    ;
         .
+        g.daikanwa:13513
+                   :detailed-glyph-of       daikanwa:13513   .
+        g2.daikanwa:13513
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of daikanwa:13513 ;
+            .
+    g.ucs_iso:0x2307C
+        a chisegg:detailed-glyph ;
+        :detailed-glyph-of [ :context domain:iso     ;
+                             :target     ucs:0x2307C ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.ucs-var-002:0x3AC4 ; # &U-v002+3AC4;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
+        :subsume
+            g2.ucs_iso:0x2307C   ,
+            g2.cns11643-6:0x495D ;
+        .
+        g2.ucs_iso:0x2307C
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:iso     ;
+                                      :target     ucs:0x2307C ] ;
+            .
+        g2.cns11643-6:0x495D
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of cns11643-6:0x495D ;
+            :eq g2.ucs_cns:0x2307C        ; # &g2-CU+2307C;
+            .
+            g2.ucs_cns:0x2307C
+                  :abstract-glyph-form-of [ :context domain:cns     ;
+                                            :target     ucs:0x2307C ] .
 
 a.ucs:0x2307F
     a chisegg:abstract-character ;
@@ -1814,129 +1877,150 @@ a.ucs:0x65A1
     ideo:radical          68 ; # ⽃ 
     ideo:strokes          10 ;
     ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround a.ucs:0x501D ; # 倝
+        isd:filling  a.ucs:0x6597   # 斗
+    ] ;
+    .
+
+rep.adobe-japan1-0:01146
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of adobe-japan1-0:01146 ;
+    :denotation-of
+        a.ucs:0x65A1         ;
+    ideo:radical          68 ; # ⽃ 
+    ideo:strokes          10 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿸ ;
+        isd:surround rep.adobe-japan1-6:21127 ; # &AJ1-21127;
+        isd:filling  a.ucs:0x6597   # 斗
+    ] ;
+    :eq rep.ucs_unicode:0x65A1    ; # &AJ1-01146;
+    :eq rep.jis-x0208:0x3036      ; # &I-J90-3036;
+    :eq rep.gb2312:0x4E53         ; # &I-G0-4E53;
+    :eq rep.ks-x1001:0x6456       ; # &I-K0-6456;
+    :eq rep.cns11643-1:0x687E     ; # &I-C1-687E;
+    :eq rep.jis-x0213-1:0x3036    ; # &I-JX1-3036;
+    :eq a.big5:0xBA57             ; # &I-B-BA57;
+    :eq rep.gt:17089              ; # &I-GT-17089;
+    :eq rep.gt-k:11096            ; # &I-GT-K11096;
+    :eq rep.gt-pj-1:12342         ; # &I-GT-17089;
+    :eq rep.daikanwa:13522        ; # &I-M-13522;
+    :eq rep.shinjigen:3217        ; # &AJ1-01146;
     :subsume
-        rep.adobe-japan1-0:01146 ;
+        g2.ucs_unicode:0x65A1 ,
+        g2.cns11643-1:0x687E ;
     .
-    rep.adobe-japan1-0:01146
-        a chisegg:abstract-glyph ;
-        :abstract-glyph-of adobe-japan1-0:01146 ;
-        :eq rep.ucs_unicode:0x65A1    ; # &AJ1-01146;
-        :eq rep.jis-x0208:0x3036      ; # &I-J90-3036;
-        :eq rep.gb2312:0x4E53         ; # &I-G0-4E53;
-        :eq rep.ks-x1001:0x6456       ; # &I-K0-6456;
-        :eq rep.cns11643-1:0x687E     ; # &I-C1-687E;
-        :eq rep.jis-x0213-1:0x3036    ; # &I-JX1-3036;
-        :eq a.big5:0xBA57             ; # &I-B-BA57;
-        :eq rep.gt:17089              ; # &I-GT-17089;
-        :eq rep.gt-pj-1:12342         ; # &I-GT-17089;
-        :eq rep.daikanwa:13522        ; # &I-M-13522;
-        :eq rep.shinjigen:3217        ; # &AJ1-01146;
+    rep.ucs_unicode:0x65A1
+               :abstract-glyph-of [ :context domain:unicode ;
+                                    :target     ucs:0x65A1  ] .
+    rep.jis-x0208:0x3036
+               :abstract-glyph-of      jis-x0208:0x3036  .
+    rep.gb2312:0x4E53
+               :abstract-glyph-of         gb2312:0x4E53  .
+    rep.ks-x1001:0x6456
+               :abstract-glyph-of       ks-x1001:0x6456  .
+    rep.cns11643-1:0x687E
+               :abstract-glyph-of     cns11643-1:0x687E  .
+    rep.jis-x0213-1:0x3036
+               :abstract-glyph-of    jis-x0213-1:0x3036  .
+    a.big5:0xBA57
+           :abstract-character-of           big5:0xBA57  .
+    rep.gt:17089
+               :abstract-glyph-of             gt:17089   .
+    rep.gt-k:11096
+               :abstract-glyph-of           gt-k:11096   .
+    rep.gt-pj-1:12342
+               :abstract-glyph-of        gt-pj-1:12342   .
+    rep.daikanwa:13522
+               :abstract-glyph-of       daikanwa:13522   .
+    rep.shinjigen:3217
+               :abstract-glyph-of      shinjigen:3217    .
+    g2.ucs_unicode:0x65A1
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:unicode ;
+                                  :target     ucs:0x65A1  ] ;
+        :rep.decomposition   [ :context domain:cid     ;
+                               :target  a.ucs:0x65A1         ,
+                                        a.ucs:0xE0100        ] ;
+        :eq g2.adobe-japan1-0:01146   ; # &g2-AJ1-01146;
+        :eq g2.gb2312:0x4E53          ; # &g2-AJ1-01146;
+        :eq g2.ks-x1001:0x6456        ; # &g2-AJ1-01146;
+        :eq g2.jis-x0208:0x3036       ; # &g2-AJ1-01146;
+        :eq g2.jis-x0213-1:0x3036     ; # &g2-AJ1-01146;
+        :eq g2.gt:17089               ; # &g2-AJ1-01146;
+        :eq g2.gt-k:11096             ; # &g2-AJ1-01146;
+        :eq g2.daikanwa:13522         ; # &g2-AJ1-01146;
+        :eq g2.shinjigen:3217         ; # &g2-AJ1-01146;
         :subsume
-            g2.ucs_unicode:0x65A1 ,
-            g2.cns11643-1:0x687E ;
-        .
-        rep.ucs_unicode:0x65A1
-                   :abstract-glyph-of [ :context domain:unicode ;
-                                        :target     ucs:0x65A1  ] .
-        rep.jis-x0208:0x3036
-                   :abstract-glyph-of      jis-x0208:0x3036  .
-        rep.gb2312:0x4E53
-                   :abstract-glyph-of         gb2312:0x4E53  .
-        rep.ks-x1001:0x6456
-                   :abstract-glyph-of       ks-x1001:0x6456  .
-        rep.cns11643-1:0x687E
-                   :abstract-glyph-of     cns11643-1:0x687E  .
-        rep.jis-x0213-1:0x3036
-                   :abstract-glyph-of    jis-x0213-1:0x3036  .
-        a.big5:0xBA57
-               :abstract-character-of           big5:0xBA57  .
-        rep.gt:17089
-                   :abstract-glyph-of             gt:17089   .
-        rep.gt-pj-1:12342
-                   :abstract-glyph-of        gt-pj-1:12342   .
-        rep.daikanwa:13522
-                   :abstract-glyph-of       daikanwa:13522   .
-        rep.shinjigen:3217
-                   :abstract-glyph-of      shinjigen:3217    .
-        g2.ucs_unicode:0x65A1
-            a chisegg:abstract-glyph-form ;
-            :abstract-glyph-form-of [ :context domain:unicode ;
-                                      :target     ucs:0x65A1  ] ;
-            :rep.decomposition   [ :context domain:cid     ;
-                                   :target  a.ucs:0x65A1         ,
-                                            a.ucs:0xE0100        ] ;
-            :eq g2.adobe-japan1-0:01146   ; # &g2-AJ1-01146;
-            :eq g2.gb2312:0x4E53          ; # &g2-AJ1-01146;
-            :eq g2.ks-x1001:0x6456        ; # &g2-AJ1-01146;
-            :eq g2.jis-x0208:0x3036       ; # &g2-AJ1-01146;
-            :eq g2.jis-x0213-1:0x3036     ; # &g2-AJ1-01146;
-            :eq g2.gt:17089               ; # &g2-AJ1-01146;
-            :eq g2.daikanwa:13522         ; # &g2-AJ1-01146;
-            :eq g2.shinjigen:3217         ; # &g2-AJ1-01146;
-            :subsume
-                repi.daikanwa:13522  ,
-                repi.jis-x0208:0x3036 ,
-                repi.adobe-japan1-6:01146 ,
-                repi.ks-x1001:0x6456 ,
-                repi.ucs_unicode:0x65A1 ,
-                repi.gt:17089        ;
+            repi.daikanwa:13522  ,
+            repi.jis-x0208:0x3036 ,
+            repi.adobe-japan1-6:01146 ,
+            repi.ks-x1001:0x6456 ,
+            repi.ucs_unicode:0x65A1 ,
+            repi.gt:17089        ;
+        .
+        g2.adobe-japan1-0:01146
+              :abstract-glyph-form-of adobe-japan1-0:01146   .
+        g2.gb2312:0x4E53
+              :abstract-glyph-form-of         gb2312:0x4E53  .
+        g2.ks-x1001:0x6456
+              :abstract-glyph-form-of       ks-x1001:0x6456  .
+        g2.jis-x0208:0x3036
+              :abstract-glyph-form-of      jis-x0208:0x3036  .
+        g2.jis-x0213-1:0x3036
+              :abstract-glyph-form-of    jis-x0213-1:0x3036  .
+        g2.gt:17089
+              :abstract-glyph-form-of             gt:17089   .
+        g2.gt-k:11096
+              :abstract-glyph-form-of           gt-k:11096   .
+        g2.daikanwa:13522
+              :abstract-glyph-form-of       daikanwa:13522   .
+        g2.shinjigen:3217
+              :abstract-glyph-form-of      shinjigen:3217    .
+        repi.daikanwa:13522
+            a chisegg:glyph-image ;
+            :glyph-image-of daikanwa:13522 ;
             .
-            g2.adobe-japan1-0:01146
-                  :abstract-glyph-form-of adobe-japan1-0:01146   .
-            g2.gb2312:0x4E53
-                  :abstract-glyph-form-of         gb2312:0x4E53  .
-            g2.ks-x1001:0x6456
-                  :abstract-glyph-form-of       ks-x1001:0x6456  .
-            g2.jis-x0208:0x3036
-                  :abstract-glyph-form-of      jis-x0208:0x3036  .
-            g2.jis-x0213-1:0x3036
-                  :abstract-glyph-form-of    jis-x0213-1:0x3036  .
-            g2.gt:17089
-                  :abstract-glyph-form-of             gt:17089   .
-            g2.daikanwa:13522
-                  :abstract-glyph-form-of       daikanwa:13522   .
-            g2.shinjigen:3217
-                  :abstract-glyph-form-of      shinjigen:3217    .
-            repi.daikanwa:13522
-                a chisegg:glyph-image ;
-                :glyph-image-of daikanwa:13522 ;
-                .
-            repi.jis-x0208:0x3036
-                a chisegg:glyph-image ;
-                :glyph-image-of jis-x0208:0x3036 ;
-                :eq repi.jis-x0213-1:0x3036   ; # &R-J0-3036;
-                .
-                repi.jis-x0213-1:0x3036
-                              :glyph-image-of    jis-x0213-1:0x3036  .
-            repi.adobe-japan1-0:01146
-                a chisegg:glyph-image ;
-                :glyph-image-of adobe-japan1-0:01146 ;
-                .
-            repi.ks-x1001:0x6456
-                a chisegg:glyph-image ;
-                :glyph-image-of ks-x1001:0x6456 ;
-                :eq repi.ucs_ks:0x65A1        ; # &R-K0-6456;
-                .
-                repi.ucs_ks:0x65A1
-                              :glyph-image-of [ :context domain:ks      ;
-                                                :target     ucs:0x65A1  ] .
-            repi.ucs_unicode:0x65A1
-                a chisegg:glyph-image ;
-                :glyph-image-of [ :context domain:unicode ;
-                                  :target     ucs:0x65A1  ] ;
-                .
-            repi.gt:17089
-                a chisegg:glyph-image ;
-                :glyph-image-of gt:17089 ;
-                .
-        g2.cns11643-1:0x687E
-            a chisegg:abstract-glyph-form ;
-            :abstract-glyph-form-of cns11643-1:0x687E ;
-            :eq g2.ucs_cns:0x65A1         ; # &g2-CU+65A1;
+        repi.jis-x0208:0x3036
+            a chisegg:glyph-image ;
+            :glyph-image-of jis-x0208:0x3036 ;
+            :eq repi.jis-x0213-1:0x3036   ; # &R-J0-3036;
             .
-            g2.ucs_cns:0x65A1
-                  :abstract-glyph-form-of [ :context domain:cns     ;
+            repi.jis-x0213-1:0x3036
+                          :glyph-image-of    jis-x0213-1:0x3036  .
+        repi.adobe-japan1-0:01146
+            a chisegg:glyph-image ;
+            :glyph-image-of adobe-japan1-0:01146 ;
+            .
+        repi.ks-x1001:0x6456
+            a chisegg:glyph-image ;
+            :glyph-image-of ks-x1001:0x6456 ;
+            :eq repi.ucs_ks:0x65A1        ; # &R-K0-6456;
+            .
+            repi.ucs_ks:0x65A1
+                          :glyph-image-of [ :context domain:ks      ;
                                             :target     ucs:0x65A1  ] .
+        repi.ucs_unicode:0x65A1
+            a chisegg:glyph-image ;
+            :glyph-image-of [ :context domain:unicode ;
+                              :target     ucs:0x65A1  ] ;
+            .
+        repi.gt:17089
+            a chisegg:glyph-image ;
+            :glyph-image-of gt:17089 ;
+            :eq repi.gt-k:11096           ; # &R-GT-17089;
+            .
+            repi.gt-k:11096
+                          :glyph-image-of           gt-k:11096   .
+    g2.cns11643-1:0x687E
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of cns11643-1:0x687E ;
+        :eq g2.ucs_cns:0x65A1         ; # &g2-CU+65A1;
+        .
+        g2.ucs_cns:0x65A1
+              :abstract-glyph-form-of [ :context domain:cns     ;
+                                        :target     ucs:0x65A1  ] .
 
 a.ucs:0x23086
     a chisegg:abstract-character ;
@@ -2038,10 +2122,10 @@ a.ucs:0x2308A
         a chisegg:abstract-glyph-form ;
         :abstract-glyph-form-of [ :context domain:iso     ;
                                   :target     ucs:0x2308A ] ;
-    isd:structure [ a idc:⿱ ;
-        isd:above    g2.cns11643-1:0x5970 ; # &g2-M-07440;
-        isd:below    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
-    ] ;
+        isd:structure [ a idc:⿱ ;
+            isd:above    g2.cns11643-1:0x5970 ; # &g2-M-07440;
+            isd:below    g2.ucs_unicode:0x6597   # &g2-AJ1-03143;
+        ] ;
         :eq g2.daikanwa:13527         ; # &g2-M-13527;
         :eq g2.cbeta:05802            ; # &g2-M-13527;
         :subsume
@@ -2079,6 +2163,10 @@ a.ucs:0x65A2
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x65A2 ;
     ideo:radical          68 ; # ⽃ 
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.jis-x0208_1997:0x322B ; # &J97-322B;
+        isd:right    a.ucs:0x6597   # 斗
+    ] ;
     .
 
 o.ucs_cns:0x65A2
@@ -2090,6 +2178,10 @@ o.ucs_cns:0x65A2
     ideo:radical          68 ; # ⽃ 
     ideo:strokes          12 ;
     ideo:total-strokes    16 ;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x9EC3 ; # 黃
+        isd:right    a.ucs:0x6597   # 斗
+    ] ;
     :eq a.big5:0xE9B2             ; # &o-CU+65A2;
     :subsume
         rep.daikanwa:13528   ,
@@ -2100,6 +2192,10 @@ o.ucs_cns:0x65A2
     rep.daikanwa:13528
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:13528 ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.jis-x0213-1:0x7E71 ; # &GT-65324;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
         :subsume
             g2.daikanwa:13528    ;
         .
@@ -2110,6 +2206,10 @@ o.ucs_cns:0x65A2
     rep.cns11643-2:0x573D
         a chisegg:abstract-glyph ;
         :abstract-glyph-of cns11643-2:0x573D ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.cns11643-1:0x6327 ; # &C1-6327;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
         :eq rep.ucs_cns:0x65A2        ; # &C2-573D;
         :subsume
             g2.cns11643-2:0x573D ;
@@ -2126,31 +2226,46 @@ o.ucs_cns:0x65A2
                   :abstract-glyph-form-of [ :context domain:cns     ;
                                             :target     ucs:0x65A2  ] .
 
-rep.ucs_unicode:0x65A2
-    a chisegg:abstract-glyph ;
-    :abstract-glyph-of [ :context domain:unicode ;
-                         :target     ucs:0x65A2  ] ;
+o.ucs_unicode:0x65A2
+    a chisegg:unified-glyph ;
+    :unified-glyph-of [ :context domain:unicode ;
+                        :target     ucs:0x65A2  ] ;
     :denotation-of
         a.ucs:0x65A2         ;
     ideo:radical          68 ; # ⽃ 
     ideo:strokes          11 ;
     ideo:total-strokes    15 ;
-    :rep.ucs_JP...hanazono     rdf:nil ;
-    :eq rep.iso-ir165:0x2D4E      ; # &EGB-2D4E;
+    isd:structure [ a idc:â¿° ;
+        isd:left     a.ucs:0x9EC4 ; # 黄
+        isd:right    a.ucs:0x6597   # 斗
+    ] ;
     :subsume
-        g2.ucs_unicode:0x65A2 ;
+        rep.ucs_unicode:0x65A2 ;
     .
-    rep.iso-ir165:0x2D4E
-               :abstract-glyph-of      iso-ir165:0x2D4E  .
-    g2.ucs_unicode:0x65A2
-        a chisegg:abstract-glyph-form ;
-        :abstract-glyph-form-of [ :context domain:unicode ;
-                                  :target     ucs:0x65A2  ] ;
-        :g2.ucs_JP...hanazono      rdf:nil ;
-        :eq g2.iso-ir165:0x2D4E       ; # &g2-UU+65A2;
+    rep.ucs_unicode:0x65A2
+        a chisegg:abstract-glyph ;
+        :abstract-glyph-of [ :context domain:unicode ;
+                             :target     ucs:0x65A2  ] ;
+        isd:structure [ a idc:â¿° ;
+            isd:left     rep.adobe-japan1-0:01323 ; # &AJ1-01323;
+            isd:right    a.ucs:0x6597   # 斗
+        ] ;
+        :rep.ucs_JP...hanazono     rdf:nil ;
+        :eq rep.iso-ir165:0x2D4E      ; # &EGB-2D4E;
+        :subsume
+            g2.ucs_unicode:0x65A2 ;
         .
-        g2.iso-ir165:0x2D4E
-              :abstract-glyph-form-of      iso-ir165:0x2D4E  .
+        rep.iso-ir165:0x2D4E
+                   :abstract-glyph-of      iso-ir165:0x2D4E  .
+        g2.ucs_unicode:0x65A2
+            a chisegg:abstract-glyph-form ;
+            :abstract-glyph-form-of [ :context domain:unicode ;
+                                      :target     ucs:0x65A2  ] ;
+            :g2.ucs_JP...hanazono      rdf:nil ;
+            :eq g2.iso-ir165:0x2D4E       ; # &g2-UU+65A2;
+            .
+            g2.iso-ir165:0x2D4E
+                  :abstract-glyph-form-of      iso-ir165:0x2D4E  .
 
 a.ucs:0x65A3
     a chisegg:abstract-character ;