X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R006-Hook.el;h=8ea0a14e18b8a23404f5c709cc4ea80b30767c03;hb=8670d6ad21a0bab10db777f6b1603cc13718e585;hp=44e439439138a5c7c8808b7f59cbbd336d4a1a4c;hpb=eb399666388dc9991ecbd62515dbaadbfedfb9d9;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el
index 44e4394..8ea0a14 100644
--- a/lisp/utf-2000/Ideograph-R006-Hook.el
+++ b/lisp/utf-2000/Ideograph-R006-Hook.el
@@ -175,10 +175,6 @@
   '((ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8C6B)	; 豫
-      (=jis-x0208	  . #x502E)	; &I-J90-502E; [48-14]
-      ))
     (hanyu-dazidian	1 52 2)
     (shinjigen-1	. 67)
     (shinjigen-2	. 67)
@@ -195,24 +191,42 @@
     (=gt-pj-1		. #x4D3D)	; &I-GT-00312; [45-29]
     (=daikanwa		. 00231)	; &I-M-00231;
     (mojikyo		. 000231)	; &MCS-600000E7;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x502E)	; &GT-48859; [48-14]
+      (=ks-x1001	  . #x6763)	; &I-K0-6763; [71-67]
+      (=daikanwa	  . 36425)	; &I-M-36425;
+      ))
     ))
 (define-char
   '((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		. #x20112)	; 𠄒
+    (->subsumptive
+     ((hanyu-dazidian	  1 33 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=gb2312	    . #x3245)	; &C1-445F; [18-37]
+	(=cns11643-1	    . #x445F)	; &I-C1-445F; [36-63]
+	))
+      (=daikanwa	  . 00232)	; &M-00232;
+      (=hanziku-1	  . #xAAD7)	; &I-HZK01-AAD7;
+      (=ucs@iso		  . #x20112)	; &M-00232;
       )
-     ((=ucs		  . #x624D)	; 才
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E3F)	; 丿
+	)
+       ((=gt		    . 00010)	; &GT-00010;
+	))
+      (=cns11643-6	  . #x2147)	; &C6-2147; [01-39]
       ))
-    (=ucs		. #x20112)	; 𠄒
-    (=cns11643-6	. #x2147)	; &I-C6-2147; [01-39]
-    (=daikanwa		. 00232)	; &I-M-00232;
-    (=hanziku-1		. #xAAD7)	; &I-HZK01-AAD7;
     ))
 (define-char
   '((morohashi-daikanwa	232 0 1)
@@ -288,11 +302,6 @@
   '((ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x6027)	; &GT-25238; [64-07]
-      (=ks-x1001	  . #x6E33)	; &I-K0-6E33; [78-19]
-      (=daikanwa	  . 19663)	; &I-M-19663;
-      ))
     (hanyu-dazidian	1 324 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -316,6 +325,17 @@
     (=daikanwa		. 00236)	; &I-M-00236;
     (=hanziku-1		. #xE8D1)	; &I-HZK01-E8D1;
     (mojikyo		. 000236)	; &MCS-600000EC;
+    (<-simplified@CN
+     ((=gb12345		  . #x5579)	; &C1-4E68; [53-89]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6027)	; &GT-25238; [64-07]
+      (=ks-x1001	  . #x6E33)	; &I-K0-6E33; [78-19]
+      (=daikanwa	  . 19663)	; &I-M-19663;
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x722D)	; 爭
+      ))
     ))
 (define-char
   '((=>daikanwa		. 00237)	; &M-00237;
@@ -372,31 +392,29 @@
     (mojikyo		. 000238)	; &MCS-600000EE;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	6)
-			(:radical	6 ; ⼅
-			 :strokes	6))
+  '((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)
-    (hanyu-dazidian	1 553 5)
     (=ucs		. #x20029)	; 𠀩
-    (=cns11643-6	. #x2563)	; &I-C6-2563; [05-67]
-    (=daikanwa		. 00239)	; &I-M-00239;
-    (=hanziku-2		. #xC1C0)	; &I-HZK02-C1C0;
-    (mojikyo		. 000239)	; &MCS-600000EF;
+    (->subsumptive
+     ((=cns11643-6	  . #x2563)	; &M-00239; [05-67]
+      (=daikanwa	  . 00239)	; &I-M-00239;
+      (=ucs@iso		  . #x20029)	; &M-00239;
+      )
+     ((hanyu-dazidian	  1 553 5)
+      (=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
+      (mojikyo		  . 000239)	; &MCS-600000EF;
+      ))
     ))
 (define-char
   '((morohashi-daikanwa	ho 7)
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-vulgar
-     ((shinjigen-1	  . 69)
-      (=ucs		  . #x4E8B)	; 事
-      (=jis-x0208	  . #x3B76)	; &I-J90-3B76; [27-86]
-      (=daikanwa	  . 00241)	; &I-M-00241;
-      ))
-    (<-vulgar*sources
-     songyuan-yilai-suzipu daikanwa shinjigen-1)
     (shinjigen-1	. 71)
     (shinjigen-2	. 71)
     (sound@ja/kun	"koto")
@@ -406,6 +424,14 @@
     (=gt		. 00315)	; &I-GT-00315;
     (=gt-pj-1		. #x502F)	; &I-GT-00315; [48-15]
     (mojikyo		. 054501)	; &MCS-6000D4E5;
+    (<-vulgar
+     ((shinjigen-1	  . 69)
+      (=ucs		  . #x4E8B)	; 事
+      (=jis-x0208	  . #x3B76)	; &I-J90-3B76; [27-86]
+      (=daikanwa	  . 00241)	; &I-M-00241;
+      ))
+    (<-vulgar*sources
+     songyuan-yilai-suzipu daikanwa shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅