X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fu02E00-CJK-Radical-Supplement.el;h=3622d307579a9385d030285523b5612671362443;hb=13b73f16693bf9333f11b833e711a6da7c10f737;hp=210fe441aaa20928a03c36f35468e3ed17990661;hpb=6e1982b1488f9e9d9514824f21f0de3d568e5495;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
index 210fe44..3622d30 100644
--- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
+++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el
@@ -1,8 +1,12 @@
+;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((name		. "CJK RADICAL REPEAT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x20120)	; 𠄠
+      ))
     (=ucs		. #x2E80)	; ⺀
     ))
 (define-char
@@ -10,8 +14,8 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
-     ((=ucs		  . #x20086)	; 𠂆
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5382)	; 厂
       ))
     (=ucs		. #x2E81)	; ⺁
     ))
@@ -34,9 +38,8 @@
     (<-radical
      ((=ucs		  . #x4E5A)	; 乚
       ))
-    (ideograph-cdp	. -21)
-    (=big5-cdp		. #x8C5D)	; ý¢€ˆ±
     (=ucs		. #x2E83)	; ⺃
+    (=big5-cdp		. #x8C5D)	; &I-CDP-8C5D;
     ))
 (define-char
   '((name		. "CJK RADICAL SECOND THREE")
@@ -44,9 +47,16 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 1)
-    (ideograph-cdp	. -13)
-    (=big5-cdp		. #x8D43)	; ý¢€ˆµƒ
     (=ucs		. #x2E84)	; ⺄
+    (=big5-cdp		. #x8D43)	; &I-CDP-8D43;
+    (=gt-k		. 00008)	; &I-GT-K00008;
+    (=gt-pj-k1		. #x302E)	; ⺄ [16-14]
+    ))
+(define-char
+  '((=>ucs		. #x2E84)	; ⺄
+    (total-strokes	 . 1)
+    (=gt-k		. 00007)	; &GT-K00007;
+    (=gt-pj-k1		. #x302D)	; &GT-K00007; [16-13]
     ))
 (define-char
   '((name		. "CJK RADICAL PERSON")
@@ -54,12 +64,14 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x4EBA)	; 人
+      ))
     (<-radical
      ((=ucs		  . #x4EBB)	; 亻
       ))
-    (ideograph-cdp	. -64)
-    (=big5-cdp		. #x8AF5)	; ý¢€ˆ«µ
     (=ucs		. #x2E85)	; ⺅
+    (=big5-cdp		. #x8AF5)	; &I-CDP-8AF5;
     ))
 (define-char
   '((name		. "CJK RADICAL BOX")
@@ -67,11 +79,19 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
-    (ideograph-cdp	. -80)
-    (=big5-cdp		. #x8BF2)	; ý¢€ˆ¯²
+    (<-radical
+     ((=ucs		  . #x5182)	; 冂
+      ))
     (=ucs		. #x2E86)	; ⺆
     ))
 (define-char
+  '((=>ucs		. #x2E86)	; ⺆
+    (total-strokes	 . 2)
+    (=big5-cdp		. #x8BF2)	; &CDP-8BF2;
+    (=gt-k		. 00143)	; &I-GT-K00143;
+    (=gt-pj-k1		. #x3D6C)	; &CDP-8BF2; [29-76]
+    ))
+(define-char
   '((name		. "CJK RADICAL TABLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
@@ -80,28 +100,38 @@
     (<-radical
      ((=ucs		  . #x51E0)	; 几
       ))
-    (ideograph-cdp	. -79)
-    (=big5-cdp		. #x8D66)	; ý¢€ˆµ¦
     (=ucs		. #x2E87)	; ⺇
+    (=big5-cdp		. #x8D66)	; &I-CDP-8D66;
+    (=gt		. 02284)	; &I-GT-02284;
+    (=gt-k		. 00086)	; &I-GT-K00086;
+    (=gt-pj-9		. #x505D)	; &I-GT-02284; [48-61]
     ))
 (define-char
   '((name		. "CJK RADICAL KNIFE ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5200)	; 刀
+      ))
     (=ucs		. #x2E88)	; ⺈
+    (=gt-k		. 00091)	; &I-GT-K00091;
+    (=gt-pj-k1		. #x3234)	; ⺈ [18-20]
     ))
 (define-char
   '((name		. "CJK RADICAL KNIFE TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5200)	; 刀
+      ))
     (<-radical
      ((=ucs		  . #x5202)	; 刂
       ))
-    (=big5-eten		. #xC87D)	; ý¢€Œ¡½
-    (=ucs@big5		. #x5202)	; ⺉
     (=ucs		. #x2E89)	; ⺉
+    (=big5-eten		. #xC87D)	; &B-C87D;
+    (=ucs@big5		. #x5202)	; ⺉
     ))
 (define-char
   '((name		. "CJK RADICAL DIVINATION")
@@ -109,43 +139,66 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (total-strokes	 . 2)
-    (ideograph-cdp	. -51)
-    (=big5-cdp		. #x8B78)	; ý¢€ˆ­¸
+    (<-ideographic-component-forms
+     ((=ucs		  . #x535C)	; 卜
+      ))
     (=ucs		. #x2E8A)	; ⺊
+    (=big5-cdp		. #x8B78)	; &I-CDP-8B78;
+    (=gt-k		. 00062)	; &I-GT-K00062;
+    (=gt-pj-k1		. #x3D4D)	; ⺊ [29-45]
     ))
 (define-char
-  '((name		. "CJK RADICAL SEAL")
+  '((<-denotational
+     ((=ucs		  . #x353E)	; 㔾
+      ))
+    (name		. "CJK RADICAL SEAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5369)	; 卩
+      ))
     (<-radical
      ((=ucs		  . #x353E)	; 㔾
       ))
     (=ucs		. #x2E8B)	; ⺋
     ))
 (define-char
+  '((=>ucs		. #x353E)	; 㔾
+    (=jef-china3	. #x71F7)	; &JC3-71F7;
+    ))
+(define-char
   '((name		. "CJK RADICAL SMALL ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=gt-pj-k1		. #x3233)	; ⺌
-    (=big5-cdp		. #x8B54)	; ý¢€ˆ­”
-    (=gt-k		. 00303)	; ý¡„€„¯
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5C0F)	; 小
+      ))
     (=ucs		. #x2E8C)	; ⺌
+    (=big5-cdp		. #x8B54)	; &I-CDP-8B54;
+    (=gt-k		. 00303)	; &I-GT-K00303;
+    (=gt-pj-k1		. #x3233)	; ⺌ [18-19]
     ))
 (define-char
   '((=>ucs		. #x2E8C)	; ⺌
-    (=gt-pj-k1		. #x324E)	; ý¡„€„±
-    (=gt-k		. 00305)	; ý¡„€„±
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5C0F)	; 小
+      ))
+    (=gt-k		. 00305)	; &GT-K00305;
+    (=gt-pj-k1		. #x324E)	; &GT-K00305; [18-46]
     ))
 (define-char
   '((name		. "CJK RADICAL SMALL TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=gt-pj-k1		. #x3251)	; ⺍
-    (=gt-k		. 00325)	; ý¡„€……
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5C0F)	; 小
+      ))
     (=ucs		. #x2E8D)	; ⺍
+    (=gt-k		. 00325)	; &I-GT-K00325;
+    (=gt-pj-k1		. #x3251)	; ⺍ [18-49]
     ))
 (define-char
   '((name		. "CJK RADICAL LAME ONE")
@@ -218,7 +271,10 @@
     (=ucs		. #x2E94)	; ⺔
     ))
 (define-char
-  '((name		. "CJK RADICAL SNOUT TWO")
+  '((<-denotational
+     ((=ucs		  . #x5F50)	; 彐
+      ))
+    (name		. "CJK RADICAL SNOUT TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
@@ -226,26 +282,41 @@
      ((=ucs		  . #x5F50)	; 彐
       ))
     (=ucs		. #x2E95)	; ⺕
+    (=gt-k		. 00266)	; &I-GT-K00266;
+    (=gt-pj-k1		. #x3663)	; ⺕ [22-67]
+    ))
+(define-char
+  '((<-denotational
+     ((name		  . "CJK RADICAL SNOUT TWO")
+      (=ucs		  . #x2E95)	; ⺕
+      ))
+    (=big5-cdp		. #x897C)	; &CDP-897C;
     ))
 (define-char
   '((name		. "CJK RADICAL HEART ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5FC3)	; 心
+      ))
     (<-radical
      ((=ucs		  . #x5FC4)	; 忄
       ))
-    (=gt-pj-3		. #x4D5F)	; ý¡€ƒ‹€
-    (=big5-cdp		. #x8B51)	; ý¢€ˆ­‘
-    (=gt-k		. 00302)	; ý¡„€„®
-    (=gt		. 12992)	; ý¡€ƒ‹€
     (=ucs		. #x2E96)	; ⺖
+    (=big5-cdp		. #x8B51)	; &I-CDP-8B51;
+    (=gt		. 12992)	; &I-GT-12992;
+    (=gt-k		. 00302)	; &I-GT-K00302;
+    (=gt-pj-3		. #x4D5F)	; &I-GT-12992; [45-63]
     ))
 (define-char
   '((name		. "CJK RADICAL HEART TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5FC3)	; 心
+      ))
     (<-radical
      ((=ucs		  . #x38FA)	; 㣺
       ))
@@ -256,11 +327,14 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x624B)	; 手
+      ))
     (<-radical
      ((=ucs		  . #x624C)	; 扌
       ))
-    (=big5-cdp		. #x8AFA)	; ý¢€ˆ«º
     (=ucs		. #x2E98)	; ⺘
+    (=big5-cdp		. #x8AFA)	; &I-CDP-8AFA;
     ))
 (define-char
   '((name		. "CJK RADICAL RAP")
@@ -288,9 +362,11 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (<-radical
-     ((=big5-cdp	  . #x8A78)	; ý¢€ˆ©¸
+     ((=big5-cdp	  . #x8A78)	; &CDP-8A78;
       ))
     (=ucs		. #x2E9C)	; ⺜
+    (=gt-k		. 00565)	; &I-GT-K00565;
+    (=gt-pj-k1		. #x3229)	; ⺜ [18-09]
     ))
 (define-char
   '((name		. "CJK RADICAL MOON")
@@ -337,51 +413,74 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x6C34)	; æ°´
+      ))
     (<-radical
      ((=ucs		  . #x6C35)	; æ°µ
       ))
-    (=big5-cdp		. #x8AF6)	; ý¢€ˆ«¶
     (=ucs		. #x2EA1)	; ⺡
+    (=big5-cdp		. #x8AF6)	; &I-CDP-8AF6;
     ))
 (define-char
   '((name		. "CJK RADICAL WATER TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x6C34)	; æ°´
+      ))
     (<-radical
      ((=ucs		  . #x6C3A)	; æ°º
       ))
-    (=big5-cdp		. #x8C43)	; ý¢€ˆ±ƒ
     (=ucs		. #x2EA2)	; ⺢
+    (=big5-cdp		. #x8C43)	; &I-CDP-8C43;
     ))
 (define-char
   '((name		. "CJK RADICAL FIRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x706B)	; 火
+      ))
     (<-radical
      ((=ucs		  . #x706C)	; 灬
       ))
     (=ucs		. #x2EA3)	; ⺣
     ))
 (define-char
-  '((name		. "CJK RADICAL PAW ONE")
+  '((<-denotational
+     ((=ucs		  . #x722B)	; 爫
+      ))
+    (name		. "CJK RADICAL PAW ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 87)	; ⽖
+    (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (<-radical
-     ((=ucs		  . #x722B)	; 爫
-      ))
-    (ideograph-cdp	. -493)
-    (=big5-cdp		. #x8B58)	; ý¢€ˆ­˜
     (=ucs		. #x2EA4)	; ⺤
+    (=jis-x0213-2-2000	. #x7029)	; &I-JX2-7029; [80-09]
+    (=big5-cdp		. #x8B58)	; &I-CDP-8B58;
+    (=ucs@unicode	. #x722B)	; ⺤
+    (=ucs@jis		. #xFA49)	; ⺤
+    (->subsumptive
+     ((=>ucs*		  . #x722B)	; 爫
+      (=ucs		  . #xFA49)	; 爫
+      ))
     ))
 (define-char
-  '((name		. "CJK RADICAL PAW TWO")
+  '((<-denotational
+     ((=ucs		  . #x722B)	; 爫
+      ))
+    (name		. "CJK RADICAL PAW TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-radical
+     ((=ucs		  . #x722A)	; 爪
+      ))
     (=ucs		. #x2EA5)	; ⺥
     ))
 (define-char
@@ -396,8 +495,11 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=big5-cdp		. #x8B66)	; ý¢€ˆ­¦
+    (<-ideographic-component-forms
+     ((=ucs		  . #x725B)	; 牛
+      ))
     (=ucs		. #x2EA7)	; ⺧
+    (=big5-cdp		. #x8B66)	; &I-CDP-8B66;
     ))
 (define-char
   '((name		. "CJK RADICAL DOG")
@@ -408,36 +510,73 @@
      ((=ucs		  . #x72AD)	; 犭
       ))
     (=ucs		. #x2EA8)	; ⺨
+    (=big5-cdp		. #x8BAF)	; &I-CDP-8BAF;
     ))
 (define-char
   '((name		. "CJK RADICAL JADE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x738B)	; 王
+      )
+     ((=ucs		  . #x7389)	; 玉
+      ))
     (<-radical
      ((=ucs		  . #x248E9)	; 𤣩
       ))
     (=ucs		. #x2EA9)	; ⺩
+    (=gt-k		. 00402)	; &I-GT-K00402;
+    (=gt-pj-k1		. #x3467)	; ⺩ [20-71]
     ))
 (define-char
   '((name		. "CJK RADICAL BOLT OF CLOTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x758B)	; 疋
+      ))
     (=ucs		. #x2EAA)	; ⺪
     ))
 (define-char
+  '((=>ucs		. #x2EAA)	; ⺪
+    (<-ideographic-component-forms
+     ((=ucs		  . #x758B)	; 疋
+      ))
+    (=big5-cdp		. #x8DC5)	; &CDP-8DC5;
+    ))
+(define-char
   '((name		. "CJK RADICAL EYE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x76EE)	; 目
+      ))
     (=ucs		. #x2EAB)	; ⺫
     ))
 (define-char
+  '((=>ucs		. #x2EAB)	; ⺫
+    (ideographic-radical . 109)	; ⽬
+    (ideographic-strokes . 0)
+    (total-strokes	 . 5)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x76EE)	; 目
+      ))
+    (=big5-cdp		. #x8B48)	; &GT-36329;
+    (=gt		. 36329)	; &I-GT-36329;
+    (=gt-k		. 01549)	; &I-GT-K01549;
+    (=gt-pj-5		. #x7264)	; &I-GT-36329; [82-68]
+    ))
+(define-char
   '((name		. "CJK RADICAL SPIRIT ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x793A)	; 示
+      ))
     (<-radical
      ((=ucs		  . #x793A)	; 示
       ))
@@ -448,49 +587,82 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x793A)	; 示
+      ))
     (<-radical
      ((=ucs		  . #x793B)	; 礻
       ))
-    (=big5-cdp		. #x8B70)	; ý¢€ˆ­°
     (=ucs		. #x2EAD)	; ⺭
+    (=big5-cdp		. #x8B70)	; &I-CDP-8B70;
     ))
 (define-char
   '((name		. "CJK RADICAL BAMBOO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=big5-cdp		. #x8B4C)	; ý¢€ˆ­Œ
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7AF9)	; 竹
+      ))
     (=ucs		. #x2EAE)	; ⺮
+    (=big5-cdp		. #x8B4C)	; &I-CDP-8B4C;
+    (=gt-k		. 02267)	; &I-GT-K02267;
+    (=gt-pj-k1		. #x324D)	; ⺮ [18-45]
     ))
 (define-char
-  '((name		. "CJK RADICAL SILK")
+  '((<-denotational
+     ((=ucs		  . #x7CF9)	; ç³¹
+      ))
+    (name		. "CJK RADICAL SILK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7CF8)	; 糸
+      ))
     (<-radical
      ((=ucs		  . #x7CF9)	; ç³¹
       ))
     (=ucs		. #x2EAF)	; ⺯
+    (=big5-cdp		. #x8AFB)	; &I-CDP-8AFB;
     ))
 (define-char
-  '((name		. "CJK RADICAL C-SIMPLIFIED SILK")
+  '((<-denotational
+     ((=ucs		  . #x7E9F)	; 纟
+      ))
+    (name		. "CJK RADICAL C-SIMPLIFIED SILK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7CF8)	; 糸
+      ))
     (<-radical
      ((=ucs		  . #x7E9F)	; 纟
       ))
+    (<-simplified@CN
+     ((name		  . "CJK RADICAL SILK")
+      (=ucs		  . #x2EAF)	; ⺯
+      ))
     (=ucs		. #x2EB0)	; ⺰
+    (=big5-cdp		. #x895B)	; &I-CDP-895B;
     ))
 (define-char
-  '((name		. "CJK RADICAL NET ONE")
+  '((<-denotational
+     ((=ucs		  . #x7F53)	; 罓
+      ))
+    (name		. "CJK RADICAL NET ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 122)	; â½¹
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
     (<-radical
      ((=ucs		  . #x7F53)	; 罓
       ))
     (=ucs		. #x2EB1)	; ⺱
+    (=ucs@unicode	. #x7F53)	; ⺱
     ))
 (define-char
   '((name		. "CJK RADICAL NET TWO")
@@ -531,35 +703,88 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=big5-cdp		. #x8970)	; ý¢€ˆ¥°
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
     (=ucs		. #x2EB6)	; ⺶
     ))
 (define-char
   '((=>ucs		. #x2EB6)	; ⺶
-    (=big5-cdp		. #x8CCC)	; ý¢€ˆ³Œ
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
+    (=gt-k		. 01701)	; &GT-K01701;
+    (=gt-pj-k1		. #x3443)	; &GT-K01701; [20-35]
+    ))
+(define-char
+  '((=>ucs		. #x2EB6)	; ⺶
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
+    (=big5-cdp		. #x8970)	; &CDP-8970;
+    ))
+(define-char
+  '((=>ucs		. #x2EB6)	; ⺶
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 7)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
+    (=big5-cdp		. #x8CCC)	; &CDP-8CCC;
     ))
 (define-char
   '((name		. "CJK RADICAL RAM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
+    (->mistakable
      ((=ucs		  . #x2634C)	; 𦍌
       ))
+    (<-ideographic-component-forms
+     ((=ucs		  . #x7F8A)	; 羊
+      ))
     (=ucs		. #x2EB7)	; ⺷
+    (=big5-cdp		. #x8B4E)	; &I-CDP-8B4E;
     ))
 (define-char
   '((name		. "CJK RADICAL EWE")
+    (=>daikanwa		. 28426)	; 𦍋
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 0)
+    (total-strokes	 . 7)
+    (->mistakable
+     ((=ucs		  . #x8289)	; 芉
+      ))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((name		  . "CJK RADICAL GRASS THREE")
+      (=ucs		  . #x2EC0)	; ⻀
+      )
+     ((=ucs		  . #x5E72)	; å¹²
+      ))
     (=ucs		. #x2EB8)	; ⺸
+    (=cbeta		. 06151)	; &I-CB06151;
     ))
 (define-char
   '((name		. "CJK RADICAL OLD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8001)	; 老
+      ))
     (<-radical
      ((=ucs		  . #x8002)	; 耂
       ))
@@ -590,24 +815,36 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=daikanwa		. 29237)	; ø¸‡ˆµ
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8089)	; 肉
+      ))
     (=ucs		. #x2EBC)	; ⺼
+    (->subsumptive
+     ((=gt		  . 37857)	; &GT-37857;
+      (=gt-pj-6		  . #x3879)	; &GT-37857; [24-89]
+      (=daikanwa	  . 29237)	; &I-M-29237;
+      )
+     ((=ucs@unicode	  . #x2EBC)	; &UU+2EBC;
+      )
+     ((=big5-cdp	  . #x8A73)	; &CDP-8A73;
+      )
+     ((=big5-cdp	  . #x8958)	; &CDP-8958;
+      (=gt-k		  . 00417)	; &I-GT-K00417;
+      (=gt-pj-k1	  . #x377D)	; &CDP-8958; [23-93]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2EBC)	; ⺼
-    (morohashi-daikanwa	29237 0 1)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (=big5-cdp		. #x8958)	; ý¢€ˆ¥˜
-    ))
-(define-char
-  '((=>ucs		. #x2EBC)	; ⺼
-    (morohashi-daikanwa	29237 0 0)
+  '((<-denotational
+     ((name		  . "CJK RADICAL MEAT")
+      (=ucs		  . #x2EBC)	; ⺼
+      ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=big5-cdp		. #x8A73)	; ý¢€ˆ©³
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8089)	; 肉
+      ))
+    (=big5-cdp		. #x88F0)	; &CDP-88F0;
     ))
 (define-char
   '((name		. "CJK RADICAL MORTAR")
@@ -620,34 +857,73 @@
     (=ucs		. #x2EBD)	; ⺽
     ))
 (define-char
-  '((name		. "CJK RADICAL GRASS ONE")
+  '((<-denotational
+     ((=ucs		  . #x8279)	; 艹
+      ))
+    (name		. "CJK RADICAL GRASS ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
-     ((=ucs		  . #x8279)	; 艹
-      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
     (=ucs		. #x2EBE)	; ⺾
+    (=gb2312		. #x5C33)	; &I-G0-5C33; [60-19]
+    (=jis-x0213-2-2000	. #x7576)	; &I-JX2-7576; [85-86]
+    (=big5-cdp		. #x8957)	; &I-CDP-8957;
+    (=gt		. 39639)	; &I-GT-39639;
+    (=gt-k		. 00279)	; &I-GT-K00279;
+    (=gt-pj-9		. #x4F47)	; &I-GT-39639; [47-39]
+    (=jef-china3	. #x72FA)	; &I-JC3-72FA;
+    (=ucs@unicode	. #x8279)	; ⺾
     ))
 (define-char
-  '((name		. "CJK RADICAL GRASS TWO")
+  '((<-denotational
+     ((=ucs		  . #x8279)	; 艹
+      ))
+    (name		. "CJK RADICAL GRASS TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
-     ((=ucs		  . #xFA5E)	; 艹
-      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
     (=ucs		. #x2EBF)	; ⺿
-    ))
-(define-char
-  '((name		. "CJK RADICAL GRASS THREE")
+    (=cns11643-4	. #x2153)	; &I-C4-2153; [01-51]
+    (=jis-x0213-2-2000	. #x7575)	; &I-JX2-7575; [85-85]
+    (=big5-cdp		. #x8AFE)	; &I-CDP-8AFE;
+    (=gt		. 39643)	; &I-GT-39643;
+    (=gt-k		. 00671)	; &I-GT-K00671;
+    (=gt-pj-6		. #x4664)	; &I-GT-39643; [38-68]
+    (=daikanwa		. 30639)	; &I-M-30639;
+    (=ucs@cns		. #x8279)	; ⺿
+    (=ucs@jis		. #xFA5E)	; ⺿
+    (->subsumptive
+     ((=>ucs*		  . #x8279)	; 艹
+      (=ucs		  . #xFA5E)	; 艹
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8279)	; 艹
+      ))
+    (name		. "CJK RADICAL GRASS THREE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
-     ((=ucs		  . #xFA5D)	; 艹
-      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 0)
+    (total-strokes	 . 4)
     (=ucs		. #x2EC0)	; ⻀
+    (=jis-x0213-2-2000	. #x7574)	; &I-JX2-7574; [85-84]
+    (=gt		. 39645)	; &I-GT-39645;
+    (=gt-k		. 00569)	; &I-GT-K00569;
+    (=gt-pj-9		. #x4E5A)	; &I-GT-39645; [46-58]
+    (=ucs@jis		. #xFA5D)	; ⻀
+    (->subsumptive
+     ((=>ucs*		  . #x8279)	; 艹
+      (=ucs		  . #xFA5D)	; 艹
+      ))
     ))
 (define-char
   '((name		. "CJK RADICAL TIGER")
@@ -669,8 +945,8 @@
      ((=ucs		  . #x8864)	; 衤
       ))
     (ideograph-cdp	. -849)
-    (=big5-cdp		. #x8BB1)	; ý¢€ˆ®±
     (=ucs		. #x2EC2)	; ⻂
+    (=big5-cdp		. #x8BB1)	; &I-CDP-8BB1;
     ))
 (define-char
   '((name		. "CJK RADICAL WEST ONE")
@@ -701,6 +977,7 @@
      ((=ucs		  . #x89C1)	; 见
       ))
     (=ucs		. #x2EC5)	; ⻅
+    (=big5-cdp		. #x89A1)	; &I-CDP-89A1;
     ))
 (define-char
   '((name		. "CJK RADICAL SIMPLIFIED HORN")
@@ -718,7 +995,7 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (<-radical
-     ((=daikanwa	  . 35005)	; ø¸ˆ¢½
+     ((=daikanwa	  . 35005)	; &I-M-35005;
       ))
     (=ucs		. #x2EC7)	; ⻇
     ))
@@ -731,6 +1008,7 @@
      ((=ucs		  . #x8BA0)	; è® 
       ))
     (=ucs		. #x2EC8)	; ⻈
+    (=big5-cdp		. #x8963)	; &I-CDP-8963;
     ))
 (define-char
   '((name		. "CJK RADICAL C-SIMPLIFIED SHELL")
@@ -747,7 +1025,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8DB3)	; 足
+      ))
     (=ucs		. #x2ECA)	; ⻊
+    (=gt-k		. 02600)	; &I-GT-K02600;
+    (=gt-pj-k1		. #x3436)	; ⻊ [20-22]
     ))
 (define-char
   '((name		. "CJK RADICAL C-SIMPLIFIED CART")
@@ -758,63 +1041,109 @@
      ((=ucs		  . #x8F66)	; 车
       ))
     (=ucs		. #x2ECB)	; ⻋
+    (=big5-cdp		. #x8967)	; &I-CDP-8967;
     ))
 (define-char
-  '((name		. "CJK RADICAL SIMPLIFIED WALK")
+  '((<-denotational
+     ((=ucs		  . #x8FB6)	; 辶
+      ))
+    (name		. "CJK RADICAL SIMPLIFIED WALK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (<-radical
-     ((=ucs		  . #xFA66)	; 辶
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (<-simplified@component
+     ((name		  . "CJK RADICAL WALK ONE")
+      (=ucs		  . #x2ECD)	; ⻍
       ))
     (=ucs		. #x2ECC)	; ⻌
+    (=gb2312		. #x6541)	; &I-G0-6541; [69-33]
+    (=jis-x0213-2-2000	. #x7969)	; &I-JX2-7969; [89-73]
+    (=big5-cdp		. #x8966)	; &I-CDP-8966;
+    (=jef-china3	. #x67A3)	; &I-JC3-67A3;
+    (=ucs@gb		. #x8FB6)	; ⻌
+    (=ucs@jis		. #xFA66)	; ⻌
     ))
 (define-char
-  '((name		. "CJK RADICAL WALK ONE")
-    (=>ucs		. #x8FB6)	; 辶
+  '((<-denotational
+     ((=ucs		  . #x8FB6)	; 辶
+      ))
+    (name		. "CJK RADICAL WALK ONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=jis-x0212		. #x6134)	; ø»Œ‚£
-    (=jis-x0213-2-2000	. #x796A)	; ø»¦Ÿ™
-    (=daikanwa		. 38702)	; ø¸‰œ®
-    (=ucs@jis		. #x8FB6)	; ⻍
+    (<-ideographic-component-forms
+     ((=ucs		  . #x8FB5)	; è¾µ
+      (=daikanwa	  . 38700)	; &I-M-38700;
+      ))
+    (<-ideographic-component-forms*sources
+     zihui-jianzi daikanwa)
     (=ucs		. #x2ECD)	; ⻍
+    (=jis-x0212		. #x6134)	; &I-JSP-6134; [65-20]
+    (=jis-x0213-2-2000	. #x796A)	; &I-JX2-796A; [89-74]
+    (=gt		. 51643)	; &I-GT-51643;
+    (=gt-k		. 00580)	; &I-GT-K00580;
+    (=gt-pj-7		. #x5530)	; &I-GT-51643; [53-16]
+    (=daikanwa		. 38702)	; &I-M-38702;
+    (=ucs@jis		. #x8FB6)	; ⻍
     ))
 (define-char
-  '((name		. "CJK RADICAL WALK TWO")
-    (=>ucs		. #x8FB6)	; 辶
+  '((<-denotational
+     ((=ucs		  . #x8FB6)	; 辶
+      ))
+    (name		. "CJK RADICAL WALK TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (morohashi-daikanwa	38702 0 2)
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
-    (=cns11643-4	. #x2154)	; ø»—¡›
-    (=big5-cdp		. #x8AF7)	; ý¢€ˆ«·
-    (=ucs@cns		. #x8FB6)	; ⻎
+    (<-simplified@component
+     ((name		  . "CJK RADICAL WALK ONE")
+      (=ucs		  . #x2ECD)	; ⻍
+      ))
     (=ucs		. #x2ECE)	; ⻎
+    (=cns11643-4	. #x2154)	; &I-C4-2154; [01-52]
+    (=big5-cdp		. #x8AF7)	; &I-CDP-8AF7;
+    (=ucs@cns		. #x8FB6)	; ⻎
     ))
 (define-char
-  '((name		. "CJK RADICAL CITY")
+  '((<-denotational
+     ((=ucs		  . #x961D)	; 阝
+      ))
+    (name		. "CJK RADICAL CITY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x9091)	; 邑
+      ))
     (=ucs		. #x2ECF)	; ⻏
     ))
 (define-char
-  '((name		. "CJK RADICAL C-SIMPLIFIED GOLD")
+  '((<-denotational
+     ((=ucs		  . #x9485)	; 钅
+      ))
+    (name		. "CJK RADICAL C-SIMPLIFIED GOLD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x91D1)	; 金
+      ))
     (<-radical
      ((=ucs		  . #x9485)	; 钅
       ))
     (=ucs		. #x2ED0)	; ⻐
+    (=big5-cdp		. #x895A)	; &I-CDP-895A;
     ))
 (define-char
   '((name		. "CJK RADICAL LONG ONE")
@@ -862,25 +1191,37 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (<-radical
-     ((=daikanwa	  . 41535)	; ø¸Šˆ¿
+     ((=daikanwa	  . 41535)	; &I-M-41535;
       ))
     (=ucs		. #x2ED5)	; ⻕
     ))
 (define-char
-  '((name		. "CJK RADICAL MOUND TWO")
+  '((<-denotational
+     ((=ucs		  . #x961D)	; 阝
+      ))
+    (name		. "CJK RADICAL MOUND TWO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
     (<-radical
      ((=ucs		  . #x961D)	; 阝
       ))
     (=ucs		. #x2ED6)	; ⻖
+    (=gb2312		. #x5A62)	; &I-G0-5A62; [58-66]
+    (=daikanwa		. 41536)	; &I-M-41536;
+    (=ucs@unicode	. #x961D)	; ⻖
     ))
 (define-char
   '((name		. "CJK RADICAL RAIN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x96E8)	; 雨
+      ))
     (=ucs		. #x2ED7)	; ⻗
     ))
 (define-char
@@ -948,13 +1289,32 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (=ucs		. #x2EDE)	; ⻞
     ))
 (define-char
+  '((=>ucs		. #x2EDE)	; ⻞
+    (morohashi-daikanwa	44014 0 6)
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x98DF)	; 食
+      ))
+    (=gt		. 59030)	; &GT-59030;
+    (=gt-k		. 06140)	; &I-GT-K06140;
+    (=gt-pj-9		. #x4F28)	; &GT-59030; [47-08]
+    ))
+(define-char
   '((name		. "CJK RADICAL EAT THREE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (<-radical
      ((=ucs		  . #x98E0)	; 飠
       ))
@@ -965,6 +1325,9 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (<-radical
      ((=ucs		  . #x9963)	; 饣
       ))
@@ -976,22 +1339,32 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (<-radical
-     ((=daikanwa	  . 44490)	; ø¸Š·Š
+     ((=daikanwa	  . 44490)	; &I-M-44490;
       ))
     (=ucs		. #x2EE1)	; ⻡
     ))
 (define-char
-  '((name		. "CJK RADICAL C-SIMPLIFIED HORSE")
+  '((<-denotational
+     ((=ucs		  . #x9A6C)	; 马
+      ))
+    (name		. "CJK RADICAL C-SIMPLIFIED HORSE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x99AC)	; 馬
+      ))
     (<-radical
      ((=ucs		  . #x9A6C)	; 马
       ))
     (=ucs		. #x2EE2)	; ⻢
+    (=big5-cdp		. #x8A50)	; &I-CDP-8A50;
     ))
 (define-char
-  '((name		. "CJK RADICAL BONE")
+  '((<-denotational
+     ((=ucs		  . #x9AA8)	; 骨
+      ))
+    (name		. "CJK RADICAL BONE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
@@ -1001,6 +1374,13 @@
     (=ucs		. #x2EE3)	; ⻣
     ))
 (define-char
+  '((<-denotational
+     ((name		  . "CJK RADICAL BONE")
+      (=ucs		  . #x2EE3)	; ⻣
+      ))
+    (=big5-cdp		. #x8A5C)	; &CDP-8A5C;
+    ))
+(define-char
   '((name		. "CJK RADICAL GHOST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
@@ -1009,16 +1389,24 @@
      ((=ucs		  . #x9B3C)	; 鬼
       ))
     (=ucs		. #x2EE4)	; ⻤
+    (=big5-cdp		. #x8A5D)	; &I-CDP-8A5D;
     ))
 (define-char
-  '((name		. "CJK RADICAL C-SIMPLIFIED FISH")
+  '((<-denotational
+     ((=ucs		  . #x9C7C)	; é±¼
+      ))
+    (name		. "CJK RADICAL C-SIMPLIFIED FISH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
+    (<-ideographic-component-forms
+     ((=ucs		  . #x9B5A)	; 魚
+      ))
     (<-radical
      ((=ucs		  . #x9C7C)	; é±¼
       ))
     (=ucs		. #x2EE5)	; ⻥
+    (=big5-cdp		. #x8A5B)	; &I-CDP-8A5B;
     ))
 (define-char
   '((name		. "CJK RADICAL C-SIMPLIFIED BIRD")
@@ -1059,6 +1447,7 @@
      ((=ucs		  . #x9EC4)	; 黄
       ))
     (=ucs		. #x2EE9)	; ⻩
+    (=big5-cdp		. #x8A5E)	; &I-CDP-8A5E;
     ))
 (define-char
   '((name		. "CJK RADICAL C-SIMPLIFIED FROG")