From: tomo <tomo>
Date: Mon, 16 Feb 2004 16:13:20 +0000 (+0000)
Subject: Sync up with 	r21-4-14-chise-0_21-24.
X-Git-Tag: r21-4-14-u2km-0_21-24
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccc97af2808c50fa982c76c03be661868adb6f8;p=chise%2Fxemacs-chise.git

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

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 8058de3..60c5fea 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-attribute-name<): Fixed.
+
 2004-02-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mojikyo-conf.el (default-coded-charset-priority-list): Add
@@ -22,6 +26,19 @@
 	* Ideograph-R037-Big.el (U+5941): Modify `<-simplified'.
 	(U+5969): Use `->subsumptive'.
 
+	* char-db-util.el (char-attribute-name<): Put `->denotational'
+	into the last place and `->subsumptive' is second to last.
+	(char-db-make-char-spec): Use `=daikanwa' instead of
+	`ideograph-daikanwa'.
+	(char-db-insert-char-spec): Modify for `insert-char-attributes'.
+	(char-db-insert-alist): Likewise.
+	(insert-char-attributes): Delete optional argument
+	`ccs-attributes'; CCS-features are also specified in `attributes'.
+	(insert-char-data): Likewise.
+
+	* ideograph-util.el (insert-ideograph-radical-char-data): Modify
+	for `insert-char-data'.
+
 2004-02-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R022-Right-Open-Box.el (U+5332): Use
diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index e03f668..c336f26 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -127,6 +127,8 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
+    (hanyu-dazidian	1 3 3)
+    (=ucs		. #x4E03)	; 七
     (->subsumptive
      ((shinjigen-1	  . 3)
       (shinjigen-2	  . 3)
@@ -144,8 +146,6 @@
      ((=cns11643-1	  . #x4424)	; ø»‘µ¹
       (=ucs@cns		  . #x4E03)	; ø»‘µ¹
       ))
-    (hanyu-dazidian	1 3 3)
-    (=ucs		. #x4E03)	; 七
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2502,8 +2502,7 @@
     (=hanziku-1		. #xA9A3)	; ý¢€š¦£
     ))
 (define-char
-  '((=>ucs		. #x20055)	; 𠁕
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes@daikanwa . 15)
     (total-strokes@daikanwa	  . 16)
     (ideographic-strokes@cns . 14)
diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 44458c9..e4027ee 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -257,6 +257,7 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (=ucs		. #x4E3B)	; 主
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -295,7 +296,6 @@
       (=gt-pj-1		  . #x3C67)	; ý¡€€‚Š
       (=ucs@unicode	  . #x4E3B)	; ø½Šž¬
       ))
-    (=ucs		. #x4E3B)	; 主
     ))
 (define-char
   '((ideographic-radical . 3)	; ⼂
diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el
index 9236844..ea90142 100644
--- a/lisp/utf-2000/Ideograph-R005-Second.el
+++ b/lisp/utf-2000/Ideograph-R005-Second.el
@@ -1141,6 +1141,7 @@
     (ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (=ucs		. #x4E75)	; ä¹µ
     (->subsumptive
      ((->subsumptive
        ((ideographic-structure
@@ -1184,7 +1185,6 @@
       (=jef-china3	  . #x41C3)	; øº„‡ƒ
       (mojikyo		  . 000192)	; ý €€ƒ€
       ))
-    (=ucs		. #x4E75)	; ä¹µ
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
@@ -1992,6 +1992,7 @@
     (ideographic-radical . 5)	; ⼄
     (ideographic-strokes . 11)
     (total-strokes	 . 12)
+    (=ucs		. #x3424)	; 㐤
     (->subsumptive
      ((hanyu-dazidian	  1 263 7)
       (=gt		  . 00280)	; ý¡€€„˜
@@ -2006,7 +2007,6 @@
      ((=cns11643-3	  . #x396D)	; ø»•»€
       (=ucs@unicode	  . #x3424)	; ø»•»€
       ))
-    (=ucs		. #x3424)	; 㐤
     ))
 (define-char
   '((ideographic-radical . 5)	; ⼄
diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el
index 0d7bf87..407a9b3 100644
--- a/lisp/utf-2000/Ideograph-R006-Hook.el
+++ b/lisp/utf-2000/Ideograph-R006-Hook.el
@@ -314,6 +314,7 @@
     (ideographic-radical . 6)	; ⼅
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
+    (=ucs		. #x20116)	; 𠄖
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -350,7 +351,6 @@
 	))
       (=hanziku-1	  . #xBE59)	; ý¢€›¹™
       ))
-    (=ucs		. #x20116)	; 𠄖
     ))
 (define-char
   '((ideographic-radical . 6)	; ⼅
diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 12d9176..926f92c 100644
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -3229,6 +3229,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (=ucs		. #x343B)	; 㐻
     (->subsumptive
      ((->subsumptive
        ((hanyu-dazidian	    1 122 1)
@@ -3266,7 +3267,6 @@
 	))
       (=ucs@unicode	  . #x343B)	; 󰀃
       ))
-    (=ucs		. #x343B)	; 㐻
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -6804,6 +6804,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (=ucs		. #x344A)	; 㑊
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -6831,7 +6832,6 @@
       (=hanziku-1	  . #xC2FE)	; ý¢€œ‹¾
       (=ucs@unicode	  . #x344A)	; ø»™°¨
       ))
-    (=ucs		. #x344A)	; 㑊
     ))
 (define-char
   '((=>ucs		. #x4F74)	; ä½´
@@ -7247,6 +7247,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (=ucs		. #x4F7E)	; ä½¾
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7347,7 +7348,6 @@
       (=cns11643-1	  . #x4B7C)	; ø»’£
       (=ucs@cns		  . #x4F7E)	; ø»’£
       ))
-    (=ucs		. #x4F7E)	; ä½¾
     ))
 (define-char
   '((=>ucs		. #x4F7F)	; 使
@@ -8445,6 +8445,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (=ucs		. #x344F)	; 㑏
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -8473,7 +8474,6 @@
       (=hanziku-1	  . #xC37E)	; ý¢€œ¾
       (=ucs@unicode	  . #x344F)	; ø»—¦º
       ))
-    (=ucs		. #x344F)	; 㑏
     ))
 (define-char
   '((=>ucs		. #x2020D)	; 𠈍
@@ -9781,6 +9781,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (=ucs		. #x3459)	; 㑙
     (->subsumptive
      ((=cns11643-4	  . #x2839)	; ø»—«’
       (=daikanwa	  . 00651)	; ø¸€Š‹
@@ -9791,7 +9792,6 @@
       (=ucs@unicode	  . #x3459)	; ý¢€œ­
       (mojikyo		  . 000651)	; ý €€Š‹
       ))
-    (=ucs		. #x3459)	; 㑙
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -9918,6 +9918,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (=ucs		. #x345A)	; 㑚
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -9946,7 +9947,6 @@
       (=cbeta		  . 04175)	; ø¸¡
       (=ucs@unicode	  . #x345A)	; ø»•¥Ÿ
       ))
-    (=ucs		. #x345A)	; 㑚
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -13382,6 +13382,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (=ucs		. #x3466)	; 㑦
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -13412,7 +13413,6 @@
       (=hanziku-1	  . #xCC57)	; ý¢€œ±—
       (=ucs@unicode	  . #x3466)	; ý¢€œ±—
       ))
-    (=ucs		. #x3466)	; 㑦
     ))
 (define-char
   '((=>ucs		. #x20269)	; 𠉩
@@ -15576,6 +15576,7 @@
 (define-char
   '((=>daikanwa		. 00825)	; ø»•³†
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x3464)	; 㑤
     (->subsumptive
      ((ideographic-strokes . 9)
       (total-strokes	   . 11)
@@ -15608,7 +15609,6 @@
       (=hanziku-1	  . #xCCC0)	; ý¢€œ³€
       (=ucs@unicode	  . #x3464)	; ý¢€œ³€
       ))
-    (=ucs		. #x3464)	; 㑤
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -19002,6 +19002,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (=ucs		. #x3474)	; 㑴
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -19062,7 +19063,6 @@
       (=hanziku-1	  . #xD0C7)	; ý¢€ƒ‡
       (=ucs@unicode	  . #x3474)	; ý¢€ƒ‡
       ))
-    (=ucs		. #x3474)	; 㑴
     ))
 (define-char
   '((=>ucs		. #x5083)	; 傃
@@ -19580,6 +19580,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (=ucs		. #x3475)	; 㑵
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -19617,7 +19618,6 @@
       (=cns11643-4	  . #x3632)	; ø»—¿¯
       (=ucs@cns		  . #x3475)	; ø»—¿¯
       ))
-    (=ucs		. #x3475)	; 㑵
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -21320,6 +21320,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (=ucs		. #x347A)	; 㑺
     (->subsumptive
      ((morohashi-daikanwa	ho 21)
       (ideographic-structure
@@ -21362,7 +21363,6 @@
       (=hanziku-1	  . #xD044)	; ý¢€„
       (=ucs@unicode	  . #x347A)	; ø»•»‡
       ))
-    (=ucs		. #x347A)	; 㑺
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -21740,6 +21740,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (=ucs		. #x347B)	; 㑻
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -21768,7 +21769,6 @@
       (=hanziku-1	  . #xD2A8)	; ý¢€Š¨
       (=ucs@unicode	  . #x347B)	; ø»–„š
       ))
-    (=ucs		. #x347B)	; 㑻
     ))
 (define-char
   '((=>ucs		. #x2032D)	; 𠌭
@@ -22261,6 +22261,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (=ucs		. #x347E)	; 㑾
     (->subsumptive
      ((=daikanwa	  . 01025)	; ø¸€
       )
@@ -22287,7 +22288,6 @@
       (=cns11643-4	  . #x3C2C)	; ø»˜ˆ
       (=ucs@cns		  . #x347E)	; ø»˜ˆ
       ))
-    (=ucs		. #x347E)	; 㑾
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -22707,6 +22707,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
+    (=ucs		. #x3480)	; 㒀
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -22734,7 +22735,6 @@
       (=hanziku-1	  . #xD26A)	; ý¢€‰ª
       (=ucs@unicode	  . #x3480)	; ø»˜ˆ™
       ))
-    (=ucs		. #x3480)	; 㒀
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -24763,6 +24763,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (=ucs		. #x3485)	; 㒅
     (->subsumptive
      ((=daikanwa	  . 01109)	; ø¸€‘•
       (mojikyo		  . 001109)	; ý €€‘•
@@ -24780,7 +24781,6 @@
       (=hanziku-1	  . #xD3C9)	; ý¢€‰
       (=ucs@unicode	  . #x3485)	; ø»˜‘“
       ))
-    (=ucs		. #x3485)	; 㒅
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -24886,6 +24886,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (=ucs		. #x3486)	; 㒆
     (->subsumptive
      ((hanyu-dazidian	  1 220 10)
       (ideographic-structure
@@ -24913,7 +24914,6 @@
       (=cns11643-3	  . #x4578)	; ø»–Œ³
       (=ucs@unicode	  . #x3486)	; ø»–Œ³
       ))
-    (=ucs		. #x3486)	; 㒆
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -25006,6 +25006,7 @@
 (define-char
   '((=>daikanwa		. 01118)	; ø»˜‘”
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x3488)	; 㒈
     (->subsumptive
      ((ideographic-strokes . 12)
       (total-strokes	   . 14)
@@ -25051,7 +25052,6 @@
 	))
       (=ucs@unicode	  . #x3488)	; 󰀇
       ))
-    (=ucs		. #x3488)	; 㒈
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26129,6 +26129,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (=ucs		. #x348E)	; 㒎
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -26203,7 +26204,6 @@
 	))
       (=ucs@unicode	  . #x348E)	; 󰀉
       ))
-    (=ucs		. #x348E)	; 㒎
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26557,6 +26557,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (=ucs		. #x3491)	; 㒑
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -26584,7 +26585,6 @@
       (=hanziku-1	  . #xD470)	; ý¢€‘°
       (=ucs@unicode	  . #x3491)	; ø»˜›”
       ))
-    (=ucs		. #x3491)	; 㒑
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26859,6 +26859,7 @@
 (define-char
   '((=>daikanwa		. 01174)	; ø¸€’–
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x3482)	; 㒂
     (->subsumptive
      ((ideographic-strokes . 13)
       (total-strokes	   . 15)
@@ -26899,7 +26900,6 @@
       (=hanziku-1	  . #xD454)	; ý¢€‘”
       (=ucs@unicode	  . #x3482)	; ý¢€‘”
       ))
-    (=ucs		. #x3482)	; 㒂
     ))
 (define-char
   '((=>ucs		. #x5101)	; 儁
@@ -27074,6 +27074,7 @@
 (define-char
   '((=>daikanwa		. 01179)	; ø¸€’›
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x3493)	; 㒓
     (->subsumptive
      ((ideographic-strokes . 13)
       (total-strokes	   . 15)
@@ -27117,7 +27118,6 @@
       (=hanziku-1	  . #xD2E5)	; ý¢€‹¥
       (=ucs@unicode	  . #x3493)	; ý¢€‹¥
       ))
-    (=ucs		. #x3493)	; 㒓
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -27463,6 +27463,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (=ucs		. #x3495)	; 㒕
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -27490,7 +27491,6 @@
       (=hanziku-1	  . #xD54B)	; ý¢€•‹
       (=ucs@unicode	  . #x3495)	; ø»–”“
       ))
-    (=ucs		. #x3495)	; 㒕
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28070,6 +28070,7 @@
 (define-char
   '((=>daikanwa		. 01207)	; ø»–”—
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x3496)	; 㒖
     (->subsumptive
      ((ideographic-strokes . 13)
       (total-strokes	   . 15)
@@ -28101,7 +28102,6 @@
 	))
       (=ucs@unicode	  . #x3496)	; 󰀊
       ))
-    (=ucs		. #x3496)	; 㒖
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28348,6 +28348,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
+    (=ucs		. #x348A)	; 㒊
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -28374,7 +28375,6 @@
       (=ucs@unicode	  . #x348A)	; ý¢€—´
       (mojikyo		  . 001213)	; ý €€’½
       ))
-    (=ucs		. #x348A)	; 㒊
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28404,6 +28404,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
+    (=ucs		. #x3499)	; 㒙
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -28431,7 +28432,6 @@
       (=hanziku-1	  . #xD5F6)	; ý¢€—¶
       (=ucs@unicode	  . #x3499)	; ø»–›·
       ))
-    (=ucs		. #x3499)	; 㒙
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28584,6 +28584,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
+    (=ucs		. #x349A)	; 㒚
     (->subsumptive
      ((hanyu-dazidian	  1 231 8)
       (=daikanwa	  . 01222)	; ø¸€“†
@@ -28603,7 +28604,6 @@
       )
      ((=ucs@unicode	  . #x349A)	; 󰀋
       ))
-    (=ucs		. #x349A)	; 㒚
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -28654,6 +28654,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
+    (=ucs		. #x349B)	; 㒛
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -28705,7 +28706,6 @@
       (=cns11643-5	  . #x5359)	; ø»šµ€
       (=ucs@cns		  . #x349B)	; ø»šµ€
       ))
-    (=ucs		. #x349B)	; 㒛
     ))
 (define-char
   '((=>ucs		. #x203EC)	; 𠏬
@@ -29599,6 +29599,7 @@
 (define-char
   '((=>daikanwa		. 01252)	; ø¸€“¤
     (ideographic-radical . 9)	; ⼈
+    (=ucs		. #x349E)	; 㒞
     (->subsumptive
      ((ideographic-strokes . 15)
       (total-strokes	   . 17)
@@ -29629,7 +29630,6 @@
       (=hanziku-1	  . #xD6B3)	; ý¢€š³
       (=ucs@unicode	  . #x349E)	; ø»–¦ª
       ))
-    (=ucs		. #x349E)	; 㒞
     ))
 (define-char
   '((=>ucs		. #x5123)	; 儣
@@ -30492,6 +30492,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
+    (=ucs		. #x349F)	; 㒟
     (->subsumptive
      ((=daikanwa	  . 01271)	; ø¸€“·
       (mojikyo		  . 001271)	; ý €€“·
@@ -30509,7 +30510,6 @@
       (=hanziku-1	  . #xD6DD)	; ý¢€›
       (=ucs@unicode	  . #x349F)	; ø»˜µœ
       ))
-    (=ucs		. #x349F)	; 㒟
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -31393,6 +31393,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 17)
     (total-strokes	 . 19)
+    (=ucs		. #x34A1)	; 㒡
     (->subsumptive
      ((->subsumptive
        ((ideographic-structure
@@ -31426,7 +31427,6 @@
 	))
       (=ucs@unicode	  . #x34A1)	; 󰀎
       ))
-    (=ucs		. #x34A1)	; 㒡
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -31875,6 +31875,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
+    (=ucs		. #x34A7)	; 㒧
     (->subsumptive
      ((=daikanwa	  . 01312)	; ø¸€” 
       (=cbeta		  . 04184)	; ø¸¡˜
@@ -31893,7 +31894,6 @@
       (=hanziku-1	  . #xD779)	; ý¢€¹
       (=ucs@unicode	  . #x34A7)	; ø»Ÿˆ…
       ))
-    (=ucs		. #x34A7)	; 㒧
     ))
 (define-char
   '((=>ucs		. #x5138)	; 儸
@@ -32564,6 +32564,7 @@
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 22)
     (total-strokes	 . 24)
+    (=ucs		. #x34AA)	; 㒪
     (->subsumptive
      ((=daikanwa	  . 01334)	; ø¸€”¶
       (mojikyo		  . 001334)	; ý €€”¶
@@ -32598,7 +32599,6 @@
       (=hanziku-1	  . #xD7BD)	; ý¢€ž½
       (=ucs@unicode	  . #x34AA)	; ø»–´¿
       ))
-    (=ucs		. #x34AA)	; 㒪
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 66bef1c..3df12d4 100644
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -75,6 +75,7 @@
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=ucs		. #x516C)	; 公
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -126,7 +127,6 @@
       (=gt-pj-1		  . #x3878)	; ý¡€€¥
       (=ucs@unicode	  . #x516C)	; ø»„©ž
       ))
-    (=ucs		. #x516C)	; 公
     ))
 (define-char
   '((=>ucs		. #x516D)	; 六
diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 3d2e94d..b5ebc66 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -412,6 +412,18 @@
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x6536)	; 收
+      (=jis-x0208	  . #x5A40)	; ø½‹Š‰
+      ))
+    (<-vulgar-ideograph
+     ((ideographic-radical . 66)	; ⽁
+      (shinjigen-1	  . 907)
+      (=daikanwa	  . 13110)	; ø¸ƒŒ¶
+      ))
+    (<-vulgar-ideograph*sources
+     daikanwa shinjigen-1)
+    (=ucs		. #x53CE)	; 収
     (->subsumptive
      ((hanyu-dazidian	  1 393 3)
       (ideographic-structure
@@ -447,18 +459,6 @@
 	))
       (=cns11643-3	  . #x2160)	; ø»•—£
       ))
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6536)	; 收
-      (=jis-x0208	  . #x5A40)	; ø½‹Š‰
-      ))
-    (<-vulgar-ideograph
-     ((ideographic-radical . 66)	; ⽁
-      (shinjigen-1	  . 907)
-      (=daikanwa	  . 13110)	; ø¸ƒŒ¶
-      ))
-    (<-vulgar-ideograph*sources
-     daikanwa shinjigen-1)
-    (=ucs		. #x53CE)	; 収
     ))
 (define-char
   '((=>ucs		. #x20B1F)	; 𠬟
diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index 5c4cfad..aa9030b 100644
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -2543,6 +2543,7 @@
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (=ucs		. #x5969)	; 奩
     (->subsumptive
      ((<-vulgar-ideograph
        ((shinjigen-1	    . 796)
@@ -2563,7 +2564,6 @@
      ((=gb12345		  . #x5E46)	; 󰀔
       (=ucs@unicode	  . #x5969)	; 󰀔
       ))
-    (=ucs		. #x5969)	; 奩
     ))
 (define-char
   '((=>ucs		. #x2166C)	; 𡙬
diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index 11710df..6478e8f 100644
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -3486,13 +3486,13 @@
   '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs		. #x21A5C)	; 𡩜
     (->subsumptive
      ((sources		  bos=A015412-00003)
       (=ruimoku-v6	  . #xE009)	; øº€‰
       )
      ((=ucs@iso		  . #x21A5C)	; 󰀕
       ))
-    (=ucs		. #x21A5C)	; 𡩜
     ))
 (define-char
   '((=>ucs		. #x21A5F)	; 𡩟
diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index 56d3167..233d7ac 100644
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -1011,6 +1011,7 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs		. #x5C56)	; 屖
     (->subsumptive
      ((=big5		  . #xD16A)	; ý¢€…ª
       (=daikanwa	  . 07716)	; ø¸¸¤
@@ -1018,7 +1019,6 @@
      ((=cns11643-2	  . #x2E6C)	; ø»“ ±
       (=ucs@unicode	  . #x5C56)	; ø»“ ±
       ))
-    (=ucs		. #x5C56)	; 屖
     ))
 (define-char
   '((=>ucs		. #x21C65)	; 𡱥
diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index a795ead..402d9f4 100644
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -599,13 +599,13 @@
     (ideographic-radical . 62)	; â¼½
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ucs		. #x39B4)	; 㦴
     (->subsumptive
      ((=cns11643-4	  . #x2D2F)	; ø»—²ž
       (=daikanwa	  . 11583)	; ø¸‚´¿
       )
      ((=ucs@unicode	  . #x39B4)	; 󰀖
       ))
-    (=ucs		. #x39B4)	; 㦴
     ))
 (define-char
   '((ideographic-radical . 62)	; â¼½
diff --git a/lisp/utf-2000/Ideograph-R114-Track.el b/lisp/utf-2000/Ideograph-R114-Track.el
index dee0543..6018ef4 100644
--- a/lisp/utf-2000/Ideograph-R114-Track.el
+++ b/lisp/utf-2000/Ideograph-R114-Track.el
@@ -108,6 +108,7 @@
     (ideographic-radical . 114)	; â½±
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
+    (=ucs		. #x79BB)	; 离
     (->subsumptive
      ((->subsumptive
        ((=jis-x0212	    . #x5073)	; ø»‹ª¤
@@ -121,7 +122,6 @@
       )
      ((=cns11643-2	  . #x3766)	; ø»“­¹
       ))
-    (=ucs		. #x79BB)	; 离
     ))
 (define-char
   '((ideographic-radical . 114)	; â½±
diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 2a07202..41b9f2a 100644
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -23,6 +23,10 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8089)	; 肉
+      ))
+    (=ucs		. #x2EBC)	; ⺼
     (->subsumptive
      ((=gt		  . 37857)	; ý¡€‰¡
       (=gt-pj-6		  . #x3879)	; ý¡€‰¡
@@ -36,10 +40,6 @@
       (=gt-k		  . 00417)	; ý¡„€†¡
       (=gt-pj-k1	  . #x377D)	; ý¢€ˆ¥˜
       ))
-    (<-ideographic-component-forms
-     ((=ucs		  . #x8089)	; 肉
-      ))
-    (=ucs		. #x2EBC)	; ⺼
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el
index 33f5c36..a7250e2 100644
--- a/lisp/utf-2000/Ideograph-R134-Mortar.el
+++ b/lisp/utf-2000/Ideograph-R134-Mortar.el
@@ -69,6 +69,7 @@
     (ideographic-radical . 134)	; ⾅
     (ideographic-strokes . 2)
     (total-strokes	 . 8)
+    (=ucs		. #x81FD)	; 臽
     (->subsumptive
      ((=jis-x0212	  . #x566B)	; ø»‹³
       (=cns11643-4	  . #x276D)	; ø»—ª¨
@@ -78,7 +79,6 @@
       )
      ((=ucs@unicode	  . #x81FD)	; 󰀙
       ))
-    (=ucs		. #x81FD)	; 臽
     ))
 (define-char
   '((ideographic-radical . 134)	; ⾅
diff --git a/lisp/utf-2000/Ideograph-R193-Cauldron.el b/lisp/utf-2000/Ideograph-R193-Cauldron.el
index 271b16c..75a587e 100644
--- a/lisp/utf-2000/Ideograph-R193-Cauldron.el
+++ b/lisp/utf-2000/Ideograph-R193-Cauldron.el
@@ -41,6 +41,7 @@
     (ideographic-radical . 193)	; ⿀
     (ideographic-strokes . 3)
     (total-strokes	 . 13)
+    (=ucs		. #x29C2C)	; ð©°¬
     (->subsumptive
      ((=daikanwa	  . 45674)	; ø¸‹‰ª
       )
@@ -52,7 +53,6 @@
        ((=cns11643-6	    . #x5A4E)	; ø»‰‹
 	))
       ))
-    (=ucs		. #x29C2C)	; ð©°¬
     ))
 (define-char
   '((=>ucs		. #x4C19)	; 䰙
diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index fe5ab7b..e6d3b81 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -77,27 +77,31 @@
 
 (defun char-attribute-name< (ka kb)
   (cond
+   ((eq '->denotational kb)
+    t)
+   ((eq '->subsumptive kb)
+    (not (eq '->denotational ka)))
+   ((eq '->denotational ka)
+    nil)
+   ((eq '->subsumptive ka)
+    nil)
    ((find-charset ka)
-    (cond
-     ((find-charset kb)
-      (if (<= (charset-id ka) 0)
+    (if (find-charset kb)
+	(if (<= (charset-id ka) 0)
+	    (if (<= (charset-id kb) 0)
+		(cond
+		 ((= (charset-dimension ka)
+		     (charset-dimension kb))
+		  (> (charset-id ka)(charset-id kb)))
+		 (t
+		  (> (charset-dimension ka)
+		     (charset-dimension kb))
+		  ))
+	      t)
 	  (if (<= (charset-id kb) 0)
-	      (cond
-	       ((= (charset-dimension ka)
-		   (charset-dimension kb))
-		(> (charset-id ka)(charset-id kb)))
-	       (t
-		(> (charset-dimension ka)
-		   (charset-dimension kb))
-		))
-	    t)
-	(if (<= (charset-id kb) 0)
-	    nil
-	  (< (charset-id ka)(charset-id kb)))))
-     ((symbolp kb)
-      nil)
-     (t
-      t)))
+	      nil
+	    (< (charset-id ka)(charset-id kb))))
+      nil))
    ((find-charset kb)
     t)
    ((symbolp ka)
@@ -193,7 +197,7 @@
 		  (dolist (ccs (delq (car ret) (charset-list)))
 		    (if (and (or (charset-iso-final-char ccs)
 				 (memq ccs
-				       '(ideograph-daikanwa
+				       '(=daikanwa
 					 =daikanwa-rev2
 					 ;; =gt-k
 					 )))
@@ -228,37 +232,40 @@
 					 char-spec)))
       (remove-char-attribute temp-char 'ideograph-daikanwa)
       (setq char temp-char))
-    (setq al nil
-	  cal nil)
-    (while char-spec
-      (setq key (car (car char-spec)))
-      (unless (memq key char-db-ignored-attributes)
-	(if (find-charset key)
-	    (if (encode-char char key 'defined-only)
-		(setq cal (cons key cal)))
-	  (setq al (cons key al))))
-      (setq char-spec (cdr char-spec)))
-    (unless cal
-      (setq char-spec (char-db-make-char-spec char))
-      (while char-spec
-	(setq key (car (car char-spec)))
-	(unless (memq key char-db-ignored-attributes)
-	  (if (find-charset key)
-	      (setq cal (cons key cal))
-	    (setq al (cons key al))))
-	(setq char-spec (cdr char-spec)))
-      )
-    (unless (or cal
-		(memq 'ideographic-structure al))
-      (push 'ideographic-structure al))
-    (dolist (feature required-features)
-      (if (find-charset feature)
-	  (if (encode-char char feature 'defined-only)
-	      (setq cal (adjoin feature cal)))
-	(setq al (adjoin feature al))))
+    ;; (setq al nil
+    ;;       cal nil)
+    ;; (while char-spec
+    ;;   (setq key (car (car char-spec)))
+    ;;   (unless (memq key char-db-ignored-attributes)
+    ;;     (if (find-charset key)
+    ;;         (if (encode-char char key 'defined-only)
+    ;;             (setq cal (cons key cal)))
+    ;;       (setq al (cons key al))))
+    ;;   (setq char-spec (cdr char-spec)))
+    ;; (unless cal
+    ;;   (setq char-spec (char-db-make-char-spec char))
+    ;;   (while char-spec
+    ;;     (setq key (car (car char-spec)))
+    ;;     (unless (memq key char-db-ignored-attributes)
+    ;;       (if (find-charset key)
+    ;;           (setq cal (cons key cal))
+    ;;         (setq al (cons key al))))
+    ;;     (setq char-spec (cdr char-spec)))
+    ;;   )
+    ;; (unless (or cal
+    ;;             (memq 'ideographic-structure al))
+    ;;   (push 'ideographic-structure al))
+    ;; (dolist (feature required-features)
+    ;;   (if (find-charset feature)
+    ;;       (if (encode-char char feature 'defined-only)
+    ;;           (setq cal (adjoin feature cal)))
+    ;;     (setq al (adjoin feature al))))
     (insert-char-attributes char
 			    readable
-			    (or al 'none) cal)
+                            ;; (or al 'none) cal
+			    (union (mapcar #'car char-spec)
+				   required-features)
+			    )
     (when temp-char
       ;; undefine temporary character
       ;;   Current implementation is dirty.
@@ -273,7 +280,8 @@
   (let ((line-breaking
 	 (concat "\n" (make-string (1+ column) ?\ )))
 	name value
-	ret al cal key
+	ret al ; cal
+	key
 	lbs cell rest separator)
     (insert "(")
     (while alist
@@ -289,13 +297,15 @@
 			 cal nil)
 		   (while value
 		     (setq key (car (car value)))
-		     (if (find-charset key)
-			 (setq cal (cons key cal))
-		       (setq al (cons key al)))
+                     ;; (if (find-charset key)
+                     ;;     (setq cal (cons key cal))
+		     (setq al (cons key al))
+		     ;; )
 		     (setq value (cdr value)))
 		   (insert-char-attributes ret
 					   readable
-					   (or al 'none) cal))
+					   (or al 'none) ; cal
+					   ))
 	       (insert (prin1-to-string value)))
 	     (insert ")")
 	     (insert line-breaking))
@@ -316,15 +326,17 @@
 			   cal nil)
 		     (while rest
 		       (setq key (car (car rest)))
-		       (if (find-charset key)
-			   (setq cal (cons key cal))
-			 (setq al (cons key al)))
+                       ;; (if (find-charset key)
+                       ;;     (setq cal (cons key cal))
+		       (setq al (cons key al))
+		       ;; )
 		       (setq rest (cdr rest)))
 		     (if separator
 			 (insert lbs))
 		     (insert-char-attributes ret
 					     readable
-					     al cal)
+					     al ; cal
+					     )
 		     (setq separator lbs))
 		 (if separator
 		     (insert separator))
@@ -406,40 +418,7 @@
 
 (defvar char-db-convert-obsolete-format t)
 
-(defun insert-char-attributes (char &optional readable
-				    attributes ccs-attributes
-				    column)
-  (let (atr-d ccs-d)
-    (setq attributes
-	  (sort (if attributes
-		    (if (consp attributes)
-			(progn
-			  (dolist (name attributes)
-			    (unless (memq name char-db-ignored-attributes)
-			      (push name atr-d)))
-			  atr-d))
-		  (dolist (name (char-attribute-list))
-		    (unless (memq name char-db-ignored-attributes)
-		      (if (find-charset name)
-			  (push name ccs-d)
-			(push name atr-d))))
-		  atr-d)
-		#'char-attribute-name<))
-    (setq ccs-attributes
-	  (sort (if ccs-attributes
-		    (progn
-		      (setq ccs-d nil)
-		      (dolist (name ccs-attributes)
-			(unless (memq name char-db-ignored-attributes)
-			  (push name ccs-d)))
-		      ccs-d)
-		  (or ccs-d
-		      (progn
-			(dolist (name (charset-list))
-			  (unless (memq name char-db-ignored-attributes)
-			    (push name ccs-d)))
-			ccs-d)))
-		#'char-attribute-name<)))
+(defun insert-char-attributes (char &optional readable attributes column)
   (unless column
     (setq column (current-column)))
   (let (name value has-long-ccs-name rest
@@ -449,7 +428,26 @@
 	lbs cell separator ret
 	key al cal
 	dest-ccss
-	sources required-features)
+	sources required-features
+	ccss)
+    (let (atr-d)
+      (setq attributes
+	    (sort (if attributes
+		      (if (consp attributes)
+			  (progn
+			    (dolist (name attributes)
+			      (unless (memq name char-db-ignored-attributes)
+				(if (find-charset name)
+				    (push name ccss))
+				(push name atr-d)))
+			    atr-d))
+		    (dolist (name (char-attribute-list))
+		      (unless (memq name char-db-ignored-attributes)
+			(if (find-charset name)
+			    (push name ccss))
+			(push name atr-d)))
+		    atr-d)
+		  #'char-attribute-name<)))
     (insert "(")
     (when (and (memq 'name attributes)
 	       (setq value (get-char-attribute char 'name)))
@@ -531,7 +529,7 @@
 		     line-breaking)
 	   (format "(%-18s %s)\t; %c%s"
 		   name
-		   (mapconcat #'prin1-to-string
+		   (mapconcat (function prin1-to-string)
 			      value " ")
 		   (char-representative-of-daikanwa char)
 		   line-breaking)))
@@ -860,22 +858,62 @@
       (dolist (ignored '(composition
 			 ->denotational <-subsumptive ->ucs-unified))
 	(setq attributes (delq ignored attributes))))
-    (setq rest ccs-attributes)
-    (while (and rest
-		(progn
-		  (setq value (get-char-attribute char (car rest)))
-		  (if value
-		      (if (>= (length (symbol-name (car rest))) 19)
-			  (progn
-			    (setq has-long-ccs-name t)
-			    nil)
-			t)
-		    t)))
-      (setq rest (cdr rest)))
+    ;; (setq rest ccs-attributes)
+    ;; (while (and rest
+    ;;             (progn
+    ;;               (setq value (get-char-attribute char (car rest)))
+    ;;               (if value
+    ;;                   (if (>= (length (symbol-name (car rest))) 19)
+    ;;                       (progn
+    ;;                         (setq has-long-ccs-name t)
+    ;;                         nil)
+    ;;                     t)
+    ;;                 t)))
+    ;;   (setq rest (cdr rest)))
     (while attributes
       (setq name (car attributes))
       (if (setq value (get-char-attribute char name))
-	  (cond ((string-match "^=>ucs@" (symbol-name name))
+	  (cond ((setq ret (find-charset name))
+		 (setq name (charset-name ret))
+		 (if (and (not (memq name dest-ccss))
+			  (prog1
+			      (setq value (get-char-attribute char name))
+			    (setq dest-ccss (cons name dest-ccss))))
+		     (insert
+		      (format
+		       (cond ((memq name '(=daikanwa
+					   =daikanwa-rev1 =daikanwa-rev2
+					   =gt =gt-k =cbeta))
+			      (if has-long-ccs-name
+				  "(%-26s . %05d)\t; %c%s"
+				"(%-18s . %05d)\t; %c%s"))
+			     ((eq name 'mojikyo)
+			      (if has-long-ccs-name
+				  "(%-26s . %06d)\t; %c%s"
+				"(%-18s . %06d)\t; %c%s"))
+			     ((>= (charset-dimension name) 2)
+			      (if has-long-ccs-name
+				  "(%-26s . #x%04X)\t; %c%s"
+				"(%-18s . #x%04X)\t; %c%s"))
+			     (t
+			      (if has-long-ccs-name
+				  "(%-26s . #x%02X)\t; %c%s"
+				"(%-18s . #x%02X)\t; %c%s")))
+		       name
+		       (if (= (charset-iso-graphic-plane name) 1)
+			   (logior value
+				   (cond ((= (charset-dimension name) 1)
+					  #x80)
+					 ((= (charset-dimension name) 2)
+					  #x8080)
+					 ((= (charset-dimension name) 3)
+					  #x808080)
+					 (t 0)))
+			 value)
+		       (char-db-decode-isolated-char name value)
+		       line-breaking)))
+		 )
+		((string-match "^=>ucs@" (symbol-name name))
 		 (insert (format "(%-18s . #x%04X)\t; %c%s"
 				 name value (decode-char '=ucs value)
 				 line-breaking))
@@ -899,13 +937,22 @@
                    (if (integerp cell)
 		       (setq cell (decode-char '=ucs cell)))
 		   (cond ((eq name '->subsumptive)
-			  (if separator
+			  (when (or (not
+				     (some (lambda (atr)
+					     (get-char-attribute cell atr))
+					   char-db-ignored-attributes))
+				    (some (lambda (ccs)
+					    (encode-char cell ccs
+							 'defined-only))
+					  ccss))
+			    (if separator
 			      (insert lbs))
-			  (let ((char-db-ignored-attributes
-				 (cons '<-subsumptive
-				       char-db-ignored-attributes)))
-			    (insert-char-attributes cell readable))
-			  (setq separator lbs))
+			    (let ((char-db-ignored-attributes
+				   (cons '<-subsumptive
+					 char-db-ignored-attributes)))
+			      (insert-char-attributes cell readable))
+			    (setq separator lbs))
+			  )
 			 ((characterp cell)
 			  (setq sources
 				(get-char-attribute
@@ -1028,56 +1075,55 @@
 				 line-breaking)))
 		))
       (setq attributes (cdr attributes)))
-    (while ccs-attributes
-      (setq name (charset-name (car ccs-attributes)))
-      (if (and (not (memq name dest-ccss))
-	       (prog1
-		   (setq value (get-char-attribute char name))
-		 (setq dest-ccss (cons name dest-ccss))))
-	  (insert
-	   (format
-	    (cond ((memq name '(=daikanwa
-				=daikanwa-rev1 =daikanwa-rev2
-				=gt =gt-k =cbeta))
-		   (if has-long-ccs-name
-		       "(%-26s . %05d)\t; %c%s"
-		     "(%-18s . %05d)\t; %c%s"))
-		  ((eq name 'mojikyo)
-		   (if has-long-ccs-name
-		       "(%-26s . %06d)\t; %c%s"
-		     "(%-18s . %06d)\t; %c%s"))
-		  ((>= (charset-dimension name) 2)
-		   (if has-long-ccs-name
-		       "(%-26s . #x%04X)\t; %c%s"
-		     "(%-18s . #x%04X)\t; %c%s"))
-		  (t
-		   (if has-long-ccs-name
-		       "(%-26s . #x%02X)\t; %c%s"
-		     "(%-18s . #x%02X)\t; %c%s")))
-	    name
-	    (if (= (charset-iso-graphic-plane name) 1)
-		(logior value
-			(cond ((= (charset-dimension name) 1)
-			       #x80)
-			      ((= (charset-dimension name) 2)
-			       #x8080)
-			      ((= (charset-dimension name) 3)
-			       #x808080)
-			      (t 0)))
-	      value)
-            (char-db-decode-isolated-char name value)
-	    line-breaking)))
-      (setq ccs-attributes (cdr ccs-attributes)))
+    ;; (while ccs-attributes
+    ;;   (setq name (charset-name (car ccs-attributes)))
+    ;;   (if (and (not (memq name dest-ccss))
+    ;;            (prog1
+    ;;                (setq value (get-char-attribute char name))
+    ;;              (setq dest-ccss (cons name dest-ccss))))
+    ;;       (insert
+    ;;        (format
+    ;;         (cond ((memq name '(=daikanwa
+    ;;                             =daikanwa-rev1 =daikanwa-rev2
+    ;;                             =gt =gt-k =cbeta))
+    ;;                (if has-long-ccs-name
+    ;;                    "(%-26s . %05d)\t; %c%s"
+    ;;                  "(%-18s . %05d)\t; %c%s"))
+    ;;               ((eq name 'mojikyo)
+    ;;                (if has-long-ccs-name
+    ;;                    "(%-26s . %06d)\t; %c%s"
+    ;;                  "(%-18s . %06d)\t; %c%s"))
+    ;;               ((>= (charset-dimension name) 2)
+    ;;                (if has-long-ccs-name
+    ;;                    "(%-26s . #x%04X)\t; %c%s"
+    ;;                  "(%-18s . #x%04X)\t; %c%s"))
+    ;;               (t
+    ;;                (if has-long-ccs-name
+    ;;                    "(%-26s . #x%02X)\t; %c%s"
+    ;;                  "(%-18s . #x%02X)\t; %c%s")))
+    ;;         name
+    ;;         (if (= (charset-iso-graphic-plane name) 1)
+    ;;             (logior value
+    ;;                     (cond ((= (charset-dimension name) 1)
+    ;;                            #x80)
+    ;;                           ((= (charset-dimension name) 2)
+    ;;                            #x8080)
+    ;;                           ((= (charset-dimension name) 3)
+    ;;                            #x808080)
+    ;;                           (t 0)))
+    ;;           value)
+    ;;         (char-db-decode-isolated-char name value)
+    ;;         line-breaking)))
+    ;;   (setq ccs-attributes (cdr ccs-attributes)))
     (insert ")")))
 
 (defun insert-char-data (char &optional readable
-			      attributes ccs-attributes)
+			      attributes)
   (save-restriction
     (narrow-to-region (point)(point))
     (insert "(define-char
   '")
-    (insert-char-attributes char readable
-			    attributes ccs-attributes)
+    (insert-char-attributes char readable attributes)
     (insert ")\n")
     (goto-char (point-min))
     (while (re-search-forward "[ \t]+$" nil t)
diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 6676fa6..c89e905 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -335,10 +335,12 @@
     (dolist (name (char-attribute-list))
       (unless (memq name char-db-ignored-attributes)
 	(if (find-charset name)
-	    (push name ccss)
-	  (push name attributes))))
+	    (push name ccss))
+	(push name attributes)
+	))
     (setq attributes (sort attributes #'char-attribute-name<)
-	  ccss (sort ccss #'char-attribute-name<))
+	  ;; ccss (sort ccss #'char-attribute-name<)
+	  )
     (aset ideograph-radical-chars-vector radical chars)
     (dolist (char chars)
       (when (or (not (some (lambda (atr)
@@ -347,7 +349,8 @@
 		(some (lambda (ccs)
 			(encode-char char ccs 'defined-only))
 		      ccss))
-	(insert-char-data char nil attributes ccss)))))
+	(insert-char-data char nil attributes ;ccss
+			  )))))
 
 (defun write-ideograph-radical-char-data (radical file)
   (if (file-directory-p file)
diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
index ba7ef83..bc450ea 100644
--- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
+++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
@@ -664,6 +664,10 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8089)	; 肉
+      ))
+    (=ucs		. #x2EBC)	; ⺼
     (->subsumptive
      ((=gt		  . 37857)	; ý¡€‰¡
       (=gt-pj-6		  . #x3879)	; ý¡€‰¡
@@ -677,10 +681,6 @@
       (=gt-k		  . 00417)	; ý¡„€†¡
       (=gt-pj-k1	  . #x377D)	; ý¢€ˆ¥˜
       ))
-    (<-ideographic-component-forms
-     ((=ucs		  . #x8089)	; 肉
-      ))
-    (=ucs		. #x2EBC)	; ⺼
     ))
 (define-char
   '((name		. "CJK RADICAL MORTAR")