X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R068-Dipper.el;h=1a35ab22a3438971d8417ff07c2deadbae97f0a6;hb=528ca5c9afc87d2d698ce64b29cc9b069d09894f;hp=d8e7f2445da61fe07b8585e39fa6e7331033f282;hpb=8a63bcebf2d93260eca24ae46b5db3f0fcd3df06;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R068-Dipper.el b/lisp/utf-2000/Ideograph-R068-Dipper.el
index d8e7f24..1a35ab2 100644
--- a/lisp/utf-2000/Ideograph-R068-Dipper.el
+++ b/lisp/utf-2000/Ideograph-R068-Dipper.el
@@ -17,7 +17,12 @@
     (=daikanwa		. 13489)	; &I-M-13489;
     (=shinjigen		.  3210)	; 斗
     (->subsumptive
-     ((==ucs@unicode	  . #x6597)	; &g2-AJ1-03143;
+     ((=decomposition@cid
+       ((=ucs		    . #x6597)	; 斗
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x6597)	; &g2-AJ1-03143;
       (==adobe-japan1-0	  . 03143)	; &g2-AJ1-03143;
       (==gb2312		  . #x3637)	; &g2-AJ1-03143; [22-23]
       (==ks-x1001	  . #x5460)	; &g2-AJ1-03143; [52-64]
@@ -65,36 +70,57 @@
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs		. #x6598)	; 斘
+    (=adobe-japan1-6	. 21686)	; &I-AJ1-21686;
+    (=jis-x0212		. #x415B)	; &I-JSP-415B; [33-59]
+    (=cns11643-4	. #x2441)	; &I-C4-2441; [04-33]
+    (=daikanwa		. 13491)	; &I-M-13491;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x6598)	; 斘
 	)
-       ((=ucs		    . #x81FE)	; 臾
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x6598)	; &g2-AJ1-21686;
+      (==adobe-japan1-6	  . 21686)	; &g2-AJ1-21686;
+      (==jis-x0212	  . #x415B)	; &g2-AJ1-21686; [33-59]
+      (==daikanwa	  . 13491)	; &g2-AJ1-21686;
+      (->subsumptive
+       ((===daikanwa	    . 13491)	; &R-M-13491;
 	)
-       ((=big5-cdp	    . #x8958)	; &CDP-8958;
+       ((===jis-x0212	    . #x415B)	; &R-JSP-415B; [33-59]
+	)
+       ((===adobe-japan1-6  . 21686)	; &R-AJ1-21686;
+	)
+       ((===ucs@unicode	    . #x6598)	; &R-UU+6598;
 	))
       )
-     ((=ucs		  . #x6597)	; 斗
+     ((==ucs@cns	  . #x6598)	; &g2-CU+6598;
+      (==cns11643-4	  . #x2441)	; &g2-CU+6598; [04-33]
       ))
-    (=ruimoku-v6	. #xE06A)	; &RUI6-E06A;
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (=ucs		. #x6598)	; 斘
-    (->subsumptive
-     ((=ucs@unicode	  . #x6598)	; &JSP-415B;
-      (=jis-x0212	  . #x415B)	; &JSP-415B; [33-59]
-      (=daikanwa	  . 13491)	; &I-M-13491;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x200D4)	; 𠃔
       )
-     ((=cns11643-4	  . #x2441)	; &C4-2441; [04-33]
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=ucs		. #x2306D)	; 𣁭
+    (->subsumptive
+     ((==ucs@iso	  . #x2306D)	; &g2-IU-0002306D;
+      (->subsumptive
+       ((===ucs@iso	    . #x2306D)	; &R-U-0002306D;
+	)
+       ((=hanziku-6	    . #xD1F2)	; &HZK06-D1F2;
+	))
       ))
     ))
 (define-char
@@ -224,7 +250,12 @@
     (=daikanwa		. 13501)	; &I-M-13501;
     (=shinjigen		.  3212)	; 料
     (->subsumptive
-     ((==ucs@unicode	  . #x6599)	; &g2-AJ1-03977;
+     ((=decomposition@cid
+       ((=ucs		    . #x6599)	; 料
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x6599)	; &g2-AJ1-03977;
       (==adobe-japan1-0	  . 03977)	; &g2-AJ1-03977;
       (==gb2312		  . #x414F)	; &g2-AJ1-03977; [33-47]
       (==ks-x1001	  . #x5679)	; &g2-AJ1-03977; [54-89]
@@ -372,12 +403,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x89D2)	; &GT-47107;
-      (=jis-x0208	  . #x3351)	; &GT-47107; [19-49]
-      (=ks-x1001	  . #x4A47)	; &I-K0-4A47; [42-39]
-      (=cns11643-1	  . #x4B45)	; &I-C1-4B45; [43-37]
-      (=jis-x0213-1	  . #x3351)	; &I-JX1-3351; [19-49]
-      (=daikanwa	  . 35003)	; &I-M-35003;
+     ((=ucs@jis		  . #x89D2)	; &AJ1-01455;
+      (=adobe-japan1-0	  . 01455)	; &AJ1-01455;
       )
      ((=ucs		  . #x6597)	; 斗
       ))
@@ -395,7 +422,24 @@
     (=daikanwa		. 13508)	; &I-M-13508;
     (=shinjigen		.  3213)	; &AJ1-05076;
     (->subsumptive
-     ((==ucs@jis	  . #x659B)	; &g2-AJ1-05076;
+     ((=decomposition@cid
+       ((=ucs		    . #x659B)	; 斛
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@cns	    . #x89D2)	; &g2-AJ1-01455;
+	(==ucs@jis	    . #x89D2)	; &g2-AJ1-01455;
+	(==ucs@ks	    . #x89D2)	; &g2-AJ1-01455;
+	(==adobe-japan1-0   . 01455)	; &g2-AJ1-01455;
+	)
+       ((==ucs@unicode	    . #x6597)	; &g2-AJ1-03143;
+	(==adobe-japan1-0   . 03143)	; &g2-AJ1-03143;
+	))
+      (==ucs@jis	  . #x659B)	; &g2-AJ1-05076;
       (==ucs@ks		  . #x659B)	; &g2-AJ1-05076;
       (==adobe-japan1-0	  . 05076)	; &g2-AJ1-05076;
       (==ks-x1001	  . #x4D57)	; &g2-AJ1-05076; [45-55]
@@ -443,16 +487,48 @@
     (=ucs@unicode	. #x659B)	; &G0-757A;
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x757A)	; &G0-757A; [85-90]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@unicode	    . #x89D2)	; &g2-MJ024282;
+	(==mj		    . 024282)	; &g2-MJ024282;
+	)
+       ((==ucs@unicode	    . #x6597)	; &g2-AJ1-03143;
+	(==adobe-japan1-0   . 03143)	; &g2-AJ1-03143;
+	))
+      (==ucs@unicode	  . #x659B)	; &g2-UU+659B;
+      (==ucs@JP/hanazono  . nil)
+      (==gb2312		  . #x757A)	; &g2-UU+659B; [85-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4F59)	; 余
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
     (=ucs		. #x659C)	; 斜
     (=big5		. #xB1D7)	; &I-B-B1D7;
     (->subsumptive
-     ((=hanyo-denshi/ks	  . 151460)	; &HD-KS-151460;
-      (=daikanwa	  . 13509)	; &HD-KS-151460;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs-var-006	    . #x4F59)	; &U-v006+4F59;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=adobe-japan1-4	  . 13805)	; &AJ1-13805;
+      (=hanyo-denshi/ks	  . 151460)	; &AJ1-13805;
+      (=daikanwa	  . 13509)	; &I-M-13509;
       (->subsumptive
        ((=decomposition@hanyo-denshi
 	 ((=ucs		      . #x659C)	; 斜
@@ -467,9 +543,25 @@
 	 ((===hanyo-denshi/ks . 151460)	; &R-HD-KS-151460;
 	  (=hanyo-denshi/ks/mf . #x3B2A)	; &R-HD-KS-151460;
 	  ))
+	)
+       ((=decomposition@cid
+	 ((=ucs		      . #x659C)	; 斜
+	  )
+	 ((=ucs		      . #xE0101)	; 󠄁
+	  ))
+	(==adobe-japan1-4   . 13805)	; &g2-AJ1-13805;
 	))
       )
-     ((=ucs@unicode	  . #x659C)	; &AJ1-02300;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x4F59)	; &AJ1-03880;
+	(=adobe-japan1-0    . 03880)	; &AJ1-03880;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=ucs@unicode	  . #x659C)	; &AJ1-02300;
       (=adobe-japan1-0	  . 02300)	; &AJ1-02300;
       (=jis-x0208	  . #x3C50)	; &I-J90-3C50; [28-48]
       (=gb2312		  . #x5031)	; &I-G0-5031; [48-17]
@@ -481,11 +573,25 @@
       (=gt-k		  . 07778)	; &I-GT-K07778;
       (=gt-pj-1		  . #x3C50)	; &I-GT-17075; [28-48]
       (->subsumptive
-       ((=decomposition@hanyo-denshi
+       ((=decomposition@cid
+	 ((=ucs		      . #x659C)	; 斜
+	  )
+	 ((=ucs		      . #xE0100)	; 󠄀
+	  ))
+	(=decomposition@hanyo-denshi
 	 ((=ucs		      . #x659C)	; 斜
 	  )
 	 ((=ucs		      . #xE0102)	; 󠄂
 	  ))
+	(ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=gt-k	      . 02663)	; &GT-K02663;
+	  )
+	 ((==ucs@unicode      . #x6597)	; &g2-AJ1-03143;
+	  (==adobe-japan1-0   . 03143)	; &g2-AJ1-03143;
+	  ))
 	(==ucs@unicode	    . #x659C)	; &g2-AJ1-02300;
 	(==adobe-japan1-0   . 02300)	; &g2-AJ1-02300;
 	(==gb2312	    . #x5031)	; &g2-AJ1-02300; [48-17]
@@ -533,46 +639,94 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x659D)	; 斝
+    (=adobe-japan1-5	. 16881)	; &I-AJ1-16881;
+    (=jis-x0212		. #x415C)	; &I-JSP-415C; [33-60]
+    (=iso-ir165		. #x7C63)	; &I-EGB-7C63; [92-67]
+    (=cns11643-2	. #x3C3F)	; &I-C2-3C3F; [28-31]
+    (=jis-x0213-1	. #x752A)	; &I-JX1-752A; [85-10]
     (=big5		. #xD97A)	; &I-B-D97A;
+    (=daikanwa		. 13512)	; &I-M-13512;
+    (=jef-china3	. #x50DD)	; &I-JC3-50DD;
     (->subsumptive
-     ((=ucs@unicode	  . #x659D)	; &AJ1-16881;
-      (=adobe-japan1-5	  . 16881)	; &AJ1-16881;
-      (=jis-x0212	  . #x415C)	; &I-JSP-415C; [33-60]
-      (=iso-ir165	  . #x7C63)	; &I-EGB-7C63; [92-67]
-      (=jis-x0213-1	  . #x752A)	; &I-JX1-752A; [85-10]
-      (=daikanwa	  . 13512)	; &I-M-13512;
-      (=jef-china3	  . #x50DD)	; &I-JC3-50DD;
+     ((=decomposition@cid
+       ((=ucs		    . #x659D)	; 斝
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x659D)	; &g2-AJ1-16881;
+      (==adobe-japan1-5	  . 16881)	; &g2-AJ1-16881;
+      (==jis-x0212	  . #x415C)	; &g2-AJ1-16881; [33-60]
+      (==iso-ir165	  . #x7C63)	; &g2-AJ1-16881; [92-67]
+      (==jis-x0213-1	  . #x752A)	; &g2-AJ1-16881; [85-10]
+      (==daikanwa	  . 13512)	; &g2-AJ1-16881;
+      (==jef-china3	  . #x50DD)	; &g2-AJ1-16881;
+      (->subsumptive
+       ((===daikanwa	    . 13512)	; &R-M-13512;
+	)
+       ((===jis-x0212	    . #x415C)	; &R-JX1-752A; [33-60]
+	(===jis-x0213-1	    . #x752A)	; &R-JX1-752A; [85-10]
+	)
+       ((===adobe-japan1-5  . 16881)	; &R-AJ1-16881;
+	)
+       ((===jef-china3	    . #x50DD)	; &R-JC3-50DD;
+	)
+       ((===ucs@unicode	    . #x659D)	; &R-UU+659D;
+	))
       )
-     ((=cns11643-2	  . #x3C3F)	; &C2-3C3F; [28-31]
+     ((==ucs@cns	  . #x659D)	; &g2-CU+659D;
+      (==cns11643-2	  . #x3C3F)	; &g2-CU+659D; [28-31]
       ))
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x2307C)	; 𣁼
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x2307C)	; 𣁼
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x3AC4)	; 㫄
+      )
+     ((=ucs		  . #x6597)	; 斗
       ))
-    (ideographic-radical . 68)	; ⽃
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=daikanwa		. 13513)	; &M-13513;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x2307C)	; 𣁼
+    (=ucs		. #x2307C)	; 𣁼
+    (=cns11643-6	. #x495D)	; &I-C6-495D; [41-61]
+    (=daikanwa		. 13513)	; &I-M-13513;
+    (<-original
+     ((=daikanwa	  . 13523)	; &M-13523;
       ))
-    (ideographic-radical . 68)	; ⽃
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=>>ucs@iso		. #x2307C)	; &G-IU+2307C;
+    (<-original*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((=ucs@iso		  . #x2307C)	; &U-0002307C;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x3AC4)	; &AJ1-20135;
+	(=adobe-japan1-5    . 20135)	; &AJ1-20135;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=>>daikanwa	  . 13513)	; &G-M-13513;
+      (->subsumptive
+       ((==daikanwa	    . 13513)	; &g2-M-13513;
+	))
       )
-     ((=cns11643-6	  . #x495D)	; &C6-495D; [41-61]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs-var-002	    . #x3AC4)	; &U-v002+3AC4;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=>>ucs@iso	  . #x2307C)	; &G-IU+2307C;
+      (->subsumptive
+       ((==ucs@iso	    . #x2307C)	; &g2-IU-0002307C;
+	)
+       ((==ucs@cns	    . #x2307C)	; &g2-CU+2307C;
+	(==cns11643-6	    . #x495D)	; &g2-CU+2307C; [41-61]
+	))
       ))
     ))
 (define-char
@@ -612,16 +766,71 @@
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x81FE)	; 臾
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (sound@ja/on	"yu")
     (=ucs		. #x659E)	; 斞
     (=big5		. #xD97B)	; &I-B-D97B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x659E)	; 斞
+      ))
+    (ideographic-radical . 68)	; ⽃
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@jis		  . #x81FE)	; &AJ1-06295;
+      (=adobe-japan1-0	  . 06295)	; &AJ1-06295;
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=mj		. 013067)	; &MJ013067;
+    (=koseki		. 151540)	; &MJ013067;
+    (=daikanwa		. 13516)	; &I-M-13516;
     (->subsumptive
-     ((=daikanwa	  . 13516)	; &M-13516;
+     ((==koseki		  . 151540)	; &g2-M-13516;
+      (==daikanwa	  . 13516)	; &g2-M-13516;
       )
-     ((=ucs@unicode	  . #x659E)	; &UU+659E;
+     ((==mj		  . 013067)	; &g2-MJ013067;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x659E)	; 斞
+      ))
+    (ideographic-radical . 68)	; ⽃
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x81FE)	; &C1-4F3B;
+      (=gb2312		  . #x7427)	; &C1-4F3B; [84-07]
+      (=ks-x1001	  . #x6B2C)	; &I-K0-6B2C; [75-12]
+      (=cns11643-1	  . #x4F3B)	; &I-C1-4F3B; [47-27]
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=ucs@unicode	. #x659E)	; &C2-3C40;
+    (=ucs@JP/hanazono	. nil)
+    (=cns11643-2	. #x3C40)	; &C2-3C40; [28-32]
+    (->subsumptive
+     ((==ucs@unicode	  . #x659E)	; &g2-UU+659E;
+      (==ucs@JP/hanazono  . nil)
       )
-     ((=cns11643-2	  . #x3C40)	; &C2-3C40; [28-32]
+     ((==ucs@cns	  . #x659E)	; &g2-CU+659E;
+      (==cns11643-2	  . #x3C40)	; &g2-CU+659E; [28-32]
       ))
     ))
 (define-char
@@ -652,7 +861,12 @@
     (=daikanwa		. 13517)	; &I-M-13517;
     (=shinjigen		.  3216)	; &AJ1-05077;
     (->subsumptive
-     ((=decomposition@hanyo-denshi
+     ((=decomposition@cid
+       ((=ucs		    . #x659F)	; 斟
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
        ((=ucs		    . #x659F)	; 斟
 	)
        ((=ucs		    . #xE0101)	; 󠄁
@@ -814,49 +1028,80 @@
   '((ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x501D)	; 倝
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
     (=ucs		. #x65A1)	; 斡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x65A1)	; 斡
+      ))
+    (ideographic-radical . 68)	; ⽃
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs@unicode	  . #x501D)	; &AJ1-21127;
+      (=adobe-japan1-6	  . 21127)	; &AJ1-21127;
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=ucs@unicode	. #x65A1)	; &AJ1-01146;
+    (=adobe-japan1-0	. 01146)	; &AJ1-01146;
+    (=jis-x0208		. #x3036)	; &I-J90-3036; [16-22]
+    (=gb2312		. #x4E53)	; &I-G0-4E53; [46-51]
+    (=ks-x1001		. #x6456)	; &I-K0-6456; [68-54]
+    (=cns11643-1	. #x687E)	; &I-C1-687E; [72-94]
+    (=jis-x0213-1	. #x3036)	; &I-JX1-3036; [16-22]
+    (=big5		. #xBA57)	; &I-B-BA57;
+    (=gt		. 17089)	; &I-GT-17089;
+    (=gt-k		. 11096)	; &I-GT-K11096;
+    (=gt-pj-1		. #x3036)	; &I-GT-17089; [16-22]
+    (=daikanwa		. 13522)	; &I-M-13522;
+    (=shinjigen		.  3217)	; &AJ1-01146;
     (->subsumptive
-     ((=ucs@unicode	  . #x65A1)	; &AJ1-01146;
-      (=adobe-japan1-0	  . 01146)	; &AJ1-01146;
-      (=jis-x0208	  . #x3036)	; &I-J90-3036; [16-22]
-      (=gb2312		  . #x4E53)	; &I-G0-4E53; [46-51]
-      (=ks-x1001	  . #x6456)	; &I-K0-6456; [68-54]
-      (=cns11643-1	  . #x687E)	; &I-C1-687E; [72-94]
-      (=jis-x0213-1	  . #x3036)	; &I-JX1-3036; [16-22]
-      (=big5		  . #xBA57)	; &I-B-BA57;
-      (=gt		  . 17089)	; &I-GT-17089;
-      (=gt-pj-1		  . #x3036)	; &I-GT-17089; [16-22]
-      (=daikanwa	  . 13522)	; &I-M-13522;
-      (=shinjigen	  .  3217)	; &AJ1-01146;
+     ((=decomposition@cid
+       ((=ucs		    . #x65A1)	; 斡
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x65A1)	; &g2-AJ1-01146;
+      (==adobe-japan1-0	  . 01146)	; &g2-AJ1-01146;
+      (==gb2312		  . #x4E53)	; &g2-AJ1-01146; [46-51]
+      (==ks-x1001	  . #x6456)	; &g2-AJ1-01146; [68-54]
+      (==jis-x0208	  . #x3036)	; &g2-AJ1-01146; [16-22]
+      (==jis-x0213-1	  . #x3036)	; &g2-AJ1-01146; [16-22]
+      (==gt		  . 17089)	; &g2-AJ1-01146;
+      (==gt-k		  . 11096)	; &g2-AJ1-01146;
+      (==daikanwa	  . 13522)	; &g2-AJ1-01146;
+      (==shinjigen	  .  3217)	; &g2-AJ1-01146;
       (->subsumptive
-       ((==ucs@unicode	    . #x65A1)	; &g2-AJ1-01146;
-	(==adobe-japan1-0   . 01146)	; &g2-AJ1-01146;
-	(==gb2312	    . #x4E53)	; &g2-AJ1-01146; [46-51]
-	(==ks-x1001	    . #x6456)	; &g2-AJ1-01146; [68-54]
-	(==jis-x0208	    . #x3036)	; &g2-AJ1-01146; [16-22]
-	(==jis-x0213-1	    . #x3036)	; &g2-AJ1-01146; [16-22]
-	(==gt		    . 17089)	; &g2-AJ1-01146;
-	(==daikanwa	    . 13522)	; &g2-AJ1-01146;
-	(==shinjigen	    .  3217)	; &g2-AJ1-01146;
-	(->subsumptive
-	 ((===daikanwa	      . 13522)	; &R-M-13522;
-	  )
-	 ((===jis-x0208	      . #x3036)	; &R-J0-3036; [16-22]
-	  (===jis-x0213-1     . #x3036)	; &R-J0-3036; [16-22]
-	  )
-	 ((===adobe-japan1-0  . 01146)	; &R-AJ1-01146;
-	  )
-	 ((===ucs@ks	      . #x65A1)	; &R-K0-6456;
-	  (===ks-x1001	      . #x6456)	; &R-K0-6456; [68-54]
-	  )
-	 ((===ucs@unicode     . #x65A1)	; &R-UU+65A1;
-	  )
-	 ((===gt	      . 17089)	; &R-GT-17089;
-	  ))
+       ((===daikanwa	    . 13522)	; &R-M-13522;
+	)
+       ((===jis-x0208	    . #x3036)	; &R-J0-3036; [16-22]
+	(===jis-x0213-1	    . #x3036)	; &R-J0-3036; [16-22]
 	)
-       ((==ucs@cns	    . #x65A1)	; &g2-CU+65A1;
-	(==cns11643-1	    . #x687E)	; &g2-CU+65A1; [72-94]
+       ((===adobe-japan1-0  . 01146)	; &R-AJ1-01146;
+	)
+       ((===ucs@ks	    . #x65A1)	; &R-K0-6456;
+	(===ks-x1001	    . #x6456)	; &R-K0-6456; [68-54]
+	)
+       ((===ucs@unicode	    . #x65A1)	; &R-UU+65A1;
+	)
+       ((===gt		    . 17089)	; &R-GT-17089;
+	(===gt-k	    . 11096)	; &R-GT-17089;
 	))
+      )
+     ((==ucs@cns	  . #x65A1)	; &g2-CU+65A1;
+      (==cns11643-1	  . #x687E)	; &g2-CU+65A1; [72-94]
       ))
     ))
 (define-char
@@ -941,6 +1186,14 @@
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>jis-x0208@1997	  . #x322B)	; &J97-322B; [18-11]
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
     (=ucs		. #x65A2)	; 斢
     ))
 (define-char
@@ -950,13 +1203,47 @@
     (ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x9EC3)	; 黃
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=+>ucs@cns		. #x65A2)	; &o-CU+65A2;
+    (=big5		. #xE9B2)	; &o-CU+65A2;
     (->subsumptive
-     ((=ucs@big5	  . #x65A2)	; &M-13528;
-      (=big5		  . #xE9B2)	; &M-13528;
-      (=daikanwa	  . 13528)	; &I-M-13528;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x9EC3)	; &GT-65324;
+	(=ks-x1001	    . #x7C5C)	; &GT-65324; [92-60]
+	(=jis-x0213-1	    . #x7E71)	; &I-JX1-7E71; [94-81]
+	(=daikanwa	    . 47926)	; &I-M-47926;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=daikanwa	  . 13528)	; &M-13528;
+      (->subsumptive
+       ((==daikanwa	    . 13528)	; &g2-M-13528;
+	))
       )
-     ((=ucs@cns		  . #x65A2)	; &C2-573D;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x6327)	; &C1-6327; [67-07]
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=ucs@cns		  . #x65A2)	; &C2-573D;
       (=cns11643-2	  . #x573D)	; &C2-573D; [55-29]
+      (->subsumptive
+       ((==ucs@cns	    . #x65A2)	; &g2-CU+65A2;
+	(==cns11643-2	    . #x573D)	; &g2-CU+65A2; [55-29]
+	))
       ))
     ))
 (define-char
@@ -966,20 +1253,104 @@
     (ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs@unicode	. #x65A2)	; &EGB-2D4E;
-    (=iso-ir165		. #x2D4E)	; &EGB-2D4E; [13-46]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x9EC4)	; 黄
+      )
+     ((=ucs		  . #x6597)	; 斗
+      ))
+    (=+>ucs@unicode	. #x65A2)	; &o-UU+65A2;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x9EC4)	; &AJ1-01323;
+	(=adobe-japan1-0    . 01323)	; &AJ1-01323;
+	)
+       ((=ucs		    . #x6597)	; 斗
+	))
+      (=ucs@unicode	  . #x65A2)	; &EGB-2D4E;
+      (=ucs@JP/hanazono	  . nil)
+      (=iso-ir165	  . #x2D4E)	; &EGB-2D4E; [13-46]
+      (->subsumptive
+       ((==ucs@unicode	    . #x65A2)	; &g2-UU+65A2;
+	(==ucs@JP/hanazono  . nil)
+	(==iso-ir165	    . #x2D4E)	; &g2-UU+65A2; [13-46]
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 68)	; ⽃
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x659E)	; 斞
+      )
+     ((=>ucs@component	  . #x6708)	; &A-compU+6708;
+      (=>iwds-1		  .  0053)	; &A-compU+6708;
+      ))
+    (=ucs		. #x2BFF7)	; ð«¿·
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2BFF7)	; ð«¿·
+      ))
+    (ideographic-radical . 68)	; ⽃
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs@unicode	  . #x659E)	; &C2-3C40;
+      (=cns11643-2	  . #x3C40)	; &C2-3C40; [28-32]
+      )
+     ((=>ucs@component	  . #x6708)	; &A-compU+6708;
+      (=>iwds-1		  .  0053)	; &A-compU+6708;
+      ))
+    (=ucs@JP/hanazono	. #x2BFF7)	; &RUI6-E06A;
+    (=ruimoku-v6	. #xE06A)	; &RUI6-E06A;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2BFF7)	; &g2-hanaJU+2BFF7;
+      )
+     ((==ruimoku-v6	  . #xE06A)	; &g2-RUI6-E06A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 68)	; ⽃
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x65A3)	; 斣
+    (=adobe-japan1-6	. 21688)	; &I-AJ1-21688;
+    (=jis-x0212		. #x415E)	; &I-JSP-415E; [33-62]
+    (=cns11643-4	. #x563F)	; &I-C4-563F; [54-31]
+    (=daikanwa		. 13529)	; &I-M-13529;
     (->subsumptive
-     ((=ucs@unicode	  . #x65A3)	; &JSP-415E;
-      (=jis-x0212	  . #x415E)	; &JSP-415E; [33-62]
-      (=daikanwa	  . 13529)	; &I-M-13529;
+     ((=decomposition@cid
+       ((=ucs		    . #x65A3)	; 斣
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x65A3)	; &g2-AJ1-21688;
+      (==adobe-japan1-6	  . 21688)	; &g2-AJ1-21688;
+      (==jis-x0212	  . #x415E)	; &g2-AJ1-21688; [33-62]
+      (==daikanwa	  . 13529)	; &g2-AJ1-21688;
+      (->subsumptive
+       ((===daikanwa	    . 13529)	; &R-M-13529;
+	)
+       ((===jis-x0212	    . #x415E)	; &R-JSP-415E; [33-62]
+	)
+       ((===adobe-japan1-6  . 21688)	; &R-AJ1-21688;
+	)
+       ((===ucs@unicode	    . #x65A3)	; &R-UU+65A3;
+	))
       )
-     ((=cns11643-4	  . #x563F)	; &C4-563F; [54-31]
+     ((==ucs@cns	  . #x65A3)	; &g2-CU+65A3;
+      (==cns11643-4	  . #x563F)	; &g2-CU+65A3; [54-31]
       ))
     ))
 (define-char