From: tomo <tomo>
Date: Wed, 13 Dec 2006 17:15:54 +0000 (+0000)
Subject: (U+5304): Use `->subsumptive'.
X-Git-Tag: r21-4-19-chise-0_23-4^20~287
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=35c828cfb916a7c3ae32fb846d889530f0264a09;p=chise%2Fxemacs-chise.git

(U+5304): Use `->subsumptive'.
(U+5305): Use `->denotational'; add J97-4A71.
(C6-2246): Use `<-denotational' for U+5305; unify U-0002F829.
---

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index b787081..29761eb 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -324,55 +324,56 @@
     (=jef-china3	. #x45A4)	; &I-JC3-45A4;
     ))
 (define-char
-  '((=>ucs		. #x5304)	; 匄
-    (ideographic-radical . 20)	; ⼓
+  '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
+    (=ucs		. #x5304)	; 匄
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=daikanwa	    . 00287)	; &I-M-00287;
+	))
+      (=daikanwa	  . 02505)	; &M-02505;
       )
-     ((=ucs		  . #x52F9)	; 勹
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=cns11643-1	    . #x4441)	; &C1-4441; [36-33]
+	))
+      (=cns11643-3	  . #x2222)	; &C3-2222; [02-02]
       )
-     ((=daikanwa	  . 00287)	; &I-M-00287;
+     ((hanyu-dazidian	  1 257 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((=ucs		    . #x52F9)	; 勹
+	)
+       ((=gb2312	    . #x4D76)	; &G0-4D76; [45-86]
+	))
+      (=hanziku-1	  . #xDB41)	; &HZK01-DB41;
+      (=ucs@unicode	  . #x5304)	; &HZK01-DB41;
       ))
-    (=daikanwa		. 02505)	; &M-02505;
     ))
 (define-char
-  '((=>ucs		. #x5304)	; 匄
-    (morohashi-daikanwa	2505 0 1)
-    (ideographic-radical . 20)	; ⼓
+  '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
-      (=ucs		  . #x2FF4)	; â¿´
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=cns11643-1	  . #x4441)	; &C1-4441; [36-33]
-      ))
-    (=cns11643-3	. #x2222)	; &C3-2222; [02-02]
+    (=ucs		. #x5305)	; 包
+    (=jis-x0208@1997	. #x4A71)	; 包 [42-81]
     ))
 (define-char
-  '((morohashi-daikanwa	2505 0 2)
-    (ideographic-radical . 20)	; ⼓
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
-    (hanyu-dazidian	1 257 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((=ucs		  . #x52F9)	; 勹
-      )
-     ((=ucs		  . #x4EA1)	; 亡
+  '((<-denotational
+     ((=ucs		  . #x5305)	; 包
       ))
-    (=ucs		. #x5304)	; 匄
-    (=hanziku-1		. #xDB41)	; &I-HZK01-DB41;
-    ))
-(define-char
-  '((ideographic-radical . 20)	; ⼓
+    (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 257 6)
@@ -386,16 +387,19 @@
       ))
     (shinjigen-1	. 776)
     (shinjigen-2	. 776)
-    (=ucs		. #x5305)	; 包
-    (=gb2312		. #x307C)	; &I-G0-307C; [16-92]
+    (=gb2312		. #x307C)	; &M-02506; [16-92]
     (=ks-x1001		. #x7850)	; &I-K0-7850; [88-48]
     (=cns11643-1	. #x457D)	; &I-C1-457D; [37-93]
     (=big5		. #xA55D)	; &I-B-A55D;
     (=daikanwa		. 02506)	; &I-M-02506;
     (=jef-china3	. #x45A5)	; &I-JC3-45A5;
+    (=ucs@unicode	. #x5305)	; &M-02506;
     ))
 (define-char
-  '((=>ucs		. #x5305)	; 包
+  '((<-denotational
+     ((=ucs		  . #x5305)	; 包
+      ))
+    (=>ucs*		. #x5305)	; 包
     (morohashi-daikanwa	2506 1)
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
@@ -410,12 +414,13 @@
       ))
     (shinjigen-1	. 775)
     (shinjigen-2	. 775)
-    (=jis-x0208		. #x4A71)	; &GT-03223; [42-81]
+    (=ucs		. #x2F829)	; 包
+    (=jis-x0208		. #x4A71)	; &I-J90-4A71; [42-81]
     (=cns11643-6	. #x2246)	; &I-C6-2246; [02-38]
     (=gt		. 03223)	; &I-GT-03223;
     (=gt-k		. 01001)	; &I-GT-K01001;
     (=gt-pj-1		. #x4A71)	; &I-GT-03223; [42-81]
-    (=ucs@jis		. #x5305)	; &GT-03223;
+    (=ucs@jis		. #x5305)	; 包
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓