From: tomo <tomo>
Date: Sat, 16 Oct 2004 20:04:13 +0000 (+0000)
Subject: - Use `=jis-x0208@{1978|1983|1990}' instead of
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~154
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4745c4de93b309b8f217d2bf2ca93e724f890a5c;p=chise%2Fxemacs-chise.git

- Use `=jis-x0208@{1978|1983|1990}' instead of
  `=jis-x0208-{1978|1983|1990}'.
- Use `->subsumptive' or `{<-|->}denotational' for some character
  definitions.
---

diff --git a/lisp/utf-2000/Ideograph-R136-Oppose.el b/lisp/utf-2000/Ideograph-R136-Oppose.el
index 77f6109..f5cbe9b 100644
--- a/lisp/utf-2000/Ideograph-R136-Oppose.el
+++ b/lisp/utf-2000/Ideograph-R136-Oppose.el
@@ -2,121 +2,125 @@
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 0)
-    (total-strokes	 . 6)
     (=ucs		. #x821B)	; 舛
-    (=jis-x0208		. #x4124)	; &I-J90-4124; [33-04]
-    (=gb2312		. #x6236)	; &I-G0-6236; [66-22]
-    (=gt		. 39240)	; &I-GT-39240;
-    (=gt-k		. 01657)	; &I-GT-K01657;
-    (=gt-pj-1		. #x4124)	; &I-GT-39240; [33-04]
-    (=daikanwa		. 30338)	; &I-M-30338;
-    ))
-(define-char
-  '((=>ucs		. #x821B)	; 舛
-    (morohashi-daikanwa	30338 0 0)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 0)
-    (total-strokes	 . 6)
-    (shinjigen-1	. 6636)
-    (shinjigen-2	. 6636)
-    (=cns11643-1	. #x4860)	; &C1-4860; [40-64]
-    ))
-(define-char
-  '((=>ucs		. #x821B)	; 舛
-    (morohashi-daikanwa	30338 0 1)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 0)
-    (total-strokes	 . 7)
-    (=ks-x1001		. #x743F)	; &K0-743F; [84-31]
+    (->subsumptive
+     ((total-strokes	   . 6)
+      (=jis-x0208	  . #x4124)	; &GT-39240; [33-04]
+      (=gb2312		  . #x6236)	; &I-G0-6236; [66-22]
+      (=gt		  . 39240)	; &I-GT-39240;
+      (=gt-k		  . 01657)	; &I-GT-K01657;
+      (=gt-pj-1		  . #x4124)	; &I-GT-39240; [33-04]
+      (=daikanwa	  . 30338)	; &I-M-30338;
+      (=ucs@unicode	  . #x821B)	; &GT-39240;
+      )
+     ((total-strokes	   . 6)
+      (shinjigen-1	  . 6636)
+      (shinjigen-2	  . 6636)
+      (=cns11643-1	  . #x4860)	; &C1-4860; [40-64]
+      )
+     ((total-strokes	   . 7)
+      (=ks-x1001	  . #x743F)	; &K0-743F; [84-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=ucs		. #x821C)	; 舜
-    (=gb2312		. #x4B34)	; &I-G0-4B34; [43-20]
-    (=daikanwa		. 30339)	; &I-M-30339;
-    ))
-(define-char
-  '((=>ucs		. #x821C)	; 舜
-    (morohashi-daikanwa	30339 0 0)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (=cns11643-1	. #x6155)	; &C1-6155; [65-53]
-    ))
-(define-char
-  '((=>ucs		. #x821C)	; 舜
-    (morohashi-daikanwa	30339 0 1)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (=jis-x0208-1978	. #x3D58)	; &GT-39246; [29-56]
-    (=jis-x0208-1983	. #x3D58)	; &I-J83-3D58; [29-56]
-    (=ks-x1001		. #x626F)	; &I-K0-626F; [66-79]
-    (=gt		. 39246)	; &I-GT-39246;
-    (=gt-k		. 10220)	; &I-GT-K10220;
-    (=gt-pj-1		. #x3D58)	; &I-GT-39246; [29-56]
-    ))
-(define-char
-  '((=>ucs		. #x821C)	; 舜
-    (morohashi-daikanwa	30339 0 2)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (=jis-x0208-1990	. #x3D58)	; &J90-3D58; [29-56]
-    (=ucs@jis		. #x821C)	; &J90-3D58;
-    ))
-(define-char
-  '((=>ucs		. #x20B02)	; 𠬂
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 6)
-    (total-strokes	 . 12)
-    (->identical
-     ((=ucs		  . #x20B02)	; 𠬂
+    (->subsumptive
+     ((=gb2312		  . #x4B34)	; &M-30339; [43-20]
+      (=daikanwa	  . 30339)	; &I-M-30339;
+      (=ucs@unicode	  . #x821C)	; &M-30339;
+      )
+     ((=cns11643-1	  . #x6155)	; &C1-6155; [65-53]
+      )
+     ((=jis-x0208@1978	  . #x3D58)	; &GT-39246; [29-56]
+      (=jis-x0208@1983	  . #x3D58)	; &I-J83-3D58; [29-56]
+      (=ks-x1001	  . #x626F)	; &I-K0-626F; [66-79]
+      (=gt		  . 39246)	; &I-GT-39246;
+      (=gt-k		  . 10220)	; &I-GT-K10220;
+      (=gt-pj-1		  . #x3D58)	; &I-GT-39246; [29-56]
+      )
+     ((=jis-x0208@1990	  . #x3D58)	; &J90-3D58; [29-56]
+      (=ucs@jis		  . #x821C)	; &J90-3D58;
       ))
-    (=daikanwa		. 30340)	; &M-30340;
     ))
 (define-char
-  '((=>ucs		. #x20B02)	; 𠬂
-    (morohashi-daikanwa	30340 0 0)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 6)
+  '((ideographic-radical@ucs . 28)	; ⼛
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@ucs*sources
+     daikanwa=03104 ucs)
+    (ideographic-radical@cns . 136)	; ⾇
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa=30340 cns11643)
     (total-strokes	 . 12)
-    (=cns11643-6	. #x4D62)	; &C6-4D62; [45-66]
+    (=ucs		. #x20B02)	; 𠬂
+    (->subsumptive
+     ((hanyu-dazidian	  1 389 3)
+      (=hanziku-1	  . #xF5EF)	; &HZK01-F5EF;
+      (=ucs@iso		  . #x20B02)	; &HZK01-F5EF;
+      (->subsumptive
+       ((ideographic-radical . 28)	; ⼛
+	(ideographic-strokes . 10)
+	(->synonyms
+	 ((=daikanwa	      . 13502)	; &I-M-13502;
+	  ))
+	(->synonyms*sources
+	 pianhai-leibian daikanwa)
+	(=daikanwa	    . 03104)	; &M-03104;
+	)
+       ((ideographic-radical . 136)	; ⾇
+	(ideographic-strokes . 6)
+	(=daikanwa	    . 30340)	; &M-30340;
+	))
+      )
+     ((=cns11643-6	  . #x4D62)	; &C6-4D62; [45-66]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=ucs		. #x821D)	; 舝
-    (=jis-x0212		. #x5674)	; &I-JSP-5674; [54-84]
-    (=cns11643-2	. #x4648)	; &I-C2-4648; [38-40]
-    (=daikanwa		. 30341)	; &I-M-30341;
+    (->subsumptive
+     ((=daikanwa	  . 30341)	; &M-30341;
+      (=ucs@unicode	  . #x821D)	; &M-30341;
+      )
+     ((=cns11643-2	  . #x4648)	; &C2-4648; [38-40]
+      )
+     ((=jis-x0212	  . #x5674)	; &JSP-5674; [54-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 8)
-    (total-strokes	 . 14)
     (=ucs		. #x821E)	; 舞
-    (=gb2312		. #x4E68)	; &I-G0-4E68; [46-72]
-    (=daikanwa		. 30342)	; &I-M-30342;
     ))
 (define-char
-  '((=>ucs		. #x821E)	; 舞
-    (morohashi-daikanwa	30342 0 0)
-    (ideographic-radical . 136)	; ⾇
+  '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (shinjigen-1	. 6640)
-    (=cns11643-1	. #x6A5A)	; &C1-6A5A; [74-58]
+    (<-denotational
+     ((=ucs		  . #x821E)	; 舞
+      ))
+    (->subsumptive
+     ((=gb2312		  . #x4E68)	; &M-30342; [46-72]
+      (=daikanwa	  . 30342)	; &I-M-30342;
+      (=ucs@unicode	  . #x821E)	; &M-30342;
+      )
+     ((shinjigen-1	  . 6640)
+      (=cns11643-1	  . #x6A5A)	; &C1-6A5A; [74-58]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x821E)	; 舞
-    (morohashi-daikanwa	30342 1)
+  '((morohashi-daikanwa	30342 1)
     (ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
+    (<-denotational
+     ((=ucs		  . #x821E)	; 舞
+      ))
     (shinjigen-1	. 6639)
     (=jis-x0208		. #x4971)	; &GT-39251; [41-81]
     (=ks-x1001		. #x5971)	; &I-K0-5971; [57-81]
@@ -130,80 +134,80 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x445D)	; 䑝
-    (=cns11643-6	. #x6121)	; &I-C6-6121; [65-01]
-    (=daikanwa		. 30343)	; &I-M-30343;
+    (->subsumptive
+     ((=daikanwa	  . 30343)	; &M-30343;
+      (=ucs@unicode	  . #x445D)	; &M-30343;
+      )
+     ((=cns11643-6	  . #x6121)	; &C6-6121; [65-01]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (hanyu-dazidian	1 58 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+    (=ucs		. #x269FF)	; 𦧿
+    (->subsumptive
+     ((hanyu-dazidian	  1 58 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x708E)	; 炎
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=jis-x0208	      . #x316A)	; &M-18910; [17-74]
+	  (=gb2312	      . #x5157)	; &I-G0-5157; [49-55]
+	  (=ks-x1001	      . #x667A)	; &I-K0-667A; [70-90]
+	  (=daikanwa	      . 18910)	; &I-M-18910;
+	  )
+	 ((=jis-x0208	      . #x4124)	; &GT-39240; [33-04]
+	  (=gb2312	      . #x6236)	; &I-G0-6236; [66-22]
+	  (=daikanwa	      . 30338)	; &I-M-30338;
+	  ))
 	)
-       ((=ucs		    . #x821B)	; 舛
+       ((=ucs		    . #x4E5A)	; 乚
 	))
-      )
-     ((=ucs		  . #x4E5A)	; 乚
-      ))
-    (=ucs		. #x269FF)	; 𦧿
-    (=daikanwa		. 30344)	; &I-M-30344;
-    (=hanziku-1		. #xAFE8)	; &I-HZK01-AFE8;
-    ))
-(define-char
-  '((=>ucs		. #x269FF)	; 𦧿
-    (morohashi-daikanwa	30344 0 0)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+      (=daikanwa	  . 30344)	; &M-30344;
+      (=hanziku-1	  . #xAFE8)	; &I-HZK01-AFE8;
+      (=ucs@iso		  . #x269FF)	; &M-30344;
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=cns11643-1	    . #x4E63)	; &C1-4E63; [46-67]
+       ((=cns11643-3	    . #x4773)	; &C3-4773; [39-83]
 	)
-       ((=cns11643-1	    . #x4860)	; &C1-4860; [40-64]
+       ((=ucs		    . #x4E5A)	; 乚
 	))
-      )
-     ((=ucs		  . #x4E5A)	; 乚
+      (=cns11643-5	  . #x5027)	; &C5-5027; [48-07]
       ))
-    (=cns11643-5	. #x5027)	; &C5-5027; [48-07]
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x269FE)	; 𦧾
-    ))
-(define-char
-  '((=>ucs		. #x269FE)	; 𦧾
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=cns11643-5	. #x5026)	; &C5-5026; [48-06]
+    (->subsumptive
+     ((=ucs@iso		  . #x269FE)	; &UU+269FE;
+      )
+     ((=cns11643-5	  . #x5026)	; &C5-5026; [48-06]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x445E)	; 䑞
-    (=cns11643-3	. #x524B)	; &I-C3-524B; [50-43]
-    (=daikanwa		. 30345)	; &I-M-30345;
+    (->subsumptive
+     ((=daikanwa	  . 30345)	; &M-30345;
+      (=ucs@unicode	  . #x445E)	; &M-30345;
+      )
+     ((=cns11643-3	  . #x524B)	; &C3-524B; [50-43]
+      ))
     ))
 (define-char
-  '((=>daikanwa		. 49571)	; &M-49571;
-    (ideographic-radical@ucs . 86)	; ⽕
+  '((ideographic-radical@ucs . 86)	; ⽕
     (ideographic-strokes@ucs . 12)
     (ideographic-radical@cns . 136)	; ⾇
     (ideographic-strokes@cns . 10)
@@ -221,117 +225,82 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x26A01)	; 𦨁
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 14)
-    (total-strokes	 . 20)
-    (=daikanwa		. 30346)	; &M-30346;
-    ))
-(define-char
-  '((morohashi-daikanwa	30346 0 0)
-    (ideographic-radical . 136)	; ⾇
+  '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 14)
     (total-strokes	 . 20)
-    (hanyu-dazidian	3 2037 12)
     (=ucs		. #x26A01)	; 𦨁
-    (=hanziku-5		. #xF96E)	; &I-HZK05-F96E;
-    ))
-(define-char
-  '((=>ucs		. #x26A01)	; 𦨁
-    (morohashi-daikanwa	30346 0 1)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 14)
-    (total-strokes	 . 20)
-    (=cns11643-7	. #x4F42)	; &C7-4F42; [47-34]
-    ))
-(define-char
-  '((=>ucs		. #x445F)	; 䑟
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 15)
-    (total-strokes	 . 21)
-    (=daikanwa		. 30347)	; &M-30347;
+    (->subsumptive
+     ((=daikanwa	  . 30346)	; &M-30346;
+      )
+     ((hanyu-dazidian	  3 2037 12)
+      (=hanziku-5	  . #xF96E)	; &HZK05-F96E;
+      (=ucs@iso		  . #x26A01)	; &HZK05-F96E;
+      )
+     ((=cns11643-7	  . #x4F42)	; &C7-4F42; [47-34]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	30347 0 2)
-    (ideographic-radical . 136)	; ⾇
+  '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 15)
     (total-strokes	 . 21)
     (=ucs		. #x445F)	; 䑟
-    (=cns11643-3	. #x5E54)	; &I-C3-5E54; [62-52]
+    (->subsumptive
+     ((=daikanwa	  . 30347)	; &M-30347;
+      (=ucs@unicode	  . #x445F)	; &M-30347;
+      )
+     ((=cns11643-3	  . #x5E54)	; &C3-5E54; [62-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 17)
     (total-strokes	 . 23)
     (=ucs		. #x26A03)	; 𦨃
+    (->subsumptive
+     ((=ucs@iso		  . #x26A03)	; &UU+26A03;
+      )
+     ((=cns11643-7	  . #x5C4B)	; &C7-5C4B; [60-43]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x26A03)	; 𦨃
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 17)
-    (total-strokes	 . 23)
-    (=cns11643-7	. #x5C4B)	; &C7-5C4B; [60-43]
-    ))
-(define-char
-  '((=>ucs		. #x26A04)	; 𦨄
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 18)
-    (total-strokes	 . 24)
-    (=daikanwa		. 30348)	; &M-30348;
-    ))
-(define-char
-  '((morohashi-daikanwa	30348 0 0)
-    (ideographic-radical . 136)	; ⾇
+  '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 18)
     (total-strokes	 . 24)
-    (hanyu-dazidian	1 809 8)
     (=ucs		. #x26A04)	; 𦨄
-    (=hanziku-2		. #xF87E)	; &I-HZK02-F87E;
-    ))
-(define-char
-  '((=>ucs		. #x26A04)	; 𦨄
-    (morohashi-daikanwa	30348 0 1)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 18)
-    (total-strokes	 . 24)
-    (=cns11643-7	. #x5F3F)	; &C7-5F3F; [63-31]
+    (->subsumptive
+     ((=daikanwa	  . 30348)	; &M-30348;
+      )
+     ((hanyu-dazidian	  1 809 8)
+      (=hanziku-2	  . #xF87E)	; &HZK02-F87E;
+      (=ucs@iso		  . #x26A04)	; &HZK02-F87E;
+      )
+     ((=cns11643-7	  . #x5F3F)	; &C7-5F3F; [63-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 19)
     (total-strokes	 . 25)
     (=ucs		. #x26A05)	; 𦨅
-    (=daikanwa		. 49573)	; &I-M-49573;
-    ))
-(define-char
-  '((=>ucs		. #x26A05)	; 𦨅
-    (morohashi-daikanwa	49573 0 0)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 19)
-    (total-strokes	 . 25)
-    (=cns11643-7	. #x6139)	; &C7-6139; [65-25]
-    ))
-(define-char
-  '((=>ucs		. #x26A06)	; 𦨆
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 21)
-    (total-strokes	 . 27)
-    (=daikanwa		. 30349)	; &M-30349;
+    (->subsumptive
+     ((=daikanwa	  . 49573)	; &M-49573;
+      (=ucs@iso		  . #x26A05)	; &M-49573;
+      )
+     ((=cns11643-7	  . #x6139)	; &C7-6139; [65-25]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	30349 0 0)
-    (ideographic-radical . 136)	; ⾇
+  '((ideographic-radical . 136)	; ⾇
     (ideographic-strokes . 21)
     (total-strokes	 . 27)
-    (hanyu-dazidian	5 3165 4)
     (=ucs		. #x26A06)	; 𦨆
-    (=hanziku-8		. #xE5D5)	; &I-HZK08-E5D5;
-    ))
-(define-char
-  '((=>ucs		. #x26A06)	; 𦨆
-    (morohashi-daikanwa	30349 0 1)
-    (ideographic-radical . 136)	; ⾇
-    (ideographic-strokes . 21)
-    (total-strokes	 . 27)
-    (=cns11643-5	. #x7A70)	; &C5-7A70; [90-80]
+    (->subsumptive
+     ((=daikanwa	  . 30349)	; &M-30349;
+      )
+     ((hanyu-dazidian	  5 3165 4)
+      (=hanziku-8	  . #xE5D5)	; &HZK08-E5D5;
+      (=ucs@iso		  . #x26A06)	; &HZK08-E5D5;
+      )
+     ((=cns11643-5	  . #x7A70)	; &C5-7A70; [90-80]
+      ))
     ))