X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R029-Again.el;h=7305fee3f15f14ab19d0ddd694962b61a76bcdef;hb=216ba6081bf866cb79118f40a5477acbe9b6a1da;hp=80b52bb7d065312951b761db1ed6e83f44629885;hpb=19ed15e69b25c005f61a90b98c3a4a361628537e;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 80b52bb..7305fee 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -33,11 +33,11 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x53C8)	; 又
-      ))
     (=gt-k		. 00064)	; &GT-K00064;
     (=gt-pj-k1		. #x345A)	; &GT-K00064; [20-58]
+    (<-formed@component
+     ((=ucs		  . #x53C8)	; 又
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -72,11 +72,11 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x53C9)	; 叉
-      ))
     (=gt-k		. 00255)	; &GT-K00255;
     (=gt-pj-k1		. #x6B71)	; &GT-K00255; [75-81]
+    (<-formed@component
+     ((=ucs		  . #x53C9)	; 叉
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -121,6 +121,7 @@
   '((<-denotational
      ((=ucs		  . #x53CA)	; 及
       ))
+    (=>ucs*		. #x53CA)	; 及
     (morohashi-daikanwa	3118 1)
     (ideographic-radical@ucs . 29)	; ⼜
     (ideographic-strokes@ucs . 2)
@@ -133,13 +134,15 @@
     (hanyu-dazidian	1 35 1)
     (shinjigen-1	. 900)
     (shinjigen-2	. 900)
-    (=jis-x0208		. #x355A)	; &GT-00163; [21-58]
+    (=ucs		. #x2F836)	; 及
+    (=jis-x0208		. #x355A)	; &I-J90-355A; [21-58]
     (=gb2312		. #x3C30)	; &I-G0-3C30; [28-16]
     (=cns11643-6	. #x2161)	; &I-C6-2161; [01-65]
     (=gt		. 00163)	; &I-GT-00163;
     (=gt-k		. 00257)	; &I-GT-K00257;
     (=gt-pj-1		. #x355A)	; &I-GT-00163; [21-58]
-    (=ucs@unicode	. #x53CA)	; &GT-00163;
+    (=ucs@unicode	. #x53CA)	; 及
+    (=ucs@cns		. #x2F836)	; 及
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -212,6 +215,25 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x20B1B)	; 𠬛
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8B6C)	; &CDP-8B6C;
+      )
+     ((=jis-x0208	  . #x4B74)	; &GT-03944; [43-84]
+      (=gb2312		  . #x5356)	; &I-G0-5356; [51-54]
+      (=cns11643-1	  . #x4434)	; &I-C1-4434; [36-20]
+      ))
+    (=big5-cdp		. #x8BA1)	; &CDP-8BA1;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -271,22 +293,10 @@
     (=daikanwa		. 03124)	; &I-M-03124;
     ))
 (define-char
-  '((script		JP Jouyou Ideograph)
+  '((script		JP Jouyou CN Simplified Ideograph)
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208@1990	  . #x5256)	; &GT-56567; [50-54]
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 903)
-      (=jis-x0208@1978	  . #x5256)	; &M-42116; [50-54]
-      (=jis-x0208@1983	  . #x5256)	; &I-J83-5256; [50-54]
-      (=ks-x1001	  . #x642A)	; &I-K0-642A; [68-10]
-      (=daikanwa	  . 42116)	; &I-M-42116;
-      ))
-    (<-vulgar*sources
-     yunhai daikanwa shinjigen-1)
     (hanyu-dazidian	1 393 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -308,6 +318,21 @@
     (=daikanwa		. 03125)	; &I-M-03125;
     (=hanziku-1		. #xF6D8)	; &I-HZK01-F6D8;
     (=cbeta		. 04639)	; &I-CB04639;
+    (<-simplified@CN
+     ((=gb12345		  . #x4B2B)	; &C1-7764; [43-11]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208@1990	  . #x5256)	; &GT-56567; [50-54]
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 903)
+      (=jis-x0208@1978	  . #x5256)	; &M-42116; [50-54]
+      (=jis-x0208@1983	  . #x5256)	; &I-J83-5256; [50-54]
+      (=ks-x1001	  . #x642A)	; &I-K0-642A; [68-10]
+      (=daikanwa	  . 42116)	; &I-M-42116;
+      ))
+    (<-vulgar*sources
+     yunhai daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -373,22 +398,14 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=ucs		. #x53CE)	; 収
+    (=jis-x0208@1997	. #x3C7D)	; 収 [28-93]
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x6536)	; 收
       (=jis-x0208	  . #x5A40)	; &I-J90-5A40; [58-32]
       ))
-    (=ucs		. #x53CE)	; 収
-    (=jis-x0208@1997	. #x3C7D)	; 収 [28-93]
     (->subsumptive
-     ((<-vulgar
-       ((shinjigen-1	    . 907)
-	(=ucs		    . #x6536)	; 收
-	(=jis-x0208	    . #x5A40)	; &I-J90-5A40; [58-32]
-	(=daikanwa	    . 13110)	; &I-M-13110;
-	))
-      (<-vulgar*sources
-       daikanwa shinjigen-1)
-      (hanyu-dazidian	  1 393 3)
+     ((hanyu-dazidian	  1 393 3)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -408,6 +425,14 @@
       (=hanziku-1	  . #xF6D2)	; &I-HZK01-F6D2;
       (=cbeta		  . 01495)	; &I-CB01495;
       (=ucs@unicode	  . #x53CE)	; &GT-03952;
+      (<-vulgar
+       ((shinjigen-1	    . 907)
+	(=ucs		    . #x6536)	; 收
+	(=jis-x0208	    . #x5A40)	; &I-J90-5A40; [58-32]
+	(=daikanwa	    . 13110)	; &I-M-13110;
+	))
+      (<-vulgar*sources
+       daikanwa shinjigen-1)
       )
      ((=jis-x0208@1978	  . #x3C7D)	; &J83-3C7D; [28-93]
       (=jis-x0208@1983	  . #x3C7D)	; &I-J83-3C7D; [28-93]
@@ -622,17 +647,20 @@
     (total-strokes	 . 6)
     (=ucs		. #x355C)	; 㕜
     (->subsumptive
-     ((<-original
+     ((=daikanwa	  . 03140)	; &M-03140;
+      (<-original
        ((=jis-x0208@1978    . #x3B4B)	; &M-03249; [27-43]
 	(=jis-x0208@1983    . #x3B4B)	; &I-J83-3B4B; [27-43]
 	(=ks-x1001	    . #x5E48)	; &I-K0-5E48; [62-40]
 	(=daikanwa	    . 03249)	; &I-M-03249;
 	))
       (<-original*sources
-       zhengzi-tong daikanwa)
-      (=daikanwa	  . 03140)	; &M-03140;
+       zhengzitong daikanwa)
       )
-     ((<-original
+     ((hanyu-dazidian	  1 394 3)
+      (shinjigen-1	  . 945)
+      (=hanziku-1	  . #xF6F2)	; &HZK01-F6F2;
+      (<-original
        ((shinjigen-1	    . 943)
 	(=gb2312	    . #x4A37)	; &GT-04122; [42-23]
 	(=jis-x0208@1990    . #x3B4B)	; &I-J90-3B4B; [27-43]
@@ -640,9 +668,6 @@
 	))
       (<-original*sources
        shinjigen-1)
-      (hanyu-dazidian	  1 394 3)
-      (shinjigen-1	  . 945)
-      (=hanziku-1	  . #xF6F2)	; &HZK01-F6F2;
       )
      ((=cns11643-3	  . #x2332)	; &C3-2332; [03-18]
       (=ucs@unicode	  . #x355C)	; &C3-2332;
@@ -736,20 +761,35 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 394 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8DDD)	; &CDP-8DDD;
+    (=ucs		. #x53D3)	; 叓
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8DDD)	; &CDP-8DDD;
+	)
+       ((=ks-x1001	    . #x6951)	; &M-03115; [73-49]
+	(=daikanwa	    . 03115)	; &I-M-03115;
+	))
+      (=daikanwa	  . 03146)	; &M-03146;
       )
-     ((=ucs		  . #x53C8)	; 又
+     ((hanyu-dazidian	  1 394 10)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8DDD)	; &CDP-8DDD;
+	)
+       ((=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	))
+      (=jis-x0212	  . #x345B)	; &HZK01-F6F9; [20-59]
+      (=cns11643-4	  . #x234F)	; &I-C4-234F; [03-47]
+      (=hanziku-1	  . #xF6F9)	; &I-HZK01-F6F9;
+      (=ucs@unicode	  . #x53D3)	; &HZK01-F6F9;
       ))
-    (=ucs		. #x53D3)	; 叓
-    (=jis-x0212		. #x345B)	; &I-JSP-345B; [20-59]
-    (=cns11643-4	. #x234F)	; &I-C4-234F; [03-47]
-    (=daikanwa		. 03146)	; &I-M-03146;
-    (=hanziku-1		. #xF6F9)	; &I-HZK01-F6F9;
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -806,16 +846,29 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 29)	; ⼜
+  '((=>ucs*		. #x53DF)	; 叟
+    (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=cns11643-6	. #x2643)	; &M-03151; [06-35]
-    (=daikanwa		. 03151)	; &I-M-03151;
+    (=ucs		. #x2F837)	; 叟
+    (->subsumptive
+     ((=daikanwa	  . 03151)	; &M-03151;
+      (<-vulgar
+       ((=ucs		    . #x53DF)	; 叟
+	(=daikanwa	    . 03176)	; &I-M-03176;
+	))
+      (<-vulgar*sources
+       zihui daikanwa)
+      )
+     ((=cns11643-6	  . #x2643)	; &C6-2643; [06-35]
+      (=ucs@iso		  . #x2F837)	; &C6-2643;
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (sound@ja/kun/name	"koto")
     (=ucs		. #x355D)	; 㕝
     (=jis-x0213-2-2000	. #x235D)	; &I-JX2-235D; [03-61]
     ))
@@ -823,22 +876,22 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (=gt-k		. 02778)	; &GT-K02778;
+    (=gt-pj-k1		. #x357C)	; &GT-K02778; [21-92]
     (->ideographic-variants
      ((=big5-cdp	  . #x8D4C)	; &CDP-8D4C;
       ))
-    (=gt-k		. 02778)	; &GT-K02778;
-    (=gt-pj-k1		. #x357C)	; &GT-K02778; [21-92]
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (->ideographic-variants
-     ((=gt-k		  . 02778)	; &GT-K02778;
-      ))
     (=big5-cdp		. #x8D4C)	; &CDP-8D4C;
     (=gt-k		. 02777)	; &I-GT-K02777;
     (=gt-pj-k1		. #x327B)	; &CDP-8D4C; [18-91]
+    (->ideographic-variants
+     ((=gt-k		  . 02778)	; &GT-K02778;
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -1078,18 +1131,6 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x654D)	; 敍
-      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
-      ))
-    (<-vulgar
-     ((shinjigen-1	  . 915)
-      (=ucs		  . #x654D)	; 敍
-      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
-      (=daikanwa	  . 13205)	; &I-M-13205;
-      ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa shinjigen-1)
     (hanyu-dazidian	1 397 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1109,6 +1150,18 @@
     (=gt-pj-1		. #x3D76)	; &I-GT-04007; [29-86]
     (=daikanwa		. 03163)	; &I-M-03163;
     (=hanziku-1		. #xF7C1)	; &I-HZK01-F7C1;
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x654D)	; 敍
+      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
+      ))
+    (<-vulgar
+     ((shinjigen-1	  . 915)
+      (=ucs		  . #x654D)	; 敍
+      (=jis-x0208	  . #x5A46)	; &I-J90-5A46; [58-38]
+      (=daikanwa	  . 13205)	; &I-M-13205;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -1477,6 +1530,26 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 29)	; ⼜
+    (ideographic-strokes@ucs . 8)
+    (ideographic-radical@cns . 170)	; ⾩
+    (ideographic-strokes@cns . 4)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (ideographic-strokes@cns*sources
+     daikanwa)
+    (total-strokes	 . 10)
+    (=ucs		. #x20B54)	; 𠭔
+    (->subsumptive
+     ((=cns11643-6	  . #x3C67)	; &M-41563; [28-71]
+      (=daikanwa	  . 41563)	; &I-M-41563;
+      (=ucs@iso		  . #x20B54)	; &M-41563;
+      )
+     ((hanyu-dazidian	  1 399 2)
+      (=hanziku-1	  . #xF7F4)	; &HZK01-F7F4;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -1628,17 +1701,18 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 29)	; ⼜
+  '((=>ucs*		. #x20B63)	; ð ­£
+    (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (=ucs		. #x2F838)	; 𠭣
     (->subsumptive
-     ((<-same
+     ((=daikanwa	  . 48962)	; &M-48962;
+      (<-same
        ((=daikanwa	    . 38983)	; &M-38983;
 	))
       (<-same*sources
        daikanwa)
-      (=daikanwa	  . 48962)	; &M-48962;
       )
      ((=cns11643-5	  . #x3131)	; &C5-3131; [17-17]
       (=ucs@iso		  . #x2F838)	; &C5-3131;
@@ -1723,6 +1797,10 @@
     (ideographic-radical@shinjigen*sources
      shinjigen-1 jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1516 8)
+    (shinjigen-1	. 926)
+    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
+    (=daikanwa		. 01597)	; &I-M-01597;
     (<-original
      ((shinjigen-1	  . 925)
       (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
@@ -1731,11 +1809,7 @@
       (=daikanwa	  . 14301)	; &I-M-14301;
       ))
     (<-original*sources
-     zhengzi-tong daikanwa shinjigen-1)
-    (hanyu-dazidian	2 1516 8)
-    (shinjigen-1	. 926)
-    (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
-    (=daikanwa		. 01597)	; &I-M-01597;
+     zhengzitong daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -2120,18 +2194,28 @@
     (=cns11643-5	. #x542E)	; &I-C5-542E; [52-14]
     ))
 (define-char
-  '((ideographic-radical . 29)	; ⼜
-    (ideographic-strokes . 13)
+  '((ideographic-radical@ucs . 29)	; ⼜
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@cns . 79)	; ⽎
+    (ideographic-strokes@cns . 7)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 15)
-    (->identical
-     ((=cns11643-6	  . #x537B)	; &C6-537B; [51-91]
-      ))
-    (<-same
-     ((=daikanwa	  . 16642)	; &M-16642;
-      ))
     (=ucs		. #x20B81)	; 𠮁
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x20B81)	; 𠮁
+      ))
+    (ideographic-radical@ucs . 29)	; ⼜
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@cns . 79)	; ⽎
+    (ideographic-strokes@cns . 7)
+    (total-strokes	 . 13)
+    (=cns11643-6	. #x537B)	; &C6-537B; [51-91]
+    (=ucs@iso		. #x20B81)	; &C6-537B;
+    ))
+(define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
@@ -2381,12 +2465,6 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
-    (hanyu-dazidian	1 399 2)
-    (=ucs		. #x20B54)	; 𠭔
-    (=hanziku-1		. #xF7F4)	; &I-HZK01-F7F4;
-    ))
-(define-char
-  '((ideographic-radical . 29)	; ⼜
     (hanyu-dazidian	1 400 4)
     (=ucs		. #x20B62)	; ð ­¢
     (=hanziku-1		. #xF857)	; &I-HZK01-F857;