From: tomo <tomo>
Date: Wed, 21 Apr 2004 04:09:06 +0000 (+0000)
Subject: (U+5973): Use `->subsumptive'.
X-Git-Tag: r21-4-14-chise-0_21-26-si-vulgar^2~40
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3b439822d3022408a680b56a171ce04d417f080c;p=chise%2Fxemacs-chise.git-

(U+5973): Use `->subsumptive'.
(C1-444C): Moved into U+5973.
(U+59C9): Use `->subsumptive'; use `<-vulgar*sources' instead of
char-ref in `<-vulgar'.
(K0-6D2B): Moved into U+59C9.
(C3-283F): Likewise.
---

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index cd97d21..6525eb3 100644
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -3,24 +3,21 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
-    (shinjigen-2	. 1599)
     (=ucs		. #x5973)	; 女
-    (=jis-x0208		. #x3D77)	; &I-J90-3D77;
-    (=gb2312		. #x452E)	; &I-G0-452E;
-    (=ks-x1001		. #x5233)	; &I-K0-5233;
-    (=big5		. #xA46B)	; &I-B-A46B;
-    (=gt		. 07623)	; &I-GT-07623;
-    (=gt-k		. 00185)	; &I-GT-K00185;
-    (=gt-pj-1		. #x3D77)	; &I-GT-07623;
-    (=daikanwa		. 06036)	; &I-M-06036;
-    ))
-(define-char
-  '((=>ucs		. #x5973)	; 女
-    (morohashi-daikanwa	6036 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 0)
-    (total-strokes	 . 3)
-    (=cns11643-1	. #x444C)	; &C1-444C;
+    (->subsumptive
+     ((shinjigen-2	  . 1599)
+      (=jis-x0208	  . #x3D77)	; &GT-07623;
+      (=gb2312		  . #x452E)	; &I-G0-452E;
+      (=ks-x1001	  . #x5233)	; &I-K0-5233;
+      (=big5		  . #xA46B)	; &I-B-A46B;
+      (=gt		  . 07623)	; &I-GT-07623;
+      (=gt-k		  . 00185)	; &I-GT-K00185;
+      (=gt-pj-1		  . #x3D77)	; &I-GT-07623;
+      (=daikanwa	  . 06036)	; &I-M-06036;
+      (=ucs@unicode	  . #x5973)	; &GT-07623;
+      )
+     ((=cns11643-1	  . #x444C)	; &C1-444C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
@@ -1907,64 +1904,57 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (<-vulgar
-     (:char	((=daikanwa	     . 06164)	; &I-M-06164;
-		 )
-      :sources	(morohashi-daikanwa)))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
-      )
-     ((=jis-x0208	  . #x3B54)	; &GT-11066;
-      (=ks-x1001	  . #x633C)	; &I-K0-633C;
-      (=daikanwa	  . 08775)	; &I-M-08775;
-      ))
-    (shinjigen-2	. 1628)
     (=ucs		. #x59C9)	; 姉
-    (=jis-x0208-1978	. #x3B50)	; &I-J78-3B50;
-    (=jis-x0208-1983	. #x3B50)	; &I-J83-3B50;
-    (=daikanwa		. 06165)	; &I-M-06165;
-    (=cbeta		. 00106)	; &I-CB00106;
-    ))
-(define-char
-  '((=>ucs		. #x59C9)	; 姉
-    (morohashi-daikanwa	6165 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
-      )
-     ((=jis-x0208	  . #x3B54)	; &GT-11066;
-      (=ks-x1001	  . #x633C)	; &I-K0-633C;
-      (=daikanwa	  . 08775)	; &I-M-08775;
-      ))
-    (=ks-x1001		. #x6D2B)	; &GT-07747;
-    (=jis-x0208-1990	. #x3B50)	; &I-J90-3B50;
-    (=gt		. 07747)	; &I-GT-07747;
-    (=gt-pj-1		. #x3B50)	; &I-GT-07747;
-    (=ucs@jis		. #x59C9)	; &GT-07747;
-    ))
-(define-char
-  '((=>ucs		. #x59C9)	; 姉
-    (morohashi-daikanwa	6165 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((<-vulgar
+       ((=ucs		    . #x59CA)	; 姊
+	(=daikanwa	    . 06164)	; &I-M-06164;
+	))
+      (<-vulgar*sources
+       daikanwa)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5973)	; 女
+	)
+       ((=jis-x0208	    . #x3B54)	; &GT-11066;
+	(=ks-x1001	    . #x633C)	; &I-K0-633C;
+	(=daikanwa	    . 08775)	; &I-M-08775;
+	))
+      (shinjigen-2	  . 1628)
+      (=jis-x0208-1978	  . #x3B50)	; &M-06165;
+      (=jis-x0208-1983	  . #x3B50)	; &I-J83-3B50;
+      (=daikanwa	  . 06165)	; &I-M-06165;
+      (=cbeta		  . 00106)	; &I-CB00106;
+      (=ucs@unicode	  . #x59C9)	; &M-06165;
       )
-     ((=ucs		  . #x5973)	; 女
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5973)	; 女
+	)
+       ((=jis-x0208	    . #x3B54)	; &GT-11066;
+	(=ks-x1001	    . #x633C)	; &I-K0-633C;
+	(=daikanwa	    . 08775)	; &I-M-08775;
+	))
+      (=ks-x1001	  . #x6D2B)	; &GT-07747;
+      (=jis-x0208-1990	  . #x3B50)	; &I-J90-3B50;
+      (=gt		  . 07747)	; &I-GT-07747;
+      (=gt-pj-1		  . #x3B50)	; &I-GT-07747;
+      (=ucs@jis		  . #x59C9)	; &GT-07747;
       )
-     ((=ucs		  . #x5E02)	; 市
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C;
+	)
+       ((=ucs		    . #x5E02)	; 市
+	))
+      (=cns11643-3	  . #x283F)	; &C3-283F;
       ))
-    (=cns11643-3	. #x283F)	; &C3-283F;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥