X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fruimoku6.el;h=b8b6c40412e17f84f35d596baf16886cc4975505;hb=2212697ca35301ba0869b074c7f3ff6315697b6d;hp=b0665a075e0c5b89fcf2a2ae7cc1676e880f650b;hpb=80e98c23e03099ef4456826411975d33449cf498;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index b0665a0..b8b6c40 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -76,22 +76,22 @@
       )
      ((=ucs		  . #x5C71)	; å±±
       )
-     ((=ucs@unicode	  . #x96A0)	; &GT-56168;
-      (=jis-x0208	  . #x3123)	; &GT-56168; [17-03]
-      (=jis-x0213-1	  . #x3123)	; &I-JX1-3123; [17-03]
+     ((=ucs@unicode	  . #x96A0)	; &AJ1-01221;
+      (=adobe-japan1-0	  . 01221)	; &AJ1-01221;
       ))
     (sources		ruimoku=A015330-00006)
     (=ruimoku-v6	. #xE008)	; &RUI6-E008;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs		  . #x21A5C)	; 𡩜
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
       )
-     ((=ucs@jis		  . #x5B80)	; &GT-08869;
-      (=jis-x0208	  . #x555F)	; &GT-08869; [53-63]
-      (=jis-x0213-1	  . #x555F)	; &I-JX1-555F; [53-63]
-      (=daikanwa	  . 07054)	; &I-M-07054;
+     ((==ucs@jis	  . #x5B80)	; &R-AJ1-04622;
+      (==adobe-japan1-0	  . 04622)	; &R-AJ1-04622;
       )
      ((=ucs		  . #x9FB6)	; 龶
       )
@@ -101,7 +101,10 @@
     (=ruimoku-v6	. #xE009)	; &RUI6-E009;
     ))
 (define-char
-  '((sources		ruimoku=A016374-00004)
+  '((<-subsumptive
+     ((=>>ucs@iso	  . #x29C2C)	; &G-IU+29C2C;
+      ))
+    (sources		ruimoku=A016374-00004)
     (=ucs@iso		. #x29C2C)	; &RUI6-E00A;
     (=ruimoku-v6	. #xE00A)	; &RUI6-E00A;
     ))
@@ -146,7 +149,7 @@
       (=ucs		  . #x0301)	; ́
       ))
     (sources		ruimoku=C011091-00007)
-    (=ruimoku-v6	. #xE00D)	; ā́
+    (=ruimoku-v6	. #xE00D)	; &RUI6-E00D;
     ))
 (define-char
   '((ideographic-radical . 24)	; ⼗
@@ -195,7 +198,10 @@
     (=ruimoku-v6	. #xE012)	; &RUI6-E012;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE013)	; &G-RUI6-E013;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -207,7 +213,10 @@
     (=ruimoku-v6	. #xE013)	; &RUI6-E013;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE014)	; &G-RUI6-E014;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -234,7 +243,10 @@
     (=ruimoku-v6	. #xE015)	; &RUI6-E015;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs		  . #x24F08)	; 𤼈
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
       )
@@ -272,7 +284,10 @@
     (=ruimoku-v6	. #xE017)	; &RUI6-E017;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE018)	; &G-RUI6-E018;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -306,7 +321,10 @@
     (=ruimoku-v6	. #xE019)	; &RUI6-E019;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ucs@iso	  . #x20E04)	; &G-RUI6-E01A;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -319,7 +337,10 @@
     (=ruimoku-v6	. #xE01A)	; &RUI6-E01A;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE01B)	; &G-RUI6-E01B;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -342,7 +363,10 @@
     (=ruimoku-v6	. #xE01C)	; &I-RUI6-E01C;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs		  . #x2B522)	; 𫔢
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs		  . #x2FF5)	; ⿵
       )
@@ -381,7 +405,10 @@
     (=ruimoku-v6	. #xE01E)	; &RUI6-E01E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE01F)	; &G-RUI6-E01F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -391,8 +418,8 @@
       (=jis-x0213-1	  . #x3840)	; &I-JX1-3840; [24-32]
       (=daikanwa	  . 35205)	; &I-M-35205;
       )
-     ((=ucs@unicode	  . #x83D0)	; &CDP-8D48;
-      (=jis-x0212	  . #x583A)	; &CDP-8D48; [56-26]
+     ((=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;
       ))
@@ -440,7 +467,10 @@
   '((=ruimoku-v6	. #xE026)	; &RUI6-E026;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE027)	; &G-RUI6-E027;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -518,7 +548,10 @@
     (=ruimoku-v6	. #xE02E)	; &RUI6-E02E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE02F)	; &G-RUI6-E02F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -529,7 +562,10 @@
     (=ruimoku-v6	. #xE02F)	; &RUI6-E02F;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE030)	; &G-RUI6-E030;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -549,7 +585,10 @@
   '((=ruimoku-v6	. #xE032)	; &RUI6-E032;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE033)	; &G-RUI6-E033;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -582,12 +621,10 @@
 	  ))
 	))
       )
-     ((=ucs@jis		  . #x53CD)	; &GT-03956;
-      (=jis-x0208	  . #x483F)	; &GT-03956; [40-31]
-      (=ks-x1001	  . #x5A63)	; &I-K0-5A63; [58-67]
-      (=cns11643-1	  . #x4530)	; &I-C1-4530; [37-16]
-      (=jis-x0213-1	  . #x483F)	; &I-JX1-483F; [40-31]
-      (=daikanwa	  . 03127)	; &I-M-03127;
+     ((=ucs@cns		  . #x53CD)	; &AJ1-03411;
+      (=ucs@jis		  . #x53CD)	; &AJ1-03411;
+      (=ucs@ks		  . #x53CD)	; &AJ1-03411;
+      (=adobe-japan1-0	  . 03411)	; &AJ1-03411;
       ))
     (sources		ruimoku=A2005-10807-00005 ruimoku=A2005-10807-00006)
     (=ruimoku-v6	. #xE033)	; &RUI6-E033;
@@ -598,20 +635,25 @@
     (=ruimoku-v6	. #xE034)	; &RUI6-E034;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE035)	; &G-RUI6-E035;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
      ((=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
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE036)	; &G-RUI6-E036;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -625,17 +667,17 @@
 	)
        ((=ucs		    . #x5348)	; 午
 	)
-       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
-	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
-	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
-	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
-	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
+       ((=ucs@unicode	    . #x53C8)	; &AJ1-03746;
+	(=adobe-japan1-0    . 03746)	; &AJ1-03746;
 	))
       ))
     (=ruimoku-v6	. #xE036)	; &RUI6-E036;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE037)	; &G-RUI6-E037;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -692,20 +734,25 @@
   '((=ruimoku-v6	. #xE03A)	; &RUI6-E03A;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE03B)	; &G-RUI6-E03B;
+      ))
+    (ideographic-structure
      ((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
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE03C)	; &G-RUI6-E03C;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -713,11 +760,9 @@
        ((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;
+       ((==ucs@jis	    . #x7ACB)	; &R-GT-33181;
+	(==ucs@ks	    . #x7ACB)	; &R-GT-33181;
+	(==jis-x0208	    . #x4E29)	; &R-GT-33181; [46-09]
 	)
        ((=big5-cdp	    . #x8958)	; &CDP-8958;
 	))
@@ -738,7 +783,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=cns11643-4	  . #x2475)	; &M-30668; [04-85]
+     ((=cns11643-4	  . #x2475)	; &C4-2475; [04-85]
       (=daikanwa	  . 30668)	; &I-M-30668;
       )
      ((ideographic-structure
@@ -780,18 +825,19 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((name*		    . "ideographic component person as roof")
-	(=big5-cdp	    . #x8B5D)	; &GT-00458;
+       ((=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;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE03F)	; &G-RUI6-E03F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -807,7 +853,10 @@
   '((=ruimoku-v6	. #xE040)	; &RUI6-E040;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs		  . #x2A894)	; 𪢔
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -843,7 +892,10 @@
   '((=ruimoku-v6	. #xE045)	; &RUI6-E045;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE046)	; &G-RUI6-E046;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -864,11 +916,8 @@
 	  (=jis-x0213-1	      . #x6948)	; &I-JX1-6948; [73-40]
 	  (=daikanwa	      . 32674)	; &I-M-32674;
 	  )
-	 ((=ucs@jis	      . #x5E78)	; &GT-11561;
-	  (=jis-x0208	      . #x392C)	; &GT-11561; [25-12]
-	  (=ks-x1001	      . #x7A39)	; &I-K0-7A39; [90-25]
-	  (=jis-x0213-1	      . #x392C)	; &I-JX1-392C; [25-12]
-	  (=daikanwa	      . 09176)	; &I-M-09176;
+	 ((=ucs@jis	      . #x5E78)	; &AJ1-01982;
+	  (=adobe-japan1-0    . 01982)	; &AJ1-01982;
 	  ))
 	))
       )
@@ -877,7 +926,10 @@
     (=ruimoku-v6	. #xE046)	; &RUI6-E046;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE047)	; &G-RUI6-E047;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -897,16 +949,16 @@
 	(=daikanwa	    . 30350)	; &I-M-30350;
 	))
       )
-     ((=ucs@unicode	  . #x53C8)	; &GT-03944;
-      (=jis-x0208	  . #x4B74)	; &GT-03944; [43-84]
-      (=gb2312		  . #x5356)	; &I-G0-5356; [51-54]
-      (=cns11643-1	  . #x4434)	; &I-C1-4434; [36-20]
-      (=jis-x0213-1	  . #x4B74)	; &I-JX1-4B74; [43-84]
+     ((=ucs@unicode	  . #x53C8)	; &AJ1-03746;
+      (=adobe-japan1-0	  . 03746)	; &AJ1-03746;
       ))
     (=ruimoku-v6	. #xE047)	; &RUI6-E047;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE048)	; &G-RUI6-E048;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -927,7 +979,10 @@
   '((=ruimoku-v6	. #xE04B)	; &RUI6-E04B;
     ))
 (define-char
-  '((ideographic-structure
+  '((ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
@@ -952,15 +1007,15 @@
   '((=ruimoku-v6	. #xE04E)	; &RUI6-E04E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE04F)	; &G-RUI6-E04F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@jis		  . #x5B87)	; &GT-08881;
-      (=jis-x0208	  . #x3127)	; &GT-08881; [17-07]
-      (=ks-x1001	  . #x6954)	; &I-K0-6954; [73-52]
-      (=jis-x0213-1	  . #x3127)	; &I-JX1-3127; [17-07]
-      (=daikanwa	  . 07067)	; &I-M-07067;
+     ((=ucs@unicode	  . #x5B87)	; &AJ1-01225;
+      (=adobe-japan1-0	  . 01225)	; &AJ1-01225;
       )
      ((=ucs		  . #x76BF)	; 皿
       ))
@@ -1100,27 +1155,33 @@
     (=ruimoku-v6	. #xE05D)	; &RUI6-E05D;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs		  . #x20CF5)	; ð ³µ
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
      ((=ucs		  . #x5405)	; 吅
       )
-     ((=ks-x1001	  . #x597E)	; &M-13450; [57-94]
+     ((=ucs@ks		  . #x6587)	; &M-13450;
+      (=ks-x1001	  . #x597E)	; &M-13450; [57-94]
       (=daikanwa	  . 13450)	; &I-M-13450;
       ))
     (=ruimoku-v6	. #xE05E)	; &RUI6-E05E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE05F)	; &G-RUI6-E05F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs		  . #x2FF3)	; ⿳
       )
      ((=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)	; 心
       ))
@@ -1134,12 +1195,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x5973)	; &GT-07623;
-      (=jis-x0208	  . #x3D77)	; &GT-07623; [29-87]
-      (=gb2312		  . #x452E)	; &I-G0-452E; [37-14]
-      (=ks-x1001	  . #x5233)	; &I-K0-5233; [50-19]
-      (=jis-x0213-1	  . #x3D77)	; &I-JX1-3D77; [29-87]
-      (=daikanwa	  . 06036)	; &I-M-06036;
+     ((=ucs@unicode	  . #x5973)	; &AJ1-02433;
+      (=adobe-japan1-0	  . 02433)	; &AJ1-02433;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1190,7 +1247,10 @@
     (=ruimoku-v6	. #xE064)	; &I-RUI6-E064;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6	  . #xE065)	; &G-RUI6-E065;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
@@ -1230,8 +1290,8 @@
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1319,15 +1379,10 @@
      ((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)	; &M-14593;
-      (=jis-x0212	  . #x4336)	; &M-14593; [35-22]
+     ((=ucs@unicode	  . #x67BC)	; &JSP-4336;
+      (=jis-x0212	  . #x4336)	; &JSP-4336; [35-22]
       (=daikanwa	  . 14593)	; &I-M-14593;
       ))
     (=ruimoku-v6	. #xE06D)	; &RUI6-E06D;
@@ -1487,12 +1542,12 @@
     (total-strokes	 . 10)
     (=ucs		. #xFA19)	; 神
     (=ucs@ks		. #x795E)	; 神
+    (=adobe-japan1-2	. 08580)	; &I-AJ1-08580;
     (=ks-x1001		. #x636A)	; &I-K0-636A; [67-74]
     (=jis-x0213-1	. #x793C)	; &I-JX1-793C; [89-28]
     (=daikanwa		. 24673)	; &I-M-24673;
     (=jef-china3	. #x5CDA)	; &I-JC3-5CDA;
     (=ruimoku-v6	. #xE085)	; &I-RUI6-E085;
-    (=adobe-japan1-2	. 08580)	; &I-AJ1-08580;
     ))
 (define-char
   '((<-denotational
@@ -1501,12 +1556,18 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=decomposition@hanyo-denshi
+     ((=ucs		  . #x698A)	; 榊
+      )
+     ((=ucs		  . #xE0103)	; 󠄃
+      ))
     (=ucs@jis/2004	. #x698A)	; &AJ1-07686;
-    (=jis-x0208@1978	. #x3A67)	; &AJ1-07686; [26-71]
+    (=adobe-japan1-0	. 07686)	; &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]
     (=daikanwa		. 15352)	; &I-M-15352;
     (=ruimoku-v6	. #xE086)	; &I-RUI6-E086;
-    (=adobe-japan1-0	. 07686)	; &I-AJ1-07686;
     ))
 (define-char
   '((=ruimoku-v6	. #xE087)	; &RUI6-E087;