X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R001-One.el;h=1866fadb1664131881d35ced883ca51d28de8f9d;hb=8670d6ad21a0bab10db777f6b1603cc13718e585;hp=4991f779b75c4382135363ff61a397d15549a162;hpb=2c303d9dd612b5c1b4ed05917fec3543c3f933fa;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 4991f77..1866fad 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -60,10 +60,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
-    (->bopomofo
-     ((name		  . "BOPOMOFO LETTER K")
-      (=ucs		  . #x310E)	; ㄎ
-      ))
     (hanyu-dazidian	1 4 1)
     (=ucs		. #x4E02)	; 丂
     (=jis-x0212		. #x3021)	; &I-JSP-3021; [16-01]
@@ -75,62 +71,64 @@
     (=daikanwa		. 00003)	; &I-M-00003;
     (=jef-china3	. #x41A1)	; &I-JC3-41A1;
     (mojikyo		. 000003)	; &MCS-60000003;
+    (->Bopomofo
+     ((name		  . "BOPOMOFO LETTER K")
+      (=ucs		  . #x310E)	; ㄎ
+      ))
     ))
 (define-char
   '((script		Ideograph)
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 1)
-    (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 11)
-    (hanyu-dazidian-char . 7)
-    (->bopomofo
+    (ideographic-strokes@cns . 1)
+    (total-strokes@cns	     . 2)
+    (ideographic-strokes@cns*sources
+     daikanwa cns11643 ucs)
+    (ideographic-strokes@gt . 3)
+    (total-strokes@gt	    . 4)
+    (hanyu-dazidian	1 11 7)
+    (=ucs		. #x20000)	; 𠀀
+    (->Bopomofo
      ((name		  . "BOPOMOFO LETTER O")
       (=ucs		  . #x311B)	; ㄛ
       ))
-    (=ucs		. #x20000)	; 𠀀
-    (=cns11643-5	. #x2125)	; &I-C5-2125; [01-05]
-    (=daikanwa		. 00004)	; &I-M-00004;
-    (mojikyo		. 000004)	; &MCS-60000004;
-    ))
-(define-char
-  '((=>ucs		. #x20000)	; 𠀀
-    (morohashi-daikanwa	4 0 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 1)
-    (total-strokes	 . 2)
-    (hanyu-dazidian	1 11 1)
-    (=big5-cdp		. #x87F6)	; &CDP-87F6;
-    ))
-(define-char
-  '((=>ucs		. #x20000)	; 𠀀
-    (morohashi-daikanwa	4 0 1)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (=gt		. 00026)	; &GT-00026;
-    (=gt-pj-2		. #x3022)	; &GT-00026; [16-02]
+    (->subsumptive
+     ((=gt		  . 00026)	; &GT-00026;
+      (=gt-pj-2		  . #x3022)	; &GT-00026; [16-02]
+      (=daikanwa	  . 00004)	; &I-M-00004;
+      )
+     ((hanyu-dazidian	  1 11 1)
+      (=big5-cdp	  . #x87F6)	; &CDP-87F6;
+      )
+     ((=cns11643-5	  . #x2125)	; &C5-2125; [01-05]
+      (=ucs@iso		  . #x20000)	; &C5-2125;
+      (mojikyo		  . 000004)	; &MCS-60000004;
+      ))
     ))
 (define-char
   '((script		Ideograph)
     (=>ucs		. #x311C)	; ㄜ
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 1)
-    (total-strokes	 . 2)
-    (->bopomofo
+    (ideographic-strokes@daikanwa . 1)
+    (total-strokes@daikanwa	  . 2)
+    (ideographic-strokes@gt . 3)
+    (total-strokes@gt	    . 4)
+    (=gt		. 00038)	; &GT-00038;
+    (=gt-pj-2		. #x3023)	; &GT-00038; [16-03]
+    (=daikanwa		. 00005)	; &I-M-00005;
+    (->Bopomofo
      ((name		  . "BOPOMOFO LETTER E")
       (=ucs		  . #x311C)	; ㄜ
       ))
-    (=daikanwa		. 00005)	; &M-00005;
-    (mojikyo		. 000005)	; &MCS-60000005;
     ))
 (define-char
-  '((morohashi-daikanwa	5 0 0)
+  '((<-denotational
+     ((=gt		  . 00038)	; &GT-00038;
+      (=daikanwa	  . 00005)	; &I-M-00005;
+      ))
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (=gt		. 00038)	; &GT-00038;
-    (=gt-pj-2		. #x3023)	; &GT-00038; [16-03]
+    (ideographic-strokes . 1)
+    (total-strokes	 . 2)
+    (mojikyo		. 000005)	; &MCS-60000005;
     ))
 (define-char
   '((decimal-digit-value . 7)
@@ -198,14 +196,14 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
-    (->bopomofo
-     ((name		  . "BOPOMOFO LETTER C")
-      (=ucs		  . #x3118)	; ㄘ
-      ))
     (=gt		. 00005)	; &GT-00005;
     (=gt-pj-2		. #x3026)	; &GT-00005; [16-06]
     (=daikanwa		. 00009)	; &I-M-00009;
     (mojikyo		. 000009)	; &MCS-60000009;
+    (->Bopomofo
+     ((name		  . "BOPOMOFO LETTER C")
+      (=ucs		  . #x3118)	; ㄘ
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -267,13 +265,6 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-simplified
-     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
-      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
-      (=gb12345		  . #x4D72)	; &GT-41264; [45-82]
-      ))
-    (<-simplified*sources
-     JP/Jouyou CN)
     (hanyu-dazidian	1 9 3)
     (shinjigen-1	. 12)
     (shinjigen-2	. 12)
@@ -292,6 +283,18 @@
     (=gt-pj-1		. #x4B7C)	; &I-GT-00021; [43-92]
     (=daikanwa		. 00010)	; &I-M-00010;
     (mojikyo		. 000010)	; &MCS-6000000A;
+    (<-simplified@CN
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      (=gb12345		  . #x4D72)	; &GT-41264; [45-82]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x842C)	; 萬
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -301,19 +304,19 @@
     (sound@ja/on/go	"dyAu")
     (sound@ja/on/kan	"tyAu")
     (=ucs		. #x4E08)	; 丈
+    (=big5		. #xA456)	; &I-B-A456;
+    (=jis-x0208@1997	. #x3E66)	; 丈 [30-70]
     (->subsumptive
      ((shinjigen-1	  . 10)
       (shinjigen-2	  . 10)
-      (=jis-x0208-1978	  . #x3E66)	; &GT-00018; [30-70]
-      (=jis-x0208-1983	  . #x3E66)	; &I-J83-3E66; [30-70]
+      (=jis-x0208@1978	  . #x3E66)	; &GT-00018; [30-70]
+      (=jis-x0208@1983	  . #x3E66)	; &I-J83-3E66; [30-70]
       (=ks-x1001	  . #x6D5B)	; &I-K0-6D5B; [77-59]
-      (=big5		  . #xA456)	; &I-B-A456;
       (=gt		  . 00018)	; &I-GT-00018;
       (=gt-k		  . 00189)	; &I-GT-K00189;
       (=gt-pj-2		  . #x3027)	; &I-GT-00018; [16-07]
       (=daikanwa	  . 00011)	; &I-M-00011;
       (=jef-china3	  . #x41A5)	; &I-JC3-41A5;
-      (=ucs@big5	  . #x4E08)	; &GT-00018;
       )
      ((mojikyo		  . 000011)	; &MCS-6000000B;
       )
@@ -321,7 +324,7 @@
       (shinjigen-1	  . 9)
       (shinjigen-2	  . 9)
       (=gb2312		  . #x5549)	; &GT-00020; [53-41]
-      (=jis-x0208-1990	  . #x3E66)	; &I-J90-3E66; [30-70]
+      (=jis-x0208@1990	  . #x3E66)	; &I-J90-3E66; [30-70]
       (=cns11643-1	  . #x4437)	; &I-C1-4437; [36-23]
       (=gt		  . 00020)	; &I-GT-00020;
       (=gt-pj-1		  . #x3E66)	; &I-GT-00020; [30-70]
@@ -462,12 +465,12 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
-    (<-unknown
-     ((=ucs		  . #x624D)	; 才
-      ))
     (=gt		. 00010)	; &GT-00010;
     (=gt-k		. 00176)	; &I-GT-K00176;
     (=gt-pj-9		. #x4A2B)	; &GT-00010; [42-11]
+    (<-unknown
+     ((=ucs		  . #x624D)	; 才
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -503,7 +506,6 @@
     (=ucs		. #x4E0D)	; 不
     (=jis-x0208		. #x4954)	; &I-J90-4954; [41-52]
     (=gb2312		. #x323B)	; &I-G0-323B; [18-27]
-    (=ks-x1001		. #x5C74)	; &I-K0-5C74; [60-84]
     (=cns11643-1	. #x4462)	; &I-C1-4462; [36-66]
     (=big5		. #xA4A3)	; &I-B-A4A3;
     (=gt		. 00036)	; &I-GT-00036;
@@ -511,37 +513,42 @@
     (=gt-pj-1		. #x4954)	; &I-GT-00036; [41-52]
     (=daikanwa		. 00019)	; &I-M-00019;
     (mojikyo		. 000019)	; &MCS-60000013;
+    (->subsumptive
+     ((=ks-x1001	  . #x5C74)	; &K0-5C74; [60-84]
+      (=ucs@ks		  . #x4E0D)	; &K0-5C74;
+      )
+     ((=>ucs*		  . #x4E0D)	; 不
+      (=ucs		  . #xF967)	; 不
+      (=ks-x1001	  . #x5D55)	; &I-K0-5D55; [61-53]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	19 0 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (=ucs		. #xF967)	; 不
-    (=ks-x1001		. #x5D55)	; &I-K0-5D55; [61-53]
+  '((ideographic-radical . 1)	; ⼀
+    (sound@ja/kun	"ata-H+eru" "kumi+suru" "azuka+r5")
+    (sound@ja/on	"yo")
+    (=ucs		. #x4E0E)	; 与
+    (<-simplified@ucs
+     ((=ucs		  . #x8207)	; 與
+      ))
     ))
 (define-char
-  '((ideographic-radical . 1)	; ⼀
-    (->synonyms
-     ((=daikanwa	  . 30212)	; &I-M-30212;
+  '((<-denotational
+     ((=ucs		  . #x4E0E)	; 与
       ))
-    (->synonyms*sources
-     shuowen guangyun daikanwa)
-    (=ucs		. #x4E0E)	; 与
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes@ucs . 3)
+    (total-strokes@ucs	     . 4)
+    (ideographic-strokes@ucs*sources
+     daikanwa ucs)
+    (total-strokes@ucs*sources
+     cns11643)
+    (ideographic-strokes@gt . 2)
+    (total-strokes@gt	    . 3)
+    (hanyu-dazidian	1 5 3)
+    (=big5		. #xC94F)	; &B-C94F;
+    (=ucs@big5		. #x4E0E)	; &B-C94F;
     (->subsumptive
-     ((ideographic-strokes@ucs . 3)
-      (total-strokes@ucs       . 4)
-      (ideographic-strokes@ucs*sources
-       daikanwa ucs)
-      (total-strokes@ucs*sources
-       cns11643)
-      (ideographic-strokes@gt . 2)
-      (total-strokes@gt	      . 3)
-      (<-simplified@CN
-       ((=gb12345	    . #x536B)	; &GT-39084; [51-75]
-	))
-      (hanyu-dazidian	  1 5 3)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
 	(=ucs		    . #x2FF9)	; ⿹
 	)
@@ -558,36 +565,34 @@
       (=jef-china3	  . #x82A6)	; &I-JC3-82A6;
       (=ucs@unicode	  . #x4E0E)	; &GT-00023;
       (mojikyo		  . 000020)	; &MCS-60000014;
-      )
-     ((ideographic-strokes . 3)
-      (total-strokes	   . 4)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-	(=ucs		    . #x2FF9)	; ⿹
-	)
-       ((=big5-cdp	    . #x8BBF)	; &CDP-8BBF;
-	)
-       ((=gt-k		    . 00002)	; &GT-K00002;
+      (<-simplified@CN
+       ((=gb12345	    . #x536B)	; &GT-39084; [51-75]
 	))
-      (=big5		  . #xC94F)	; &B-C94F;
-      (=ucs@big5	  . #x4E0E)	; &B-C94F;
-      )
-     ((ideographic-strokes . 2)
-      (total-strokes	   . 3)
-      (<-simplified@JP/Jouyou
-       ((=jis-x0208	    . #x6750)	; &GT-39084; [71-48]
-	(=ks-x1001	    . #x6628)	; &I-K0-6628; [70-08]
-	(=daikanwa	    . 30212)	; &I-M-30212;
+      (->synonyms
+       ((=daikanwa	    . 30212)	; &I-M-30212;
 	))
-      (shinjigen-1	  . 6625)
-      (shinjigen-2	  . 6625)
-      (sound@ja/kun	  "ata-H+eru" "kumi+suru" "azuka+r5")
-      (sound@ja/on	  "yo")
-      (=jis-x0208	  . #x4D3F)	; &GT-00024; [45-31]
-      (=gt		  . 00024)	; &I-GT-00024;
-      (=gt-k		  . 00208)	; &I-GT-K00208;
-      (=gt-pj-1		  . #x4D3F)	; &I-GT-00024; [45-31]
-      (=ucs@jis		  . #x4E0E)	; &GT-00024;
+      (->synonyms*sources
+       shuowen guangyun daikanwa)
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E0E)	; 与
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 2)
+    (total-strokes	 . 3)
+    (shinjigen-1	. 6625)
+    (shinjigen-2	. 6625)
+    (=jis-x0208		. #x4D3F)	; &GT-00024; [45-31]
+    (=gt		. 00024)	; &I-GT-00024;
+    (=gt-k		. 00208)	; &I-GT-K00208;
+    (=gt-pj-1		. #x4D3F)	; &I-GT-00024; [45-31]
+    (=ucs@jis		. #x4E0E)	; &GT-00024;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6750)	; &GT-39084; [71-48]
+      (=ks-x1001	  . #x6628)	; &I-K0-6628; [70-08]
+      (=daikanwa	  . 30212)	; &I-M-30212;
       ))
     ))
 (define-char
@@ -634,39 +639,52 @@
     (sound@ja/kun	"usi")
     (sound@ja/on/kan	"tIu")
     (=ucs		. #x4E11)	; 丑
-    (->subsumptive
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E11)	; 丑
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (shinjigen-1	. 16)
+    (shinjigen-2	. 16)
+    (=jis-x0208		. #x312F)	; &GT-00033; [17-15]
+    (=ks-x1001		. #x7564)	; &I-K0-7564; [85-68]
+    (=cns11643-1	. #x4460)	; &I-C1-4460; [36-64]
+    (=big5		. #xA4A1)	; &I-B-A4A1;
+    (=gt		. 00033)	; &I-GT-00033;
+    (=gt-k		. 00398)	; &I-GT-K00398;
+    (=gt-pj-1		. #x312F)	; &I-GT-00033; [17-15]
+    (=daikanwa		. 00023)	; &I-M-00023;
+    (=ucs@jis		. #x4E11)	; &GT-00033;
+    (=ucs@big5		. #x4E11)	; &GT-00033;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E11)	; 丑
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (shinjigen-1	. 17)
+    (=gb2312		. #x3373)	; &GT-00035; [19-83]
+    (=big5-cdp		. #x89D2)	; &I-CDP-89D2;
+    (=gt		. 00035)	; &I-GT-00035;
+    (=gt-pj-9		. #x4B23)	; &I-GT-00035; [43-03]
+    (=ucs@unicode	. #x4E11)	; &GT-00035;
+    (<-simplified@CN
+     ((=gb12345		  . #x3373)	; &UU+919C; [19-83]
+      ))
+    (<-vulgar
      ((shinjigen-1	  . 16)
-      (shinjigen-2	  . 16)
       (=jis-x0208	  . #x312F)	; &GT-00033; [17-15]
       (=ks-x1001	  . #x7564)	; &I-K0-7564; [85-68]
       (=cns11643-1	  . #x4460)	; &I-C1-4460; [36-64]
-      (=big5		  . #xA4A1)	; &I-B-A4A1;
-      (=gt		  . 00033)	; &I-GT-00033;
-      (=gt-k		  . 00398)	; &I-GT-K00398;
-      (=gt-pj-1		  . #x312F)	; &I-GT-00033; [17-15]
       (=daikanwa	  . 00023)	; &I-M-00023;
-      (=ucs@jis		  . #x4E11)	; &GT-00033;
-      (=ucs@big5	  . #x4E11)	; &GT-00033;
-      (mojikyo		  . 000023)	; &MCS-60000017;
-      )
-     ((<-simplified@CN
-       ((=gb12345	    . #x3373)	; &UU+919C; [19-83]
-	))
-      (<-vulgar
-       ((shinjigen-1	    . 16)
-	(=jis-x0208	    . #x312F)	; &GT-00033; [17-15]
-	(=ks-x1001	    . #x7564)	; &I-K0-7564; [85-68]
-	(=cns11643-1	    . #x4460)	; &I-C1-4460; [36-64]
-	(=daikanwa	    . 00023)	; &I-M-00023;
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (shinjigen-1	  . 17)
-      (=gb2312		  . #x3373)	; &GT-00035; [19-83]
-      (=gt		  . 00035)	; &I-GT-00035;
-      (=gt-pj-9		  . #x4B23)	; &I-GT-00035; [43-03]
-      (=ucs@unicode	  . #x4E11)	; &GT-00035;
       ))
+    (<-vulgar*sources
+     shinjigen-1)
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -699,25 +717,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (=ucs		. #x2000B)	; 𠀋
     (<-vulgar
      ((=ucs		  . #x4E08)	; 丈
       ))
-    (=ucs		. #x2000B)	; 𠀋
     (->subsumptive
-     ((<-vulgar
-       ((=jis-x0208-1978    . #x3E66)	; &GT-00018; [30-70]
-	(=jis-x0208-1983    . #x3E66)	; &I-J83-3E66; [30-70]
-	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
-	(=daikanwa	    . 00011)	; &I-M-00011;
-	))
-      (<-vulgar*sources
-       daikanwa)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
 	)
-       ((=jis-x0208-1978    . #x3E66)	; &GT-00018; [30-70]
-	(=jis-x0208-1983    . #x3E66)	; &I-J83-3E66; [30-70]
+       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
+	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
 	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
 	(=daikanwa	    . 00011)	; &I-M-00011;
 	)
@@ -728,18 +738,18 @@
       (=gt-pj-2		  . #x3030)	; &I-GT-00031; [16-16]
       (=daikanwa	  . 00026)	; &I-M-00026;
       (=ucs@jis		  . #x2000B)	; &GT-00031;
+      (<-vulgar
+       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
+	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
+	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
+	(=daikanwa	    . 00011)	; &I-M-00011;
+	))
+      (<-vulgar*sources
+       daikanwa)
       )
      ((mojikyo		  . 000026)	; &MCS-6000001A;
       )
-     ((<-vulgar
-       ((shinjigen-1	    . 9)
-	(=gb2312	    . #x5549)	; &GT-00020; [53-41]
-	(=jis-x0208-1990    . #x3E66)	; &I-J90-3E66; [30-70]
-	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
-	))
-      (<-vulgar*sources
-       shinjigen-1)
-      (hanyu-dazidian	  1 12 5)
+     ((hanyu-dazidian	  1 12 5)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
@@ -754,6 +764,14 @@
       (=gt-pj-9		  . #x4B24)	; &I-GT-00032; [43-04]
       (=hanziku-1	  . #xA6AC)	; &I-HZK01-A6AC;
       (=ucs@iso		  . #x2000B)	; &GT-00032;
+      (<-vulgar
+       ((shinjigen-1	    . 9)
+	(=gb2312	    . #x5549)	; &GT-00020; [53-41]
+	(=jis-x0208@1990    . #x3E66)	; &I-J90-3E66; [30-70]
+	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
+	))
+      (<-vulgar*sources
+       shinjigen-1)
       ))
     ))
 (define-char
@@ -800,6 +818,12 @@
     (ideographic-radical@daikanwa . 1)	; ⼀
     (ideographic-strokes@daikanwa . 3)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 241 5)
+    (shinjigen-1	. 492)
+    (=ucs		. #x20503)	; 𠔃
+    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
+    (=daikanwa		. 48904)	; &I-M-48904;
+    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     (<-vulgar
      ((shinjigen-1	  . 491)
       (=jis-x0208	  . #x5142)	; &GT-01891; [49-34]
@@ -808,25 +832,19 @@
       ))
     (<-vulgar*sources
      daikanwa shinjigen-1)
-    (hanyu-dazidian	1 241 5)
-    (shinjigen-1	. 492)
-    (=ucs		. #x20503)	; 𠔃
-    (=cns11643-6	. #x2141)	; &I-C6-2141; [01-33]
-    (=daikanwa		. 48904)	; &I-M-48904;
-    (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (<-simplified@CN
-     ((=gb12345		  . #x5728)	; &GT-09367; [55-08]
-      ))
     (hanyu-dazidian	1 10 5)
     (=ucs		. #x4E13)	; 专
     (=gb2312		. #x5728)	; &I-G0-5728; [55-08]
     (=big5-cdp		. #x89F9)	; &I-CDP-89F9;
     (=jef-china3	. #x81D9)	; &I-JC3-81D9;
+    (<-simplified@CN
+     ((=gb12345		  . #x5728)	; &GT-09367; [55-08]
+      ))
     ))
 (define-char
   '((=>ucs		. #x5187)	; 冇
@@ -867,6 +885,23 @@
     (=big5-cdp		. #x87F1)	; &I-CDP-87F1;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x25605)	; 𥘅
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (hanyu-dazidian	1 11 2)
+    (=big5-cdp		. #x88C7)	; &CDP-88C7;
+    (<-formed@component/connect-right
+     ((=cns11643-6	  . #x2227)	; &GT-31487; [02-07]
+      (=daikanwa	  . 24624)	; &I-M-24624;
+      )
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
+      ))
+    ))
+(define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
@@ -877,8 +912,45 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian	1 11 2)
-    (=big5-cdp		. #x88C7)	; &CDP-88C7;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+	(=ucs		    . #x2FF5)	; ⿵
+	)
+       ((=ucs		    . #x5182)	; 冂
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      ))
+    (=gt-k		. 00615)	; &GT-K00615;
+    (=gt-pj-k1		. #x3E25)	; &GT-K00615; [30-05]
+    ))
+(define-char
+  '((ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+	(=ucs		    . #x2FF5)	; ⿵
+	)
+       ((=ucs		    . #x5182)	; 冂
+	)
+       ((=ucs		    . #x4E36)	; 丶
+	))
+      ))
+    (=gt-k		. 00616)	; &GT-K00616;
+    (=gt-pj-k1		. #x3E29)	; &GT-K00616; [30-09]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1115,26 +1187,25 @@
     (mojikyo		. 000037)	; &MCS-60000025;
     ))
 (define-char
-  '((=>ucs		. #x200E0)	; 𠃠
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
-    (=gt		. 00049)	; &GT-00049;
-    (=gt-pj-2		. #x3038)	; &GT-00049; [16-24]
-    (=daikanwa		. 00038)	; &I-M-00038;
-    (mojikyo		. 000038)	; &MCS-60000026;
-    ))
-(define-char
-  '((morohashi-daikanwa	38 0 0)
-    (ideographic-	(:radical	1 ; ⼀
-			 :strokes	4)
-			(:radical	5 ; ⼄
-			 :strokes	4))
-    (total-strokes	 . 5)
-    (hanyu-dazidian	1 52 9)
+  '((total-strokes	 . 5)
     (=ucs		. #x200E0)	; 𠃠
-    (=cns11643-6	. #x222A)	; &I-C6-222A; [02-10]
-    (=big5-cdp		. #x87CF)	; &I-CDP-87CF;
+    (->subsumptive
+     ((ideographic-radical . 1)	; ⼀
+      (ideographic-strokes . 4)
+      (=gt		  . 00049)	; &GT-00049;
+      (=gt-pj-2		  . #x3038)	; &GT-00049; [16-24]
+      (=daikanwa	  . 00038)	; &I-M-00038;
+      (mojikyo		  . 000038)	; &MCS-60000026;
+      )
+     ((ideographic-radical@ucs . 5)	; ⼄
+      (ideographic-strokes@ucs . 4)
+      (ideographic-radical@cns . 1)	; ⼀
+      (ideographic-strokes@cns . 4)
+      (hanyu-dazidian	  1 52 9)
+      (=cns11643-6	  . #x222A)	; &CDP-87CF; [02-10]
+      (=big5-cdp	  . #x87CF)	; &I-CDP-87CF;
+      (=ucs@iso		  . #x200E0)	; &CDP-87CF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1160,21 +1231,18 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x5235)	; &GT-19258; [50-21]
-      ))
     (hanyu-dazidian	1 15 4)
     (=ucs		. #x4E1A)	; 业
     (=gb2312		. #x5235)	; &I-G0-5235; [50-21]
     (=big5-cdp		. #x8B60)	; &I-CDP-8B60;
+    (<-simplified@CN
+     ((=gb12345		  . #x5235)	; &GT-19258; [50-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x3454)	; &UU+53E2; [20-52]
-      ))
     (hanyu-dazidian	1 17 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1187,17 +1255,20 @@
     (=ucs		. #x4E1B)	; 丛
     (=gb2312		. #x3454)	; &I-G0-3454; [20-52]
     (=hanziku-1		. #xA7AD)	; &I-HZK01-A7AD;
+    (<-simplified@CN
+     ((=gb12345		  . #x3454)	; &UU+53E2; [20-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (=ucs		. #x4E1C)	; 东
+    (=gb2312		. #x362B)	; &I-G0-362B; [22-11]
     (<-simplified@CN
      ((=ucs		  . #x6771)	; 東
       (=gb12345		  . #x362B)	; 東 [22-11]
       ))
-    (=ucs		. #x4E1C)	; 东
-    (=gb2312		. #x362B)	; &I-G0-362B; [22-11]
     ))
 (define-char
   '((=>ucs		. #x4E1C)	; 东
@@ -1211,9 +1282,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (<-simplified@CN
-     ((=gb12345		  . #x4B3F)	; &UU+7D72; [43-31]
-      ))
     (hanyu-dazidian	1 17 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1233,6 +1301,9 @@
     (=ucs		. #x4E1D)	; 丝
     (=gb2312		. #x4B3F)	; &I-G0-4B3F; [43-31]
     (=hanziku-1		. #xA7B2)	; &I-HZK01-A7B2;
+    (<-simplified@CN
+     ((=gb12345		  . #x4B3F)	; &UU+7D72; [43-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1420,77 +1491,77 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 19 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x20AD4)	; 𠫔
-      )
-     ((=big5-cdp	  . #x8665)	; &CDP-8665;
-      ))
     (=ucs		. #x2001A)	; 𠀚
-    (=gt		. 00064)	; &I-GT-00064;
-    (=gt-pj-2		. #x303E)	; &I-GT-00064; [16-30]
-    (=daikanwa		. 00044)	; &I-M-00044;
-    (=hanziku-1		. #xA7F3)	; &I-HZK01-A7F3;
-    (mojikyo		. 000044)	; &MCS-6000002C;
-    ))
-(define-char
-  '((=>ucs		. #x2001A)	; 𠀚
-    (morohashi-daikanwa	44 0 9)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=cns11643-6	. #x233F)	; &C6-233F; [03-31]
-    ))
-(define-char
-  '((ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (hanyu-dazidian	1 17 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x5317)	; 北
+    (->subsumptive
+     ((hanyu-dazidian	  1 19 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x20AD4)	; 𠫔
+	)
+       ((=big5-cdp	    . #x8665)	; &CDP-8665;
+	))
+      (=gt		  . 00064)	; &GT-00064;
+      (=gt-pj-2		  . #x303E)	; &GT-00064; [16-30]
+      (=daikanwa	  . 00044)	; &I-M-00044;
+      (=hanziku-1	  . #xA7F3)	; &I-HZK01-A7F3;
+      (=ucs@iso		  . #x2001A)	; &GT-00064;
+      (mojikyo		  . 000044)	; &MCS-6000002C;
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x20AD4)	; 𠫔
+	)
+       ((=ucs		    . #x5C0F)	; 小
+	))
+      (=cns11643-6	  . #x233F)	; &C6-233F; [03-31]
       ))
-    (=ucs		. #x4E20)	; 丠
-    (=gt		. 00058)	; &I-GT-00058;
-    (=gt-k		. 02006)	; &I-GT-K02006;
-    (=gt-pj-2		. #x303F)	; &I-GT-00058; [16-31]
-    (=daikanwa		. 00045)	; &I-M-00045;
-    (=hanziku-1		. #xA7B5)	; &I-HZK01-A7B5;
-    (mojikyo		. 000045)	; &MCS-6000002D;
     ))
 (define-char
-  '((=>ucs		. #x4E20)	; 丠
-    (morohashi-daikanwa	45 0 0)
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x4621)	; &C1-4621; [38-01]
+    (=ucs		. #x4E20)	; 丠
+    (->subsumptive
+     ((hanyu-dazidian	  1 17 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x4B4C)	; &GT-03302; [43-44]
+	(=gb2312	    . #x3131)	; &I-G0-3131; [17-17]
+	(=ks-x1001	    . #x5D41)	; &I-K0-5D41; [61-33]
+	(=daikanwa	    . 02574)	; &I-M-02574;
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      (=gt		  . 00058)	; &GT-00058;
+      (=gt-k		  . 02006)	; &I-GT-K02006;
+      (=gt-pj-2		  . #x303F)	; &GT-00058; [16-31]
+      (=daikanwa	  . 00045)	; &I-M-00045;
+      (=hanziku-1	  . #xA7B5)	; &I-HZK01-A7B5;
+      (=ucs@unicode	  . #x4E20)	; &GT-00058;
+      (mojikyo		  . 000045)	; &MCS-6000002D;
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x4621)	; &C1-4621; [38-01]
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      (=cns11643-3	  . #x2262)	; &C3-2262; [02-66]
+      (=ucs@cns		  . #x4E20)	; &C3-2262;
       ))
-    (=cns11643-3	. #x2262)	; &C3-2262; [02-66]
-    (=ucs@cns		. #x4E20)	; &C3-2262;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x5140)	; &GT-01871; [49-32]
-      (=ks-x1001	  . #x5557)	; &I-K0-5557; [53-55]
-      (=daikanwa	  . 01436)	; &I-M-01436;
-      ))
     (hanyu-dazidian	1 19 1)
     (shinjigen-1	. 483)
     (shinjigen-2	. 483)
@@ -1503,6 +1574,11 @@
     (=gt-pj-1		. #x4E3E)	; &I-GT-00065; [46-30]
     (=daikanwa		. 00046)	; &I-M-00046;
     (mojikyo		. 000046)	; &MCS-6000002E;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5140)	; &GT-01871; [49-32]
+      (=ks-x1001	  . #x5557)	; &I-K0-5557; [53-55]
+      (=daikanwa	  . 01436)	; &I-M-01436;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 1)	; ⼀
@@ -1530,10 +1606,44 @@
     (mojikyo		. 000144)	; &MCS-60000090;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	5)
-			(:radical	55 ; ⼶
-			 :strokes	3))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@daikanwa . 37)	; ⼤
+    (ideographic-strokes@daikanwa . 3)
+    (total-strokes	 . 6)
+    (=ucs		. #x2001B)	; 𠀛
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=daikanwa	    . 05847)	; &M-05847;
+	))
+      (=daikanwa	  . 05861)	; &M-05861;
+      )
+     ((hanyu-dazidian	  1 17 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=big5-cdp	    . #x877C)	; &CDP-877C;
+	))
+      (=big5-cdp	  . #x87EE)	; &CDP-87EE;
+      (=hanziku-1	  . #xA7B3)	; &I-HZK01-A7B3;
+      (=ucs@iso		  . #x2001B)	; &CDP-87EE;
+      ))
+    ))
+(define-char
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@cns . 55)	; ⼶
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     cns11643 daikanwa)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 17 12)
     (ideographic-structure
@@ -1550,47 +1660,22 @@
     (=hanziku-1		. #xA7B6)	; &I-HZK01-A7B6;
     ))
 (define-char
-  '((=>ucs		. #x3402)	; 㐂
-    (morohashi-daikanwa	ho 1)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=gt		. 00057)	; &GT-00057;
-    (=gt-pj-11		. #x526E)	; &GT-00057; [50-78]
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 1 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=ucs		. #x3402)	; 㐂
-    (=jis-x0213-1-2000	. #x2E23)	; &I-JX1-2E23; [14-03]
-    (=gt		. 00056)	; &I-GT-00056;
-    (=gt-pj-9		. #x3B2A)	; &I-GT-00056; [27-10]
-    ))
-(define-char
-  '((=>ucs		. #x3402)	; 㐂
-    (morohashi-daikanwa	ho 1 1)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (mojikyo		. 050741)	; &MCS-6000C635;
-    ))
-(define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 17 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+    (=ucs		. #x3402)	; 㐂
+    (->subsumptive
+     ((morohashi-daikanwa	ho 1)
+      (=gt		  . 00057)	; &GT-00057;
+      (=gt-pj-11	  . #x526E)	; &GT-00057; [50-78]
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((=jis-x0213-1-2000  . #x2E23)	; &GT-00056; [14-03]
+      (=gt		  . 00056)	; &I-GT-00056;
+      (=gt-pj-9		  . #x3B2A)	; &I-GT-00056; [27-10]
+      (=ucs@unicode	  . #x3402)	; &GT-00056;
       )
-     ((=big5-cdp	  . #x877C)	; &CDP-877C;
+     ((mojikyo		  . 050741)	; &MCS-6000C635;
       ))
-    (=ucs		. #x2001B)	; 𠀛
-    (=hanziku-1		. #xA7B3)	; &I-HZK01-A7B3;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1694,51 +1779,45 @@
     (=gt-pj-11		. #x4B6C)	; &GT-00060; [43-76]
     ))
 (define-char
-  '((=>ucs		. #x20022)	; 𠀢
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 6)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 19 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((=ucs		  . #x6B64)	; æ­¤
-      ))
-    (=gt		. 00070)	; &GT-00070;
-    (=gt-pj-2		. #x3040)	; &GT-00070; [16-32]
-    (=daikanwa		. 00047)	; &I-M-00047;
-    (=hanziku-1		. #xA7F6)	; &I-HZK01-A7F6;
-    (mojikyo		. 000047)	; &MCS-6000002F;
-    ))
-(define-char
-  '((morohashi-daikanwa	47 0 1)
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
+    (=ucs		. #x20022)	; 𠀢
+    (->subsumptive
+     ((hanyu-dazidian	  1 19 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
+	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
+	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=daikanwa	    . 16259)	; &I-M-16259;
+	))
+      (=gt		  . 00070)	; &GT-00070;
+      (=gt-pj-2		  . #x3040)	; &GT-00070; [16-32]
+      (=daikanwa	  . 00047)	; &I-M-00047;
+      (=hanziku-1	  . #xA7F6)	; &I-HZK01-A7F6;
+      (mojikyo		  . 000047)	; &MCS-6000002F;
       )
-     ((=cns11643-1	  . #x483A)	; &C1-483A; [40-26]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=cns11643-1	    . #x483A)	; &C1-483A; [40-26]
+	))
+      (=cns11643-5	  . #x232F)	; &C5-232F; [03-15]
+      (=ucs@iso		  . #x20022)	; &C5-232F;
       ))
-    (=ucs		. #x20022)	; 𠀢
-    (=cns11643-5	. #x232F)	; &I-C5-232F; [03-15]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-ancient-ideograph
-     (:sources	(morohashi-daikanwa)
-      :char	((=daikanwa	     . 39763)	; &I-M-39763;
-		 )
-      ))
-    (comment		. "M-11708 is different character.")
     (hanyu-dazidian	1 21 6)
     (=ucs		. #x4E23)	; 丣
     (=jis-x0212		. #x3027)	; &I-JSP-3027; [16-07]
@@ -1748,6 +1827,17 @@
     (=gt-pj-2		. #x3041)	; &I-GT-00076; [16-33]
     (=daikanwa		. 00048)	; &I-M-00048;
     (mojikyo		. 000048)	; &MCS-60000030;
+    (<-ancient
+     ((=daikanwa	  . 39763)	; &M-39763;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (->mistakable
+     ((=ucs		  . #x623C)	; 戼
+      (=daikanwa	  . 11708)	; &I-M-11708;
+      ))
+    (->mistakable*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1794,9 +1884,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified@CN
-     ((=gb12345		  . #x413D)	; &C1-4C25; [33-29]
-      ))
     (hanyu-dazidian	1 21 2)
     (=ucs		. #x4E24)	; 两
     (=gb2312		. #x413D)	; &I-G0-413D; [33-29]
@@ -1808,6 +1895,9 @@
     (=daikanwa		. 00051)	; &I-M-00051;
     (=jef-china3	. #x41A3)	; &I-JC3-41A3;
     (mojikyo		. 000051)	; &MCS-60000033;
+    (<-simplified@CN
+     ((=gb12345		  . #x413D)	; &C1-4C25; [33-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1821,29 +1911,35 @@
     (mojikyo		. 000052)	; &MCS-60000034;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	6)
-			(:radical	6 ; ⼅
-			 :strokes	6))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 6)
+    (ideographic-radical@cns . 6)	; ⼅
+    (ideographic-strokes@cns . 6)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 553 5)
     (=ucs		. #x20029)	; 𠀩
-    (=cns11643-6	. #x2563)	; &I-C6-2563; [05-67]
-    (=daikanwa		. 00239)	; &I-M-00239;
-    (=hanziku-2		. #xC1C0)	; &I-HZK02-C1C0;
-    (mojikyo		. 000239)	; &MCS-600000EF;
+    (->subsumptive
+     ((=cns11643-6	  . #x2563)	; &M-00239; [05-67]
+      (=daikanwa	  . 00239)	; &I-M-00239;
+      (=ucs@iso		  . #x20029)	; &M-00239;
+      )
+     ((hanyu-dazidian	  1 553 5)
+      (=hanziku-2	  . #xC1C0)	; &HZK02-C1C0;
+      (mojikyo		  . 000239)	; &MCS-600000EF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (<-simplified@CN
-     ((=gb12345		  . #x514F)	; &UU+56B4; [49-47]
-      ))
     (hanyu-dazidian	1 19 10)
     (=ucs		. #x4E25)	; 严
     (=gb2312		. #x514F)	; &I-G0-514F; [49-47]
     (=big5-cdp		. #x8A6C)	; &I-CDP-8A6C;
+    (<-simplified@CN
+     ((=gb12345		  . #x514F)	; &UU+56B4; [49-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1906,32 +2002,29 @@
     (=gt-pj-9		. #x3B41)	; &GT-00074; [27-33]
     ))
 (define-char
-  '((=>ucs		. #x4E26)	; 並
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes	 . 8)
-    (shinjigen-1	. 5733)
-    (=daikanwa		. 00053)	; &M-00053;
-    (mojikyo		. 000053)	; &MCS-60000035;
-    ))
-(define-char
-  '((morohashi-daikanwa	53 0 0)
+  '((=>ucs*		. #x4E26)	; 並
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 8)
-    (total-strokes	 . 9)
-    (=gt		. 00089)	; &GT-00089;
-    (=gt-k		. 06059)	; &I-GT-K06059;
-    (=gt-pj-2		. #x3046)	; &GT-00089; [16-38]
+    (ideographic-strokes@daikanwa . 7)
+    (total-strokes@daikanwa	  . 8)
+    (ideographic-strokes@gt . 8)
+    (total-strokes@gt	    . 9)
+    (=ucs		. #xFA70)	; ï©°
+    (->subsumptive
+     ((shinjigen-1	  . 5733)
+      (=gt		  . 00089)	; &GT-00089;
+      (=gt-k		  . 06059)	; &I-GT-K06059;
+      (=gt-pj-2		  . #x3046)	; &GT-00089; [16-38]
+      (=daikanwa	  . 00053)	; &I-M-00053;
+      (=ucs@JP		  . #xFA70)	; &GT-00089;
+      (mojikyo		  . 000053)	; &MCS-60000035;
+      )
+     ((=ucs@unicode	  . #xFA70)	; &UU+FA70;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (<-simplified@JP/Jouyou
-     ((=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
-      (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
-      (=daikanwa	  . 25752)	; &I-M-25752;
-      ))
     (hanyu-dazidian	1 246 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1955,6 +2048,11 @@
     (=gt-pj-1		. #x4A42)	; &I-GT-00084; [42-34]
     (=daikanwa		. 00054)	; &I-M-00054;
     (mojikyo		. 000054)	; &MCS-60000036;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
+      (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
+      (=daikanwa	  . 25752)	; &I-M-25752;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2160B)	; 𡘋
@@ -2049,62 +2147,76 @@
     (mojikyo		. 000058)	; &MCS-6000003A;
     ))
 (define-char
-  '((=>ucs		. #x4E3D)	; 丽
+  '((ideographic-radical@ucs . 3)	; ⼂
+    (ideographic-radical@ucs*sources
+     daikanwa gt ucs)
+    (ideographic-radical@cns . 1)	; ⼀
+    (=ucs		. #x4E3D)	; 丽
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E3D)	; 丽
+      ))
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (->same
-     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
-      (=daikanwa	  . 00104)	; &I-M-00104;
-      ))
-    (<-ancient-ideograph
-     ((=daikanwa	  . 47663)	; &I-M-47663;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
       ))
-    (<-ancient-ideograph*sources
-     daikanwa)
     (=cns11643-6	. #x2936)	; &GT-00087; [09-22]
     (=gt		. 00087)	; &I-GT-00087;
     (=gt-pj-2		. #x304B)	; &I-GT-00087; [16-43]
     (=daikanwa		. 00059)	; &I-M-00059;
     (mojikyo		. 000059)	; &MCS-6000003B;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (<-same
+     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
+      (=daikanwa	  . 00104)	; &I-M-00104;
+      ))
     ))
 (define-char
-  '((total-strokes	 . 8)
+  '((ideographic-radical@cns . 55)	; ⼶
+    (ideographic-strokes@cns . 5)
+    (ideographic-radical@cns*sources
+     daikanwa=09608 cns11643)
+    (ideographic-radical@gt . 1)	; ⼀
+    (ideographic-strokes@gt . 7)
+    (ideographic-radical@gt*sources
+     daikanwa=00060 gt)
+    (total-strokes	 . 8)
     (=ucs		. #x2233D)	; 𢌽
+    (=cns11643-5	. #x262E)	; &I-C5-262E; [06-14]
+    (=gt		. 00083)	; &I-GT-00083;
+    (=gt-pj-2		. #x304C)	; &I-GT-00083; [16-44]
+    (=jef-china3	. #x8EF3)	; &I-JC3-8EF3;
     (->subsumptive
      ((ideographic-radical . 1)	; ⼀
       (ideographic-strokes . 7)
-      (=gt		  . 00083)	; &GT-00083;
-      (=gt-pj-2		  . #x304C)	; &GT-00083; [16-44]
-      (=daikanwa	  . 00060)	; &I-M-00060;
-      (=jef-china3	  . #x8EF3)	; &I-JC3-8EF3;
+      (=daikanwa	  . 00060)	; &M-00060;
       (mojikyo		  . 000060)	; &MCS-6000003C;
       )
      ((ideographic-radical . 55)	; ⼶
       (ideographic-strokes . 5)
-      (=cns11643-5	  . #x262E)	; &M-09608; [06-14]
-      (=daikanwa	  . 09608)	; &I-M-09608;
-      (=ucs@iso		  . #x2233D)	; &M-09608;
+      (=daikanwa	  . 09608)	; &M-09608;
       ))
     ))
 (define-char
-  '((ideographic-radical@daikanwa . 3)	; ⼂
-    (ideographic-strokes@daikanwa . 7)
-    (total-strokes@daikanwa	  . 8)
-    (ideographic-radical@daikanwa*sources
-     daikanwa gt)
-    (ideographic-radical@cns . 1)	; ⼀
-    (ideographic-strokes@cns . 7)
-    (total-strokes@cns	     . 8)
-    (ideographic-radical@cns*sources
-     cns11643)
-    (ideographic-radical@unicode . 3)
-    (ideographic-strokes@unicode . 6)
-    (total-strokes@unicode . 7)
-    (=ucs		. #x4E3D)	; 丽
-    ))
-(define-char
-  '((ideographic-radical@daikanwa . 3)	; ⼂
+  '((<-denotational
+     ((=ucs		  . #x4E3D)	; 丽
+      ))
+    (ideographic-radical@daikanwa . 3)	; ⼂
     (ideographic-strokes@daikanwa . 7)
     (ideographic-radical@daikanwa*sources
      daikanwa gt)
@@ -2113,54 +2225,14 @@
     (ideographic-radical@cns*sources
      cns11643)
     (total-strokes	 . 8)
-    (->same
-     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
-      (=daikanwa	  . 00059)	; &I-M-00059;
-      ))
-    (<-ancient-ideograph
-     ((=daikanwa	  . 47663)	; &I-M-47663;
-      ))
-    (<-ancient-ideograph*sources
-     daikanwa)
-    (<-denotational
-     ((=ucs		  . #x4E3D)	; 丽
-      ))
     (hanyu-dazidian	1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
-	))
+     ((=gt-k		  . 00616)	; &GT-K00616;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
-	))
+     ((=gt-k		  . 00616)	; &GT-K00616;
       ))
     (=cns11643-3	. #x2740)	; &GT-00145; [07-32]
     (=big5-cdp		. #x8CB7)	; &I-CDP-8CB7;
@@ -2169,52 +2241,58 @@
     (=daikanwa		. 00104)	; &I-M-00104;
     (=ucs@cns		. #x4E3D)	; &GT-00145;
     (mojikyo		. 000104)	; &MCS-60000068;
-    ))
-(define-char
-  '((=>ucs		. #x20030)	; 𠀰
-    (morohashi-daikanwa	ho 2)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes	 . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E0D)	; 不
-      )
-     ((=jis-x0208	  . #x3E2F)	; &GT-09425; [30-15]
-      (=ks-x1001	  . #x6134)	; &I-K0-6134; [65-20]
-      (=daikanwa	  . 07475)	; &I-M-07475;
+    (<-ancient
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (<-same
+     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
+      (=daikanwa	  . 00059)	; &I-M-00059;
       ))
-    (=gt		. 00081)	; &GT-00081;
-    (=gt-pj-11		. #x4349)	; &GT-00081; [35-41]
-    (mojikyo		. 085219)	; &MCS-60014CE3;
     ))
 (define-char
-  '((morohashi-daikanwa	ho 2 0)
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 24 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E0D)	; 不
+    (=ucs		. #x20030)	; 𠀰
+    (->subsumptive
+     ((morohashi-daikanwa	ho 2)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E0D)	; 不
+	)
+       ((=jis-x0208	    . #x3E2F)	; &GT-09425; [30-15]
+	(=ks-x1001	    . #x6134)	; &I-K0-6134; [65-20]
+	(=daikanwa	    . 07475)	; &I-M-07475;
+	))
+      (=gt		  . 00081)	; &GT-00081;
+      (=gt-pj-11	  . #x4349)	; &GT-00081; [35-41]
+      (mojikyo		  . 085219)	; &MCS-60014CE3;
       )
-     ((=ucs		  . #x5C11)	; 少
+     ((hanyu-dazidian	  1 24 6)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E0D)	; 不
+	)
+       ((=gb2312	    . #x4959)	; &C1-4537; [41-57]
+	(=cns11643-1	    . #x4537)	; &I-C1-4537; [37-23]
+	))
+      (=hanziku-1	  . #xA8F3)	; &HZK01-A8F3;
+      (=ucs@iso		  . #x20030)	; &HZK01-A8F3;
       ))
-    (=ucs		. #x20030)	; 𠀰
-    (=hanziku-1		. #xA8F3)	; &I-HZK01-A8F3;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (<-simplified@CN
-     ((=ucs		  . #x55AA)	; 喪
-      (=gb12345		  . #x4925)	; 喪 [41-05]
-      ))
     (hanyu-dazidian	1 22 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2227,6 +2305,10 @@
     (=ucs		. #x4E27)	; 丧
     (=gb2312		. #x4925)	; &I-G0-4925; [41-05]
     (=hanziku-1		. #xA8AE)	; &I-HZK01-A8AE;
+    (<-simplified@CN
+     ((=ucs		  . #x55AA)	; 喪
+      (=gb12345		  . #x4925)	; 喪 [41-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2364,9 +2446,7 @@
 	  )
 	 ((=ucs		      . #x5182)	; 冂
 	  )
-	 ((=jis-x0208	      . #x5469)	; &GT-07201; [52-73]
-	  (=cns11643-3	      . #x2139)	; &I-C3-2139; [01-25]
-	  (=daikanwa	      . 05691)	; &I-M-05691;
+	 ((=ucs		      . #x5902)	; 夂
 	  ))
 	)
        ((=ucs		    . #x4E5E)	; 乞
@@ -2518,14 +2598,26 @@
     (=gt-pj-11		. #x487D)	; &GT-00093; [40-93]
     ))
 (define-char
-  '((ideographic-	(:radical	30 ; ⼝
-			 :strokes	9)
-			(:radical	1 ; ⼀
-			 :strokes	11))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
     (total-strokes	 . 12)
-    (->same
-     ((=cns11643-6	  . #x472D)	; &C6-472D; [39-13]
+    (=ucs		. #x20048)	; 𠁈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20048)	; 𠁈
       ))
+    (ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 12)
     (hanyu-dazidian	1 26 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2550,9 +2642,9 @@
 	  ))
 	))
       ))
-    (=ucs		. #x20048)	; 𠁈
-    (=daikanwa		. 04020)	; &I-M-04020;
+    (=daikanwa		. 04020)	; &M-04020;
     (=hanziku-1		. #xA979)	; &I-HZK01-A979;
+    (=ucs@iso		. #x20048)	; &M-04020;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀