X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R079-Weapon.el;h=b9a007dcafc590da4c819b5f9f136be590f662ce;hb=e48dd994be917eb084f043e80a407d98c3e46535;hp=6ccaf5c0b750e8b4fa0ffd42f4454a4c97bac199;hpb=8ede7b3c6b4b1e7bd6c6c67920ede5fc2a935f0d;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 6ccaf5c..b9a007d 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -3,6 +3,26 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (=>ucs@component	. #x6BB3)	; &A-compU+6BB3;
+    (=>iwds-1		.  0220)	; &A-compU+6BB3;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x6BB3)	; &A-compU+6BB3;
+      (=>iwds-1		  .  0220)	; &A-compU+6BB3;
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x51E0)	; &A-compU+51E0;
+      (=>iwds-1		  .  0119)	; &A-compU+51E0;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
     (=ucs		. #x6BB3)	; 殳
     ))
 (define-char
@@ -12,6 +32,14 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x51E0)	; 几
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
     (=ucs@unicode	. #x6BB3)	; &MJ014908;
     (=mj		. 014908)	; &MJ014908;
     (=adobe-japan1-0	. 05364)	; &I-AJ1-05364;
@@ -74,13 +102,31 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x6BB3)	; 殳
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x513F)	; 儿
       )
-     ((=ucs		  . #xE0102)	; 󠄂
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=mj		. 014909)	; &MJ014909;
+    (=hanyo-denshi/ks	. 188360)	; &MJ014909;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x6BB3)	; 殳
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==mj		  . 014909)	; &g2-MJ014909;
+      (==hanyo-denshi/ks  . 188360)	; &g2-MJ014909;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 188360)	; &R-HD-KS-188360;
+	(=hanyo-denshi/ks/mf . #x4994)	; &R-HD-KS-188360;
+	)
+       ((===mj		    . 014909)	; &R-MJ014909;
+	))
       ))
-    (=hanyo-denshi/ks	. 188360)	; &HD-KS-188360;
-    (=hanyo-denshi/ks/mf . #x4994)	; &HD-KS-188360;
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
@@ -363,6 +409,15 @@
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@component	  . #x7680)	; &A-compU+7680;
+      (=>iwds-1		  .  0355)	; &A-compU+7680;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
     (=ucs		. #x23A98)	; 𣪘
     (=>jis-x0213-2	. #x6E23)	; 𣪘 [78-03]
     ))
@@ -379,7 +434,8 @@
       )
      ((=big5-cdp	  . #x8B7C)	; &CDP-8B7C;
       )
-     ((=ucs		  . #x6BB3)	; 殳
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
       ))
     (=big5-cdp		. #x8AD4)	; &CDP-8AD4;
     (<-simplified@misc
@@ -391,7 +447,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=big5-cdp	    . #x8B7C)	; &CDP-8B7C;
+       ((==big5-cdp	    . #x8B7C)	; &g2-CDP-8B7C;
 	)
        ((==ucs@unicode	    . #x6BB3)	; &g2-UU+6BB3;
 	))
@@ -647,16 +703,75 @@
      ((=ucs		  . #x6BB3)	; 殳
       ))
     (=ucs		. #x23A8A)	; 𣪊
-    (=gt-k		. 07489)	; &I-GT-K07489;
-    (=gt-pj-k2		. #x3F4F)	; 𣪊 [31-47]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23A8A)	; 𣪊
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp	  . #x8D44)	; &CDP-8D44;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@iso		. #x23A8A)	; &GT-K07489;
+    (=gt-k		. 07489)	; &GT-K07489;
+    (=gt-pj-k2		. #x3F4F)	; &GT-K07489; [31-47]
     (->subsumptive
      ((==gt-k		  . 07489)	; &g2-GT-K07489;
+      (==gt-pj-k2	  . #x3F4F)	; &g2-GT-K07489; [31-47]
       )
      ((==ucs@iso	  . #x23A8A)	; &g2-IU-00023A8A;
       ))
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp-var-002  . #x8C7A)	; &CDP-v002-8C7A;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs		. #x2C1A3)	; 𬆣
+    (<-same
+     ((=ucs		  . #x2BA3B)	; 𫨻
+      )
+     ((=ucs		  . #x6BB5)	; 段
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2C1A3)	; 𬆣
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp-var-002  . #x8C7A)	; &CDP-v002-8C7A;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@JP/hanazono	. #x2C1A3)	; &hanaJU+2C1A3;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2C1A3)	; &g2-hanaJU+2C1A3;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x23A8B)	; 𣪋
@@ -702,12 +817,41 @@
       )
      ((=ucs		  . #x6BB3)	; 殳
       ))
+    (sound@ja/on	"siN")
     (=ucs		. #x3C80)	; 㲀
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C80)	; 㲀
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x8FB0)	; è¾°
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@unicode	. #x3C80)	; &MJ001981;
+    (=mj		. 001981)	; &MJ001981;
+    (=cns11643-4	. #x324F)	; &I-C4-324F; [18-47]
+    (=koseki		. 188690)	; &MJ001981;
+    (=daikanwa		. 16632)	; &I-M-16632;
     (->subsumptive
-     ((=daikanwa	  . 16632)	; &M-16632;
+     ((==daikanwa	  . 16632)	; &g2-M-16632;
+      )
+     ((==mj		  . 001981)	; &g2-MJ001981;
+      (==koseki		  . 188690)	; &g2-MJ001981;
       )
-     ((=ucs@unicode	  . #x3C80)	; &C4-324F;
-      (=cns11643-4	  . #x324F)	; &C4-324F; [18-47]
+     ((==ucs@unicode	  . #x3C80)	; &g2-UU+3C80;
+      (==ucs@JP/hanazono  . nil)
+      )
+     ((==ucs@cns	  . #x3C80)	; &g2-CU+3C80;
+      (==cns11643-4	  . #x324F)	; &g2-CU+3C80; [18-47]
       ))
     ))
 (define-char
@@ -738,7 +882,8 @@
      ((=ucs@unicode	  . #x58F0)	; &AJ1-02656;
       (=adobe-japan1-0	  . 02656)	; &AJ1-02656;
       )
-     ((=ucs		  . #x6BB3)	; 殳
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
       ))
     (=ucs@unicode	. #x6BB8)	; &JSP-4630;
     (=jis-x0212		. #x4630)	; &JSP-4630; [38-16]
@@ -1053,62 +1198,6 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x6BBB)	; æ®»
-    (=adobe-japan1-0	. 01450)	; &I-AJ1-01450;
-    (=jis-x0208		. #x334C)	; &I-J90-334C; [19-44]
-    (=cns11643-3	. #x3665)	; &I-C3-3665; [22-69]
-    (=jis-x0213-1	. #x334C)	; &I-JX1-334C; [19-44]
-    (=gb12345		. #x3F47)	; æ®» [31-39]
-    (=gt		. 21325)	; &I-GT-21325;
-    (=gt-k		. 07726)	; &I-GT-K07726;
-    (=gt-pj-1		. #x334C)	; &I-GT-21325; [19-44]
-    (=shinjigen		.  3999)	; æ®»
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6BBC)	; 殼
-      (=jis-x0208	  . #x5D57)	; &I-J90-5D57; [61-55]
-      ))
-    (->subsumptive
-     ((==jis-x0208@1978	  . #x334C)	; &g2-GT-21325; [19-44]
-      (==jis-x0208@1983	  . #x334C)	; &g2-GT-21325; [19-44]
-      (==gt		  . 21325)	; &g2-GT-21325;
-      (==gt-k		  . 07726)	; &g2-GT-21325;
-      (==shinjigen	  .  3999)	; &g2-GT-21325;
-      (->subsumptive
-       ((===jis-x0208@1978  . #x334C)	; &R-J83-334C; [19-44]
-	(===jis-x0208@1983  . #x334C)	; &R-J83-334C; [19-44]
-	)
-       ((===gt		    . 21325)	; &R-GT-21325;
-	(===gt-k	    . 07726)	; &R-GT-21325;
-	))
-      )
-     ((==ucs@unicode	  . #x6BBB)	; &g2-UU+6BBB;
-      (==ucs@JP/hanazono  . nil)
-      (==cns11643-3	  . #x3665)	; &g2-UU+6BBB; [22-69]
-      (==gb12345	  . #x3F47)	; &g2-UU+6BBB; [31-39]
-      (->subsumptive
-       ((===cns11643-3	    . #x3665)	; &R-C3-3665; [22-69]
-	)
-       ((===ucs@unicode	    . #x6BBB)	; &R-UU+6BBB;
-	))
-      )
-     ((==ucs@jis/1990	  . #x6BBB)	; &g2-AJ1-01450;
-      (==ucs@jis/2000	  . #x6BBB)	; &g2-AJ1-01450;
-      (==ucs@jis/2004	  . #x6BBB)	; &g2-AJ1-01450;
-      (==adobe-japan1-0	  . 01450)	; &g2-AJ1-01450;
-      (==jis-x0208@1990	  . #x334C)	; &g2-AJ1-01450; [19-44]
-      (==jis-x0213-1	  . #x334C)	; &g2-AJ1-01450; [19-44]
-      (->subsumptive
-       ((===jis-x0208@1990  . #x334C)	; &R-J90-334C; [19-44]
-	(===jis-x0213-1	    . #x334C)	; &R-J90-334C; [19-44]
-	)
-       ((===adobe-japan1-0  . 01450)	; &R-AJ1-01450;
-	))
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
     (=ucs		. #x23A95)	; 𣪕
     (->subsumptive
      ((=jef-china3	  . #x93C8)	; &JC3-93C8;
@@ -1298,6 +1387,13 @@
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
+    (==>ucs@bucs	. #x6BBC)	; &BUCS+6BBC;
+    ))
+(define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x6BBC)	; &BUCS+6BBC;
+      ))
+    (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x6BBC)	; 殼
@@ -1346,6 +1442,65 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x6BBC)	; &BUCS+6BBC;
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x6BBB)	; æ®»
+    (=adobe-japan1-0	. 01450)	; &I-AJ1-01450;
+    (=jis-x0208		. #x334C)	; &I-J90-334C; [19-44]
+    (=cns11643-3	. #x3665)	; &I-C3-3665; [22-69]
+    (=jis-x0213-1	. #x334C)	; &I-JX1-334C; [19-44]
+    (=gb12345		. #x3F47)	; æ®» [31-39]
+    (=gt		. 21325)	; &I-GT-21325;
+    (=gt-k		. 07726)	; &I-GT-K07726;
+    (=gt-pj-1		. #x334C)	; &I-GT-21325; [19-44]
+    (=shinjigen		.  3999)	; æ®»
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6BBC)	; 殼
+      (=jis-x0208	  . #x5D57)	; &I-J90-5D57; [61-55]
+      ))
+    (->subsumptive
+     ((==jis-x0208@1978	  . #x334C)	; &g2-GT-21325; [19-44]
+      (==jis-x0208@1983	  . #x334C)	; &g2-GT-21325; [19-44]
+      (==gt		  . 21325)	; &g2-GT-21325;
+      (==gt-k		  . 07726)	; &g2-GT-21325;
+      (==shinjigen	  .  3999)	; &g2-GT-21325;
+      (->subsumptive
+       ((===jis-x0208@1978  . #x334C)	; &R-J83-334C; [19-44]
+	(===jis-x0208@1983  . #x334C)	; &R-J83-334C; [19-44]
+	)
+       ((===gt		    . 21325)	; &R-GT-21325;
+	(===gt-k	    . 07726)	; &R-GT-21325;
+	))
+      )
+     ((==ucs@unicode	  . #x6BBB)	; &g2-UU+6BBB;
+      (==ucs@JP/hanazono  . nil)
+      (==cns11643-3	  . #x3665)	; &g2-UU+6BBB; [22-69]
+      (==gb12345	  . #x3F47)	; &g2-UU+6BBB; [31-39]
+      (->subsumptive
+       ((===cns11643-3	    . #x3665)	; &R-C3-3665; [22-69]
+	)
+       ((===ucs@unicode	    . #x6BBB)	; &R-UU+6BBB;
+	))
+      )
+     ((==ucs@jis/1990	  . #x6BBB)	; &g2-AJ1-01450;
+      (==ucs@jis/2000	  . #x6BBB)	; &g2-AJ1-01450;
+      (==ucs@jis/2004	  . #x6BBB)	; &g2-AJ1-01450;
+      (==adobe-japan1-0	  . 01450)	; &g2-AJ1-01450;
+      (==jis-x0208@1990	  . #x334C)	; &g2-AJ1-01450; [19-44]
+      (==jis-x0213-1	  . #x334C)	; &g2-AJ1-01450; [19-44]
+      (->subsumptive
+       ((===jis-x0208@1990  . #x334C)	; &R-J90-334C; [19-44]
+	(===jis-x0213-1	    . #x334C)	; &R-J90-334C; [19-44]
+	)
+       ((===adobe-japan1-0  . 01450)	; &R-AJ1-01450;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
@@ -1644,8 +1799,17 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x282A5)	; 𨊥
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
     (=ucs		. #x23AA0)	; 𣪠
     (=cns11643-6	. #x5421)	; &I-C6-5421; [52-01]
+    (=big5-cdp		. #x8CF6)	; &I-CDP-8CF6;
     (=gt		. 21354)	; &I-GT-21354;
     (=gt-k		. 10381)	; &I-GT-K10381;
     (=gt-pj-4		. #x4522)	; &I-GT-21354; [37-02]
@@ -1665,12 +1829,15 @@
        ((===gt		    . 21354)	; &R-GT-21354;
 	))
       )
-     ((==ucs@unicode	  . #x23AA0)	; &g2-UU+23AA0;
-      (==cns11643-6	  . #x5421)	; &g2-UU+23AA0; [52-01]
+     ((==ucs@iso	  . #x23AA0)	; &g2-CDP-8CF6;
+      (==cns11643-6	  . #x5421)	; &g2-CDP-8CF6; [52-01]
+      (==big5-cdp	  . #x8CF6)	; &g2-CDP-8CF6;
       (->subsumptive
-       ((===ucs@unicode	    . #x23AA0)	; &R-UU+23AA0;
+       ((===big5-cdp	    . #x8CF6)	; &R-CDP-8CF6;
 	)
        ((===cns11643-6	    . #x5421)	; &R-C6-5421; [52-01]
+	)
+       ((===ucs@iso	    . #x23AA0)	; &R-U-00023AA0;
 	))
       ))
     ))
@@ -2449,12 +2616,78 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4286)	; 䊆
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
     (=ucs		. #x6BC7)	; 毇
     (=adobe-japan1-5	. 17899)	; &I-AJ1-17899;
     (=cns11643-2	. #x5770)	; &I-C2-5770; [55-80]
     (=jis-x0213-2	. #x6E26)	; &I-JX2-6E26; [78-06]
     (=big5		. #xE9E5)	; &I-B-E9E5;
     (=daikanwa		. 16679)	; &I-M-16679;
+    (<-formed
+     ((=mj		  . 044390)	; &MJ044390;
+      ))
+    (<-same
+     ((=ucs		  . #x25F66)	; 𥽦
+      (=daikanwa	  . 27190)	; &I-M-27190;
+      )
+     ((=ucs		  . #x25DB5)	; 𥶵
+      (=daikanwa	  . 26728)	; &I-M-26728;
+      )
+     ((=ucs		  . #x25F39)	; 𥼹
+      (=daikanwa	  . 27156)	; &I-M-27156;
+      )
+     ((=ucs		  . #x25F42)	; 𥽂
+      (=daikanwa	  . 27157)	; &I-M-27157;
+      ))
+    (<-same$_1*sources
+     zhengzitong daikanwa)
+    (<-same$_2*sources
+     zhengzitong daikanwa)
+    (<-same$_3*sources
+     jiyun daikanwa)
+    (<-same$_4*sources
+     kangxi daikanwa)
+    (<-same*sources
+     daikanwa)
+    (<-simplified@misc
+     ((=mj		  . 044390)	; &MJ044390;
+      ))
+    (->formed
+     ((=ucs		  . #x25F66)	; 𥽦
+      (=daikanwa	  . 27190)	; &I-M-27190;
+      )
+     ((=ucs		  . #x25F39)	; 𥼹
+      (=daikanwa	  . 27156)	; &I-M-27156;
+      )
+     ((=ucs		  . #x25F42)	; 𥽂
+      (=daikanwa	  . 27157)	; &I-M-27157;
+      )
+     ((=mj		  . 044390)	; &MJ044390;
+      (=daikanwa	  . 27216)	; &I-M-27216;
+      )
+     ((=ucs@unicode	  . #x7CF3)	; &MJ019939;
+      (=mj		  . 019939)	; &MJ019939;
+      ))
+    (->formed$_1*sources
+     zhengzitong)
+    (->formed$_2*sources
+     jiyun)
+    (->formed$_3*sources
+     kangxi)
+    (->formed*sources
+     daikanwa)
+    (->wrong
+     ((=ucs		  . #x25DB5)	; 𥶵
+      ))
+    (->wrong*sources
+     zhengzitong)
     (->subsumptive
      ((==ucs@jis	  . #x6BC7)	; &g2-AJ1-17899;
       (==adobe-japan1-5	  . 17899)	; &g2-AJ1-17899;
@@ -2696,6 +2929,89 @@
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=ucs		. #x23AC2)	; 𣫂
+    (->subsumptive
+     ((==ucs@iso	  . #x23AC2)	; &g2-IU-00023AC2;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs-itaiji-001	  . #x6614)	; &A-U-i001+6614;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs		. #x23AC4)	; 𣫄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23AC4)	; 𣫄
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs-itaiji-002	  . #x6614)	; &U-i002+6614;
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@iso		. #x23AC4)	; &U-00023AC4;
+    (->subsumptive
+     ((==ucs@iso	  . #x23AC4)	; &g2-IU-00023AC4;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x28910)	; 𨤐
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs		. #x23ACB)	; 𣫋
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23ACB)	; 𣫋
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@iso		  . #x28910)	; &C5-3D27;
+      (=cns11643-5	  . #x3D27)	; &C5-3D27; [29-07]
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@iso		. #x23ACB)	; &U-00023ACB;
+    (<-unknown
+     ((=ucs		  . #x7A40)	; 穀
+      ))
+    (->subsumptive
+     ((==ucs@iso	  . #x23ACB)	; &g2-IU-00023ACB;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x23AC9)	; 𣫉
@@ -2791,18 +3107,53 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7B97)	; 算
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (sound@ja/on	"saN")
     (=ucs		. #x23AD1)	; 𣫑
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23AD1)	; 𣫑
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7B97)	; 算
+      )
+     ((=ucs@unicode	  . #x6BB3)	; &MJ014908;
+      (=mj		  . 014908)	; &MJ014908;
+      ))
+    (=ucs@iso		. #x23AD1)	; &C7-4033;
+    (=cns11643-7	. #x4033)	; &C7-4033; [32-19]
+    (=daikanwa		. 16695)	; &I-M-16695;
+    (<-wrong
+     ((=ucs@iso		  . #x23014)	; &C4-5B3B;
+      (=cns11643-4	  . #x5B3B)	; &C4-5B3B; [59-27]
+      (=daikanwa	  . 13419)	; &I-M-13419;
+      ))
+    (<-wrong*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 16695)	; &M-16695;
-      (<-wrong
-       ((=ucs		    . #x23014)	; 𣀔
-	(=daikanwa	    . 13419)	; &I-M-13419;
-	))
-      (<-wrong*sources
-       zhengzitong daikanwa)
+     ((==daikanwa	  . 16695)	; &g2-M-16695;
       )
-     ((=ucs@iso		  . #x23AD1)	; &C7-4033;
-      (=cns11643-7	  . #x4033)	; &C7-4033; [32-19]
+     ((==ucs@iso	  . #x23AD1)	; &g2-IU-00023AD1;
+      (==cns11643-7	  . #x4033)	; &g2-IU-00023AD1; [32-19]
+      (->subsumptive
+       ((===cns11643-7	    . #x4033)	; &R-C7-4033; [32-19]
+	)
+       ((===ucs@iso	    . #x23AD1)	; &R-U-00023AD1;
+	))
       ))
     ))
 (define-char
@@ -2854,18 +3205,68 @@
   '((ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@iwds-1	  . #x777F)	; &A-IWDSU+777F;
+      (=>iwds-1		  .  0306)	; &A-IWDSU+777F;
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
     (=ucs		. #x3C8A)	; 㲊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C8A)	; 㲊
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x25220)	; 𥈠
+      )
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=daikanwa		. 16698)	; &M-16698;
+    (<-wrong
+     ((=ucs		  . #x53E1)	; 叡
+      (=daikanwa	  . 03214)	; &I-M-03214;
+      ))
+    (<-wrong*sources
+     zihui-bu daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 16698)	; &M-16698;
-      (<-wrong
-       ((=ucs		    . #x53E1)	; 叡
-	(=daikanwa	    . 03214)	; &I-M-03214;
-	))
-      (<-wrong*sources
-       zihui-bu daikanwa)
+     ((==daikanwa	  . 16698)	; &g2-M-16698;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3C8A)	; 㲊
+      ))
+    (ideographic-radical . 79)	; ⽎
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x777F)	; 睿
       )
-     ((=ucs@unicode	  . #x3C8A)	; &C3-5825;
-      (=cns11643-3	  . #x5825)	; &C3-5825; [56-05]
+     ((=ucs		  . #x6BB3)	; 殳
+      ))
+    (=ucs@unicode	. #x3C8A)	; &C3-5825;
+    (=cns11643-3	. #x5825)	; &C3-5825; [56-05]
+    (->subsumptive
+     ((==ucs@unicode	  . #x3C8A)	; &g2-UU+3C8A;
+      (==cns11643-3	  . #x5825)	; &g2-UU+3C8A; [56-05]
+      (->subsumptive
+       ((===cns11643-3	    . #x5825)	; &R-C3-5825; [56-05]
+	)
+       ((===ucs@unicode	    . #x3C8A)	; &R-UU+3C8A;
+	))
       ))
     ))
 (define-char
@@ -3497,8 +3898,15 @@
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎
-    (ideographic-strokes . 23)
-    (total-strokes	 . 27)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x7A40)	; 穀
+      )
+     ((=ucs		  . #x6703)	; 會
+      ))
+    (sound@ja/on	"wi")
     (=ucs		. #x23AEA)	; 𣫪
     ))
 (define-char
@@ -3508,7 +3916,24 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 23)
     (total-strokes	 . 27)
-    (=daikanwa		. 16720)	; &M-16720;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs-itaiji-001	  . #x7A40)	; &U-i001+7A40;
+      )
+     ((=ucs@unicode	  . #x6703)	; &AJ1-04171;
+      (=adobe-japan1-0	  . 04171)	; &AJ1-04171;
+      ))
+    (=mj		. 038958)	; &MJ038958;
+    (=koseki		. 189520)	; &MJ038958;
+    (=daikanwa		. 16720)	; &I-M-16720;
+    (->subsumptive
+     ((==daikanwa	  . 16720)	; &g2-M-16720;
+      )
+     ((==mj		  . 038958)	; &g2-MJ038958;
+      (==koseki		  . 189520)	; &g2-MJ038958;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -3517,12 +3942,26 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 23)
     (total-strokes	 . 27)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x2F959)	; 穀
+      )
+     ((=ucs@unicode	  . #x6703)	; &AJ1-04171;
+      (=adobe-japan1-0	  . 04171)	; &AJ1-04171;
+      ))
+    (=ucs@iso		. #x23AEA)	; &U-00023AEA;
     (->subsumptive
      ((=cbeta		  . 00751)	; &CB00751;
       )
      ((=cbeta		  . 00988)	; &CB00988;
       )
-     ((=ucs@iso		  . #x23AEA)	; &HZK06-BE6F;
-      (=hanziku-6	  . #xBE6F)	; &HZK06-BE6F;
+     ((==ucs@iso	  . #x23AEA)	; &g2-IU-00023AEA;
+      (->subsumptive
+       ((===ucs@iso	    . #x23AEA)	; &R-U-00023AEA;
+	)
+       ((=hanziku-6	    . #xBE6F)	; &HZK06-BE6F;
+	))
       ))
     ))