X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R006-Hook.el;h=2701eaef425bbdc30dd483e638f246ada22f0468;hp=b7f8e10475ecaba4852ceebe1f9cbb355d48d64c;hb=HEAD;hpb=9d34e0022915bb801b2db20b63744f6934727dbd

diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el
index b7f8e10..e74fbf7 100644
--- a/lisp/utf-2000/Ideograph-R006-Hook.el
+++ b/lisp/utf-2000/Ideograph-R006-Hook.el
@@ -1,8 +1,7 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((<-denotational@usage
-     ((ideographic-radical . 6)	; ⼅
-      (==>daijiten	  . 00123)	; &A2-DJT-00123;
+     ((==>daijiten	  . 00123)	; &A2-DJT-00123;
       ))
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 0)
@@ -56,8 +55,7 @@
     ))
 (define-char
   '((<-denotational@usage
-     ((ideographic-radical . 6)	; ⼅
-      (==>daijiten	  . 00124)	; &A2-DJT-00124;
+     ((==>daijiten	  . 00124)	; &A2-DJT-00124;
       ))
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 0)
@@ -68,6 +66,8 @@
     (=ucs		. #x2010C)	; 𠄌
     (=cns11643-5	. #x2124)	; &I-C5-2124; [01-04]
     (=big5-cdp		. #x8AAB)	; &I-CDP-8AAB;
+    (=gt-k		. 00133)	; &I-GT-K00133;
+    (=gt-pj-k1		. #x3364)	; 𠄌 [19-68]
     (=daikanwa		. 00225)	; &I-M-00225;
     (=daijiten		. 00124)	; &I-DJT-00124;
     (->subsumptive
@@ -85,6 +85,9 @@
        ((===ucs@iso	    . #x2010C)	; &R-U-0002010C;
 	))
       )
+     ((==gt-k		  . 00133)	; &g2-GT-K00133;
+      (==gt-pj-k1	  . #x3364)	; &g2-GT-K00133; [19-68]
+      )
      ((==daijiten	  . 00124)	; &g2-DJT-00124;
       ))
     ))
@@ -106,8 +109,7 @@
     ))
 (define-char
   '((<-denotational@usage
-     ((ideographic-radical . 6)	; ⼅
-      (==>daijiten	  . 00125)	; &A2-DJT-00125;
+     ((==>daijiten	  . 00125)	; &A2-DJT-00125;
       ))
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 1)
@@ -248,7 +250,7 @@
     (hanyu-dazidian	1 49 6)
     (sound@ja/on	"dai")
     (=ucs@iso		. #x2010E)	; &GT-00303;
-    (=cns11643-4	. #x2128)	; &I-C4-2128; [01-08]
+    (=cns11643-4	. #x2128)	; &GT-00303; [01-08]
     (=big5-cdp		. #x866A)	; &I-CDP-866A;
     (=gt		. 00303)	; &I-GT-00303;
     (=gt-k		. 00117)	; &I-GT-K00117;
@@ -355,33 +357,69 @@
     (=hanziku-1		. #xAEA3)	; &I-HZK01-AEA3;
     ))
 (define-char
-  '((total-strokes	 . 3)
+  '((<-denotational@component
+     ((=>ucs@component	  . #x4E87)	; &A-compU+4E87;
+      ))
+    (ideographic-radical@ucs . 6)	; ⼅
+    (ideographic-strokes@ucs . 2)
+    (ideographic-radical@cns . 4)	; ⼃
+    (ideographic-strokes@cns . 2)
+    (total-strokes	 . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>big5-cdp	  . #x8DD8)	; &A-CDP-8DD8;
+      )
+     ((=ucs		  . #x4E85)	; 亅
+      ))
     (=ucs		. #x4E87)	; 亇
-    (->subsumptive
-     ((ideographic-radical . 4)	; ⼃
-      (ideographic-strokes . 2)
-      (=ucs@cns		  . #x4E87)	; &C3-212D;
-      (=cns11643-3	  . #x212D)	; &C3-212D; [01-13]
-      (=jef-china3	  . #x8FC2)	; &I-JC3-8FC2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E87)	; 亇
+      ))
+    (ideographic-radical . 6)	; ⼅
+    (ideographic-strokes . 2)
+    (total-strokes	 . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ideographic-radical . 6)	; ⼅
-      (ideographic-strokes . 2)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8DD8)	; &CDP-8DD8;
-	)
-       ((=ucs		    . #x4E85)	; 亅
-	))
-      (=ucs@unicode	  . #x4E87)	; &UU+4E87;
-      (=gb12345		  . #x7D3B)	; &UU+4E87; [93-27]
+     ((=big5-cdp	  . #x8DD8)	; &CDP-8DD8;
+      )
+     ((=ucs		  . #x4E85)	; 亅
+      ))
+    (=ucs@unicode	. #x4E87)	; &UU+4E87;
+    (=ucs@JP/hanazono	. nil)
+    (=gb12345		. #x7D3B)	; &UU+4E87; [93-27]
+    (->subsumptive
+     ((==ucs@unicode	  . #x4E87)	; &g2-UU+4E87;
+      (==ucs@JP/hanazono  . nil)
+      (==gb12345	  . #x7D3B)	; &g2-UU+4E87; [93-27]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 6)	; ⼅
+    (ideographic-strokes . 2)
+    (total-strokes	 . 3)
+    (=>ucs-itaiji-005	. #x624D)	; &A-U-i005+624D;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs-itaiji-005	  . #x624D)	; &A-U-i005+624D;
+      ))
+    (ideographic-radical . 6)	; ⼅
+    (ideographic-strokes . 2)
+    (total-strokes	 . 3)
+    (=ucs-itaiji-005	. #x624D)	; &U-i005+624D;
+    (->subsumptive
+     ((==ucs-itaiji-005	  . #x624D)	; &g2-U-i005+624D;
       ))
     ))
 (define-char
   '((<-denotational@usage
-     ((ideographic-radical . 6)	; ⼅
-      (==>daijiten	  . 00126)	; &A2-DJT-00126;
+     ((==>daijiten	  . 00126)	; &A2-DJT-00126;
       ))
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 3)
@@ -497,22 +535,67 @@
       )
      ((=ucs		  . #x624D)	; 才
       ))
+    (sound@ja/on	"sui")
     (=ucs		. #x20112)	; 𠄒
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20112)	; 𠄒
+      ))
+    (ideographic-radical . 6)	; ⼅
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (hanyu-dazidian	1 33 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E3F)	; 丿
+      )
+     ((=ucs@unicode	  . #x624D)	; &C1-445F;
+      (=gb2312		  . #x3245)	; &C1-445F; [18-37]
+      (=cns11643-1	  . #x445F)	; &I-C1-445F; [36-63]
+      ))
+    (=ucs@iso		. #x20112)	; &MJ030452;
+    (=mj		. 030452)	; &MJ030452;
+    (=cns11643-6	. #x2147)	; &I-C6-2147; [01-39]
+    (=koseki		. 002760)	; &MJ030452;
+    (=gt		. 00310)	; &I-GT-00310;
+    (=gt-pj-2		. #x317D)	; &I-GT-00310; [17-93]
+    (=daikanwa		. 00232)	; &I-M-00232;
+    (<-ancient
+     ((=ucs@unicode	  . #x5782)	; &AJ1-02600;
+      (=adobe-japan1-0	  . 02600)	; &AJ1-02600;
+      (=daikanwa	  . 05012)	; &I-M-05012;
+      ))
+    (<-ancient*sources
+     kangxi daikanwa)
+    (<-formed
+     ((=ucs@unicode	  . #x5782)	; &AJ1-02600;
+      (=adobe-japan1-0	  . 02600)	; &AJ1-02600;
+      ))
+    (<-formed$_1*sources
+     koseki mj)
+    (<-formed*sources
+     koseki mj)
     (->subsumptive
-     ((hanyu-dazidian	  1 33 4)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E3F)	; 丿
-	)
-       ((=ucs@unicode	    . #x624D)	; &C1-445F;
-	(=gb2312	    . #x3245)	; &C1-445F; [18-37]
-	(=cns11643-1	    . #x445F)	; &I-C1-445F; [36-63]
+     ((=>>ucs@iso	  . #x20112)	; &G-GT-00310;
+      (=>>gt		  . 00310)	; &G-GT-00310;
+      (=>>daikanwa	  . 00232)	; &G-GT-00310;
+      (->subsumptive
+       ((==ucs@iso	    . #x20112)	; &g2-GT-00310;
+	(==gt		    . 00310)	; &g2-GT-00310;
+	(==daikanwa	    . 00232)	; &g2-GT-00310;
+	(->subsumptive
+	 ((===daikanwa	      . 00232)	; &R-M-00232;
+	  )
+	 ((===gt	      . 00310)	; &R-GT-00310;
+	  )
+	 ((===ucs@iso	      . #x20112)	; &R-U-00020112;
+	  )
+	 ((=hanziku-1	      . #xAAD7)	; &HZK01-AAD7;
+	  ))
 	))
-      (=ucs@iso		  . #x20112)	; &M-00232;
-      (=daikanwa	  . 00232)	; &M-00232;
-      (=hanziku-1	  . #xAAD7)	; &I-HZK01-AAD7;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -522,8 +605,20 @@
 	)
        ((=gt		    . 00010)	; &GT-00010;
 	))
-      (=ucs@cns		  . #x20112)	; &C6-2147;
-      (=cns11643-6	  . #x2147)	; &C6-2147; [01-39]
+      (=>>ucs@cns	  . #x20112)	; &G-MJ030452;
+      (=>>mj		  . 030452)	; &G-MJ030452;
+      (=>>cns11643-6	  . #x2147)	; &G-MJ030452; [01-39]
+      (->subsumptive
+       ((==ucs@cns	    . #x20112)	; &g2-MJ030452;
+	(==mj		    . 030452)	; &g2-MJ030452;
+	(==cns11643-6	    . #x2147)	; &g2-MJ030452; [01-39]
+	(==koseki	    . 002760)	; &g2-MJ030452;
+	(->subsumptive
+	 ((===mj	      . 030452)	; &R-MJ030452;
+	  )
+	 ((===cns11643-6      . #x2147)	; &R-C6-2147; [01-39]
+	  ))
+	))
       ))
     ))
 (define-char
@@ -535,6 +630,26 @@
     (=cns11643-6	. #x2148)	; &I-C6-2148; [01-40]
     (=big5-cdp		. #x87E0)	; &I-CDP-87E0;
     (=daikanwa		. 00233)	; &I-M-00233;
+    (<-ancient
+     ((=ucs		  . #x5DDE)	; 州
+      ))
+    (<-ancient*sources
+     shuowen)
+    (->subsumptive
+     ((==ucs@iso	  . #x20113)	; &g2-CDP-87E0;
+      (==cns11643-6	  . #x2148)	; &g2-CDP-87E0; [01-40]
+      (==big5-cdp	  . #x87E0)	; &g2-CDP-87E0;
+      (==daikanwa	  . 00233)	; &g2-CDP-87E0;
+      (->subsumptive
+       ((===daikanwa	    . 00233)	; &R-M-00233;
+	)
+       ((===big5-cdp	    . #x87E0)	; &R-CDP-87E0;
+	)
+       ((===cns11643-6	    . #x2148)	; &R-C6-2148; [01-40]
+	)
+       ((===ucs@iso	    . #x20113)	; &R-U-00020113;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
@@ -610,7 +725,23 @@
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
-    (ideographic-strokes . 4)
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x4E86)	; 了
+      )
+     ((=ucs		  . #x4E86)	; 了
+      ))
+    (=ucs		. #x30052)	; 𰁒
+    ))
+(define-char
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 4)
+    (ideographic-radical@misc . 6)	; ⼅
+    (ideographic-strokes@misc . 4)
     (total-strokes	 . 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -620,8 +751,14 @@
       )
      ((=big5-cdp	  . #x88CD)	; &CDP-88CD;
       ))
-    (=gt-k		. 01268)	; &GT-K01268;
-    (=gt-pj-k2		. #x4A76)	; &GT-K01268; [42-86]
+    (=ucs		. #x3000A)	; 𰀊
+    (=gt-k		. 01268)	; &I-GT-K01268;
+    (=gt-pj-k2		. #x4A76)	; 𰀊 [42-86]
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x3000A)	; &g2-GT-K01268;
+      (==gt-k		  . 01268)	; &g2-GT-K01268;
+      (==gt-pj-k2	  . #x4A76)	; &g2-GT-K01268; [42-86]
+      ))
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
@@ -645,8 +782,31 @@
       ))
     (=ucs		. #x20115)	; 𠄕
     (=cns11643-6	. #x2347)	; &I-C6-2347; [03-39]
+    (=gt		. 00314)	; &I-GT-00314;
+    (=gt-pj-2		. #x3222)	; &I-GT-00314; [18-02]
     (=daikanwa		. 00235)	; &I-M-00235;
-    (=hanziku-1		. #xAEE7)	; &I-HZK01-AEE7;
+    (<-Zhouwen
+     ((=ucs		  . #x4E43)	; 乃
+      ))
+    (<-Zhouwen*sources
+     shuowen)
+    (->subsumptive
+     ((==ucs@iso	  . #x20115)	; &g2-GT-00314;
+      (==cns11643-6	  . #x2347)	; &g2-GT-00314; [03-39]
+      (==gt		  . 00314)	; &g2-GT-00314;
+      (==daikanwa	  . 00235)	; &g2-GT-00314;
+      (->subsumptive
+       ((===daikanwa	    . 00235)	; &R-M-00235;
+	)
+       ((===cns11643-6	    . #x2347)	; &R-C6-2347; [03-39]
+	)
+       ((===gt		    . 00314)	; &R-GT-00314;
+	)
+       ((===ucs@iso	    . #x20115)	; &R-U-00020115;
+	)
+       ((=hanziku-1	    . #xAEE7)	; &HZK01-AEE7;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -656,19 +816,37 @@
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 324 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x2008A)	; 𠂊
+     ((=>ucs@component	  . #x5200)	; &A-compU+5200;
+      (=>iwds-1		  .  0149)	; &A-compU+5200;
       )
      ((=big5-cdp	  . #x8BFE)	; &CDP-8BFE;
       ))
     (sound@ja/kun	"araso+H5" "araga+H5")
     (sound@ja/on/kan	"sAu")
     (=ucs		. #x4E89)	; 争
-    (=adobe-japan1-0	. 02794)	; &I-AJ1-02794;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E89)	; 争
+      ))
+    (ideographic-radical . 6)	; ⼅
+    (ideographic-strokes . 5)
+    (total-strokes	 . 6)
+    (hanyu-dazidian	1 324 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x2008A)	; 𠂊
+      )
+     ((=big5-cdp	  . #x8BFE)	; &CDP-8BFE;
+      ))
+    (=ucs@unicode	. #x4E89)	; &AJ1-02794;
+    (=adobe-japan1-0	. 02794)	; &AJ1-02794;
     (=jis-x0208		. #x4168)	; &I-J90-4168; [33-72]
     (=gb2312		. #x5579)	; &I-G0-5579; [53-89]
     (=cns11643-3	. #x2265)	; &I-C3-2265; [02-69]
@@ -678,7 +856,7 @@
     (=gt-pj-1		. #x4168)	; &I-GT-00313; [33-72]
     (=daikanwa		. 00236)	; &I-M-00236;
     (=daijiten		. 00127)	; &I-DJT-00127;
-    (=shinjigen		.  4698)	; 争
+    (=shinjigen		.  4698)	; &AJ1-02794;
     (<-simplified@CN
      ((=ucs@unicode	  . #x722D)	; &C1-4E68;
       (=cns11643-1	  . #x4E68)	; &C1-4E68; [46-72]
@@ -782,8 +960,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=>>ucs@unicode	    . #x4EE4)	; &GT-K01022;
-	(=gt-k		    . 01022)	; &GT-K01022;
+       ((=mj		    . 056905)	; &MJ056905;
 	)
        ((=ucs		    . #x4E01)	; 丁
 	))
@@ -805,17 +982,61 @@
     (ideographic-strokes@ucs . 6)
     (ideographic-radical@cns . 6)	; ⼅
     (ideographic-strokes@cns . 6)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=>ucs@iwds-1	  . #x20012)	; &A-IWDSU+20012;
+      )
+     ((=ucs		  . #x4E01)	; 丁
+      ))
+    (sound@ja/on	"tei")
+    (=ucs		. #x20029)	; 𠀩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20029)	; 𠀩
+      ))
+    (ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 6)	; ⼅
+    (ideographic-strokes@cns . 6)
     (ideographic-radical@cns*sources
      daikanwa cns11643)
     (total-strokes	 . 7)
-    (=ucs		. #x20029)	; 𠀩
+    (hanyu-dazidian	1 553 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@iso		  . #x20012)	; &MJ030324;
+      (=mj		  . 030324)	; &MJ030324;
+      )
+     ((=ucs		  . #x4E01)	; 丁
+      ))
+    (=ucs@iso		. #x20029)	; &C6-2563;
+    (=cns11643-6	. #x2563)	; &C6-2563; [05-67]
+    (=daikanwa		. 00239)	; &I-M-00239;
+    (<-same
+     ((=mj		  . 035214)	; &MJ035214;
+      (=daikanwa	  . 09171)	; &I-M-09171;
+      ))
+    (<-same*sources
+     zihui-bu daikanwa)
     (->subsumptive
-     ((=ucs@iso		  . #x20029)	; &C6-2563;
-      (=cns11643-6	  . #x2563)	; &C6-2563; [05-67]
-      (=daikanwa	  . 00239)	; &I-M-00239;
+     ((==ucs@iso	  . #x20029)	; &g2-M-00239;
+      (==cns11643-6	  . #x2563)	; &g2-M-00239; [05-67]
+      (==daikanwa	  . 00239)	; &g2-M-00239;
+      (->subsumptive
+       ((===daikanwa	    . 00239)	; &R-M-00239;
+	)
+       ((===cns11643-6	    . #x2563)	; &R-C6-2563; [05-67]
+	)
+       ((===ucs@iso	    . #x20029)	; &R-U-00020029;
+	))
       )
-     ((hanyu-dazidian	  1 553 5)
-      (=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
+     ((=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
       ))
     ))
 (define-char