X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fruimoku6.el;h=24490476d438c140e3b6b47774079b77e55650b5;hb=a4d1d77332fc5868bfff7ff1874c38a9fda90001;hp=2df2989e7cc4a1db97d2ba451b4ea9cd51a99952;hpb=755176d1c85c4ec06192d33116e65a504835c3f2;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 2df2989..2449047 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -239,19 +239,31 @@
     (=ruimoku-v6	. #xE012)	; &RUI6-E012;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE013)	; &G-RUI6-E013;
-      ))
+  '((ideographic-radical . 142)	; ⾍
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cns11643-1	  . #x454B)	; &C1-454B; [37-43]
+     ((=ucs		  . #x65E5)	; 日
       )
      ((=ucs		  . #x866B)	; 虫
       ))
     (sources		ruimoku=A021610-00006)
     (=ruimoku-v6	. #xE013)	; &RUI6-E013;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((==ucs@cns	    . #x66F0)	; &g2-CU+66F0;
+	(==cns11643-1	    . #x454B)	; &g2-CU+66F0; [37-43]
+	)
+       ((=ucs		    . #x866B)	; 虫
+	))
+      (==ruimoku-v6	  . #xE013)	; &g2-RUI6-E013;
+      ))
     ))
 (define-char
   '((<-subsumptive
@@ -877,7 +889,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>>ruimoku-v6	  . #xE038)	; &G-RUI6-E038;
+     ((=ucs		  . #x2A75D)	; 𪝝
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
@@ -889,12 +901,30 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@unicode	  . #x6715)	; &GT-18207;
-      (=jis-x0208	  . #x443F)	; &GT-18207; [36-31]
-      (=gb2312		  . #x6B5E)	; &I-G0-6B5E; [75-62]
-      (=jis-x0213-1	  . #x443F)	; &I-JX1-443F; [36-31]
+     ((=ucs@unicode	  . #x6715)	; &AJ1-03035;
+      (=adobe-japan1-0	  . 03035)	; &AJ1-03035;
       ))
+    (=ucs@iso		. #x2A75D)	; &RUI6-E038;
     (=ruimoku-v6	. #xE038)	; &RUI6-E038;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((==ucs@unicode	    . #x6715)	; &g2-AJ1-03035;
+	(==adobe-japan1-0   . 03035)	; &g2-AJ1-03035;
+	))
+      (==ucs@iso	  . #x2A75D)	; &g2-IU-0002A75D;
+      (==ruimoku-v6	  . #xE038)	; &g2-IU-0002A75D;
+      (->subsumptive
+       ((===ruimoku-v6	    . #xE038)	; &R-RUI6-E038;
+	)
+       ((===ucs@iso	    . #x2A75D)	; &R-U-0002A75D;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1053,8 +1083,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x5ECC)	; &C2-4264;
-	(=cns11643-2	    . #x4264)	; &C2-4264; [34-68]
+       ((==ucs@unicode	    . #x5ECC)	; &g2-AJ1-21504;
+	(==adobe-japan1-6   . 21504)	; &g2-AJ1-21504;
 	)
        ((name		    . "CJK RADICAL CITY")
 	(=ucs		    . #x2ECF)	; ⻏
@@ -1066,20 +1096,37 @@
   '((=ruimoku-v6	. #xE040)	; &RUI6-E040;
     ))
 (define-char
-  '((<-subsumptive
-     ((=ucs		  . #x2A894)	; 𪢔
-      ))
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x5ECC)	; &C2-4264;
-      (=cns11643-2	  . #x4264)	; &C2-4264; [34-68]
+     ((=ucs		  . #x5ECC)	; 廌
+      ))
+    (=ucs		. #x2A894)	; 𪢔
+    (=ruimoku-v6	. #xE041)	; &I-RUI6-E041;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((==ucs@unicode	    . #x5ECC)	; &g2-AJ1-21504;
+	(==adobe-japan1-6   . 21504)	; &g2-AJ1-21504;
+	))
+      (==ucs@iso	  . #x2A894)	; &g2-IU-0002A894;
+      (==ruimoku-v6	  . #xE041)	; &g2-IU-0002A894;
+      (->subsumptive
+       ((===ruimoku-v6	    . #xE041)	; &R-RUI6-E041;
+	)
+       ((===ucs@iso	    . #x2A894)	; &R-U-0002A894;
+	))
       ))
-    (=ucs@gb		. #x2A894)	; &RUI6-E041;
-    (=ruimoku-v6	. #xE041)	; &RUI6-E041;
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1105,9 +1152,9 @@
   '((=ruimoku-v6	. #xE045)	; &RUI6-E045;
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE046)	; &G-RUI6-E046;
-      ))
+  '((ideographic-radical . 108)	; ⽫
+    (ideographic-strokes . 16)
+    (total-strokes	 . 21)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1123,21 +1170,47 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
 	  (=ucs		      . #x2FF8)	; ⿸
 	  )
-	 ((=ucs@unicode	      . #x864D)	; &GT-44176;
-	  (=jis-x0208	      . #x6948)	; &GT-44176; [73-40]
-	  (=gb2312	      . #x722E)	; &I-G0-722E; [82-14]
-	  (=jis-x0213-1	      . #x6948)	; &I-JX1-6948; [73-40]
-	  (=daikanwa	      . 32674)	; &I-M-32674;
+	 ((=ucs		      . #x864D)	; 虍
 	  )
-	 ((=ucs@jis	      . #x5E78)	; &AJ1-01982;
-	  (=ucs@ks	      . #x5E78)	; &AJ1-01982;
-	  (=adobe-japan1-0    . 01982)	; &AJ1-01982;
+	 ((=ucs		      . #x5E78)	; 幸
 	  ))
 	))
       )
      ((=ucs		  . #x76BF)	; 皿
       ))
     (=ruimoku-v6	. #xE046)	; &RUI6-E046;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((name		      . "CJK RADICAL PERSON")
+	  (=ucs		      . #x2E85)	; ⺅
+	  )
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+	    (=ucs		. #x2FF8)	; ⿸
+	    )
+	   ((=ucs@unicode	. #x864D)	; &GT-44176;
+	    (=jis-x0208		. #x6948)	; &GT-44176; [73-40]
+	    (=gb2312		. #x722E)	; &I-G0-722E; [82-14]
+	    (=jis-x0213-1	. #x6948)	; &I-JX1-6948; [73-40]
+	    (=daikanwa		. 32674)	; &I-M-32674;
+	    )
+	   ((==ucs@jis		. #x5E78)	; &g2-AJ1-01982;
+	    (==ucs@ks		. #x5E78)	; &g2-AJ1-01982;
+	    (==adobe-japan1-0	. 01982)	; &g2-AJ1-01982;
+	    ))
+	  ))
+	)
+       ((=ucs		    . #x76BF)	; 皿
+	))
+      (==ruimoku-v6	  . #xE046)	; &g2-RUI6-E046;
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
@@ -1176,11 +1249,9 @@
 	  )
 	 ((=ucs		      . #x9B5A)	; 魚
 	  )
-	 ((=ucs@jis	      . #x821F)	; &GT-39269;
-	  (=jis-x0208	      . #x3D2E)	; &GT-39269; [29-14]
-	  (=ks-x1001	      . #x7147)	; &I-K0-7147; [81-39]
-	  (=jis-x0213-1	      . #x3D2E)	; &I-JX1-3D2E; [29-14]
-	  (=daikanwa	      . 30350)	; &I-M-30350;
+	 ((==ucs@jis	      . #x821F)	; &g2-GT-39269;
+	  (==ucs@ks	      . #x821F)	; &g2-GT-39269;
+	  (==jis-x0208	      . #x3D2E)	; &g2-GT-39269; [29-14]
 	  ))
 	)
        ((==ucs@unicode	    . #x53C8)	; &g2-AJ1-03746;
@@ -1290,15 +1361,19 @@
     (=ruimoku-v6	. #xE050)	; &RUI6-E050;
     ))
 (define-char
-  '((ideographic-structure
+  '((total-strokes	 . 6)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
      ((=ucs		  . #x51E0)	; 几
       )
-     ((=cns11643-1	  . #x454B)	; &C1-454B; [37-43]
+     ((=ucs		  . #x65E5)	; 日
       ))
     (=ruimoku-v6	. #xE051)	; &RUI6-E051;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE051)	; &g2-RUI6-E051;
+      ))
     ))
 (define-char
   '((=ruimoku-v6	. #xE052)	; &RUI6-E052;
@@ -1708,23 +1783,37 @@
   '((=ruimoku-v6	. #xE071)	; &RUI6-E071;
     ))
 (define-char
-  '((ideographic-radical . 124)	; â½»
+  '((<-denotational
+     ((=ucs		  . #x2C686)	; 𬚆
+      ))
+    (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=gt-k		  . 01762)	; &GT-K01762;
+     ((=ucs		  . #xFA1E)	; 羽
       )
-     ((=ucs@unicode	  . #x80FD)	; &GT-38124;
-      (=jis-x0208	  . #x473D)	; &GT-38124; [39-29]
-      (=gb2312		  . #x445C)	; &I-G0-445C; [36-60]
-      (=ks-x1001	  . #x5276)	; &I-K0-5276; [50-86]
-      (=jis-x0213-1	  . #x473D)	; &I-JX1-473D; [39-29]
-      (=daikanwa	  . 29454)	; &I-M-29454;
+     ((=ucs		  . #x80FD)	; 能
       ))
     (=ruimoku-v6	. #xE072)	; &RUI6-E072;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=gt-k		    . 01762)	; &GT-K01762;
+	)
+       ((=ucs@unicode	    . #x80FD)	; &GT-38124;
+	(=jis-x0208	    . #x473D)	; &GT-38124; [39-29]
+	(=gb2312	    . #x445C)	; &I-G0-445C; [36-60]
+	(=ks-x1001	    . #x5276)	; &I-K0-5276; [50-86]
+	(=jis-x0213-1	    . #x473D)	; &I-JX1-473D; [39-29]
+	(=daikanwa	    . 29454)	; &I-M-29454;
+	))
+      (==ruimoku-v6	  . #xE072)	; &g2-RUI6-E072;
+      ))
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
@@ -1853,11 +1942,6 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x698A)	; 榊
-      )
-     ((=ucs		  . #xE0103)	; 󠄃
-      ))
     (=ucs@jis/2004	. #x698A)	; &AJ1-07686;
     (=adobe-japan1-0	. 07686)	; &AJ1-07686;
     (=jis-x0208@1978	. #x3A67)	; &I-J78-3A67; [26-71]
@@ -1865,6 +1949,31 @@
     (=hanyo-denshi/ft	. #x3228)	; &I-HD-FT-3228; [18-08]
     (=daikanwa		. 15352)	; &I-M-15352;
     (=ruimoku-v6	. #xE086)	; &I-RUI6-E086;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x698A)	; 榊
+	)
+       ((=ucs		    . #xE0103)	; 󠄃
+	))
+      (==ucs@jis/2004	  . #x698A)	; &g2-AJ1-07686;
+      (==adobe-japan1-0	  . 07686)	; &g2-AJ1-07686;
+      (==jis-x0208@1978	  . #x3A67)	; &g2-AJ1-07686; [26-71]
+      (==jis-x0213-1@2004 . #x3A67)	; &g2-AJ1-07686; [26-71]
+      (==hanyo-denshi/ft  . #x3228)	; &g2-AJ1-07686; [18-08]
+      (==daikanwa	  . 15352)	; &g2-AJ1-07686;
+      (==ruimoku-v6	  . #xE086)	; &g2-AJ1-07686;
+      (->subsumptive
+       ((===daikanwa	    . 15352)	; &R-M-15352;
+	)
+       ((===jis-x0208@1978  . #x3A67)	; &R-HD-FT-3228; [26-71]
+	(===jis-x0213-1@2004 . #x3A67)	; &R-HD-FT-3228; [26-71]
+	(===hanyo-denshi/ft . #x3228)	; &R-HD-FT-3228; [18-08]
+	)
+       ((===adobe-japan1-0  . 07686)	; &R-AJ1-07686;
+	)
+       ((===ruimoku-v6	    . #xE086)	; &R-RUI6-E086;
+	))
+      ))
     ))
 (define-char
   '((=ruimoku-v6	. #xE087)	; &RUI6-E087;