X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R031-Enclosure.el;h=70b27d8ab791f454b4481da7fcf8768be749dc48;hb=f435b0f8544c5a06dc28f72a8957b768e456dc91;hp=72f74a744a8194760a8f0c23a61beedf984b3890;hpb=c986ddb0792fa5239dfbf1cbb40b22756735abb1;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index 72f74a7..70b27d8 100644
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -679,8 +679,8 @@
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs@jis		  . #x4EA2)	; &AJ1-04111;
-      (=jis-x0208	  . #x5036)	; &AJ1-04111; [48-22]
+     ((=ucs@jis		  . #x4EA2)	; 亢󠄀
+      (=jis-x0208	  . #x5036)	; 亢󠄀 [48-22]
       (=ks-x1001	  . #x7971)	; &I-K0-7971; [89-81]
       (=jis-x0213-1	  . #x5036)	; &I-JX1-5036; [48-22]
       (=daikanwa	  . 00288)	; &I-M-00288;
@@ -1456,8 +1456,8 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	  (=ucs		      . #x2FF1)	; ⿱
 	  )
-	 ((=ucs@jis	      . #x516B)	; &GT-01888;
-	  (=jis-x0208	      . #x482C)	; &GT-01888; [40-12]
+	 ((=ucs@jis	      . #x516B)	; 八󠄀
+	  (=jis-x0208	      . #x482C)	; 八󠄀 [40-12]
 	  (=ks-x1001	      . #x7822)	; &I-K0-7822; [88-02]
 	  (=jis-x0213-1	      . #x482C)	; &I-JX1-482C; [40-12]
 	  (=daikanwa	      . 01450)	; &I-M-01450;
@@ -1514,7 +1514,13 @@
        ((=ucs		    . #x571F)	; 土
 	))
       ))
-    (=cns11643-3	. #x2822)	; &C3-2822; [08-02]
+    (=>>ucs@cns		. #x56F6)	; &G-CU+56F6;
+    (->subsumptive
+     ((=hanyo-denshi/jt	  . #xAF38)	; &HD-JT-AF38;
+      )
+     ((=ucs@cns		  . #x56F6)	; &C3-2822;
+      (=cns11643-3	  . #x2822)	; &C3-2822; [08-02]
+      ))
     ))
 (define-char
   '((=>ucs		. #x211B5)	; 𡆵
@@ -1637,8 +1643,8 @@
 	)
        ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs@jis	    . #x4EE4)	; &AJ1-04009;
-	(=jis-x0208	    . #x4E61)	; &AJ1-04009; [46-65]
+       ((=ucs@jis	    . #x4EE4)	; 令󠄀
+	(=jis-x0208	    . #x4E61)	; 令󠄀 [46-65]
 	(=ks-x1001	    . #x5635)	; &I-K0-5635; [54-21]
 	(=jis-x0213-1	    . #x4E61)	; &I-JX1-4E61; [46-65]
 	(=daikanwa	    . 00387)	; &I-M-00387;
@@ -2562,6 +2568,7 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 721 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -2600,7 +2607,7 @@
     (=gt-k		. 07917)	; &I-GT-K07917;
     (=gt-pj-1		. #x5421)	; &I-GT-06024; [52-01]
     (=daikanwa		. 04789)	; &I-M-04789;
-    (=shinjigen@rev	.  1330)	; &GT-06024;
+    (=shinjigen		.  1330)	; &GT-06024;
     (=hanyo-denshi/ja	. #x5421)	; &I-HD-JA-5421; [52-01]
     ))
 (define-char
@@ -2610,20 +2617,40 @@
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 721 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
       )
      ((=ucs		  . #x56D7)	; 囗
       )
-     ((=ucs@unicode	  . #x5377)	; &C1-4C3A;
-      (=gb2312		  . #x3E6D)	; &C1-4C3A; [30-77]
-      (=cns11643-1	  . #x4C3A)	; &I-C1-4C3A; [44-26]
+     ((=>>ucs@unicode	  . #x5377)	; &G-UU+5377;
+      ))
+    (=>>ucs@unicode	. #x5708)	; &G-UU+5708;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=hanyo-denshi/ft   . #x3521)	; &HD-FT-3521; [21-01]
+	))
+      (=hanyo-denshi/ft	  . #x353A)	; &HD-FT-353A; [21-26]
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=ucs@unicode	    . #x5377)	; &C1-4C3A;
+	(=gb2312	    . #x3E6D)	; &C1-4C3A; [30-77]
+	(=cns11643-1	    . #x4C3A)	; &I-C1-4C3A; [44-26]
+	))
+      (=ucs@unicode	  . #x5708)	; &C1-594E;
+      (=gb2312		  . #x4826)	; &C1-594E; [40-06]
+      (=cns11643-1	  . #x594E)	; &I-C1-594E; [57-46]
       ))
-    (=ucs@unicode	. #x5708)	; &C1-594E;
-    (=gb2312		. #x4826)	; &C1-594E; [40-06]
-    (=cns11643-1	. #x594E)	; &I-C1-594E; [57-46]
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2966,11 +2993,35 @@
     (=ucs		. #x570D)	; 圍
     (=big5		. #xB3F2)	; &I-B-B3F2;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x5423)	; &M-04806; [52-03]
-      (=jis-x0208@1983	  . #x5423)	; &I-J83-5423; [52-03]
-      (=ks-x1001	  . #x6A4C)	; &I-K0-6A4C; [74-44]
-      (=cns11643-1	  . #x5E58)	; &I-C1-5E58; [62-56]
-      (=daikanwa	  . 04806)	; &I-M-04806;
+     ((=>>>ucs@unicode	  . #x570D)	; &GI-UU+570D;
+      (->subsumptive
+       ((=jis-x0208@1978    . #x5423)	; &M-04806; [52-03]
+	(=jis-x0208@1983    . #x5423)	; &I-J83-5423; [52-03]
+	(=ks-x1001	    . #x6A4C)	; &I-K0-6A4C; [74-44]
+	(=cns11643-1	    . #x5E58)	; &I-C1-5E58; [62-56]
+	(=daikanwa	    . 04806)	; &I-M-04806;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	  (=ucs		      . #x2FF4)	; â¿´
+	  )
+	 ((=ucs		      . #x56D7)	; 囗
+	  )
+	 ((=ucs@unicode	      . #x97CB)	; &GT-57812;
+	  (=gb12345	      . #x4E24)	; &GT-57812; [46-04]
+	  (=daikanwa	      . 43108)	; &GT-57812;
+	  ))
+	(=gt		    . 06038)	; &GT-06038;
+	(=gt-k		    . 09174)	; &I-GT-K09174;
+	(=gt-pj-1	    . #x5423)	; &GT-06038; [52-03]
+	(=shinjigen	    .  1309)	; &GT-06038;
+	)
+       ((=ucs@unicode	    . #x570D)	; &J90-5423;
+	(=jis-x0208@1990    . #x5423)	; &J90-5423; [52-03]
+	(=jis-x0213-1	    . #x5423)	; &I-JX1-5423; [52-03]
+	(=gb12345	    . #x4E27)	; &J90-5423; [46-07]
+	(=hanyo-denshi/ja   . #x5423)	; &I-HD-JA-5423; [52-03]
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
@@ -2978,20 +3029,12 @@
 	)
        ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs@unicode	    . #x97CB)	; &GT-57812;
-	(=gb12345	    . #x4E24)	; &GT-57812; [46-04]
-	(=daikanwa	    . 43108)	; &GT-57812;
+       ((=ucs@jis	    . #x97CB)	; &GT-57813;
+	(=jis-x0208	    . #x706A)	; &GT-57813; [80-74]
+	(=ks-x1001	    . #x6A5F)	; &I-K0-6A5F; [74-63]
+	(=jis-x0213-1	    . #x706A)	; &I-JX1-706A; [80-74]
 	))
-      (=gt		  . 06038)	; &GT-06038;
-      (=gt-k		  . 09174)	; &I-GT-K09174;
-      (=gt-pj-1		  . #x5423)	; &GT-06038; [52-03]
-      (=shinjigen	  .  1309)	; &GT-06038;
-      )
-     ((=ucs@unicode	  . #x570D)	; &J90-5423;
-      (=jis-x0208@1990	  . #x5423)	; &J90-5423; [52-03]
-      (=jis-x0213-1	  . #x5423)	; &I-JX1-5423; [52-03]
-      (=gb12345		  . #x4E27)	; &J90-5423; [46-07]
-      (=hanyo-denshi/ja	  . #x5423)	; &I-HD-JA-5423; [52-03]
+      (=hanyo-denshi/ft	  . #x3C6A)	; &HD-FT-3C6A; [28-74]
       ))
     ))
 (define-char
@@ -3619,6 +3662,30 @@
      ((=ucs		  . #x5716)	; 圖
       ))
     (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs		    . #x9762)	; 面
+	))
+      ))
+    (=hanyo-denshi/jt	. #xAF43)	; &HD-JT-AF43;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5716)	; 圖
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=>>ucs@unicode	. #x5716)	; &G-UU+5716;