X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R001-One.el;h=f7c1be7e617da0aed82b2948fc3a840eabeb5042;hp=6a77fe333907a0396a14dfb85fa20d8cb5f4a5a1;hb=02cc46ca419f143263039b722f802717cfd45c84;hpb=1f2a75d2dc62546c22e0b1884d75a51af3b1d252

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 6a77fe3..f7c1be7 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -7,8 +7,6 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 1)
     (hanyu-dazidian	1 1 1)
-    (shinjigen-1	. 1)
-    (shinjigen-2	. 1)
     (sound@ja/kun	"hito-tu" "hito")
     (sound@ja/kun/name	"hazime" "kazu")
     (sound@ja/on/go	"iti")
@@ -18,11 +16,13 @@
     (=gb2312		. #x523B)	; &I-G0-523B; [50-27]
     (=ks-x1001		. #x6C69)	; &I-K0-6C69; [76-73]
     (=cns11643-1	. #x4421)	; &I-C1-4421; [36-01]
+    (=jis-x0213-1	. #x306C)	; &I-JX1-306C; [16-76]
     (=big5		. #xA440)	; &I-B-A440;
     (=gt		. 00001)	; &I-GT-00001;
     (=gt-k		. 00001)	; &I-GT-K00001;
     (=gt-pj-1		. #x306C)	; &I-GT-00001; [16-76]
     (=daikanwa		. 00001)	; &I-M-00001;
+    (=shinjigen		.  0001)	; 一
     ))
 (define-char
   '((=>ucs		. #x4E00)	; 一
@@ -38,8 +38,6 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
     (hanyu-dazidian	1 2 5)
-    (shinjigen-1	. 4)
-    (shinjigen-2	. 4)
     (sound@ja/kun	"hinoto")
     (sound@ja/on/go	"tyAu")
     (sound@ja/on/kan	"tei")
@@ -48,84 +46,76 @@
     (=gb2312		. #x3621)	; &I-G0-3621; [22-01]
     (=ks-x1001		. #x6F4B)	; &I-K0-6F4B; [79-43]
     (=cns11643-1	. #x4423)	; &I-C1-4423; [36-03]
+    (=jis-x0213-1	. #x437A)	; &I-JX1-437A; [35-90]
     (=big5		. #xA442)	; &I-B-A442;
     (=gt		. 00007)	; &I-GT-00007;
     (=gt-k		. 00051)	; &I-GT-K00051;
     (=gt-pj-1		. #x437A)	; &I-GT-00007; [35-90]
     (=daikanwa		. 00002)	; &I-M-00002;
+    (=shinjigen		.  0004)	; 丁
     ))
 (define-char
   '((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]
     (=cns11643-4	. #x2126)	; &I-C4-2126; [01-06]
-    (=jis-x0213-2-2000	. #x2122)	; &I-JX2-2122; [01-02]
+    (=jis-x0213-2	. #x2122)	; &I-JX2-2122; [01-02]
     (=big5-cdp		. #x8BCD)	; &I-CDP-8BCD;
     (=gt		. 00003)	; &I-GT-00003;
     (=gt-pj-2		. #x3021)	; &I-GT-00003; [16-01]
     (=daikanwa		. 00003)	; &I-M-00003;
     (=jef-china3	. #x41A1)	; &I-JC3-41A1;
+    (=adobe-japan1-5	. 17234)	; 丂
+    (->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;
-    ))
-(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;
+      ))
     ))
 (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;
-    ))
-(define-char
-  '((morohashi-daikanwa	5 0 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 3)
-    (total-strokes	 . 4)
-    (=gt		. 00038)	; &GT-00038;
-    (=gt-pj-2		. #x3023)	; &GT-00038; [16-03]
     ))
 (define-char
   '((decimal-digit-value . 7)
@@ -139,17 +129,17 @@
     (sound@ja/on/go	"siti")
     (=ucs		. #x4E03)	; 七
     (->subsumptive
-     ((shinjigen-1	  . 3)
-      (shinjigen-2	  . 3)
-      (=jis-x0208	  . #x3C37)	; &GT-00004; [28-23]
+     ((=jis-x0208	  . #x3C37)	; &GT-00004; [28-23]
       (=gb2312		  . #x465F)	; &I-G0-465F; [38-63]
       (=ks-x1001	  . #x7652)	; &I-K0-7652; [86-50]
+      (=jis-x0213-1	  . #x3C37)	; &I-JX1-3C37; [28-23]
       (=big5		  . #xA443)	; &I-B-A443;
       (=big5-cdp	  . #x88ED)	; &I-CDP-88ED;
       (=gt		  . 00004)	; &I-GT-00004;
       (=gt-k		  . 00046)	; &I-GT-K00046;
       (=gt-pj-1		  . #x3C37)	; &I-GT-00004; [28-23]
       (=daikanwa	  . 00006)	; &I-M-00006;
+      (=shinjigen	  .  0003)	; &GT-00004;
       (=ucs@unicode	  . #x4E03)	; &GT-00004;
       )
      ((=cns11643-1	  . #x4424)	; &C1-4424; [36-04]
@@ -190,13 +180,13 @@
     (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;
+    (->Bopomofo
+     ((name		  . "BOPOMOFO LETTER C")
+      (=ucs		  . #x3118)	; ㄘ
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -237,7 +227,7 @@
     (ideographic-strokes@misc . 0)
     (total-strokes	 . 2)
     (=ucs		. #x20089)	; 𠂉
-    (=jis-x0213-2-2000	. #x2121)	; &I-JX2-2121; [01-01]
+    (=jis-x0213-2	. #x2121)	; &I-JX2-2121; [01-01]
     (=big5-cdp		. #x8B4A)	; &I-CDP-8B4A;
     (=gt		. 00008)	; &I-GT-00008;
     (=gt-pj-9		. #x4D4A)	; &I-GT-00008; [45-42]
@@ -255,16 +245,7 @@
     (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)
     (sound@ja/kun	"yorozu")
     (sound@ja/kun/name	"ma")
     (sound@ja/on/go	"man")
@@ -274,11 +255,27 @@
     (=gb2312		. #x4D72)	; &I-G0-4D72; [45-82]
     (=ks-x1001		. #x5832)	; &I-K0-5832; [56-18]
     (=cns11643-2	. #x2126)	; &I-C2-2126; [01-06]
+    (=jis-x0213-1	. #x4B7C)	; &I-JX1-4B7C; [43-92]
     (=big5		. #xC945)	; &I-B-C945;
     (=gt		. 00021)	; &I-GT-00021;
     (=gt-k		. 00204)	; &I-GT-K00204;
     (=gt-pj-1		. #x4B7C)	; &I-GT-00021; [43-92]
     (=daikanwa		. 00010)	; &I-M-00010;
+    (=shinjigen		.  0012)	; 万
+    (<-simplified@CN
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      (=jis-x0213-1	  . #x685F)	; &I-JX1-685F; [72-63]
+      (=gb12345		  . #x4D72)	; &GT-41264; [45-82]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x685F)	; &GT-41264; [72-63]
+      (=ks-x1001	  . #x583F)	; &I-K0-583F; [56-31]
+      (=jis-x0213-1	  . #x685F)	; &I-JX1-685F; [72-63]
+      ))
+    (<-simplified@ucs
+     ((=ucs		  . #x842C)	; 萬
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -291,25 +288,24 @@
     (=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@1978	  . #x3E66)	; &GT-00018; [30-70]
       (=jis-x0208@1983	  . #x3E66)	; &I-J83-3E66; [30-70]
       (=ks-x1001	  . #x6D5B)	; &I-K0-6D5B; [77-59]
       (=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;
+      (=shinjigen	  .  0010)	; &GT-00018;
       (=jef-china3	  . #x41A5)	; &I-JC3-41A5;
       )
      ((hanyu-dazidian	  1 9 2)
-      (shinjigen-1	  . 9)
-      (shinjigen-2	  . 9)
       (=gb2312		  . #x5549)	; &GT-00020; [53-41]
       (=jis-x0208@1990	  . #x3E66)	; &I-J90-3E66; [30-70]
       (=cns11643-1	  . #x4437)	; &I-C1-4437; [36-23]
+      (=jis-x0213-1	  . #x3E66)	; &I-JX1-3E66; [30-70]
       (=gt		  . 00020)	; &I-GT-00020;
       (=gt-pj-1		  . #x3E66)	; &I-GT-00020; [30-70]
+      (=shinjigen	  .  0009)	; &GT-00020;
       (=ucs@unicode	  . #x4E08)	; &GT-00020;
       ))
     ))
@@ -321,8 +317,6 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
     (hanyu-dazidian	1 4 3)
-    (shinjigen-1	. 6)
-    (shinjigen-2	. 6)
     (sound@ja/kun	"mi-ttu" "mi" "mitu")
     (sound@ja/name	"zou")
     (sound@ja/on	"san")
@@ -331,19 +325,19 @@
     (=gb2312		. #x487D)	; &I-G0-487D; [40-93]
     (=ks-x1001		. #x5F32)	; &I-K0-5F32; [63-18]
     (=cns11643-1	. #x4435)	; &I-C1-4435; [36-21]
+    (=jis-x0213-1	. #x3B30)	; &I-JX1-3B30; [27-16]
     (=big5		. #xA454)	; &I-B-A454;
     (=gt		. 00017)	; &I-GT-00017;
     (=gt-k		. 00177)	; &I-GT-K00177;
     (=gt-pj-1		. #x3B30)	; &I-GT-00017; [27-16]
     (=daikanwa		. 00012)	; &I-M-00012;
+    (=shinjigen		.  0006)	; 三
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
     (hanyu-dazidian	1 5 4)
-    (shinjigen-1	. 8)
-    (shinjigen-2	. 8)
     (sound@ja/kun	"ue" "uwa" "kami" "a-g+eru" "aga+r5" "nobo+r5")
     (sound@ja/on/go	"zyAu")
     (sound@ja/on/kan	"syAu")
@@ -352,19 +346,19 @@
     (=gb2312		. #x494F)	; &I-G0-494F; [41-47]
     (=ks-x1001		. #x5F3E)	; &I-K0-5F3E; [63-30]
     (=cns11643-1	. #x4438)	; &I-C1-4438; [36-24]
+    (=jis-x0213-1	. #x3E65)	; &I-JX1-3E65; [30-69]
     (=big5		. #xA457)	; &I-B-A457;
     (=gt		. 00019)	; &I-GT-00019;
     (=gt-k		. 00188)	; &I-GT-K00188;
     (=gt-pj-1		. #x3E65)	; &I-GT-00019; [30-69]
     (=daikanwa		. 00013)	; &I-M-00013;
+    (=shinjigen		.  0008)	; 上
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
     (hanyu-dazidian	1 7 1)
-    (shinjigen-1	. 5)
-    (shinjigen-2	. 5)
     (sound@ja/kun	"sita" "simo" "moto" "kuda+r5" "kuda+s5" "kundari"
 			"o-r+iru" "oro+s5" "sa-g+eru" "saga+r5")
     (sound@ja/on/go	"ge")
@@ -374,11 +368,13 @@
     (=gb2312		. #x4F42)	; &I-G0-4F42; [47-34]
     (=ks-x1001		. #x793B)	; &I-K0-793B; [89-27]
     (=cns11643-1	. #x4436)	; &I-C1-4436; [36-22]
+    (=jis-x0213-1	. #x323C)	; &I-JX1-323C; [18-28]
     (=big5		. #xA455)	; &I-B-A455;
     (=gt		. 00011)	; &I-GT-00011;
     (=gt-k		. 00159)	; &I-GT-K00159;
     (=gt-pj-1		. #x323C)	; &I-GT-00011; [18-28]
     (=daikanwa		. 00014)	; &I-M-00014;
+    (=shinjigen		.  0005)	; 下
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -393,6 +389,26 @@
     (=gt		. 00015)	; &I-GT-00015;
     (=gt-pj-2		. #x3028)	; &I-GT-00015; [16-08]
     (=daikanwa		. 00015)	; &I-M-00015;
+    (=adobe-japan1-5	. 19140)	; 丌
+    ))
+(define-char
+  '((=>daikanwa		. 00015)	; 丌
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 2)
+    (total-strokes	 . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=gt-k		  . 00059)	; &GT-K00059;
+      ))
+    (=gt-k		. 00264)	; &GT-K00264;
+    (=gt-pj-k1		. #x3764)	; &GT-K00264; [23-68]
+    (<-formed@component/connect-above
+     ((=ucs		  . #x4E0C)	; 丌
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -440,12 +456,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)	; ⼀
@@ -474,50 +490,54 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
     (hanyu-dazidian	1 11 6)
-    (shinjigen-1	. 18)
-    (shinjigen-2	. 18)
     (sound@ja/on/go	"hu")
     (=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]
+    (=jis-x0213-1	. #x4954)	; &I-JX1-4954; [41-52]
     (=big5		. #xA4A3)	; &I-B-A4A3;
     (=gt		. 00036)	; &I-GT-00036;
     (=gt-k		. 00480)	; &I-GT-K00480;
     (=gt-pj-1		. #x4954)	; &I-GT-00036; [41-52]
     (=daikanwa		. 00019)	; &I-M-00019;
+    (=shinjigen		.  0018)	; 不
+    (->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)	; ⿹
 	)
@@ -533,36 +553,35 @@
       (=daikanwa	  . 00020)	; &I-M-00020;
       (=jef-china3	  . #x82A6)	; &I-JC3-82A6;
       (=ucs@unicode	  . #x4E0E)	; &GT-00023;
-      )
-     ((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)
+    (=jis-x0208		. #x4D3F)	; &GT-00024; [45-31]
+    (=jis-x0213-1	. #x4D3F)	; &I-JX1-4D3F; [45-31]
+    (=gt		. 00024)	; &I-GT-00024;
+    (=gt-k		. 00208)	; &I-GT-K00208;
+    (=gt-pj-1		. #x4D3F)	; &I-GT-00024; [45-31]
+    (=shinjigen		.  6625)	; &GT-00024;
+    (=ucs@jis		. #x4E0E)	; &GT-00024;
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x6750)	; &GT-39084; [71-48]
+      (=ks-x1001	  . #x6628)	; &I-K0-6628; [70-08]
+      (=jis-x0213-1	  . #x6750)	; &I-JX1-6750; [71-48]
+      (=daikanwa	  . 30212)	; &I-M-30212;
       ))
     ))
 (define-char
@@ -570,34 +589,35 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
     (hanyu-dazidian	1 11 5)
-    (shinjigen-1	. 19)
     (=ucs		. #x4E0F)	; 丏
     (=iso-ir165		. #x7A21)	; &I-EGB-7A21; [90-01]
     (=cns11643-2	. #x212D)	; &I-C2-212D; [01-13]
-    (=jis-x0213-2-2000	. #x2123)	; &I-JX2-2123; [01-03]
+    (=jis-x0213-2	. #x2123)	; &I-JX2-2123; [01-03]
     (=big5		. #xC94D)	; &I-B-C94D;
     (=gt		. 00037)	; &I-GT-00037;
     (=gt-pj-2		. #x302D)	; &I-GT-00037; [16-13]
     (=daikanwa		. 00021)	; &I-M-00021;
+    (=shinjigen@1ed	.  0019)	; 丏
     (=jef-china3	. #x97C5)	; &I-JC3-97C5;
+    (=adobe-japan1-5	. 17235)	; 丏
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
     (hanyu-dazidian	1 10 6)
-    (shinjigen-1	. 15)
-    (shinjigen-2	. 15)
     (sound@ja/on	"kai")
     (=ucs		. #x4E10)	; 丐
     (=jis-x0208		. #x5022)	; &I-J90-5022; [48-02]
     (=gb2312		. #x5824)	; &I-G0-5824; [56-04]
     (=cns11643-1	. #x4461)	; &I-C1-4461; [36-65]
+    (=jis-x0213-1	. #x5022)	; &I-JX1-5022; [48-02]
     (=big5		. #xA4A2)	; &I-B-A4A2;
     (=gt		. 00027)	; &I-GT-00027;
     (=gt-k		. 00507)	; &I-GT-K00507;
     (=gt-pj-1		. #x5022)	; &I-GT-00027; [48-02]
     (=daikanwa		. 00022)	; &I-M-00022;
+    (=shinjigen		.  0015)	; 丐
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -607,38 +627,53 @@
     (sound@ja/kun	"usi")
     (sound@ja/on/kan	"tIu")
     (=ucs		. #x4E11)	; 丑
-    (->subsumptive
-     ((shinjigen-1	  . 16)
-      (shinjigen-2	  . 16)
-      (=jis-x0208	  . #x312F)	; &GT-00033; [17-15]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E11)	; 丑
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (=jis-x0208		. #x312F)	; &GT-00033; [17-15]
+    (=ks-x1001		. #x7564)	; &I-K0-7564; [85-68]
+    (=cns11643-1	. #x4460)	; &I-C1-4460; [36-64]
+    (=jis-x0213-1	. #x312F)	; &I-JX1-312F; [17-15]
+    (=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;
+    (=shinjigen		.  0016)	; &GT-00033;
+    (=ucs@jis		. #x4E11)	; &GT-00033;
+    (=ucs@big5		. #x4E11)	; &GT-00033;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E11)	; 丑
+      ))
+    (ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (=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]
+    (=shinjigen@1ed	.  0017)	; &GT-00035;
+    (=ucs@unicode	. #x4E11)	; &GT-00035;
+    (<-simplified@CN
+     ((=gb12345		  . #x3373)	; &UU+919C; [19-83]
+      ))
+    (<-vulgar
+     ((=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]
+      (=jis-x0213-1	  . #x312F)	; &I-JX1-312F; [17-15]
       (=daikanwa	  . 00023)	; &I-M-00023;
-      (=ucs@jis		  . #x4E11)	; &GT-00033;
-      (=ucs@big5	  . #x4E11)	; &GT-00033;
-      )
-     ((<-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;
+      (=shinjigen	  .  0016)	; &GT-00033;
       ))
+    (<-vulgar*sources
+     shinjigen@1ed)
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -669,20 +704,12 @@
   '((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)	; ⿺
 	)
@@ -693,21 +720,21 @@
 	)
        ((=ucs		    . #x4E36)	; 丶
 	))
-      (=jis-x0213-1-2000  . #x2E22)	; &GT-00031; [14-02]
+      (=jis-x0213-1	  . #x2E22)	; &GT-00031; [14-02]
       (=gt		  . 00031)	; &I-GT-00031;
       (=gt-pj-2		  . #x3030)	; &I-GT-00031; [16-16]
       (=daikanwa	  . 00026)	; &I-M-00026;
       (=ucs@jis		  . #x2000B)	; &GT-00031;
-      )
-     ((<-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
+       ((=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
-       shinjigen-1)
-      (hanyu-dazidian	  1 12 5)
+       daikanwa)
+      )
+     ((hanyu-dazidian	  1 12 5)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
@@ -716,12 +743,21 @@
 	)
        ((=ucs		    . #x4E36)	; 丶
 	))
-      (shinjigen-1	  . 11)
       (=cns11643-3	  . #x2144)	; &GT-00032; [01-36]
       (=gt		  . 00032)	; &I-GT-00032;
       (=gt-pj-9		  . #x4B24)	; &I-GT-00032; [43-04]
+      (=shinjigen@1ed	  .  0011)	; &GT-00032;
       (=hanziku-1	  . #xA6AC)	; &I-HZK01-A6AC;
       (=ucs@iso		  . #x2000B)	; &GT-00032;
+      (<-vulgar
+       ((=gb2312	    . #x5549)	; &GT-00020; [53-41]
+	(=jis-x0208@1990    . #x3E66)	; &I-J90-3E66; [30-70]
+	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
+	(=jis-x0213-1	    . #x3E66)	; &I-JX1-3E66; [30-70]
+	(=shinjigen	    .  0009)	; &GT-00020;
+	))
+      (<-vulgar*sources
+       shinjigen@1ed)
       ))
     ))
 (define-char
@@ -742,21 +778,20 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=jis-x0208	  . #x3F4F)	; &GT-02407; [31-47]
-      (=cns11643-6	  . #x2138)	; &I-C6-2138; [01-24]
-      (=daikanwa	  . 01850)	; &I-M-01850;
+     ((=ucs		  . #x2F81E)	; 刃
       )
      ((=ucs		  . #x4E00)	; 一
       ))
-    (shinjigen-2	. 17)
     (=ucs		. #x4E12)	; 丒
     (=jis-x0212		. #x3025)	; &I-JSP-3025; [16-05]
     (=cns11643-4	. #x2139)	; &I-C4-2139; [01-25]
-    (=jis-x0213-2-2000	. #x2124)	; &I-JX2-2124; [01-04]
+    (=jis-x0213-2	. #x2124)	; &I-JX2-2124; [01-04]
     (=gt		. 00034)	; &I-GT-00034;
     (=gt-pj-2		. #x3032)	; &I-GT-00034; [16-18]
     (=daikanwa		. 00028)	; &I-M-00028;
+    (=shinjigen@rev	.  0017)	; 丒
     (=jef-china3	. #x41A8)	; &I-JC3-41A8;
+    (=adobe-japan1-5	. 17236)	; 丒
     ))
 (define-char
   '((ideographic-radical@ucs . 12)	; ⼋
@@ -766,33 +801,34 @@
     (ideographic-radical@daikanwa . 1)	; ⼀
     (ideographic-strokes@daikanwa . 3)
     (total-strokes	 . 4)
-    (<-vulgar
-     ((shinjigen-1	  . 491)
-      (=jis-x0208	  . #x5142)	; &GT-01891; [49-34]
-      (=ks-x1001	  . #x7B31)	; &I-K0-7B31; [91-17]
-      (=daikanwa	  . 01455)	; &I-M-01455;
-      ))
-    (<-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;
+    (=shinjigen@1ed	.  0492)	; 𠔃
     (=hanziku-1		. #xD7D7)	; &I-HZK01-D7D7;
+    (<-vulgar
+     ((=jis-x0208	  . #x5142)	; &GT-01891; [49-34]
+      (=ks-x1001	  . #x7B31)	; &I-K0-7B31; [91-17]
+      (=jis-x0213-1	  . #x5142)	; &I-JX1-5142; [49-34]
+      (=daikanwa	  . 01455)	; &I-M-01455;
+      (=shinjigen	  .  0491)	; &GT-01891;
+      ))
+    (<-vulgar*sources
+     daikanwa shinjigen@1ed)
     ))
 (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)	; 冇
@@ -832,6 +868,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)
@@ -842,16 +895,51 @@
   '((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)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 15 5)
-    (shinjigen-1	. 22)
-    (shinjigen-2	. 22)
     (sound@ja/kun	"ka-tu")
     (sound@ja/kun/name	"katusi" "katu")
     (sound@ja/on/kan	"syo")
@@ -860,11 +948,13 @@
     (=gb2312		. #x4752)	; &I-G0-4752; [39-50]
     (=ks-x1001		. #x7326)	; &I-K0-7326; [83-06]
     (=cns11643-1	. #x4562)	; &I-C1-4562; [37-66]
+    (=jis-x0213-1	. #x336E)	; &I-JX1-336E; [19-78]
     (=big5		. #xA542)	; &I-B-A542;
     (=gt		. 00045)	; &I-GT-00045;
     (=gt-k		. 00904)	; &I-GT-K00904;
     (=gt-pj-1		. #x336E)	; &I-GT-00045; [19-78]
     (=daikanwa		. 00029)	; &I-M-00029;
+    (=shinjigen		.  0022)	; 且
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -879,27 +969,25 @@
       )
      ((=ucs		  . #x4E00)	; 一
       ))
-    (shinjigen-1	. 26)
-    (shinjigen-2	. 26)
     (sound@ja/on	"hi")
     (=ucs		. #x4E15)	; 丕
     (=jis-x0208		. #x5023)	; &I-J90-5023; [48-03]
     (=gb2312		. #x5827)	; &I-G0-5827; [56-07]
     (=ks-x1001		. #x5D60)	; &I-K0-5D60; [61-64]
     (=cns11643-1	. #x4561)	; &I-C1-4561; [37-65]
+    (=jis-x0213-1	. #x5023)	; &I-JX1-5023; [48-03]
     (=big5		. #xA541)	; &I-B-A541;
     (=gt		. 00050)	; &I-GT-00050;
     (=gt-k		. 01025)	; &I-GT-K01025;
     (=gt-pj-1		. #x5023)	; &I-GT-00050; [48-03]
     (=daikanwa		. 00030)	; &I-M-00030;
+    (=shinjigen		.  0026)	; 丕
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 14 6)
-    (shinjigen-1	. 23)
-    (shinjigen-2	. 23)
     (sound@ja/kun	"yo")
     (sound@ja/kun/name	"tosi")
     (sound@ja/on/go	"se")
@@ -909,11 +997,13 @@
     (=gb2312		. #x4A40)	; &I-G0-4A40; [42-32]
     (=ks-x1001		. #x6126)	; &I-K0-6126; [65-06]
     (=cns11643-1	. #x4560)	; &I-C1-4560; [37-64]
+    (=jis-x0213-1	. #x4024)	; &I-JX1-4024; [32-04]
     (=big5		. #xA540)	; &I-B-A540;
     (=gt		. 00046)	; &I-GT-00046;
     (=gt-k		. 00961)	; &I-GT-K00961;
     (=gt-pj-1		. #x4024)	; &I-GT-00046; [32-04]
     (=daikanwa		. 00031)	; &I-M-00031;
+    (=shinjigen		.  0023)	; 世
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -930,13 +1020,13 @@
       (=daikanwa	  . 00032)	; &I-M-00032;
       )
      ((hanyu-dazidian	  1 14 5)
-      (shinjigen-1	  . 24)
-      (shinjigen-2	  . 24)
       (=jis-x0208	  . #x5242)	; &GT-00048; [50-34]
+      (=jis-x0213-1	  . #x5242)	; &I-JX1-5242; [50-34]
       (=big5-cdp	  . #x89D8)	; &I-CDP-89D8;
       (=gt		  . 00048)	; &I-GT-00048;
       (=gt-k		  . 01035)	; &I-GT-K01035;
       (=gt-pj-1		  . #x5242)	; &I-GT-00048; [50-34]
+      (=shinjigen	  .  0024)	; &GT-00048;
       (=ucs@unicode	  . #x4E17)	; &GT-00048;
       )
      ((ideographic-structure
@@ -956,8 +1046,6 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
     (hanyu-dazidian	1 17 1)
-    (shinjigen-1	. 20)
-    (shinjigen-2	. 20)
     (sound@ja/kun	"oka")
     (sound@ja/on/kan	"kIu")
     (=ucs		. #x4E18)	; 丘
@@ -965,11 +1053,13 @@
     (=gb2312		. #x4770)	; &I-G0-4770; [39-80]
     (=ks-x1001		. #x4E78)	; &I-K0-4E78; [46-88]
     (=cns11643-1	. #x4563)	; &I-C1-4563; [37-67]
+    (=jis-x0213-1	. #x3556)	; &I-JX1-3556; [21-54]
     (=big5		. #xA543)	; &I-B-A543;
     (=gt		. 00040)	; &I-GT-00040;
     (=gt-k		. 00909)	; &I-GT-K00909;
     (=gt-pj-1		. #x3556)	; &I-GT-00040; [21-54]
     (=daikanwa		. 00033)	; &I-M-00033;
+    (=shinjigen		.  0020)	; 丘
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -984,12 +1074,12 @@
       )
      ((=ucs		  . #x4E00)	; 一
       ))
-    (shinjigen-1	. 21)
     (=ucs		. #x3400)	; 㐀
     (=cns11643-6	. #x222C)	; &I-C6-222C; [02-12]
     (=gt		. 00041)	; &I-GT-00041;
     (=gt-pj-2		. #x3035)	; &I-GT-00041; [16-21]
     (=daikanwa		. 00034)	; &I-M-00034;
+    (=shinjigen@1ed	.  0021)	; 㐀
     (=hanziku-1		. #xA74B)	; &I-HZK01-A74B;
     ))
 (define-char
@@ -1009,21 +1099,20 @@
 	)
        ((=ucs		    . #x5185)	; 内
 	))
-      (shinjigen-1	  . 27)
-      (shinjigen-2	  . 27)
       (=jis-x0208	  . #x4A3A)	; &GT-00051; [42-26]
       (=gb2312		  . #x317B)	; &I-G0-317B; [17-91]
       (=ks-x1001	  . #x5C30)	; &I-K0-5C30; [60-16]
       (=cns11643-1	  . #x455F)	; &I-C1-455F; [37-63]
+      (=jis-x0213-1	  . #x4A3A)	; &I-JX1-4A3A; [42-26]
       (=big5		  . #xA4FE)	; &I-B-A4FE;
       (=gt		  . 00051)	; &I-GT-00051;
       (=gt-k		  . 00997)	; &I-GT-K00997;
       (=gt-pj-1		  . #x4A3A)	; &I-GT-00051; [42-26]
       (=daikanwa	  . 00035)	; &I-M-00035;
+      (=shinjigen	  .  0027)	; &GT-00051;
       (=ucs@unicode	  . #x4E19)	; &GT-00051;
       )
-     ((shinjigen-1	  . 28)
-      (shinjigen-2	  . 28)
+     ((=shinjigen	  .  0028)	; &JC3-41A2;
       (=jef-china3	  . #x41A2)	; &JC3-41A2;
       ))
     ))
@@ -1070,25 +1159,24 @@
     (=hanziku-1		. #xA7B0)	; &I-HZK01-A7B0;
     ))
 (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;
-    ))
-(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;
+      )
+     ((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)	; ⼀
@@ -1114,21 +1202,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")
@@ -1141,17 +1226,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)	; 东
@@ -1165,9 +1253,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")
@@ -1187,6 +1272,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)	; ⼀
@@ -1224,38 +1312,22 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian	1 14 2)
-    (=ucs		. #x29C0A)	; 𩰊
-    (=big5-cdp		. #x88D0)	; &I-CDP-88D0;
+    (=gt		. 00039)	; &GT-00039;
+    (=gt-pj-9		. #x4228)	; &GT-00039; [34-08]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (hanyu-dazidian	1 15 2)
-    (=ucs		. #x29C0B)	; 𩰋
-    (=big5-cdp		. #x88D1)	; &I-CDP-88D1;
+    (=gt		. 00043)	; &GT-00043;
+    (=gt-pj-2		. #x3033)	; &GT-00043; [16-19]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
-    (=gt		. 00039)	; &GT-00039;
-    (=gt-pj-9		. #x4228)	; &GT-00039; [34-08]
-    ))
-(define-char
-  '((ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
-    (=gt		. 00043)	; &GT-00043;
-    (=gt-pj-2		. #x3033)	; &GT-00043; [16-19]
-    ))
-(define-char
-  '((ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
-    (=gt		. 00053)	; &GT-00053;
-    (=gt-pj-9		. #x3758)	; &GT-00053; [23-56]
+    (=gt		. 00053)	; &GT-00053;
+    (=gt-pj-9		. #x3758)	; &GT-00053; [23-56]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1282,8 +1354,6 @@
       )
      ((=ucs		  . #x4E00)	; 一
       ))
-    (shinjigen-1	. 29)
-    (shinjigen-2	. 29)
     (sound@ja/kun	"suke")
     (sound@ja/on/go	"zyAu")
     (=ucs		. #x4E1E)	; 丞
@@ -1291,11 +1361,13 @@
     (=gb2312		. #x5829)	; &I-G0-5829; [56-09]
     (=ks-x1001		. #x632A)	; &I-K0-632A; [67-10]
     (=cns11643-1	. #x4722)	; &I-C1-4722; [39-02]
+    (=jis-x0213-1	. #x3E67)	; &I-JX1-3E67; [30-71]
     (=big5		. #xA5E0)	; &I-B-A5E0;
     (=gt		. 00059)	; &I-GT-00059;
     (=gt-k		. 01645)	; &I-GT-K01645;
     (=gt-pj-1		. #x3E67)	; &I-GT-00059; [30-71]
     (=daikanwa		. 00040)	; &I-M-00040;
+    (=shinjigen		.  0029)	; 丞
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1369,86 +1441,93 @@
   '((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)	; 𠫔
+    (=ucs		. #x2001A)	; 𠀚
+    (->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;
       )
-     ((=big5-cdp	  . #x8665)	; &CDP-8665;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x20AD4)	; 𠫔
+	)
+       ((=ucs		    . #x5C0F)	; 小
+	))
+      (=cns11643-6	  . #x233F)	; &C6-233F; [03-31]
       ))
-    (=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;
-    ))
-(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)	; 北
-      )
-     ((=ucs		  . #x4E00)	; 一
-      ))
     (=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;
-    ))
-(define-char
-  '((=>ucs		. #x4E20)	; 丠
-    (morohashi-daikanwa	45 0 0)
-    (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]
+    (->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]
+	(=jis-x0213-1	    . #x4B4C)	; &I-JX1-4B4C; [43-44]
+	(=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;
       )
-     ((=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)
     (sound@ja/on	"ryAu")
     (=ucs		. #x4E21)	; 両
     (=jis-x0208		. #x4E3E)	; &I-J90-4E3E; [46-30]
     (=cns11643-3	. #x2261)	; &I-C3-2261; [02-65]
+    (=jis-x0213-1	. #x4E3E)	; &I-JX1-4E3E; [46-30]
     (=gt		. 00065)	; &I-GT-00065;
     (=gt-k		. 01705)	; &I-GT-K01705;
     (=gt-pj-1		. #x4E3E)	; &I-GT-00065; [46-30]
     (=daikanwa		. 00046)	; &I-M-00046;
+    (=shinjigen		.  0483)	; 両
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x5140)	; &GT-01871; [49-32]
+      (=ks-x1001	  . #x5557)	; &I-K0-5557; [53-55]
+      (=jis-x0213-1	  . #x5140)	; &I-JX1-5140; [49-32]
+      (=daikanwa	  . 01436)	; &I-M-01436;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 1)	; ⼀
@@ -1475,10 +1554,44 @@
     (=jef-china3	. #x41BA)	; &I-JC3-41BA;
     ))
 (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
@@ -1495,39 +1608,20 @@
     (=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
   '((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		  . #x4E00)	; 一
+    (=ucs		. #x3402)	; 㐂
+    (->subsumptive
+     ((morohashi-daikanwa	ho 1)
+      (=gt		  . 00057)	; &GT-00057;
+      (=gt-pj-11	  . #x526E)	; &GT-00057; [50-78]
       )
-     ((=big5-cdp	  . #x877C)	; &CDP-877C;
+     ((=jis-x0213-1	  . #x2E23)	; &GT-00056; [14-03]
+      (=gt		  . 00056)	; &I-GT-00056;
+      (=gt-pj-9		  . #x3B2A)	; &I-GT-00056; [27-10]
+      (=ucs@unicode	  . #x3402)	; &GT-00056;
       ))
-    (=ucs		. #x2001B)	; 𠀛
-    (=hanziku-1		. #xA7B3)	; &I-HZK01-A7B3;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1646,6 +1740,7 @@
        ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
 	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
 	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=jis-x0213-1	    . #x3A21)	; &I-JX1-3A21; [26-01]
 	(=daikanwa	    . 16259)	; &I-M-16259;
 	))
       (=gt		  . 00070)	; &GT-00070;
@@ -1669,15 +1764,6 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (->mistakable
-     ((=daikanwa	  . 11708)	; &I-M-11708;
-      ))
-    (<-ancient
-     ((=ucs		  . #x9149)	; 酉
-      (=daikanwa	  . 39763)	; &I-M-39763;
-      ))
-    (<-ancient*sources
-     daikanwa)
     (hanyu-dazidian	1 21 6)
     (=ucs		. #x4E23)	; 丣
     (=jis-x0212		. #x3027)	; &I-JSP-3027; [16-07]
@@ -1686,6 +1772,17 @@
     (=gt		. 00076)	; &I-GT-00076;
     (=gt-pj-2		. #x3041)	; &I-GT-00076; [16-33]
     (=daikanwa		. 00048)	; &I-M-00048;
+    (<-ancient
+     ((=daikanwa	  . 39763)	; &M-39763;
+      ))
+    (<-ancient*sources
+     daikanwa)
+    (->mistakable
+     ((=ucs		  . #x623C)	; 戼
+      (=daikanwa	  . 11708)	; &I-M-11708;
+      ))
+    (->mistakable*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1730,9 +1827,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]
@@ -1743,6 +1837,9 @@
     (=gt-pj-2		. #x3044)	; &I-GT-00077; [16-36]
     (=daikanwa		. 00051)	; &I-M-00051;
     (=jef-china3	. #x41A3)	; &I-JC3-41A3;
+    (<-simplified@CN
+     ((=gb12345		  . #x413D)	; &C1-4C25; [33-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1755,28 +1852,34 @@
     (=daikanwa		. 00052)	; &I-M-00052;
     ))
 (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;
+    (->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;
+      ))
     ))
 (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)	; ⼀
@@ -1839,31 +1942,35 @@
     (=gt-pj-9		. #x3B41)	; &GT-00074; [27-33]
     ))
 (define-char
-  '((=>ucs		. #x4E26)	; 並
+  '((=>ucs*		. #x4E26)	; 並
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes	 . 8)
-    (shinjigen-1	. 5733)
-    (=daikanwa		. 00053)	; &M-00053;
-    ))
-(define-char
-  '((morohashi-daikanwa	53 0 0)
-    (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
+     ((=gt		  . 00089)	; &GT-00089;
+      (=gt-k		  . 06059)	; &I-GT-K06059;
+      (=gt-pj-2		  . #x3046)	; &GT-00089; [16-38]
+      (=daikanwa	  . 00053)	; &I-M-00053;
+      (=shinjigen	  .  5734)	; &GT-00089;
+      (=ucs@JP		  . #xFA70)	; &GT-00089;
+      (<-formed
+       ((=ucs		    . #x4E26)	; 並
+	(=jis-x0208	    . #x4A42)	; &I-J90-4A42; [42-34]
+	(=shinjigen	    .  5732)	; 並
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=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")
@@ -1873,19 +1980,25 @@
       )
      ((=ucs		  . #x4E1A)	; 业
       ))
-    (shinjigen-1	. 5732)
-    (shinjigen-2	. 5732)
     (sound@ja/kun	"nami" "nara+b5")
     (sound@ja/on/kan	"hei")
     (=ucs		. #x4E26)	; 並
     (=jis-x0208		. #x4A42)	; &I-J90-4A42; [42-34]
     (=iso-ir165		. #x2C76)	; &I-EGB-2C76; [12-86]
     (=cns11643-1	. #x4B64)	; &I-C1-4B64; [43-68]
+    (=jis-x0213-1	. #x4A42)	; &I-JX1-4A42; [42-34]
     (=big5		. #xA8C3)	; &I-B-A8C3;
     (=gt		. 00084)	; &I-GT-00084;
     (=gt-k		. 03817)	; &I-GT-K03817;
     (=gt-pj-1		. #x4A42)	; &I-GT-00084; [42-34]
     (=daikanwa		. 00054)	; &I-M-00054;
+    (=shinjigen		.  5732)	; 並
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x636D)	; &GT-33217; [67-77]
+      (=ks-x1001	  . #x5C3D)	; &I-K0-5C3D; [60-29]
+      (=jis-x0213-1	  . #x636D)	; &I-JX1-636D; [67-77]
+      (=daikanwa	  . 25752)	; &I-M-25752;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2160B)	; 𡘋
@@ -1976,25 +2089,33 @@
     (=hanziku-1		. #xA950)	; &I-HZK01-A950;
     ))
 (define-char
-  '((ideographic-radical@daikanwa . 3)	; ⼂
-    (ideographic-strokes@daikanwa . 7)
-    (total-strokes@daikanwa	  . 8)
-    (ideographic-radical@daikanwa*sources
-     daikanwa gt)
+  '((ideographic-radical@ucs . 3)	; ⼂
+    (ideographic-radical@ucs*sources
+     daikanwa gt ucs)
     (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 . 1)	; ⼀
+  '((<-denotational
+     ((=ucs		  . #x4E3D)	; 丽
+      ))
+    (=>ucs*		. #x4E3D)	; 丽
+    (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
+      ))
+    (=ucs		. #x2F800)	; 丽
+    (=cns11643-6	. #x2936)	; &I-C6-2936; [09-22]
+    (=gt		. 00087)	; &I-GT-00087;
+    (=gt-pj-2		. #x304B)	; &I-GT-00087; [16-43]
+    (=daikanwa		. 00059)	; &I-M-00059;
     (<-ancient
      ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
       (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
@@ -2003,38 +2124,41 @@
       ))
     (<-ancient*sources
      daikanwa)
-    (<-denotational
-     ((=ucs		  . #x4E3D)	; 丽
-      ))
     (<-same
      ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
       (=daikanwa	  . 00104)	; &I-M-00104;
       ))
-    (=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;
     ))
 (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;
       )
      ((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)	; ⼂
+  '((<-denotational
+     ((=ucs		  . #x4E3D)	; 丽
+      ))
+    (ideographic-radical@daikanwa . 3)	; ⼂
     (ideographic-strokes@daikanwa . 7)
     (ideographic-radical@daikanwa*sources
      daikanwa gt)
@@ -2043,6 +2167,21 @@
     (ideographic-radical@cns*sources
      cns11643)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 24 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gt-k		  . 00616)	; &GT-K00616;
+      )
+     ((=gt-k		  . 00616)	; &GT-K00616;
+      ))
+    (=cns11643-3	. #x2740)	; &GT-00145; [07-32]
+    (=big5-cdp		. #x8CB7)	; &I-CDP-8CB7;
+    (=gt		. 00145)	; &I-GT-00145;
+    (=gt-pj-2		. #x3071)	; &I-GT-00145; [16-81]
+    (=daikanwa		. 00104)	; &I-M-00104;
+    (=ucs@cns		. #x4E3D)	; &GT-00145;
     (<-ancient
      ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
       (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
@@ -2051,101 +2190,49 @@
       ))
     (<-ancient*sources
      daikanwa)
-    (<-denotational
-     ((=ucs		  . #x4E3D)	; 丽
-      ))
     (<-same
-     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
-      (=daikanwa	  . 00059)	; &I-M-00059;
+     ((=ucs		  . #x2F800)	; 丽
       ))
-    (hanyu-dazidian	1 24 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((ideographic-structure
+    ))
+(define-char
+  '((ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 7)
+    (total-strokes	 . 8)
+    (=ucs		. #x20030)	; 𠀰
+    (->subsumptive
+     ((morohashi-daikanwa	ho 2)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4E00)	; 一
+       ((=ucs		    . #x4E0D)	; 不
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
+       ((=jis-x0208	    . #x3E2F)	; &GT-09425; [30-15]
+	(=ks-x1001	    . #x6134)	; &I-K0-6134; [65-20]
+	(=jis-x0213-1	    . #x3E2F)	; &I-JX1-3E2F; [30-15]
+	(=daikanwa	    . 07475)	; &I-M-07475;
 	))
+      (=gt		  . 00081)	; &GT-00081;
+      (=gt-pj-11	  . #x4349)	; &GT-00081; [35-41]
       )
-     ((ideographic-structure
+     ((hanyu-dazidian	  1 24 6)
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4E00)	; 一
+       ((=ucs		    . #x4E0D)	; 不
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
+       ((=gb2312	    . #x4959)	; &C1-4537; [41-57]
+	(=cns11643-1	    . #x4537)	; &I-C1-4537; [37-23]
 	))
+      (=hanziku-1	  . #xA8F3)	; &HZK01-A8F3;
+      (=ucs@iso		  . #x20030)	; &HZK01-A8F3;
       ))
-    (=cns11643-3	. #x2740)	; &GT-00145; [07-32]
-    (=big5-cdp		. #x8CB7)	; &I-CDP-8CB7;
-    (=gt		. 00145)	; &I-GT-00145;
-    (=gt-pj-2		. #x3071)	; &I-GT-00145; [16-81]
-    (=daikanwa		. 00104)	; &I-M-00104;
-    (=ucs@cns		. #x4E3D)	; &GT-00145;
-    ))
-(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;
-      ))
-    (=gt		. 00081)	; &GT-00081;
-    (=gt-pj-11		. #x4349)	; &GT-00081; [35-41]
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 2 0)
-    (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		  . #x5C11)	; 少
-      ))
-    (=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")
@@ -2158,6 +2245,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)	; ⼀
@@ -2211,6 +2302,7 @@
       )
      ((=jis-x0208	  . #x5029)	; &GT-00153; [48-09]
       (=ks-x1001	  . #x6751)	; &I-K0-6751; [71-49]
+      (=jis-x0213-1	  . #x5029)	; &I-JX1-5029; [48-09]
       (=daikanwa	  . 00111)	; &I-M-00111;
       ))
     (=gt		. 00088)	; &GT-00088;
@@ -2293,9 +2385,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)	; 乞
@@ -2438,14 +2528,45 @@
     (=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@daikanwa . 16)	; ⼏
+    (ideographic-strokes@daikanwa . 10)
     (total-strokes	 . 12)
-    (<-same
-     ((=cns11643-6	  . #x472D)	; &C6-472D; [39-13]
+    (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@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 11)
+    (ideographic-radical@cns . 30)	; ⼝
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (total-strokes	 . 12)
+    (=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")
@@ -2470,25 +2591,9 @@
 	  ))
 	))
       ))
-    (=ucs		. #x20048)	; 𠁈
-    (=daikanwa		. 04020)	; &I-M-04020;
+    (=daikanwa		. 04020)	; &M-04020;
     (=hanziku-1		. #xA979)	; &I-HZK01-A979;
-    ))
-(define-char
-  '((ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 11)
-    (total-strokes	 . 12)
-    (hanyu-dazidian	1 26 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((=ucs		  . #x51F0)	; 凰
-      ))
-    (=ucs		. #x20049)	; 𠁉
-    (=hanziku-1		. #xA97C)	; &I-HZK01-A97C;
+    (=ucs@iso		. #x20048)	; &M-04020;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀