X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R160-Bitter.el;h=7dd5c988d027851ffbe5ae44438d54c39ced9cae;hb=0749da60f377158848e05119c728d02b33427390;hp=a9f1ab49360468d4670a6b3bf481c6b3d686c8b1;hpb=bf53878824059f16b29d06e364ff91ee06e7b4aa;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R160-Bitter.el b/lisp/utf-2000/Ideograph-R160-Bitter.el
index a9f1ab4..7dd5c98 100644
--- a/lisp/utf-2000/Ideograph-R160-Bitter.el
+++ b/lisp/utf-2000/Ideograph-R160-Bitter.el
@@ -4,20 +4,43 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
     (=ucs		. #x8F9B)	; 辛
+    (=jis-x0208		. #x3F49)	; &I-J90-3F49; [31-41]
+    (=gb2312		. #x5041)	; &I-G0-5041; [48-33]
+    (=ks-x1001		. #x6374)	; &I-K0-6374; [67-84]
+    (=cns11643-1	. #x4B50)	; &I-C1-4B50; [43-48]
+    (=jis-x0213-1	. #x3F49)	; &I-JX1-3F49; [31-41]
+    (=gt		. 51557)	; &I-GT-51557;
+    (=gt-k		. 02584)	; &I-GT-K02584;
+    (=gt-pj-1		. #x3F49)	; &I-GT-51557; [31-41]
+    (=daikanwa		. 38630)	; &I-M-38630;
+    (=shinjigen		.  8196)	; 辛
     (->subsumptive
-     ((=ucs@jis		  . #x8F9B)	; &GT-51557;
-      (=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
-      (=ks-x1001	  . #x6374)	; &I-K0-6374; [67-84]
-      (=jis-x0213-1	  . #x3F49)	; &I-JX1-3F49; [31-41]
-      (=gt		  . 51557)	; &I-GT-51557;
-      (=gt-k		  . 02584)	; &I-GT-K02584;
-      (=gt-pj-1		  . #x3F49)	; &I-GT-51557; [31-41]
-      (=daikanwa	  . 38630)	; &I-M-38630;
-      (=shinjigen	  .  8196)	; &GT-51557;
-      )
-     ((=ucs@unicode	  . #x8F9B)	; &C1-4B50;
-      (=gb2312		  . #x5041)	; &C1-4B50; [48-33]
-      (=cns11643-1	  . #x4B50)	; &I-C1-4B50; [43-48]
+     ((==ucs@unicode	  . #x8F9B)	; &g2-GT-51557;
+      (==gb2312		  . #x5041)	; &g2-GT-51557; [48-33]
+      (==ks-x1001	  . #x6374)	; &g2-GT-51557; [67-84]
+      (==jis-x0208	  . #x3F49)	; &g2-GT-51557; [31-41]
+      (==cns11643-1	  . #x4B50)	; &g2-GT-51557; [43-48]
+      (==jis-x0213-1	  . #x3F49)	; &g2-GT-51557; [31-41]
+      (==gt		  . 51557)	; &g2-GT-51557;
+      (==gt-k		  . 02584)	; &g2-GT-51557;
+      (==daikanwa	  . 38630)	; &g2-GT-51557;
+      (==shinjigen	  .  8196)	; &g2-GT-51557;
+      (->subsumptive
+       ((===daikanwa	    . 38630)	; &R-M-38630;
+	)
+       ((===jis-x0208	    . #x3F49)	; &R-J90-3F49; [31-41]
+	(===jis-x0213-1	    . #x3F49)	; &R-J90-3F49; [31-41]
+	)
+       ((===ucs@ks	    . #x8F9B)	; &R-K0-6374;
+	(===ks-x1001	    . #x6374)	; &R-K0-6374; [67-84]
+	)
+       ((===gt		    . 51557)	; &R-GT-51557;
+	(===gt-k	    . 02584)	; &R-GT-51557;
+	)
+       ((===ucs@unicode	    . #x8F9B)	; &R-UU+8F9B;
+	)
+       ((===cns11643-1	    . #x4B50)	; &R-C1-4B50; [43-48]
+	))
       ))
     ))
 (define-char
@@ -30,48 +53,36 @@
     (=gt-k		. 02585)	; &GT-K02585;
     (=gt-pj-k1		. #x3D69)	; &GT-K02585; [29-73]
     (<-formed@component/connect-right
-     ((=ucs@jis		  . #x8F9B)	; &GT-51557;
-      (=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
-      (=ks-x1001	  . #x6374)	; &I-K0-6374; [67-84]
-      (=jis-x0213-1	  . #x3F49)	; &I-JX1-3F49; [31-41]
-      (=daikanwa	  . 38630)	; &I-M-38630;
+     ((=ucs		  . #x8F9B)	; 辛
       ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
+    (hanyu-dazidian	6 4036 2)
     (=ucs		. #x2840B)	; 𨐋
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x2840B)	; 𨐋
-      ))
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 0)
-    (total-strokes	 . 7)
-    (=gt		. 51556)	; &GT-51556;
-    (=gt-pj-7		. #x5451)	; &GT-51556; [52-49]
-    (=daikanwa/+p	. 38630)	; &GT-51556;
+    (=cns11643-6	. #x292B)	; &I-C6-292B; [09-11]
+    (=gt		. 51556)	; &I-GT-51556;
+    (=gt-pj-7		. #x5451)	; &I-GT-51556; [52-49]
+    (=daikanwa/+p	. 38630)	; 𨐋
+    (=hanziku-10	. #xF0FA)	; &I-HZK10-F0FA;
     (<-same
      ((=daikanwa	  . 25722)	; &M-25722;
       ))
     (<-same*sources
      jiyun daikanwa)
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x2840B)	; 𨐋
-      ))
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 0)
-    (total-strokes	 . 7)
-    (=>>ucs@iso		. #x2840B)	; &G-IU+2840B;
     (->subsumptive
-     ((hanyu-dazidian	  6 4036 2)
-      (=ucs@iso		  . #x2840B)	; &C6-292B;
-      (=cns11643-6	  . #x292B)	; &C6-292B; [09-11]
-      (=hanziku-10	  . #xF0FA)	; &I-HZK10-F0FA;
+     ((==gt		  . 51556)	; &g2-GT-51556;
+      (==daikanwa/+p	  . 38630)	; &g2-GT-51556;
+      )
+     ((==ucs@iso	  . #x2840B)	; &g2-IU-0002840B;
+      (==cns11643-6	  . #x292B)	; &g2-IU-0002840B; [09-11]
+      (->subsumptive
+       ((===ucs@iso	    . #x2840B)	; &R-U-0002840B;
+	)
+       ((===cns11643-6	    . #x292B)	; &R-C6-292B; [09-11]
+	))
       ))
     ))
 (define-char
@@ -108,8 +119,7 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28410)	; 𨐐
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (ideographic-structure
@@ -120,65 +130,96 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@jis	    . #x7ACB)	; &GT-33181;
-	(=jis-x0208	    . #x4E29)	; &GT-33181; [46-09]
-	(=ks-x1001	    . #x5821)	; &I-K0-5821; [56-01]
-	(=jis-x0213-1	    . #x4E29)	; &I-JX1-4E29; [46-09]
-	(=daikanwa	    . 25721)	; &I-M-25721;
+       ((=ucs		    . #x7ACB)	; 立
 	)
-       ((=big5-cdp	    . #x8B75)	; &RUI6-E00E;
+       ((=ucs		    . #x22189)	; 𢆉
 	))
       )
      ((=ucs		  . #x4E5A)	; 乚
       ))
-    (=daikanwa		. 38633)	; &M-38633;
-    ))
-(define-char
-  '((=>ucs		. #x28410)	; 𨐐
-    (morohashi-daikanwa	38633 0 0)
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 57 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+    (=ucs		. #x28410)	; 𨐐
+    (->subsumptive
+     ((hanyu-dazidian	  1 57 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x7ACB)	; 立
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x7ACB)	; 立
+	  )
+	 ((=ucs		      . #x22189)	; 𢆉
+	  ))
 	)
-       ((=big5-cdp	    . #x8B75)	; &RUI6-E00E;
+       ((=ucs		    . #x4E5A)	; 乚
+	))
+      (=daikanwa	  . 38633)	; &M-38633;
+      (=hanziku-1	  . #xAFC8)	; &I-HZK01-AFC8;
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	    (=ucs		. #x2FF1)	; ⿱
+	    )
+	   ((==ucs@unicode	. #x7ACB)	; &g2-GT-33181;
+	    (==jis-x0208	. #x4E29)	; &g2-GT-33181; [46-09]
+	    )
+	   ((=ucs		. #x22189)	; 𢆉
+	    ))
+	  )
+	 ((=ucs		      . #x4E5A)	; 乚
+	  ))
+	(==daikanwa	    . 38633)	; &g2-M-38633;
 	))
-      )
-     ((=ucs		  . #x4E5A)	; 乚
-      ))
-    (=hanziku-1		. #xAFC8)	; &HZK01-AFC8;
-    ))
-(define-char
-  '((morohashi-daikanwa	38633 0 1)
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x7ACB)	; 立
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x7ACB)	; 立
+	  )
+	 ((=gt-k	      . 01380)	; &GT-K01380;
+	  ))
 	)
-       ((=gt-k		    . 01380)	; &GT-K01380;
+       ((=ucs		    . #x4E5A)	; 乚
+	))
+      (=ucs@iso		  . #x28410)	; &C5-3625;
+      (=cns11643-5	  . #x3625)	; &C5-3625; [22-05]
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	    (=ucs		. #x2FF1)	; ⿱
+	    )
+	   ((==ucs@unicode	. #x7ACB)	; &g2-GT-33181;
+	    (==jis-x0208	. #x4E29)	; &g2-GT-33181; [46-09]
+	    )
+	   ((=gt-k		. 01380)	; &GT-K01380;
+	    ))
+	  )
+	 ((=ucs		      . #x4E5A)	; 乚
+	  ))
+	(==ucs@iso	    . #x28410)	; &g2-IU-00028410;
+	(==cns11643-5	    . #x3625)	; &g2-IU-00028410; [22-05]
+	(->subsumptive
+	 ((===ucs@iso	      . #x28410)	; &R-U-00028410;
+	  )
+	 ((===cns11643-5      . #x3625)	; &R-C5-3625; [22-05]
+	  ))
 	))
-      )
-     ((=ucs		  . #x4E5A)	; 乚
       ))
-    (=ucs		. #x28410)	; 𨐐
-    (=cns11643-5	. #x3625)	; &I-C5-3625; [22-05]
     ))
 (define-char
   '((=>ucs		. #x28411)	; 𨐑
@@ -252,8 +293,10 @@
     (=cns11643-3	. #x3F4B)	; &I-C3-3F4B; [31-43]
     ))
 (define-char
-  '((ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 6)
+  '((ideographic-radical@ucs . 160)	; ⾟
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@ucs/compat . 135)	; ⾆
+    (ideographic-strokes@ucs/compat . 7)
     (total-strokes	 . 13)
     (=ucs		. #x8F9E)	; 辞
     ))
@@ -261,45 +304,80 @@
   '((<-denotational
      ((=ucs		  . #x8F9E)	; 辞
       ))
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 6)
+    (ideographic-radical@ucs . 160)	; ⾟
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@ucs*sources
+     daikanwa=38638 cns11643-3=4477 shinjigen)
+    (ideographic-radical@ucs/compat . 135)	; ⾆
+    (ideographic-strokes@ucs/compat . 7)
+    (ideographic-radical@ucs/compat*sources
+     daikanwa=30307 cns11643-3=4425)
     (total-strokes	 . 13)
+    (=ucs@unicode	. #x8F9E)	; &GT-51568;
+    (=jis-x0208		. #x3C2D)	; &GT-51568; [28-13]
+    (=gb2312		. #x3447)	; &I-G0-3447; [20-39]
+    (=cns11643-3	. #x4477)	; &I-C3-4477; [36-87]
+    (=jis-x0213-1	. #x3C2D)	; &I-JX1-3C2D; [28-13]
+    (=gt		. 51568)	; &I-GT-51568;
+    (=gt-pj-1		. #x3C2D)	; &I-GT-51568; [28-13]
+    (=shinjigen		.  8199)	; &GT-51568;
+    (<-simplified@JP/Jouyou
+     ((=ucs@jis		  . #x8FAD)	; &GT-51611;
+      (=ucs@ks		  . #x8FAD)	; &GT-51611;
+      (=jis-x0208	  . #x6D66)	; &GT-51611; [77-70]
+      (=ks-x1001	  . #x5E76)	; &I-K0-5E76; [62-86]
+      (=jis-x0213-1	  . #x6D66)	; &I-JX1-6D66; [77-70]
+      (=daikanwa	  . 38671)	; &I-M-38671;
+      ))
+    (<-vulgar@jiyun
+     ((=ucs@unicode	  . #x8FA4)	; &JX2-7967;
+      (=jis-x0212	  . #x6130)	; &JX2-7967; [65-16]
+      (=cns11643-3	  . #x4F37)	; &I-C3-4F37; [47-23]
+      (=jis-x0213-2	  . #x7967)	; &I-JX2-7967; [89-71]
+      (=daikanwa	  . 38649)	; &I-M-38649;
+      ))
+    (<-vulgar@jiyun*sources
+     jiyun daikanwa)
+    (<-vulgar@zhengzitong
+     ((=ucs@jis		  . #x8FAD)	; &GT-51611;
+      (=ucs@ks		  . #x8FAD)	; &GT-51611;
+      (=jis-x0208	  . #x6D66)	; &GT-51611; [77-70]
+      (=ks-x1001	  . #x5E76)	; &I-K0-5E76; [62-86]
+      (=jis-x0213-1	  . #x6D66)	; &I-JX1-6D66; [77-70]
+      (=daikanwa	  . 38671)	; &I-M-38671;
+      ))
+    (<-vulgar@zhengzitong*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((=ucs@jis		  . #x8F9E)	; &GT-51568;
-      (=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
-      (=jis-x0213-1	  . #x3C2D)	; &I-JX1-3C2D; [28-13]
-      (=gt		  . 51568)	; &I-GT-51568;
-      (=gt-pj-1		  . #x3C2D)	; &I-GT-51568; [28-13]
-      (=daikanwa	  . 38638)	; &I-M-38638;
-      (=shinjigen@rev	  .  8199)	; &GT-51568;
-      (<-simplified@JP/Jouyou
-       ((=ucs@jis	    . #x8FAD)	; &GT-51611;
-	(=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
-	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
-	(=jis-x0213-1	    . #x6D66)	; &I-JX1-6D66; [77-70]
-	(=daikanwa	    . 38671)	; &I-M-38671;
-	))
-      (<-vulgar@jiyun
-       ((=ucs@jis	    . #x8FA4)	; &JX2-7967;
-	(=jis-x0212	    . #x6130)	; &JX2-7967; [65-16]
-	(=jis-x0213-2	    . #x7967)	; &I-JX2-7967; [89-71]
-	(=daikanwa	    . 38649)	; &I-M-38649;
-	))
-      (<-vulgar@jiyun*sources
-       jiyun daikanwa)
-      (<-vulgar@zhengzitong
-       ((=ucs@jis	    . #x8FAD)	; &GT-51611;
-	(=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
-	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
-	(=jis-x0213-1	    . #x6D66)	; &I-JX1-6D66; [77-70]
-	(=daikanwa	    . 38671)	; &I-M-38671;
+     ((==ucs@unicode	  . #x8F9E)	; &g2-GT-51568;
+      (==gb2312		  . #x3447)	; &g2-GT-51568; [20-39]
+      (==jis-x0208	  . #x3C2D)	; &g2-GT-51568; [28-13]
+      (==cns11643-3	  . #x4477)	; &g2-GT-51568; [36-87]
+      (==jis-x0213-1	  . #x3C2D)	; &g2-GT-51568; [28-13]
+      (==gt		  . 51568)	; &g2-GT-51568;
+      (==shinjigen	  .  8199)	; &g2-GT-51568;
+      (->subsumptive
+       ((ideographic-radical . 160)	; ⾟
+	(ideographic-strokes . 6)
+	(=daikanwa	    . 38638)	; &M-38638;
+	)
+       ((ideographic-radical . 135)	; ⾆
+	(ideographic-strokes . 7)
+	(=daikanwa	    . 30307)	; &M-30307;
+	)
+       ((===jis-x0208	    . #x3C2D)	; &R-J90-3C2D; [28-13]
+	(===jis-x0213-1	    . #x3C2D)	; &R-J90-3C2D; [28-13]
+	)
+       ((===gt		    . 51568)	; &R-GT-51568;
+	)
+       ((ideographic-radical . 160)	; ⾟
+	(ideographic-strokes . 6)
+	(===ucs@unicode	    . #x8F9E)	; &R-UU+8F9E;
+	)
+       ((ideographic-radical . 160)	; ⾟
+	(ideographic-strokes . 6)
+	(===cns11643-3	    . #x4477)	; &R-C3-4477; [36-87]
 	))
-      (<-vulgar@zhengzitong*sources
-       zhengzitong daikanwa)
-      )
-     ((=ucs@unicode	  . #x8F9E)	; &C3-4477;
-      (=gb2312		  . #x3447)	; &C3-4477; [20-39]
-      (=cns11643-3	  . #x4477)	; &I-C3-4477; [36-87]
       ))
     ))
 (define-char
@@ -350,23 +428,43 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (=ucs		. #x8F9F)	; 辟
+    (=jis-x0208		. #x6D64)	; &I-J90-6D64; [77-68]
+    (=gb2312		. #x3159)	; &I-G0-3159; [17-57]
+    (=cns11643-1	. #x6728)	; &I-C1-6728; [71-08]
+    (=jis-x0213-1	. #x6D64)	; &I-JX1-6D64; [77-68]
+    (=gt		. 51571)	; &I-GT-51571;
+    (=gt-k		. 10359)	; &I-GT-K10359;
+    (=gt-pj-1		. #x6D64)	; &I-GT-51571; [77-68]
+    (=daikanwa		. 38642)	; &I-M-38642;
+    (=shinjigen		.  8202)	; 辟
+    (<-formed
+     ((=ucs@ks		  . #x907F)	; &M-39163;
+      (=ks-x1001	  . #x792D)	; &M-39163; [89-13]
+      (=daikanwa	  . 39163)	; &I-M-39163;
+      ))
     (->subsumptive
-     ((=ucs@jis		  . #x8F9F)	; &GT-51571;
-      (=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
-      (=jis-x0213-1	  . #x6D64)	; &I-JX1-6D64; [77-68]
-      (=gt		  . 51571)	; &I-GT-51571;
-      (=gt-k		  . 10359)	; &I-GT-K10359;
-      (=gt-pj-1		  . #x6D64)	; &I-GT-51571; [77-68]
-      (=daikanwa	  . 38642)	; &I-M-38642;
-      (=shinjigen	  .  8202)	; &GT-51571;
-      (<-formed
-       ((=ks-x1001	    . #x792D)	; &M-39163; [89-13]
-	(=daikanwa	    . 39163)	; &I-M-39163;
+     ((==ucs@unicode	  . #x8F9F)	; &g2-GT-51571;
+      (==gb2312		  . #x3159)	; &g2-GT-51571; [17-57]
+      (==jis-x0208	  . #x6D64)	; &g2-GT-51571; [77-68]
+      (==cns11643-1	  . #x6728)	; &g2-GT-51571; [71-08]
+      (==jis-x0213-1	  . #x6D64)	; &g2-GT-51571; [77-68]
+      (==gt		  . 51571)	; &g2-GT-51571;
+      (==gt-k		  . 10359)	; &g2-GT-51571;
+      (==daikanwa	  . 38642)	; &g2-GT-51571;
+      (==shinjigen	  .  8202)	; &g2-GT-51571;
+      (->subsumptive
+       ((===daikanwa	    . 38642)	; &R-M-38642;
+	)
+       ((===jis-x0208	    . #x6D64)	; &R-J90-6D64; [77-68]
+	(===jis-x0213-1	    . #x6D64)	; &R-J90-6D64; [77-68]
+	)
+       ((===gt		    . 51571)	; &R-GT-51571;
+	(===gt-k	    . 10359)	; &R-GT-51571;
+	)
+       ((===ucs@unicode	    . #x8F9F)	; &R-UU+8F9F;
+	)
+       ((===cns11643-1	    . #x6728)	; &R-C1-6728; [71-08]
 	))
-      )
-     ((=ucs@unicode	  . #x8F9F)	; &C1-6728;
-      (=gb2312		  . #x3159)	; &C1-6728; [17-57]
-      (=cns11643-1	  . #x6728)	; &I-C1-6728; [71-08]
       ))
     ))
 (define-char
@@ -465,22 +563,52 @@
     (=cns11643-4	. #x4E2E)	; &I-C4-4E2E; [46-14]
     ))
 (define-char
-  '((=>ucs		. #x8FA4)	; 辤
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=ucs@jis		. #x8FA4)	; &JX2-7967;
-    (=jis-x0212		. #x6130)	; &JX2-7967; [65-16]
-    (=jis-x0213-2	. #x7967)	; &I-JX2-7967; [89-71]
-    (=daikanwa		. 38649)	; &I-M-38649;
+    (=ucs		. #x8FA4)	; 辤
     ))
 (define-char
-  '((morohashi-daikanwa	38649 0 0)
+  '((<-denotational
+     ((=ucs		  . #x8FA4)	; 辤
+      ))
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=ucs		. #x8FA4)	; 辤
+    (=ucs@unicode	. #x8FA4)	; &JX2-7967;
+    (=jis-x0212		. #x6130)	; &JX2-7967; [65-16]
     (=cns11643-3	. #x4F37)	; &I-C3-4F37; [47-23]
+    (=jis-x0213-2	. #x7967)	; &I-JX2-7967; [89-71]
+    (=daikanwa		. 38649)	; &I-M-38649;
+    (=shinjigen		.  8201)	; &JX2-7967;
+    (<-vulgar
+     ((=ucs@unicode	  . #x8F9E)	; &GT-51568;
+      (=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
+      (=gb2312		  . #x3447)	; &I-G0-3447; [20-39]
+      (=cns11643-3	  . #x4477)	; &I-C3-4477; [36-87]
+      (=jis-x0213-1	  . #x3C2D)	; &I-JX1-3C2D; [28-13]
+      (=shinjigen	  .  8199)	; &GT-51568;
+      ))
+    (<-vulgar*sources
+     shinjigen)
+    (->subsumptive
+     ((==ucs@unicode	  . #x8FA4)	; &g2-JSP-6130;
+      (==jis-x0212	  . #x6130)	; &g2-JSP-6130; [65-16]
+      (==cns11643-3	  . #x4F37)	; &g2-JSP-6130; [47-23]
+      (==jis-x0213-2	  . #x7967)	; &g2-JSP-6130; [89-71]
+      (==daikanwa	  . 38649)	; &g2-JSP-6130;
+      (==shinjigen	  .  8201)	; &g2-JSP-6130;
+      (->subsumptive
+       ((===daikanwa	    . 38649)	; &R-M-38649;
+	)
+       ((===jis-x0212	    . #x6130)	; &R-JX2-7967; [65-16]
+	(===jis-x0213-2	    . #x7967)	; &R-JX2-7967; [89-71]
+	)
+       ((===ucs@unicode	    . #x8FA4)	; &R-UU+8FA4;
+	)
+       ((===cns11643-3	    . #x4F37)	; &R-C3-4F37; [47-23]
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
@@ -586,61 +714,60 @@
     (=gb12345		. #x306C)	; 辦 [16-76]
     ))
 (define-char
-  '((=>ucs		. #x8FA7)	; 辧
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ucs@jis		. #x8FA7)	; &GT-51593;
-    (=jis-x0208		. #x5221)	; &GT-51593; [50-01]
-    (=jis-x0213-1	. #x5221)	; &I-JX1-5221; [50-01]
-    (=gt		. 51593)	; &I-GT-51593;
-    (=gt-pj-1		. #x5221)	; &I-GT-51593; [50-01]
-    (=daikanwa		. 38656)	; &I-M-38656;
-    (=shinjigen@rev	.  2248)	; &GT-51593;
-    ))
-(define-char
-  '((morohashi-daikanwa	38656 0 0)
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x8FA7)	; 辧
-    (=cns11643-3	. #x5326)	; &I-C3-5326; [51-06]
-    ))
-(define-char
-  '((=>ucs		. #x8FA8)	; 辨
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ucs@jis		. #x8FA8)	; &GT-51594;
-    (=jis-x0208		. #x517E)	; &GT-51594; [49-94]
-    (=jis-x0213-1	. #x517E)	; &I-JX1-517E; [49-94]
-    (=gt		. 51594)	; &I-GT-51594;
-    (=gt-pj-1		. #x517E)	; &I-GT-51594; [49-94]
-    (=daikanwa		. 38657)	; &I-M-38657;
+    (->subsumptive
+     ((=ucs@jis		  . #x8FA7)	; &GT-51593;
+      (=jis-x0208	  . #x5221)	; &GT-51593; [50-01]
+      (=jis-x0213-1	  . #x5221)	; &I-JX1-5221; [50-01]
+      (=gt		  . 51593)	; &I-GT-51593;
+      (=gt-pj-1		  . #x5221)	; &I-GT-51593; [50-01]
+      (=daikanwa	  . 38656)	; &I-M-38656;
+      (=shinjigen	  .  2248)	; &GT-51593;
+      (<-original
+       ((=ucs@jis	    . #x8FA8)	; &AJ1-04277;
+	(=adobe-japan1-0    . 04277)	; &AJ1-04277;
+	(=jis-x0208	    . #x517E)	; &I-J90-517E; [49-94]
+	(=shinjigen	    .  2245)	; &AJ1-04277;
+	))
+      (<-original*sources
+       shinjigen)
+      (<-same
+       ((=ucs@jis	    . #x8FA8)	; &AJ1-04277;
+	(=adobe-japan1-0    . 04277)	; &AJ1-04277;
+	(=daikanwa	    . 38657)	; &I-M-38657;
+	))
+      (<-same*sources
+       zhengzitong daikanwa)
+      )
+     ((=ucs@unicode	  . #x8FA7)	; &C3-5326;
+      (=cns11643-3	  . #x5326)	; &C3-5326; [51-06]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	38657 0 0)
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x8FA8)	; 辨
-    (=gb2312		. #x3166)	; &I-G0-3166; [17-70]
-    ))
-(define-char
-  '((=>ucs		. #x8FA8)	; 辨
-    (morohashi-daikanwa	38657 0 0 1)
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=cns11643-1	. #x7255)	; &C1-7255; [82-53]
-    ))
-(define-char
-  '((=>ucs		. #x8FA8)	; 辨
-    (morohashi-daikanwa	38657 0 0 2)
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=ks-x1001		. #x5C29)	; &K0-5C29; [60-09]
+    (->subsumptive
+     ((=ucs@jis		  . #x8FA8)	; &AJ1-04277;
+      (=adobe-japan1-0	  . 04277)	; &AJ1-04277;
+      (=jis-x0208	  . #x517E)	; &I-J90-517E; [49-94]
+      (=jis-x0213-1	  . #x517E)	; &I-JX1-517E; [49-94]
+      (=gt		  . 51594)	; &I-GT-51594;
+      (=gt-pj-1		  . #x517E)	; &I-GT-51594; [49-94]
+      (=daikanwa	  . 38657)	; &I-M-38657;
+      (=shinjigen	  .  2245)	; &AJ1-04277;
+      )
+     ((=ucs@unicode	  . #x8FA8)	; &G0-3166;
+      (=gb2312		  . #x3166)	; &G0-3166; [17-70]
+      )
+     ((=ks-x1001	  . #x5C29)	; &K0-5C29; [60-09]
+      )
+     ((=cns11643-1	  . #x7255)	; &C1-7255; [82-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
@@ -887,12 +1014,11 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
-    (=>>daikanwa	. 38670)	; &G-M-38670;
+    (hanyu-dazidian	6 4043 4)
+    (=daikanwa		. 38670)	; &M-38670;
+    (=hanziku-10	. #xF2A2)	; &I-HZK10-F2A2;
     (->subsumptive
-     ((=daikanwa	  . 38670)	; &M-38670;
-      )
-     ((hanyu-dazidian	  6 4043 4)
-      (=hanziku-10	  . #xF2A2)	; &HZK10-F2A2;
+     ((==daikanwa	  . 38670)	; &g2-M-38670;
       ))
     ))
 (define-char
@@ -902,10 +1028,16 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
-    (=>>ucs@iso		. #x28432)	; &G-IU+28432;
+    (=ucs@iso		. #x28432)	; &C7-4373;
+    (=cns11643-7	. #x4373)	; &C7-4373; [35-83]
     (->subsumptive
-     ((=ucs@iso		  . #x28432)	; &C7-4373;
-      (=cns11643-7	  . #x4373)	; &C7-4373; [35-83]
+     ((==ucs@iso	  . #x28432)	; &g2-IU-00028432;
+      (==cns11643-7	  . #x4373)	; &g2-IU-00028432; [35-83]
+      (->subsumptive
+       ((===ucs@iso	    . #x28432)	; &R-U-00028432;
+	)
+       ((===cns11643-7	    . #x4373)	; &R-C7-4373; [35-83]
+	))
       ))
     ))
 (define-char
@@ -922,6 +1054,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
     (=ucs@jis		. #x8FAD)	; &GT-51611;
+    (=ucs@ks		. #x8FAD)	; &GT-51611;
     (=jis-x0208		. #x6D66)	; &GT-51611; [77-70]
     (=ks-x1001		. #x5E76)	; &I-K0-5E76; [62-86]
     (=jis-x0213-1	. #x6D66)	; &I-JX1-6D66; [77-70]
@@ -937,23 +1070,27 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (=>>ucs@unicode	. #x8FAD)	; &G-HD-FT-3973;
-    (=>>hanyo-denshi/ft . #x3973)	; &G-HD-FT-3973; [25-83]
+    (=ucs@unicode	. #x8FAD)	; &HD-FT-3973;
+    (=cns11643-1	. #x7930)	; &HD-FT-3973; [89-16]
+    (=gb12345		. #x3447)	; &HD-FT-3973; [20-39]
+    (=hanyo-denshi/ft	. #x3973)	; &I-HD-FT-3973; [25-83]
     (->subsumptive
-     ((=>>>ucs@unicode	  . #x8FAD)	; &g2-UU+8FAD;
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x8FAD)	; è¾­
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@unicode	  . #x8FAD)	; &g2-HD-FT-3973;
+      (==gb12345	  . #x3447)	; &g2-HD-FT-3973; [20-39]
+      (==hanyo-denshi/ft  . #x3973)	; &g2-HD-FT-3973; [25-83]
       (->subsumptive
-       ((=decomposition@hanyo-denshi
-	 ((=ucs		      . #x8FAD)	; è¾­
-	  )
-	 ((=ucs		      . #xE0102)	; 󠄂
-	  ))
-	(=hanyo-denshi/ft   . #x3973)	; &HD-FT-3973; [25-83]
+       ((===hanyo-denshi/ft . #x3973)	; &R-HD-FT-3973; [25-83]
 	)
-       ((=ucs@unicode	    . #x8FAD)	; &UU+8FAD;
-	(=gb12345	    . #x3447)	; &UU+8FAD; [20-39]
+       ((===ucs@unicode	    . #x8FAD)	; &R-UU+8FAD;
 	))
       )
-     ((=cns11643-1	  . #x7930)	; &C1-7930; [89-16]
+     ((==ucs@cns	  . #x8FAD)	; &g2-CU+8FAD;
+      (==cns11643-1	  . #x7930)	; &g2-CU+8FAD; [89-16]
       ))
     ))
 (define-char
@@ -1035,9 +1172,10 @@
     (total-strokes	 . 21)
     (=ucs		. #x8FAF)	; 辯
     (->subsumptive
-     ((=ucs@jis		  . #x8FAF)	; &GT-51615;
-      (=ucs@ks		  . #x8FAF)	; &GT-51615;
-      (=jis-x0208	  . #x6D67)	; &GT-51615; [77-71]
+     ((=ucs@jis		  . #x8FAF)	; &AJ1-06886;
+      (=ucs@ks		  . #x8FAF)	; &AJ1-06886;
+      (=adobe-japan1-0	  . 06886)	; &AJ1-06886;
+      (=jis-x0208	  . #x6D67)	; &I-J90-6D67; [77-71]
       (=ks-x1001	  . #x5C2A)	; &I-K0-5C2A; [60-10]
       (=jis-x0213-1	  . #x6D67)	; &I-JX1-6D67; [77-71]
       (=gt		  . 51615)	; &I-GT-51615;
@@ -1090,12 +1228,11 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 21)
     (total-strokes	 . 28)
-    (=>>daikanwa	. 38680)	; &G-M-38680;
+    (hanyu-dazidian	6 4045 5)
+    (=daikanwa		. 38680)	; &M-38680;
+    (=hanziku-10	. #xF2E3)	; &I-HZK10-F2E3;
     (->subsumptive
-     ((=daikanwa	  . 38680)	; &M-38680;
-      )
-     ((hanyu-dazidian	  6 4045 5)
-      (=hanziku-10	  . #xF2E3)	; &HZK10-F2E3;
+     ((==daikanwa	  . 38680)	; &g2-M-38680;
       ))
     ))
 (define-char
@@ -1105,11 +1242,16 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 22)
     (total-strokes	 . 29)
-    (=>>ucs@iso		. #x28441)	; &G-IU+28441;
+    (=ucs@iso		. #x28441)	; &C7-6547;
+    (=cns11643-7	. #x6547)	; &C7-6547; [69-39]
     (->subsumptive
-     ((=ucs@iso		  . #x28441)	; &U-00028441;
-      )
-     ((=cns11643-7	  . #x6547)	; &C7-6547; [69-39]
+     ((==ucs@iso	  . #x28441)	; &g2-IU-00028441;
+      (==cns11643-7	  . #x6547)	; &g2-IU-00028441; [69-39]
+      (->subsumptive
+       ((===ucs@iso	    . #x28441)	; &R-U-00028441;
+	)
+       ((===cns11643-7	    . #x6547)	; &R-C7-6547; [69-39]
+	))
       ))
     ))
 (define-char