X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R184-Eat.el;h=d5a9c1724ac0c82c8b29603b9c6c7a42fe1d1e1b;hb=79d252a72fdacaa865958de8a054c6f3008eb64f;hp=85221209d58f79e9bb5aa2fecc275b9df5591b2d;hpb=4b033b25cdf993fac746fc80c1385f3178d5c732;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index 8522120..d5a9c17 100644
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -1,6 +1,14 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
-  '((=>ucs		. #x98DF)	; 食
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 0)
+    (total-strokes	 . 9)
+    (=ucs		. #x98DF)	; 食
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 9)
@@ -20,56 +28,235 @@
     (=gt-k		. 05344)	; &I-GT-K05344;
     (=gt-pj-8		. #x462F)	; &I-GT-59026; [38-15]
     (=daikanwa		. 44014)	; &I-M-44014;
+    (=jef-china3	. #x6DAB)	; &I-JC3-6DAB;
     ))
 (define-char
-  '((morohashi-daikanwa	44014 0 0)
+  '((<-denotational
+     ((=ucs		  . #x98DF)	; 食
+      ))
+    (name		. "CJK RADICAL EAT ONE")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EDD)	; ⻝
+    (<-identical@component
+     ((=ucs		  . #x98DF)	; 食
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+    (->subsumptive
+     ((shinjigen-1	  . 9233)
+      (shinjigen-2	  . 9234)
+      (=jis-x0208	  . #x3F29)	; &GT-59029; [31-09]
+      (=gt		  . 59029)	; &I-GT-59029;
+      (=gt-k		  . 05345)	; &I-GT-K05345;
+      (=gt-pj-1		  . #x3F29)	; &I-GT-59029; [31-09]
+      (=ucs@jis		  . #x98DF)	; &GT-59029;
       )
-     ((=ucs		  . #x4EBD)	; 亽
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4EBD)	; 亽
+	)
+       ((=ucs		    . #x826E)	; 艮
+	))
+      (=gb2312		  . #x4A33)	; &G0-4A33; [42-19]
+      (=ucs@unicode	  . #x98DF)	; &G0-4A33;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 0)
+    (total-strokes	 . 9)
+    (=cns11643-6	. #x347C)	; &GT-59037; [20-92]
+    (=gt		. 59037)	; &I-GT-59037;
+    (=gt-pj-8		. #x4630)	; &I-GT-59037; [38-16]
+    (=daikanwa		. 44015)	; &I-M-44015;
+    (<-original
+     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
+      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
+      (=daikanwa	  . 44014)	; &I-M-44014;
+      ))
+    (<-original*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 0)
+    (total-strokes	 . 9)
+    (=ucs		. #x29681)	; 𩚁
+    (->subsumptive
+     ((hanyu-dazidian	  1 155 4)
+      (=daikanwa	  . 44016)	; &M-44016;
+      (=hanziku-1	  . #xC3C2)	; &I-HZK01-C3C2;
+      (=ucs@iso		  . #x29681)	; &M-44016;
+      (<-vulgar
+       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
+	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
+	(=daikanwa	    . 44014)	; &I-M-44014;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa)
       )
-     ((=ucs		  . #x826E)	; 艮
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
+	)
+       ((=big5-cdp	    . #x8AB7)	; &CDP-8AB7;
+	))
+      (=cns11643-6	  . #x347D)	; &C6-347D; [20-93]
       ))
-    (=ucs		. #x98DF)	; 食
-    (=gb2312		. #x4A33)	; &I-G0-4A33; [42-19]
     ))
 (define-char
-  '((=>ucs		. #x98DF)	; 食
-    (morohashi-daikanwa	44014 0 1)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 9)
-    (shinjigen-1	. 9233)
-    (shinjigen-2	. 9234)
-    (=jis-x0208		. #x3F29)	; &GT-59029; [31-09]
-    (=gt		. 59029)	; &I-GT-59029;
-    (=gt-k		. 05345)	; &I-GT-K05345;
-    (=gt-pj-1		. #x3F29)	; &I-GT-59029; [31-09]
-    (=ucs@jis		. #x98DF)	; &GT-59029;
+    (hanyu-dazidian	1 155 7)
+    (=ucs		. #x29683)	; 𩚃
+    (=cns11643-6	. #x347E)	; &I-C6-347E; [20-94]
+    (=daikanwa		. 44017)	; &I-M-44017;
+    (=hanziku-1		. #xC3C5)	; &I-HZK01-C3C5;
+    (<-ancient
+     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
+      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
+      (=daikanwa	  . 44014)	; &I-M-44014;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
+    ))
+(define-char
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 7)
+    (ideographic-radical@cns . 184)	; â¾·
+    (ideographic-strokes@cns . 0)
+    (ideographic-radical@cns*sources
+     cns11643 daikanwa)
+    (total-strokes	 . 9)
+    (=ucs		. #x2028A)	; 𠊊
+    (->subsumptive
+     ((hanyu-dazidian	  1 169 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
+	)
+       ((=jis-x0208	    . #x6225)	; &GT-29075; [66-05]
+	(=cns11643-3	    . #x2674)	; &I-C3-2674; [06-84]
+	(=daikanwa	    . 22683)	; &I-M-22683;
+	))
+      (=daikanwa	  . 44018)	; &M-44018;
+      (=hanziku-1	  . #xC94D)	; &I-HZK01-C94D;
+      (=ucs@iso		  . #x2028A)	; &M-44018;
+      (<-original
+       ((=ks-x1001	    . #x635D)	; &GT-59026; [67-61]
+	(=cns11643-1	    . #x537A)	; &I-C1-537A; [51-90]
+	(=daikanwa	    . 44014)	; &I-M-44014;
+	))
+      (<-original*sources
+       zhonghua-dazidian daikanwa)
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8AFC)	; &CDP-8AFC;
+	)
+       ((=big5-cdp	    . #x8ABE)	; &CDP-8ABE;
+	))
+      (=cns11643-6	  . #x3521)	; &C6-3521; [21-01]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2967F)	; 𩙿
+      ))
+    (name		. "CJK RADICAL EAT TWO")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EDE)	; ⻞
+    (<-formed@component/connect-right
+     ((=ucs		  . #x98DF)	; 食
+      ))
+    (<-identical@component/connect-right
+     ((=ucs		  . #x2967F)	; 𩙿
+      ))
     ))
 (define-char
-  '((=>ucs		. #x98E0)	; 飠
-    (morohashi-daikanwa	44014 0 2)
+  '((<-denotational
+     ((=ucs		  . #x98E0)	; 飠
+      ))
+    (name		. "CJK RADICAL EAT THREE")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EDF)	; ⻟
+    (<-identical@component
+     ((=ucs		  . #x98E0)	; 飠
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9963)	; 饣
+      ))
+    (name		. "CJK RADICAL C-SIMPLIFIED EAT")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EE0)	; â» 
+    (<-identical@component
+     ((=ucs		  . #x9963)	; 饣
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 0)
+    (total-strokes	 . 8)
+    (=ucs		. #x98E0)	; 飠
+    (<-formed@component/connect-right
+     ((=ucs		  . #x98DF)	; 食
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98E0)	; 飠
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
+    (->subsumptive
+     ((=gt-k		  . 04996)	; &GT-K04996;
+      (=gt-pj-k1	  . #x3471)	; &GT-K04996; [20-81]
+      (<-identical@component/connect-right
+       ((=jis-x0213-2-2000  . #x7C4B)	; &GT-59024; [92-43]
+	))
       )
-     ((=big5-cdp	  . #x8B7C)	; &CDP-8B7C;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4EBD)	; 亽
+	)
+       ((=big5-cdp	    . #x8B7C)	; &CDP-8B7C;
+	))
+      (=gb12345		  . #x623B)	; &UU+98E0; [66-27]
+      (=ucs@unicode	  . #x98E0)	; &UU+98E0;
       ))
-    (=big5-cdp		. #x8BB9)	; &CDP-8BB9;
     ))
 (define-char
-  '((=>ucs		. #x98E0)	; 飠
-    (morohashi-daikanwa	44014 0 3)
+  '((<-denotational
+     ((=ucs		  . #x98E0)	; 飠
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
@@ -79,16 +266,9 @@
     (=ucs@jis		. #x98E0)	; &GT-59024;
     ))
 (define-char
-  '((=>ucs		. #x98E0)	; 飠
-    (morohashi-daikanwa	44014 0 4)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 8)
-    (=gt-k		. 04996)	; &GT-K04996;
-    (=gt-pj-k1		. #x3471)	; &GT-K04996; [20-81]
-    ))
-(define-char
-  '((morohashi-daikanwa	44014 0 5)
+  '((<-denotational
+     ((=ucs		  . #x98E0)	; 飠
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 8)
@@ -96,75 +276,39 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #x4EBD)	; 亽
+     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
       )
      ((=big5-cdp	  . #x8B7C)	; &CDP-8B7C;
       ))
-    (=ucs		. #x98E0)	; 飠
-    (=gb12345		. #x623B)	; 飠 [66-27]
-    ))
-(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]
+    (=big5-cdp		. #x8BB9)	; &CDP-8BB9;
     ))
 (define-char
-  '((morohashi-daikanwa	44014 0 7)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
     (=ucs		. #x9963)	; 饣
     (=gb2312		. #x623B)	; &I-G0-623B; [66-27]
+    (<-simplified@CN
+     ((=gb12345		  . #x623B)	; &UU+98E0; [66-27]
+      ))
+    (<-simplified@CN/component/connect-right
+     ((=gb2312		  . #x4A33)	; &G0-4A33; [42-19]
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x347C)	; &GT-59037; [20-92]
-    (=gt		. 59037)	; &I-GT-59037;
-    (=gt-pj-8		. #x4630)	; &I-GT-59037; [38-16]
-    (=daikanwa		. 44015)	; &I-M-44015;
-    ))
-(define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=daikanwa		. 44016)	; &M-44016;
-    ))
-(define-char
-  '((morohashi-daikanwa	44016 0 0)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x347D)	; &C6-347D; [20-93]
-    ))
-(define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x347E)	; &M-44017; [20-94]
-    (=daikanwa		. 44017)	; &I-M-44017;
-    ))
-(define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=daikanwa		. 44018)	; &M-44018;
-    ))
-(define-char
-  '((morohashi-daikanwa	44018 0 0)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 0)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3521)	; &C6-3521; [21-01]
+    (total-strokes	 . 3)
+    (=ucs		. #x2967F)	; 𩙿
+    (=jis-x0213-2-2000	. #x7C4C)	; &I-JX2-7C4C; [92-44]
+    (=gt		. 59030)	; &I-GT-59030;
+    (=gt-k		. 06140)	; &I-GT-K06140;
+    (=gt-pj-9		. #x4F28)	; &I-GT-59030; [47-08]
+    (<-formed@component/connect-right
+     ((=ks-x1001	  . #x635D)	; &GT-59026; [67-61]
+      (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
+      (=daikanwa	  . 44014)	; &I-M-44014;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -230,25 +374,26 @@
     (=ucs		. #x98E2)	; 飢
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 2)
-    (total-strokes	 . 11)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x98E2)	; 飢
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 2)
+    (total-strokes	 . 11)
     (=ks-x1001		. #x5146)	; &GT-59043; [49-38]
     (=gt		. 59043)	; &I-GT-59043;
     (=gt-k		. 08023)	; &I-GT-K08023;
     (=gt-pj-8		. #x4638)	; &I-GT-59043; [38-24]
     (=daikanwa		. 44023)	; &I-M-44023;
+    (=jef-china3	. #x6DB1)	; &I-JC3-6DB1;
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 2)
-    (total-strokes	 . 10)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x98E2)	; 飢
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 2)
+    (total-strokes	 . 10)
     (->subsumptive
      ((morohashi-daikanwa	44023 1)
       (=jis-x0208	  . #x3532)	; &GT-59033; [21-18]
@@ -266,34 +411,60 @@
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 2)
-    (total-strokes	 . 11)
     (=ucs		. #x98E3)	; 飣
-    (=jis-x0212		. #x6849)	; &I-JSP-6849; [72-41]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98E3)	; 飣
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 2)
+    (total-strokes	 . 11)
+    (=jis-x0212		. #x6849)	; &M-44024; [72-41]
     (=jis-x0213-2-2000	. #x7C4E)	; &I-JX2-7C4E; [92-46]
     (=daikanwa		. 44024)	; &I-M-44024;
+    (=ucs@jis		. #x98E3)	; &M-44024;
     ))
 (define-char
-  '((=>ucs		. #x98E3)	; 飣
-    (morohashi-daikanwa	44024 0 1)
+  '((<-denotational
+     ((=ucs		  . #x98E3)	; 飣
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
-    (=cns11643-2	. #x334B)	; &C2-334B; [19-43]
+    (->subsumptive
+     ((=cns11643-2	  . #x334B)	; &C2-334B; [19-43]
+      )
+     ((=ucs@unicode	  . #x98E3)	; &UU+98E3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 2)
-    (total-strokes	 . 11)
     (=ucs		. #x98E4)	; 飤
-    (=daikanwa		. 44025)	; &I-M-44025;
     ))
 (define-char
-  '((=>ucs		. #x98E4)	; 飤
-    (morohashi-daikanwa	44025 0 1)
+  '((<-denotational
+     ((=ucs		  . #x98E4)	; 飤
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 2)
+    (total-strokes	 . 11)
+    (=daikanwa		. 44025)	; &M-44025;
+    (=jef-china3	. #x8EA7)	; &I-JC3-8EA7;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98E4)	; 飤
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
-    (=cns11643-4	. #x3042)	; &C4-3042; [16-34]
+    (->subsumptive
+     ((=cns11643-4	  . #x3042)	; &C4-3042; [16-34]
+      )
+     ((=ucs@unicode	  . #x98E4)	; &UU+98E4;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -394,7 +565,7 @@
       )
      ((=cns11643-5	  . #x3D4C)	; &C5-3D4C; [29-44]
       )
-     ((=ucs@iso		  . #x29687)	; &UU+29687;
+     ((=ucs@iso		  . #x29687)	; &U-00029687;
       ))
     ))
 (define-char
@@ -486,6 +657,8 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
+    (=gt		. 59087)	; &GT-59087;
+    (=gt-pj-8		. #x4646)	; &GT-59087; [38-38]
     (<-same
      ((=jis-x0212	  . #x6870)	; &M-44433; [72-80]
       (=jis-x0213-1-2000  . #x7E2A)	; &I-JX1-7E2A; [94-10]
@@ -493,27 +666,22 @@
       ))
     (<-same*sources
      daikanwa)
-    (=gt		. 59087)	; &GT-59087;
-    (=gt-pj-8		. #x4646)	; &GT-59087; [38-38]
     ))
 (define-char
-  '((=>ucs		. #x98E7)	; 飧
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 3)
-    (total-strokes	 . 12)
-    (=jis-x0212		. #x684C)	; &M-44038; [72-44]
-    (=cns11643-1	. #x627D)	; &I-C1-627D; [66-93]
-    (=jis-x0213-1-2000	. #x7E29)	; &I-JX1-7E29; [94-09]
-    (=daikanwa		. 44038)	; &I-M-44038;
-    (=ucs@jis		. #x98E7)	; &M-44038;
-    ))
-(define-char
-  '((morohashi-daikanwa	44038 0 1)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
     (=ucs		. #x98E7)	; 飧
-    (=gb2312		. #x6238)	; &I-G0-6238; [66-24]
+    (->subsumptive
+     ((=jis-x0212	  . #x684C)	; &M-44038; [72-44]
+      (=cns11643-1	  . #x627D)	; &I-C1-627D; [66-93]
+      (=jis-x0213-1-2000  . #x7E29)	; &I-JX1-7E29; [94-09]
+      (=daikanwa	  . 44038)	; &I-M-44038;
+      (=ucs@jis		  . #x98E7)	; &M-44038;
+      )
+     ((=gb2312		  . #x6238)	; &G0-6238; [66-24]
+      (=ucs@unicode	  . #x98E7)	; &G0-6238;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -891,7 +1059,7 @@
       (=daikanwa	  . 44060)	; &M-44060;
       )
      ((total-strokes	   . 12)
-      (=ucs@iso		  . #x2969B)	; &UU+2969B;
+      (=ucs@iso		  . #x2969B)	; &U-0002969B;
       )
      ((total-strokes	   . 12)
       (=cns11643-5	  . #x3D4E)	; &C5-3D4E; [29-46]
@@ -1259,57 +1427,74 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x98F4)	; 飴
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 5)
+    (=ucs		. #x98F4)	; 飴
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x98F4)	; 飴
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
-    (=jis-x0208-1978	. #x303B)	; &M-44080; [16-27]
+    (shinjigen-1	. 9250)
+    (shinjigen-2	. 9250)
+    (=jis-x0208@1978	. #x303B)	; &M-44080; [16-27]
     (=ks-x1001		. #x6C47)	; &I-K0-6C47; [76-39]
     (=daikanwa		. 44080)	; &I-M-44080;
     ))
 (define-char
-  '((=>ucs		. #x98F4)	; 飴
-    (morohashi-daikanwa	44080 0 1)
+  '((<-denotational
+     ((=ucs		  . #x98F4)	; 飴
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
-    (=cns11643-1	. #x6766)	; &C1-6766; [71-70]
+    (->subsumptive
+     ((=cns11643-1	  . #x6766)	; &C1-6766; [71-70]
+      )
+     ((=jis-x0208@1983	  . #x303B)	; &GT-59108; [16-27]
+      (=jis-x0208@1990	  . #x303B)	; &I-J90-303B; [16-27]
+      (=gt		  . 59108)	; &I-GT-59108;
+      (=gt-pj-1		  . #x303B)	; &I-GT-59108; [16-27]
+      (=ucs@jis		  . #x98F4)	; &GT-59108;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x303B)	; &M-44080; [16-27]
+	(=ks-x1001	    . #x6C47)	; &I-K0-6C47; [76-39]
+	(=daikanwa	    . 44080)	; &I-M-44080;
+	))
+      )
+     ((=gb12345		  . #x6242)	; &JC3-6DC8; [66-34]
+      (=jef-china3	  . #x6DC8)	; &JC3-6DC8;
+      (=ucs@unicode	  . #x98F4)	; &JC3-6DC8;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x98F4)	; 飴
-    (morohashi-daikanwa	44080 0 2)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
-    (total-strokes	 . 13)
-    (shinjigen-1	. 9250)
-    (shinjigen-2	. 9250)
-    (=jis-x0208-1983	. #x303B)	; &GT-59108; [16-27]
-    (=jis-x0208-1990	. #x303B)	; &I-J90-303B; [16-27]
-    (=gt		. 59108)	; &I-GT-59108;
-    (=gt-pj-1		. #x303B)	; &I-GT-59108; [16-27]
-    (=ucs@jis		. #x98F4)	; &GT-59108;
+    (=ucs		. #x4B2E)	; 䬮
     ))
 (define-char
-  '((morohashi-daikanwa	44080 0 3)
+  '((<-denotational
+     ((=ucs		  . #x4B2E)	; 䬮
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
-    (total-strokes	 . 13)
-    (=ucs		. #x98F4)	; 飴
-    (=gb12345		. #x6242)	; 飴 [66-34]
+    (total-strokes	 . 14)
+    (=daikanwa		. 44081)	; &M-44081;
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
+  '((<-denotational
+     ((=ucs		  . #x4B2E)	; 䬮
+      ))
+    (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
-    (=ucs		. #x4B2E)	; 䬮
+    (total-strokes	 . 13)
     (->subsumptive
-     ((total-strokes	   . 14)
-      (=daikanwa	  . 44081)	; &M-44081;
+     ((=cns11643-3	  . #x455E)	; &C3-455E; [37-62]
       )
-     ((total-strokes	   . 13)
-      (=cns11643-3	  . #x455E)	; &C3-455E; [37-62]
-      )
-     ((total-strokes	   . 13)
-      (=ucs@unicode	  . #x4B2E)	; &UU+4B2E;
+     ((=ucs@unicode	  . #x4B2E)	; &UU+4B2E;
       ))
     ))
 (define-char
@@ -1777,22 +1962,22 @@
     (=ucs		. #x98FE)	; 飾
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 5)
-    (total-strokes	 . 14)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x98FE)	; 飾
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 5)
+    (total-strokes	 . 14)
     (=ks-x1001		. #x635E)	; &M-44111; [67-62]
     (=daikanwa		. 44111)	; &I-M-44111;
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 5)
-    (total-strokes	 . 13)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x98FE)	; 飾
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 5)
+    (total-strokes	 . 13)
     (->subsumptive
      ((morohashi-daikanwa	44111 1)
       (=jis-x0208	  . #x3E7E)	; &GT-59144; [30-94]
@@ -2078,7 +2263,7 @@
       (=daikanwa	  . 44129)	; &M-44129;
       )
      ((total-strokes	   . 14)
-      (=ucs@iso		  . #x296CC)	; &UU+296CC;
+      (=ucs@iso		  . #x296CC)	; &U-000296CC;
       )
      ((total-strokes	   . 14)
       (=cns11643-5	  . #x4B49)	; &C5-4B49; [43-41]
@@ -2142,40 +2327,44 @@
     (=cns11643-5	. #x4B4C)	; &I-C5-4B4C; [43-44]
     ))
 (define-char
-  '((=>ucs		. #x9905)	; 餅
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 15)
-    (=jis-x0208-1978	. #x4C5F)	; &M-44133; [44-63]
-    (=daikanwa		. 44133)	; &I-M-44133;
-    ))
-(define-char
-  '((=>ucs		. #x9905)	; 餅
-    (morohashi-daikanwa	44133 0 1)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6B6F)	; &C1-6B6F; [75-79]
+    (=ucs		. #x9905)	; 餅
     ))
 (define-char
-  '((=>ucs		. #x9905)	; 餅
-    (morohashi-daikanwa	44133 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9905)	; 餅
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=jis-x0208-1983	. #x4C5F)	; &GT-59239; [44-63]
-    (=jis-x0208-1990	. #x4C5F)	; &I-J90-4C5F; [44-63]
-    (=gt		. 59239)	; &I-GT-59239;
-    (=gt-pj-1		. #x4C5F)	; &I-GT-59239; [44-63]
-    (=ucs@jis		. #x9905)	; &GT-59239;
+    (total-strokes	 . 15)
+    (=jis-x0208@1978	. #x4C5F)	; &M-44133; [44-63]
+    (=daikanwa		. 44133)	; &I-M-44133;
     ))
 (define-char
-  '((morohashi-daikanwa	44133 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9905)	; 餅
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=ucs		. #x9905)	; 餅
-    (=gb12345		. #x317D)	; 餅 [17-93]
+    (->subsumptive
+     ((=cns11643-1	  . #x6B6F)	; &C1-6B6F; [75-79]
+      )
+     ((=jis-x0208@1983	  . #x4C5F)	; &GT-59239; [44-63]
+      (=jis-x0208@1990	  . #x4C5F)	; &I-J90-4C5F; [44-63]
+      (=gt		  . 59239)	; &I-GT-59239;
+      (=gt-pj-1		  . #x4C5F)	; &I-GT-59239; [44-63]
+      (=ucs@jis		  . #x9905)	; &GT-59239;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x4C5F)	; &M-44133; [44-63]
+	(=daikanwa	    . 44133)	; &I-M-44133;
+	))
+      )
+     ((=gb12345		  . #x317D)	; &JC3-6DCD; [17-93]
+      (=jef-china3	  . #x6DCD)	; &JC3-6DCD;
+      (=ucs@unicode	  . #x9905)	; &JC3-6DCD;
+      ))
     ))
 (define-char
   '((=>ucs		. #x9906)	; 餆
@@ -2387,84 +2576,79 @@
     (=cns11643-4	. #x4E63)	; &I-C4-4E63; [46-67]
     ))
 (define-char
-  '((=>ucs		. #x990C)	; 餌
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 15)
-    (=ks-x1001		. #x6C48)	; &M-44146; [76-40]
-    (=daikanwa		. 44146)	; &I-M-44146;
+    (=ucs		. #x990C)	; 餌
     ))
 (define-char
-  '((=>ucs		. #x990C)	; 餌
-    (morohashi-daikanwa	44146 0 1)
+  '((<-denotational
+     ((=ucs		  . #x990C)	; 餌
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
-    (=jis-x0208-1978	. #x3142)	; &J78-3142; [17-34]
-    ))
-(define-char
-  '((=>ucs		. #x990C)	; 餌
-    (morohashi-daikanwa	44146 0 2)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6B70)	; &C1-6B70; [75-80]
-    ))
-(define-char
-  '((=>ucs		. #x990C)	; 餌
-    (morohashi-daikanwa	44146 0 3)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=gt		. 59204)	; &GT-59204;
-    (=gt-pj-1		. #x3142)	; &GT-59204; [17-34]
-    ))
-(define-char
-  '((=>ucs		. #x990C)	; 餌
-    (morohashi-daikanwa	44146 0 4)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=jis-x0208-1990	. #x3142)	; &J90-3142; [17-34]
-    (=ucs@jis		. #x990C)	; &J90-3142;
+    (->subsumptive
+     ((=daikanwa	  . 44146)	; &M-44146;
+      )
+     ((=jis-x0208@1978	  . #x3142)	; &J78-3142; [17-34]
+      (=ks-x1001	  . #x6C48)	; &I-K0-6C48; [76-40]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x990C)	; 餌
-    (morohashi-daikanwa	44146 0 5)
+  '((<-denotational
+     ((=ucs		  . #x990C)	; 餌
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=jis-x0208-1983	. #x3142)	; &J83-3142; [17-34]
+    (->subsumptive
+     ((=cns11643-1	  . #x6B70)	; &C1-6B70; [75-80]
+      )
+     ((=gt		  . 59204)	; &GT-59204;
+      (=gt-pj-1		  . #x3142)	; &GT-59204; [17-34]
+      )
+     ((=jis-x0208@1990	  . #x3142)	; &J90-3142; [17-34]
+      (=ucs@jis		  . #x990C)	; &J90-3142;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3142)	; &J78-3142; [17-34]
+	(=ks-x1001	    . #x6C48)	; &I-K0-6C48; [76-40]
+	))
+      (<-simplified@JP/misc
+       ((=daikanwa	    . 44146)	; &M-44146;
+	))
+      )
+     ((=jis-x0208@1983	  . #x3142)	; &J83-3142; [17-34]
+      )
+     ((=gb12345		  . #x367C)	; &UU+990C; [22-92]
+      (=ucs@unicode	  . #x990C)	; &UU+990C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	44146 0 6)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=ucs		. #x990C)	; 餌
-    (=gb12345		. #x367C)	; 餌 [22-92]
+    (=ucs		. #x296CF)	; 𩛏
     ))
 (define-char
-  '((=>ucs		. #x296CF)	; 𩛏
+  '((<-denotational
+     ((=ucs		  . #x296CF)	; 𩛏
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
     (=daikanwa		. 44147)	; &M-44147;
     ))
 (define-char
-  '((morohashi-daikanwa	44147 0 1)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=ucs		. #x296CF)	; 𩛏
-    ))
-(define-char
-  '((=>ucs		. #x296CF)	; 𩛏
-    (morohashi-daikanwa	44147 0 2)
+  '((<-denotational
+     ((=ucs		  . #x296CF)	; 𩛏
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=cns11643-4	. #x485A)	; &C4-485A; [40-58]
+    (->subsumptive
+     ((=ucs@iso		  . #x296CF)	; &U-000296CF;
+      )
+     ((=cns11643-4	  . #x485A)	; &C4-485A; [40-58]
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
@@ -2875,22 +3059,22 @@
     (=ucs		. #x9913)	; 餓
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 7)
-    (total-strokes	 . 16)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x9913)	; 餓
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 7)
+    (total-strokes	 . 16)
     (=ks-x1001		. #x643B)	; &M-44168; [68-27]
     (=daikanwa		. 44168)	; &I-M-44168;
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 7)
-    (total-strokes	 . 15)
-    (<-denotational
+  '((<-denotational
      ((=ucs		  . #x9913)	; 餓
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 7)
+    (total-strokes	 . 15)
     (->subsumptive
      ((morohashi-daikanwa	44168 1)
       (=jis-x0208	  . #x326E)	; &GT-59257; [18-78]
@@ -3334,7 +3518,7 @@
       (=daikanwa	  . 44197)	; &M-44197;
       )
      ((total-strokes	   . 16)
-      (=ucs@iso		  . #x296FA)	; &UU+296FA;
+      (=ucs@iso		  . #x296FA)	; &U-000296FA;
       )
      ((total-strokes	   . 16)
       (=cns11643-5	  . #x5A23)	; &C5-5A23; [58-03]
@@ -3508,7 +3692,7 @@
       (=daikanwa	  . 44209)	; &M-44209;
       )
      ((total-strokes	   . 16)
-      (=ucs@iso		  . #x29701)	; &UU+29701;
+      (=ucs@iso		  . #x29701)	; &U-00029701;
       )
      ((total-strokes	   . 16)
       (=cns11643-5	  . #x597B)	; &C5-597B; [57-91]
@@ -4140,7 +4324,7 @@
       (=daikanwa	  . 44249)	; &M-44249;
       )
      ((total-strokes	   . 16)
-      (=ucs@iso		  . #x2971A)	; &UU+2971A;
+      (=ucs@iso		  . #x2971A)	; &U-0002971A;
       )
      ((total-strokes	   . 16)
       (=cns11643-5	  . #x597D)	; &C5-597D; [57-93]
@@ -4277,7 +4461,7 @@
       (=daikanwa	  . 44257)	; &M-44257;
       )
      ((total-strokes	   . 17)
-      (=ucs@iso		  . #x2972D)	; &UU+2972D;
+      (=ucs@iso		  . #x2972D)	; &U-0002972D;
       )
      ((total-strokes	   . 17)
       (=cns11643-5	  . #x6034)	; &C5-6034; [64-20]
@@ -4363,7 +4547,7 @@
       (=daikanwa	  . 44264)	; &M-44264;
       )
      ((total-strokes	   . 17)
-      (=ucs@iso		  . #x29731)	; &UU+29731;
+      (=ucs@iso		  . #x29731)	; &U-00029731;
       )
      ((total-strokes	   . 17)
       (=cns11643-5	  . #x602F)	; &C5-602F; [64-15]
@@ -4378,7 +4562,7 @@
       (=daikanwa	  . 44265)	; &M-44265;
       )
      ((total-strokes	   . 17)
-      (=ucs@iso		  . #x29732)	; &UU+29732;
+      (=ucs@iso		  . #x29732)	; &U-00029732;
       )
      ((total-strokes	   . 17)
       (=cns11643-5	  . #x6033)	; &C5-6033; [64-19]
@@ -4685,7 +4869,7 @@
       (=daikanwa	  . 44290)	; &M-44290;
       )
      ((total-strokes	   . 17)
-      (=ucs@iso		  . #x29740)	; &UU+29740;
+      (=ucs@iso		  . #x29740)	; &U-00029740;
       )
      ((total-strokes	   . 17)
       (=cns11643-5	  . #x602E)	; &C5-602E; [64-14]
@@ -5833,7 +6017,7 @@
       )
      ((ideographic-strokes . 9)
       (total-strokes	   . 17)
-      (=ucs@iso		  . #x2978A)	; &UU+2978A;
+      (=ucs@iso		  . #x2978A)	; &U-0002978A;
       )
      ((ideographic-strokes . 9)
       (total-strokes	   . 17)
@@ -5976,7 +6160,7 @@
     (total-strokes	 . 20)
     (=ucs		. #x2979F)	; 𩞟
     (->subsumptive
-     ((=ucs@iso		  . #x2979F)	; &UU+2979F;
+     ((=ucs@iso		  . #x2979F)	; &U-0002979F;
       )
      ((=cns11643-4	  . #x653E)	; &C4-653E; [69-30]
       ))
@@ -6018,7 +6202,7 @@
       (=daikanwa	  . 44374)	; &M-44374;
       )
      ((total-strokes	   . 19)
-      (=ucs@iso		  . #x2979E)	; &UU+2979E;
+      (=ucs@iso		  . #x2979E)	; &U-0002979E;
       )
      ((total-strokes	   . 19)
       (=cns11643-5	  . #x6A6B)	; &C5-6A6B; [74-75]
@@ -6069,7 +6253,7 @@
       )
      ((ideographic-strokes . 10)
       (total-strokes	   . 18)
-      (=ucs@iso		  . #x29799)	; &UU+29799;
+      (=ucs@iso		  . #x29799)	; &U-00029799;
       ))
     ))
 (define-char
@@ -6760,7 +6944,7 @@
       )
      ((ideographic-strokes . 11)
       (total-strokes	   . 19)
-      (=ucs@iso		  . #x297C2)	; &UU+297C2;
+      (=ucs@iso		  . #x297C2)	; &U-000297C2;
       ))
     ))
 (define-char
@@ -6772,7 +6956,7 @@
       (=daikanwa	  . 44419)	; &M-44419;
       )
      ((total-strokes	   . 21)
-      (=ucs@iso		  . #x297C3)	; &UU+297C3;
+      (=ucs@iso		  . #x297C3)	; &U-000297C3;
       )
      ((total-strokes	   . 21)
       (=cns11643-5	  . #x7221)	; &C5-7221; [82-01]
@@ -7071,7 +7255,7 @@
       (=daikanwa	  . 44437)	; &M-44437;
       )
      ((total-strokes	   . 21)
-      (=ucs@iso		  . #x297CD)	; &UU+297CD;
+      (=ucs@iso		  . #x297CD)	; &U-000297CD;
       )
      ((total-strokes	   . 21)
       (=cns11643-5	  . #x7229)	; &C5-7229; [82-09]
@@ -7134,7 +7318,7 @@
       (=cns11643-5	  . #x746E)	; &C5-746E; [84-78]
       )
      ((total-strokes	   . 22)
-      (=ucs@iso		  . #x297D4)	; &UU+297D4;
+      (=ucs@iso		  . #x297D4)	; &U-000297D4;
       ))
     ))
 (define-char
@@ -7434,7 +7618,7 @@
       (=daikanwa	  . 44468)	; &M-44468;
       )
      ((total-strokes	   . 24)
-      (=ucs@iso		  . #x297ED)	; &UU+297ED;
+      (=ucs@iso		  . #x297ED)	; &U-000297ED;
       )
      ((total-strokes	   . 24)
       (=cns11643-5	  . #x784B)	; &C5-784B; [88-43]