X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R029-Again.el;h=4b247817a65cdfc7865e21196e83e24c9dfacc26;hb=3ab6086db0628e64bbf74bda2f08a798794931ec;hp=a8ae3abca5e2a5ee6aca3a3044d894326614229a;hpb=60bba5889cb014b3007a01e4941247c31cb946a5;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index a8ae3ab..4b24781 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -1,6 +1,15 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
-  '((<-denotational@usage
+  '((ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 0)
+    (total-strokes	 . 2)
+    (=>ucs@component	. #x53C8)	; &A-compU+53C8;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component	  . #x53C8)	; &A-compU+53C8;
+      ))
+    (<-denotational@usage
      ((==>daijiten	  . 01108)	; &A2-DJT-01108;
       ))
     (ideographic-radical . 29)	; ⼜
@@ -263,7 +272,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 29)	; ⼜
+  '((<-denotational@usage
+     ((==>daijiten	  . 01116)	; &A2-DJT-01116;
+      ))
+    (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (ideographic-structure
@@ -279,7 +291,8 @@
     (=mj		. 057133)	; &I-MJ057133;
     (=koseki		. 036250)	; 𭆥
     (<-formed
-     ((=ucs		  . #x53CD)	; 反
+     ((=ucs@unicode	  . #x53CD)	; &AJ1-03411;
+      (=adobe-japan1-0	  . 03411)	; &AJ1-03411;
       ))
     (<-formed*sources
      koseki)
@@ -287,6 +300,9 @@
      ((==ucs@JP/hanazono  . #x2D1A5)	; &g2-MJ057133;
       (==mj		  . 057133)	; &g2-MJ057133;
       (==koseki		  . 036250)	; &g2-MJ057133;
+      (->subsumptive
+       ((===mj		    . 057133)	; &R-MJ057133;
+	))
       ))
     ))
 (define-char
@@ -779,6 +795,9 @@
   '((<-denotational
      ((=>ucs@cognate	  . #x20B1B)	; &A-cgnU+20B1B;
       ))
+    (<-denotational@component
+     ((=>ucs@component	  . #x2A832)	; &A-compU+2A832;
+      ))
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -802,6 +821,8 @@
      ((=ucs		  . #x6534)	; 攴
       )
      ((=ucs		  . #x6535)	; 攵
+      )
+     ((=ucs		  . #x2A832)	; 𪠲
       ))
     ))
 (define-char
@@ -863,6 +884,33 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>big5-cdp@cognate . #x8C79)	; &A-cgnCDP-8C79;
+      ))
+    (<-denotational@component
+     ((=>ucs@component	  . #x2A832)	; &A-compU+2A832;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8C78)	; &CDP-8C78;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=big5-cdp		. #x8C79)	; &CDP-8C79;
+    (->subsumptive
+     ((==big5-cdp	  . #x8C79)	; &g2-CDP-8C79;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
+    (=>big5-cdp@cognate . #x8C79)	; &A-cgnCDP-8C79;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -1216,6 +1264,23 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=>ucs@component	  . #x4E06)	; &A-compU+4E06;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs		. #x53CD)	; 反
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53CD)	; 反
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
     (hanyu-dazidian	1 391 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1225,8 +1290,8 @@
       )
      ((=ucs		  . #x53C8)	; 又
       ))
-    (=ucs		. #x53CD)	; 反
-    (=adobe-japan1-0	. 03411)	; &I-AJ1-03411;
+    (=ucs@unicode	. #x53CD)	; &AJ1-03411;
+    (=adobe-japan1-0	. 03411)	; &AJ1-03411;
     (=jis-x0208		. #x483F)	; &I-J90-483F; [40-31]
     (=gb2312		. #x3734)	; &I-G0-3734; [23-20]
     (=ks-x1001		. #x5A63)	; &I-K0-5A63; [58-67]
@@ -1238,7 +1303,7 @@
     (=gt-pj-1		. #x483F)	; &I-GT-03956; [40-31]
     (=daikanwa		. 03127)	; &I-M-03127;
     (=daijiten		. 01116)	; &I-DJT-01116;
-    (=shinjigen		.  0904)	; 反
+    (=shinjigen		.  0904)	; &AJ1-03411;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1264,15 +1329,6 @@
 	  )
 	 ((=ucs		      . #xE0100)	; 󠄀
 	  ))
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	  (=ucs		      . #x2FF8)	; ⿸
-	  )
-	 ((=ucs		      . #x5382)	; 厂
-	  )
-	 ((==ucs@unicode      . #x53C8)	; &g2-AJ1-03746;
-	  (==adobe-japan1-0   . 03746)	; &g2-AJ1-03746;
-	  ))
 	(==ucs@cns	    . #x53CD)	; &g2-AJ1-03411;
 	(==ucs@jis	    . #x53CD)	; &g2-AJ1-03411;
 	(==ucs@ks	    . #x53CD)	; &g2-AJ1-03411;
@@ -1322,16 +1378,7 @@
       (=gt-k		  . 00476)	; &GT-K00476;
       (=gt-pj-k1	  . #x422F)	; &GT-K00476; [34-15]
       (->subsumptive
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	  (=ucs		      . #x2FF8)	; ⿸
-	  )
-	 ((=ucs		      . #x20086)	; 𠂆
-	  )
-	 ((==ucs@unicode      . #x53C8)	; &g2-AJ1-03746;
-	  (==adobe-japan1-0   . 03746)	; &g2-AJ1-03746;
-	  ))
-	(==ucs@unicode	    . #x53CD)	; &g2-GT-K00476;
+       ((==ucs@unicode	    . #x53CD)	; &g2-GT-K00476;
 	(==ucs@JP/hanazono  . nil)
 	(==gb2312	    . #x3734)	; &g2-GT-K00476; [23-20]
 	(==gt-k		    . 00476)	; &g2-GT-K00476;
@@ -1344,6 +1391,26 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x53CD)	; 反
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x4E06)	; 丆
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs-var-002	. #x53CD)	; &U-v002+53CD;
+    (->subsumptive
+     ((==ucs-var-002	  . #x53CD)	; &g2-U-v002+53CD;
+      ))
+    ))
+(define-char
   '((<-denotational@component
      ((=>ucs@component	  . #x53CE)	; &A-compU+53CE;
       ))
@@ -1552,6 +1619,51 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>big5-cdp@cognate . #x8C79)	; &A-cgnCDP-8C79;
+      ))
+    (<-denotational@component
+     ((=>gt-k		  . 01143)	; &A-GT-K01143;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x5F50)	; &G0-6566;
+      (=gb2312		  . #x6566)	; &G0-6566; [69-70]
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=gt-k		. 01143)	; &U-i003+20B2A;
+    (=gt-pj-k2		. #x3F60)	; &U-i003+20B2A; [31-64]
+    (=ucs-itaiji-003	. #x20B2A)	; &U-i003+20B2A;
+    (->subsumptive
+     ((==ucs-itaiji-003	  . #x20B2A)	; &g2-U-i003+20B2A;
+      )
+     ((==gt-k		  . 01143)	; &g2-GT-K01143;
+      (==gt-pj-k2	  . #x3F60)	; &g2-GT-K01143; [31-64]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@iwds-1	  . #x5F51)	; &A-IWDSU+5F51;
+      (=>iwds-1		  .  37280)	; &A-IWDSU+5F51;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=>gt-k		. 01143)	; &A-GT-K01143;
+    (=>ucs-itaiji-003	. #x20B2A)	; &A-GT-K01143;
+    ))
+(define-char
   '((<-denotational@usage
      ((==>daijiten	  . 01118)	; &A2-DJT-01118;
       ))
@@ -1701,20 +1813,110 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x53D0)	; 叐
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E3F)	; 丿
+      )
+     ((=ucs@unicode	  . #x72AE)	; &CDP-8A66;
+      (=big5-cdp	  . #x8A66)	; &CDP-8A66;
+      ))
+    (=mj		. 057134)	; &MJ057134;
+    (=koseki		. 036460)	; &MJ057134;
+    (->subsumptive
+     ((==mj		  . 057134)	; &g2-MJ057134;
+      (==koseki		  . 036460)	; &g2-MJ057134;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x5C6E)	; &A-compU+5C6E;
+      (=>iwds-1		  .  0096)	; &A-compU+5C6E;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (sound@ja/on/go	"tou")
+    (sound@ja/on/kan	"tAu")
     (=ucs		. #x20B22)	; 𠬢
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B22)	; 𠬢
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (hanyu-dazidian	1 393 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #xFA3C)	; 屮
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs@iso		. #x20B22)	; &MJ032014;
+    (=mj		. 032014)	; &MJ032014;
+    (=cns11643-4	. #x2168)	; &I-C4-2168; [01-72]
+    (=koseki		. 036360)	; &MJ032014;
+    (=daikanwa		. 03133)	; &I-M-03133;
+    (<-interchangeable
+     ((=ucs		  . #x6311)	; 挑
+      (=daikanwa	  . 12055)	; &I-M-12055;
+      ))
+    (<-interchangeable$_1*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-interchangeable*sources
+     shuowen-tongxun-dingsheng daikanwa)
     (->subsumptive
-     ((=daikanwa	  . 03133)	; &M-03133;
+     ((==daikanwa	  . 03133)	; &g2-M-03133;
       )
-     ((hanyu-dazidian	  1 393 13)
-      (=ucs@iso		  . #x20B22)	; &C4-2168;
-      (=cns11643-4	  . #x2168)	; &C4-2168; [01-72]
-      (=hanziku-1	  . #xF6DC)	; &I-HZK01-F6DC;
+     ((==ucs@iso	  . #x20B22)	; &g2-MJ032014;
+      (==mj		  . 032014)	; &g2-MJ032014;
+      (==cns11643-4	  . #x2168)	; &g2-MJ032014; [01-72]
+      (==koseki		  . 036360)	; &g2-MJ032014;
+      (->subsumptive
+       ((===mj		    . 032014)	; &R-MJ032014;
+	)
+       ((===cns11643-4	    . #x2168)	; &R-C4-2168; [01-72]
+	)
+       ((===ucs@iso	    . #x20B22)	; &R-U-00020B22;
+	)
+       ((=hanziku-1	    . #xF6DC)	; &HZK01-F6DC;
+	))
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x20B22)	; 𠬢
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5C71)	; å±±
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=cbeta		. 11783)	; &CB11783;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
@@ -1831,25 +2033,53 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian	1 394 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-      (=ucs		  . #x2FFA)	; ⿺
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=big5-cdp	    . #x89F6)	; &CDP-89F6;
-	)
-       ((=ucs		    . #x53C8)	; 又
-	))
+     ((=big5-cdp-itaiji-001 . #x89F6)	; &CDP-i001-89F6;
       )
-     ((=ucs		  . #x4E36)	; 丶
+     ((=>ucs@component	  . #x53C8)	; &A-compU+53C8;
       ))
     (=ucs		. #x53D1)	; 发
-    (=gb2312		. #x3722)	; &I-G0-3722; [23-02]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53D1)	; 发
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (hanyu-dazidian	1 394 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=big5-cdp-itaiji-001 . #x89F6)	; &CDP-i001-89F6;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs@unicode	. #x53D1)	; &G0-3722;
+    (=gb2312		. #x3722)	; &G0-3722; [23-02]
     (=big5-cdp		. #x8A6A)	; &I-CDP-8A6A;
+    (<-simplified@CN
+     ((=ucs@unicode	  . #x767C)	; &AJ1-05785;
+      (=adobe-japan1-0	  . 05785)	; &AJ1-05785;
+      (=gb12345		  . #x3722)	; &AJ1-05785; [23-02]
+      )
+     ((=ucs@unicode	  . #x9AEE)	; &UU+9AEE;
+      (=gb12345		  . #x7831)	; &UU+9AEE; [88-17]
+      ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x53D1)	; &g2-CDP-8A6A;
+      (==gb2312		  . #x3722)	; &g2-CDP-8A6A; [23-02]
+      (==big5-cdp	  . #x8A6A)	; &g2-CDP-8A6A;
+      (->subsumptive
+       ((===big5-cdp	    . #x8A6A)	; &R-CDP-8A6A;
+	)
+       ((===ucs@unicode	    . #x53D1)	; &R-UU+53D1;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -2029,6 +2259,39 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x37A2)	; 㞢
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs		. #x301B2)	; 𰆲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x301B2)	; 𰆲
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x37A2)	; &C3-2162;
+      (=cns11643-3	  . #x2162)	; &C3-2162; [01-66]
+      (=daikanwa	  . 07829)	; &I-M-07829;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs@JP/hanazono	. #x301B2)	; &hanaJU+301B2;
+    ))
+(define-char
   '((<-denotational@usage
      ((==>ucs@bucs	  . #x4E8B)	; &BUCS+4E8B;
       ))
@@ -2379,6 +2642,40 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4491)	; 䒑
+      )
+     ((=>ucs@component	  . #x53CE)	; &A-compU+53CE;
+      ))
+    (=>ucs-itaiji-003	. #x7077)	; &A-U-i003+7077;
+    (=>ucs-itaiji-004	. #x7077)	; &A-U-i003+7077;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-003	  . #x7077)	; &A-U-i003+7077;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x4491)	; &AJ1-18467;
+      (=adobe-japan1-5	  . 18467)	; &AJ1-18467;
+      )
+     ((=ucs-var-002	  . #x20B1E)	; &U-v002+20B1E;
+      ))
+    (=ucs-itaiji-003	. #x7077)	; &U-i003+7077;
+    (->subsumptive
+     ((==ucs-itaiji-003	  . #x7077)	; &g2-U-i003+7077;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (ideographic-structure
@@ -2415,6 +2712,25 @@
     (=>ucs-itaiji-001	. #x2D1B2)	; &A-GT-K03405;
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs-itaiji-003	  . #x7077)	; &A-U-i003+7077;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs-var-001	  . #x4491)	; &U-v001+4491;
+      )
+     ((=ucs@iso		  . #x20B1E)	; &GT-03950;
+      (=cns11643-6	  . #x2162)	; &GT-03950; [01-66]
+      (=daikanwa	  . 03126)	; &I-M-03126;
+      ))
+    (=ucs-itaiji-004	. #x7077)	; &U-i004+7077;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -2989,18 +3305,35 @@
     (total-strokes	 . 8)
     (hanyu-dazidian	1 397 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4EA0)	; 亠
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=big5-cdp	  . #x89BB)	; &CDP-89BB;
+     ((=ucs		  . #x4EA6)	; 亦
       )
      ((=ucs		  . #x53C8)	; 又
       ))
     (=ucs		. #x53D8)	; 变
     (=gb2312		. #x3164)	; &I-G0-3164; [17-68]
-    (=hanziku-1		. #xF7B3)	; &I-HZK01-F7B3;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x3005C)	; 𰁜
+	)
+       ((=ucs		    . #x53C8)	; 又
+	))
+      (=>>ucs@unicode	  . #x53D8)	; &G-UU+53D8;
+      (->subsumptive
+       ((==ucs@unicode	    . #x53D8)	; &g2-UU+53D8;
+	(==gb2312	    . #x3164)	; &g2-UU+53D8; [17-68]
+	(->subsumptive
+	 ((===ucs@unicode     . #x53D8)	; &R-UU+53D8;
+	  )
+	 ((=hanziku-1	      . #xF7B3)	; &HZK01-F7B3;
+	  ))
+	))
+      ))
     ))
 (define-char
   '((<-denotational@usage
@@ -3290,6 +3623,25 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>big5-cdp	  . #x8C7A)	; &A-CDP-8C7A;
+      )
+     ((=big5-cdp	  . #x8C79)	; &CDP-8C79;
+      ))
+    (sound@ja/on/go	"ke" "ge")
+    (sound@ja/on/kan	"ka" "ka")
+    (=ucs		. #x53DA)	; 叚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53DA)	; 叚
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
     (hanyu-dazidian	1 398 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -3299,17 +3651,61 @@
       )
      ((=big5-cdp	  . #x8C79)	; &CDP-8C79;
       ))
-    (=ucs		. #x53DA)	; 叚
-    (=adobe-japan1-4	. 14372)	; &I-AJ1-14372;
-    (=jis-x0212		. #x345D)	; &I-JSP-345D; [20-61]
-    (=cns11643-3	. #x2B4F)	; &I-C3-2B4F; [11-47]
-    (=jis-x0213-2	. #x2360)	; &I-JX2-2360; [03-64]
-    (=big5-cdp		. #x8C77)	; &I-CDP-8C77;
-    (=daikanwa		. 03165)	; &I-M-03165;
-    (=daijiten		. 01132)	; &I-DJT-01132;
-    (=shinjigen		.  0913)	; 叚
-    (=cbeta		. 00556)	; &I-CB00556;
-    (=jef-china3	. #x45F1)	; &I-JC3-45F1;
+    (=ucs@unicode	. #x53DA)	; &AJ1-14372;
+    (=adobe-japan1-4	. 14372)	; &AJ1-14372;
+    (=jis-x0212		. #x345D)	; &I-JSP-345D; [20-61]
+    (=cns11643-3	. #x2B4F)	; &I-C3-2B4F; [11-47]
+    (=jis-x0213-2	. #x2360)	; &I-JX2-2360; [03-64]
+    (=big5-cdp		. #x8C77)	; &I-CDP-8C77;
+    (=daikanwa		. 03165)	; &I-M-03165;
+    (=daijiten		. 01132)	; &I-DJT-01132;
+    (=shinjigen		.  0913)	; &AJ1-14372;
+    (=cbeta		. 00556)	; &I-CB00556;
+    (=jef-china3	. #x45F1)	; &I-JC3-45F1;
+    (<-formed
+     ((=ucs@unicode	  . #x5047)	; &AJ1-04170;
+      (=adobe-japan1-0	  . 04170)	; &AJ1-04170;
+      ))
+    (->ancient
+     ((=ucs@iso		  . #x2058A)	; &C6-2E6D;
+      (=cns11643-6	  . #x2E6D)	; &C6-2E6D; [14-77]
+      (=daikanwa	  . 01582)	; &I-M-01582;
+      ))
+    (->ancient$_1*sources
+     shuowen daikanwa)
+    (->ancient*sources
+     shuowen daikanwa)
+    (->formed
+     ((=ucs@iso		  . #x20B4A)	; &C6-357B;
+      (=cns11643-6	  . #x357B)	; &C6-357B; [21-91]
+      (=daikanwa	  . 03174)	; &I-M-03174;
+      ))
+    (->formed$_1*sources
+     shuowen daikanwa)
+    (->formed*sources
+     shuowen daikanwa)
+    (->interchangeable
+     ((=ucs@unicode	  . #x5047)	; &AJ1-04170;
+      (=adobe-japan1-0	  . 04170)	; &AJ1-04170;
+      (=daikanwa	  . 00835)	; &I-M-00835;
+      )
+     ((=ucs@unicode	  . #x7455)	; &AJ1-05669;
+      (=adobe-japan1-0	  . 05669)	; &AJ1-05669;
+      (=daikanwa	  . 21120)	; &I-M-21120;
+      ))
+    (->interchangeable$_1*sources
+     jiyun daikanwa)
+    (->interchangeable$_2*sources
+     shuowen-zhu jiyun daikanwa)
+    (->interchangeable*sources
+     jiyun daikanwa)
+    (->mistakable
+     ((=ucs@unicode	  . #x6BB5)	; &AJ1-02952;
+      (=adobe-japan1-0	  . 02952)	; &AJ1-02952;
+      (=daikanwa	  . 16619)	; &I-M-16619;
+      ))
+    (->mistakable*sources
+     zihui-biansi-2char daikanwa)
     (->subsumptive
      ((==ucs@unicode	  . #x53DA)	; &g2-AJ1-14372;
       (==adobe-japan1-4	  . 14372)	; &g2-AJ1-14372;
@@ -3346,6 +3742,26 @@
     ))
 (define-char
   '((<-denotational
+     ((=ucs		  . #x53DA)	; 叚
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp-itaiji-001 . #x8C7A)	; &CDP-i001-8C7A;
+      )
+     ((=big5-cdp	  . #x8C79)	; &CDP-8C79;
+      ))
+    (=ucs-itaiji-006	. #x53DA)	; &U-i006+53DA;
+    (->subsumptive
+     ((==ucs-itaiji-006	  . #x53DA)	; &g2-U-i006+53DA;
+      ))
+    ))
+(define-char
+  '((<-denotational
      ((=>ucs@cognate	  . #x53DA)	; &A-cgnU+53DA;
       ))
     (ideographic-radical . 29)	; ⼜
@@ -3413,17 +3829,6 @@
 	)
        ((=ucs		    . #xE0103)	; 󠄃
 	))
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=gt-k		    . 01097)	; &GT-K01097;
-	)
-       ((==ucs@cns	    . #x53CD)	; &g2-AJ1-03411;
-	(==ucs@jis	    . #x53CD)	; &g2-AJ1-03411;
-	(==ucs@ks	    . #x53CD)	; &g2-AJ1-03411;
-	(==adobe-japan1-0   . 03411)	; &g2-AJ1-03411;
-	))
       (==ucs@jis/2004	  . #x53DB)	; &g2-MJ008009;
       (==ucs@ks		  . #x53DB)	; &g2-MJ008009;
       (==mj		  . 008009)	; &g2-MJ008009;
@@ -3512,17 +3917,6 @@
 	  )
 	 ((=ucs		      . #xE0102)	; 󠄂
 	  ))
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	  (=ucs		      . #x2FF0)	; â¿°
-	  )
-	 ((=gt-k	      . 00987)	; &GT-K00987;
-	  )
-	 ((==ucs@cns	      . #x53CD)	; &g2-AJ1-03411;
-	  (==ucs@jis	      . #x53CD)	; &g2-AJ1-03411;
-	  (==ucs@ks	      . #x53CD)	; &g2-AJ1-03411;
-	  (==adobe-japan1-0   . 03411)	; &g2-AJ1-03411;
-	  ))
 	(==ucs@jis/1990	    . #x53DB)	; &g2-MJ008010;
 	(==ucs@jis/2000	    . #x53DB)	; &g2-MJ008010;
 	(==mj		    . 008010)	; &g2-MJ008010;
@@ -3917,6 +4311,46 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
     (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs-itaiji-001	  . #x30009)	; &A-U-i001+30009;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs		. #x20B46)	; 𠭆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B46)	; 𠭆
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 397 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs-itaiji-001	  . #x30009)	; &U-i001+30009;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs@iso		. #x20B46)	; &U-00020B46;
+    (->subsumptive
+     ((==ucs@iso	  . #x20B46)	; &g2-IU-00020B46;
+      (->subsumptive
+       ((===ucs@iso	    . #x20B46)	; &R-U-00020B46;
+	)
+       ((=hanziku-1	    . #xF7BF)	; &HZK01-F7BF;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -4111,11 +4545,61 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 398 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp-var-001  . #x8CE4)	; &CDP-v001-8CE4;
+      )
+     ((=>gt-k		  . 01143)	; &A-GT-K01143;
+      ))
+    (sound@ja/on	"ka")
     (=ucs		. #x20B4A)	; 𠭊
-    (=cns11643-6	. #x357B)	; &I-C6-357B; [21-91]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B4A)	; 𠭊
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 398 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp-var-001  . #x8CE4)	; &CDP-v001-8CE4;
+      )
+     ((=gt-k		  . 01143)	; &U-i003+20B2A;
+      ))
+    (=ucs@iso		. #x20B4A)	; &C6-357B;
+    (=cns11643-6	. #x357B)	; &C6-357B; [21-91]
     (=daikanwa		. 03174)	; &I-M-03174;
-    (=hanziku-1		. #xF7DB)	; &I-HZK01-F7DB;
+    (<-formed
+     ((=ucs@unicode	  . #x53DA)	; &AJ1-14372;
+      (=adobe-japan1-4	  . 14372)	; &AJ1-14372;
+      ))
+    (<-same
+     ((=ucs@unicode	  . #x53DA)	; &AJ1-14372;
+      (=adobe-japan1-4	  . 14372)	; &AJ1-14372;
+      (=daikanwa	  . 03165)	; &I-M-03165;
+      ))
+    (<-same*sources
+     shuowen daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x20B4A)	; &g2-M-03174;
+      (==cns11643-6	  . #x357B)	; &g2-M-03174; [21-91]
+      (==daikanwa	  . 03174)	; &g2-M-03174;
+      (->subsumptive
+       ((===daikanwa	    . 03174)	; &R-M-03174;
+	)
+       ((===cns11643-6	    . #x357B)	; &R-C6-357B; [21-91]
+	)
+       ((===ucs@iso	    . #x20B4A)	; &R-U-00020B4A;
+	)
+       ((=hanziku-1	    . #xF7DB)	; &HZK01-F7DB;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -4242,6 +4726,10 @@
      ((=ucs@cns		  . #x6E9E)	; &C2-4438;
       (=cns11643-2	  . #x4438)	; &C2-4438; [36-24]
       (=daikanwa	  . 17945)	; &I-M-17945;
+      )
+     ((=ucs@cns		  . #x5AC2)	; &MJ009894;
+      (=mj		  . 009894)	; &MJ009894;
+      (=daikanwa	  . 06603)	; &I-M-06603;
       ))
     (->interchangeable$_1*sources
      jiyun daikanwa)
@@ -5787,15 +6275,109 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x8658)	; 虘
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (sound@ja/on/go	"sya")
+    (sound@ja/on/kan	"sa")
     (=ucs		. #x20B6F)	; ð ­¯
-    (->subsumptive
-     ((=daikanwa	  . 03195)	; &M-03195;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B6F)	; ð ­¯
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 401 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x8658)	; &JSP-5A3D;
+      (=jis-x0212	  . #x5A3D)	; &JSP-5A3D; [58-29]
+      (=cns11643-3	  . #x3860)	; &I-C3-3860; [24-64]
+      (=daikanwa	  . 32701)	; &I-M-32701;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=ucs@iso		. #x20B6F)	; &MJ032070;
+    (=mj		. 032070)	; &MJ032070;
+    (=cns11643-4	. #x3C43)	; &I-C4-3C43; [28-35]
+    (=hanyo-denshi/ks	. 037220)	; &MJ032070;
+    (=koseki		. 037220)	; &MJ032070;
+    (=daikanwa		. 03195)	; &I-M-03195;
+    (<-interchangeable
+     ((=ucs		  . #x62AF)	; 抯
+      ))
+    (->formed
+     ((=ucs@unicode	  . #x6463)	; &JSP-4066;
+      (=jis-x0212	  . #x4066)	; &JSP-4066; [32-70]
+      (=cns11643-4	  . #x435E)	; &I-C4-435E; [35-62]
+      (=daikanwa	  . 12601)	; &I-M-12601;
       )
-     ((hanyu-dazidian	  1 401 4)
-      (=hanziku-1	  . #xF877)	; &HZK01-F877;
+     ((=mj		  . 032069)	; &MJ032069;
+      ))
+    (->formed$_1*sources
+     shuowen-zhu daikanwa)
+    (->formed*sources
+     shuowen-zhu daikanwa)
+    (->subsumptive
+     ((=>>mj		  . 032070)	; &G-MJ032070;
+      (=>>hanyo-denshi/ks . 037220)	; &G-MJ032070;
+      (=>>daikanwa	  . 03195)	; &G-MJ032070;
+      (->subsumptive
+       ((==koseki	    . 037220)	; &g2-M-03195;
+	(==daikanwa	    . 03195)	; &g2-M-03195;
+	)
+       ((==mj		    . 032070)	; &g2-MJ032070;
+	(==hanyo-denshi/ks  . 037220)	; &g2-MJ032070;
+	(->subsumptive
+	 ((===hanyo-denshi/ks . 037220)	; &R-HD-KS-037220;
+	  (=hanyo-denshi/ks/mf . #x0E8A)	; &R-HD-KS-037220;
+	  )
+	 ((===mj	      . 032070)	; &R-MJ032070;
+	  ))
+	)
+       ((=hanziku-1	    . #xF877)	; &HZK01-F877;
+	))
       )
-     ((=ucs@iso		  . #x20B6F)	; &C4-3C43;
-      (=cns11643-4	  . #x3C43)	; &C4-3C43; [28-35]
+     ((=>>ucs@iso	  . #x20B6F)	; &MJ032069;
+      (=mj		  . 032069)	; &MJ032069;
+      (=>>cns11643-4	  . #x3C43)	; &MJ032069; [28-35]
+      (=>>hanyo-denshi/ks . 037120)	; &MJ032069;
+      (<-formed
+       ((=ucs@iso	    . #x20B6F)	; &MJ032070;
+	(=mj		    . 032070)	; &MJ032070;
+	(=koseki	    . 037220)	; &MJ032070;
+	))
+      (<-formed$_1*sources
+       koseki)
+      (<-formed*sources
+       koseki)
+      (->subsumptive
+       ((==mj		    . 032069)	; &g2-MJ032069;
+	(==hanyo-denshi/ks  . 037120)	; &g2-MJ032069;
+	(->subsumptive
+	 ((===hanyo-denshi/ks . 037120)	; &R-HD-KS-037120;
+	  (=hanyo-denshi/ks/mf . #x0E80)	; &R-HD-KS-037120;
+	  )
+	 ((===mj	      . 032069)	; &R-MJ032069;
+	  ))
+	)
+       ((==ucs@iso	    . #x20B6F)	; &g2-IU-00020B6F;
+	(==cns11643-4	    . #x3C43)	; &g2-IU-00020B6F; [28-35]
+	(->subsumptive
+	 ((===cns11643-4      . #x3C43)	; &R-C4-3C43; [28-35]
+	  )
+	 ((===ucs@iso	      . #x20B6F)	; &R-U-00020B6F;
+	  ))
+	))
       ))
     ))
 (define-char
@@ -6023,6 +6605,44 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=>ucs@component	  . #x3561)	; &A-compU+3561;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x239BB)	; 𣦻
+      )
+     ((=ucs		  . #x2050C)	; 𠔌
+      ))
+    (=>ucs-itaiji-001	. #x3561)	; &A-U-i001+3561;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-001	  . #x3561)	; &A-U-i001+3561;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x239BB)	; 𣦻
+      )
+     ((=ucs@iso		  . #x2050C)	; &MJ030987;
+      (=mj		  . 030987)	; &MJ030987;
+      ))
+    (=ucs-itaiji-001	. #x3561)	; &U-i001+3561;
+    (->subsumptive
+     ((==ucs-itaiji-001	  . #x3561)	; &g2-U-i001+3561;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
@@ -6734,51 +7354,26 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@unicode	  . #x470C)	; &AJ1-18690;
-      (=adobe-japan1-5	  . 18690)	; &AJ1-18690;
+     ((=+>ucs@unicode	  . #x470C)	; &o-JX2-786B;
+      (=+>jis-x0213-2	  . #x786B)	; &o-JX2-786B; [88-75]
       )
      ((=ucs		  . #x53C8)	; 又
       ))
-    (=ucs@iso		. #x20B93)	; &MJ032097;
-    (=mj		. 032097)	; &MJ032097;
-    (=cns11643-4	. #x6631)	; &I-C4-6631; [70-17]
-    (=koseki		. 037460)	; &MJ032097;
-    (=daikanwa		. 03222)	; &I-M-03222;
-    (=daijiten		. 01140)	; &I-DJT-01140;
-    (<-formed
-     ((=ucs@unicode	  . #x8B8A)	; &AJ1-05075;
-      (=adobe-japan1-0	  . 05075)	; &AJ1-05075;
-      )
-     ((=ucs@unicode	  . #x5909)	; &AJ1-03617;
-      (=adobe-japan1-0	  . 03617)	; &AJ1-03617;
-      ))
-    (<-formed$_1*sources
-     koseki mj)
-    (<-formed$_2*sources
-     koseki@mj)
-    (<-formed*sources
-     koseki mj)
-    (<-vulgar
-     ((=ucs@unicode	  . #x8B8A)	; &AJ1-05075;
-      (=adobe-japan1-0	  . 05075)	; &AJ1-05075;
-      (=daikanwa	  . 36117)	; &I-M-36117;
-      ))
-    (<-vulgar*sources
-     daikanwa)
+    (=+>ucs@iso		. #x20B93)	; &o-IU+20B93;
     (->subsumptive
-     ((==mj		  . 032097)	; &g2-MJ032097;
-      (==koseki		  . 037460)	; &g2-MJ032097;
-      (==daikanwa	  . 03222)	; &g2-MJ032097;
-      (->subsumptive
-       ((===daikanwa	    . 03222)	; &R-M-03222;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((===mj		    . 032097)	; &R-MJ032097;
+       ((=ucs@jis	    . #x470C)	; &AJ1-18690;
+	(=adobe-japan1-5    . 18690)	; &AJ1-18690;
+	)
+       ((=ucs		    . #x53C8)	; 又
 	))
-      )
-     ((=>>ucs@iso	  . #x20B93)	; &MJ032098;
-      (=mj		  . 032098)	; &MJ032098;
-      (=>>cns11643-4	  . #x6631)	; &MJ032098; [70-17]
-      (=koseki		  . 409590)	; &MJ032098;
+      (=mj		  . 032097)	; &MJ032097;
+      (=koseki		  . 037460)	; &MJ032097;
+      (=daikanwa	  . 03222)	; &I-M-03222;
+      (=daijiten	  . 01140)	; &I-DJT-01140;
       (<-formed
        ((=ucs@unicode	    . #x8B8A)	; &AJ1-05075;
 	(=adobe-japan1-0    . 05075)	; &AJ1-05075;
@@ -6792,16 +7387,65 @@
        koseki@mj)
       (<-formed*sources
        koseki mj)
+      (<-vulgar
+       ((=ucs@unicode	    . #x8B8A)	; &AJ1-05075;
+	(=adobe-japan1-0    . 05075)	; &AJ1-05075;
+	(=daikanwa	    . 36117)	; &I-M-36117;
+	))
+      (<-vulgar*sources
+       daikanwa)
       (->subsumptive
-       ((==mj		    . 032098)	; &g2-MJ032098;
-	(==koseki	    . 409590)	; &g2-MJ032098;
-	(==daijiten	    . 01140)	; &g2-MJ032098;
+       ((=>>mj		    . 032097)	; &G-MJ032097;
 	(->subsumptive
-	 ((===daijiten	      . 01140)	; &R-DJT-01140;
+	 ((==mj		      . 032097)	; &g2-MJ032097;
+	  (==koseki	      . 037460)	; &g2-MJ032097;
+	  (==daikanwa	      . 03222)	; &g2-MJ032097;
+	  (->subsumptive
+	   ((===daikanwa	. 03222)	; &R-M-03222;
+	    )
+	   ((===mj		. 032097)	; &R-MJ032097;
+	    ))
+	  ))
+	)
+       ((=mj		    . 032098)	; &MJ032098;
+	(=koseki	    . 409590)	; &MJ032098;
+	(<-formed
+	 ((=ucs@unicode	      . #x8B8A)	; &AJ1-05075;
+	  (=adobe-japan1-0    . 05075)	; &AJ1-05075;
 	  )
-	 ((===mj	      . 032098)	; &R-MJ032098;
+	 ((=ucs@unicode	      . #x5909)	; &AJ1-03617;
+	  (=adobe-japan1-0    . 03617)	; &AJ1-03617;
 	  ))
+	(<-formed$_1*sources
+	 koseki mj)
+	(<-formed$_2*sources
+	 koseki@mj)
+	(<-formed*sources
+	 koseki mj)
+	(->subsumptive
+	 ((==mj		      . 032098)	; &g2-MJ032098;
+	  (==koseki	      . 409590)	; &g2-MJ032098;
+	  (==daijiten	      . 01140)	; &g2-MJ032098;
+	  (->subsumptive
+	   ((===daijiten	. 01140)	; &R-DJT-01140;
+	    )
+	   ((===mj		. 032098)	; &R-MJ032098;
+	    ))
+	  ))
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs@unicode	    . #x470C)	; &C5-6952;
+	(=cns11643-5	    . #x6952)	; &C5-6952; [73-50]
 	)
+       ((=ucs		    . #x53C8)	; 又
+	))
+      (=ucs@iso		  . #x20B93)	; &C4-6631;
+      (=cns11643-4	  . #x6631)	; &C4-6631; [70-17]
+      (->subsumptive
        ((==ucs@iso	    . #x20B93)	; &g2-IU-00020B93;
 	(==cns11643-4	    . #x6631)	; &g2-IU-00020B93; [70-17]
 	(->subsumptive
@@ -6849,29 +7493,7 @@
       ))
     (=ruimoku-v6	. #xE047)	; &RUI6-E047;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
-	  (=ucs		      . #x2FF2)	; ⿲
-	  )
-	 ((name		      . "CJK RADICAL WATER ONE")
-	  (=ucs		      . #x2EA1)	; ⺡
-	  )
-	 ((==ucs@unicode      . #x9B5A)	; &g2-AJ1-01685;
-	  (==adobe-japan1-0   . 01685)	; &g2-AJ1-01685;
-	  )
-	 ((==ucs@jis	      . #x821F)	; &g2-AJ1-02360;
-	  (==ucs@ks	      . #x821F)	; &g2-AJ1-02360;
-	  (==adobe-japan1-0   . 02360)	; &g2-AJ1-02360;
-	  ))
-	)
-       ((==ucs@unicode	    . #x53C8)	; &g2-AJ1-03746;
-	(==adobe-japan1-0   . 03746)	; &g2-AJ1-03746;
-	))
-      (==ruimoku-v6	  . #xE047)	; &g2-RUI6-E047;
+     ((==ruimoku-v6	  . #xE047)	; &g2-RUI6-E047;
       ))
     ))
 (define-char
@@ -6963,6 +7585,10 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
+    (=>ucs@component	. #x2A832)	; &A-compU+2A832;
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
     (hanyu-dazidian	1 394 5)
     (=ucs		. #x20B30)	; ð ¬°
     (=hanziku-1		. #xF6F4)	; &I-HZK01-F6F4;
@@ -6975,12 +7601,6 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
-    (hanyu-dazidian	1 397 13)
-    (=ucs		. #x20B46)	; 𠭆
-    (=hanziku-1		. #xF7BF)	; &I-HZK01-F7BF;
-    ))
-(define-char
-  '((ideographic-radical . 29)	; ⼜
     (hanyu-dazidian	1 400 4)
     (=ucs		. #x20B62)	; ð ­¢
     (=hanziku-1		. #xF857)	; &I-HZK01-F857;
@@ -7025,6 +7645,10 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
+    (==>daijiten	. 01116)	; &A2-DJT-01116;
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
     (==>daijiten	. 01110)	; &A2-DJT-01110;
     ))
 (define-char
@@ -7045,10 +7669,6 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
-    (==>daijiten	. 01116)	; &A2-DJT-01116;
-    ))
-(define-char
-  '((ideographic-radical . 29)	; ⼜
     (==>daijiten	. 01118)	; &A2-DJT-01118;
     ))
 (define-char