X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R191-Fight.el;h=a7a35975552e70c5db55522e68d0b1086b9a5088;hb=b7ff3de74912b7d809cd2e1907ab7c24bfbf5a23;hp=0f304a548b88c8f50494285d9da7d4e8c1931384;hpb=3b7cf42b414e90319b6bba296497a02a43303e95;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R191-Fight.el b/lisp/utf-2000/Ideograph-R191-Fight.el
index 0f304a5..a7a3597 100644
--- a/lisp/utf-2000/Ideograph-R191-Fight.el
+++ b/lisp/utf-2000/Ideograph-R191-Fight.el
@@ -25,8 +25,8 @@
     (total-strokes	 . 5)
     (=ucs		. #x29C0A)	; 𩰊
     (->subsumptive
-     ((=ucs@iso		  . #x29C0A)	; &M-45633;
-      (=cns11643-6	  . #x233D)	; &M-45633; [03-29]
+     ((=ucs@iso		  . #x29C0A)	; &C6-233D;
+      (=cns11643-6	  . #x233D)	; &C6-233D; [03-29]
       (=daikanwa	  . 45633)	; &I-M-45633;
       )
      ((hanyu-dazidian	  1 14 2)
@@ -40,7 +40,7 @@
     (=ucs		. #x29C0B)	; 𩰋
     (->subsumptive
      ((hanyu-dazidian	  1 15 2)
-      (=cns11643-6	  . #x233C)	; &CDP-88D1; [03-28]
+      (=cns11643-6	  . #x233C)	; &C6-233C; [03-28]
       (=big5-cdp	  . #x88D1)	; &I-CDP-88D1;
       (=daikanwa	  . 45634)	; &I-M-45634;
       )
@@ -152,8 +152,14 @@
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 5)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2B5D)	; &M-45640; [11-61]
-    (=daikanwa		. 45640)	; &I-M-45640;
+    (=ucs		. #x29C10)	; 𩰐
+    (->subsumptive
+     ((=daikanwa	  . 45640)	; &M-45640;
+      )
+     ((=ucs@iso		  . #x29C10)	; &U-00029C10;
+      )
+     ((=cns11643-7	  . #x2B5D)	; &C7-2B5D; [11-61]
+      ))
     ))
 (define-char
   '((=>ucs		. #x9B28)	; 鬨
@@ -186,15 +192,27 @@
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 6)
     (total-strokes	 . 16)
-    (=cns11643-7	. #x3634)	; &M-45642; [22-20]
-    (=daikanwa		. 45642)	; &I-M-45642;
+    (=ucs		. #x29C11)	; 𩰑
+    (->subsumptive
+     ((=daikanwa	  . 45642)	; &M-45642;
+      )
+     ((=ucs@iso		  . #x29C11)	; &U-00029C11;
+      )
+     ((=cns11643-7	  . #x3634)	; &C7-3634; [22-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 7)
     (total-strokes	 . 17)
-    (=cns11643-7	. #x3E3C)	; &M-45643; [30-28]
-    (=daikanwa		. 45643)	; &I-M-45643;
+    (=ucs		. #x29C12)	; 𩰒
+    (->subsumptive
+     ((=daikanwa	  . 45643)	; &M-45643;
+      )
+     ((=ucs@iso		  . #x29C12)	; &U-00029C12;
+      )
+     ((=cns11643-7	  . #x3E3C)	; &C7-3E3C; [30-28]
+      ))
     ))
 (define-char
   '((=>ucs		. #x9B29)	; 鬩
@@ -228,8 +246,14 @@
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 8)
     (total-strokes	 . 18)
-    (=cns11643-7	. #x4545)	; &M-45645; [37-37]
-    (=daikanwa		. 45645)	; &I-M-45645;
+    (=ucs		. #x29C13)	; 𩰓
+    (->subsumptive
+     ((=daikanwa	  . 45645)	; &M-45645;
+      )
+     ((=ucs@iso		  . #x29C13)	; &U-00029C13;
+      )
+     ((=cns11643-7	  . #x4545)	; &C7-4545; [37-37]
+      ))
     ))
 (define-char
   '((=>ucs		. #x29C14)	; 𩰔
@@ -250,8 +274,14 @@
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x517E)	; &M-45647; [49-94]
-    (=daikanwa		. 45647)	; &I-M-45647;
+    (=ucs		. #x29C15)	; 𩰕
+    (->subsumptive
+     ((=daikanwa	  . 45647)	; &M-45647;
+      )
+     ((=ucs@iso		  . #x29C15)	; &U-00029C15;
+      )
+     ((=cns11643-7	  . #x517E)	; &C7-517E; [49-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -264,15 +294,28 @@
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=>>ucs@unicode	. #x4C17)	; &G-HD-IA-2822;
-    (=>>hanyo-denshi/ia . #x2822)	; &G-HD-IA-2822; [08-02]
+    (=ucs@unicode	. #x4C17)	; &HD-IA-2822;
+    (=cns11643-7	. #x517D)	; &HD-IA-2822; [49-93]
+    (=hanyo-denshi/ia	. #x2822)	; &I-HD-IA-2822; [08-02]
+    (=daikanwa		. 45648)	; &I-M-45648;
     (->subsumptive
-     ((=daikanwa	  . 45648)	; &M-45648;
-      )
-     ((=ucs@unicode	  . #x4C17)	; &HD-IA-2822;
-      (=hanyo-denshi/ia	  . #x2822)	; &HD-IA-2822; [08-02]
+     ((==daikanwa	  . 45648)	; &g2-M-45648;
       )
-     ((=cns11643-7	  . #x517D)	; &C7-517D; [49-93]
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x4C17)	; 䰗
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (==ucs@unicode	  . #x4C17)	; &g2-HD-IA-2822;
+      (==cns11643-7	  . #x517D)	; &g2-HD-IA-2822; [49-93]
+      (==hanyo-denshi/ia  . #x2822)	; &g2-HD-IA-2822; [08-02]
+      (->subsumptive
+       ((===hanyo-denshi/ia . #x2822)	; &R-HD-IA-2822; [08-02]
+	)
+       ((===ucs@unicode	    . #x4C17)	; &R-UU+4C17;
+	)
+       ((===cns11643-7	    . #x517D)	; &R-C7-517D; [49-93]
+	))
       ))
     ))
 (define-char
@@ -282,17 +325,29 @@
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 11)
     (total-strokes	 . 21)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x4C17)	; 䰗
-      )
-     ((=ucs		  . #xE0102)	; 󠄂
-      ))
     (sound@ja/kun/name	"kuzi" "kuti" "^guti")
     (sound@ja/kun/place "kuzi" "kuzu")
-    (=ucs@jis		. #x4C17)	; 䰗󠄂
-    (=jis-x0213-1	. #x7E3E)	; 䰗󠄂 [94-30]
-    (=jef-china3	. #x6EB8)	; &I-JC3-6EB8;
+    (=ucs@jis		. #x4C17)	; &HD-JC-7E3E;
+    (=jis-x0213-1	. #x7E3E)	; &HD-JC-7E3E; [94-30]
     (=hanyo-denshi/jc	. #x7E3E)	; &I-HD-JC-7E3E; [94-30]
+    (=jef-china3	. #x6EB8)	; &I-JC3-6EB8;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x4C17)	; 䰗
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@jis	  . #x4C17)	; &g2-HD-JC-7E3E;
+      (==jis-x0213-1	  . #x7E3E)	; &g2-HD-JC-7E3E; [94-30]
+      (==hanyo-denshi/jc  . #x7E3E)	; &g2-HD-JC-7E3E; [94-30]
+      (==jef-china3	  . #x6EB8)	; &g2-HD-JC-7E3E;
+      (->subsumptive
+       ((===jis-x0213-1	    . #x7E3E)	; &R-JX1-7E3E; [94-30]
+	(===hanyo-denshi/jc . #x7E3E)	; &R-JX1-7E3E; [94-30]
+	)
+       ((===jef-china3	    . #x6EB8)	; &R-JC3-6EB8;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -314,8 +369,7 @@
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	45649 1)
-    (ideographic-radical@ucs . 169)	; ⾨
+  '((ideographic-radical@ucs . 169)	; ⾨
     (ideographic-radical@daikanwa . 191)	; â¾¾
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
@@ -325,18 +379,25 @@
     (=jis-x0213-1	. #x462E)	; &I-JX1-462E; [38-14]
     (=gt		. 61399)	; &I-GT-61399;
     (=gt-pj-1		. #x462E)	; &I-GT-61399; [38-14]
+    (=daikanwa/+p	. 45649)	; 闘
     (=shinjigen		.  9497)	; 闘
     (<-simplified@JP/Jouyou
-     ((=ucs@unicode	  . #x9B2D)	; 鬭󠄄
-      (=jis-x0213-1	  . #x7E3F)	; 鬭󠄄 [94-31]
+     ((=ucs@unicode	  . #x9B2D)	; &HD-JC-7E3F;
+      (=jis-x0213-1	  . #x7E3F)	; &HD-JC-7E3F; [94-31]
       ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 11)
     (total-strokes	 . 21)
-    (=cns11643-7	. #x565F)	; &M-45650; [54-63]
-    (=daikanwa		. 45650)	; &I-M-45650;
+    (=ucs		. #x29C16)	; 𩰖
+    (->subsumptive
+     ((=daikanwa	  . 45650)	; &M-45650;
+      )
+     ((=ucs@iso		  . #x29C16)	; &U-00029C16;
+      )
+     ((=cns11643-7	  . #x565F)	; &C7-565F; [54-63]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -412,28 +473,58 @@
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
+    (=ucs		. #x29C19)	; 𩰙
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x29C19)	; 𩰙
+      ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
     (=daikanwa		. 45654)	; &M-45654;
     ))
 (define-char
-  '((morohashi-daikanwa	45654 0 2)
+  '((<-denotational
+     ((=ucs		  . #x29C19)	; 𩰙
+      ))
     (ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
+    (=ucs@iso		. #x29C19)	; &C7-5A49;
     (=cns11643-7	. #x5A49)	; &C7-5A49; [58-41]
+    (->subsumptive
+     ((==ucs@iso	  . #x29C19)	; &g2-IU-00029C19;
+      )
+     ((==ucs@cns	  . #x29C19)	; &g2-CU+29C19;
+      (==cns11643-7	  . #x5A49)	; &g2-CU+29C19; [58-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 14)
     (total-strokes	 . 24)
-    (=cns11643-7	. #x603A)	; &M-45655; [64-26]
-    (=daikanwa		. 45655)	; &I-M-45655;
+    (=ucs		. #x29C1C)	; 𩰜
+    (->subsumptive
+     ((=daikanwa	  . 45655)	; &M-45655;
+      )
+     ((=ucs@iso		  . #x29C1C)	; &U-00029C1C;
+      )
+     ((=cns11643-7	  . #x603A)	; &C7-603A; [64-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
     (ideographic-strokes . 14)
     (total-strokes	 . 24)
-    (=cns11643-7	. #x6039)	; &M-45656; [64-25]
-    (=daikanwa		. 45656)	; &I-M-45656;
+    (=ucs		. #x29C1D)	; 𩰝
+    (->subsumptive
+     ((=daikanwa	  . 45656)	; &M-45656;
+      )
+     ((=ucs@iso		  . #x29C1D)	; &U-00029C1D;
+      )
+     ((=cns11643-7	  . #x6039)	; &C7-6039; [64-25]
+      ))
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾
@@ -450,13 +541,13 @@
     (total-strokes	 . 24)
     (=>>ucs@jis/1990	. #x9B2D)	; &G-CU+9B2D;
     (=>>ucs@cns		. #x9B2D)	; &G-CU+9B2D;
-    (=>>daikanwa	. 45657)	; &G-CU+9B2D;
     (=>>hanyo-denshi/jb . #x6A32)	; &G-CU+9B2D; [74-18]
+    (=>>daikanwa	. 45657)	; &G-CU+9B2D;
     (->subsumptive
      ((=daikanwa	  . 45657)	; &M-45657;
       )
-     ((=ucs@jis/1990	  . #x9B2D)	; &JSP-6A32;
-      (=jis-x0212	  . #x6A32)	; &JSP-6A32; [74-18]
+     ((=ucs@jis/1990	  . #x9B2D)	; &HD-JB-6A32;
+      (=jis-x0212	  . #x6A32)	; &HD-JB-6A32; [74-18]
       (=hanyo-denshi/jb	  . #x6A32)	; &I-HD-JB-6A32; [74-18]
       )
      ((ideographic-strokes . 15)
@@ -475,16 +566,17 @@
     (=>>ucs@unicode	. #x9B2D)	; &G-JX1-7E3F;
     (=>>jis-x0213-1	. #x7E3F)	; &G-JX1-7E3F; [94-31]
     (=>>hanyo-denshi/jc . #x7E3F)	; &G-JX1-7E3F; [94-31]
+    (=>>cbeta		. 10823)	; &G-JX1-7E3F;
     (->subsumptive
      ((=decomposition@hanyo-denshi
        ((=ucs		    . #x9B2D)	; 鬭
 	)
        ((=ucs		    . #xE0104)	; 󠄄
 	))
-      (=ucs@unicode	  . #x9B2D)	; 鬭󠄄
-      (=jis-x0213-1	  . #x7E3F)	; 鬭󠄄 [94-31]
-      (=cbeta		  . 10823)	; &I-CB10823;
+      (=ucs@unicode	  . #x9B2D)	; &HD-JC-7E3F;
+      (=jis-x0213-1	  . #x7E3F)	; &HD-JC-7E3F; [94-31]
       (=hanyo-denshi/jc	  . #x7E3F)	; &I-HD-JC-7E3F; [94-31]
+      (=cbeta		  . 10823)	; &I-CB10823;
       )
      ((=shinjigen	  .  9499)	; &SJG2-9499;
       (<-original
@@ -527,6 +619,20 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 26)
     (=ucs		. #x9B2E)	; 鬮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2E)	; 鬮
+      ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 16)
+    (total-strokes	 . 26)
+    (=>>ucs@jis		. #x9B2E)	; &G-JX1-722D;
+    (=>>jis-x0208@1983	. #x722D)	; &G-JX1-722D; [82-13]
+    (=>>jis-x0208@1990	. #x722D)	; &G-JX1-722D; [82-13]
+    (=>>jis-x0213-1	. #x722D)	; &G-JX1-722D; [82-13]
+    (=>>gt		. 61417)	; &G-JX1-722D;
+    (=>>daikanwa	. 45659)	; &G-JX1-722D;
     (->subsumptive
      ((=daikanwa	  . 45659)	; &M-45659;
       )
@@ -536,15 +642,42 @@
       (=jis-x0213-1	  . #x722D)	; &I-JX1-722D; [82-13]
       (=gt		  . 61417)	; &I-GT-61417;
       (=gt-pj-1		  . #x722D)	; &I-GT-61417; [82-13]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2E)	; 鬮
+      ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 16)
+    (total-strokes	 . 26)
+    (=ucs@unicode	. #x9B2E)	; &UU+9B2E;
+    (=gb12345		. #x634E)	; &UU+9B2E; [67-46]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2E)	; 鬮
+      ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 16)
+    (total-strokes	 . 26)
+    (=decomposition@hanyo-denshi
+     ((=ucs		  . #x9B2E)	; 鬮
       )
-     ((=ucs@cns		  . #x9B2E)	; &C2-7166;
-      (=cns11643-2	  . #x7166)	; &C2-7166; [81-70]
-      )
-     ((=jis-x0208@1978	  . #x722D)	; &J78-722D; [82-13]
-      )
-     ((=ucs@unicode	  . #x9B2E)	; &UU+9B2E;
-      (=gb12345		  . #x634E)	; &UU+9B2E; [67-46]
+     ((=ucs		  . #xE0103)	; 󠄃
+      ))
+    (=jis-x0208@1978	. #x722D)	; &HD-FT-3429; [82-13]
+    (=hanyo-denshi/ft	. #x3429)	; &I-HD-FT-3429; [20-09]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B2E)	; 鬮
       ))
+    (ideographic-radical . 191)	; â¾¾
+    (ideographic-strokes . 16)
+    (total-strokes	 . 26)
+    (=ucs@cns		. #x9B2E)	; &C2-7166;
+    (=cns11643-2	. #x7166)	; &C2-7166; [81-70]
     ))
 (define-char
   '((ideographic-radical . 191)	; â¾¾