X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R031-Enclosure.el;h=6b756bf366f70755b2962f77fc02a2fdb4f2bc69;hb=329a4fe3f24bdf8420f27c2aaf021ac54de11ceb;hp=e8eea22ae46d44e192723e6f6025f355c315086e;hpb=bfba76d68e2d13c4388d491c5c3272dc5321a3d0;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index e8eea22..6b756bf 100644
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -178,29 +178,27 @@
     (=cns11643-4	. #x216E)	; &C4-216E; [01-78]
     ))
 (define-char
-  '((=>ucs		. #x56DB)	; 四
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (shinjigen-2	. 1299)
-    (=jis-x0208		. #x3B4D)	; &GT-05901; [27-45]
-    (=ks-x1001		. #x5E4C)	; &I-K0-5E4C; [62-44]
-    (=gt		. 05901)	; &I-GT-05901;
-    (=gt-k		. 00942)	; &I-GT-K00942;
-    (=gt-pj-1		. #x3B4D)	; &I-GT-05901; [27-45]
-    (=daikanwa		. 04682)	; &I-M-04682;
-    (=ucs@jis		. #x56DB)	; &GT-05901;
-    ))
-(define-char
-  '((morohashi-daikanwa	4682 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 710 16)
     (=ucs		. #x56DB)	; 四
-    (=gb2312		. #x4B44)	; &I-G0-4B44; [43-36]
-    (=cns11643-1	. #x463E)	; &I-C1-463E; [38-30]
     (=big5		. #xA57C)	; &I-B-A57C;
+    (->subsumptive
+     ((shinjigen-2	  . 1299)
+      (=jis-x0208	  . #x3B4D)	; &GT-05901; [27-45]
+      (=ks-x1001	  . #x5E4C)	; &I-K0-5E4C; [62-44]
+      (=gt		  . 05901)	; &I-GT-05901;
+      (=gt-k		  . 00942)	; &I-GT-K00942;
+      (=gt-pj-1		  . #x3B4D)	; &I-GT-05901; [27-45]
+      (=daikanwa	  . 04682)	; &I-M-04682;
+      (=ucs@jis		  . #x56DB)	; &GT-05901;
+      )
+     ((=gb2312		  . #x4B44)	; &G0-4B44; [43-36]
+      (=ucs@unicode	  . #x56DB)	; &G0-4B44;
+      )
+     ((=cns11643-1	  . #x463E)	; &C1-463E; [38-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -651,20 +649,51 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 715 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56DB)	; 四
+    (=ucs		. #x56E7)	; 囧
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56E7)	; 囧
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=big5		. #xCAA8)	; &B-CAA8;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=jis-x0208	    . #x3B4D)	; &GT-05901; [27-45]
+	(=ks-x1001	    . #x5E4C)	; &I-K0-5E4C; [62-44]
+	(=daikanwa	    . 04682)	; &I-M-04682;
+	)
+       ((=big5-cdp	    . #x8BC0)	; &CDP-8BC0;
+	))
+      (=jis-x0212	  . #x367A)	; &M-04707; [22-90]
+      (=daikanwa	  . 04707)	; &I-M-04707;
+      (=jef-china3	  . #x47BF)	; &I-JC3-47BF;
+      (=ucs@jis		  . #x56E7)	; &M-04707;
       )
-     ((=big5-cdp	  . #x8BC0)	; &CDP-8BC0;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=cns11643-1	    . #x463E)	; &C1-463E; [38-30]
+	)
+       ((=big5-cdp	    . #x8BC0)	; &CDP-8BC0;
+	))
+      (=cns11643-2	  . #x2348)	; &C2-2348; [03-40]
       ))
-    (=ucs		. #x56E7)	; 囧
-    (=jis-x0212		. #x367A)	; &I-JSP-367A; [22-90]
-    (=cns11643-2	. #x2348)	; &I-C2-2348; [03-40]
-    (=big5		. #xCAA8)	; &I-B-CAA8;
-    (=daikanwa		. 04707)	; &I-M-04707;
-    (=jef-china3	. #x47BF)	; &I-JC3-47BF;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56E7)	; 囧
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs@unicode	. #x56E7)	; &UU+56E7;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -704,30 +733,35 @@
     (=hanziku-2		. #xE542)	; &I-HZK02-E542;
     ))
 (define-char
-  '((=>ucs		. #x56F1)	; 囱
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical@ucs . 31)	; ⼞
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 36)	; â¼£
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=big5-cdp	  . #x8CC8)	; &CDP-8CC8;
-      )
-     ((=ucs		  . #x590A)	; 夊
+    (=ucs		. #x56F1)	; 囱
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56F1)	; 囱
       ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
     (=jis-x0212		. #x367C)	; &M-04710; [22-92]
     (=daikanwa		. 04710)	; &I-M-04710;
     (=ucs@jis		. #x56F1)	; &M-04710;
     ))
 (define-char
-  '((morohashi-daikanwa	4710 0 1)
+  '((<-denotational
+     ((=ucs		  . #x56F1)	; 囱
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x56F1)	; 囱
-    (=gb2312		. #x3451)	; &I-G0-3451; [20-49]
+    (=gb2312		. #x3451)	; &G0-3451; [20-49]
     (=jef-china3	. #x8CD8)	; &I-JC3-8CD8;
+    (=ucs@unicode	. #x56F1)	; &G0-3451;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -826,6 +860,7 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 715 5)
     (=ucs		. #x56EE)	; 囮
     (=big5		. #xCAA7)	; &I-B-CAA7;
     (->subsumptive
@@ -854,14 +889,13 @@
       (=cns11643-2	  . #x2347)	; &C2-2347; [03-39]
       (=ucs@cns		  . #x56EE)	; &C2-2347;
       )
-     ((hanyu-dazidian	  1 715 5)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
 	(=ucs		    . #x2FF4)	; â¿´
 	)
        ((=ucs		    . #x56D7)	; 囗
 	)
-       ((=ucs@unicode	    . #x5316)	; &UU+5316;
+       ((=daikanwa	    . 02572)	; &M-02572;
 	))
       (=gt		  . 05931)	; &GT-05931;
       (=gt-pj-1		  . #x5379)	; &GT-05931; [51-89]
@@ -2404,12 +2438,12 @@
     (=big5		. #xD4AB)	; &I-B-D4AB;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x570A)	; 圊
       ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -2425,12 +2459,12 @@
     (=ucs@jis		. #x570A)	; &M-04797;
     ))
 (define-char
-  '((ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x570A)	; 圊
       ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (->subsumptive
      ((hanyu-dazidian	  1 720 6)
       (ideographic-structure
@@ -2645,15 +2679,23 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
+    (=ucs		. #x21209)	; 𡈉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21209)	; 𡈉
+      ))
+    (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x21209)	; 𡈉
-    (=cns11643-5	. #x3732)	; &I-C5-3732; [23-18]
+    (=cns11643-5	. #x3732)	; &M-04810; [23-18]
     (=daikanwa		. 04810)	; &I-M-04810;
+    (=ucs@iso		. #x21209)	; &M-04810;
     ))
 (define-char
-  '((=>ucs		. #x21209)	; 𡈉
-    (morohashi-daikanwa	4810 0 1)
+  '((<-denotational
+     ((=ucs		  . #x21209)	; 𡈉
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -2661,25 +2703,35 @@
     (=hanziku-2		. #xE6C7)	; &HZK02-E6C7;
     ))
 (define-char
-  '((=>ucs		. #x24517)	; 𤔗
-    (ideographic-radical . 31)	; ⼞
-    (ideographic-strokes . 9)
+  '((ideographic-radical@ucs . 87)	; ⽖
+    (ideographic-strokes@ucs . 9)
+    (ideographic-radical@cns . 31)	; ⼞
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (=daikanwa		. 04811)	; &M-04811;
+    (=ucs		. #x24517)	; 𤔗
+    (->subsumptive
+     ((ideographic-radical . 31)	; ⼞
+      (ideographic-strokes . 9)
+      (=daikanwa	  . 04811)	; &M-04811;
+      )
+     ((hanyu-dazidian	  3 2033 18)
+      (=cns11643-6	  . #x4743)	; &HZK05-F8B3; [39-35]
+      (=hanziku-5	  . #xF8B3)	; &I-HZK05-F8B3;
+      (=ucs@iso		  . #x24517)	; &HZK05-F8B3;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x24517)	; 𤔗
-    (morohashi-daikanwa	4811 0 0)
-    (ideographic-radical . 31)	; ⼞
+  '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (->identical
-     ((=ucs		  . #x24517)	; 𤔗
-      ))
-    (=cns11643-6	. #x4743)	; &C6-4743; [39-35]
+    (=ucs		. #x21207)	; 𡈇
     ))
 (define-char
-  '((=>ucs		. #x21207)	; 𡈇
+  '((<-denotational
+     ((=ucs		  . #x21207)	; 𡈇
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -2687,13 +2739,15 @@
     (=daikanwa		. 04812)	; &I-M-04812;
     ))
 (define-char
-  '((morohashi-daikanwa	4812 0 1)
+  '((<-denotational
+     ((=ucs		  . #x21207)	; 𡈇
+      ))
     (ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 723 2)
-    (=ucs		. #x21207)	; 𡈇
-    (=hanziku-2		. #xE6E4)	; &I-HZK02-E6E4;
+    (=hanziku-2		. #xE6E4)	; &HZK02-E6E4;
+    (=ucs@iso		. #x21207)	; &HZK02-E6E4;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2733,13 +2787,19 @@
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=daikanwa		. 04814)	; &M-04814;
+    (hanyu-dazidian	1 722 7)
+    (=ucs		. #x21205)	; 𡈅
+    (=daikanwa		. 04814)	; &I-M-04814;
+    (=hanziku-2		. #xE6C9)	; &I-HZK02-E6C9;
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=daikanwa		. 04815)	; &M-04815;
+    (hanyu-dazidian	1 722 11)
+    (=ucs		. #x21206)	; 𡈆
+    (=daikanwa		. 04815)	; &I-M-04815;
+    (=hanziku-2		. #xE6CD)	; &I-HZK02-E6CD;
     ))
 (define-char
   '((morohashi-daikanwa	4815 1)
@@ -2841,25 +2901,43 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 723 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x56D7)	; 囗
-      )
-     ((=ucs		  . #x8881)	; 袁
+    (=ucs		. #x5712)	; 園
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5712)	; 園
       ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (shinjigen-1	. 1334)
     (shinjigen-2	. 1334)
-    (=ucs		. #x5712)	; 園
-    (=jis-x0208		. #x3160)	; &I-J90-3160; [17-64]
+    (=jis-x0208		. #x3160)	; &GT-06057; [17-64]
     (=ks-x1001		. #x6A2E)	; &I-K0-6A2E; [74-14]
-    (=cns11643-1	. #x6350)	; &I-C1-6350; [67-48]
-    (=gb12345		. #x5430)	; 園 [52-16]
+    (=gb12345		. #x5430)	; &GT-06057; [52-16]
     (=big5		. #xB6E9)	; &I-B-B6E9;
     (=gt		. 06057)	; &I-GT-06057;
     (=gt-k		. 10172)	; &I-GT-K10172;
     (=gt-pj-1		. #x3160)	; &I-GT-06057; [17-64]
     (=daikanwa		. 04818)	; &I-M-04818;
+    (=ucs@unicode	. #x5712)	; &GT-06057;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5712)	; 園
+      ))
+    (ideographic-radical . 31)	; ⼞
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x56D7)	; 囗
+      )
+     ((=ucs		  . #x8881)	; 袁
+      ))
+    (=cns11643-1	. #x6350)	; &C1-6350; [67-48]
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -3904,18 +3982,6 @@
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 722 7)
-    (=ucs		. #x21205)	; 𡈅
-    (=hanziku-2		. #xE6C9)	; &I-HZK02-E6C9;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
-    (hanyu-dazidian	1 722 11)
-    (=ucs		. #x21206)	; 𡈆
-    (=hanziku-2		. #xE6CD)	; &I-HZK02-E6CD;
-    ))
-(define-char
-  '((ideographic-radical . 31)	; ⼞
     (hanyu-dazidian	1 724 3)
     (=ucs		. #x21210)	; 𡈐
     (=hanziku-2		. #xE746)	; &I-HZK02-E746;