X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R031-Enclosure.el;h=956181ae37c52bb353748205a26bd5c02100e63e;hb=1c0149e7d5276bcce926554063638cbde6eecf6a;hp=ec67f307d3b3aff1c91830eade5e316101443ed1;hpb=565d4796f0c6fb399ca20be7b9cceff795f7d1af;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index ec67f30..956181a 100644
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -57,7 +57,8 @@
     (=gt-pj-9		. #x4B22)	; &I-GT-04091; [43-02]
     (=daikanwa/ho	.  0077)	; ㇣
     (<-formed@Zetian
-     ((=ucs		  . #x661F)	; 星
+     ((=ucs@unicode	  . #x661F)	; &AJ1-02645;
+      (=adobe-japan1-0	  . 02645)	; &AJ1-02645;
       (=daikanwa	  . 13837)	; &I-M-13837;
       ))
     (<-formed@Zetian*sources
@@ -687,11 +688,8 @@
      ((name		  . "CJK RADICAL EYE")
       (=ucs		  . #x2EAB)	; ⺫
       )
-     ((=ucs@unicode	  . #x7F52)	; &JX2-746A;
-      (=jis-x0212	  . #x5474)	; &JX2-746A; [52-84]
-      (=cns11643-4	  . #x2221)	; &I-C4-2221; [02-01]
-      (=jis-x0213-2	  . #x746A)	; &I-JX2-746A; [84-74]
-      (=daikanwa	  . 28200)	; &I-M-28200;
+     ((name		  . "CJK RADICAL NET TWO")
+      (=ucs		  . #x2EB2)	; ⺲
       ))
     (->subsumptive
      ((=decomposition@hanyo-denshi
@@ -936,6 +934,15 @@
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((name		  . "CJK RADICAL SMALL ONE")
+      (=ucs		  . #x2E8C)	; ⺌
+      ))
     (=big5-cdp		. #x8B62)	; &CDP-8B62;
     (->subsumptive
      ((==big5-cdp	  . #x8B62)	; &g2-CDP-8B62;
@@ -1026,7 +1033,8 @@
       (=adobe-japan1-4	  . 13641)	; &AJ1-13641;
       (=daikanwa	  . 39013)	; &I-M-39013;
       )
-     ((=ucs		  . #x97CB)	; 韋
+     ((=ucs@unicode	  . #x97CB)	; &MJ028060;
+      (=mj		  . 028060)	; &MJ028060;
       (=daikanwa	  . 43108)	; &I-M-43108;
       )
      ((=ucs@jis		  . #x8FF4)	; &AJ1-06894;
@@ -1553,7 +1561,10 @@
     (=hanziku-2		. #xE4DE)	; &HZK02-E4DE;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x5718)	; &BUCS+5718;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (ideographic-structure
@@ -1604,7 +1615,25 @@
       ))
     (=ucs@unicode	. #x56E2)	; &G0-4D45;
     (=gb2312		. #x4D45)	; &G0-4D45; [45-37]
-    (=hanziku-2		. #xE4A4)	; &I-HZK02-E4A4;
+    (<-simplified@CN
+     ((=ucs@unicode	  . #x5718)	; &AJ1-04470;
+      (=adobe-japan1-0	  . 04470)	; &AJ1-04470;
+      (=gb12345		  . #x4D45)	; &AJ1-04470; [45-37]
+      )
+     ((=ucs@unicode	  . #x7CF0)	; &C1-7A28;
+      (=cns11643-1	  . #x7A28)	; &C1-7A28; [90-08]
+      (=gb12345		  . #x7870)	; &C1-7A28; [88-80]
+      (=daikanwa	  . 27175)	; &I-M-27175;
+      ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x56E2)	; &g2-UU+56E2;
+      (==gb2312		  . #x4D45)	; &g2-UU+56E2; [45-37]
+      (->subsumptive
+       ((===ucs@unicode	    . #x56E2)	; &R-UU+56E2;
+	)
+       ((=hanziku-2	    . #xE4A4)	; &HZK02-E4A4;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -1625,7 +1654,10 @@
     (=hanziku-2		. #xE4DD)	; &I-HZK02-E4DD;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x5718)	; &BUCS+5718;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (ideographic-structure
@@ -1645,7 +1677,8 @@
     (=gt-pj-1		. #x4344)	; &I-GT-05918; [35-36]
     (=daikanwa/+p	. 04703)	; 団
     (<-simplified@JP/Jouyou
-     ((=ucs		  . #x5718)	; 團
+     ((=ucs@unicode	  . #x5718)	; &AJ1-04470;
+      (=adobe-japan1-0	  . 04470)	; &AJ1-04470;
       (=jis-x0208	  . #x5425)	; &I-J90-5425; [52-05]
       ))
     (->subsumptive
@@ -2279,7 +2312,8 @@
     (->mistakable*sources
      kangxi-biansi-2char daikanwa)
     (->vulgar
-     ((=ucs		  . #x7A93)	; 窓
+     ((=ucs@unicode	  . #x7A93)	; &AJ1-02797;
+      (=adobe-japan1-0	  . 02797)	; &AJ1-02797;
       (=daikanwa	  . 25494)	; &I-M-25494;
       ))
     (->vulgar*sources
@@ -2516,7 +2550,8 @@
      ((=ucs		  . #x628F)	; 抏
       (=daikanwa	  . 11881)	; &I-M-11881;
       )
-     ((=ucs		  . #x5718)	; 團
+     ((=ucs@unicode	  . #x5718)	; &AJ1-04470;
+      (=adobe-japan1-0	  . 04470)	; &AJ1-04470;
       (=daikanwa	  . 04834)	; &I-M-04834;
       ))
     (<-formed$_1*sources
@@ -2529,7 +2564,8 @@
      ((=ucs		  . #x5713)	; 圓
       (=daikanwa	  . 04819)	; &I-M-04819;
       )
-     ((=ucs		  . #x5718)	; 團
+     ((=ucs@unicode	  . #x5718)	; &AJ1-04470;
+      (=adobe-japan1-0	  . 04470)	; &AJ1-04470;
       (=daikanwa	  . 04834)	; &I-M-04834;
       ))
     (<-interchangeable$_1*sources
@@ -2540,7 +2576,8 @@
      ((=ucs		  . #x5213)	; 刓
       (=daikanwa	  . 01895)	; &I-M-01895;
       )
-     ((=ucs		  . #x5718)	; 團
+     ((=ucs@unicode	  . #x5718)	; &AJ1-04470;
+      (=adobe-japan1-0	  . 04470)	; &AJ1-04470;
       (=daikanwa	  . 04834)	; &I-M-04834;
       ))
     (<-same$_1*sources
@@ -3287,6 +3324,38 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=>ucs@iwds-1	  . #x5315)	; &J97-5238;
+      (=>jis-x0208	  . #x5238)	; &J97-5238; [50-24]
+      ))
+    (=ucs		. #x2BB44)	; 𫭄
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2BB44)	; 𫭄
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=ucs		  . #x5315)	; 匕
+      ))
+    (=ucs@JP/hanazono	. #x2BB44)	; &hanaJU+2BB44;
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -3341,6 +3410,38 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
       )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=>ucs@iwds-1	  . #x4EBA)	; &A-IWDSU+4EBA;
+      (=>iwds-1		  .  14623)	; &A-IWDSU+4EBA;
+      ))
+    (=>ucs-itaiji-001	. #x2BB44)	; &A-U-i001+2BB44;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-001	  . #x2BB44)	; &A-U-i001+2BB44;
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
+    (=ucs-itaiji-001	. #x2BB44)	; &U-i001+2BB44;
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
      ((=ucs		  . #x56D7)	; 囗
       )
      ((=ucs		  . #x4ECC)	; 仌
@@ -3545,10 +3646,12 @@
     (=daikanwa		. 04741)	; &I-M-04741;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>daijiten	  . 01625)	; &A2-DJT-01625;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 717 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -3557,14 +3660,36 @@
       )
      ((=ucs		  . #x79BE)	; 禾
       ))
+    (sound@ja/on/go	"kiN" "giN")
+    (sound@ja/on/kan	"kiN" "kiN")
     (=ucs		. #x56F7)	; 囷
-    (=adobe-japan1-5	. 17413)	; &I-AJ1-17413;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56F7)	; 囷
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (hanyu-dazidian	1 717 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x79BE)	; &AJ1-01363;
+      (=adobe-japan1-0	  . 01363)	; &AJ1-01363;
+      ))
+    (=ucs@unicode	. #x56F7)	; &AJ1-17413;
+    (=adobe-japan1-5	. 17413)	; &AJ1-17413;
     (=jis-x0212		. #x3722)	; &I-JSP-3722; [23-02]
     (=iso-ir165		. #x7A67)	; &I-EGB-7A67; [90-71]
     (=cns11643-2	. #x2570)	; &I-C2-2570; [05-80]
     (=jis-x0213-2	. #x2458)	; &I-JX2-2458; [04-56]
     (=big5		. #xCBF0)	; &I-B-CBF0;
     (=daikanwa		. 04742)	; &I-M-04742;
+    (=daijiten		. 01625)	; &I-DJT-01625;
     (=jef-china3	. #x47C1)	; &I-JC3-47C1;
     (->subsumptive
      ((=decomposition@cid
@@ -3579,10 +3704,13 @@
       (==cns11643-2	  . #x2570)	; &g2-AJ1-17413; [05-80]
       (==jis-x0213-2	  . #x2458)	; &g2-AJ1-17413; [04-56]
       (==daikanwa	  . 04742)	; &g2-AJ1-17413;
+      (==daijiten	  . 01625)	; &g2-AJ1-17413;
       (==jef-china3	  . #x47C1)	; &g2-AJ1-17413;
       (->subsumptive
        ((===daikanwa	    . 04742)	; &R-M-04742;
 	)
+       ((===daijiten	    . 01625)	; &R-DJT-01625;
+	)
        ((===jis-x0212	    . #x3722)	; &R-JX2-2458; [23-02]
 	(===jis-x0213-2	    . #x2458)	; &R-JX2-2458; [04-56]
 	)
@@ -3617,10 +3745,12 @@
     (=hanziku-2		. #xE5A7)	; &I-HZK02-E5A7;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x56F9)	; &BUCS+56F9;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 717 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -3629,8 +3759,29 @@
       )
      ((=ucs		  . #x4EE4)	; 令
       ))
+    (sound@ja/on/go	"rIyAu")
+    (sound@ja/on/kan	"rei")
     (=ucs		. #x56F9)	; 囹
-    (=adobe-japan1-0	. 04461)	; &I-AJ1-04461;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56F9)	; 囹
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (hanyu-dazidian	1 717 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x4EE4)	; &AJ1-04009;
+      (=adobe-japan1-0	  . 04009)	; &AJ1-04009;
+      ))
+    (=ucs@unicode	. #x56F9)	; &AJ1-04461;
+    (=adobe-japan1-0	. 04461)	; &AJ1-04461;
     (=jis-x0208		. #x537A)	; &I-J90-537A; [51-90]
     (=gb2312		. #x6072)	; &I-G0-6072; [64-82]
     (=ks-x1001		. #x5637)	; &I-K0-5637; [54-23]
@@ -3640,7 +3791,8 @@
     (=gt		. 05976)	; &I-GT-05976;
     (=gt-pj-1		. #x537A)	; &I-GT-05976; [51-90]
     (=daikanwa		. 04744)	; &I-M-04744;
-    (=shinjigen		.  1322)	; 囹
+    (=daijiten		. 01626)	; &I-DJT-01626;
+    (=shinjigen		.  1322)	; &AJ1-04461;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -3673,10 +3825,13 @@
 	(==jis-x0213-1	    . #x537A)	; &g2-AJ1-04461; [51-90]
 	(==gt		    . 05976)	; &g2-AJ1-04461;
 	(==daikanwa	    . 04744)	; &g2-AJ1-04461;
+	(==daijiten	    . 01626)	; &g2-AJ1-04461;
 	(==shinjigen	    .  1322)	; &g2-AJ1-04461;
 	(->subsumptive
 	 ((===daikanwa	      . 04744)	; &R-M-04744;
 	  )
+	 ((===daijiten	      . 01626)	; &R-DJT-01626;
+	  )
 	 ((===jis-x0208	      . #x537A)	; &R-J0-537A; [51-90]
 	  (===jis-x0213-1     . #x537A)	; &R-J0-537A; [51-90]
 	  )
@@ -4045,6 +4200,28 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x5360)	; 占
+      ))
+    (=ucs		. #x3024F)	; 𰉏
+    (=ruimoku-v6	. #xE0BD)	; &I-RUI6-E0BD;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x3024F)	; &g2-hanaJU+3024F;
+      (==ruimoku-v6	  . #xE0BD)	; &g2-hanaJU+3024F;
+      (->subsumptive
+       ((===ruimoku-v6	    . #xE0BD)	; &R-RUI6-E0BD;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -4122,23 +4299,6 @@
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs		  . #x5360)	; 占
-      ))
-    (=ruimoku-v6	. #xE0BD)	; &RUI6-E0BD;
-    (->subsumptive
-     ((==ruimoku-v6	  . #xE0BD)	; &g2-RUI6-E0BD;
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
      ((=ucs		  . #x767D)	; 白
       ))
     (=ruimoku-v6	. #xE0D1)	; &RUI6-E0D1;
@@ -4562,7 +4722,53 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=daikanwa		. 04764)	; &M-04764;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x5408)	; 合
+      ))
+    (sound@ja/on	"kAu")
+    (=ucs		. #x211DE)	; 𡇞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x211DE)	; 𡇞
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 718 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x5408)	; &AJ1-02041;
+      (=adobe-japan1-0	  . 02041)	; &AJ1-02041;
+      ))
+    (=ucs@iso		. #x211DE)	; &MJ032855;
+    (=mj		. 032855)	; &MJ032855;
+    (=koseki		. 054390)	; &MJ032855;
+    (=daikanwa		. 04764)	; &I-M-04764;
+    (->subsumptive
+     ((==ucs@iso	  . #x211DE)	; &g2-MJ032855;
+      (==mj		  . 032855)	; &g2-MJ032855;
+      (==koseki		  . 054390)	; &g2-MJ032855;
+      (==daikanwa	  . 04764)	; &g2-MJ032855;
+      (->subsumptive
+       ((===daikanwa	    . 04764)	; &R-M-04764;
+	)
+       ((===mj		    . 032855)	; &R-MJ032855;
+	)
+       ((===ucs@iso	    . #x211DE)	; &R-U-000211DE;
+	)
+       ((=hanziku-2	    . #xE5EB)	; &HZK02-E5EB;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -6013,11 +6219,61 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 722 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=ucs		  . #x5408)	; 合
+      ))
+    (sound@ja/on/go	"goHu")
+    (sound@ja/on/kan	"kAu")
     (=ucs		. #x211F6)	; 𡇶
-    (=cns11643-6	. #x3E22)	; &I-C6-3E22; [30-02]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x211F6)	; 𡇶
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 722 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=gt-k		  . 01419)	; &GT-K01419;
+      )
+     ((=ucs@unicode	  . #x5408)	; &AJ1-02041;
+      (=adobe-japan1-0	  . 02041)	; &AJ1-02041;
+      ))
+    (=ucs@iso		. #x211F6)	; &C6-3E22;
+    (=cns11643-6	. #x3E22)	; &C6-3E22; [30-02]
     (=daikanwa		. 04796)	; &I-M-04796;
-    (=hanziku-2		. #xE6C5)	; &I-HZK02-E6C5;
+    (->interchangeable
+     ((=ucs@unicode	  . #x90C3)	; &AJ1-18782;
+      (=adobe-japan1-5	  . 18782)	; &AJ1-18782;
+      (=daikanwa	  . 39377)	; &I-M-39377;
+      ))
+    (->interchangeable$_1*sources
+     jiyun daikanwa)
+    (->interchangeable*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x211F6)	; &g2-M-04796;
+      (==cns11643-6	  . #x3E22)	; &g2-M-04796; [30-02]
+      (==daikanwa	  . 04796)	; &g2-M-04796;
+      (->subsumptive
+       ((===daikanwa	    . 04796)	; &R-M-04796;
+	)
+       ((===cns11643-6	    . #x3E22)	; &R-C6-3E22; [30-02]
+	)
+       ((===ucs@iso	    . #x211F6)	; &R-U-000211F6;
+	)
+       ((=hanziku-2	    . #xE6C5)	; &HZK02-E6C5;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -6443,8 +6699,23 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
+    (=>ucs@cognate	. #x570D)	; &A-cgnU+570D;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@cognate	  . #x570D)	; &A-cgnU+570D;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x97CB)	; 韋
+      ))
     (=ucs		. #x570D)	; 圍
     ))
 (define-char
@@ -6461,9 +6732,9 @@
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs		  . #x97CB)	; 韋
+     ((=ucs@unicode	  . #x97CB)	; &MJ028060;
+      (=mj		  . 028060)	; &MJ028060;
       ))
-    (=>ucs@iwds-1	. #x570D)	; &MJ008868;
     (=ucs@unicode	. #x570D)	; &MJ008868;
     (=mj		. 008868)	; &MJ008868;
     (=adobe-japan1-0	. 04468)	; &I-AJ1-04468;
@@ -6507,16 +6778,6 @@
 	  )
 	 ((=ucs		      . #xE0101)	; 󠄁
 	  ))
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-	  (=ucs		      . #x2FF4)	; â¿´
-	  )
-	 ((==ucs@unicode      . #x56D7)	; &g2-AJ1-04459;
-	  (==adobe-japan1-0   . 04459)	; &g2-AJ1-04459;
-	  )
-	 ((==ucs@unicode      . #x97CB)	; &g2-GT-57812;
-	  (==daikanwa	      . 43108)	; &g2-GT-57812;
-	  ))
 	(==ucs@ks	    . #x570D)	; &g2-AJ1-13528;
 	(==adobe-japan1-4   . 13528)	; &g2-AJ1-13528;
 	(==jis-x0208@1978   . #x5423)	; &g2-AJ1-13528; [52-03]
@@ -6592,16 +6853,6 @@
 	  )
 	 ((=ucs		      . #xE0103)	; 󠄃
 	  ))
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-	  (=ucs		      . #x2FF4)	; â¿´
-	  )
-	 ((==ucs@unicode      . #x56D7)	; &g2-AJ1-04459;
-	  (==adobe-japan1-0   . 04459)	; &g2-AJ1-04459;
-	  )
-	 ((==ucs@jis	      . #x97CB)	; &g2-MJ028060;
-	  (==mj		      . 028060)	; &g2-MJ028060;
-	  ))
 	(==mj		    . 008869)	; &g2-MJ008869;
 	(==hanyo-denshi/ft  . #x3C6A)	; &g2-MJ008869; [28-74]
 	(->subsumptive
@@ -6614,19 +6865,43 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x570D)	; 圍
+     ((=>ucs@cognate	  . #x570D)	; &A-cgnU+570D;
       ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (===hng-khi		. 00280)	; &HNG010-00280;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x2E9F0)	; 𮧰
+      ))
+    (=>ucs-itaiji-002	. #x570D)	; &A-U-i002+570D;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x570D)	; 圍
+     ((=>ucs-itaiji-002	  . #x570D)	; &A-U-i002+570D;
       ))
     (ideographic-radical . 31)	; ⼞
-    (===hng-khm		. 02520)	; &HNG011-02520;
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@JP/hanazono	  . #x2E9F0)	; &MJ059016;
+      (=mj		  . 059016)	; &MJ059016;
+      ))
+    (=ucs-itaiji-002	. #x570D)	; &U-i002+570D;
+    (->subsumptive
+     ((===hng-khm	  . 02520)	; &HNG011-02520;
+      )
+     ((===hng-khi	  . 00280)	; &HNG010-00280;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -7957,31 +8232,55 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>daijiten	  . 01648)	; &A2-DJT-01648;
+      )
+     ((==>ucs@bucs	  . #x5718)	; &BUCS+5718;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (hanyu-dazidian	1 725 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs		  . #x5C08)	; 專
+     ((=>ucs@iwds-1	  . #x5C08)	; &A-IWDSU+5C08;
+      (=>iwds-1		  .  0387)	; &A-IWDSU+5C08;
       ))
     (=ucs		. #x5718)	; 團
-    (=adobe-japan1-0	. 04470)	; &I-AJ1-04470;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5718)	; 團
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	1 725 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x5C08)	; &AJ1-04642;
+      (=adobe-japan1-0	  . 04642)	; &AJ1-04642;
+      ))
+    (=ucs@unicode	. #x5718)	; &AJ1-04470;
+    (=adobe-japan1-0	. 04470)	; &AJ1-04470;
     (=jis-x0208		. #x5425)	; &I-J90-5425; [52-05]
     (=ks-x1001		. #x5325)	; &I-K0-5325; [51-05]
     (=cns11643-1	. #x6836)	; &I-C1-6836; [72-22]
     (=jis-x0213-1	. #x5425)	; &I-JX1-5425; [52-05]
-    (=gb12345		. #x4D45)	; 團 [45-37]
+    (=gb12345		. #x4D45)	; &AJ1-04470; [45-37]
     (=big5		. #xB9CE)	; &I-B-B9CE;
     (=gt		. 06086)	; &I-GT-06086;
     (=gt-k		. 11195)	; &I-GT-K11195;
     (=gt-pj-1		. #x5425)	; &I-GT-06086; [52-05]
     (=daikanwa		. 04834)	; &I-M-04834;
-    (=shinjigen		.  1307)	; 團
+    (=shinjigen		.  1307)	; &AJ1-04470;
     (<-ancient
      ((=ucs@unicode	  . #x6171)	; &AJ1-04894;
       (=adobe-japan1-0	  . 04894)	; &AJ1-04894;
@@ -8004,7 +8303,8 @@
      ((=ucs		  . #x56ED)	; 园
       (=daikanwa	  . 04714)	; &I-M-04714;
       )
-     ((=ucs		  . #x587C)	; 塼
+     ((=ucs@unicode	  . #x587C)	; &AJ1-14436;
+      (=adobe-japan1-4	  . 14436)	; &AJ1-14436;
       (=daikanwa	  . 05400)	; &I-M-05400;
       )
      ((=ucs@unicode	  . #x5C08)	; &AJ1-04642;
@@ -8029,7 +8329,8 @@
     (->formed*sources
      daikanwa)
     (->interchangeable
-     ((=ucs		  . #x6476)	; 摶
+     ((=ucs@unicode	  . #x6476)	; &AJ1-05021;
+      (=adobe-japan1-0	  . 05021)	; &AJ1-05021;
       (=daikanwa	  . 12642)	; &I-M-12642;
       )
      ((=ucs@unicode	  . #x5C08)	; &AJ1-04642;
@@ -8042,7 +8343,8 @@
      ((=ucs		  . #x56ED)	; 园
       (=daikanwa	  . 04714)	; &I-M-04714;
       )
-     ((=ucs		  . #x587C)	; 塼
+     ((=ucs@unicode	  . #x587C)	; &AJ1-14436;
+      (=adobe-japan1-4	  . 14436)	; &AJ1-14436;
       (=daikanwa	  . 05400)	; &I-M-05400;
       )
      ((=ucs		  . #x63E3)	; 揣
@@ -8056,7 +8358,8 @@
       (=adobe-japan1-0	  . 04894)	; &AJ1-04894;
       (=daikanwa	  . 11137)	; &I-M-11137;
       )
-     ((=ucs		  . #x6476)	; 摶
+     ((=ucs@unicode	  . #x6476)	; &AJ1-05021;
+      (=adobe-japan1-0	  . 05021)	; &AJ1-05021;
       (=daikanwa	  . 12642)	; &I-M-12642;
       ))
     (->interchangeable$_1*sources
@@ -8108,6 +8411,26 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5718)	; 團
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=mj		  . 010273)	; &MJ010273;
+      ))
+    (=daijiten		. 01648)	; &DJT-01648;
+    (->subsumptive
+     ((==daijiten	  . 01648)	; &g2-DJT-01648;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -8584,10 +8907,12 @@
     (=hanziku-2		. #xE7AE)	; &I-HZK02-E7AE;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>daijiten	  . 01650)	; &A2-DJT-01650;
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (hanyu-dazidian	1 726 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -8596,15 +8921,40 @@
       )
      ((=ucs		  . #x776A)	; 睪
       ))
+    (sound@ja/on/go	"yaku")
+    (sound@ja/on/kan	"eki")
     (=ucs		. #x571B)	; 圛
-    (=mj		. 008887)	; &I-MJ008887;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x571B)	; 圛
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (hanyu-dazidian	1 726 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x776A)	; &JX2-7227;
+      (=jis-x0212	  . #x4F23)	; &JX2-7227; [47-03]
+      (=cns11643-1	  . #x6548)	; &I-C1-6548; [69-40]
+      (=jis-x0213-2	  . #x7227)	; &I-JX2-7227; [82-07]
+      (=daikanwa	  . 23466)	; &I-M-23466;
+      ))
+    (=ucs@unicode	. #x571B)	; &MJ008887;
+    (=mj		. 008887)	; &MJ008887;
     (=adobe-japan1-5	. 19278)	; &I-AJ1-19278;
     (=jis-x0212		. #x372B)	; &I-JSP-372B; [23-11]
     (=cns11643-2	. #x5652)	; &I-C2-5652; [54-50]
     (=big5		. #xE948)	; &I-B-E948;
     (=hanyo-denshi/jt	. #xAF45)	; &I-HD-JT-AF45;
-    (=koseki		. 055350)	; 圛
+    (=koseki		. 055350)	; &MJ008887;
     (=daikanwa		. 04850)	; &I-M-04850;
+    (=daijiten		. 01650)	; &I-DJT-01650;
     (=jef-china3	. #x47C7)	; &I-JC3-47C7;
     (->subsumptive
      ((=>>ucs@jis	  . #x571B)	; &G-MJ008887;
@@ -8623,9 +8973,12 @@
 	(==jis-x0212	    . #x372B)	; &g2-MJ008887; [23-11]
 	(==koseki	    . 055350)	; &g2-MJ008887;
 	(==daikanwa	    . 04850)	; &g2-MJ008887;
+	(==daijiten	    . 01650)	; &g2-MJ008887;
 	(->subsumptive
 	 ((===daikanwa	      . 04850)	; &R-M-04850;
 	  )
+	 ((===daijiten	      . 01650)	; &R-DJT-01650;
+	  )
 	 ((===jis-x0212	      . #x372B)	; &R-JSP-372B; [23-11]
 	  )
 	 ((===adobe-japan1-5  . 19278)	; &R-AJ1-19278;
@@ -8783,18 +9136,54 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
+  '((<-denotational@usage
+     ((==>ucs@bucs	  . #x7344)	; &BUCS+7344;
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x7344)	; 獄
+      ))
+    (=ucs		. #x2122D)	; 𡈭
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2122D)	; 𡈭
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (hanyu-dazidian	1 727 4)
-    (=ucs		. #x2122D)	; 𡈭
-    (=cns11643-7	. #x373C)	; &I-C7-373C; [23-28]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs@unicode	  . #x7344)	; &AJ1-02056;
+      (=adobe-japan1-0	  . 02056)	; &AJ1-02056;
+      ))
+    (=ucs@iso		. #x2122D)	; &C7-373C;
+    (=cns11643-7	. #x373C)	; &C7-373C; [23-28]
     (=daikanwa		. 04855)	; &I-M-04855;
-    (=shinjigen		.  7639)	; 𡈭
+    (=daijiten		. 01652)	; &I-DJT-01652;
+    (=shinjigen		.  7639)	; &C7-373C;
+    (<-ancient
+     ((=ucs@unicode	  . #x7344)	; &AJ1-02056;
+      (=adobe-japan1-0	  . 02056)	; &AJ1-02056;
+      (=daikanwa	  . 20603)	; &I-M-20603;
+      ))
+    (<-ancient*sources
+     yupian daikanwa)
     (<-vulgar
-     ((=ucs		  . #x7344)	; 獄
+     ((=ucs@unicode	  . #x7344)	; &AJ1-02056;
+      (=adobe-japan1-0	  . 02056)	; &AJ1-02056;
       (=jis-x0208	  . #x3976)	; &I-J90-3976; [25-86]
-      (=shinjigen	  .  7638)	; 獄
+      (=shinjigen	  .  7638)	; &AJ1-02056;
       ))
     (<-vulgar*sources
      shinjigen)
@@ -8802,7 +9191,13 @@
      ((==daikanwa	  . 04855)	; &g2-M-04855;
       (==shinjigen	  .  7639)	; &g2-M-04855;
       )
-     ((==ucs@iso	  . #x2122D)	; &g2-IU-0002122D;
+     ((==ucs@iso	  . #x2122D)	; &g2-DJT-01652;
+      (==daijiten	  . 01652)	; &g2-DJT-01652;
+      (->subsumptive
+       ((===daijiten	    . 01652)	; &R-DJT-01652;
+	)
+       ((===ucs@iso	    . #x2122D)	; &R-U-0002122D;
+	))
       )
      ((==ucs@cns	  . #x2122D)	; &g2-CU+2122D;
       (==cns11643-7	  . #x373C)	; &g2-CU+2122D; [23-28]
@@ -9393,12 +9788,6 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 718 12)
-    (=ucs		. #x211DE)	; 𡇞
-    (=hanziku-2		. #xE5EB)	; &I-HZK02-E5EB;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
     (hanyu-dazidian	1 719 5)
     (=ucs		. #x211E8)	; 𡇨
     (=hanziku-2		. #xE645)	; &I-HZK02-E645;
@@ -9449,11 +9838,35 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
+    (==>ucs@bucs	. #x5718)	; &BUCS+5718;
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
     (==>ucs@bucs	. #x570B)	; &BUCS+570B;
     (==>daijiten	. 01639)	; &BUCS+570B;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
+    (==>daijiten	. 01625)	; &A2-DJT-01625;
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
+    (==>ucs@bucs	. #x56F9)	; &BUCS+56F9;
+    (==>daijiten	. 01626)	; &BUCS+56F9;
+    ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
     (==>ucs@bucs	. #x56FF)	; &BUCS+56FF;
     (==>daijiten	. 01630)	; &BUCS+56FF;
     ))
+(define-char
+  '((ideographic-radical . 31)	; ⼞
+    (==>daijiten	. 01650)	; &A2-DJT-01650;
+    ))
+(define-char
+  '((<-denotational
+     ((==>ucs@bucs	  . #x5718)	; &BUCS+5718;
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (==>daijiten	. 01648)	; &A2-DJT-01648;
+    ))