From: tomo <tomo>
Date: Mon, 12 Apr 2004 07:18:14 +0000 (+0000)
Subject: Add some `<-simplified@CN' features.
X-Git-Tag: r21-4-14-chise-0_21-26^2~42
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=47fa0d99f0ec25f573589aefe13e05ce9dc087b6;p=chise%2Fxemacs-chise.git

Add some `<-simplified@CN' features.
(GT-00160): Moved into U+4E49.
(U+4E49): Use `->subsumptive'.
(U+4E54): Use `ideographic-{radical|strokes}@{ucs|cns}' and
`ideographic-radical@cns*sources' instead of `ideographic-'; use
`->subsumptive'.
---

diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el
index b395b40..df91c15 100644
--- a/lisp/utf-2000/Ideograph-R004-Slash.el
+++ b/lisp/utf-2000/Ideograph-R004-Slash.el
@@ -388,28 +388,29 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x4E49)	; 义
-    (ideographic-radical . 4)	; ⼃
-    (ideographic-strokes . 2)
-    (total-strokes	 . 3)
-    (=gt		. 00160)	; &GT-00160;
-    (=gt-k		. 00245)	; &I-GT-K00245;
-    (=gt-pj-2		. #x3122)	; &GT-00160;
-    (=daikanwa		. 00124)	; &I-M-00124;
-    (=cbeta		. 01415)	; &I-CB01415;
-    ))
-(define-char
-  '((morohashi-daikanwa	124 0 0)
-    (ideographic-radical . 4)	; ⼃
+  '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (hanyu-dazidian	1 42 10)
     (=ucs		. #x4E49)	; 义
-    (=gb2312		. #x5265)	; &I-G0-5265;
-    (=cns11643-3	. #x212E)	; &I-C3-212E;
-    (=big5-cdp		. #x8AEE)	; &I-CDP-8AEE;
-    (=gt		. 00165)	; &I-GT-00165;
-    (=gt-pj-9		. #x4A2A)	; &I-GT-00165;
+    (->subsumptive
+     ((=gt		  . 00160)	; &GT-00160;
+      (=gt-k		  . 00245)	; &I-GT-K00245;
+      (=gt-pj-2		  . #x3122)	; &GT-00160;
+      (=daikanwa	  . 00124)	; &I-M-00124;
+      (=cbeta		  . 01415)	; &I-CB01415;
+      )
+     ((<-simplified@CN
+       ((=ucs		    . #x7FA9)	; 義
+	(=gb12345	    . #x5265)	; 義
+	))
+      (hanyu-dazidian	  1 42 10)
+      (=gb2312		  . #x5265)	; &GT-00165;
+      (=cns11643-3	  . #x212E)	; &I-C3-212E;
+      (=big5-cdp	  . #x8AEE)	; &I-CDP-8AEE;
+      (=gt		  . 00165)	; &I-GT-00165;
+      (=gt-pj-9		  . #x4A2A)	; &I-GT-00165;
+      (=ucs@unicode	  . #x4E49)	; &GT-00165;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	3118 1)
@@ -603,6 +604,10 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (<-simplified@CN
+     ((=ucs		  . #x70CF)	; 烏
+      (=gb12345		  . #x4E5A)	; 烏
+      ))
     (hanyu-dazidian	1 34 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -848,6 +853,10 @@
   '((ideographic-radical . 4)	; ⼃
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (<-simplified@CN
+     ((=ucs		  . #x6A02)	; 樂
+      (=gb12345		  . #x4056)	; 樂
+      ))
     (hanyu-dazidian	1 37 5)
     (=ucs		. #x4E50)	; 乐
     (=gb2312		. #x4056)	; &I-G0-4056;
@@ -1092,25 +1101,35 @@
     (=jef-china3	. #x80C2)	; &I-JC3-80C2;
     ))
 (define-char
-  '((morohashi-daikanwa	5860 0 2)
-    (ideographic-	(:radical	37 ; ⼤
-			 :strokes	3)
-			(:radical	4 ; ⼃
-			 :strokes	5))
+  '((ideographic-radical@ucs . 4)	; ⼃
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@cns . 37)	; ⼤
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 38 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x592D)	; 夭
+    (=ucs		. #x4E54)	; 乔
+    (->subsumptive
+     ((=daikanwa	  . 05860)	; &M-05860;
       )
-     ((=big5-cdp	  . #x89AB)	; &CDP-89AB;
+     ((<-simplified@CN
+       ((=ucs		    . #x55AC)	; 喬
+	(=gb12345	    . #x4747)	; 喬
+	))
+      (hanyu-dazidian	  1 38 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x592D)	; 夭
+	)
+       ((=big5-cdp	    . #x89AB)	; &CDP-89AB;
+	))
+      (=gb2312		  . #x4747)	; &HZK01-ABD7;
+      (=cns11643-3	  . #x2345)	; &I-C3-2345;
+      (=hanziku-1	  . #xABD7)	; &I-HZK01-ABD7;
+      (=ucs@unicode	  . #x4E54)	; &HZK01-ABD7;
       ))
-    (=ucs		. #x4E54)	; 乔
-    (=gb2312		. #x4747)	; &I-G0-4747;
-    (=cns11643-3	. #x2345)	; &I-C3-2345;
-    (=hanziku-1		. #xABD7)	; &I-HZK01-ABD7;
     ))
 (define-char
   '((ideographic-	(:radical	49 ; â¼°