X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fruimoku6.el;h=54313bdaf76b28d5f2cee148833639777196378a;hb=59483252003895f7e52f747b322c84073c676922;hp=9b0a8640f134285badd090d05b54625d7dcb71ee;hpb=576e20b9b99c95f0f088a17dc0a9ceae2c507e92;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 9b0a864..54313bd 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -34,13 +34,24 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
       (=ucs		  . #x2FF9)	; ⿹
       )
-     ((=gt		  . 14544)	; &GT-14544;
-      (=daikanwa	  . 11530)	; &I-M-11530;
+     ((=ucs		  . #x6208)	; 戈
       )
      ((=ucs		  . #x51AC)	; 冬
       ))
     (sources		ruimoku=A016481-00008)
     (=ruimoku-v6	. #xE005)	; &RUI6-E005;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((==daikanwa	    . 11530)	; &g2-GT-14544;
+	)
+       ((=ucs@unicode	    . #x51AC)	; &MJ007359;
+	(=mj		    . 007359)	; &MJ007359;
+	))
+      (==ruimoku-v6	  . #xE005)	; &g2-RUI6-E005;
+      ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
@@ -69,7 +80,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 46)	; â¼­
+  '((<-denotational
+     ((=>ruimoku-v6	  . #xE008)	; &A-RUI6-E008;
+      ))
+    (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (ideographic-structure
@@ -78,14 +92,20 @@
       )
      ((=ucs		  . #x5C71)	; å±±
       )
-     ((=ucs@unicode	  . #x96A0)	; &AJ1-01221;
-      (=adobe-japan1-0	  . 01221)	; &AJ1-01221;
+     ((=ucs@unicode	  . #x96A0)	; &MJ027675;
+      (=mj		  . 027675)	; &MJ027675;
       ))
     (sources		ruimoku=A015330-00006)
     (=ruimoku-v6	. #xE008)	; &RUI6-E008;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE008)	; &g2-RUI6-E008;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 40)	; ⼧
+  '((<-denotational
+     ((=ucs		  . #x21A5C)	; 𡩜
+      ))
+    (ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (ideographic-structure
@@ -96,15 +116,13 @@
       )
      ((=ucs		  . #x9FB6)	; 龶
       )
-     ((=big5-cdp	  . #x8B48)	; &GT-36329;
+     ((name		  . "CJK RADICAL EYE")
+      (=ucs		  . #x2EAB)	; ⺫
       ))
     (sources		ruimoku=A015412-00003)
-    (=ucs		. #x21A5C)	; 𡩜
-    (=hanziku-12	. #xECD1)	; &I-HZK12-ECD1;
-    (=ruimoku-v6	. #xE009)	; &I-RUI6-E009;
+    (=ucs@iso		. #x21A5C)	; &RUI6-E009;
+    (=ruimoku-v6	. #xE009)	; &RUI6-E009;
     (->subsumptive
-     ((==ruimoku-v6	  . #xE009)	; &g2-RUI6-E009;
-      )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(=ucs		    . #x2FF3)	; ⿳
@@ -112,11 +130,19 @@
        ((==ucs@unicode	    . #x5B80)	; &g2-AJ1-04622;
 	(==adobe-japan1-0   . 04622)	; &g2-AJ1-04622;
 	)
-       ((=ucs		    . #x9FB6)	; 龶
+       ((==gt-k		    . 00586)	; &g2-GT-K00586;
 	)
-       ((=big5-cdp	    . #x8B48)	; &GT-36329;
+       ((==big5-cdp	    . #x8B48)	; &g2-CDP-8B48;
 	))
       (==ucs@iso	  . #x21A5C)	; &g2-IU-00021A5C;
+      (==ruimoku-v6	  . #xE009)	; &g2-IU-00021A5C;
+      (->subsumptive
+       ((===ruimoku-v6	    . #xE009)	; &R-RUI6-E009;
+	)
+       ((===ucs@iso	    . #x21A5C)	; &R-U-00021A5C;
+	)
+       ((=hanziku-12	    . #xECD1)	; &HZK12-ECD1;
+	))
       ))
     ))
 (define-char
@@ -266,9 +292,9 @@
       ))
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE014)	; &G-RUI6-E014;
-      ))
+  '((ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 10)
+    (total-strokes	 . 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -279,6 +305,17 @@
       ))
     (sources		ruimoku=A021610-00006)
     (=ruimoku-v6	. #xE014)	; &RUI6-E014;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((==ruimoku-v6	    . #xE013)	; &g2-RUI6-E013;
+	)
+       ((==ucs@unicode	    . #x9801)	; &g2-UU+9801;
+	))
+      (==ruimoku-v6	  . #xE014)	; &g2-RUI6-E014;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -323,14 +360,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
-	(=ucs		    . #x2FF6)	; ⿶
-	)
-       ((=big5-cdp	    . #x8B64)	; &CDP-8B64;
-	)
-       ((=ucs		    . #x540C)	; 同
-	))
+     ((=ucs-itaiji-009	  . #x8208)	; &U-i009+8208;
       )
      ((=ucs		  . #x6614)	; 昔
       ))
@@ -400,9 +430,8 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@cns		  . #x82F1)	; &HD-IB-3B76;
-      (=cns11643-1	  . #x5341)	; &HD-IB-3B76; [51-33]
-      (=daikanwa	  . 30808)	; &I-M-30808;
+     ((=ucs@cns		  . #x82F1)	; &MJ021701;
+      (=mj		  . 021701)	; &MJ021701;
       ))
     (sources		ruimoku=A021761-00005)
     (=ucs@iso		. #x20E04)	; &RUI6-E01A;
@@ -412,9 +441,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((==ucs@unicode	    . #x53E3)	; &g2-AJ1-01969;
+	(==adobe-japan1-0   . 01969)	; &g2-AJ1-01969;
 	)
-       ((==hanyo-denshi/ib  . #x3B76)	; &g2-HD-IB-3B76; [27-86]
+       ((==mj		    . 021701)	; &g2-MJ021701;
 	))
       (==ruimoku-v6	  . #xE01A)	; &g2-RUI6-E01A;
       )
@@ -422,7 +452,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((==ucs@unicode	    . #x53E3)	; &g2-AJ1-01969;
+	(==adobe-japan1-0   . 01969)	; &g2-AJ1-01969;
 	)
        ((==ucs@cns	    . #x82F1)	; &g2-CU+82F1;
 	(==cns11643-1	    . #x5341)	; &g2-CU+82F1; [51-33]
@@ -438,35 +469,52 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((name		  . "CJK RADICAL PERSON")
-      (=ucs		  . #x2E85)	; ⺅
+     ((=ucs		  . #x4EBB)	; 亻
       )
      ((=ucs		  . #x26A36)	; 𦨶
       ))
     (sources		ruimoku=A021894-00009)
     (=ruimoku-v6	. #xE01B)	; &RUI6-E01B;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((name		    . "CJK RADICAL PERSON")
-	(=ucs		    . #x2E85)	; ⺅
-	)
-       ((=daikanwa	    . 30426)	; &M-30426;
-	))
-      (==ruimoku-v6	  . #xE01B)	; &g2-RUI6-E01B;
+     ((==ruimoku-v6	  . #xE01B)	; &g2-RUI6-E01B;
       ))
     ))
 (define-char
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5927)	; 大
+      )
+     ((=ucs		  . #x22189)	; 𢆉
+      ))
     (sources		ruimoku=A2003-10837-00013)
     (=ucs		. #x3694)	; 㚔
     (=cns11643-4	. #x2571)	; &I-C4-2571; [05-81]
+    (=big5-cdp		. #x8ABA)	; &I-CDP-8ABA;
     (=daikanwa		. 05884)	; &I-M-05884;
     (=ruimoku-v6	. #xE01C)	; &I-RUI6-E01C;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3694)	; &g2-CDP-8ABA;
+      (==cns11643-4	  . #x2571)	; &g2-CDP-8ABA; [05-81]
+      (==big5-cdp	  . #x8ABA)	; &g2-CDP-8ABA;
+      (==daikanwa	  . 05884)	; &g2-CDP-8ABA;
+      (==ruimoku-v6	  . #xE01C)	; &g2-CDP-8ABA;
+      (->subsumptive
+       ((===daikanwa	    . 05884)	; &R-M-05884;
+	)
+       ((===big5-cdp	    . #x8ABA)	; &R-CDP-8ABA;
+	)
+       ((===cns11643-4	    . #x2571)	; &R-C4-2571; [05-81]
+	)
+       ((===ucs@unicode	    . #x3694)	; &R-UU+3694;
+	)
+       ((===ruimoku-v6	    . #xE01C)	; &R-RUI6-E01C;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -488,8 +536,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
 	(=ucs		    . #x2FF5)	; ⿵
 	)
-       ((==ucs@unicode	    . #x9580)	; &g2-GT-55423;
-	(==jis-x0208	    . #x4C67)	; &g2-GT-55423; [44-71]
+       ((==ucs@unicode	    . #x9580)	; &g2-AJ1-03827;
+	(==adobe-japan1-0   . 03827)	; &g2-AJ1-03827;
 	)
        ((=ucs		    . #x4E32)	; 串
 	))
@@ -632,7 +680,13 @@
       )
      ((=ucs		  . #x5FC3)	; 心
       ))
-    (=ruimoku-v6	. #xE028)	; &RUI6-E028;
+    (=ucs		. #x2BE75)	; 𫹵
+    (=ruimoku-v6	. #xE028)	; &I-RUI6-E028;
+    (->subsumptive
+     ((==ucs@iso	  . #x2BE75)	; &g2-IU-0002BE75;
+      )
+     ((==ruimoku-v6	  . #xE028)	; &g2-RUI6-E028;
+      ))
     ))
 (define-char
   '((=ruimoku-v6	. #xE029)	; &RUI6-E029;
@@ -647,10 +701,12 @@
       )
      ((=ucs		  . #x65E2)	; 既
       )
-     ((name		  . "CJK RADICAL KNIFE TWO")
-      (=ucs		  . #x2E89)	; ⺉
+     ((=ucs		  . #x5202)	; 刂
       ))
     (=ruimoku-v6	. #xE02A)	; &RUI6-E02A;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE02A)	; &g2-RUI6-E02A;
+      ))
     ))
 (define-char
   '((=ruimoku-v6	. #xE02B)	; &RUI6-E02B;
@@ -712,9 +768,9 @@
       ))
     ))
 (define-char
-  '((<-subsumptive
-     ((=>>ruimoku-v6	  . #xE030)	; &G-RUI6-E030;
-      ))
+  '((ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -722,15 +778,22 @@
      ((name		  . "CJK RADICAL PAW ONE")
       (=ucs		  . #x2EA4)	; ⺤
       )
-     ((=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;
+     ((=ucs		  . #x8863)	; è¡£
       ))
     (=ruimoku-v6	. #xE030)	; &RUI6-E030;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((name		    . "CJK RADICAL PAW ONE")
+	(=ucs		    . #x2EA4)	; ⺤
+	)
+       ((==ucs@unicode	    . #x8863)	; &g2-AJ1-01189;
+	(==adobe-japan1-0   . 01189)	; &g2-AJ1-01189;
+	))
+      (==ruimoku-v6	  . #xE030)	; &g2-RUI6-E030;
+      ))
     ))
 (define-char
   '((=ruimoku-v6	. #xE031)	; &RUI6-E031;
@@ -739,30 +802,17 @@
   '((=ruimoku-v6	. #xE032)	; &RUI6-E032;
     ))
 (define-char
-  '((ideographic-radical . 189)	; â¾¼
+  '((<-denotational
+     ((=>ruimoku-v6	  . #xE033)	; &A-RUI6-E033;
+      ))
+    (ideographic-radical . 189)	; â¾¼
     (ideographic-strokes . 11)
     (total-strokes	 . 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(=ucs		    . #x2FF3)	; ⿳
-	)
-       ((=gt-k		    . 02128)	; &GT-K02128;
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((=big5-cdp	      . #x89CC)	; &CDP-89CC;
-	  )
-	 ((=ucs		      . #x4E05)	; 丅
-	  ))
-	))
+     ((=ucs@iso		  . #x2CD18)	; &U-0002CD18;
       )
      ((=ucs		  . #x53CD)	; 反
       ))
@@ -773,25 +823,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	  (=ucs		      . #x2FF3)	; ⿳
-	  )
-	 ((==gt-k	      . 02128)	; &g2-GT-K02128;
-	  )
-	 ((=ucs		      . #x53E3)	; 口
-	  )
-	 ((ideographic-structure
-	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	    (=ucs		. #x2FF3)	; ⿳
-	    )
-	   ((=big5-cdp		. #x89CC)	; &CDP-89CC;
-	    )
-	   ((=ucs		. #x4E00)	; 一
-	    )
-	   ((=ucs		. #x4E36)	; 丶
-	    ))
-	  ))
+       ((==ucs@iso	    . #x2CD18)	; &g2-IU-0002CD18;
 	)
        ((==ucs@cns	    . #x53CD)	; &g2-AJ1-03411;
 	(==ucs@jis	    . #x53CD)	; &g2-AJ1-03411;
@@ -824,7 +856,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((==ucs@unicode	    . #x53E3)	; &g2-AJ1-01969;
+	(==adobe-japan1-0   . 01969)	; &g2-AJ1-01969;
 	)
        ((==ucs@unicode	    . #x6587)	; &g2-AJ1-03592;
 	(==adobe-japan1-0   . 03592)	; &g2-AJ1-03592;
@@ -900,8 +933,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((name		  . "CJK RADICAL PERSON")
-      (=ucs		  . #x2E85)	; ⺅
+     ((=ucs		  . #x4EBB)	; 亻
       )
      ((=ucs@unicode	  . #x6715)	; &AJ1-03035;
       (=adobe-japan1-0	  . 03035)	; &AJ1-03035;
@@ -930,7 +962,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>>ruimoku-v6	  . #xE039)	; &G-RUI6-E039;
+     ((=>ruimoku-v6	  . #xE039)	; &A-RUI6-E039;
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
@@ -960,7 +992,7 @@
       )
      ((=ucs		  . #x5B80)	; 宀
       )
-     ((=ruimoku-v6	  . #xE03C)	; &RUI6-E03C;
+     ((=ucs		  . #x2A7CD)	; 𪟍
       ))
     (=ruimoku-v6	. #xE03B)	; &RUI6-E03B;
     (->subsumptive
@@ -971,7 +1003,8 @@
        ((==ucs@unicode	    . #x5B80)	; &g2-AJ1-04622;
 	(==adobe-japan1-0   . 04622)	; &g2-AJ1-04622;
 	)
-       ((==ruimoku-v6	    . #xE03C)	; &g2-RUI6-E03C;
+       ((==ucs@JP/hanazono  . #x2A7CD)	; &g2-hanaJU+2A7CD;
+	(==ruimoku-v6	    . #xE03C)	; &g2-hanaJU+2A7CD;
 	))
       (==ruimoku-v6	  . #xE03B)	; &g2-RUI6-E03B;
       ))
@@ -986,10 +1019,13 @@
       )
      ((=ucs		  . #x2668F)	; 𦚏
       )
-     ((name		  . "CJK RADICAL KNIFE TWO")
-      (=ucs		  . #x2E89)	; ⺉
+     ((=ucs		  . #x5202)	; 刂
+      ))
+    (=ucs		. #x2A7CD)	; 𪟍
+    (=ruimoku-v6	. #xE03C)	; &I-RUI6-E03C;
+    (<-construed@chu
+     ((=ucs		  . #x534A)	; 半
       ))
-    (=ruimoku-v6	. #xE03C)	; &RUI6-E03C;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1000,12 +1036,13 @@
        ((name		    . "CJK RADICAL KNIFE TWO")
 	(=ucs		    . #x2E89)	; ⺉
 	))
-      (==ruimoku-v6	  . #xE03C)	; &g2-RUI6-E03C;
+      (==ucs@JP/hanazono  . #x2A7CD)	; &g2-hanaJU+2A7CD;
+      (==ruimoku-v6	  . #xE03C)	; &g2-hanaJU+2A7CD;
       ))
     ))
 (define-char
   '((<-denotational
-     ((=>>ruimoku-v6	  . #xE03D)	; &G-RUI6-E03D;
+     ((=>ruimoku-v6	  . #xE03D)	; &A-RUI6-E03D;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
@@ -1014,7 +1051,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cns11643-4	  . #x2475)	; &C4-2475; [04-85]
+     ((=ucs@cns		  . #x8289)	; &C4-2475;
+      (=cns11643-4	  . #x2475)	; &C4-2475; [04-85]
       (=daikanwa	  . 30668)	; &I-M-30668;
       )
      ((ideographic-structure
@@ -1033,7 +1071,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>>ruimoku-v6	  . #xE03E)	; &G-RUI6-E03E;
+     ((=>ruimoku-v6	  . #xE03E)	; &A-RUI6-E03E;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
@@ -1116,7 +1154,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((==ucs@unicode	    . #x53E3)	; &g2-AJ1-01969;
+	(==adobe-japan1-0   . 01969)	; &g2-AJ1-01969;
 	)
        ((==ucs@unicode	    . #x5ECC)	; &g2-AJ1-21504;
 	(==adobe-japan1-6   . 21504)	; &g2-AJ1-21504;
@@ -1165,17 +1204,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((name		    . "CJK RADICAL PERSON")
-	(=ucs		    . #x2E85)	; ⺅
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	  (=ucs		      . #x2FF8)	; ⿸
-	  )
-	 ((=ucs		      . #x864D)	; 虍
-	  )
-	 ((=ucs		      . #x5E78)	; 幸
-	  ))
+       ((=gt-k		    . 11538)	; &GT-K11538;
 	))
       )
      ((=ucs		  . #x76BF)	; 皿
@@ -1197,11 +1228,8 @@
 	   ((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@unicode	. #x864D)	; &g2-AJ1-06479;
+	    (==adobe-japan1-0	. 06479)	; &g2-AJ1-06479;
 	    )
 	   ((==ucs@jis		. #x5E78)	; &g2-AJ1-01982;
 	    (==ucs@ks		. #x5E78)	; &g2-AJ1-01982;
@@ -1226,8 +1254,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
 	(=ucs		    . #x2FF2)	; ⿲
 	)
-       ((name		    . "CJK RADICAL WATER ONE")
-	(=ucs		    . #x2EA1)	; ⺡
+       ((=ucs		    . #x6C35)	; æ°µ
 	)
        ((=ucs		    . #x9B5A)	; 魚
 	)
@@ -1249,11 +1276,12 @@
 	 ((name		      . "CJK RADICAL WATER ONE")
 	  (=ucs		      . #x2EA1)	; ⺡
 	  )
-	 ((=ucs		      . #x9B5A)	; 魚
+	 ((==ucs@unicode      . #x9B5A)	; &g2-AJ1-01685;
+	  (==adobe-japan1-0   . 01685)	; &g2-AJ1-01685;
 	  )
-	 ((==ucs@jis	      . #x821F)	; &g2-GT-39269;
-	  (==ucs@ks	      . #x821F)	; &g2-GT-39269;
-	  (==jis-x0208	      . #x3D2E)	; &g2-GT-39269; [29-14]
+	 ((==ucs@jis	      . #x821F)	; &g2-AJ1-02360;
+	  (==ucs@ks	      . #x821F)	; &g2-AJ1-02360;
+	  (==adobe-japan1-0   . 02360)	; &g2-AJ1-02360;
 	  ))
 	)
        ((==ucs@unicode	    . #x53C8)	; &g2-AJ1-03746;
@@ -1392,20 +1420,26 @@
   '((=ruimoku-v6	. #xE056)	; &RUI6-E056;
     ))
 (define-char
-  '((ideographic-radical . 141)	; ⾌
+  '((<-denotational
+     ((=>ruimoku-v6	  . #xE057)	; &A-RUI6-E057;
+      ))
+    (ideographic-radical . 141)	; ⾌
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
       )
-     ((name		  . "CJK RADICAL TIGER")
-      (=ucs		  . #x2EC1)	; ⻁
+     ((=ucs@unicode	  . #x864E)	; &G0-3B22;
+      (=gb2312		  . #x3B22)	; &G0-3B22; [27-02]
       )
      ((=ucs		  . #x53E3)	; 口
       ))
     (sources		ruimoku=A2007-10507-00090)
     (=ruimoku-v6	. #xE057)	; &RUI6-E057;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE057)	; &g2-RUI6-E057;
+      ))
     ))
 (define-char
   '((ideographic-structure
@@ -1536,7 +1570,8 @@
 	)
        ((==ucs@iso	    . #x20CF5)	; &g2-IU-00020CF5;
 	)
-       ((=ucs		    . #x5FC3)	; 心
+       ((==ucs@unicode	    . #x5FC3)	; &g2-AJ1-02554;
+	(==adobe-japan1-0   . 02554)	; &g2-AJ1-02554;
 	))
       (==ruimoku-v6	  . #xE05F)	; &g2-RUI6-E05F;
       ))
@@ -1552,7 +1587,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=adobe-japan1-4	  . 13828)	; &AJ1-13828;
+     ((=ucs		  . #x5973)	; 女
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1564,16 +1599,16 @@
 	))
       ))
     (=ruimoku-v6	. #xE061)	; &RUI6-E061;
+    (->subsumptive
+     ((==ruimoku-v6	  . #xE061)	; &g2-RUI6-E061;
+      ))
     ))
 (define-char
   '((ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x793B)	; &GT-31488;
-      (=jis-x0212	  . #x504B)	; &GT-31488; [48-43]
-      (=jis-x0213-2	  . #x7260)	; &I-JX2-7260; [82-64]
-      (=daikanwa	  . 24625)	; &I-M-24625;
+     ((=ucs		  . #x793B)	; 礻
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -1596,11 +1631,32 @@
     (=ruimoku-v6	. #xE063)	; &I-RUI6-E063;
     ))
 (define-char
-  '((ideographic-radical . 66)	; ⽁
+  '((<-denotational
+     ((=>daikanwa	  . 13458)	; &A-M-13458;
+      ))
+    (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x21D42)	; 𡵂
+      )
+     ((=ucs		  . #x6535)	; 攵
+      ))
     (=ucs		. #x22F38)	; 𢼸
     (=ruimoku-v6	. #xE064)	; &I-RUI6-E064;
+    (->subsumptive
+     ((==ucs@iso	  . #x22F38)	; &g2-IU-00022F38;
+      (->subsumptive
+       ((===ucs@iso	    . #x22F38)	; &R-U-00022F38;
+	)
+       ((=hanziku-4	    . #xD65A)	; &HZK04-D65A;
+	))
+      )
+     ((==ruimoku-v6	  . #xE064)	; &g2-RUI6-E064;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -1667,8 +1723,7 @@
 	)
        ((=ucs		    . #x268FB)	; 𦣻
 	)
-       ((name* . "ideographic component person as left roof")
-	(=gt-k		    . 00058)	; &GT-K00058;
+       ((=gt-k		    . 00058)	; &GT-K00058;
 	)
        ((=gt-k		    . 00439)	; &GT-K00439;
 	))
@@ -1746,11 +1801,22 @@
       )
      ((=ucs		  . #x6BDB)	; 毛
       )
-     ((=ucs@unicode	  . #x67BC)	; &JSP-4336;
-      (=jis-x0212	  . #x4336)	; &JSP-4336; [35-22]
-      (=daikanwa	  . 14593)	; &I-M-14593;
+     ((=ucs		  . #x67BC)	; 枼
       ))
     (=ruimoku-v6	. #xE06D)	; &RUI6-E06D;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+	(=ucs		    . #x2FFA)	; ⿺
+	)
+       ((==ucs@unicode	    . #x6BDB)	; &g2-AJ1-03807;
+	(==adobe-japan1-0   . 03807)	; &g2-AJ1-03807;
+	)
+       ((==ucs@unicode	    . #x67BC)	; &g2-AJ1-21742;
+	(==adobe-japan1-6   . 21742)	; &g2-AJ1-21742;
+	))
+      (==ruimoku-v6	  . #xE06D)	; &g2-RUI6-E06D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -1798,12 +1864,8 @@
 	)
        ((=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;
+       ((==ucs@unicode	    . #x80FD)	; &g2-AJ1-03315;
+	(==adobe-japan1-0   . 03315)	; &g2-AJ1-03315;
 	))
       (==ruimoku-v6	  . #xE072)	; &g2-RUI6-E072;
       ))
@@ -1919,6 +1981,14 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x793A)	; 示
+      )
+     ((=ucs		  . #x7533)	; 申
+      ))
     (=ucs		. #xFA19)	; 神
     (=ucs@ks		. #x795E)	; 神
     (=adobe-japan1-2	. 08580)	; &I-AJ1-08580;
@@ -1927,6 +1997,49 @@
     (=daikanwa		. 24673)	; &I-M-24673;
     (=jef-china3	. #x5CDA)	; &I-JC3-5CDA;
     (=ruimoku-v6	. #xE085)	; &I-RUI6-E085;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x795E)	; 神
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=adobe-japan1-5    . 19130)	; &AJ1-19130;
+	)
+       ((=ucs		    . #x7533)	; 申
+	))
+      (==ucs@unicode	  . #xFA19)	; &g2-AJ1-08580;
+      (==ucs@ks		  . #x795E)	; &g2-AJ1-08580;
+      (==adobe-japan1-2	  . 08580)	; &g2-AJ1-08580;
+      (==ks-x1001	  . #x636A)	; &g2-AJ1-08580; [67-74]
+      (==jis-x0213-1	  . #x793C)	; &g2-AJ1-08580; [89-28]
+      (==daikanwa	  . 24673)	; &g2-AJ1-08580;
+      (==jef-china3	  . #x5CDA)	; &g2-AJ1-08580;
+      (==ruimoku-v6	  . #xE085)	; &g2-AJ1-08580;
+      (->subsumptive
+       ((===daikanwa	    . 24673)	; &R-M-24673;
+	)
+       ((===jis-x0213-1	    . #x793C)	; &R-JX1-793C; [89-28]
+	)
+       ((===adobe-japan1-2  . 08580)	; &R-AJ1-08580;
+	)
+       ((===jef-china3	    . #x5CDA)	; &R-JC3-5CDA;
+	)
+       ((===ucs@ks	    . #x795E)	; &R-K0-636A;
+	(===ks-x1001	    . #x636A)	; &R-K0-636A; [67-74]
+	)
+       ((===ucs@unicode	    . #xFA19)	; &R-UU+FA19;
+	)
+       ((===ruimoku-v6	    . #xE085)	; &R-RUI6-E085;
+	))
+      )
+     ((===hng-khm	  . 04670)	; &HNG011-04670;
+      )
+     ((===hng-kar	  . 11230)	; &HNG018-11230;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1935,8 +2048,9 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs@jis/2004	. #x698A)	; &AJ1-07686;
-    (=adobe-japan1-0	. 07686)	; &AJ1-07686;
+    (=ucs@jis/2004	. #x698A)	; &MJ014256;
+    (=mj		. 014256)	; &MJ014256;
+    (=adobe-japan1-0	. 07686)	; &I-AJ1-07686;
     (=jis-x0208@1978	. #x3A67)	; &I-J78-3A67; [26-71]
     (=jis-x0213-1@2004	. #x3A67)	; &I-JX3-3A67; [26-71]
     (=hanyo-denshi/ft	. #x3228)	; &I-HD-FT-3228; [18-08]
@@ -1948,22 +2062,26 @@
 	)
        ((=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;
+      (==ucs@jis/2004	  . #x698A)	; &g2-MJ014256;
+      (==mj		  . 014256)	; &g2-MJ014256;
+      (==adobe-japan1-0	  . 07686)	; &g2-MJ014256;
+      (==jis-x0208@1978	  . #x3A67)	; &g2-MJ014256; [26-71]
+      (==jis-x0213-1@2004 . #x3A67)	; &g2-MJ014256; [26-71]
+      (==hanyo-denshi/ft  . #x3228)	; &g2-MJ014256; [18-08]
+      (==daikanwa	  . 15352)	; &g2-MJ014256;
+      (==ruimoku-v6	  . #xE086)	; &g2-MJ014256;
       (->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]
+       ((===jis-x0208@1978  . #x3A67)	; &R-J78-3A67; [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;
 	)
+       ((===mj		    . 014256)	; &R-MJ014256;
+	)
        ((===ruimoku-v6	    . #xE086)	; &R-RUI6-E086;
 	))
       ))