X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R002-Line.el;h=5ff9ab69261f8bdc48fb659958a8c1634056ba58;hb=a559bc7649206988f87ba89bee1e9968c67ff523;hp=46a397048e399c25adb517f169d818f76ff704c2;hpb=ffe143c4a3bf580720cd2774d8b0122256b295c5;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el
index 46a3970..5ff9ab6 100644
--- a/lisp/utf-2000/Ideograph-R002-Line.el
+++ b/lisp/utf-2000/Ideograph-R002-Line.el
@@ -214,33 +214,30 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=ucs		  . #x8C50)	; 豐
-      (=gb12345		  . #x3761)	; 豐 [23-65]
-      ))
-    (shinjigen-1	. 35)
-    (shinjigen-2	. 35)
     (=ucs		. #x4E30)	; 丰
-    (=gb2312		. #x3761)	; &I-G0-3761; [23-65]
-    (=jis-x0212		. #x302D)	; &I-JSP-302D; [16-13]
-    (=jis-x0213-1-2000	. #x2E26)	; &I-JX1-2E26; [14-06]
-    (=big5-cdp		. #x897E)	; &I-CDP-897E;
-    (=gt		. 00110)	; &I-GT-00110;
-    (=gt-pj-2		. #x305A)	; &I-GT-00110; [16-58]
-    (=daikanwa		. 00076)	; &I-M-00076;
-    (=jef-china3	. #x81FE)	; &I-JC3-81FE;
-    ))
-(define-char
-  '((=>ucs		. #x4E30)	; 丰
-    (morohashi-daikanwa	76 0 2)
-    (ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (hanyu-dazidian	1 28 7)
-    (=cns11643-1	. #x4464)	; &C1-4464; [36-68]
-    (=big5		. #xA4A5)	; &I-B-A4A5;
-    (=ucs@cns		. #x4E30)	; &C1-4464;
-    (=ucs@big5		. #x4E30)	; &C1-4464;
+    (->subsumptive
+     ((<-simplified@CN
+       ((=ucs		    . #x8C50)	; 豐
+	(=gb12345	    . #x3761)	; 豐 [23-65]
+	))
+      (shinjigen-1	  . 35)
+      (shinjigen-2	  . 35)
+      (=gb2312		  . #x3761)	; &GT-00110; [23-65]
+      (=jis-x0212	  . #x302D)	; &I-JSP-302D; [16-13]
+      (=jis-x0213-1-2000  . #x2E26)	; &I-JX1-2E26; [14-06]
+      (=big5-cdp	  . #x897E)	; &I-CDP-897E;
+      (=gt		  . 00110)	; &I-GT-00110;
+      (=gt-pj-2		  . #x305A)	; &I-GT-00110; [16-58]
+      (=daikanwa	  . 00076)	; &I-M-00076;
+      (=jef-china3	  . #x81FE)	; &I-JC3-81FE;
+      (=ucs@unicode	  . #x4E30)	; &GT-00110;
+      )
+     ((hanyu-dazidian	  1 28 7)
+      (=cns11643-1	  . #x4464)	; &C1-4464; [36-68]
+      (=big5		  . #xA4A5)	; &I-B-A4A5;
+      (=ucs@cns		  . #x4E30)	; &C1-4464;
+      (=ucs@big5	  . #x4E30)	; &C1-4464;
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -382,9 +379,24 @@
     (=daikanwa		. 00083)	; &I-M-00083;
     ))
 (define-char
-  '((ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 7)
-    (total-strokes	 . 8)
+  '((ideographic-radical@ucs . 85)	; ⽔
+    (ideographic-strokes@ucs . 8)
+    (ideographic-radical@cns . 2)	; ⼁
+    (ideographic-strokes@cns . 7)
+    (total-strokes@cns	     . 8)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643 gt)
+    (ideographic-strokes@cns*sources
+     daikanwa)
+    (total-strokes@cns*sources
+     cns11643 cdp)
+    (ideographic-radical@gt . 2)	; ⼁
+    (ideographic-strokes@gt . 8)
+    (total-strokes@gt	    . 9)
+    (ideographic-radical@cdp . 4)	; ⼃
+    (ideographic-strokes@cdp . 7)
+    (total-strokes@cdp	     . 8)
+    (hanyu-dazidian	1 39 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -394,27 +406,18 @@
      ((=ucs		  . #x4E00)	; 一
       ))
     (=ucs		. #x23D92)	; 𣶒
-    (=cns11643-4	. #x252F)	; &I-C4-252F; [05-15]
-    (=daikanwa		. 00084)	; &I-M-00084;
-    ))
-(define-char
-  '((=>ucs		. #x23D92)	; 𣶒
-    (morohashi-daikanwa	84 0 0)
-    (ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 8)
-    (total-strokes	 . 9)
-    (=gt		. 00119)	; &GT-00119;
-    (=gt-pj-2		. #x3060)	; &GT-00119; [16-64]
-    ))
-(define-char
-  '((=>ucs		. #x23D92)	; 𣶒
-    (morohashi-daikanwa	84 0 1)
-    (ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 8)
-    (total-strokes	 . 9)
-    (=gt		. 00120)	; &GT-00120;
-    (=gt-k		. 06263)	; &I-GT-K06263;
-    (=gt-pj-9		. #x4B25)	; &GT-00120; [43-05]
+    (->subsumptive
+     ((=cns11643-4	  . #x252F)	; &GT-00119; [05-15]
+      (=gt		  . 00119)	; &I-GT-00119;
+      (=gt-pj-2		  . #x3060)	; &I-GT-00119; [16-64]
+      (=daikanwa	  . 00084)	; &I-M-00084;
+      (=ucs@iso		  . #x23D92)	; &GT-00119;
+      )
+     ((=big5-cdp	  . #x8DD9)	; &GT-00120;
+      (=gt		  . 00120)	; &I-GT-00120;
+      (=gt-k		  . 06263)	; &I-GT-K06263;
+      (=gt-pj-9		  . #x4B25)	; &I-GT-00120; [43-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -526,8 +529,7 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 9)
     (<-simplified@CN
-     ((=ucs		  . #x81E8)	; 臨
-      (=gb12345		  . #x4159)	; 臨 [33-57]
+     ((=gb12345		  . #x4159)	; &GT-38930; [33-57]
       ))
     (hanyu-dazidian	1 30 5)
     (ideographic-structure
@@ -554,22 +556,26 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 9)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 30 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E1A)	; 业
+    (=ucs		. #x4E35)	; 丵
+    (->subsumptive
+     ((hanyu-dazidian	  1 30 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E1A)	; 业
+	)
+       ((=big5-cdp	    . #x8B75)	; &RUI6-E00E;
+	))
+      (=jis-x0212	  . #x302E)	; &GT-00124; [16-14]
+      (=cns11643-4	  . #x2B5E)	; &I-C4-2B5E; [11-62]
+      (=gt		  . 00124)	; &I-GT-00124;
+      (=gt-pj-2		  . #x3063)	; &I-GT-00124; [16-67]
+      (=daikanwa	  . 00087)	; &I-M-00087;
+      (=ucs@unicode	  . #x4E35)	; &GT-00124;
       )
-     ((=big5-cdp	  . #x8B75)	; &RUI6-E00E;
+     ((=big5-cdp	  . #x8AA8)	; &CDP-8AA8;
       ))
-    (=ucs		. #x4E35)	; 丵
-    (=jis-x0212		. #x302E)	; &I-JSP-302E; [16-14]
-    (=cns11643-4	. #x2B5E)	; &I-C4-2B5E; [11-62]
-    (=big5-cdp		. #x8AA8)	; &I-CDP-8AA8;
-    (=gt		. 00124)	; &I-GT-00124;
-    (=gt-pj-2		. #x3063)	; &I-GT-00124; [16-67]
-    (=daikanwa		. 00087)	; &I-M-00087;
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁