X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R016-Table.el;h=18526c03094cb7ce279ad762c017dc6f5639c0be;hb=ae0355846e6654f41029c4194bf98583a94ccb9b;hp=0b9cee33723dd2fe9d6cc7b0b2279eb2ae9d4b1d;hpb=6180cb7c4a65968a5a98cac6b019bb6f46d09e05;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index 0b9cee3..18526c0 100644
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -4,83 +4,112 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
     (hanyu-dazidian	1 275 19)
-    (shinjigen-1	. 565)
-    (shinjigen-2	. 565)
     (=ucs		. #x51E0)	; 几
     (=jis-x0208		. #x515C)	; &I-J90-515C; [49-60]
     (=gb2312		. #x3C38)	; &I-G0-3C38; [28-24]
     (=cns11643-1	. #x442D)	; &I-C1-442D; [36-13]
+    (=jis-x0213-1	. #x515C)	; &I-JX1-515C; [49-60]
     (=big5		. #xA44C)	; &I-B-A44C;
     (=gt		. 02282)	; &I-GT-02282;
     (=gt-k		. 00084)	; &I-GT-K00084;
     (=gt-pj-1		. #x515C)	; &I-GT-02282; [49-60]
     (=daikanwa		. 01737)	; &I-M-01737;
+    (=shinjigen		.  0565)	; 几
     ))
 (define-char
-  '((=>ucs		. #x20627)	; 𠘧
-    (ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 0)
+  '((<-denotational
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (name		. "CJK RADICAL TABLE")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
     (total-strokes	 . 2)
-    (=daikanwa		. 01738)	; &M-01738;
+    (=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]
+    (<-identical@component
+     ((=ucs		  . #x51E0)	; 几
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	1738 0 0)
-    (ideographic-radical . 16)	; ⼏
+  '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
     (=ucs		. #x20627)	; 𠘧
-    (=cns11643-4	. #x2129)	; &I-C4-2129; [01-09]
-    (=big5-cdp		. #x8AAE)	; &I-CDP-8AAE;
+    (->subsumptive
+     ((=daikanwa	  . 01738)	; &M-01738;
+      (->mistakable
+       ((=ucs		    . #x513F)	; 儿
+	(=daikanwa	    . 01336)	; &I-M-01336;
+	)
+       ((=ucs		    . #x51E0)	; 几
+	(=daikanwa	    . 01737)	; &I-M-01737;
+	))
+      (->mistakable*sources
+       zihui daikanwa)
+      )
+     ((=ucs@iso		  . #x20627)	; &CDP-8AAE;
+      (=cns11643-4	  . #x2129)	; &CDP-8AAE; [01-09]
+      (=big5-cdp	  . #x8AAE)	; &I-CDP-8AAE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (ideographic-radical*sources daikanwa shinjigen-1 ucs)
     (sound@ja/kun	"oyo-so" "arayu-ru")
     (sound@ja/on/go	"bon")
     (sound@ja/on/kan	"han")
     (=ucs		. #x51E1)	; 凡
-    (->subsumptive
-     ((ideographic-radical@cns . 3)	; ⼂
-      (ideographic-strokes@cns . 2)
-      (hanyu-dazidian	  1 276 3)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	(=ucs		    . #x2FF5)	; ⿵
-	)
-       ((=ucs		    . #x51E0)	; 几
-	)
-       ((=ucs		    . #x4E36)	; 丶
-	))
-      (shinjigen-1	  . 566)
-      (shinjigen-2	  . 566)
+    (=>jis-x0208	. #x4B5E)	; 凡 [43-62]
+    (=>jis-x0213-1	. #x4B5E)	; 凡 [43-62]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51E1)	; 凡
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-radical@cns . 3)	; ⼂
+    (ideographic-strokes@cns . 2)
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (hanyu-dazidian	1 276 3)
+    (ideographic-radical*sources daikanwa shinjigen ucs)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=ucs		  . #x51E0)	; 几
+      )
+     ((=ucs		  . #x4E36)	; 丶
+      ))
+    (=>>ucs@unicode	. #x51E1)	; &GT-02286;
+    (=ucs@unicode	. #x51E1)	; &GT-02286;
+    (=jis-x0208		. #x4B5E)	; &GT-02286; [43-62]
+    (=gb2312		. #x3732)	; &I-G0-3732; [23-18]
+    (=ks-x1001		. #x5B6D)	; &I-K0-5B6D; [59-77]
+    (=cns11643-1	. #x443B)	; &I-C1-443B; [36-27]
+    (=jis-x0213-1	. #x4B5E)	; &I-JX1-4B5E; [43-62]
+    (=big5		. #xA45A)	; &I-B-A45A;
+    (=gt		. 02286)	; &I-GT-02286;
+    (=gt-k		. 00203)	; &I-GT-K00203;
+    (=gt-pj-1		. #x4B5E)	; &I-GT-02286; [43-62]
+    (=daikanwa		. 01739)	; &I-M-01739;
+    (=shinjigen		.  0566)	; &GT-02286;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@unicode	  . #x51E1)	; &GT-02286;
       (=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
       (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
       (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
       (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
-      (=big5		  . #xA45A)	; &I-B-A45A;
-      (=gt		  . 02286)	; &I-GT-02286;
-      (=gt-k		  . 00203)	; &I-GT-K00203;
-      (=gt-pj-1		  . #x4B5E)	; &I-GT-02286; [43-62]
+      (=jis-x0213-1	  . #x4B5E)	; &I-JX1-4B5E; [43-62]
       (=daikanwa	  . 01739)	; &I-M-01739;
-      (=ucs@unicode	  . #x51E1)	; &GT-02286;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	(=ucs		    . #x2FF5)	; ⿵
-	)
-       ((=ucs		    . #x51E0)	; 几
-	)
-       ((=ucs		    . #x4E00)	; 一
-	))
-      (shinjigen-1	  . 567)
-      (shinjigen-2	  . 567)
       ))
-    ))
-(define-char
-  '((=>ucs		. #x51E1)	; 凡
-    (=>daikanwa		. 01739)	; &GT-02286;
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
@@ -95,10 +124,37 @@
       ))
     (=gt-k		. 00368)	; &GT-K00368;
     (=gt-pj-k1		. #x403E)	; &GT-K00368; [32-30]
+    (<-formed@component
+     ((=ucs@unicode	  . #x51E1)	; &GT-02286;
+      (=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
+      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
+      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
+      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
+      (=jis-x0213-1	  . #x4B5E)	; &I-JX1-4B5E; [43-62]
+      (=daikanwa	  . 01739)	; &I-M-01739;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51E1)	; 凡
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=ucs		  . #x51E0)	; 几
+      )
+     ((=ucs		  . #x4E00)	; 一
+      ))
+    (=shinjigen		.  0567)	; &SJG2-0567;
     ))
 (define-char
-  '((=>ucs		. #x51E1)	; 凡
-    (=>daikanwa		. 01739)	; &GT-02286;
+  '((<-denotational
+     ((=shinjigen	  .  0567)	; &SJG2-0567;
+      ))
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
@@ -113,18 +169,29 @@
       ))
     (=gt-k		. 00369)	; &GT-K00369;
     (=gt-pj-k1		. #x692C)	; &GT-K00369; [73-12]
+    (<-formed@component/surround-from-above
+     ((=shinjigen	  .  0567)	; &SJG2-0567;
+      ))
     ))
 (define-char
-  '((total-strokes	 . 3)
-    (<-vulgar
-     ((=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
-      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
-      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
-      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
-      (=daikanwa	  . 01739)	; &I-M-01739;
+  '((ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (=>daikanwa		. 01740)	; &A-M-01740;
+    ))
+(define-char
+  '((<-denotational
+     ((=>daikanwa	  . 01740)	; &A-M-01740;
       ))
-    (<-vulgar*sources
-     zhengzi-tong daikanwa)
+    (ideographic-radical@ucs . 16)	; ⼏
+    (ideographic-strokes@ucs . 1)
+    (ideographic-radical@ucs*sources
+     daikanwa=01740 jis-x0213@2000 ucs)
+    (ideographic-radical@cns . 4)	; ⼃
+    (ideographic-strokes@cns . 2)
+    (ideographic-radical@cns*sources
+     daikanwa=00123 cns11643)
+    (total-strokes	 . 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -136,23 +203,35 @@
     (=ucs		. #x51E2)	; 凢
     (=jis-x0212		. #x3329)	; &I-JSP-3329; [19-09]
     (=cns11643-3	. #x212F)	; &I-C3-212F; [01-15]
-    (=jis-x0213-1-2000	. #x2E58)	; &I-JX1-2E58; [14-56]
+    (=jis-x0213-1	. #x2E58)	; &I-JX1-2E58; [14-56]
     (=hanziku-1		. #xDEE9)	; &I-HZK01-DEE9;
     (=jef-china3	. #x41B8)	; &I-JC3-41B8;
+    (=adobe-japan1-5	. 16795)	; &I-AJ1-16795;
+    (<-vulgar
+     ((=ucs@unicode	  . #x51E1)	; &GT-02286;
+      (=jis-x0208	  . #x4B5E)	; &GT-02286; [43-62]
+      (=gb2312		  . #x3732)	; &I-G0-3732; [23-18]
+      (=ks-x1001	  . #x5B6D)	; &I-K0-5B6D; [59-77]
+      (=cns11643-1	  . #x443B)	; &I-C1-443B; [36-27]
+      (=jis-x0213-1	  . #x4B5E)	; &I-JX1-4B5E; [43-62]
+      (=daikanwa	  . 01739)	; &I-M-01739;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     (->subsumptive
      ((ideographic-radical . 4)	; ⼃
       (ideographic-strokes . 2)
-      (ideographic-radical*sources daikanwa cns11643)
       (=daikanwa	  . 00123)	; &M-00123;
       )
      ((ideographic-radical . 16)	; ⼏
       (ideographic-strokes . 1)
-      (ideographic-radical*sources daikanwa jis-x0213-2000 ucs)
       (=daikanwa	  . 01740)	; &M-01740;
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	1740 0 2)
+  '((<-denotational
+     ((=>daikanwa	  . 01740)	; &A-M-01740;
+      ))
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
@@ -241,28 +320,28 @@
     (total-strokes	 . 4)
     (=ucs		. #x2062F)	; 𠘯
     (->subsumptive
-     ((=daikanwa	  . 03067)	; &M-03067;
-      (=ucs@iso		  . #x2062F)	; &M-03067;
+     ((=ucs@iso		  . #x2062F)	; &M-03067;
+      (=daikanwa	  . 03067)	; &M-03067;
       )
      ((=cns11643-6	  . #x215C)	; &CDP-87B8; [01-60]
       (=big5-cdp	  . #x87B8)	; &I-CDP-87B8;
       ))
     ))
 (define-char
-  '((morohashi-daikanwa	ho 45)
+  '((<-denotational
+     ((=ucs		  . #x20AD7)	; 𠫗
+      ))
+    (morohashi-daikanwa	ho 45)
     (ideographic-radical@ucs . 28)	; ⼛
     (ideographic-strokes@ucs . 2)
     (ideographic-radical@daikanwa . 16)	; ⼏
     (ideographic-strokes@daikanwa . 2)
     (total-strokes	 . 4)
-    (<-denotational
-     ((=ucs		  . #x20AD7)	; 𠫗
-      ))
     (hanyu-dazidian	1 276 8)
+    (=ucs@iso		. #x20AD7)	; &GT-02288;
     (=gt		. 02288)	; &GT-02288;
     (=gt-pj-11		. #x432A)	; &GT-02288; [35-10]
     (=hanziku-1		. #xDEEF)	; &I-HZK01-DEEF;
-    (=ucs@iso		. #x20AD7)	; &GT-02288;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -288,30 +367,31 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #x8655)	; 處
-      (=jis-x0208	  . #x515D)	; &I-J90-515D; [49-61]
-      ))
     (hanyu-dazidian	1 276 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (=ucs		  . #x2FFA)	; ⿺
       )
-     ((=jis-x0208	  . #x5469)	; &GT-07201; [52-73]
-      (=cns11643-3	  . #x2139)	; &I-C3-2139; [01-25]
-      (=daikanwa	  . 05691)	; &I-M-05691;
+     ((=ucs		  . #x5902)	; 夂
       )
      ((=ucs		  . #x51E0)	; 几
       ))
-    (shinjigen-1	. 568)
-    (shinjigen-2	. 568)
     (=ucs		. #x51E6)	; 処
     (=jis-x0208		. #x3D68)	; &I-J90-3D68; [29-72]
+    (=jis-x0213-1	. #x3D68)	; &I-JX1-3D68; [29-72]
     (=big5-cdp		. #x8BE4)	; &I-CDP-8BE4;
     (=gt		. 02293)	; &I-GT-02293;
     (=gt-k		. 00956)	; &I-GT-K00956;
     (=gt-pj-1		. #x3D68)	; &I-GT-02293; [29-72]
     (=daikanwa		. 01745)	; &I-M-01745;
+    (=shinjigen		.  0568)	; 処
+    (<-simplified@JP/Jouyou
+     ((=ucs@unicode	  . #x8655)	; &GT-44206;
+      (=jis-x0208	  . #x515D)	; &GT-44206; [49-61]
+      (=ks-x1001	  . #x7425)	; &I-K0-7425; [84-05]
+      (=jis-x0213-1	  . #x515D)	; &I-JX1-515D; [49-61]
+      (=daikanwa	  . 32697)	; &I-M-32697;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -363,14 +443,14 @@
       )
      ((=ucs		  . #x5DFE)	; å·¾
       ))
-    (shinjigen-1	. 571)
-    (shinjigen-2	. 571)
     (=ucs		. #x51E7)	; 凧
     (=jis-x0208		. #x427C)	; &I-J90-427C; [34-92]
+    (=jis-x0213-1	. #x427C)	; &I-JX1-427C; [34-92]
     (=gt		. 02296)	; &I-GT-02296;
     (=gt-k		. 00974)	; &I-GT-K00974;
     (=gt-pj-1		. #x427C)	; &I-GT-02296; [34-92]
     (=daikanwa		. 01749)	; &I-M-01749;
+    (=shinjigen		.  0571)	; 凧
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -439,13 +519,23 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (=daikanwa		. 01754)	; &M-01754;
+    (=ucs		. #x2063A)	; 𠘺
+    (->subsumptive
+     ((=daikanwa	  . 01754)	; &M-01754;
+      )
+     ((hanyu-dazidian	  1 277 6)
+      (=ucs@iso		  . #x2063A)	; &HZK01-DF4E;
+      (=hanziku-1	  . #xDF4E)	; &HZK01-DF4E;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-    (=daikanwa		. 01755)	; &M-01755;
+    (hanyu-dazidian	1 277 8)
+    (=ucs		. #x2063B)	; 𠘻
+    (=daikanwa		. 01755)	; &I-M-01755;
+    (=hanziku-1		. #xDF50)	; &I-HZK01-DF50;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -479,13 +569,13 @@
       )
      ((=ucs		  . #x6728)	; 木
       ))
-    (shinjigen-1	. 572)
-    (shinjigen-2	. 572)
     (=ucs		. #x51E9)	; 凩
     (=jis-x0208		. #x515E)	; &I-J90-515E; [49-62]
+    (=jis-x0213-1	. #x515E)	; &I-JX1-515E; [49-62]
     (=gt		. 02301)	; &I-GT-02301;
     (=gt-pj-1		. #x515E)	; &I-GT-02301; [49-62]
     (=daikanwa		. 01757)	; &I-M-01757;
+    (=shinjigen		.  0572)	; 凩
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -500,13 +590,13 @@
       )
      ((=ucs		  . #x6B62)	; æ­¢
       ))
-    (shinjigen-1	. 573)
-    (shinjigen-2	. 573)
     (=ucs		. #x51EA)	; 凪
     (=jis-x0208		. #x4664)	; &I-J90-4664; [38-68]
+    (=jis-x0213-1	. #x4664)	; &I-JX1-4664; [38-68]
     (=gt		. 02305)	; &I-GT-02305;
     (=gt-pj-1		. #x4664)	; &I-GT-02305; [38-68]
     (=daikanwa		. 01758)	; &I-M-01758;
+    (=shinjigen		.  0573)	; 凪
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -559,48 +649,55 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=daikanwa		. 01762)	; &M-01762;
+    (hanyu-dazidian	1 277 9)
+    (=ucs		. #x20641)	; 𠙁
+    (=daikanwa		. 01762)	; &I-M-01762;
+    (=hanziku-1		. #xDF51)	; &I-HZK01-DF51;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (=daikanwa		. 01763)	; &M-01763;
-    ))
-(define-char
-  '((=>ucs		. #x20AE8)	; 𠫨
-    (ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (=daikanwa		. 01764)	; &M-01764;
+    (hanyu-dazidian	1 277 13)
+    (=ucs		. #x20642)	; 𠙂
+    (=daikanwa		. 01763)	; &I-M-01763;
+    (=hanziku-1		. #xDF55)	; &I-HZK01-DF55;
     ))
 (define-char
-  '((morohashi-daikanwa	1764 0 0)
-    (ideographic-radical . 16)	; ⼏
+  '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 386 11)
     (=ucs		. #x20AE8)	; 𠫨
-    (=cns11643-5	. #x233C)	; &I-C5-233C; [03-28]
-    (=hanziku-1		. #xF575)	; &I-HZK01-F575;
+    (->subsumptive
+     ((=daikanwa	  . 01764)	; &M-01764;
+      )
+     ((hanyu-dazidian	  1 386 11)
+      (=ucs@iso		  . #x20AE8)	; &HZK01-F575;
+      (=cns11643-5	  . #x233C)	; &HZK01-F575; [03-28]
+      (=hanziku-1	  . #xF575)	; &I-HZK01-F575;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
-    (<-ancient
-     ((shinjigen-1	  . 9211)
-      (=jis-x0208	  . #x4977)	; &I-J90-4977; [41-87]
-      (=daikanwa	  . 43756)	; &I-M-43756;
-      ))
-    (<-ancient*sources
-     shinjigen-1)
     (hanyu-dazidian	1 277 11)
     (=ucs		. #x51EC)	; 凬
     (=cns11643-3	. #x245B)	; &I-C3-245B; [04-59]
     (=daikanwa		. 01765)	; &I-M-01765;
     (=hanziku-1		. #xDF53)	; &I-HZK01-DF53;
     (=jef-china3	. #x44AC)	; &I-JC3-44AC;
+    (=adobe-japan1-2	. 08397)	; &I-AJ1-08397;
+    (<-ancient
+     ((=ucs@unicode	  . #x98A8)	; &GT-58717;
+      (=jis-x0208	  . #x4977)	; &GT-58717; [41-87]
+      (=ks-x1001	  . #x7926)	; &I-K0-7926; [89-06]
+      (=jis-x0213-1	  . #x4977)	; &I-JX1-4977; [41-87]
+      (=daikanwa	  . 43756)	; &I-M-43756;
+      (=shinjigen	  .  9211)	; &GT-58717;
+      ))
+    (<-ancient*sources
+     shinjigen@1ed)
     ))
 (define-char
   '((morohashi-daikanwa	ho 46)
@@ -624,14 +721,14 @@
       )
      ((=ucs		  . #x51E0)	; 几
       ))
-    (shinjigen-1	. 574)
-    (shinjigen-2	. 574)
     (=ucs		. #x51ED)	; 凭
     (=jis-x0208		. #x515F)	; &I-J90-515F; [49-63]
     (=gb2312		. #x463E)	; &I-G0-463E; [38-30]
+    (=jis-x0213-1	. #x515F)	; &I-JX1-515F; [49-63]
     (=gt		. 02321)	; &I-GT-02321;
     (=gt-pj-1		. #x515F)	; &I-GT-02321; [49-63]
     (=daikanwa		. 01766)	; &I-M-01766;
+    (=shinjigen		.  0574)	; 凭
     (=hanziku-1		. #xDF5E)	; &I-HZK01-DF5E;
     (=cbeta		. 00285)	; &I-CB00285;
     (=jef-china3	. #x82B8)	; &I-JC3-82B8;
@@ -744,15 +841,19 @@
     (ideographic-radical@cns*sources
      daikanwa=01775 cns11643)
     (total-strokes	 . 8)
-    (<-ancient
-     ((=daikanwa	  . 09208)	; &I-M-09208;
-      ))
-    (<-ancient*sources
-     yupian jiyun daikanwa)
     (hanyu-dazidian	2 1094 6)
     (=ucs		. #x221BB)	; 𢆻
     (=cns11643-6	. #x295E)	; &I-C6-295E; [09-62]
     (=hanziku-3		. #xDF74)	; &I-HZK03-DF74;
+    (<-ancient
+     ((=ucs@jis		  . #x5E7E)	; &M-09208;
+      (=jis-x0208	  . #x3476)	; &M-09208; [20-86]
+      (=ks-x1001	  . #x507A)	; &I-K0-507A; [48-90]
+      (=jis-x0213-1	  . #x3476)	; &I-JX1-3476; [20-86]
+      (=daikanwa	  . 09208)	; &I-M-09208;
+      ))
+    (<-ancient*sources
+     yupian jiyun daikanwa)
     (->subsumptive
      ((=daikanwa	  . 01775)	; &M-01775;
       )
@@ -776,7 +877,7 @@
     (=ucs		. #x51EE)	; 凮
     (=jis-x0212		. #x332B)	; &I-JSP-332B; [19-11]
     (=cns11643-4	. #x2545)	; &I-C4-2545; [05-37]
-    (=jis-x0213-1-2000	. #x2E59)	; &I-JX1-2E59; [14-57]
+    (=jis-x0213-1	. #x2E59)	; &I-JX1-2E59; [14-57]
     (=daikanwa		. 01776)	; &I-M-01776;
     (=hanziku-12	. #xEBA9)	; &I-HZK12-EBA9;
     (=jef-china3	. #x44A8)	; &I-JC3-44A8;
@@ -790,6 +891,7 @@
     (total-strokes	 . 8)
     (=ucs		. #x9F21)	; 鼡
     (=jis-x0208		. #x736B)	; &I-J90-736B; [83-75]
+    (=jis-x0213-1	. #x736B)	; &I-JX1-736B; [83-75]
     (=gt		. 12984)	; &I-GT-12984;
     (=gt-k		. 03927)	; &I-GT-K03927;
     (=gt-pj-1		. #x736B)	; &I-GT-12984; [83-75]
@@ -849,32 +951,128 @@
     (=hanziku-1		. #xDF62)	; &I-HZK01-DF62;
     ))
 (define-char
-  '((ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 8)
+  '((ideographic-radical@ucs . 16)	; ⼏
+    (ideographic-strokes@ucs . 8)
+    (ideographic-radical@ucs*sources
+     daikanwa=01780 cns11643 ucs)
+    (ideographic-radical@daikanwa=36670 . 154)	; ⾙
+    (ideographic-strokes@daikanwa=36670 . 3)
+    (ideographic-radical@daikanwa=36670*sources
+     daikanwa=36670)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 278 4)
     (=ucs		. #x20652)	; 𠙒
     (=cns11643-6	. #x3547)	; &I-C6-3547; [21-39]
-    (=daikanwa		. 01780)	; &I-M-01780;
     (=hanziku-1		. #xDF6C)	; &I-HZK01-DF6C;
+    (->subsumptive
+     ((ideographic-radical . 16)	; ⼏
+      (ideographic-strokes . 8)
+      (=daikanwa	  . 01780)	; &M-01780;
+      )
+     ((ideographic-radical . 154)	; ⾙
+      (ideographic-strokes . 3)
+      (=daikanwa	  . 36670)	; &M-36670;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 01781)	; &M-01781;
+    (hanyu-dazidian	1 278 5)
+    (=ucs		. #x20654)	; 𠙔
+    (=daikanwa		. 01781)	; &I-M-01781;
+    (=hanziku-1		. #xDF6D)	; &I-HZK01-DF6D;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 01782)	; &M-01782;
+    (hanyu-dazidian	1 278 6)
+    (=ucs		. #x20655)	; 𠙕
+    (=daikanwa		. 01782)	; &I-M-01782;
+    (=hanziku-1		. #xDF6E)	; &I-HZK01-DF6E;
     ))
 (define-char
-  '((ideographic-radical . 16)	; ⼏
+  '((ideographic-radical@ucs . 8)	; ⼇
+    (ideographic-radical@ucs*sources
+     daikanwa=00314 cns11643 ucs)
+    (ideographic-radical@daikanwa=01783 . 16)	; ⼏
+    (ideographic-radical@daikanwa=01783*sources
+     daikanwa=01783)
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=daikanwa		. 01783)	; &M-01783;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=ucs		  . #x821B)	; 舛
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (=ucs		. #x2015E)	; 𠅞
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs@jis	    . #x4EA0)	; &AJ1-04110;
+	(=jis-x0208	    . #x5035)	; &AJ1-04110; [48-21]
+	(=jis-x0213-1	    . #x5035)	; &I-JX1-5035; [48-21]
+	)
+       ((=ucs@unicode	    . #x821B)	; &GT-39240;
+	(=jis-x0208	    . #x4124)	; &GT-39240; [33-04]
+	(=gb2312	    . #x6236)	; &I-G0-6236; [66-22]
+	(=jis-x0213-1	    . #x4124)	; &I-JX1-4124; [33-04]
+	(=daikanwa	    . 30338)	; &I-M-30338;
+	)
+       ((=ucs		    . #x51E0)	; 几
+	))
+      (->subsumptive
+       ((ideographic-radical . 8)	; ⼇
+	(=daikanwa	    . 00314)	; &M-00314;
+	)
+       ((ideographic-radical . 16)	; ⼏
+	(=daikanwa	    . 01783)	; &M-01783;
+	))
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (hanyu-dazidian	  1 287 13)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs@unicode	    . #x4EA0)	; &GT-00375;
+	(=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((=ucs@unicode	    . #x821B)	; &GT-39240;
+	(=jis-x0208	    . #x4124)	; &GT-39240; [33-04]
+	(=gb2312	    . #x6236)	; &I-G0-6236; [66-22]
+	(=jis-x0213-1	    . #x4124)	; &I-JX1-4124; [33-04]
+	(=daikanwa	    . 30338)	; &I-M-30338;
+	)
+       ((=ucs		    . #x51E0)	; 几
+	))
+      (=ucs@iso		  . #x2015E)	; &HZK01-E15B;
+      (=hanziku-1	  . #xE15B)	; &HZK01-E15B;
+      )
+     ((ideographic-radical . 8)	; ⼇
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+	(=ucs		    . #x2FF3)	; ⿳
+	)
+       ((=ucs@unicode	    . #x4EA0)	; &GT-00375;
+	(=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
+	)
+       ((=cns11643-1	    . #x4860)	; &C1-4860; [40-64]
+	)
+       ((=ucs		    . #x51E0)	; 几
+	))
+      (=cns11643-6	  . #x3531)	; &C6-3531; [21-17]
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -890,18 +1088,18 @@
       )
      ((=ucs		  . #x7687)	; 皇
       ))
-    (shinjigen-1	. 576)
-    (shinjigen-2	. 576)
     (=ucs		. #x51F0)	; 凰
     (=jis-x0208		. #x5160)	; &I-J90-5160; [49-64]
     (=gb2312		. #x3B4B)	; &I-G0-3B4B; [27-43]
     (=ks-x1001		. #x7C45)	; &I-K0-7C45; [92-37]
     (=cns11643-1	. #x5929)	; &I-C1-5929; [57-09]
+    (=jis-x0213-1	. #x5160)	; &I-JX1-5160; [49-64]
     (=big5		. #xB0C4)	; &I-B-B0C4;
     (=gt		. 02337)	; &I-GT-02337;
     (=gt-k		. 07908)	; &I-GT-K07908;
     (=gt-pj-1		. #x5160)	; &I-GT-02337; [49-64]
     (=daikanwa		. 01784)	; &I-M-01784;
+    (=shinjigen		.  0576)	; 凰
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -990,17 +1188,17 @@
       )
      ((=ucs		  . #x51E0)	; 几
       ))
-    (shinjigen-1	. 577)
-    (shinjigen-2	. 577)
     (=ucs		. #x51F1)	; 凱
     (=jis-x0208		. #x332E)	; &I-J90-332E; [19-14]
     (=ks-x1001		. #x4B42)	; &I-K0-4B42; [43-34]
     (=cns11643-1	. #x5E33)	; &I-C1-5E33; [62-19]
+    (=jis-x0213-1	. #x332E)	; &I-JX1-332E; [19-14]
     (=gb12345		. #x3F2D)	; 凱 [31-13]
     (=big5		. #xB3CD)	; &I-B-B3CD;
     (=gt		. 02341)	; &I-GT-02341;
     (=gt-pj-1		. #x332E)	; &I-GT-02341; [19-14]
     (=daikanwa		. 01790)	; &I-M-01790;
+    (=shinjigen		.  0577)	; 凱
     ))
 (define-char
   '((=>ucs		. #x2065F)	; 𠙟
@@ -1034,12 +1232,12 @@
       )
      ((=gt		  . 01936)	; &GT-01936;
       ))
+    (=ucs@jis		. #x51F2)	; &M-01792;
     (=jis-x0212		. #x332C)	; &M-01792; [19-12]
     (=cns11643-6	. #x4665)	; &I-C6-4665; [38-69]
     (=daikanwa		. 01792)	; &I-M-01792;
     (=hanziku-1		. #xDF76)	; &I-HZK01-DF76;
     (=jef-china3	. #x44A9)	; &I-JC3-44A9;
-    (=ucs@jis		. #x51F2)	; &M-01792;
     ))
 (define-char
   '((morohashi-daikanwa	1792 0 2)
@@ -1103,30 +1301,47 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian	5 3202 1)
     (=ucs		. #x20662)	; 𠙢
-    (=daikanwa		. 01794)	; &I-M-01794;
-    (=hanziku-8		. #xED68)	; &I-HZK08-ED68;
-    ))
-(define-char
-  '((=>ucs		. #x20662)	; 𠙢
-    (morohashi-daikanwa	1794 0 0)
-    (ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 10)
-    (total-strokes	 . 12)
-    (=cns11643-6	. #x4664)	; &C6-4664; [38-68]
+    (->subsumptive
+     ((hanyu-dazidian	  5 3202 1)
+      (=ucs@iso		  . #x20662)	; &M-01794;
+      (=daikanwa	  . 01794)	; &M-01794;
+      (=hanziku-8	  . #xED68)	; &I-HZK08-ED68;
+      )
+     ((=cns11643-6	  . #x4664)	; &C6-4664; [38-68]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 10)
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@daikanwa . 16)	; ⼏
+    (ideographic-strokes@daikanwa . 10)
     (total-strokes	 . 12)
-    (=daikanwa		. 01795)	; &M-01795;
+    (hanyu-dazidian	1 26 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x51F0)	; 凰
+      ))
+    (=ucs		. #x20049)	; 𠁉
+    (=daikanwa		. 01795)	; &I-M-01795;
+    (=hanziku-1		. #xA97C)	; &I-HZK01-A97C;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
-    (=daikanwa		. 01796)	; &M-01796;
+    (=ucs		. #x20664)	; 𠙤
+    (->subsumptive
+     ((=daikanwa	  . 01796)	; &M-01796;
+      )
+     ((hanyu-dazidian	  1 278 18)
+      (=ucs@iso		  . #x20664)	; &HZK01-DF7A;
+      (=hanziku-1	  . #xDF7A)	; &HZK01-DF7A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -1145,10 +1360,11 @@
     (=gb2312		. #x354A)	; &I-G0-354A; [21-42]
     (=jis-x0212		. #x332D)	; &I-JSP-332D; [19-13]
     (=cns11643-1	. #x6821)	; &I-C1-6821; [72-01]
-    (=jis-x0213-2-2000	. #x2333)	; &I-JX2-2333; [03-19]
+    (=jis-x0213-2	. #x2333)	; &I-JX2-2333; [03-19]
     (=big5		. #xB9B9)	; &I-B-B9B9;
     (=daikanwa		. 01797)	; &I-M-01797;
     (=jef-china3	. #x98DF)	; &I-JC3-98DF;
+    (=adobe-japan1-5	. 17309)	; &I-AJ1-17309;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -1166,7 +1382,7 @@
     (=ucs		. #x51F4)	; 凴
     (=jis-x0212		. #x332E)	; &I-JSP-332E; [19-14]
     (=cns11643-3	. #x457A)	; &I-C3-457A; [37-90]
-    (=jis-x0213-2-2000	. #x2334)	; &I-JX2-2334; [03-20]
+    (=jis-x0213-2	. #x2334)	; &I-JX2-2334; [03-20]
     (=daikanwa		. 01798)	; &I-M-01798;
     (=hanziku-1		. #xDF7B)	; &I-HZK01-DF7B;
     (=cbeta		. 06316)	; &I-CB06316;
@@ -1184,48 +1400,12 @@
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 277 6)
-    (=ucs		. #x2063A)	; 𠘺
-    (=hanziku-1		. #xDF4E)	; &I-HZK01-DF4E;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 277 8)
-    (=ucs		. #x2063B)	; 𠘻
-    (=hanziku-1		. #xDF50)	; &I-HZK01-DF50;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 277 9)
-    (=ucs		. #x20641)	; 𠙁
-    (=hanziku-1		. #xDF51)	; &I-HZK01-DF51;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 277 13)
-    (=ucs		. #x20642)	; 𠙂
-    (=hanziku-1		. #xDF55)	; &I-HZK01-DF55;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
     (hanyu-dazidian	8 9 25)
     (=ucs		. #x20644)	; 𠙄
     (=hanziku-12	. #xEBA8)	; &I-HZK12-EBA8;
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 278 5)
-    (=ucs		. #x20654)	; 𠙔
-    (=hanziku-1		. #xDF6D)	; &I-HZK01-DF6D;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 278 6)
-    (=ucs		. #x20655)	; 𠙕
-    (=hanziku-1		. #xDF6E)	; &I-HZK01-DF6E;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
     (hanyu-dazidian	8 9 27)
     (=ucs		. #x20656)	; 𠙖
     (=hanziku-12	. #xEBAA)	; &I-HZK12-EBAA;
@@ -1238,12 +1418,6 @@
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 278 18)
-    (=ucs		. #x20664)	; 𠙤
-    (=hanziku-1		. #xDF7A)	; &I-HZK01-DF7A;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
     (hanyu-dazidian	8 10 1)
     (=ucs		. #x20665)	; 𠙥
     (=hanziku-12	. #xEBAB)	; &I-HZK12-EBAB;