X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R124-Feather.el;h=2f5bbcb9139e6728c80fdb396afa8291e2132206;hb=90c42eb4fa13a7f78c7b3a33b62d80e4aff44e60;hp=a5c5edbe150a236f853ffb47e49e6edba50b96da;hpb=db0cc7f171f1c1f0e001ad291624a554a12d84e2;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index a5c5edb..2f5bbcb 100644
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -6,21 +6,29 @@
     (korean-ksc5601	. #x6962)	; ø»Š„½
     (chinese-big5	. #xA6D0)	; ý¢€Š›
     (ideograph-daikanwa . 28614)	; ø¸†¿†
+    (=jef-china3	. #x60A1)	; øº†‚¡
     (mojikyo		. 028614)	; ý €†¿†
     ))
 (define-char
+  '((=>ucs		. #x7FBD)	; ç¾½
+    (morohashi-daikanwa	28614 0 0)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
+    (ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+    (=gt-k		. 01762)	; ý¡„€›¢
+    ))
+(define-char
   '((morohashi-daikanwa	28614 1)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 0)
     (total-strokes	 . 6)
-    (japanese-jisx0208-1978	. #x3129)	; ø»‚“¨
-    (chinese-gb2312		. #x5370)	; ø»…¯
-    (japanese-jisx0208		. #x3129)	; ø»†§°
-    (chinese-isoir165		. #x5370)	; ø»¸¿
-    (chinese-cns11643-1		. #x4851)	; ø»‘¼ž
-    (japanese-jisx0208-1990	. #x3129)	; ø½Š¤
-    (mojikyo			. 050358)	; ý €Œ’¶
-    (ucs			. #x7FBD)	; ç¾½
+    (chinese-gb2312	. #x5370)	; ø»…¯
+    (=jis-x0208		. #x3129)	; ø½Š¤
+    (chinese-isoir165	. #x5370)	; ø»¸¿
+    (chinese-cns11643-1 . #x4851)	; ø»‘¼ž
+    (mojikyo		. 050358)	; ý €Œ’¶
+    (ucs		. #x7FBD)	; ç¾½
     ))
 (define-char
   '((ideographic-radical . 124)	; â½»
@@ -194,25 +202,28 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
-      )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
-      )
-     ((ucs		  . #x5EFE)	; 廾
-      ))
-    (japanese-jisx0212		. #x5535)	; ø»‹°¼
-    (japanese-jisx0213-1	. #x7A3D)	; ø»¤–†
-    (chinese-big5		. #xACFD)	; ý¢€Š³½
-    (ideograph-daikanwa		. 28625)	; ø¸†¿‘
+    (japanese-jisx0212	. #x5535)	; ø»‹°¼
+    (=jis-x0213-1-2000	. #x7A3D)	; ø»¤–†
+    (chinese-big5	. #xACFD)	; ý¢€Š³½
+    (ideograph-daikanwa . 28625)	; ø¸†¿‘
+    (=jef-china3	. #x60A2)	; øº†‚¢
+    (ucs-jis		. #x7FBF)	; ø»‹°¼
     ))
 (define-char
   '((morohashi-daikanwa	28625 0 2)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
+    (chinese-gb2312	. #x7460)	; ø»†€½
+    (chinese-isoir165	. #x7460)	; ø»Ž©
+    (ucs		. #x7FBF)	; 羿
+    ))
+(define-char
+  '((=>ucs		. #x7FBF)	; 羿
+    (morohashi-daikanwa	28625 0 3)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -221,10 +232,7 @@
       )
      ((ucs		  . #x5EFE)	; 廾
       ))
-    (chinese-gb2312	. #x7460)	; ø»†€½
-    (chinese-isoir165	. #x7460)	; ø»Ž©
     (chinese-cns11643-1 . #x5322)	; ø»’‹¹
-    (ucs		. #x7FBF)	; 羿
     ))
 (define-char
   '((=>ucs		. #x263FB)	; 𦏻
@@ -267,9 +275,9 @@
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (japanese-jisx0213-2	. #x7479)	; ø»¦˜’
-    (ideograph-daikanwa		. 28627)	; ø¸†¿“
-    (ucs			. #x26402)	; 𦐂
+    (=jis-x0213-2-2000	. #x7479)	; ø»¦˜’
+    (ideograph-daikanwa . 28627)	; ø¸†¿“
+    (ucs		. #x26402)	; 𦐂
     ))
 (define-char
   '((=>ucs		. #x26402)	; 𦐂
@@ -348,6 +356,9 @@
     (japanese-jisx0212	. #x5536)	; ø»‹°½
     (chinese-big5	. #xD365)	; ý¢€¥
     (ideograph-daikanwa . 28632)	; ø¸†¿˜
+    (=jef-china3	. #x9FDE)	; øº‰¿ž
+    (ucs-jis		. #x7FC0)	; ø»‹°½
+    (mojikyo		. 028632)	; ý €†¿˜
     ))
 (define-char
   '((morohashi-daikanwa	28632 0 2)
@@ -390,7 +401,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8A78)	; ý¢€ˆ©¸
+     ((name*		  . "ideographic component hood")
+      (=big5-cdp	  . #x8A78)	; ý¢€ˆ©¸
+      (mojikyo		  . 070546)	; ý €‘Ž’
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
@@ -407,11 +420,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8A78)	; ý¢€ˆ©¸
+     ((name*		  . "ideographic component hood")
+      (=big5-cdp	  . #x8A78)	; ý¢€ˆ©¸
+      (mojikyo		  . 070546)	; ý €‘Ž’
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
-    (chinese-big5-cdp	. #x8ACB)	; ý¢€ˆ«‹
+    (=big5-cdp		. #x8ACB)	; ý¢€ˆ«‹
     (mojikyo		. 074841)	; ý €’‘™
     ))
 (define-char
@@ -440,9 +455,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ideograph-daikanwa . 01452)	; ø¸€–¬
+     ((japanese-jisx0208-1978	  . #x3878)	; ø»‚Ÿ‰
+      (japanese-jisx0208	  . #x3878)	; ø»†³‘
+      (korean-ksc5601		  . #x4D6B)	; ø»‰›¾
+      (ideograph-daikanwa	  . 01452)	; ø¸€–¬
       )
-     ((ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((korean-ksc5601	  . #x6962)	; ø»Š„½
+      (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (korean-ksc5601	. #x683A)	; ø»Š‚·
     (chinese-big5	. #xAFCE)	; ý¢€Š¿Ž
@@ -586,20 +605,19 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (ucs		     . #x2FF0)	; â¿°
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8CEB)	; ý¢€ˆ³«
+     ((ucs		  . #x53B7)	; 厷
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (japanese-jisx0212		. #x5537)	; ø»‹°¾
-    (japanese-jisx0213-2	. #x747A)	; ø»¦˜“
-    (chinese-big5		. #xD363)	; ý¢€£
-    (ideograph-daikanwa		. 28639)	; ø¸†¿Ÿ
+    (japanese-jisx0212	. #x5537)	; ø»‹°¾
+    (=jis-x0213-2-2000	. #x747A)	; ø»¦˜“
+    (chinese-big5	. #xD363)	; ý¢€£
+    (ideograph-daikanwa . 28639)	; ø¸†¿Ÿ
+    (ucs-jis		. #x7FC3)	; ø»‹°¾
     ))
 (define-char
   '((morohashi-daikanwa	28639 0 2)
@@ -610,7 +628,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8CEB)	; ý¢€ˆ³«
+     ((ucs		  . #x53B7)	; 厷
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
@@ -653,23 +671,20 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-		 (ucs		     . #x2FFA)	; ⿺
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (ucs		  . #x2FFA)	; ⿺
       )
-     ((ideograph-daikanwa . 13061)	; ø¸ƒŒ…
+     ((ucs		  . #x652F)	; 支
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6300)
-    (japanese-jisx0208-1978	. #x6642)	; ø»ƒ¡·
-    (japanese-jisx0208		. #x6642)	; ø»‡µ¿
-    (korean-ksc5601		. #x6347)	; ø»‰»®
-    (japanese-jisx0208-1990	. #x6642)	; ø½‹›³
-    (chinese-big5		. #xAFCD)	; ý¢€Š¿
-    (ideograph-daikanwa		. 28642)	; ø¸†¿¢
+    (=jis-x0208		. #x6642)	; ø½‹›³
+    (korean-ksc5601	. #x6347)	; ø»‰»®
+    (chinese-big5	. #xAFCD)	; ý¢€Š¿
+    (ideograph-daikanwa . 28642)	; ø¸†¿¢
+    (ucs-jis		. #x7FC5)	; ø½‹›³
     ))
 (define-char
   '((morohashi-daikanwa	28642 0 2)
@@ -762,10 +777,9 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (shinjigen-2	. 6313)
-    (japanese-jisx0208-1978	. #x6643)	; ø»ƒ¡¸
-    (japanese-jisx0208		. #x6643)	; ø»‡¶€
-    (japanese-jisx0208-1990	. #x6643)	; ø½‹›´
-    (ideograph-daikanwa		. 28647)	; ø¸†¿§
+    (=jis-x0208		. #x6643)	; ø½‹›´
+    (ideograph-daikanwa . 28647)	; ø¸†¿§
+    (ucs-jis		. #x7FC6)	; ø½‹›´
     ))
 (define-char
   '((morohashi-daikanwa	28647 0 2)
@@ -853,6 +867,7 @@
     (total-strokes	 . 11)
     (japanese-jisx0212	. #x5538)	; ø»‹°¿
     (ideograph-daikanwa . 28650)	; ø¸†¿ª
+    (ucs-jis		. #x7FC8)	; ø»‹°¿
     ))
 (define-char
   '((morohashi-daikanwa	28650 0 2)
@@ -949,18 +964,19 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((ucs		  . #x7ACB)	; 立
+     ((=jis-x0208	  . #x4E29)	; ø½Š¸Š
+      (korean-ksc5601	  . #x5821)	; ø»‰ª¾
+      (ideograph-daikanwa . 25721)	; ø¸†‘¹
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6306)
-    (japanese-jisx0208-1978	. #x6644)	; ø»ƒ¡¹
-    (japanese-jisx0208		. #x6644)	; ø»‡¶
-    (korean-ksc5601		. #x6C4D)	; ø»Š‰‚
-    (japanese-jisx0208-1990	. #x6644)	; ø½‹›µ
-    (chinese-big5		. #xD6F6)	; ý¢€›¶
-    (ideograph-daikanwa		. 28655)	; ø¸†¿¯
+    (=jis-x0208		. #x6644)	; ø½‹›µ
+    (korean-ksc5601	. #x6C4D)	; ø»Š‰‚
+    (chinese-big5	. #xD6F6)	; ý¢€›¶
+    (ideograph-daikanwa . 28655)	; ø¸†¿¯
+    (ucs-jis		. #x7FCA)	; ø½‹›µ
     ))
 (define-char
   '((morohashi-daikanwa	28655 0 2)
@@ -1039,8 +1055,28 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
-    (korean-ksc5601	. #x6C4E)	; ø»Š‰ƒ
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((korean-ksc5601	  . #x6962)	; ø»Š„½
+      (ideograph-daikanwa . 28614)	; ø¸†¿†
+      )
+     ((=jis-x0208	  . #x4E29)	; ø½Š¸Š
+      (korean-ksc5601	  . #x5821)	; ø»‰ª¾
+      (ideograph-daikanwa . 25721)	; ø¸†‘¹
+      ))
     (ideograph-daikanwa . 28657)	; ø¸†¿±
+    ))
+(define-char
+  '((=>ucs		. #x7FCC)	; 翌
+    (morohashi-daikanwa	28657 0 0)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 5)
+    (total-strokes	 . 11)
+    (korean-ksc5601	. #x6C4E)	; ø»Š‰ƒ
+    (chinese-big5	. #xB2DD)	; ý¢€‹‹
+    (=jef-china3	. #x60A3)	; øº†‚£
     (mojikyo		. 028657)	; ý €†¿±
     ))
 (define-char
@@ -1050,20 +1086,18 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
     (ideographic-structure
-     (:cdp-combinator	2
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-		 (ucs		     . #x2FF1)	; ⿱
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
-     ((ucs		  . #x7ACB)	; 立
+     ((=jis-x0208	  . #x4E29)	; ø½Š¸Š
+      (korean-ksc5601	  . #x5821)	; ø»‰ª¾
+      (ideograph-daikanwa . 25721)	; ø¸†‘¹
       ))
-    (japanese-jisx0208-1978	. #x4D62)	; ø»‚½©
-    (japanese-jisx0208		. #x4D62)	; ø»‡‘±
-    (japanese-jisx0208-1990	. #x4D62)	; ø½Š·¥
-    (chinese-big5		. #xB2DD)	; ý¢€‹‹
-    (mojikyo			. 050360)	; ý €Œ’¸
+    (=jis-x0208		. #x4D62)	; ø½Š·¥
+    (ucs-jis		. #x7FCC)	; ø½Š·¥
+    (mojikyo		. 050360)	; ý €Œ’¸
     ))
 (define-char
   '((morohashi-daikanwa	28657 1 0)
@@ -1071,10 +1105,8 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
     (ideographic-structure
-     (:cdp-combinator	2
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-		 (ucs		     . #x2FF1)	; ⿱
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
@@ -1187,19 +1219,20 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((japanese-jisx0208-1978	  . #x4E61)	; ø»‚¿†
-      (japanese-jisx0208	  . #x4E61)	; ø»‡“Ž
-      (korean-ksc5601		  . #x5635)	; ø»‰¨–
-      (ideograph-daikanwa	  . 00387)	; ø¸€†ƒ
+     ((=jis-x0208	  . #x4E61)	; ø½Š¹‚
+      (korean-ksc5601	  . #x5635)	; ø»‰¨–
+      (ideograph-daikanwa . 00387)	; ø¸€†ƒ
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (korean-ksc5601		. #x563F)	; ø»‰¨ 
-    (japanese-jisx0212		. #x5539)	; ø»‹±€
-    (japanese-jisx0213-1	. #x7A3E)	; ø»¤–‡
-    (chinese-big5		. #xB2DE)	; ý¢€‹‹ž
-    (ideograph-daikanwa		. 28663)	; ø¸†¿·
+    (korean-ksc5601	. #x563F)	; ø»‰¨ 
+    (japanese-jisx0212	. #x5539)	; ø»‹±€
+    (=jis-x0213-1-2000	. #x7A3E)	; ø»¤–‡
+    (chinese-big5	. #xB2DE)	; ý¢€‹‹ž
+    (ideograph-daikanwa . 28663)	; ø¸†¿·
+    (=jef-china3	. #x60AB)	; øº†‚«
+    (ucs-jis		. #x7FCE)	; ø»‰¨ 
     ))
 (define-char
   '((=>ucs		. #x7FCE)	; 翎
@@ -1258,31 +1291,40 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+      (=gt-k		  . 01762)	; ý¡„€›¢
       )
-     ((chinese-big5-cdp	  . #x8BFC)	; ý¢€ˆ¯¼
+     ((ucs		  . #x3431)	; 㐱
       ))
-    (japanese-jisx0212		. #x553A)	; ø»‹±
-    (japanese-jisx0213-2	. #x747B)	; ø»¦˜”
-    (chinese-big5		. #xD6FC)	; ý¢€›¼
-    (ideograph-daikanwa		. 28665)	; ø¸†¿¹
+    (japanese-jisx0212	. #x553A)	; ø»‹±
+    (=jis-x0213-2-2000	. #x747B)	; ø»¦˜”
+    (chinese-big5	. #xD6FC)	; ý¢€›¼
+    (ideograph-daikanwa . 28665)	; ø¸†¿¹
+    (ucs-jis		. #x7FCF)	; ø»‹±
     ))
 (define-char
   '((morohashi-daikanwa	28665 0 2)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
+    (ucs		. #x7FCF)	; 翏
+    ))
+(define-char
+  '((=>ucs		. #x7FCF)	; 翏
+    (morohashi-daikanwa	28665 0 3)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 5)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
-     ((chinese-big5-cdp	  . #x8BFC)	; ý¢€ˆ¯¼
+     ((ucs		  . #x3431)	; 㐱
       ))
     (chinese-cns11643-2 . #x3841)	; ø»“®²
-    (ucs		. #x7FCF)	; 翏
+    (ucs-cns		. #x7FCF)	; ø»“®²
     ))
 (define-char
   '((=>ucs		. #x7FD0)	; 翐
@@ -1419,7 +1461,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((korean-ksc5601	  . #x6962)	; ø»Š„½
+      (ideograph-daikanwa . 28614)	; ø¸†¿†
       )
      ((ucs		  . #x767D)	; 白
       ))
@@ -1431,8 +1474,18 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+      (=gt-k		  . 01762)	; ý¡„€›¢
+      )
+     ((ucs		  . #x767D)	; 白
+      ))
     (korean-ksc5601	. #x6327)	; ø»‰»Ž
     (chinese-big5	. #xB2DF)	; ý¢€‹‹Ÿ
+    (=jef-china3	. #x60A5)	; øº†‚¥
     (mojikyo		. 028672)	; ý €‡€€
     ))
 (define-char
@@ -1449,25 +1502,16 @@
       )
      ((ucs		  . #x767D)	; 白
       ))
-    (japanese-jisx0208-1978	. #x3D2C)	; ø»‚¥“
-    (japanese-jisx0208		. #x3D2C)	; ø»†¹›
-    (chinese-cns11643-1		. #x5C64)	; ø»’š‰
-    (japanese-jisx0208-1990	. #x3D2C)	; ø½ŠŸ
-    (mojikyo			. 050361)	; ý €Œ’¹
+    (=jis-x0208		. #x3D2C)	; ø½ŠŸ
+    (chinese-cns11643-1 . #x5C64)	; ø»’š‰
+    (ucs-jis		. #x7FD2)	; ø½ŠŸ
+    (mojikyo		. 050361)	; ý €Œ’¹
     ))
 (define-char
   '((morohashi-daikanwa	28672 1 0)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 5)
     (total-strokes	 . 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (ucs		  . #x2FF1)	; ⿱
-      )
-     ((ucs		  . #x7FBD)	; ç¾½
-      )
-     ((ucs		  . #x767D)	; 白
-      ))
     (chinese-gb12345	. #x4F30)	; 習
     (ucs		. #x7FD2)	; 習
     ))
@@ -1755,6 +1799,7 @@
       ))
     (japanese-jisx0208		. #x6646)	; ø»‡¶ƒ
     (japanese-jisx0208-1990	. #x6646)	; ø½‹›·
+    (ucs-jis			. #x7FD4)	; ø»‡¶ƒ
     ))
 (define-char
   '((morohashi-daikanwa	28689 0 2)
@@ -1804,12 +1849,11 @@
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6309)
-    (japanese-jisx0208-1978	. #x6645)	; ø»ƒ¡º
-    (japanese-jisx0208		. #x6645)	; ø»‡¶‚
-    (korean-ksc5601		. #x7D68)	; ø»Š¢›
-    (japanese-jisx0208-1990	. #x6645)	; ø½‹›¶
-    (chinese-big5		. #xB5BF)	; ý¢€‹–¿
-    (ideograph-daikanwa		. 28691)	; ø¸‡€“
+    (=jis-x0208		. #x6645)	; ø½‹›¶
+    (korean-ksc5601	. #x7D68)	; ø»Š¢›
+    (chinese-big5	. #xB5BF)	; ý¢€‹–¿
+    (ideograph-daikanwa . 28691)	; ø¸‡€“
+    (ucs-jis		. #x7FD5)	; ø½‹›¶
     ))
 (define-char
   '((morohashi-daikanwa	28691 0 2)
@@ -1850,6 +1894,7 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (ideograph-daikanwa . 28693)	; ø¸‡€•
+    (=jef-china3	. #x60AC)	; øº†‚¬
     ))
 (define-char
   '((morohashi-daikanwa	28693 0 2)
@@ -2128,35 +2173,42 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (ideographic-structure
-     (:cdp-combinator	4
-      )
-     ((chinese-big5-cdp	  . #x8B7A)	; ý¢€ˆ­º
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8AF9)	; ý¢€ˆ«¹
+     ((=big5-cdp	  . #x8B7A)	; ý¢€ˆ­º
       )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(ucs		    . #x2FF1)	; ⿱
+	)
+       ((ucs		    . #x6535)	; 攵
+	)
+       ((korean-ksc5601	    . #x6962)	; ø»Š„½
+	(ideograph-daikanwa . 28614)	; ø¸†¿†
+	))
       ))
-    (japanese-jisx0212		. #x553B)	; ø»‹±‚
-    (japanese-jisx0213-1	. #x7A3F)	; ø»¤–ˆ
-    (ideograph-daikanwa		. 28709)	; ø¸‡€¥
+    (japanese-jisx0212	. #x553B)	; ø»‹±‚
+    (=jis-x0213-1-2000	. #x7A3F)	; ø»¤–ˆ
+    (chinese-big5	. #xDF6F)	; ý¢€½¯
+    (ideograph-daikanwa . 28709)	; ø¸‡€¥
+    (=jef-china3	. #x43AE)	; øº„Ž®
+    (ucs-jis		. #x7FDB)	; ø»‹±‚
     ))
 (define-char
-  '((morohashi-daikanwa	28709 0 2)
+  '((=>ucs		. #x7FDB)	; 翛
+    (morohashi-daikanwa	28709 0 2)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (ideographic-structure
-     (:cdp-combinator	4
-      )
-     ((chinese-big5-cdp	  . #x8B7A)	; ý¢€ˆ­º
-      )
-     ((chinese-big5-cdp	  . #x8AF9)	; ý¢€ˆ«¹
-      )
-     ((ucs		  . #x7FBD)	; ç¾½
-      ))
     (chinese-cns11643-2 . #x4636)	; ø»”ƒ‹
-    (chinese-big5	. #xDF6F)	; ý¢€½¯
+    (ucs-cns		. #x7FDB)	; ø»”ƒ‹
+    ))
+(define-char
+  '((morohashi-daikanwa	28709 0 3)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
     (ucs		. #x7FDB)	; 翛
     ))
 (define-char
@@ -2413,10 +2465,9 @@
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       )
-     ((japanese-jisx0208-1978	  . #x357E)	; ø»‚šµ
-      (japanese-jisx0208	  . #x357E)	; ø»†®½
-      (korean-ksc5601		  . #x4C48)	; ø»‰™½
-      (ideograph-daikanwa	  . 00299)	; ø¸€„«
+     ((=jis-x0208	  . #x357E)	; ø½Š”±
+      (korean-ksc5601	  . #x4C48)	; ø»‰™½
+      (ideograph-daikanwa . 00299)	; ø¸€„«
       ))
     (chinese-big5	. #xE37E)	; ý¢€Ž¾
     (ideograph-daikanwa . 28725)	; ø¸‡€µ
@@ -2461,21 +2512,32 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+      (=gt-k		  . 01762)	; ý¡„€›¢
       )
-     ((japanese-jisx0208-1978	  . #x7032)	; ø»ƒ°“
-      (japanese-jisx0208	  . #x7032)	; ø»ˆ„›
-      (ideograph-daikanwa	  . 41937)	; ø¸Š‘
+     ((=jis-x0208	  . #x7032)	; ø½‹ª
+      (ideograph-daikanwa . 41937)	; ø¸Š‘
       ))
-    (korean-ksc5601		. #x6E61)	; ø»ŠŒ’
-    (japanese-jisx0212		. #x553C)	; ø»‹±ƒ
-    (japanese-jisx0213-1	. #x7A40)	; ø»¤–‰
-    (chinese-big5		. #xBB43)	; ý¢€‹­ƒ
-    (ideograph-daikanwa		. 28727)	; ø¸‡€·
+    (korean-ksc5601	. #x6E61)	; ø»ŠŒ’
+    (japanese-jisx0212	. #x553C)	; ø»‹±ƒ
+    (=jis-x0213-1-2000	. #x7A40)	; ø»¤–‰
+    (chinese-big5	. #xBB43)	; ý¢€‹­ƒ
+    (ideograph-daikanwa . 28727)	; ø¸‡€·
+    (=jef-china3	. #x60A6)	; øº†‚¦
+    (ucs-jis		. #x7FDF)	; ø»ŠŒ’
     ))
 (define-char
-  '((morohashi-daikanwa	28727 0 3)
+  '((morohashi-daikanwa	28727 0 2)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (chinese-gb2312	. #x3554)	; ø»„¤
+    (chinese-isoir165	. #x3554)	; ø»ŒŸ
+    (ucs		. #x7FDF)	; 翟
+    ))
+(define-char
+  '((=>ucs		. #x7FDF)	; 翟
+    (morohashi-daikanwa	28727 0 3)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
@@ -2487,10 +2549,7 @@
       )
      ((ucs		  . #x96B9)	; 隹
       ))
-    (chinese-gb2312	. #x3554)	; ø»„¤
-    (chinese-isoir165	. #x3554)	; ø»ŒŸ
     (chinese-cns11643-1 . #x6A4B)	; ø»’®”
-    (ucs		. #x7FDF)	; 翟
     ))
 (define-char
   '((=>ucs		. #x2644F)	; 𦑏
@@ -2575,13 +2634,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+      (=gt-k		  . 01762)	; ý¡„€›¢
       )
-     ((japanese-jisx0208-1978	  . #x4234)	; ø»‚¬±
-      (japanese-jisx0208	  . #x4234)	; ø»‡€¹
-      (korean-ksc5601		  . #x706F)	; ø»Šœ
-      (ideograph-daikanwa	  . 02740)	; ø¸€ª´
+     ((=jis-x0208	  . #x4234)	; ø½Š¦­
+      (korean-ksc5601	  . #x706F)	; ø»Šœ
+      (ideograph-daikanwa . 02740)	; ø¸€ª´
       ))
     (japanese-jisx0208-1978	. #x3F69)	; ø»‚©Œ
     (korean-ksc5601		. #x7628)	; ø»Š—‰
@@ -2600,13 +2658,14 @@
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
-     ((japanese-jisx0208-1978	  . #x4234)	; ø»‚¬±
-      (japanese-jisx0208	  . #x4234)	; ø»‡€¹
-      (korean-ksc5601		  . #x706F)	; ø»Šœ
-      (ideograph-daikanwa	  . 02740)	; ø¸€ª´
+     ((=jis-x0208	  . #x4234)	; ø½Š¦­
+      (korean-ksc5601	  . #x706F)	; ø»Šœ
+      (ideograph-daikanwa . 02740)	; ø¸€ª´
       ))
     (japanese-jisx0208		. #x3F69)	; ø»†½”
     (japanese-jisx0208-1990	. #x3F69)	; ø½Š£ˆ
+    (=jef-china3		. #x5FFE)	; øº…¿¾
+    (ucs-jis			. #x7FE0)	; ø»†½”
     ))
 (define-char
   '((morohashi-daikanwa	28732 0 3)
@@ -2635,11 +2694,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x4873)	; ø»‚¶¤
-      (japanese-jisx0208	  . #x4873)	; ø»‡Š¬
-      (korean-ksc5601		  . #x5E2A)	; ø»‰³»
-      (chinese-cns11643-1	  . #x4F66)	; ø»’‡…
-      (ideograph-daikanwa	  . 42585)	; ø¸Š™™
+     ((=jis-x0208	  . #x4873)	; ø½Š° 
+      (korean-ksc5601	  . #x5E2A)	; ø»‰³»
+      (ideograph-daikanwa . 42585)	; ø¸Š™™
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
@@ -2661,15 +2718,15 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((japanese-jisx0208-1978	  . #x4873)	; ø»‚¶¤
-      (japanese-jisx0208	  . #x4873)	; ø»‡Š¬
-      (korean-ksc5601		  . #x5E2A)	; ø»‰³»
-      (chinese-cns11643-1	  . #x4F66)	; ø»’‡…
-      (ideograph-daikanwa	  . 42585)	; ø¸Š™™
+     ((=jis-x0208	  . #x4873)	; ø½Š° 
+      (korean-ksc5601	  . #x5E2A)	; ø»‰³»
+      (ideograph-daikanwa . 42585)	; ø¸Š™™
       )
-     ((ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((korean-ksc5601	  . #x6962)	; ø»Š„½
+      (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (japanese-jisx0208-1990	. #x6647)	; ø½‹›¸
+    (ucs-jis			. #x7FE1)	; ø½‹›¸
     ))
 (define-char
   '((morohashi-daikanwa	28733 0 3)
@@ -2816,18 +2873,18 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
+     ((ideograph-gt-pj-k1 . #x322B)	; ý¡„€›¢
+      (=gt-k		  . 01762)	; ý¡„€›¢
       )
-     ((japanese-jisx0208-1978	  . #x3E2A)	; ø»‚¦¯
-      (japanese-jisx0208	  . #x3E2A)	; ø»†º·
-      (korean-ksc5601		  . #x745D)	; ø»Š•‚
-      (ideograph-daikanwa	  . 06147)	; ø¸ ƒ
+     ((=jis-x0208	  . #x3E2A)	; ø½Š «
+      (korean-ksc5601	  . #x745D)	; ø»Š•‚
+      (ideograph-daikanwa . 06147)	; ø¸ ƒ
       ))
-    (japanese-jisx0212		. #x553D)	; ø»‹±„
-    (japanese-jisx0213-2	. #x747C)	; ø»¦˜•
-    (chinese-big5		. #xE37C)	; ý¢€Ž¼
-    (ideograph-daikanwa		. 28739)	; ø¸‡ƒ
+    (japanese-jisx0212	. #x553D)	; ø»‹±„
+    (=jis-x0213-2-2000	. #x747C)	; ø»¦˜•
+    (chinese-big5	. #xE37C)	; ý¢€Ž¼
+    (ideograph-daikanwa . 28739)	; ø¸‡ƒ
+    (ucs-jis		. #x7FE3)	; ø»‹±„
     ))
 (define-char
   '((morohashi-daikanwa	28739 0 2)
@@ -2929,14 +2986,15 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ideograph-daikanwa . 28853)	; ø¸‡‚µ
+     ((ucs		  . #xFA5B)	; 者
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (japanese-jisx0212		. #x553E)	; ø»‹±…
-    (japanese-jisx0213-2	. #x747D)	; ø»¦˜–
-    (ideograph-daikanwa		. 28744)	; ø¸‡ˆ
+    (japanese-jisx0212	. #x553E)	; ø»‹±…
+    (=jis-x0213-2-2000	. #x747D)	; ø»¦˜–
+    (ideograph-daikanwa . 28744)	; ø¸‡ˆ
+    (ucs-jis		. #x7FE5)	; ø»‹±…
     ))
 (define-char
   '((=>ucs		. #x7FE5)	; ç¿¥
@@ -3118,10 +3176,9 @@
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6321)
-    (japanese-jisx0208-1978	. #x6648)	; ø»ƒ¡½
-    (japanese-jisx0208		. #x6648)	; ø»‡¶…
-    (japanese-jisx0208-1990	. #x6648)	; ø½‹›¹
-    (ideograph-daikanwa		. 28752)	; ø¸‡
+    (=jis-x0208		. #x6648)	; ø½‹›¹
+    (ideograph-daikanwa . 28752)	; ø¸‡
+    (ucs-jis		. #x7FE6)	; ø½‹›¹
     ))
 (define-char
   '((=>ucs		. #x7FE6)	; 翦
@@ -3287,6 +3344,7 @@
     (japanese-jisx0212	. #x553F)	; ø»‹±†
     (chinese-big5	. #xE6FA)	; ý¢€Ž›º
     (ideograph-daikanwa . 28759)	; ø¸‡—
+    (ucs-jis		. #x7FE8)	; ø»‹±†
     ))
 (define-char
   '((morohashi-daikanwa	28759 0 2)
@@ -3334,7 +3392,8 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-cns11643-1 . #x5137)	; ø»’‰’
+     ((korean-ksc5601	  . #x7837)	; ø»Šš”
+      (chinese-cns11643-1 . #x5137)	; ø»’‰’
       (ideograph-daikanwa . 11724)	; ø¸‚·Œ
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
@@ -3354,15 +3413,13 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((japanese-jisx0208-1978	  . #x5928)	; ø»ƒŽ—
-      (japanese-jisx0208	  . #x5928)	; ø»‡¢Ÿ
+     ((=jis-x0208	  . #x5928)	; ø½‹ˆ“
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (japanese-jisx0208-1978	. #x6649)	; ø»ƒ¡¾
-    (japanese-jisx0208		. #x6649)	; ø»‡¶†
-    (japanese-jisx0208-1990	. #x6649)	; ø½‹›º
+    (=jis-x0208		. #x6649)	; ø½‹›º
+    (ucs-jis		. #x7FE9)	; ø½‹›º
     ))
 (define-char
   '((=>ucs		. #x7FE9)	; ç¿©
@@ -3587,10 +3644,11 @@
       )
      ((ucs		  . #x8ECD)	; 軍
       ))
-    (japanese-jisx0212		. #x5540)	; ø»‹±‡
-    (japanese-jisx0213-1	. #x7A41)	; ø»¤–Š
-    (chinese-big5		. #xE6F8)	; ý¢€Ž›¸
-    (ideograph-daikanwa		. 28769)	; ø¸‡¡
+    (japanese-jisx0212	. #x5540)	; ø»‹±‡
+    (=jis-x0213-1-2000	. #x7A41)	; ø»¤–Š
+    (chinese-big5	. #xE6F8)	; ý¢€Ž›¸
+    (ideograph-daikanwa . 28769)	; ø¸‡¡
+    (ucs-jis		. #x7FEC)	; ø»‹±‡
     ))
 (define-char
   '((morohashi-daikanwa	28769 0 2)
@@ -3714,17 +3772,17 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((japanese-jisx0208-1978	  . #x722F)	; ø»ƒ³Œ
-      (japanese-jisx0208	  . #x722F)	; ø»ˆ‡”
-      (ideograph-daikanwa	  . 45672)	; ø¸‹‰¨
+     ((=jis-x0208	  . #x722F)	; ø½‹­ˆ
+      (ideograph-daikanwa . 45672)	; ø¸‹‰¨
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (japanese-jisx0212		. #x5541)	; ø»‹±ˆ
-    (japanese-jisx0213-1	. #x7A42)	; ø»¤–‹
-    (chinese-big5		. #xBFAD)	; ý¢€‹¾­
-    (ideograph-daikanwa		. 28776)	; ø¸‡¨
+    (japanese-jisx0212	. #x5541)	; ø»‹±ˆ
+    (=jis-x0213-1-2000	. #x7A42)	; ø»¤–‹
+    (chinese-big5	. #xBFAD)	; ý¢€‹¾­
+    (ideograph-daikanwa . 28776)	; ø¸‡¨
+    (ucs-jis		. #x7FEE)	; ø»‹±ˆ
     ))
 (define-char
   '((morohashi-daikanwa	28776 0 5)
@@ -3773,10 +3831,11 @@
       )
      ((ucs		  . #x9AD8)	; 高
       ))
-    (japanese-jisx0212		. #x5542)	; ø»‹±‰
-    (japanese-jisx0213-2	. #x747E)	; ø»¦˜—
-    (chinese-big5		. #xEAE4)	; ý¢€Ž«¤
-    (ideograph-daikanwa		. 28778)	; ø¸‡ª
+    (japanese-jisx0212	. #x5542)	; ø»‹±‰
+    (=jis-x0213-2-2000	. #x747E)	; ø»¦˜—
+    (chinese-big5	. #xEAE4)	; ý¢€Ž«¤
+    (ideograph-daikanwa . 28778)	; ø¸‡ª
+    (ucs-jis		. #x7FEF)	; ø»‹±‰
     ))
 (define-char
   '((morohashi-daikanwa	28778 0 2)
@@ -3822,16 +3881,6 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
-    (ideographic-structure
-     (:cdp-combinator	4
-      )
-     ((chinese-big5-cdp	  . #x8C49)	; ý¢€ˆ±‰
-      )
-     ((chinese-big5-cdp	  . #x8B5D)	; ý¢€ˆ­
-      )
-     ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (ideograph-daikanwa . 28614)	; ø¸†¿†
-      ))
     (japanese-jisx0208-1978	. #x344D)	; ø»‚˜¦
     (korean-ksc5601		. #x7957)	; ø»Šœ’
     (chinese-big5		. #xBFAB)	; ý¢€‹¾«
@@ -3842,15 +3891,6 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
-    (ideographic-structure
-     (:cdp-combinator	4
-      )
-     ((chinese-big5-cdp	  . #x8C49)	; ý¢€ˆ±‰
-      )
-     ((chinese-big5-cdp	  . #x8B5D)	; ý¢€ˆ­
-      )
-     ((ucs		  . #x7FBD)	; ç¾½
-      ))
     (chinese-gb2312		. #x3A32)	; ø»„«ƒ
     (japanese-jisx0208		. #x344D)	; ø»†¬®
     (chinese-isoir165		. #x3A32)	; ø»““
@@ -4123,9 +4163,10 @@
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
-    (japanese-jisx0212		. #x5543)	; ø»‹±Š
-    (japanese-jisx0213-2	. #x7521)	; ø»¦˜˜
-    (ideograph-daikanwa		. 28795)	; ø¸‡»
+    (japanese-jisx0212	. #x5543)	; ø»‹±Š
+    (=jis-x0213-2-2000	. #x7521)	; ø»¦˜˜
+    (ideograph-daikanwa . 28795)	; ø¸‡»
+    (ucs-jis		. #x7FF2)	; ø»‹±Š
     ))
 (define-char
   '((=>ucs		. #x7FF2)	; 翲
@@ -4185,18 +4226,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((ucs		  . #x6BB9)	; 殹
+     ((ideograph-daikanwa . 16634)	; ø¸„ƒº
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
-      (chinese-big5	  . #xA6D0)	; ý¢€Š›
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6326)
-    (japanese-jisx0208-1978	. #x664A)	; ø»ƒ¡¿
-    (japanese-jisx0208		. #x664A)	; ø»‡¶‡
-    (japanese-jisx0208-1990	. #x664A)	; ø½‹›»
-    (chinese-big5		. #xC16B)	; ý¢€Œ…«
-    (ideograph-daikanwa		. 28796)	; ø¸‡¼
+    (=jis-x0208		. #x664A)	; ø½‹›»
+    (chinese-big5	. #xC16B)	; ý¢€Œ…«
+    (ideograph-daikanwa . 28796)	; ø¸‡¼
+    (ucs-jis		. #x7FF3)	; ø½‹›»
     ))
 (define-char
   '((morohashi-daikanwa	28796 0 2)
@@ -4225,7 +4264,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
       )
-     ((chinese-big5-cdp	  . #x8CD2)	; ý¢€ˆ³’
+     ((chinese-cns11643-4 . #x3250)	; ø»—º•
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
@@ -4365,15 +4404,12 @@
     (total-strokes	 . 17)
     (->mojikyo		. 050362)	; ø»’½«
     (->same-ideograph
-     (:sources	(morohashi-daikanwa)
-      :char	((ideograph-daikanwa . 28818)	; ø¸‡‚’
+     (:char	((ideograph-daikanwa . 28818)	; ø¸‡‚’
 		 )
-      ))
+      :sources	(morohashi-daikanwa)))
     (ideographic-structure
-     (:cdp-combinator	2
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-		 (ucs		     . #x2FF1)	; ⿱
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
@@ -4392,10 +4428,8 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
     (ideographic-structure
-     (:cdp-combinator	2
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-		 (ucs		     . #x2FF1)	; ⿱
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
       )
      ((ucs		  . #x7FBD)	; ç¾½
       )
@@ -4403,17 +4437,23 @@
       ))
     (chinese-cns11643-1		. #x7476)	; ø»’½«
     (japanese-jisx0208-1990	. #x4D63)	; ø½Š·¦
-    (chinese-big5		. #xC16C)	; ý¢€Œ…¬
+    (ucs-jis			. #x7FFC)	; ø»’½«
     (mojikyo			. 050362)	; ý €Œ’º
     ))
 (define-char
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
-    (chinese-cns11643-3 . #x557E)	; ø»–¤™
     (ucs		. #x7FF6)	; 翶
     ))
 (define-char
+  '((=>ucs		. #x7FF6)	; 翶
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 11)
+    (total-strokes	 . 17)
+    (chinese-cns11643-3 . #x557E)	; ø»–¤™
+    ))
+(define-char
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 11)
     (total-strokes	 . 17)
@@ -4426,13 +4466,10 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (ucs		     . #x2FF0)	; â¿°
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8CB9)	; ý¢€ˆ²¹
-      (ucs		  . #x7CA6)	; 粦
+     ((ucs		  . #x7CA6)	; 粦
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
@@ -4440,26 +4477,56 @@
     (ideograph-daikanwa . 28802)	; ø¸‡‚‚
     ))
 (define-char
+  '((=>ucs		. #x7FF7)	; ç¿·
+    (morohashi-daikanwa	28802 0 0)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
+      )
+     ((japanese-jisx0212  . #x5332)	; ø»‹­½
+      (=jis-x0213-2-2000  . #x7376)	; ø»¦–±
+      )
+     ((korean-ksc5601	  . #x6962)	; ø»Š„½
+      (ideograph-daikanwa . 28614)	; ø¸†¿†
+      ))
+    (chinese-big5	. #xF07A)	; ý¢€º
+    ))
+(define-char
   '((morohashi-daikanwa	28802 0 2)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (ucs		     . #x2FF0)	; â¿°
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8CB9)	; ý¢€ˆ²¹
-      (ucs		  . #x7CA6)	; 粦
+     ((ucs		  . #x7CA6)	; 粦
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
-    (chinese-cns11643-2 . #x6266)	; ø»”­ƒ
-    (chinese-big5	. #xF07A)	; ý¢€º
     (ucs		. #x7FF7)	; ç¿·
     ))
 (define-char
+  '((=>ucs		. #x7FF7)	; ç¿·
+    (morohashi-daikanwa	28802 0 3)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 12)
+    (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
+      )
+     ((chinese-cns11643-3 . #x3E22)	; ø»–‹
+      )
+     ((ucs		  . #x7FBD)	; ç¾½
+      ))
+    (chinese-cns11643-2 . #x6266)	; ø»”­ƒ
+    (ucs-cns		. #x7FF7)	; ø»”­ƒ
+    ))
+(define-char
   '((=>ucs		. #x4396)	; 䎖
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
@@ -4567,12 +4634,11 @@
       (ideograph-daikanwa . 28614)	; ø¸†¿†
       ))
     (shinjigen-2	. 6329)
-    (japanese-jisx0208-1978	. #x664B)	; ø»ƒ¢€
-    (japanese-jisx0208		. #x664B)	; ø»‡¶ˆ
-    (korean-ksc5601		. #x4E6E)	; ø»‰Ÿ
-    (japanese-jisx0208-1990	. #x664B)	; ø½‹›¼
-    (chinese-big5		. #xC2BC)	; ý¢€ŒŠ¼
-    (ideograph-daikanwa		. 28808)	; ø¸‡‚ˆ
+    (=jis-x0208		. #x664B)	; ø½‹›¼
+    (korean-ksc5601	. #x4E6E)	; ø»‰Ÿ
+    (chinese-big5	. #xC2BC)	; ý¢€ŒŠ¼
+    (ideograph-daikanwa . 28808)	; ø¸‡‚ˆ
+    (ucs-jis		. #x7FF9)	; ø½‹›¼
     ))
 (define-char
   '((morohashi-daikanwa	28808 0 2)
@@ -4611,9 +4677,10 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
-    (japanese-jisx0212		. #x5544)	; ø»‹±‹
-    (japanese-jisx0213-1	. #x7A43)	; ø»¤–Œ
-    (ideograph-daikanwa		. 28810)	; ø¸‡‚Š
+    (japanese-jisx0212	. #x5544)	; ø»‹±‹
+    (=jis-x0213-1-2000	. #x7A43)	; ø»¤–Œ
+    (ideograph-daikanwa . 28810)	; ø¸‡‚Š
+    (ucs-jis		. #x7FFA)	; ø»‹±‹
     ))
 (define-char
   '((morohashi-daikanwa	28810 0 2)
@@ -4698,13 +4765,11 @@
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
-    (japanese-jisx0208-1978	. #x4B5D)	; ø»‚º¨
-    (chinese-gb2312		. #x372D)	; ø»„¦¤
-    (japanese-jisx0208		. #x4B5D)	; ø»‡Ž°
-    (chinese-isoir165		. #x372D)	; ø»Ž´
-    (chinese-cns11643-1		. #x7729)	; ø»“€¸
-    (japanese-jisx0208-1990	. #x4B5D)	; ø½Š´¤
-    (ucs			. #x7FFB)	; ç¿»
+    (chinese-gb2312	. #x372D)	; ø»„¦¤
+    (=jis-x0208		. #x4B5D)	; ø½Š´¤
+    (chinese-isoir165	. #x372D)	; ø»Ž´
+    (chinese-cns11643-1 . #x7729)	; ø»“€¸
+    (ucs		. #x7FFB)	; ç¿»
     ))
 (define-char
   '((=>ucs		. #x26491)	; 𦒑
@@ -4767,6 +4832,14 @@
     (korean-ksc5601	. #x6C4F)	; ø»Š‰„
     ))
 (define-char
+  '((=>ucs		. #x7FFC)	; 翼
+    (morohashi-daikanwa	28818 0 2)
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 11)
+    (total-strokes	 . 17)
+    (chinese-big5	. #xC16C)	; ý¢€Œ…¬
+    ))
+(define-char
   '((=>ucs		. #x26496)	; 𦒖
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 12)
@@ -4850,6 +4923,7 @@
     (japanese-jisx0212	. #x5545)	; ø»‹±Œ
     (chinese-big5	. #xF2BE)	; ý¢€Š¾
     (ideograph-daikanwa . 28823)	; ø¸‡‚—
+    (ucs-jis		. #x7FFD)	; ø»‹±Œ
     ))
 (define-char
   '((morohashi-daikanwa	28823 0 2)
@@ -4876,7 +4950,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8BB6)	; ý¢€ˆ®¶
+     ((ucs		  . #x7758)	; 睘
       )
      ((korean-ksc5601	  . #x6962)	; ø»Š„½
       (ideograph-daikanwa . 28614)	; ø¸†¿†
@@ -4884,6 +4958,7 @@
     (japanese-jisx0212	. #x5546)	; ø»‹±
     (chinese-big5	. #xF2BF)	; ý¢€Š¿
     (ideograph-daikanwa . 28824)	; ø¸‡‚˜
+    (ucs-jis		. #x7FFE)	; ø»‹±
     ))
 (define-char
   '((morohashi-daikanwa	28824 0 2)
@@ -4894,7 +4969,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
       )
-     ((chinese-big5-cdp	  . #x8BB6)	; ý¢€ˆ®¶
+     ((ucs		  . #x7758)	; 睘
       )
      ((ucs		  . #x7FBD)	; ç¾½
       ))
@@ -4944,10 +5019,8 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 20)
     (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (ucs		     . #x2FF0)	; â¿°
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
      ((ucs		  . #x58FD)	; 壽
       )
@@ -4956,6 +5029,7 @@
       ))
     (japanese-jisx0212	. #x5547)	; ø»‹±Ž
     (ideograph-daikanwa . 28827)	; ø¸‡‚›
+    (ucs-jis		. #x7FFF)	; ø»‹±Ž
     ))
 (define-char
   '((morohashi-daikanwa	28827 0 2)
@@ -4982,17 +5056,15 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 20)
     (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (ucs		     . #x2FF0)	; â¿°
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (ucs		  . #x2FF0)	; â¿°
       )
      ((ucs		  . #x5149)	; 光
       )
-     ((korean-ksc5601		  . #x6E61)	; ø»ŠŒ’
-      (japanese-jisx0212	  . #x553C)	; ø»‹±ƒ
-      (japanese-jisx0213-1	  . #x7A40)	; ø»¤–‰
-      (ideograph-daikanwa	  . 28727)	; ø¸‡€·
+     ((korean-ksc5601	  . #x6E61)	; ø»ŠŒ’
+      (japanese-jisx0212  . #x553C)	; ø»‹±ƒ
+      (=jis-x0213-1-2000  . #x7A40)	; ø»¤–‰
+      (ideograph-daikanwa . 28727)	; ø¸‡€·
       ))
     (japanese-jisx0208-1978	. #x4D54)	; ø»‚½›
     (korean-ksc5601		. #x6925)	; ø»Š„€
@@ -5006,6 +5078,8 @@
     (total-strokes	 . 20)
     (japanese-jisx0208		. #x4D54)	; ø»‡‘£
     (japanese-jisx0208-1990	. #x4D54)	; ø½Š·—
+    (=jef-china3		. #x6BFE)	; øº†¯¾
+    (ucs-jis			. #x8000)	; ø»‡‘£
     ))
 (define-char
   '((=>ucs		. #x8000)	; 耀
@@ -5019,7 +5093,10 @@
       )
      ((ucs		  . #x5149)	; 光
       )
-     ((chinese-big5	  . #xBB43)	; ý¢€‹­ƒ
+     ((korean-ksc5601	  . #x6E61)	; ø»ŠŒ’
+      (japanese-jisx0212  . #x553C)	; ø»‹±ƒ
+      (=jis-x0213-1-2000  . #x7A40)	; ø»¤–‰
+      (ideograph-daikanwa . 28727)	; ø¸‡€·
       ))
     (chinese-big5	. #xC4A3)	; ý¢€Œ’£
     ))