X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R029-Again.el;h=d6fce90fa300c8cb9f50a241d81853a7233df25e;hb=dd47429744ee806472cba854b14cb3afc6e891b6;hp=9d14f8949a303e36084c7d1696a120dfb4ae7751;hpb=90795a402082eb137f6ae62e3af74ac68768182c;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 9d14f89..d6fce90 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -385,8 +385,8 @@
 	)
        ((=ucs		    . #x53C8)	; 又
 	))
-      (=>>jis-x0208	  . #x483F)	; &aJX1-483F; [40-31]
-      (=>>jis-x0213-1	  . #x483F)	; &aJX1-483F; [40-31]
+      (=>>jis-x0208	  . #x483F)	; &G-J0-483F; [40-31]
+      (=>>jis-x0213-1	  . #x483F)	; &G-J0-483F; [40-31]
       (->subsumptive
        ((ideographic-structure
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -458,8 +458,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x4E29)	; &GT-00102;
-	(=jis-x0213-2	    . #x2125)	; &GT-00102; [01-05]
+       ((=ucs@unicode	    . #x4E29)	; 丩󠄀
+	(=jis-x0213-2	    . #x2125)	; 丩󠄀 [01-05]
 	(=daikanwa	    . 00068)	; &I-M-00068;
 	)
        ((=ucs@unicode	    . #x53C8)	; &GT-03944;
@@ -934,27 +934,37 @@
     (sound@ja/kun/name	"koto")
     (=ucs		. #x355D)	; 㕝
     (=jis-x0213-2	. #x235D)	; &I-JX2-235D; [03-61]
+    (=adobe-japan1-5	. 17341)	; &I-AJ1-17341;
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (=>>big5-cdp	. #x8D4C)	; &G-CDP-8D4C;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>big5-cdp	  . #x8D4C)	; &G-CDP-8D4C;
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
     (=gt-k		. 02778)	; &GT-K02778;
     (=gt-pj-k1		. #x357C)	; &GT-K02778; [21-92]
-    (->ideographic-variants
+    (<-simplified@component
      ((=big5-cdp	  . #x8D4C)	; &CDP-8D4C;
       ))
     ))
 (define-char
-  '((ideographic-radical . 29)	; ⼜
+  '((<-denotational
+     ((=>>big5-cdp	  . #x8D4C)	; &G-CDP-8D4C;
+      ))
+    (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (=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)	; ⼜
@@ -1039,12 +1049,12 @@
     (=jis-x0213-2	. #x235E)	; &I-JX2-235E; [03-62]
     (=big5-cdp		. #x8AC3)	; &I-CDP-8AC3;
     (=daikanwa		. 03156)	; &I-M-03156;
+    (=adobe-japan1-5	. 17342)	; &I-AJ1-17342;
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 397 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1054,18 +1064,35 @@
      ((=ucs		  . #x53CC)	; 双
       ))
     (=ucs		. #x53D5)	; 叕
-    (=jis-x0212		. #x345C)	; &I-JSP-345C; [20-60]
-    (=cns11643-3	. #x276B)	; &I-C3-276B; [07-75]
-    (=jis-x0213-2	. #x235F)	; &I-JX2-235F; [03-63]
-    (=daikanwa		. 03157)	; &I-M-03157;
-    (=hanziku-1		. #xF7B6)	; &I-HZK01-F7B6;
-    (=jef-china3	. #x80CA)	; &I-JC3-80CA;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x53D5)	; &M-03157;
+      (=jis-x0212	  . #x345C)	; &M-03157; [20-60]
+      (=daikanwa	  . 03157)	; &I-M-03157;
+      (=jef-china3	  . #x80CA)	; &I-JC3-80CA;
+      )
+     ((hanyu-dazidian	  1 397 4)
+      (=ucs@unicode	  . #x53D5)	; &AJ1-17343;
+      (=jis-x0213-2	  . #x235F)	; &AJ1-17343; [03-63]
+      (=hanziku-1	  . #xF7B6)	; &I-HZK01-F7B6;
+      (=adobe-japan1-5	  . 17343)	; &I-AJ1-17343;
+      )
+     ((=cns11643-3	  . #x276B)	; &C3-276B; [07-75]
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x8033)	; 耳
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
     (=ucs		. #x53D6)	; 取
+    (=big5		. #xA8FA)	; &I-B-A8FA;
     (->subsumptive
      ((hanyu-dazidian	  1 395 1)
       (ideographic-structure
@@ -1074,15 +1101,17 @@
 	)
        ((=daikanwa	    . 28999)	; &M-28999;
 	)
-       ((=ucs		    . #x53C8)	; 又
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
 	))
       (=ucs@jis		  . #x53D6)	; &GT-03992;
-      (=ucs@big5	  . #x53D6)	; &GT-03992;
       (=jis-x0208	  . #x3C68)	; &GT-03992; [28-72]
       (=ks-x1001	  . #x7622)	; &I-K0-7622; [86-02]
       (=cns11643-1	  . #x4C3D)	; &I-C1-4C3D; [44-29]
       (=jis-x0213-1	  . #x3C68)	; &I-JX1-3C68; [28-72]
-      (=big5		  . #xA8FA)	; &I-B-A8FA;
       (=gt		  . 03992)	; &I-GT-03992;
       (=gt-k		  . 03734)	; &I-GT-K03734;
       (=gt-pj-1		  . #x3C68)	; &I-GT-03992; [28-72]
@@ -1098,7 +1127,11 @@
 	(=ks-x1001	    . #x6C3C)	; &I-K0-6C3C; [76-28]
 	(=jis-x0213-1	    . #x3C2A)	; &I-JX1-3C2A; [28-10]
 	)
-       ((=ucs		    . #x53C8)	; 又
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
 	))
       (=ucs@unicode	  . #x53D6)	; &G0-4821;
       (=gb2312		  . #x4821)	; &G0-4821; [40-01]
@@ -1294,7 +1327,7 @@
       )
      ((=ucs		  . #x53CD)	; 反
       ))
-    (=>>jis-x0213-1@2004 . #x4840)	; &aJX3-4840; [40-32]
+    (=>>jis-x0213-1@2004 . #x4840)	; &G-JX3-4840; [40-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1334,7 +1367,7 @@
       )
      ((=ucs		  . #x53CD)	; 反
       ))
-    (=>>jis-x0213-1@2000 . #x4840)	; &aJX1-4840; [40-32]
+    (=>>jis-x0213-1@2000 . #x4840)	; &G-JX1-4840; [40-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1498,6 +1531,7 @@
     (=daikanwa		. 03170)	; &I-M-03170;
     (=hanziku-1		. #xF7BA)	; &I-HZK01-F7BA;
     (=jef-china3	. #x45F3)	; &I-JC3-45F3;
+    (=adobe-japan1-2	. 08409)	; &I-AJ1-08409;
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -1611,7 +1645,7 @@
       )
      ((=ucs		  . #x53C8)	; 又
       ))
-    (=>>jis-x0213-1@2004 . #x5257)	; &aJX3-5257; [50-55]
+    (=>>jis-x0213-1@2004 . #x5257)	; &G-JX3-5257; [50-55]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1641,7 +1675,7 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
-    (=>>jis-x0213-1@2000 . #x5257)	; &aJX1-5257; [50-55]
+    (=>>jis-x0213-1@2000 . #x5257)	; &G-JX1-5257; [50-55]
     (->subsumptive
      ((=ucs@jis/1990	  . #x53DF)	; &GT-04009;
       (=ucs@jis/2000	  . #x53DF)	; &GT-04009;
@@ -1962,6 +1996,8 @@
      shinjigen@1ed jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
     (=ucs		. #x6700)	; 最
+    (=>jis-x0208	. #x3A47)	; 最 [26-39]
+    (=>jis-x0213-1	. #x3A47)	; 最 [26-39]
     (=big5		. #xB3CC)	; &I-B-B3CC;
     ))
 (define-char
@@ -1980,20 +2016,30 @@
     (hanyu-dazidian	2 1516 8)
     (=cns11643-1	. #x5E32)	; &M-01597; [62-18]
     (=daikanwa		. 01597)	; &I-M-01597;
-    (=shinjigen@1ed	.  0926)	; &M-01597;
+    (=shinjigen		.  0926)	; &M-01597;
     (<-original
-     ((=ucs@iso		  . #x2F8D4)	; &GT-18101;
-      (=ucs@jis		  . #x6700)	; &GT-18101;
-      (=ucs@ks		  . #x6700)	; &GT-18101;
-      (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
+     ((=ucs		  . #x2F8D4)	; 最
+      ))
+    (<-original*sources
+     zhengzitong daikanwa shinjigen)
+    (<-original@daikanwa
+     ((=ucs@jis		  . #x6700)	; &M-14301;
+      (=ucs@ks		  . #x6700)	; &M-14301;
+      (=jis-x0208	  . #x3A47)	; &M-14301; [26-39]
       (=ks-x1001	  . #x754C)	; &I-K0-754C; [85-44]
       (=cns11643-6	  . #x4978)	; &I-C6-4978; [41-88]
       (=jis-x0213-1	  . #x3A47)	; &I-JX1-3A47; [26-39]
       (=daikanwa	  . 14301)	; &I-M-14301;
+      ))
+    (<-original@daikanwa*sources
+     zhengzitong daikanwa)
+    (<-original@shinjigen
+     ((=ucs@iso		  . #x2F8D4)	; &GT-18101;
+      (=gt		  . 18101)	; &GT-18101;
       (=shinjigen	  .  0925)	; &GT-18101;
       ))
-    (<-original*sources
-     zhengzitong daikanwa shinjigen@1ed)
+    (<-original@shinjigen*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -2070,10 +2116,6 @@
   '((<-denotational
      ((=ucs		  . #x6700)	; 最
       ))
-    (=>ucs*		. #x6700)	; 最
-    (=>ucs@gb		. #x6700)	; &G0-576E;
-    (=>ucs@jis		. #x6700)	; &GT-18101;
-    (=>ucs@ks		. #x6700)	; &GT-18101;
     (ideographic-radical@ucs . 73)	; ⽈
     (ideographic-strokes@ucs . 8)
     (ideographic-radical@ucs*sources
@@ -2083,20 +2125,27 @@
     (ideographic-radical@shinjigen*sources
      shinjigen@1ed jisx0208/a jisx0208/b)
     (total-strokes	 . 12)
-    (=ucs		. #x2F8D4)	; 最
+    (=>>ucs@unicode	. #x6700)	; &G-J0-3A47;
+    (=>>ucs@cns		. #x2F8D4)	; &G-J0-3A47;
+    (=>>jis-x0208	. #x3A47)	; &G-J0-3A47; [26-39]
     (->subsumptive
-     ((=ucs@iso		  . #x2F8D4)	; &GT-18101;
-      (=ucs@jis		  . #x6700)	; &GT-18101;
-      (=ucs@ks		  . #x6700)	; &GT-18101;
-      (=jis-x0208	  . #x3A47)	; &GT-18101; [26-39]
-      (=ks-x1001	  . #x754C)	; &I-K0-754C; [85-44]
-      (=cns11643-6	  . #x4978)	; &I-C6-4978; [41-88]
-      (=jis-x0213-1	  . #x3A47)	; &I-JX1-3A47; [26-39]
-      (=gt		  . 18101)	; &I-GT-18101;
-      (=gt-k		  . 09052)	; &I-GT-K09052;
-      (=gt-pj-1		  . #x3A47)	; &I-GT-18101; [26-39]
-      (=daikanwa	  . 14301)	; &I-M-14301;
-      (=shinjigen	  .  0925)	; &GT-18101;
+     ((=>ucs*		  . #x6700)	; 最
+      (=ucs		  . #x2F8D4)	; 最
+      (->subsumptive
+       ((=ucs@jis	    . #x6700)	; &M-14301;
+	(=ucs@ks	    . #x6700)	; &M-14301;
+	(=jis-x0208	    . #x3A47)	; &M-14301; [26-39]
+	(=ks-x1001	    . #x754C)	; &I-K0-754C; [85-44]
+	(=cns11643-6	    . #x4978)	; &I-C6-4978; [41-88]
+	(=jis-x0213-1	    . #x3A47)	; &I-JX1-3A47; [26-39]
+	(=daikanwa	    . 14301)	; &I-M-14301;
+	)
+       ((=ucs@iso	    . #x2F8D4)	; &GT-18101;
+	(=gt		    . 18101)	; &GT-18101;
+	(=gt-k		    . 09052)	; &I-GT-K09052;
+	(=gt-pj-1	    . #x3A47)	; &GT-18101; [26-39]
+	(=shinjigen	    .  0925)	; &GT-18101;
+	))
       )
      ((=ucs@unicode	  . #x6700)	; &G0-576E;
       (=gb2312		  . #x576E)	; &G0-576E; [55-78]
@@ -2510,13 +2559,29 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
     (=ucs		. #x20B90)	; 𠮐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B90)	; 𠮐
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 16)
+    (total-strokes	 . 18)
+    (=daikanwa		. 03219)	; &M-03219;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20B90)	; 𠮐
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 16)
+    (total-strokes	 . 18)
     (->subsumptive
-     ((=daikanwa	  . 03219)	; &M-03219;
-      )
      ((hanyu-dazidian	  1 403 1)
       (=ucs@iso		  . #x20B90)	; &HZK01-F8D6;
-      (=cns11643-4	  . #x5A6F)	; &HZK01-F8D6; [58-79]
-      (=hanziku-1	  . #xF8D6)	; &I-HZK01-F8D6;
+      (=hanziku-1	  . #xF8D6)	; &HZK01-F8D6;
+      )
+     ((=cns11643-4	  . #x5A6F)	; &C4-5A6F; [58-79]
       ))
     ))
 (define-char
@@ -2524,16 +2589,24 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
     (hanyu-dazidian	1 402 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E35)	; 丵
+      )
+     ((=ucs		  . #x53D6)	; 取
+      ))
     (=ucs		. #x53E2)	; 叢
+    (=big5		. #xC24F)	; &I-B-C24F;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4E35)	; 丵
+       ((=big5-cdp	    . #x8AA8)	; &CDP-8AA8;
 	)
        ((=ucs@jis	    . #x53D6)	; &GT-03992;
-	(=ucs@big5	    . #x53D6)	; &GT-03992;
 	(=jis-x0208	    . #x3C68)	; &GT-03992; [28-72]
 	(=ks-x1001	    . #x7622)	; &I-K0-7622; [86-02]
 	(=cns11643-1	    . #x4C3D)	; &I-C1-4C3D; [44-29]
@@ -2541,12 +2614,10 @@
 	(=daikanwa	    . 03158)	; &I-M-03158;
 	))
       (=ucs@jis		  . #x53E2)	; &GT-04083;
-      (=ucs@big5	  . #x53E2)	; &GT-04083;
       (=jis-x0208	  . #x4151)	; &GT-04083; [33-49]
       (=ks-x1001	  . #x753F)	; &I-K0-753F; [85-31]
       (=cns11643-1	  . #x763B)	; &I-C1-763B; [86-27]
       (=jis-x0213-1	  . #x4151)	; &I-JX1-4151; [33-49]
-      (=big5		  . #xC24F)	; &I-B-C24F;
       (=gt		  . 04083)	; &I-GT-04083;
       (=gt-pj-1		  . #x4151)	; &I-GT-04083; [33-49]
       (=daikanwa	  . 03220)	; &I-M-03220;
@@ -2556,7 +2627,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4E35)	; 丵
+       ((=big5-cdp	    . #x8AA8)	; &CDP-8AA8;
 	)
        ((=ucs@unicode	    . #x53D6)	; &G0-4821;
 	(=gb2312	    . #x4821)	; &G0-4821; [40-01]
@@ -2620,6 +2691,59 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 20)
+    (total-strokes	 . 22)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	(=ucs		    . #x2FF2)	; ⿲
+	)
+       ((name		    . "CJK RADICAL WATER ONE")
+	(=ucs		    . #x2EA1)	; ⺡
+	)
+       ((=ucs		    . #x9B5A)	; 魚
+	)
+       ((=ucs		    . #x821F)	; 舟
+	))
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=>>ruimoku-v6	. #xE047)	; &G-RUI6-E047;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	  (=ucs		      . #x2FF2)	; ⿲
+	  )
+	 ((name		      . "CJK RADICAL WATER ONE")
+	  (=ucs		      . #x2EA1)	; ⺡
+	  )
+	 ((=ucs		      . #x9B5A)	; 魚
+	  )
+	 ((=ucs@jis	      . #x821F)	; &GT-39269;
+	  (=jis-x0208	      . #x3D2E)	; &GT-39269; [29-14]
+	  (=ks-x1001	      . #x7147)	; &I-K0-7147; [81-39]
+	  (=jis-x0213-1	      . #x3D2E)	; &I-JX1-3D2E; [29-14]
+	  (=daikanwa	      . 30350)	; &I-M-30350;
+	  ))
+	)
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
+	))
+      (=ruimoku-v6	  . #xE047)	; &RUI6-E047;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 21)
     (total-strokes	 . 23)
     (=ucs		. #x20B96)	; 𠮖