X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fruimoku6.el;h=6e5f50eb8bd66cc3300873986dfe09f9ebeb42e9;hb=830fe91027eb3673ffd76c1d18fda99b6feb1e3c;hp=128cc85e1d75df49b12805f9d05e3423e5d21a9a;hpb=09bdcf93eec3bbff72aaaef3738d9940c6fd3c8d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 128cc85..6e5f50e 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -90,8 +90,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
       )
-     ((=ucs@jis		  . #x5B80)	; &AJ1-04622;
-      (=adobe-japan1-0	  . 04622)	; &AJ1-04622;
+     ((==ucs@jis	  . #x5B80)	; &R-AJ1-04622;
+      (==adobe-japan1-0	  . 04622)	; &R-AJ1-04622;
       )
      ((=ucs		  . #x9FB6)	; 龶
       )
@@ -284,16 +284,16 @@
     (=ruimoku-v6	. #xE017)	; &RUI6-E017;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE018)	; &G-RUI6-E018;
-      ))
+  '((ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=hanziku-3	  . #xC1EC)	; &HZK03-C1EC;
+     ((=ucs		  . #x38C8)	; 㣈
       )
-     ((=cns11643-1	  . #x4556)	; &C1-4556; [37-54]
+     ((=ucs		  . #x706B)	; 火
       ))
     (sources		ruimoku=A2003-10320-00001 ruimoku=A2003-10320-00002
 			ruimoku=A2003-10320-00004 ruimoku=A2003-10620-00005
@@ -304,6 +304,18 @@
       )
      ((=ucs		  . #x71F9)	; 燹
       ))
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=hanziku-3	    . #xC1EC)	; &HZK03-C1EC;
+	)
+       ((==ucs@cns	    . #x706B)	; &R-CU+706B;
+	(==cns11643-1	    . #x4556)	; &R-CU+706B; [37-54]
+	))
+      (==ruimoku-v6	  . #xE018)	; &R-RUI6-E018;
+      ))
     ))
 (define-char
   '((ideographic-radical . 129)	; ⾀
@@ -330,7 +342,7 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=gt		  . 40028)	; &GT-40028;
+     ((=hanyo-denshi/ib	  . #x3B76)	; &HD-IB-3B76; [27-86]
       (=daikanwa	  . 30808)	; &I-M-30808;
       ))
     (sources		ruimoku=A021761-00005)
@@ -405,26 +417,33 @@
     (=ruimoku-v6	. #xE01E)	; &RUI6-E01E;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE01F)	; &G-RUI6-E01F;
-      ))
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x8A00)	; &GT-47348;
-      (=jis-x0208	  . #x3840)	; &GT-47348; [24-32]
-      (=ks-x1001	  . #x656B)	; &I-K0-656B; [69-75]
-      (=jis-x0213-1	  . #x3840)	; &I-JX1-3840; [24-32]
-      (=daikanwa	  . 35205)	; &I-M-35205;
+     ((=ucs		  . #x8A00)	; 言
       )
-     ((=ucs@unicode	  . #x83D0)	; &JX2-763C;
-      (=jis-x0212	  . #x583A)	; &JX2-763C; [56-26]
-      (=jis-x0213-2	  . #x763C)	; &I-JX2-763C; [86-28]
-      (=daikanwa	  . 31164)	; &I-M-31164;
+     ((=ucs		  . #x83D0)	; 菐
       ))
     (sources		ruimoku=A2003-10165-00011 ruimoku=A2003-00594-00003)
     (=ruimoku-v6	. #xE01F)	; &RUI6-E01F;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@jis	    . #x8A00)	; &R-GT-47348;
+	(==ucs@ks	    . #x8A00)	; &R-GT-47348;
+	(==jis-x0208	    . #x3840)	; &R-GT-47348; [24-32]
+	)
+       ((==ucs@unicode	    . #x83D0)	; &R-JSP-583A;
+	(==jis-x0213-2	    . #x763C)	; &R-JSP-583A; [86-28]
+	))
+      (==ruimoku-v6	  . #xE01F)	; &R-RUI6-E01F;
+      ))
     ))
 (define-char
   '((sources		ruimoku=A2003-00092-00005)
@@ -572,9 +591,13 @@
      ((name		  . "CJK RADICAL PAW ONE")
       (=ucs		  . #x2EA4)	; ⺤
       )
-     ((=ucs@unicode	  . #x8863)	; &C1-4868;
-      (=gb2312		  . #x5242)	; &C1-4868; [50-34]
+     ((=ucs@unicode	  . #x8863)	; &GT-45972;
+      (=jis-x0208	  . #x3061)	; &GT-45972; [16-65]
+      (=gb2312		  . #x5242)	; &I-G0-5242; [50-34]
+      (=ks-x1001	  . #x6B7D)	; &I-K0-6B7D; [75-93]
       (=cns11643-1	  . #x4868)	; &I-C1-4868; [40-72]
+      (=jis-x0213-1	  . #x3061)	; &I-JX1-3061; [16-65]
+      (=daikanwa	  . 34091)	; &I-M-34091;
       ))
     (=ruimoku-v6	. #xE030)	; &RUI6-E030;
     ))
@@ -644,23 +667,20 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@jis		  . #x6587)	; &GT-17008;
-      (=jis-x0208	  . #x4A38)	; &GT-17008; [42-24]
-      (=jis-x0213-1	  . #x4A38)	; &I-JX1-4A38; [42-24]
+     ((=ucs@unicode	  . #x6587)	; &AJ1-03592;
+      (=adobe-japan1-0	  . 03592)	; &AJ1-03592;
       ))
     (=ruimoku-v6	. #xE035)	; &RUI6-E035;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE036)	; &G-RUI6-E036;
-      ))
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 6)
+    (total-strokes	 . 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x8A00)	; &C1-4B46;
-      (=gb2312		  . #x5154)	; &C1-4B46; [49-52]
-      (=cns11643-1	  . #x4B46)	; &I-C1-4B46; [43-38]
+     ((=ucs		  . #x8A00)	; 言
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -668,27 +688,34 @@
 	)
        ((=ucs		    . #x5348)	; 午
 	)
-       ((=ucs@unicode	    . #x53C8)	; &AJ1-03746;
-	(=adobe-japan1-0    . 03746)	; &AJ1-03746;
+       ((=ucs		    . #x53C8)	; 又
 	))
       ))
     (=ruimoku-v6	. #xE036)	; &RUI6-E036;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@unicode	    . #x8A00)	; &R-UU+8A00;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x5348)	; 午
+	  )
+	 ((==ucs@unicode      . #x53C8)	; &R-AJ1-03746;
+	  (==adobe-japan1-0   . 03746)	; &R-AJ1-03746;
+	  ))
+	))
+      (==ruimoku-v6	  . #xE036)	; &R-RUI6-E036;
+      ))
     ))
 (define-char
   '((<-subsumptive
      ((=>>ruimoku-v6	  . #xE037)	; &G-RUI6-E037;
       ))
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=daikanwa	  . 00311)	; &M-00311;
-      )
-     ((=ucs@jis		  . #x96B9)	; &GT-56353;
-      (=jis-x0208	  . #x7032)	; &GT-56353; [80-18]
-      (=jis-x0213-1	  . #x7032)	; &I-JX1-7032; [80-18]
-      (=daikanwa	  . 41937)	; &I-M-41937;
-      ))
     (=ruimoku-v6	. #xE037)	; &RUI6-E037;
     ))
 (define-char
@@ -742,39 +769,39 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@unicode	  . #x5B80)	; &C3-213B;
-      (=gb2312		  . #x6532)	; &C3-213B; [69-18]
-      (=cns11643-3	  . #x213B)	; &I-C3-213B; [01-27]
+     ((==ucs@unicode	  . #x5B80)	; &C3-213B;
+      (=cns11643-3	  . #x213B)	; &C3-213B; [01-27]
       )
      ((=ruimoku-v6	  . #xE03C)	; &RUI6-E03C;
       ))
     (=ruimoku-v6	. #xE03B)	; &RUI6-E03B;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE03C)	; &G-RUI6-E03C;
-      ))
+  '((ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs@jis	    . #x7ACB)	; &GT-33181;
-	(=jis-x0208	    . #x4E29)	; &GT-33181; [46-09]
-	(=ks-x1001	    . #x5821)	; &I-K0-5821; [56-01]
-	(=jis-x0213-1	    . #x4E29)	; &I-JX1-4E29; [46-09]
-	(=daikanwa	    . 25721)	; &I-M-25721;
-	)
-       ((=big5-cdp	    . #x8958)	; &CDP-8958;
-	))
+     ((=ucs		  . #x2668F)	; 𦚏
       )
      ((name		  . "CJK RADICAL KNIFE TWO")
       (=ucs		  . #x2E89)	; ⺉
       ))
     (=ruimoku-v6	. #xE03C)	; &RUI6-E03C;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ucs@iso	    . #x2668F)	; &R-U-0002668F;
+	)
+       ((name		    . "CJK RADICAL KNIFE TWO")
+	(=ucs		    . #x2E89)	; ⺉
+	))
+      (==ruimoku-v6	  . #xE03C)	; &R-RUI6-E03C;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -831,9 +858,8 @@
 	)
        ((=ucs		    . #x201A2)	; 𠆢
 	)
-       ((=ucs@unicode	    . #x65B9)	; &C1-4549;
-	(=gb2312	    . #x373D)	; &C1-4549; [23-29]
-	(=cns11643-1	    . #x4549)	; &I-C1-4549; [37-41]
+       ((=ucs@unicode	    . #x65B9)	; &AJ1-03661;
+	(=adobe-japan1-0    . 03661)	; &AJ1-03661;
 	))
       ))
     (=ruimoku-v6	. #xE03E)	; &RUI6-E03E;
@@ -922,6 +948,7 @@
 	  (=daikanwa	      . 32674)	; &I-M-32674;
 	  )
 	 ((=ucs@jis	      . #x5E78)	; &AJ1-01982;
+	  (=ucs@ks	      . #x5E78)	; &AJ1-01982;
 	  (=adobe-japan1-0    . 01982)	; &AJ1-01982;
 	  ))
 	))
@@ -1019,8 +1046,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@jis		  . #x5B87)	; &AJ1-01225;
-      (=ucs@ks		  . #x5B87)	; &AJ1-01225;
+     ((=ucs@unicode	  . #x5B87)	; &AJ1-01225;
       (=adobe-japan1-0	  . 01225)	; &AJ1-01225;
       )
      ((=ucs		  . #x76BF)	; 皿
@@ -1062,10 +1088,7 @@
       )
      ((=gt-k		  . 05309)	; &GT-K05309;
       )
-     ((=ucs@jis		  . #x96B9)	; &GT-56353;
-      (=jis-x0208	  . #x7032)	; &GT-56353; [80-18]
-      (=jis-x0213-1	  . #x7032)	; &I-JX1-7032; [80-18]
-      (=daikanwa	  . 41937)	; &I-M-41937;
+     ((=ucs		  . #x96B9)	; 隹
       ))
     (=ruimoku-v6	. #xE054)	; &RUI6-E054;
     ))
@@ -1186,9 +1209,8 @@
       )
      ((=ucs		  . #x5405)	; 吅
       )
-     ((=ucs@jis		  . #x6587)	; &GT-17008;
-      (=jis-x0208	  . #x4A38)	; &GT-17008; [42-24]
-      (=jis-x0213-1	  . #x4A38)	; &I-JX1-4A38; [42-24]
+     ((=ucs@unicode	  . #x6587)	; &AJ1-03592;
+      (=adobe-japan1-0	  . 03592)	; &AJ1-03592;
       )
      ((=ucs		  . #x5FC3)	; 心
       ))
@@ -1198,12 +1220,14 @@
   '((=ruimoku-v6	. #xE060)	; &RUI6-E060;
     ))
 (define-char
-  '((ideographic-structure
+  '((ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x5973)	; &AJ1-02433;
-      (=adobe-japan1-0	  . 02433)	; &AJ1-02433;
+     ((=adobe-japan1-4	  . 13828)	; &AJ1-13828;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1254,23 +1278,32 @@
     (=ruimoku-v6	. #xE064)	; &I-RUI6-E064;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE065)	; &G-RUI6-E065;
-      ))
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 21)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@iso		  . #x275F8)	; &M-34065;
-      (=daikanwa	  . 34065)	; &M-34065;
+     ((=ucs		  . #x275F8)	; 𧗸
       )
-     ((=ucs@jis		  . #x8A00)	; &GT-47348;
-      (=jis-x0208	  . #x3840)	; &GT-47348; [24-32]
-      (=ks-x1001	  . #x656B)	; &I-K0-656B; [69-75]
-      (=jis-x0213-1	  . #x3840)	; &I-JX1-3840; [24-32]
-      (=daikanwa	  . 35205)	; &I-M-35205;
+     ((=ucs		  . #x8A00)	; 言
       ))
     (=ruimoku-v6	. #xE065)	; &RUI6-E065;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((==ucs@iso	    . #x275F8)	; &R-M-34065;
+	(==daikanwa	    . 34065)	; &R-M-34065;
+	)
+       ((==ucs@jis	    . #x8A00)	; &R-GT-47348;
+	(==ucs@ks	    . #x8A00)	; &R-GT-47348;
+	(==jis-x0208	    . #x3840)	; &R-GT-47348; [24-32]
+	))
+      (==ruimoku-v6	  . #xE065)	; &R-RUI6-E065;
+      ))
     ))
 (define-char
   '((ideographic-radical . 147)	; ⾒
@@ -1386,12 +1419,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (=ucs		  . #x2FFA)	; ⿺
       )
-     ((=ucs@unicode	  . #x6BDB)	; &GT-21495;
-      (=jis-x0208	  . #x4C53)	; &GT-21495; [44-51]
-      (=gb2312		  . #x432B)	; &I-G0-432B; [35-11]
-      (=ks-x1001	  . #x593E)	; &I-K0-593E; [57-30]
-      (=jis-x0213-1	  . #x4C53)	; &I-JX1-4C53; [44-51]
-      (=daikanwa	  . 16772)	; &I-M-16772;
+     ((=ucs		  . #x6BDB)	; 毛
       )
      ((=ucs@unicode	  . #x67BC)	; &JSP-4336;
       (=jis-x0212	  . #x4336)	; &JSP-4336; [35-22]