From: tomo <tomo>
Date: Tue, 15 Jun 2004 00:11:25 +0000 (+0000)
Subject: Sync up with r21-4-14-chise-0_21-29.
X-Git-Tag: r21-4-14-u2km-0_21-29
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8859129b175e3450c102c137d6fb495a8461bcb;p=chise%2Fxemacs-chise.git.1

Sync up with r21-4-14-chise-0_21-29.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 1ede224..6649f40 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,116 @@
+2004-06-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R010-Legs.el (U+514D): Unify B-A74B.
+	(U+FA32): Use `->subsumptive' to integrate U-0002F80E; delete
+	BC-A74B.
+	(G0-4362): Separate B-A74B.
+
+	* Ideograph-R109-Eye.el (U-0002032A): Use
+	`ideographic-{radical|strokes}@{ucs|cns}',
+	`total-strokes@{ucs|cns}' and `ideographic-radical@cns*sources'
+	instead of `ideographic-'; use `->subsumptive'.
+	(U-00025186): Use `->subsumptive'.
+
+	* Ideograph-R053-Dotted-Cliff.el (U+5E82): Use `->subsumptive'.
+	(U+5E83): Likewise.
+	(U+386F): Likewise.
+	(U-000221D7): Likewise.
+	(U-000221D8): Likewise.
+	(U-000221D9): Likewise.
+	(U+3870): Likewise.
+	(U-000221DA): Likewise.
+	(U+3871): Likewise.
+	(U-000221DB): Likewise.
+
+2004-06-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R009-Man.el (U-0002032A): Use
+	`ideographic-{radical|strokes}@{ucs|cns}',
+	`total-strokes@{ucs|cns}' and `ideographic-radical@cns*sources'
+	instead of `ideographic-'; use `->subsumptive'.
+	(U-00020309): Use `->subsumptive'.
+
+	* Ideograph-R162-Walk.el (U+5DE1): Copied from
+	Ideograph-R047-River.el.
+	(C1-4B56): Use `<-denotational' for U+5DE1.
+	(U+8FDA): Use `->subsumptive'.
+	(IU-000285B3): Unify GT-52500.
+
+2004-06-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R170-Mound.el (U-00028EF4): Delete `=>daikanwa'.
+
+	* Ideograph-R047-River.el: Add some mappings to Hanziku code
+	points.
+	(M-08670): New character.
+	(U-00021FE8): Use `hanyu-dazidian' instead of
+	`hanyu-dazidian-{vol|page|char}'.
+	(BC-8BED): New character.
+	(U+5DE1): Define as an abstract character.
+	(J0-3D64): Use `->subsumptive'; moved into U-0002F881.
+	(U-0002F881): New character; add `<-denotational' for U+5DE1.
+	(U-00021FEC): Use `->subsumptive'.
+	(U+3829): Likewise.
+	(U+5DDF): Likewise.
+	(U-00021FEE): Likewise; integrate M-03081 and C6-237E.
+	(K0-625E): Add `<-denotational' for U+5DE1.
+	(U-00021FF9): Use `->subsumptive'.
+	(U-00021FFC): New character.
+	(U-00020657): Use `->subsumptive'.
+	(U-00021FFE): Likewise.
+	(U-00022007): Likewise.
+	(U-00022008): Likewise.
+	(U-00022009): Likewise.
+	(U-0002200A): Likewise.
+	(U-00022010): Likewise.
+
+	* Ideograph-R041-Inch.el (U-00021B4E): Use `->subsumptive'; use
+	`<-ancient-ideograph*sources' instead of char-ref in
+	`<-ancient-ideograph'.
+	(U-00021B50): Use `->subsumptive'.
+	(U-00021B51): Use `<-ancient-ideograph' instead of
+	`ancient-ideograph-of'.
+	(U-00021B52): Use `->subsumptive'.
+	(U-00021B53): Likewise.
+	(U-0002330F): Likewise; add H4-E7B0.
+
+	* ideograph-util.el (char-representative-of-daikanwa): New
+	implementation.
+
+2004-06-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R085-Water.el (U-00023D9A): Use `->subsumptive';
+	delete incomplete `ideographic-structure'.
+	(U+6E00): Use `->subsumptive'.
+	(U+3D03): Likewise.
+
+2004-06-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R009-Man.el (U+4F82): Use `->subsumptive'; compaction
+	`ideographic-structure'.
+	(U+4F83): Use `->subsumptive'.
+	(U-000203D8): Delete incomplete `ideographic-structure'.
+
+	* Ideograph-R005-Second.el (U-000200E4): Use `->subsumptive';
+	delete `ideographic-structure'.
+	(U-000200E5): Use `->subsumptive'.
+	(U+4E6A): Likewise.
+
+2004-06-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R028-Private.el (M-03081): Moved into U-00021FEE; use
+	`->subsumptive' to integrate with C6-237E.
+	(U-00021FEE): Copied from Ideograph-R047-River.el; use
+	`->subsumptive'.
+
+2004-06-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R044-Corpse.el (U-00021C61): Use `->subsumptive'.
+	(U-000221C0): Unify H3-DFB2.
+
+	* Ideograph-R042-Small.el (U-000221D4): Use `->subsumptive'.
+	(C4-5626): Unify H2-C46D.
+
 2004-06-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* u0FE30-CJK-Compatibility-Forms.el,
diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el
index 9dde27b..ac7e7e0 100644
--- a/lisp/utf-2000/Ideograph-R005-Second.el
+++ b/lisp/utf-2000/Ideograph-R005-Second.el
@@ -733,98 +733,80 @@
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 38 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8CAC)	; &CDP-8CAC;
-      )
-     ((=big5-cdp	  . #x8BED)	; &CDP-8BED;
-      ))
     (=ucs		. #x200E4)	; 𠃤
-    (=cns11643-6	. #x2346)	; &I-C6-2346; [03-38]
-    (=gt		. 00244)	; &I-GT-00244;
-    (=gt-pj-2		. #x3153)	; &I-GT-00244; [17-51]
-    (=daikanwa		. 00183)	; &I-M-00183;
-    (=hanziku-1		. #xABE1)	; &I-HZK01-ABE1;
-    (mojikyo		. 000183)	; &MCS-600000B7;
-    ))
-(define-char
-  '((=>ucs		. #x200E5)	; 𠃥
-    (ideographic-radical . 5)	; ⼄
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
-      )
-     ((name		  . "CJK RADICAL SECOND THREE")
-      (=ucs		  . #x2E84)	; ⺄
+    (->subsumptive
+     ((hanyu-dazidian	  1 38 11)
+      (=gt		  . 00244)	; &GT-00244;
+      (=gt-pj-2		  . #x3153)	; &GT-00244; [17-51]
+      (=daikanwa	  . 00183)	; &I-M-00183;
+      (=hanziku-1	  . #xABE1)	; &I-HZK01-ABE1;
+      (=ucs@iso		  . #x200E4)	; &GT-00244;
+      (mojikyo		  . 000183)	; &MCS-600000B7;
       )
-     ((=ucs		  . #x672A)	; 未
+     ((=cns11643-6	  . #x2346)	; &C6-2346; [03-38]
       ))
-    (=gt		. 00242)	; &GT-00242;
-    (=gt-pj-2		. #x3154)	; &GT-00242; [17-52]
-    (=daikanwa		. 00184)	; &I-M-00184;
-    (mojikyo		. 000184)	; &MCS-600000B8;
     ))
 (define-char
-  '((morohashi-daikanwa	184 0 0)
-    (ideographic-radical . 5)	; ⼄
+  '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 53 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs		  . #x2FF9)	; ⿹
+    (=ucs		. #x200E5)	; 𠃥
+    (->subsumptive
+     ((=gt		  . 00242)	; &GT-00242;
+      (=gt-pj-2		  . #x3154)	; &GT-00242; [17-52]
+      (=daikanwa	  . 00184)	; &I-M-00184;
+      (mojikyo		  . 000184)	; &MCS-600000B8;
       )
-     ((name		  . "CJK RADICAL SECOND THREE")
-      (=ucs		  . #x2E84)	; ⺄
+     ((hanyu-dazidian	  1 53 3)
+      (=hanziku-1	  . #xAEE2)	; &HZK01-AEE2;
+      (=ucs@iso		  . #x200E5)	; &HZK01-AEE2;
       )
-     ((=ucs		  . #x672A)	; 未
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	(=ucs		    . #x2FF9)	; ⿹
+	)
+       ((name		    . "CJK RADICAL SECOND THREE")
+	(=ucs		    . #x2E84)	; ⺄
+	)
+       ((=ucs		    . #x672A)	; 未
+	))
+      (=cns11643-6	  . #x2344)	; &C6-2344; [03-36]
       ))
-    (=ucs		. #x200E5)	; 𠃥
-    (=cns11643-6	. #x2344)	; &I-C6-2344; [03-36]
-    (=hanziku-1		. #xAEE2)	; &I-HZK01-AEE2;
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-      (=ucs		  . #x2FFA)	; ⿺
-      )
-     ((=ucs		  . #x4E59)	; 乙
-      )
-     ((=ucs		  . #x7530)	; 田
-      ))
     (=ucs		. #x4E6A)	; 乪
-    (=cns11643-4	. #x2228)	; &I-C4-2228; [02-08]
-    (=gb12345		. #x7C5A)	; 乪 [92-58]
-    (=gt		. 00246)	; &I-GT-00246;
-    (=gt-pj-2		. #x3155)	; &I-GT-00246; [17-53]
-    (=daikanwa		. 00185)	; &I-M-00185;
-    (mojikyo		. 000185)	; &MCS-600000B9;
-    ))
-(define-char
-  '((=>ucs		. #x4E6A)	; 乪
-    (morohashi-daikanwa	185 0 2)
-    (ideographic-radical . 5)	; ⼄
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (hanyu-dazidian	1 53 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-      (=ucs		  . #x2FFA)	; ⿺
-      )
-     ((name		  . "CJK RADICAL SECOND THREE")
-      (=ucs		  . #x2E84)	; ⺄
-      )
-     ((=ucs		  . #x7530)	; 田
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+	(=ucs		    . #x2FFA)	; ⿺
+	)
+       ((=ucs		    . #x4E59)	; 乙
+	)
+       ((=ucs		    . #x7530)	; 田
+	))
+      (=cns11643-4	  . #x2228)	; &GT-00246; [02-08]
+      (=gb12345		  . #x7C5A)	; &GT-00246; [92-58]
+      (=gt		  . 00246)	; &I-GT-00246;
+      (=gt-pj-2		  . #x3155)	; &I-GT-00246; [17-53]
+      (=daikanwa	  . 00185)	; &I-M-00185;
+      (=ucs@unicode	  . #x4E6A)	; &GT-00246;
+      (mojikyo		  . 000185)	; &MCS-600000B9;
+      )
+     ((hanyu-dazidian	  1 53 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+	(=ucs		    . #x2FFA)	; ⿺
+	)
+       ((name		    . "CJK RADICAL SECOND THREE")
+	(=ucs		    . #x2E84)	; ⺄
+	)
+       ((=ucs		    . #x7530)	; 田
+	))
+      (=hanziku-1	  . #xAEE6)	; &HZK01-AEE6;
       ))
-    (=hanziku-1		. #xAEE6)	; &HZK01-AEE6;
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index d89d0b2..ec234f7 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -542,6 +542,7 @@
 	 ((=jis-x0213-2-2000  . #x2359)	; &JX2-2359; [03-57]
 	  )
 	 ((=big5-cdp	      . #x8BED)	; &CDP-8BED;
+	  (=daikanwa	      . 08674)	; &I-M-08674;
 	  ))
 	(=jis-x0213-2-2000  . #x2132)	; &M-00296; [01-18]
 	(=daikanwa	    . 00296)	; &I-M-00296;
@@ -564,6 +565,7 @@
        ((=ucs		    . #x20AD3)	; 𠫓
 	)
        ((=big5-cdp	    . #x8BED)	; &CDP-8BED;
+	(=daikanwa	    . 08674)	; &I-M-08674;
 	))
       (=big5-cdp	  . #x8C50)	; &CDP-8C50;
       ))
diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 92e1b57..39c309b 100644
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -7472,95 +7472,87 @@
     (mojikyo		. 000575)	; &MCS-6000023F;
     ))
 (define-char
-  '((=>ucs		. #x4F82)	; 侂
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (hanyu-dazidian	1 152 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
+    (=ucs		. #x4F82)	; 侂
+    (=big5		. #xCBC9)	; &I-B-CBC9;
+    (->subsumptive
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=jis-x0208	    . #x5678)	; &GT-11620; [54-88]
-	(=daikanwa	    . 09221)	; &I-M-09221;
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs		    . #x4E47)	; 乇
+       ((=daikanwa	    . 09225)	; &M-09225;
 	))
-      ))
-    (=jis-x0212		. #x307D)	; &M-00576; [16-93]
-    (=jis-x0213-2-2000	. #x214B)	; &I-JX2-214B; [01-43]
-    (=big5		. #xCBC9)	; &I-B-CBC9;
-    (=daikanwa		. 00576)	; &I-M-00576;
-    (=jef-china3	. #x9FFE)	; &I-JC3-9FFE;
-    (=ucs@jis		. #x4F82)	; &M-00576;
-    (=ucs@big5		. #x4F82)	; &M-00576;
-    (mojikyo		. 000576)	; &MCS-60000240;
-    ))
-(define-char
-  '((morohashi-daikanwa	576 0 0)
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 152)
-    (hanyu-dazidian-char . 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+      (=jis-x0212	  . #x307D)	; &M-00576; [16-93]
+      (=jis-x0213-2-2000  . #x214B)	; &I-JX2-214B; [01-43]
+      (=daikanwa	  . 00576)	; &I-M-00576;
+      (=jef-china3	  . #x9FFE)	; &I-JC3-9FFE;
+      (=ucs@jis		  . #x4F82)	; &M-00576;
+      (mojikyo		  . 000576)	; &MCS-60000240;
       )
-     ((=ucs		  . #x4EBB)	; 亻
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=ucs		    . #x386F)	; 㡯
+	))
+      (=ucs@unicode	  . #x4F82)	; &UU+4F82;
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x5E7F)	; 广
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=ucs		    . #x4E47)	; 乇
+       ((=cns11643-3	    . #x2360)	; &C3-2360; [03-64]
 	))
+      (=cns11643-2	  . #x2549)	; &C2-2549; [05-41]
       ))
-    (=ucs		. #x4F82)	; 侂
-    (=cns11643-2	. #x2549)	; &I-C2-2549; [05-41]
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 148 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+    (=ucs		. #x4F83)	; 侃
+    (->subsumptive
+     ((hanyu-dazidian	  1 148 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x53E3)	; 口
+       ((=ucs		    . #x4EBB)	; 亻
 	)
-       ((=big5-cdp	    . #x8BED)	; &CDP-8BED;
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x53E3)	; 口
+	  )
+	 ((=big5-cdp	      . #x8BED)	; &CDP-8BED;
+	  (=daikanwa	      . 08674)	; &I-M-08674;
+	  ))
 	))
+      (shinjigen-1	  . 211)
+      (shinjigen-2	  . 211)
+      (=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
+      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
+      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
+      (=big5		  . #xA8D4)	; &I-B-A8D4;
+      (=gt		  . 00718)	; &I-GT-00718;
+      (=gt-k		  . 03660)	; &I-GT-K03660;
+      (=gt-pj-1		  . #x3426)	; &I-GT-00718; [20-06]
+      (=daikanwa	  . 00577)	; &I-M-00577;
+      (=ucs@unicode	  . #x4F83)	; &GT-00718;
+      (mojikyo		  . 000577)	; &MCS-60000241;
+      )
+     ((=cns11643-1	  . #x4B75)	; &C1-4B75; [43-85]
       ))
-    (shinjigen-1	. 211)
-    (shinjigen-2	. 211)
-    (=ucs		. #x4F83)	; 侃
-    (=jis-x0208		. #x3426)	; &I-J90-3426; [20-06]
-    (=gb2312		. #x5929)	; &I-G0-5929; [57-09]
-    (=ks-x1001		. #x4A49)	; &I-K0-4A49; [42-41]
-    (=cns11643-1	. #x4B75)	; &I-C1-4B75; [43-85]
-    (=big5		. #xA8D4)	; &I-B-A8D4;
-    (=gt		. 00718)	; &I-GT-00718;
-    (=gt-k		. 03660)	; &I-GT-K03660;
-    (=gt-pj-1		. #x3426)	; &I-GT-00718; [20-06]
-    (=daikanwa		. 00577)	; &I-M-00577;
-    (mojikyo		. 000577)	; &MCS-60000241;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -21305,45 +21297,55 @@
     (mojikyo		. 001001)	; &MCS-600003E9;
     ))
 (define-char
-  '((=>ucs		. #x2032A)	; 𠌪
-    (ideographic-	(:radical	109 ; ⽬
-			 :strokes	6)
-			(:radical	9 ; ⼈
-			 :strokes	10))
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 189 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=big5-cdp	  . #x8B7A)	; &CDP-8B7A;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 10)
+    (total-strokes@ucs	     . 12)
+    (ideographic-radical@cns . 109)	; ⽬
+    (ideographic-strokes@cns . 6)
+    (total-strokes@cns	     . 11)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (=ucs		. #x2032A)	; 𠌪
+    (->subsumptive
+     ((hanyu-dazidian	  1 189 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=jis-x0208	    . #x5469)	; &GT-07201; [52-73]
-	(=cns11643-3	    . #x2139)	; &I-C3-2139; [01-25]
-	(=daikanwa	    . 05691)	; &I-M-05691;
+       ((=big5-cdp	    . #x8B7A)	; &CDP-8B7A;
 	)
-       ((=ucs		    . #x76EE)	; 目
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=jis-x0208	      . #x5469)	; &GT-07201; [52-73]
+	  (=cns11643-3	      . #x2139)	; &I-C3-2139; [01-25]
+	  (=daikanwa	      . 05691)	; &I-M-05691;
+	  )
+	 ((=ucs		      . #x76EE)	; 目
+	  ))
 	))
+      (=cns11643-5	  . #x3421)	; &M-23328; [20-01]
+      (=daikanwa	  . 23328)	; &I-M-23328;
+      (=hanziku-1	  . #xCD57)	; &I-HZK01-CD57;
+      )
+     ((=ucs@iso		  . #x2032A)	; &UU+2032A;
       ))
-    (=cns11643-5	. #x3421)	; &M-23328; [20-01]
-    (=daikanwa		. 23328)	; &I-M-23328;
-    (=hanziku-1		. #xCD57)	; &I-HZK01-CD57;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x20309)	; 𠌉
-    (=cns11643-5	. #x364F)	; &I-C5-364F; [22-47]
-    (=daikanwa		. 48922)	; &I-M-48922;
+    (->subsumptive
+     ((=daikanwa	  . 48922)	; &M-48922;
+      )
+     ((=cns11643-5	  . #x364F)	; &C5-364F; [22-47]
+      (=ucs@iso		  . #x20309)	; &C5-364F;
+      ))
     ))
 (define-char
-  '((=>daikanwa		ho 21)	; &CB01842;
-    (ideographic-radical . 9)	; ⼈
+  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x347A)	; 㑺
@@ -21532,16 +21534,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (->same
-     ((=cns11643-5	  . #x3421)	; &M-23328; [20-01]
-      (=daikanwa	  . 23328)	; &I-M-23328;
-      ))
-    (=ucs		. #x2032A)	; 𠌪
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 215 10)
@@ -33875,16 +33867,6 @@
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (hanyu-dazidian	1 225 7)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=big5-cdp	  . #x8BED)	; &CDP-8BED;
-      )
-     ((=ucs		  . #x8A00)	; 言
-      ))
     (=ucs		. #x203D8)	; 𠏘
     (=hanziku-1		. #xD4B0)	; &I-HZK01-D4B0;
     ))
diff --git a/lisp/utf-2000/Ideograph-R010-Legs.el b/lisp/utf-2000/Ideograph-R010-Legs.el
index 1c69846..efcc927 100644
--- a/lisp/utf-2000/Ideograph-R010-Legs.el
+++ b/lisp/utf-2000/Ideograph-R010-Legs.el
@@ -716,9 +716,12 @@
     (sound@ja/kun	"manuka-r+eru" "manuga-r+eru")
     (sound@ja/on/go	"men")
     (=ucs		. #x514D)	; 免
+    (=big5		. #xA74B)	; &I-B-A74B;
     ))
 (define-char
   '((=>ucs*		. #x514D)	; 免
+    (=>ucs@cns		. #x2F80E)	; 免
+    (=>ucs@jis		. #xFA32)	; 免
     (ideographic-radical . 10)	; ⼉
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
@@ -733,22 +736,18 @@
       )
      ((=big5-cdp	  . #x8BCB)	; &CDP-8BCB;
       ))
-    (shinjigen-1	. 471)
-    (shinjigen-2	. 471)
-    (=ucs		. #xFA32)	; 免
-    (=cns11643-3	. #x2452)	; &I-C3-2452; [04-50]
-    (=jis-x0213-1-2000	. #x2E50)	; &I-JX1-2E50; [14-48]
-    (=big5-cdp		. #xA74B)	; &I-B-A74B;
-    (=daikanwa		. 01358)	; &I-M-01358;
-    (=jef-china3	. #x43D5)	; &I-JC3-43D5;
-    (=ucs@cns		. #x2F80E)	; 免
-    (mojikyo		. 054447)	; &MCS-6000D4AF;
-    ))
-(define-char
-  '((->identical
-     ((=ucs		  . #xFA32)	; 免
+    (->subsumptive
+     ((shinjigen-1	  . 471)
+      (shinjigen-2	  . 471)
+      (=ucs		  . #xFA32)	; 免
+      (=jis-x0213-1-2000  . #x2E50)	; &I-JX1-2E50; [14-48]
+      (=daikanwa	  . 01358)	; &I-M-01358;
+      (=jef-china3	  . #x43D5)	; &I-JC3-43D5;
+      (mojikyo		  . 054447)	; &MCS-6000D4AF;
+      )
+     ((=ucs		  . #x2F80E)	; 免
+      (=cns11643-3	  . #x2452)	; &I-C3-2452; [04-50]
       ))
-    (=ucs		. #x2F80E)	; 免
     ))
 (define-char
   '((ideographic-strokes . 5)
@@ -768,7 +767,6 @@
     (=gb2312		. #x4362)	; &C1-492D; [35-66]
     (=ks-x1001		. #x5873)	; &I-K0-5873; [56-83]
     (=cns11643-1	. #x492D)	; &I-C1-492D; [41-13]
-    (=big5		. #xA74B)	; &I-B-A74B;
     (=ucs@unicode	. #x514D)	; &C1-492D;
     (mojikyo		. 001358)	; &MCS-6000054E;
     ))
diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el
index 6b5f495..0c114cc 100644
--- a/lisp/utf-2000/Ideograph-R028-Private.el
+++ b/lisp/utf-2000/Ideograph-R028-Private.el
@@ -402,19 +402,28 @@
     (=hanziku-1		. #xAEE3)	; &I-HZK01-AEE3;
     ))
 (define-char
-  '((=>ucs		. #x21FEE)	; ð¡¿®
-    (ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 4)
-    (total-strokes	 . 6)
-    (=daikanwa		. 03081)	; &M-03081;
-    ))
-(define-char
-  '((=>ucs		. #x21FEE)	; ð¡¿®
-    (morohashi-daikanwa	3081 0 0)
-    (ideographic-radical . 28)	; ⼛
-    (ideographic-strokes . 4)
-    (total-strokes	 . 6)
-    (=cns11643-6	. #x237E)	; &C6-237E; [03-94]
+  '((=ucs		. #x21FEE)	; ð¡¿®
+    (->subsumptive
+     ((ideographic-radical . 28)	; ⼛
+      (ideographic-strokes . 4)
+      (total-strokes	   . 6)
+      (->subsumptive
+       ((=daikanwa	    . 03081)	; &M-03081;
+	)
+       ((=cns11643-6	    . #x237E)	; &C6-237E; [03-94]
+	))
+      )
+     ((ideographic-radical . 47)	; â¼®
+      (ideographic-strokes . 4)
+      (total-strokes	   . 7)
+      (->subsumptive
+       ((=daikanwa	    . 08682)	; &M-08682;
+	)
+       ((hanyu-dazidian	    2 1097 16)
+	(=hanziku-3	    . #xE041)	; &HZK03-E041;
+	(=ucs@iso	    . #x21FEE)	; &HZK03-E041;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 28)	; ⼛
diff --git a/lisp/utf-2000/Ideograph-R041-Inch.el b/lisp/utf-2000/Ideograph-R041-Inch.el
index 0796b81..9d41101 100644
--- a/lisp/utf-2000/Ideograph-R041-Inch.el
+++ b/lisp/utf-2000/Ideograph-R041-Inch.el
@@ -800,88 +800,86 @@
     (=daikanwa		. 07467)	; &I-M-07467;
     ))
 (define-char
-  '((=>ucs		. #x21B4E)	; 𡭎
-    (ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (<-ancient-ideograph
-     (:sources	(morohashi-daikanwa)
-      :char	((=daikanwa	     . 07465)	; &I-M-07465;
-		 )
-      ))
-    (=daikanwa		. 07468)	; &M-07468;
-    (mojikyo		. 007468)	; &MCS-60001D2C;
-    ))
-(define-char
-  '((=>ucs		. #x21B4E)	; 𡭎
-    (morohashi-daikanwa	7468 0 2)
-    (ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-7	. #x375C)	; &C7-375C; [23-60]
-    ))
-(define-char
-  '((morohashi-daikanwa	7468 0 3)
-    (ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
+  '((ideographic-radical . 41)	; ⼨
     (=ucs		. #x21B4E)	; 𡭎
+    (->subsumptive
+     ((ideographic-strokes . 14)
+      (total-strokes	   . 17)
+      (<-ancient-ideograph
+       ((=daikanwa	    . 07465)	; &I-M-07465;
+	))
+      (<-ancient-ideograph*sources
+       daikanwa)
+      (=daikanwa	  . 07468)	; &M-07468;
+      (mojikyo		  . 007468)	; &MCS-60001D2C;
+      )
+     ((ideographic-strokes . 14)
+      (total-strokes	   . 17)
+      (=cns11643-7	  . #x375C)	; &C7-375C; [23-60]
+      )
+     ((ideographic-strokes . 13)
+      (total-strokes	   . 16)
+      (=ucs@iso		  . #x21B4E)	; &UU+21B4E;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x21B50)	; 𡭐
-    (ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=daikanwa		. 07469)	; &M-07469;
-    ))
-(define-char
-  '((morohashi-daikanwa	7469 0 1)
-    (ideographic-radical . 41)	; ⼨
+  '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x21B50)	; 𡭐
-    (=cns11643-5	. #x614F)	; &I-C5-614F; [65-47]
+    (->subsumptive
+     ((=daikanwa	  . 07469)	; &M-07469;
+      )
+     ((=cns11643-5	  . #x614F)	; &C5-614F; [65-47]
+      (=ucs@iso		  . #x21B50)	; &C5-614F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (ancient-ideograph-of
-     ((char . ((=daikanwa	   . 07465)	; &I-M-07465;
-	       ))
+    (<-ancient-ideograph
+     ((=daikanwa	  . 07465)	; &I-M-07465;
       ))
     (=ucs		. #x21B51)	; 𡭑
     (=cns11643-7	. #x4659)	; &I-C7-4659; [38-57]
     (=daikanwa		. 07470)	; &I-M-07470;
     ))
 (define-char
-  '((=>ucs		. #x21B52)	; 𡭒
-    (ideographic-radical . 41)	; ⼨
-    (ideographic-strokes . 17)
-    (total-strokes	 . 20)
-    (=daikanwa		. 07471)	; &M-07471;
-    (mojikyo		. 007471)	; &MCS-60001D2F;
-    ))
-(define-char
-  '((morohashi-daikanwa	7471 0 2)
-    (ideographic-radical . 41)	; ⼨
+  '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (=ucs		. #x21B52)	; 𡭒
-    (=cns11643-7	. #x4D54)	; &I-C7-4D54; [45-52]
+    (->subsumptive
+     ((=daikanwa	  . 07471)	; &M-07471;
+      (mojikyo		  . 007471)	; &MCS-60001D2F;
+      )
+     ((=cns11643-7	  . #x4D54)	; &C7-4D54; [45-52]
+      (=ucs@iso		  . #x21B52)	; &C7-4D54;
+      ))
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (=ucs		. #x21B53)	; 𡭓
-    (=cns11643-7	. #x532F)	; &I-C7-532F; [51-15]
-    (=daikanwa		. 07472)	; &I-M-07472;
+    (->subsumptive
+     ((=daikanwa	  . 07472)	; &M-07472;
+      (=ucs@iso		  . #x21B53)	; &M-07472;
+      )
+     ((=cns11643-7	  . #x532F)	; &C7-532F; [51-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 41)	; ⼨
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (=ucs		. #x2330F)	; 𣌏
-    (=cns11643-5	. #x7339)	; &I-C5-7339; [83-25]
+    (->subsumptive
+     ((=cns11643-5	  . #x7339)	; &C5-7339; [83-25]
+      (=ucs@iso		  . #x2330F)	; &C5-7339;
+      )
+     ((hanyu-dazidian	  2 1542 5)
+      (=hanziku-4	  . #xE7B0)	; &HZK04-E7B0;
+      ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el
index e7413bb..92d8be9 100644
--- a/lisp/utf-2000/Ideograph-R042-Small.el
+++ b/lisp/utf-2000/Ideograph-R042-Small.el
@@ -819,19 +819,18 @@
     (=cns11643-7	. #x2D3A)	; &I-C7-2D3A; [13-26]
     ))
 (define-char
-  '((=>ucs		. #x221D4)	; 𢇔
-    (ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 07534)	; &M-07534;
-    ))
-(define-char
-  '((morohashi-daikanwa	7534 0 0)
-    (ideographic-radical . 42)	; ⼩
+  '((ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x221D4)	; 𢇔
-    (=cns11643-4	. #x5626)	; &I-C4-5626; [54-06]
+    (->subsumptive
+     ((=daikanwa	  . 07534)	; &M-07534;
+      )
+     ((hanyu-dazidian	  1 566 11)
+      (=cns11643-4	  . #x5626)	; &HZK02-C46D; [54-06]
+      (=hanziku-2	  . #xC46D)	; &I-HZK02-C46D;
+      (=ucs@iso		  . #x221D4)	; &HZK02-C46D;
+      ))
     ))
 (define-char
   '((=>ucs		. #x21BBB)	; ð¡®»
diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index ab975b1..3d097ba 100644
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -793,27 +793,27 @@
     (=daikanwa		. 07700)	; &I-M-07700;
     ))
 (define-char
-  '((=>ucs		. #x21C61)	; 𡱡
-    (ideographic-radical . 44)	; ⼫
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 07701)	; &M-07701;
-    ))
-(define-char
-  '((morohashi-daikanwa	7701 0 0)
-    (ideographic-radical . 44)	; ⼫
+  '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x21C61)	; 𡱡
-    (=cns11643-5	. #x2874)	; &I-C5-2874; [08-84]
+    (->subsumptive
+     ((=daikanwa	  . 07701)	; &M-07701;
+      )
+     ((=ucs@iso		  . #x21C61)	; &UU+21C61;
+      )
+     ((=cns11643-5	  . #x2874)	; &C5-2874; [08-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (hanyu-dazidian	2 1095 2)
     (=ucs		. #x221C0)	; 𢇀
     (=cns11643-6	. #x3041)	; &I-C6-3041; [16-33]
     (=daikanwa		. 07704)	; &I-M-07704;
+    (=hanziku-3		. #xDFB2)	; &I-HZK03-DFB2;
     ))
 (define-char
   '((total-strokes	 . 9)
diff --git a/lisp/utf-2000/Ideograph-R047-River.el b/lisp/utf-2000/Ideograph-R047-River.el
index f3da8b6..b632617 100644
--- a/lisp/utf-2000/Ideograph-R047-River.el
+++ b/lisp/utf-2000/Ideograph-R047-River.el
@@ -18,10 +18,26 @@
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (->mistakable
+     ((=daikanwa	  . 08669)	; &I-M-08669;
+      )
+     ((=daikanwa	  . 08675)	; &I-M-08675;
+      ))
+    (->mistakable*sources
+     kangxi)
+    (<-ancient-ideograph
+     ((=daikanwa	  . 04969)	; &I-M-04969;
+      ))
+    (<-ancient-ideograph*sources
+     yupian)
+    (=daikanwa		. 08670)	; &M-08670;
+    ))
+(define-char
+  '((ideographic-radical . 47)	; â¼®
+    (ideographic-strokes . 0)
     (total-strokes	 . 1)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 47)
-    (hanyu-dazidian-char . 6)
+    (hanyu-dazidian	1 47 6)
     (=ucs		. #x21FE8)	; 𡿨
     (=cns11643-4	. #x2125)	; &I-C4-2125; [01-05]
     (=big5-cdp		. #x8DEA)	; &I-CDP-8DEA;
@@ -55,6 +71,20 @@
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (<-simplified@JP/old
+     ((=jis-x0208	  . #x3731)	; &GT-47374; [23-17]
+      (=ks-x1001	  . #x7D3A)	; &I-K0-7D3A; [93-26]
+      (=daikanwa	  . 35238)	; &I-M-35238;
+      ))
+    (<-simplified@JP/old*sources
+     daikanwa)
+    (=big5-cdp		. #x8BED)	; &CDP-8BED;
+    (=daikanwa		. 08674)	; &I-M-08674;
+    ))
+(define-char
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 1)
     (total-strokes	 . 4)
     (=ucs		. #x21FE7)	; 𡿧
@@ -131,68 +161,81 @@
     (=daikanwa		. 08680)	; &I-M-08680;
     ))
 (define-char
-  '((morohashi-daikanwa	8680 1)
+  '((ideographic-radical@ucs . 47)	; â¼®
+    (ideographic-radical@ucs*sources
+     daikanwa cns11643-6 ucs)
+    (ideographic-radical@cns . 162)	; ⾡
+    (ideographic-radical@cns*sources
+     cns11643-1)
+    (=ucs		. #x5DE1)	; å·¡
+    (=big5		. #xA8B5)	; &I-B-A8B5;
+    ))
+(define-char
+  '((=>ucs*		. #x5DE1)	; å·¡
+    (=>ucs@gb		. #x5DE1)	; &GT-10953;
+    (=>ucs@jis		. #x5DE1)	; &GT-10953;
     (ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=ucs		. #x5DE1)	; å·¡
-    (=jis-x0208		. #x3D64)	; &I-J90-3D64; [29-68]
-    (=gb2312		. #x5132)	; &I-G0-5132; [49-18]
-    (=cns11643-6	. #x2736)	; &I-C6-2736; [07-22]
-    (=gt		. 10953)	; &I-GT-10953;
-    (=gt-pj-1		. #x3D64)	; &I-GT-10953; [29-68]
-    (mojikyo		. 050160)	; &MCS-6000C3F0;
+    (<-denotational
+     ((=ucs		  . #x5DE1)	; å·¡
+      ))
+    (=ucs		. #x2F881)	; 巡
+    (->subsumptive
+     ((morohashi-daikanwa	8680 1)
+      (=jis-x0208	  . #x3D64)	; &GT-10953; [29-68]
+      (=gb2312		  . #x5132)	; &I-G0-5132; [49-18]
+      (=gt		  . 10953)	; &I-GT-10953;
+      (=gt-pj-1		  . #x3D64)	; &I-GT-10953; [29-68]
+      (=ucs@unicode	  . #x5DE1)	; &GT-10953;
+      (mojikyo		  . 050160)	; &MCS-6000C3F0;
+      )
+     ((=cns11643-6	  . #x2736)	; &C6-2736; [07-22]
+      (=ucs@iso		  . #x2F881)	; &C6-2736;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x21FEC)	; 𡿬
-    (=cns11643-6	. #x245C)	; &I-C6-245C; [04-60]
-    (=daikanwa		. 49063)	; &I-M-49063;
+    (->subsumptive
+     ((=cns11643-6	  . #x245C)	; &M-49063; [04-60]
+      (=daikanwa	  . 49063)	; &I-M-49063;
+      )
+     ((=ucs@iso		  . #x21FEC)	; &UU+21FEC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x3829)	; ã ©
-    (=cns11643-3	. #x235B)	; &I-C3-235B; [03-59]
-    (=daikanwa		. 49064)	; &I-M-49064;
-    ))
-(define-char
-  '((=>ucs		. #x5DDF)	; 巟
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=big5		. #xC9DA)	; &M-49065;
-    (=daikanwa		. 49065)	; &I-M-49065;
-    (=ucs@big5		. #x5DDF)	; &M-49065;
-    ))
-(define-char
-  '((=>ucs		. #x5DDF)	; 巟
-    (morohashi-daikanwa	49065 0 1)
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=cns11643-2	. #x223A)	; &C2-223A; [02-26]
-    (=ucs@cns		. #x5DDF)	; &C2-223A;
-    ))
-(define-char
-  '((=>ucs		. #x5DDF)	; 巟
-    (morohashi-daikanwa	49065 0 2)
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=gt		. 10950)	; &GT-10950;
-    (=gt-k		. 02004)	; &I-GT-K02004;
-    (=gt-pj-3		. #x3D7D)	; &GT-10950; [29-93]
+    (->subsumptive
+     ((=daikanwa	  . 49064)	; &M-49064;
+      (=ucs@iso		  . #x3829)	; &M-49064;
+      )
+     ((=cns11643-3	  . #x235B)	; &C3-235B; [03-59]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	49065 0 3)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x5DDF)	; 巟
+    (=big5		. #xC9DA)	; &I-B-C9DA;
+    (->subsumptive
+     ((=daikanwa	  . 49065)	; &M-49065;
+      )
+     ((=cns11643-2	  . #x223A)	; &C2-223A; [02-26]
+      (=ucs@cns		  . #x5DDF)	; &C2-223A;
+      )
+     ((=gt		  . 10950)	; &GT-10950;
+      (=gt-k		  . 02004)	; &I-GT-K02004;
+      (=gt-pj-3		  . #x3D7D)	; &GT-10950; [29-93]
+      )
+     ((=ucs@unicode	  . #x5DDF)	; &UU+5DDF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -212,6 +255,30 @@
     (=daikanwa		. 08681)	; &I-M-08681;
     ))
 (define-char
+  '((=ucs		. #x21FEE)	; ð¡¿®
+    (->subsumptive
+     ((ideographic-radical . 28)	; ⼛
+      (ideographic-strokes . 4)
+      (total-strokes	   . 6)
+      (->subsumptive
+       ((=daikanwa	    . 03081)	; &M-03081;
+	)
+       ((=cns11643-6	    . #x237E)	; &C6-237E; [03-94]
+	))
+      )
+     ((ideographic-radical . 47)	; â¼®
+      (ideographic-strokes . 4)
+      (total-strokes	   . 7)
+      (->subsumptive
+       ((=daikanwa	    . 08682)	; &M-08682;
+	)
+       ((hanyu-dazidian	    2 1097 16)
+	(=hanziku-3	    . #xE041)	; &HZK03-E041;
+	(=ucs@iso	    . #x21FEE)	; &HZK03-E041;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
@@ -220,15 +287,15 @@
     (=daikanwa		. 08683)	; &I-M-08683;
     ))
 (define-char
-  '((=>ucs		. #x5DE1)	; å·¡
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (<-denotational
+     ((=ucs		  . #x5DE1)	; å·¡
+      ))
     (=ks-x1001		. #x625E)	; &M-08684; [66-62]
-    (=big5		. #xA8B5)	; &I-B-A8B5;
     (=daikanwa		. 08684)	; &I-M-08684;
     (=jef-china3	. #x67AA)	; &I-JC3-67AA;
-    (=ucs@big5		. #x5DE1)	; &M-08684;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -239,17 +306,6 @@
     (=daikanwa		. 08685)	; &I-M-08685;
     ))
 (define-char
-  '((ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (->same
-     ((=daikanwa	  . 03081)	; &M-03081;
-      ))
-    (hanyu-dazidian	2 1097 16)
-    (=ucs		. #x21FEE)	; ð¡¿®
-    (=hanziku-3		. #xE041)	; &I-HZK03-E041;
-    ))
-(define-char
   '((=>ucs		. #x21FF1)	; ð¡¿±
     (ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 5)
@@ -288,65 +344,71 @@
     (=ucs		. #x21FF8)	; 𡿸
     ))
 (define-char
-  '((=>ucs		. #x21FF9)	; ð¡¿¹
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 08690)	; &M-08690;
-    ))
-(define-char
-  '((morohashi-daikanwa	8690 0 4)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x21FF9)	; ð¡¿¹
-    (=cns11643-6	. #x3056)	; &I-C6-3056; [16-54]
+    (->subsumptive
+     ((=daikanwa	  . 08690)	; &M-08690;
+      )
+     ((=cns11643-6	  . #x3056)	; &C6-3056; [16-54]
+      (=ucs@iso		  . #x21FF9)	; &C6-3056;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (hanyu-dazidian	2 1098 6)
     (=ucs		. #x21FFB)	; ð¡¿»
     (=cns11643-6	. #x3053)	; &I-C6-3053; [16-51]
     (=daikanwa		. 08691)	; &I-M-08691;
+    (=hanziku-3		. #xE057)	; &I-HZK03-E057;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (hanyu-dazidian	2 1098 8)
     (=ucs		. #x21FFD)	; ð¡¿½
     (=cns11643-6	. #x3726)	; &I-C6-3726; [23-06]
     (=daikanwa		. 08692)	; &I-M-08692;
+    (=hanziku-3		. #xE059)	; &I-HZK03-E059;
     ))
 (define-char
-  '((=>ucs		. #x20657)	; 𠙗
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 08694)	; &M-08694;
+    (hanyu-dazidian	2 1098 7)
+    (=ucs		. #x21FFC)	; ð¡¿¼
+    (=daikanwa		. 08693)	; &I-M-08693;
+    (=hanziku-3		. #xE058)	; &I-HZK03-E058;
     ))
 (define-char
-  '((morohashi-daikanwa	8694 0 0)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x20657)	; 𠙗
-    (=cns11643-6	. #x3727)	; &I-C6-3727; [23-07]
-    ))
-(define-char
-  '((=>ucs		. #x21FFE)	; ð¡¿¾
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 08695)	; &M-08695;
+    (->subsumptive
+     ((=daikanwa	  . 08694)	; &M-08694;
+      )
+     ((=cns11643-6	  . #x3727)	; &C6-3727; [23-07]
+      (=ucs@iso		  . #x20657)	; &C6-3727;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8695 0 0)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x21FFE)	; ð¡¿¾
-    (=cns11643-5	. #x322B)	; &I-C5-322B; [18-11]
+    (->subsumptive
+     ((=daikanwa	  . 08695)	; &M-08695;
+      )
+     ((hanyu-dazidian	  2 1098 11)
+      (=cns11643-5	  . #x322B)	; &HZK03-E05C; [18-11]
+      (=hanziku-3	  . #xE05C)	; &I-HZK03-E05C;
+      (=ucs@iso		  . #x21FFE)	; &HZK03-E05C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -384,25 +446,31 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (hanyu-dazidian	2 1406 14)
     (=ucs		. #x21FFF)	; ð¡¿¿
     (=cns11643-4	. #x3141)	; &I-C4-3141; [17-33]
     (=daikanwa		. 08697)	; &I-M-08697;
+    (=hanziku-4		. #xCBE5)	; &I-HZK04-CBE5;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (hanyu-dazidian	2 1098 10)
     (=ucs		. #x22000)	; 𢀀
     (=cns11643-6	. #x3F2D)	; &I-C6-3F2D; [31-13]
     (=daikanwa		. 08698)	; &I-M-08698;
+    (=hanziku-3		. #xE05B)	; &I-HZK03-E05B;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (hanyu-dazidian	2 1098 14)
     (=ucs		. #x22001)	; 𢀁
     (=cns11643-5	. #x3776)	; &I-C5-3776; [23-86]
     (=daikanwa		. 08699)	; &I-M-08699;
+    (=hanziku-3		. #xE05F)	; &I-HZK03-E05F;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -415,9 +483,11 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (hanyu-dazidian	2 1098 15)
     (=ucs		. #x22002)	; 𢀂
     (=cns11643-6	. #x5C48)	; &I-C6-5C48; [60-40]
     (=daikanwa		. 08701)	; &I-M-08701;
+    (=hanziku-3		. #xE060)	; &I-HZK03-E060;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
@@ -450,98 +520,125 @@
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (hanyu-dazidian	2 1098 17)
     (=ucs		. #x22003)	; 𢀃
     (=cns11643-7	. #x2252)	; &I-C7-2252; [02-50]
     (=daikanwa		. 08703)	; &I-M-08703;
+    (=hanziku-3		. #xE062)	; &I-HZK03-E062;
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (hanyu-dazidian	2 1099 1)
     (=ucs		. #x22004)	; 𢀄
     (=cns11643-5	. #x5439)	; &I-C5-5439; [52-25]
     (=daikanwa		. 08704)	; &I-M-08704;
+    (=hanziku-3		. #xE072)	; &I-HZK03-E072;
     ))
 (define-char
-  '((=>ucs		. #x22007)	; 𢀇
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 08705)	; &M-08705;
-    ))
-(define-char
-  '((morohashi-daikanwa	8705 0 0)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x22007)	; 𢀇
-    (=cns11643-7	. #x3768)	; &I-C7-3768; [23-72]
+    (->subsumptive
+     ((=daikanwa	  . 08705)	; &M-08705;
+      )
+     ((hanyu-dazidian	  2 1099 2)
+      (=cns11643-7	  . #x3768)	; &HZK03-E073; [23-72]
+      (=hanziku-3	  . #xE073)	; &I-HZK03-E073;
+      (=ucs@iso		  . #x22007)	; &HZK03-E073;
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x22008)	; 𢀈
-    (=daikanwa		. 08706)	; &I-M-08706;
-    ))
-(define-char
-  '((=>ucs		. #x22008)	; 𢀈
-    (morohashi-daikanwa	8706 0 0)
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=cns11643-7	. #x3F4A)	; &C7-3F4A; [31-42]
-    ))
-(define-char
-  '((=>ucs		. #x22009)	; 𢀉
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=daikanwa		. 08707)	; &M-08707;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1099 3)
+      (=daikanwa	  . 08706)	; &M-08706;
+      (=hanziku-3	  . #xE074)	; &I-HZK03-E074;
+      (=ucs@iso		  . #x22008)	; &M-08706;
+      )
+     ((=cns11643-7	  . #x3F4A)	; &C7-3F4A; [31-42]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8707 0 0)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x22009)	; 𢀉
-    (=cns11643-7	. #x4663)	; &I-C7-4663; [38-67]
-    ))
-(define-char
-  '((=>ucs		. #x2200A)	; 𢀊
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 16)
-    (total-strokes	 . 19)
-    (=daikanwa		. 08708)	; &M-08708;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1099 4)
+      (=daikanwa	  . 08707)	; &M-08707;
+      (=hanziku-3	  . #xE075)	; &I-HZK03-E075;
+      )
+     ((=ucs@iso		  . #x22009)	; &UU+22009;
+      )
+     ((=cns11643-7	  . #x4663)	; &C7-4663; [38-67]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8708 0 0)
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x2200A)	; 𢀊
-    (=cns11643-5	. #x6766)	; &I-C5-6766; [71-70]
+    (->subsumptive
+     ((hanyu-dazidian	  2 1099 5)
+      (=daikanwa	  . 08708)	; &M-08708;
+      (=hanziku-3	  . #xE076)	; &I-HZK03-E076;
+      )
+     ((=ucs@iso		  . #x2200A)	; &UU+2200A;
+      )
+     ((=cns11643-5	  . #x6766)	; &C5-6766; [71-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 21)
     (total-strokes	 . 24)
+    (hanyu-dazidian	2 1099 9)
     (=ucs		. #x2200E)	; 𢀎
     (=cns11643-7	. #x5E61)	; &I-C7-5E61; [62-65]
     (=daikanwa		. 08712)	; &I-M-08712;
+    (=hanziku-3		. #xE07A)	; &I-HZK03-E07A;
     ))
 (define-char
-  '((=>ucs		. #x22010)	; 𢀐
-    (ideographic-radical . 47)	; â¼®
+  '((ideographic-radical . 47)	; â¼®
     (ideographic-strokes . 26)
     (total-strokes	 . 29)
-    (=daikanwa		. 08713)	; &M-08713;
+    (=ucs		. #x22010)	; 𢀐
+    (->subsumptive
+     ((hanyu-dazidian	  1 279 3)
+      (=daikanwa	  . 08713)	; &M-08713;
+      (=hanziku-1	  . #xDFAD)	; &I-HZK01-DFAD;
+      )
+     ((=cns11643-7	  . #x6535)	; &C7-6535; [69-21]
+      (=ucs@iso		  . #x22010)	; &C7-6535;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	8713 0 0)
-    (ideographic-radical . 47)	; â¼®
-    (ideographic-strokes . 26)
-    (total-strokes	 . 29)
-    (=ucs		. #x22010)	; 𢀐
-    (=cns11643-7	. #x6535)	; &I-C7-6535; [69-21]
+  '((ideographic-radical . 47)	; â¼®
+    (hanyu-dazidian	2 1099 6)
+    (=ucs		. #x2200B)	; 𢀋
+    (=hanziku-3		. #xE077)	; &I-HZK03-E077;
+    ))
+(define-char
+  '((ideographic-radical . 47)	; â¼®
+    (hanyu-dazidian	2 1099 7)
+    (=ucs		. #x2200C)	; 𢀌
+    (=hanziku-3		. #xE078)	; &I-HZK03-E078;
+    ))
+(define-char
+  '((ideographic-radical . 47)	; â¼®
+    (hanyu-dazidian	2 1099 8)
+    (=ucs		. #x2200D)	; 𢀍
+    (=hanziku-3		. #xE079)	; &I-HZK03-E079;
+    ))
+(define-char
+  '((ideographic-radical . 47)	; â¼®
+    (hanyu-dazidian	8 18 16)
+    (=ucs		. #x2200F)	; 𢀏
+    (=hanziku-12	. #xECE5)	; &I-HZK12-ECE5;
     ))
diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index 491680b..f24d465 100644
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -76,134 +76,142 @@
     (=cns11643-3	. #x2247)	; &I-C3-2247; [02-39]
     ))
 (define-char
-  '((=>ucs		. #x5E82)	; 庂
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=big5		. #xC97A)	; &M-09224;
-    (=daikanwa		. 09224)	; &I-M-09224;
-    ))
-(define-char
-  '((morohashi-daikanwa	9224 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5E82)	; 庂
-    (=cns11643-2	. #x215B)	; &I-C2-215B; [01-59]
-    ))
-(define-char
-  '((=>ucs		. #x5E83)	; 広
-    (morohashi-daikanwa	9224 1)
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5722)	; &GT-11938; [55-02]
-      (=ks-x1001	  . #x4E46)	; &I-K0-4E46; [46-38]
-      (=daikanwa	  . 09493)	; &I-M-09493;
+    (=big5		. #xC97A)	; &I-B-C97A;
+    (->subsumptive
+     ((=daikanwa	  . 09224)	; &M-09224;
+      )
+     ((=cns11643-2	  . #x215B)	; &C2-215B; [01-59]
+      (=ucs@unicode	  . #x5E82)	; &C2-215B;
       ))
-    (=jis-x0208		. #x392D)	; &GT-11621; [25-13]
-    (=gt		. 11621)	; &I-GT-11621;
-    (=gt-k		. 00928)	; &I-GT-K00928;
-    (=gt-pj-1		. #x392D)	; &I-GT-11621; [25-13]
-    (=ucs@jis		. #x5E83)	; &GT-11621;
-    (mojikyo		. 050163)	; &MCS-6000C3F3;
     ))
 (define-char
-  '((morohashi-daikanwa	9224 1 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5E83)	; 広
-    (=cns11643-3	. #x2248)	; &I-C3-2248; [02-40]
-    ))
-(define-char
-  '((=>ucs		. #x386F)	; 㡯
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=daikanwa		. 09225)	; &M-09225;
+    (->subsumptive
+     ((morohashi-daikanwa	9224 1)
+      (<-simplified@JP/Jouyou
+       ((=jis-x0208	    . #x5722)	; &GT-11938; [55-02]
+	(=ks-x1001	    . #x4E46)	; &I-K0-4E46; [46-38]
+	(=daikanwa	    . 09493)	; &I-M-09493;
+	))
+      (=jis-x0208	  . #x392D)	; &GT-11621; [25-13]
+      (=gt		  . 11621)	; &I-GT-11621;
+      (=gt-k		  . 00928)	; &I-GT-K00928;
+      (=gt-pj-1		  . #x392D)	; &I-GT-11621; [25-13]
+      (=ucs@jis		  . #x5E83)	; &GT-11621;
+      (mojikyo		  . 050163)	; &MCS-6000C3F3;
+      )
+     ((=cns11643-3	  . #x2248)	; &C3-2248; [02-40]
+      (=ucs@unicode	  . #x5E83)	; &C3-2248;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9225 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x386F)	; 㡯
-    (=cns11643-3	. #x2360)	; &I-C3-2360; [03-64]
+    (->subsumptive
+     ((=daikanwa	  . 09225)	; &M-09225;
+      )
+     ((=ucs@unicode	  . #x386F)	; &UU+386F;
+      )
+     ((=cns11643-3	  . #x2360)	; &C3-2360; [03-64]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x221D7)	; 𢇗
-    (=cns11643-4	. #x2268)	; &I-C4-2268; [02-72]
-    (=daikanwa		. 09226)	; &I-M-09226;
-    ))
-(define-char
-  '((=>ucs		. #x221D8)	; 𢇘
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=daikanwa		. 09227)	; &M-09227;
+    (->subsumptive
+     ((=daikanwa	  . 09226)	; &M-09226;
+      )
+     ((=cns11643-4	  . #x2268)	; &C4-2268; [02-72]
+      (=ucs@iso		  . #x221D7)	; &C4-2268;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9227 0 1)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x221D8)	; 𢇘
-    (=cns11643-5	. #x225E)	; &I-C5-225E; [02-62]
+    (->subsumptive
+     ((=daikanwa	  . 09227)	; &M-09227;
+      )
+     ((=cns11643-5	  . #x225E)	; &C5-225E; [02-62]
+      (=ucs@iso		  . #x221D8)	; &C5-225E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x221D9)	; 𢇙
-    (=cns11643-6	. #x2464)	; &I-C6-2464; [04-68]
-    (=daikanwa		. 09228)	; &I-M-09228;
+    (->subsumptive
+     ((=daikanwa	  . 09228)	; &M-09228;
+      )
+     ((=ucs@iso		  . #x221D9)	; &UU+221D9;
+      )
+     ((=cns11643-6	  . #x2464)	; &C6-2464; [04-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x3870)	; ã¡°
-    (=cns11643-3	. #x235F)	; &I-C3-235F; [03-63]
-    (=daikanwa		. 09229)	; &I-M-09229;
-    (=cbeta		. 01688)	; &I-CB01688;
-    ))
-(define-char
-  '((=>ucs		. #x221DA)	; 𢇚
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=daikanwa		. 09230)	; &M-09230;
-    (mojikyo		. 009230)	; &MCS-6000240E;
+    (->subsumptive
+     ((=daikanwa	  . 09229)	; &M-09229;
+      (=cbeta		  . 01688)	; &I-CB01688;
+      )
+     ((=cns11643-3	  . #x235F)	; &C3-235F; [03-63]
+      (=ucs@unicode	  . #x3870)	; &C3-235F;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	9230 0 1)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x221DA)	; 𢇚
-    (=cns11643-5	. #x225D)	; &I-C5-225D; [02-61]
+    (->subsumptive
+     ((=daikanwa	  . 09230)	; &M-09230;
+      (mojikyo		  . 009230)	; &MCS-6000240E;
+      )
+     ((=ucs@iso		  . #x221DA)	; &UU+221DA;
+      )
+     ((=cns11643-5	  . #x225D)	; &C5-225D; [02-61]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x3871)	; 㡱
-    (=cns11643-3	. #x235E)	; &I-C3-235E; [03-62]
-    (=daikanwa		. 09231)	; &I-M-09231;
+    (->subsumptive
+     ((=daikanwa	  . 09231)	; &M-09231;
+      )
+     ((=cns11643-3	  . #x235E)	; &C3-235E; [03-62]
+      (=ucs@unicode	  . #x3871)	; &C3-235E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (=ucs		. #x221DB)	; 𢇛
-    (=cns11643-6	. #x2463)	; &I-C6-2463; [04-67]
-    (=daikanwa		. 09232)	; &I-M-09232;
-    (=cbeta		. 06872)	; &I-CB06872;
+    (->subsumptive
+     ((=daikanwa	  . 09232)	; &M-09232;
+      (=cbeta		  . 06872)	; &I-CB06872;
+      )
+     ((=cns11643-6	  . #x2463)	; &C6-2463; [04-67]
+      (=ucs@iso		  . #x221DB)	; &C6-2463;
+      ))
     ))
 (define-char
   '((=>ucs		. #x221DC)	; 𢇜
diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 1f40e8b..f2c1928 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -8777,57 +8777,35 @@
     (=daikanwa		. 17708)	; &I-M-17708;
     ))
 (define-char
-  '((=>ucs		. #x23D9A)	; 𣶚
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 203 5)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=big5-cdp	  . #x8BED)	; &CDP-8BED;
+    (=ucs		. #x23D9A)	; 𣶚
+    (->subsumptive
+     ((hanyu-dazidian	  1 203 5)
+      (=daikanwa	  . 17712)	; &M-17712;
+      (=hanziku-1	  . #xD040)	; &I-HZK01-D040;
       )
-     ((=ucs		  . #x6C34)	; æ°´
+     ((=cns11643-6	  . #x4A59)	; &C6-4A59; [42-57]
+      (=ucs@iso		  . #x23D9A)	; &C6-4A59;
       ))
-    (=daikanwa		. 17712)	; &M-17712;
-    (=hanziku-1		. #xD040)	; &I-HZK01-D040;
     ))
 (define-char
-  '((morohashi-daikanwa	17712 0 0)
+  '((=>daikanwa		. 17712)	; &M-17712;
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (hanyu-dazidian	1 203 5)
-    (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=big5-cdp	  . #x8BED)	; &CDP-8BED;
-      )
-     ((=ucs		  . #x6C34)	; æ°´
+    (<-denotational
+     ((=ucs		  . #x23D9A)	; 𣶚
       ))
-    (=ucs		. #x23D9A)	; 𣶚
-    (=cns11643-6	. #x4A59)	; &I-C6-4A59; [42-57]
-    (=hanziku-1		. #xD040)	; &I-HZK01-D040;
-    ))
-(define-char
-  '((=>ucs		. #x23D9A)	; 𣶚
-    (morohashi-daikanwa	17712 0 5)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
     (ideographic-structure
-     (:cdp-combinator	4)
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x53E3)	; 口
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=big5-cdp	  . #x8BED)	; &CDP-8BED;
+     ((=jis-x0208	  . #x3426)	; &GT-00718; [20-06]
+      (=gb2312		  . #x5929)	; &I-G0-5929; [57-09]
+      (=ks-x1001	  . #x4A49)	; &I-K0-4A49; [42-41]
+      (=daikanwa	  . 00577)	; &I-M-00577;
       )
      ((=ucs		  . #x6C34)	; æ°´
       ))
@@ -8835,30 +8813,33 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
     (=ucs		. #x6E00)	; 渀
-    (=jis-x0212		. #x4767)	; &I-JSP-4767; [39-71]
-    (=cns11643-2	. #x364F)	; &I-C2-364F; [22-47]
-    (=big5		. #xD5EB)	; &I-B-D5EB;
-    (=daikanwa		. 17714)	; &I-M-17714;
-    (=jef-china3	. #x56BB)	; &I-JC3-56BB;
-    ))
-(define-char
-  '((=>ucs		. #x3D03)	; 㴃
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-6	. #x412B)	; &M-17718; [33-11]
-    (=daikanwa		. 17718)	; &I-M-17718;
-    (=cbeta		. 02889)	; &I-CB02889;
+    (->subsumptive
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 11)
+      (=jis-x0212	  . #x4767)	; &M-17714; [39-71]
+      (=cns11643-2	  . #x364F)	; &I-C2-364F; [22-47]
+      (=big5		  . #xD5EB)	; &I-B-D5EB;
+      (=daikanwa	  . 17714)	; &I-M-17714;
+      (=ucs@unicode	  . #x6E00)	; &M-17714;
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes	   . 12)
+      (=jef-china3	  . #x56BB)	; &JC3-56BB;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	17718 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x3D03)	; 㴃
+    (->subsumptive
+     ((=cns11643-6	  . #x412B)	; &M-17718; [33-11]
+      (=daikanwa	  . 17718)	; &I-M-17718;
+      (=cbeta		  . 02889)	; &I-CB02889;
+      )
+     ((=ucs@unicode	  . #x3D03)	; &UU+3D03;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index c3d979a..ba947ea 100644
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -2851,41 +2851,52 @@
     (=daikanwa		. 23327)	; &I-M-23327;
     ))
 (define-char
-  '((=>ucs		. #x2032A)	; 𠌪
-    (ideographic-	(:radical	109 ; ⽬
-			 :strokes	6)
-			(:radical	9 ; ⼈
-			 :strokes	10))
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 189 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=big5-cdp	  . #x8B7A)	; &CDP-8B7A;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 10)
+    (total-strokes@ucs	     . 12)
+    (ideographic-radical@cns . 109)	; ⽬
+    (ideographic-strokes@cns . 6)
+    (total-strokes@cns	     . 11)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (=ucs		. #x2032A)	; 𠌪
+    (->subsumptive
+     ((hanyu-dazidian	  1 189 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=jis-x0208	    . #x5469)	; &GT-07201; [52-73]
-	(=cns11643-3	    . #x2139)	; &I-C3-2139; [01-25]
-	(=daikanwa	    . 05691)	; &I-M-05691;
+       ((=big5-cdp	    . #x8B7A)	; &CDP-8B7A;
 	)
-       ((=ucs		    . #x76EE)	; 目
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=jis-x0208	      . #x5469)	; &GT-07201; [52-73]
+	  (=cns11643-3	      . #x2139)	; &I-C3-2139; [01-25]
+	  (=daikanwa	      . 05691)	; &I-M-05691;
+	  )
+	 ((=ucs		      . #x76EE)	; 目
+	  ))
 	))
+      (=cns11643-5	  . #x3421)	; &M-23328; [20-01]
+      (=daikanwa	  . 23328)	; &I-M-23328;
+      (=hanziku-1	  . #xCD57)	; &I-HZK01-CD57;
+      )
+     ((=ucs@iso		  . #x2032A)	; &UU+2032A;
       ))
-    (=cns11643-5	. #x3421)	; &M-23328; [20-01]
-    (=daikanwa		. 23328)	; &I-M-23328;
-    (=hanziku-1		. #xCD57)	; &I-HZK01-CD57;
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x25186)	; 𥆆
-    (=cns11643-6	. #x4245)	; &I-C6-4245; [34-37]
-    (=daikanwa		. 23329)	; &I-M-23329;
+    (->subsumptive
+     ((=daikanwa	  . 23329)	; &M-23329;
+      )
+     ((=cns11643-6	  . #x4245)	; &C6-4245; [34-37]
+      (=ucs@iso		  . #x25186)	; &C6-4245;
+      ))
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el
index 358da44..3fe9fb6 100644
--- a/lisp/utf-2000/Ideograph-R120-Silk.el
+++ b/lisp/utf-2000/Ideograph-R120-Silk.el
@@ -10245,6 +10245,11 @@
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
+    (=ucs		. #x7E2B)	; 縫
+    (=big5		. #xC15F)	; &I-B-C15F;
+    ))
+(define-char
+  '((ideographic-radical . 120)	; â½·
     (<-denotational
      ((=ucs		  . #x7E2B)	; 縫
       ))
@@ -10417,11 +10422,6 @@
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
-    (=ucs		. #x7E2B)	; 縫
-    (=big5		. #xC15F)	; &I-B-C15F;
-    ))
-(define-char
-  '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
     (=ucs		. #x260D5)	; 𦃕
diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 9db5f5c..35d3c86 100644
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -695,18 +695,24 @@
     (=gb2312		. #x397D)	; &I-G0-397D; [25-93]
     ))
 (define-char
-  '((=>ucs		. #x5DE1)	; å·¡
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical@ucs . 47)	; â¼®
+    (ideographic-radical@ucs*sources
+     daikanwa cns11643-6 ucs)
+    (ideographic-radical@cns . 162)	; ⾡
+    (ideographic-radical@cns*sources
+     cns11643-1)
+    (=ucs		. #x5DE1)	; å·¡
+    (=big5		. #xA8B5)	; &I-B-A8B5;
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
-    (->mojikyo		. 050160)	; å·¡
-    (->ideographic-variants
-     ((morohashi-daikanwa	8680 1)
-      (=ucs		  . #x5DE1)	; å·¡
-      )
-     ((=daikanwa	  . 08684)	; &I-M-08684;
+    (<-denotational
+     ((=ucs		  . #x5DE1)	; å·¡
       ))
     (=cns11643-1	. #x4B56)	; &C1-4B56; [43-54]
+    (=ucs@cns		. #x5DE1)	; &C1-4B56;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -1495,13 +1501,19 @@
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (shinjigen-2	. 8232)
     (=ucs		. #x8FDA)	; 迚
-    (=jis-x0208		. #x6D69)	; &I-J90-6D69; [77-73]
-    (=gt		. 51828)	; &I-GT-51828;
-    (=gt-pj-1		. #x6D69)	; &I-GT-51828; [77-73]
-    (=daikanwa		. 38773)	; &I-M-38773;
+    (->subsumptive
+     ((total-strokes	   . 8)
+      (shinjigen-1	  . 8232)
+      (shinjigen-2	  . 8232)
+      (=jis-x0208	  . #x6D69)	; &GT-51828; [77-73]
+      (=gt		  . 51828)	; &I-GT-51828;
+      (=gt-pj-1		  . #x6D69)	; &I-GT-51828; [77-73]
+      (=daikanwa	  . 38773)	; &I-M-38773;
+      (=ucs@jis		  . #x8FDA)	; &GT-51828;
+      )
+     ((=ucs@unicode	  . #x8FDA)	; &UU+8FDA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -8268,8 +8280,7 @@
     (=cns11643-7	. #x296A)	; &C7-296A; [09-74]
     ))
 (define-char
-  '((=>daikanwa		39112 1)	; &GT-52598;
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (=ucs		. #x285B3)	; 𨖳
     (->subsumptive
      ((morohashi-daikanwa	39112 1)
@@ -8285,20 +8296,16 @@
       (total-strokes	   . 15)
       (=cns11643-5	  . #x5163)	; &C5-5163; [49-67]
       )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 14)
-      (=ucs@iso		  . #x285B3)	; &UU+285B3;
+     ((ideographic-strokes@ucs . 11)
+      (total-strokes@ucs       . 14)
+      (ideographic-strokes@gt . 12)
+      (total-strokes@gt	      . 15)
+      (=gt		  . 52500)	; &GT-52500;
+      (=gt-pj-10	  . #x4128)	; &GT-52500; [33-08]
+      (=ucs@iso		  . #x285B3)	; &GT-52500;
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	39112 1 3)
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=gt		. 52500)	; &GT-52500;
-    (=gt-pj-10		. #x4128)	; &GT-52500; [33-08]
-    ))
-(define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index ee102b7..67cdf79 100644
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -3919,8 +3919,7 @@
     (=daikanwa		. 41858)	; &I-M-41858;
     ))
 (define-char
-  '((=>daikanwa		41858 1)	; &GT-56222;
-    (ideographic-radical . 170)	; ⾩
+  '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x28EF4)	; 𨻴
diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index a343fce..67652e1 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -360,61 +360,131 @@
 ;;         ((null b) t)
 ;;         (t (< a b))))
 
+(defvar ideographic-radical nil)
+
 ;;;###autoload
 (defun char-representative-of-daikanwa (char &optional radical
-					     ignore-default dont-inherit)
+					     ignore-default checked)
   (unless radical
     (setq radical ideographic-radical))
-  (if (or (encode-char char 'ideograph-daikanwa 'defined-only)
-	  (encode-char char '=daikanwa-rev2 'defined-only))
-      char
-    (let ((m (char-feature char '=>daikanwa))
-	  m-m m-s pat
-	  ;;scs sc ret
-	  )
-      (or (and (integerp m)
-	       (or (decode-char '=daikanwa-rev2 m 'defined-only)
-		   (decode-char 'ideograph-daikanwa m)))
-	  (when (or m
-		    (setq m (get-char-attribute char 'morohashi-daikanwa)))
-	    (setq m-m (car m))
-	    (setq m-s (nth 1 m))
-	    (if (= m-s 0)
-		(or (decode-char '=daikanwa-rev2 m-m 'defined-only)
-		    (decode-char 'ideograph-daikanwa m-m))
-	      (when m
-		(setq pat (list m-m m-s))
-		(map-char-attribute (lambda (c v)
-				      (if (equal pat v)
-					  c))
-				    'morohashi-daikanwa))))
-	  (unless dont-inherit
-	    (map-char-family
-	     (lambda (sc)
-	       (let ((ret (char-representative-of-daikanwa sc nil t t)))
-		 (if (and ret
-			  (or (null radical)
-			      (eq (char-ideographic-radical ret radical)
-				  radical)))
-		     ret)))
-	     char))
-	  ;; (when (setq scs (append
-          ;;                  (get-char-attribute char '->subsumptive)
-          ;;                  (get-char-attribute char '->denotational)))
-          ;;   (while (and scs
-          ;;               (setq sc (car scs))
-          ;;               (not
-          ;;                (and
-          ;;                 (setq ret
-          ;;                       (char-representative-of-daikanwa sc nil t))
-          ;;                 (or (null radical)
-          ;;                     (eq (char-ideographic-radical ret radical)
-          ;;                         radical)
-          ;;                     (setq ret nil)))))
-          ;;     (setq scs (cdr scs)))
-          ;;   ret)
-	  (unless ignore-default
-	    char)))))
+  (if (or (null radical)
+          (eq (or (get-char-attribute char 'ideographic-radical)
+                  (char-ideographic-radical char radical t))
+              radical))
+      (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only)
+                     (encode-char char '=daikanwa-rev2 'defined-only))))
+	(or (and ret char)
+	    (if (setq ret (get-char-attribute char 'morohashi-daikanwa))
+		(let ((m-m (car ret))
+		      (m-s (nth 1 ret))
+		      pat)
+		  (if (= m-s 0)
+		      (or (decode-char '=daikanwa-rev2 m-m 'defined-only)
+			  (decode-char 'ideograph-daikanwa m-m))
+		    (setq pat (list m-m m-s))
+		    (map-char-attribute (lambda (c v)
+					  (if (equal pat v)
+					      c))
+					'morohashi-daikanwa))))
+            (and (setq ret (get-char-attribute char '=>daikanwa))
+		 (if (numberp ret)
+		     (or (decode-char '=daikanwa-rev2 ret 'defined-only)
+			 (decode-char 'ideograph-daikanwa ret))
+		   (map-char-attribute (lambda (c v)
+					 (if (equal ret v)
+					     char))
+				       'morohashi-daikanwa)))
+	    (unless (memq char checked)
+	      (catch 'tag
+		(let ((rest
+		       (append (get-char-attribute char '->subsumptive)
+			       (get-char-attribute char '->denotational)))
+		      (i 0)
+		      sc)
+		  (setq checked (cons char checked))
+		  (while rest
+		    (setq sc (car rest))
+		    (if (setq ret (char-representative-of-daikanwa
+				   sc radical t checked))
+			(throw 'tag ret))
+		    (setq checked (cons sc checked)
+			  rest (cdr rest)
+			  i (1+ i)))
+		  (setq rest (get-char-attribute char '->identical))
+		  (while rest
+		    (setq sc (car rest))
+		    (when (setq ret (char-representative-of-daikanwa
+				     sc radical t checked))
+		      (throw 'tag ret))
+		    (setq checked (cons sc checked)
+			  rest (cdr rest)))
+		  (setq rest
+			(append (get-char-attribute char '<-subsumptive)
+				(get-char-attribute char '<-denotational)))
+		  (while rest
+		    (setq sc (car rest))
+		    (when (setq ret (char-representative-of-daikanwa
+				     sc radical t checked))
+		      (throw 'tag ret))
+		    (setq checked (cons sc checked)
+			  rest (cdr rest))))))
+	    (unless ignore-default
+	      char)))))
+;; (defun char-representative-of-daikanwa (char &optional radical
+;;                                              ignore-default dont-inherit)
+;;   (unless radical
+;;     (setq radical ideographic-radical))
+;;   (if (or (encode-char char 'ideograph-daikanwa 'defined-only)
+;;           (encode-char char '=daikanwa-rev2 'defined-only))
+;;       char
+;;     (let ((m (char-feature char '=>daikanwa))
+;;           m-m m-s pat
+;;           scs sc ret
+;;           )
+;;       (or (and (integerp m)
+;;                (or (decode-char '=daikanwa-rev2 m 'defined-only)
+;;                    (decode-char 'ideograph-daikanwa m)))
+;;           (when (or m
+;;                     (setq m (get-char-attribute char 'morohashi-daikanwa)))
+;;             (setq m-m (car m))
+;;             (setq m-s (nth 1 m))
+;;             (if (= m-s 0)
+;;                 (or (decode-char '=daikanwa-rev2 m-m 'defined-only)
+;;                     (decode-char 'ideograph-daikanwa m-m))
+;;               (when m
+;;                 (setq pat (list m-m m-s))
+;;                 (map-char-attribute (lambda (c v)
+;;                                       (if (equal pat v)
+;;                                           c))
+;;                                     'morohashi-daikanwa))))
+;;           (unless dont-inherit
+;;             ;; (map-char-family
+;;             ;;  (lambda (sc)
+;;             ;;    (let ((ret (char-representative-of-daikanwa sc nil t t)))
+;;             ;;      (if (and ret
+;;             ;;               (or (null radical)
+;;             ;;                   (eq (char-ideographic-radical ret radical)
+;;             ;;                       radical)))
+;;             ;;          ret)))
+;;             ;;  char)
+;;             (when (setq scs (append
+;;                              (get-char-attribute char '->subsumptive)
+;;                              (get-char-attribute char '->denotational)))
+;;               (while (and scs
+;;                           (setq sc (car scs))
+;;                           (not
+;;                            (and
+;;                             (setq ret
+;;                                   (char-representative-of-daikanwa sc nil t t))
+;;                             (or (null radical)
+;;                                 (eq (char-ideographic-radical ret radical)
+;;                                     radical)
+;;                                 (setq ret nil)))))
+;;                 (setq scs (cdr scs)))
+;;               ret)
+;;             )
+;;           (unless ignore-default
+;;             char)))))
 
 (defun char-attributes-poly< (c1 c2 accessors testers defaulters)
   (catch 'tag
@@ -446,8 +516,6 @@
 	      testers (cdr testers)
 	      defaulters (cdr defaulters))))))
 
-(defvar ideographic-radical nil)
-
 (defun char-daikanwa-strokes (char &optional radical)
   (unless radical
     (setq radical ideographic-radical))
diff --git a/src/mule-canna.c b/src/mule-canna.c
index 49db237..c2eb8d3 100644
--- a/src/mule-canna.c
+++ b/src/mule-canna.c
@@ -1891,7 +1891,6 @@ m2c (unsigned char *mp, int l, unsigned char *cp)
 {
   unsigned char	ch, *ep = mp + l;
 #ifdef UTF2000
-  unsigned char fb;
   int len;
   Emchar chr;
 #endif
@@ -1936,25 +1935,31 @@ m2c (unsigned char *mp, int l, unsigned char *cp)
 	}
       if ( chr <= 0x7f )
 	*cp++ = chr;
-      else if ( chr <= MAX_CHAR_HALFWIDTH_KATAKANA )
-	{
-	  *cp++ = ISO_CODE_SS2;
-	  *cp++ = ( chr & 0x7f ) | 0x80;
-	}
       else
 	{
-	  Lisp_Object charset;
-	  int c1, c2;
+	  int code;
 
-	  BREAKUP_CHAR (chr, charset, c1, c2);
-	  fb = XCHARSET_FINAL (charset);
-	  switch (fb)
+	  if ( (code
+		= charset_code_point (Vcharset_japanese_jisx0208,
+				      chr, 0)) >= 0 )
+	    {
+	      *cp++ = (code >> 8) | 0x80;
+	      *cp++ = (code & 0xFF) | 0x80;
+	    }
+	  else if ( (code
+		     = charset_code_point (Vcharset_katakana_jisx0201,
+					   chr, 0)) >= 0 )
+	    {
+	      *cp++ = ISO_CODE_SS2;
+	      *cp++ = code | 0x80;
+	    }
+	  else if ( (code
+		     = charset_code_point (Vcharset_japanese_jisx0212,
+					   chr, 0)) >= 0 )
 	    {
-	    case 'D':
 	      *cp++ = ISO_CODE_SS3;
-	    default:
-	      *cp++ = c1;
-	      *cp++ = c2;
+	      *cp++ = (code >> 8) | 0x80;
+	      *cp++ = (code & 0xFF) | 0x80;
 	    }
 	}
 #else