X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R002-Line.el;h=74b549d6c32c9412beb39bb62ee634b1bba3967b;hb=bf95d2aafd80b2f4065d87ff035cc1bd2e8e4eab;hp=c9f67d4dc5e5174c162402710e6f5f70763f89ed;hpb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el
index c9f67d4..74b549d 100644
--- a/lisp/utf-2000/Ideograph-R002-Line.el
+++ b/lisp/utf-2000/Ideograph-R002-Line.el
@@ -20,48 +20,50 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
-    (hanyu-dazidian	1 49 2)
-    (shinjigen-1	. 31)
     (=ucs		. #x4E29)	; 丩
-    (=jis-x0213-2-2000	. #x2125)	; &I-JX2-2125; [01-05]
-    (=big5-cdp		. #x8BA3)	; &I-CDP-8BA3;
-    (=gt		. 00102)	; &I-GT-00102;
-    (=gt-k		. 00069)	; &I-GT-K00069;
-    (=gt-pj-2		. #x3054)	; &I-GT-00102; [16-52]
-    (=daikanwa		. 00068)	; &I-M-00068;
-    ))
-(define-char
-  '((=>ucs		. #x4E29)	; 丩
-    (morohashi-daikanwa	68 0 0)
-    (ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 1)
-    (total-strokes	 . 2)
-    (=cns11643-4	. #x2127)	; &GT-K00068; [01-07]
-    (=gt-k		. 00068)	; &I-GT-K00068;
-    (=gt-pj-k1		. #x735C)	; &GT-K00068; [83-60]
-    (=ucs@cns		. #x4E29)	; &GT-K00068;
+    (->subsumptive
+     ((hanyu-dazidian	  1 49 2)
+      (shinjigen-1	  . 31)
+      (=jis-x0213-2-2000  . #x2125)	; &GT-00102; [01-05]
+      (=big5-cdp	  . #x8BA3)	; &I-CDP-8BA3;
+      (=gt		  . 00102)	; &I-GT-00102;
+      (=gt-k		  . 00069)	; &I-GT-K00069;
+      (=gt-pj-2		  . #x3054)	; &I-GT-00102; [16-52]
+      (=daikanwa	  . 00068)	; &I-M-00068;
+      (=ucs@unicode	  . #x4E29)	; &GT-00102;
+      (=adobe-japan1-5	  . 17237)	; &GT-00102;
+      )
+     ((=cns11643-4	  . #x2127)	; &GT-K00068; [01-07]
+      (=gt-k		  . 00068)	; &I-GT-K00068;
+      (=gt-pj-k1	  . #x735C)	; &GT-K00068; [83-60]
+      (=ucs@cns		  . #x4E29)	; &GT-K00068;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 1)
-    (total-strokes	 . 2)
-    (->same
-     ((=cns11643-6	  . #x212C)	; &M-02775; [01-12]
-      (=daikanwa	  . 02775)	; &I-M-02775;
-      ))
-    (->same*sources
-     daikanwa)
-    (<-ancient-ideograph
-     ((=daikanwa	  . 02774)	; &I-M-02774;
-      ))
-    (<-ancient-ideograph*sources
-     daikanwa)
+  '((total-strokes	 . 2)
     (hanyu-dazidian	1 28 4)
     (=ucs		. #x20061)	; 𠁡
+    (=cns11643-6	. #x212C)	; &I-C6-212C; [01-12]
     (=big5-cdp		. #x87B1)	; &I-CDP-87B1;
     (=gt		. 00103)	; &I-GT-00103;
     (=gt-pj-2		. #x3055)	; &I-GT-00103; [16-53]
-    (=daikanwa		. 00069)	; &I-M-00069;
+    (<-ancient
+     ((=ucs		  . #x535C)	; 卜
+      (=daikanwa	  . 02774)	; &I-M-02774;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
+    (->subsumptive
+     ((ideographic-radical . 2)	; ⼁
+      (ideographic-strokes . 1)
+      (ideographic-radical*sources daikanwa=00069 gt ucs)
+      (=daikanwa	  . 00069)	; &M-00069;
+      )
+     ((ideographic-radical . 25)	; ⼘
+      (ideographic-strokes . 0)
+      (ideographic-radical*sources daikanwa=02775 cns11643)
+      (=daikanwa	  . 02775)	; &M-02775;
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -74,10 +76,6 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified@CN
-     ((=ucs		  . #x500B)	; 個
-      (=gb12345		  . #x3876)	; 個 [24-86]
-      ))
     (hanyu-dazidian	1 103 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -102,6 +100,10 @@
     (=gt-pj-1		. #x5024)	; &I-GT-00105; [48-04]
     (=daikanwa		. 00070)	; &I-M-00070;
     (=cbeta		. 00286)	; &I-CB00286;
+    (<-simplified@CN
+     ((=ucs		  . #x500B)	; 個
+      (=gb12345		  . #x3876)	; 個 [24-86]
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -194,6 +196,7 @@
     (=gt-pj-2		. #x3058)	; &I-GT-00108; [16-56]
     (=daikanwa		. 00074)	; &I-M-00074;
     (=jef-china3	. #x41AF)	; &I-JC3-41AF;
+    (=adobe-japan1-5	. 17238)	; 丮
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -213,33 +216,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
+     ((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;
+      (<-simplified@CN
+       ((=ucs		    . #x8C50)	; 豐
+	(=gb12345	    . #x3761)	; 豐 [23-65]
+	))
+      )
+     ((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)	; ⼁
@@ -284,19 +284,24 @@
     (=daikanwa		. 00078)	; &I-M-00078;
     ))
 (define-char
-  '((morohashi-daikanwa	4684 0 0)
-    (ideographic-	(:radical	31 ; ⼞
-			 :strokes	2)
-			(:radical	2 ; ⼁
-			 :strokes	4))
+  '((ideographic-radical@ucs . 2)	; ⼁
+    (ideographic-strokes@ucs . 4)
+    (ideographic-radical@cns . 31)	; ⼞
+    (ideographic-strokes@cns . 2)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 5)
-    (->same
-     ((=daikanwa	  . 04684)	; &M-04684;
-      ))
     (hanyu-dazidian	1 29 3)
     (=ucs		. #x20064)	; 𠁤
-    (=cns11643-6	. #x225F)	; &I-C6-225F; [02-63]
-    (=big5-cdp		. #x87E5)	; &I-CDP-87E5;
+    (->subsumptive
+     ((ideographic-radical . 31)	; ⼞
+      (ideographic-strokes . 2)
+      (=daikanwa	  . 04684)	; &M-04684;
+      )
+     ((=cns11643-6	  . #x225F)	; &CDP-87E5; [02-63]
+      (=big5-cdp	  . #x87E5)	; &I-CDP-87E5;
+      (=ucs@iso		  . #x20064)	; &CDP-87E5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -328,21 +333,20 @@
     (=ucs		. #x4E32)	; 串
     (=jis-x0208		. #x367A)	; &I-J90-367A; [22-90]
     (=gb2312		. #x342E)	; &I-G0-342E; [20-14]
-    (=ks-x1001		. #x4D7A)	; &I-K0-4D7A; [45-90]
     (=cns11643-1	. #x486B)	; &I-C1-486B; [40-75]
     (=big5		. #xA6EA)	; &I-B-A6EA;
     (=gt		. 00115)	; &I-GT-00115;
     (=gt-k		. 02530)	; &I-GT-K02530;
     (=gt-pj-1		. #x367A)	; &I-GT-00115; [22-90]
     (=daikanwa		. 00080)	; &I-M-00080;
-    ))
-(define-char
-  '((morohashi-daikanwa	80 0 0)
-    (ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 6)
-    (total-strokes	 . 7)
-    (=ucs		. #xF905)	; 串
-    (=ks-x1001		. #x4E2D)	; &I-K0-4E2D; [46-13]
+    (->subsumptive
+     ((=ks-x1001	  . #x4D7A)	; &K0-4D7A; [45-90]
+      (=ucs@ks		  . #x4E32)	; &K0-4D7A;
+      )
+     ((=>ucs*		  . #x4E32)	; 串
+      (=ucs		  . #xF905)	; 串
+      (=ks-x1001	  . #x4E2D)	; &I-K0-4E2D; [46-13]
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -381,9 +385,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)	; â¿´
@@ -393,27 +412,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)	; ⼁
@@ -434,10 +444,10 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (=big5-cdp		. #x89CD)	; &CDP-89CD;
     (<-simplified
      ((=ucs		  . #x23D92)	; 𣶒
       ))
-    (=big5-cdp		. #x89CD)	; &CDP-89CD;
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -524,10 +534,6 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 8)
     (total-strokes	 . 9)
-    (<-simplified@CN
-     ((=ucs		  . #x81E8)	; 臨
-      (=gb12345		  . #x4159)	; 臨 [33-57]
-      ))
     (hanyu-dazidian	1 30 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -548,27 +554,34 @@
     (=gb2312		. #x4159)	; &I-G0-4159; [33-57]
     (=hanziku-1		. #xAA56)	; &I-HZK01-AA56;
     (=jef-china3	. #x82AF)	; &I-JC3-82AF;
+    (<-simplified@CN
+     ((=gb12345		  . #x4159)	; &GT-38930; [33-57]
+      ))
     ))
 (define-char
   '((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)	; ⼁
@@ -607,8 +620,10 @@
     (=daikanwa		. 48905)	; &I-M-48905;
     ))
 (define-char
-  '((ideographic-radical . 2)	; ⼁
-    (ideographic-strokes . 10)
+  '((ideographic-radical@ucs . 2)	; ⼁
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 170)	; ⾩
+    (ideographic-strokes@cns . 4)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 30 8)
     (ideographic-structure
@@ -620,7 +635,11 @@
      ((=ucs		  . #x4E95)	; 井
       ))
     (=ucs		. #x20072)	; 𠁲
+    (=cns11643-6	. #x457D)	; &I-C6-457D; [37-93]
     (=hanziku-1		. #xAA59)	; &I-HZK01-AA59;
+    (<-unknown
+     ((=ucs		  . #x28E25)	; 𨸥
+      ))
     ))
 (define-char
   '((ideographic-radical . 2)	; ⼁
@@ -641,7 +660,13 @@
     (ideographic-strokes@cns . 12)
     (total-strokes	 . 13)
     (=ucs		. #x23244)	; 𣉄
-    (=cns11643-5	. #x3D55)	; &I-C5-3D55; [29-53]
+    (->subsumptive
+     ((=cns11643-5	  . #x3D55)	; &C5-3D55; [29-53]
+      (=ucs@iso		  . #x23244)	; &C5-3D55;
+      )
+     ((hanyu-dazidian	  2 1522 15)
+      (=hanziku-4	  . #xE3AE)	; &HZK04-E3AE;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 2)	; ⼁