X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R075-Tree.el;h=d22378c625323ab9c7e85517adbe0de914d382b6;hb=77dd380a416d9c7d3a3c866a58233d3f0fae509d;hp=9f20d55b150716d16f0d0e0641a862ede659de8e;hpb=4d9deab042e34ad8bd653d654e6649a2dec2b463;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index 9f20d55..d22378c 100644
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -126,6 +126,8 @@
 	))
       )
      ((===hng-khi	  . 04390)	; &HNG010-04390;
+      )
+     ((===hng-khm	  . 03870)	; &HNG011-03870;
       ))
     ))
 (define-char
@@ -173,6 +175,8 @@
 	))
       )
      ((===hng-khi	  . 04380)	; &HNG010-04380;
+      )
+     ((===hng-khm	  . 00700)	; &HNG011-00700;
       ))
     ))
 (define-char
@@ -1704,7 +1708,12 @@
        ((===ucs@unicode	    . #x6765)	; &R-UU+6765;
 	))
       )
-     ((===hng-khi	  . 02450)	; &HNG010-02450;
+     ((=ucs-var-003	  . #x6765)	; &U-v003+6765;
+      (->subsumptive
+       ((===hng-khi	    . 02450)	; &HNG010-02450;
+	)
+       ((===hng-khm	    . 01950)	; &HNG011-01950;
+	))
       ))
     ))
 (define-char
@@ -2043,7 +2052,12 @@
        ((===ucs@unicode	    . #x6771)	; &R-UU+6771;
 	))
       )
-     ((===hng-khi	  . 04410)	; &HNG010-04410;
+     ((=ucs-var-001	  . #x6771)	; &U-v001+6771;
+      (->subsumptive
+       ((===hng-khi	    . 04410)	; &HNG010-04410;
+	)
+       ((===hng-khm	    . 03910)	; &HNG011-03910;
+	))
       ))
     ))
 (define-char
@@ -3263,7 +3277,12 @@
        ((===ucs@unicode	    . #x6797)	; &R-UU+6797;
 	))
       )
-     ((===hng-khi	  . 04360)	; &HNG010-04360;
+     ((=ucs-itaiji-001	  . #x6797)	; &U-i001+6797;
+      (->subsumptive
+       ((===hng-khi	    . 04360)	; &HNG010-04360;
+	)
+       ((===hng-khm	    . 00650)	; &HNG011-00650;
+	))
       ))
     ))
 (define-char
@@ -4960,7 +4979,25 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67D4)	; 柔
-    (=jis-x0208		. #x3D40)	; &I-J90-3D40; [29-32]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x67D4)	; 柔
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x77DB)	; 矛
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=>ucs@iwds-1	. #x67D4)	; &GT-18606;
+    (=ucs@unicode	. #x67D4)	; &GT-18606;
+    (=jis-x0208		. #x3D40)	; &GT-18606; [29-32]
     (=gb2312		. #x4861)	; &I-G0-4861; [40-65]
     (=ks-x1001		. #x6A75)	; &I-K0-6A75; [74-85]
     (=cns11643-1	. #x515B)	; &I-C1-515B; [49-59]
@@ -4970,7 +5007,7 @@
     (=gt-k		. 05100)	; &I-GT-K05100;
     (=gt-pj-1		. #x3D40)	; &I-GT-18606; [29-32]
     (=daikanwa		. 14622)	; &I-M-14622;
-    (=shinjigen		.  3569)	; 柔
+    (=shinjigen		.  3569)	; &GT-18606;
     (->subsumptive
      ((==jis-x0208@1978	  . #x3D40)	; &g2-M-14622; [29-32]
       (==jis-x0208@1983	  . #x3D40)	; &g2-M-14622; [29-32]
@@ -5008,12 +5045,27 @@
       (==cns11643-1	  . #x515B)	; &g2-CU+67D4; [49-59]
       (->subsumptive
        ((===cns11643-1	    . #x515B)	; &R-C1-515B; [49-59]
-	)
-       ((===hng-khi	    . 04350)	; &HNG010-04350;
 	))
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x67D4)	; 柔
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x77DB)	; 矛
+      )
+     ((=ucs		  . #x21B55)	; 𡭕
+      ))
+    (===hng-khi		. 04350)	; &HNG010-04350;
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -6928,20 +6980,61 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6817)	; 栗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6817)	; 栗
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x8980)	; 覀
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=ucs@unicode	. #x6817)	; &GT-18817;
+    (=jis-x0208		. #x372A)	; &GT-18817; [23-10]
+    (=gb2312		. #x4075)	; &I-G0-4075; [32-85]
+    (=ks-x1001		. #x574A)	; &I-K0-574A; [55-42]
+    (=cns11643-1	. #x5623)	; &I-C1-5623; [54-03]
+    (=jis-x0213-1	. #x372A)	; &I-JX1-372A; [23-10]
     (=big5		. #xAEDF)	; &I-B-AEDF;
+    (=gt		. 18817)	; &I-GT-18817;
+    (=gt-k		. 06409)	; &I-GT-K06409;
+    (=gt-pj-1		. #x372A)	; &I-GT-18817; [23-10]
+    (=daikanwa		. 14695)	; &I-M-14695;
+    (=shinjigen		.  3624)	; &GT-18817;
     (->subsumptive
-     ((=ucs@unicode	  . #x6817)	; &GT-18817;
-      (=jis-x0208	  . #x372A)	; &GT-18817; [23-10]
-      (=gb2312		  . #x4075)	; &I-G0-4075; [32-85]
-      (=ks-x1001	  . #x574A)	; &I-K0-574A; [55-42]
-      (=jis-x0213-1	  . #x372A)	; &I-JX1-372A; [23-10]
-      (=gt		  . 18817)	; &I-GT-18817;
-      (=gt-k		  . 06409)	; &I-GT-K06409;
-      (=gt-pj-1		  . #x372A)	; &I-GT-18817; [23-10]
-      (=daikanwa	  . 14695)	; &I-M-14695;
-      (=shinjigen	  .  3624)	; &GT-18817;
+     ((==ucs@unicode	  . #x6817)	; &g2-GT-18817;
+      (==gb2312		  . #x4075)	; &g2-GT-18817; [32-85]
+      (==ks-x1001	  . #x574A)	; &g2-GT-18817; [55-42]
+      (==jis-x0208	  . #x372A)	; &g2-GT-18817; [23-10]
+      (==jis-x0213-1	  . #x372A)	; &g2-GT-18817; [23-10]
+      (==gt		  . 18817)	; &g2-GT-18817;
+      (==gt-k		  . 06409)	; &g2-GT-18817;
+      (==daikanwa	  . 14695)	; &g2-GT-18817;
+      (==shinjigen	  .  3624)	; &g2-GT-18817;
+      (->subsumptive
+       ((===daikanwa	    . 14695)	; &R-M-14695;
+	)
+       ((===jis-x0208	    . #x372A)	; &R-J0-372A; [23-10]
+	(===jis-x0213-1	    . #x372A)	; &R-J0-372A; [23-10]
+	)
+       ((===gt		    . 18817)	; &R-GT-18817;
+	(===gt-k	    . 06409)	; &R-GT-18817;
+	)
+       ((===ucs@ks	    . #x6817)	; &R-K0-574A;
+	(===ks-x1001	    . #x574A)	; &R-K0-574A; [55-42]
+	)
+       ((===ucs@unicode	    . #x6817)	; &R-UU+6817;
+	))
       )
-     ((=cns11643-1	  . #x5623)	; &C1-5623; [54-03]
+     ((==ucs@cns	  . #x6817)	; &g2-CU+6817;
+      (==cns11643-1	  . #x5623)	; &g2-CU+6817; [54-03]
       ))
     ))
 (define-char
@@ -7890,6 +7983,8 @@
 	(=hanyo-denshi/ks/mf . #x4129)	; &R-HD-KS-166810;
 	)
        ((===hng-khi	    . 04310)	; &HNG010-04310;
+	)
+       ((===hng-khm	    . 00670)	; &HNG011-00670;
 	))
       )
      ((==ucs@unicode	  . #x6834)	; &g2-UU+6834;
@@ -8062,6 +8157,8 @@
 	))
       )
      ((===hng-khi	  . 04400)	; &HNG010-04400;
+      )
+     ((===hng-khm	  . 03850)	; &HNG011-03850;
       ))
     ))
 (define-char
@@ -11656,6 +11753,35 @@
     (<-formed
      ((=ucs		  . #x6A92)	; 檒
       ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x68B5)	; &g2-GT-18967;
+      (==gb2312		  . #x6873)	; &g2-GT-18967; [72-83]
+      (==ks-x1001	  . #x5B6F)	; &g2-GT-18967; [59-79]
+      (==jis-x0208	  . #x5B70)	; &g2-GT-18967; [59-80]
+      (==cns11643-1	  . #x5B31)	; &g2-GT-18967; [59-17]
+      (==jis-x0213-1	  . #x5B70)	; &g2-GT-18967; [59-80]
+      (==gt		  . 18967)	; &g2-GT-18967;
+      (==gt-k		  . 07946)	; &g2-GT-18967;
+      (==daikanwa	  . 14888)	; &g2-GT-18967;
+      (->subsumptive
+       ((===daikanwa	    . 14888)	; &R-M-14888;
+	)
+       ((===jis-x0208	    . #x5B70)	; &R-J0-5B70; [59-80]
+	(===jis-x0213-1	    . #x5B70)	; &R-J0-5B70; [59-80]
+	)
+       ((===cns11643-1	    . #x5B31)	; &R-C1-5B31; [59-17]
+	)
+       ((===gt		    . 18967)	; &R-GT-18967;
+	(===gt-k	    . 07946)	; &R-GT-18967;
+	)
+       ((===ucs@ks	    . #x68B5)	; &R-K0-5B6F;
+	(===ks-x1001	    . #x5B6F)	; &R-K0-5B6F; [59-79]
+	)
+       ((===ucs@unicode	    . #x68B5)	; &R-UU+68B5;
+	))
+      )
+     ((===hng-khm	  . 03860)	; &HNG011-03860;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -12175,6 +12301,25 @@
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x68C4)	; 棄
     (=big5		. #xB1F3)	; &I-B-B1F3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x68C4)	; 棄
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x20AD3)	; 𠫓
+      )
+     ((=big5-cdp	  . #x8DA8)	; &CDP-8DA8;
+      ))
+    (=+>ucs@unicode	. #x68C4)	; &o-J0-347E;
+    (=+>jis-x0208	. #x347E)	; &o-J0-347E; [20-94]
+    (=+>jis-x0213-1	. #x347E)	; &o-J0-347E; [20-94]
+    (=+>adobe-japan1-0	. 01594)	; &o-J0-347E;
+    (=+>gt		. 19254)	; &o-J0-347E;
     (->subsumptive
      ((ideographic-strokes . 8)
       (total-strokes	   . 12)
@@ -12224,6 +12369,7 @@
       )
      ((ideographic-strokes . 7)
       (total-strokes	   . 11)
+      (=ucs@cns		  . #x68C4)	; &HD-KS-170110;
       (=cns11643-1	  . #x5B39)	; &HD-KS-170110; [59-25]
       (=hanyo-denshi/ks	  . 170110)	; &HD-KS-170110;
       (->subsumptive
@@ -12241,6 +12387,25 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x68C4)	; 棄
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x20AD3)	; 𠫓
+      )
+     ((=ucs		  . #x2000D)	; 𠀍
+      )
+     ((=ucs		  . #x6729)	; 朩
+      ))
+    (===hng-khm		. 00690)	; &HNG011-00690;
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
@@ -15511,7 +15676,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00495)	; &GT-K00495;
+     ((=ucs		  . #x6728)	; 木
       )
      ((=ucs@jis		  . #x5FDD)	; &AJ1-04806;
       (=adobe-japan1-0	  . 04806)	; &AJ1-04806;
@@ -15523,6 +15688,34 @@
     (=gt-pj-4		. #x3561)	; &I-GT-19138; [21-65]
     (=daikanwa		. 49170)	; &I-M-49170;
     (=cbeta		. 01268)	; &I-CB01268;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((==ucs@jis	    . #x5FDD)	; &g2-AJ1-04806;
+	(==adobe-japan1-0   . 04806)	; &g2-AJ1-04806;
+	))
+      (==ucs@jis	  . #x3B87)	; &g2-AJ1-17826;
+      (==adobe-japan1-5	  . 17826)	; &g2-AJ1-17826;
+      (==jis-x0213-2	  . #x2F28)	; &g2-AJ1-17826; [15-08]
+      (==gt		  . 19138)	; &g2-AJ1-17826;
+      (==daikanwa	  . 49170)	; &g2-AJ1-17826;
+      (==cbeta		  . 01268)	; &g2-AJ1-17826;
+      (->subsumptive
+       ((===daikanwa	    . 49170)	; &R-M-49170;
+	)
+       ((===jis-x0213-2	    . #x2F28)	; &R-JX2-2F28; [15-08]
+	)
+       ((===adobe-japan1-5  . 17826)	; &R-AJ1-17826;
+	)
+       ((===gt		    . 19138)	; &R-GT-19138;
+	)
+       ((===cbeta	    . 01268)	; &R-CB01268;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -15535,17 +15728,25 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00495)	; &GT-K00495;
+     ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs@unicode	  . #x5FDD)	; &C1-4D3F;
-      (=gb2312		  . #x6343)	; &C1-4D3F; [67-35]
-      (=cns11643-1	  . #x4D3F)	; &I-C1-4D3F; [45-31]
+     ((=ucs@unicode	  . #x5FDD)	; &AJ1-20118;
+      (=adobe-japan1-5	  . 20118)	; &AJ1-20118;
       ))
     (=ucs@unicode	. #x3B87)	; &C3-3C2B;
     (=ucs@JP/hanazono	. nil)
     (=cns11643-3	. #x3C2B)	; &C3-3C2B; [28-11]
     (->subsumptive
-     ((==ucs@unicode	  . #x3B87)	; &g2-UU+3B87;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((==ucs@unicode	    . #x5FDD)	; &g2-AJ1-20118;
+	(==adobe-japan1-5   . 20118)	; &g2-AJ1-20118;
+	))
+      (==ucs@unicode	  . #x3B87)	; &g2-UU+3B87;
       (==ucs@JP/hanazono  . nil)
       (==cns11643-3	  . #x3C2B)	; &g2-UU+3B87; [28-11]
       (->subsumptive
@@ -18362,6 +18563,7 @@
      ((=ucs		  . #x6728)	; 木
       )
      ((=ucs@cns		  . #x82F1)	; &HD-IB-3B76;
+      (=ucs@ks		  . #x82F1)	; &HD-IB-3B76;
       (=ks-x1001	  . #x6748)	; &HD-IB-3B76; [71-40]
       (=cns11643-1	  . #x5341)	; &I-C1-5341; [51-33]
       (=daikanwa	  . 30808)	; &I-M-30808;
@@ -18489,23 +18691,33 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x3B9A)	; 㮚
+    (=cns11643-3	. #x417A)	; &I-C3-417A; [33-90]
+    (=daikanwa		. 15166)	; &I-M-15166;
+    (=shinjigen		.  3625)	; 㮚
+    (<-ancient
+     ((=ucs@unicode	  . #x6817)	; &GT-18817;
+      (=jis-x0208	  . #x372A)	; &GT-18817; [23-10]
+      (=gb2312		  . #x4075)	; &I-G0-4075; [32-85]
+      (=ks-x1001	  . #x574A)	; &I-K0-574A; [55-42]
+      (=cns11643-1	  . #x5623)	; &I-C1-5623; [54-03]
+      (=jis-x0213-1	  . #x372A)	; &I-JX1-372A; [23-10]
+      (=daikanwa	  . 14695)	; &I-M-14695;
+      (=shinjigen	  .  3624)	; &GT-18817;
+      ))
+    (<-ancient*sources
+     yupian daikanwa shinjigen)
     (->subsumptive
-     ((=ucs@unicode	  . #x3B9A)	; &M-15166;
-      (=daikanwa	  . 15166)	; &M-15166;
-      (=shinjigen	  .  3625)	; &M-15166;
-      (<-ancient
-       ((=ucs@unicode	    . #x6817)	; &GT-18817;
-	(=jis-x0208	    . #x372A)	; &GT-18817; [23-10]
-	(=gb2312	    . #x4075)	; &I-G0-4075; [32-85]
-	(=ks-x1001	    . #x574A)	; &I-K0-574A; [55-42]
-	(=jis-x0213-1	    . #x372A)	; &I-JX1-372A; [23-10]
-	(=daikanwa	    . 14695)	; &I-M-14695;
-	(=shinjigen	    .  3624)	; &GT-18817;
+     ((==ucs@unicode	  . #x3B9A)	; &g2-M-15166;
+      (==daikanwa	  . 15166)	; &g2-M-15166;
+      (==shinjigen	  .  3625)	; &g2-M-15166;
+      (->subsumptive
+       ((===daikanwa	    . 15166)	; &R-M-15166;
+	)
+       ((===ucs@unicode	    . #x3B9A)	; &R-UU+3B9A;
 	))
-      (<-ancient*sources
-       yupian daikanwa shinjigen)
       )
-     ((=cns11643-3	  . #x417A)	; &C3-417A; [33-90]
+     ((==ucs@cns	  . #x3B9A)	; &g2-CU+3B9A;
+      (==cns11643-3	  . #x417A)	; &g2-CU+3B9A; [33-90]
       ))
     ))
 (define-char
@@ -18644,6 +18856,8 @@
       (==cns11643-1	  . #x6446)	; &g2-CU+696D; [68-38]
       )
      ((===hng-khi	  . 04280)	; &HNG010-04280;
+      )
+     ((===hng-khm	  . 03890)	; &HNG011-03890;
       ))
     ))
 (define-char
@@ -18934,6 +19148,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x4E9F)	; 亟
+      ))
     (=ucs		. #x6975)	; 極
     ))
 (define-char
@@ -18943,6 +19165,16 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs@cns		  . #x4E9F)	; &AJ1-04109;
+      (=ucs@jis		  . #x4E9F)	; &AJ1-04109;
+      (=adobe-japan1-0	  . 04109)	; &AJ1-04109;
+      ))
     (=ucs@cns		. #x6975)	; &GT-19035;
     (=ucs@jis		. #x6975)	; &GT-19035;
     (=ucs@ks		. #x6975)	; &GT-19035;
@@ -18957,7 +19189,17 @@
     (=daikanwa		. 15181)	; &I-M-15181;
     (=shinjigen		.  3712)	; &GT-19035;
     (->subsumptive
-     ((==ucs@jis	  . #x6975)	; &g2-GT-19035;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((==ucs@cns	    . #x4E9F)	; &g2-AJ1-04109;
+	(==ucs@jis	    . #x4E9F)	; &g2-AJ1-04109;
+	(==adobe-japan1-0   . 04109)	; &g2-AJ1-04109;
+	))
+      (==ucs@jis	  . #x6975)	; &g2-GT-19035;
       (==ucs@ks		  . #x6975)	; &g2-GT-19035;
       (==ks-x1001	  . #x503F)	; &g2-GT-19035; [48-31]
       (==jis-x0208	  . #x364B)	; &g2-GT-19035; [22-43]
@@ -18988,13 +19230,47 @@
      ((=ucs		  . #x6975)	; 極
       ))
     (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (=ucs		  . #x2FF6)	; ⿶
+      )
+     ((=ucs		  . #x4E9F)	; 亟
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (===hng-khm		. 03840)	; &HNG011-03840;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6975)	; 極
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs@unicode	  . #x4E9F)	; &G0-583D;
+      (=gb2312		  . #x583D)	; &G0-583D; [56-29]
+      ))
     (=ucs@unicode	. #x6975)	; &UU+6975;
     (=ucs@JP/hanazono	. nil)
     (=gb12345		. #x3C2B)	; &UU+6975; [28-11]
     (->subsumptive
-     ((==ucs@unicode	  . #x6975)	; &g2-UU+6975;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((==ucs@unicode	    . #x4E9F)	; &g2-UU+4E9F;
+	))
+      (==ucs@unicode	  . #x6975)	; &g2-UU+6975;
       (==ucs@JP/hanazono  . nil)
       (==gb12345	  . #x3C2B)	; &g2-UU+6975; [28-11]
       ))
@@ -19409,8 +19685,13 @@
     (=daikanwa		. 15213)	; &I-M-15213;
     (=shinjigen		.  3706)	; 楽
     (<-simplified@JP/Jouyou
-     ((=ucs		  . #x6A02)	; 樂
-      (=jis-x0208	  . #x5C5B)	; &I-J90-5C5B; [60-59]
+     ((=>ucs@iwds-1	  . #x6A02)	; &GT-19659;
+      (=ucs@unicode	  . #x6A02)	; &GT-19659;
+      (=jis-x0208	  . #x5C5B)	; &GT-19659; [60-59]
+      (=ks-x1001	  . #x6445)	; &I-K0-6445; [68-37]
+      (=cns11643-1	  . #x6D40)	; &I-C1-6D40; [77-32]
+      (=jis-x0213-1	  . #x5C5B)	; &I-JX1-5C5B; [60-59]
+      (=daikanwa	  . 15399)	; &I-M-15399;
       ))
     (->subsumptive
      ((==ucs@unicode	  . #x697D)	; &g2-GT-19243;
@@ -21334,9 +21615,9 @@
 	)
        ((=gt-k		    . 00495)	; &GT-K00495;
 	)
-       ((==ucs@jis	    . #x810A)	; &g2-GT-38115;
-	(==ucs@ks	    . #x810A)	; &g2-GT-38115;
-	(==jis-x0208	    . #x4054)	; &g2-GT-38115; [32-52]
+       ((==ucs@jis	    . #x810A)	; &g2-AJ1-02680;
+	(==ucs@ks	    . #x810A)	; &g2-AJ1-02680;
+	(==adobe-japan1-0   . 02680)	; &g2-AJ1-02680;
 	))
       (==daikanwa	  . 15270)	; &g2-M-15270;
       (==cbeta		  . 01097)	; &g2-M-15270;
@@ -22515,6 +22796,23 @@
     (===hng-khi		. 04340)	; &HNG010-04340;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x69C3)	; 槃
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs-itaiji-004	  . #x822C)	; &U-i004+822C;
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (===hng-khm		. 03930)	; &HNG011-03930;
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
@@ -22782,7 +23080,13 @@
       (=jis-x0213-1	  . #x3F2B)	; &I-JX1-3F2B; [31-11]
       (=daikanwa	  . 38686)	; &I-M-38686;
       ))
+    (=shinjigen		.  6370)	; &JC3-53F6;
     (=jef-china3	. #x53F6)	; &JC3-53F6;
+    (<-original
+     ((=shinjigen	  .  6369)	; &SJG2-6369;
+      ))
+    (<-original*sources
+     shinjigen)
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -22794,6 +23098,7 @@
 	(==ucs@ks	    . #x8FB1)	; &g2-GT-51624;
 	(==jis-x0208	    . #x3F2B)	; &g2-GT-51624; [31-11]
 	))
+      (==shinjigen	  .  6370)	; &g2-JC3-53F6;
       (==jef-china3	  . #x53F6)	; &g2-JC3-53F6;
       ))
     ))
@@ -25655,17 +25960,35 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A02)	; 樂
-    (=jis-x0208		. #x5C5B)	; &I-J90-5C5B; [60-59]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A02)	; 樂
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8BF4)	; &CDP-8BF4;
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
+    (=>ucs@iwds-1	. #x6A02)	; &GT-19659;
+    (=ucs@unicode	. #x6A02)	; &GT-19659;
+    (=jis-x0208		. #x5C5B)	; &GT-19659; [60-59]
     (=ks-x1001		. #x6445)	; &I-K0-6445; [68-37]
     (=cns11643-1	. #x6D40)	; &I-C1-6D40; [77-32]
     (=jis-x0213-1	. #x5C5B)	; &I-JX1-5C5B; [60-59]
-    (=gb12345		. #x4056)	; 樂 [32-54]
+    (=gb12345		. #x4056)	; &GT-19659; [32-54]
     (=big5		. #xBCD6)	; &I-B-BCD6;
     (=gt		. 19659)	; &I-GT-19659;
     (=gt-k		. 11978)	; &I-GT-K11978;
     (=gt-pj-1		. #x5C5B)	; &I-GT-19659; [60-59]
     (=daikanwa		. 15399)	; &I-M-15399;
-    (=shinjigen		.  3707)	; 樂
+    (=shinjigen		.  3707)	; &GT-19659;
     (->subsumptive
      ((==ucs@unicode	  . #x6A02)	; &g2-GT-19659;
       (==ks-x1001	  . #x6445)	; &g2-GT-19659; [68-37]
@@ -25693,8 +26016,28 @@
       )
      ((==ucs@cns	  . #x6A02)	; &g2-CU+6A02;
       (==cns11643-1	  . #x6D40)	; &g2-CU+6A02; [77-32]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6A02)	; 樂
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8BF4)	; &CDP-8BF4;
       )
+     ((=ucs		  . #x21B55)	; 𡭕
+      ))
+    (=ucs-itaiji-001	. #x6A02)	; &U-i001+6A02;
+    (->subsumptive
      ((===hng-khi	  . 04330)	; &HNG010-04330;
+      )
+     ((===hng-khm	  . 03920)	; &HNG011-03920;
       ))
     ))
 (define-char
@@ -26469,6 +26812,23 @@
     (===hng-khi		. 00900)	; &HNG010-00900;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6A13)	; 樓
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs-itaiji-001	  . #x21764)	; &U-i001+21764;
+      ))
+    (===hng-khm		. 00660)	; &HNG011-00660;
+    ))
+(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -28422,6 +28782,8 @@
 	))
       )
      ((===hng-khi	  . 04370)	; &HNG010-04370;
+      )
+     ((===hng-khm	  . 03900)	; &HNG011-03900;
       ))
     ))
 (define-char
@@ -31084,8 +31446,8 @@
       )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ks-x1001	  . #x5339)	; &M-39011; [51-25]
-      (=daikanwa	  . 39011)	; &I-M-39011;
+     ((=ucs@ks		  . #x9054)	; &AJ1-13912;
+      (=adobe-japan1-4	  . 13912)	; &AJ1-13912;
       ))
     (=daikanwa		. 15625)	; &M-15625;
     (=cbeta		. 02762)	; &I-CB02762;
@@ -31096,8 +31458,8 @@
 	)
        ((=gt-k		    . 00495)	; &GT-K00495;
 	)
-       ((=ks-x1001	    . #x5339)	; &M-39011; [51-25]
-	(=daikanwa	    . 39011)	; &I-M-39011;
+       ((==ucs@ks	    . #x9054)	; &g2-AJ1-13912;
+	(==adobe-japan1-4   . 13912)	; &g2-AJ1-13912;
 	))
       (==daikanwa	  . 15625)	; &g2-M-15625;
       (==cbeta		  . 02762)	; &g2-M-15625;
@@ -31159,24 +31521,13 @@
       )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs@unicode	  . #x9054)	; &GT-52255;
-      (=jis-x0208	  . #x4323)	; &GT-52255; [35-03]
-      (=jis-x0213-1	  . #x4323)	; &I-JX1-4323; [35-03]
+     ((=ucs@unicode	  . #x9054)	; &AJ1-02913;
+      (=adobe-japan1-0	  . 02913)	; &AJ1-02913;
       ))
     (=ucs@unicode	. #x6A7D)	; &UU+6A7D;
     (=ucs@JP/hanazono	. nil)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=gt-k		    . 00495)	; &GT-K00495;
-	)
-       ((=ucs@unicode	    . #x9054)	; &GT-52255;
-	(=jis-x0208	    . #x4323)	; &GT-52255; [35-03]
-	(=jis-x0213-1	    . #x4323)	; &I-JX1-4323; [35-03]
-	))
-      (==ucs@unicode	  . #x6A7D)	; &g2-UU+6A7D;
+     ((==ucs@unicode	  . #x6A7D)	; &g2-UU+6A7D;
       (==ucs@JP/hanazono  . nil)
       ))
     ))
@@ -31262,7 +31613,7 @@
        ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((==ucs@jis	    . #x8C66)	; &g2-GT-48799;
-	(==daikanwa	    . 36391)	; &g2-GT-48799;
+	(==jis-x0212	    . #x5E75)	; &g2-GT-48799; [62-85]
 	))
       (==daikanwa	  . 15627)	; &g2-M-15627;
       (==cbeta		  . 04651)	; &g2-M-15627;
@@ -33516,10 +33867,32 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (===hng-khi		. 04320)	; &HNG010-04320;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x9763)	; 靣
+	)
+       ((=ucs		    . #x65E6)	; 旦
+	))
+      ))
+    (=ucs-var-001	. #x23780)	; &U-v001+23780;
     (<-formed
      ((=ucs		  . #x6A80)	; 檀
       ))
+    (<-formed*sources
+     hng)
+    (->subsumptive
+     ((===hng-khi	  . 04320)	; &HNG010-04320;
+      )
+     ((===hng-khm	  . 00680)	; &HNG011-00680;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -35648,6 +36021,7 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (hanyu-dazidian	2 1313 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -35657,22 +36031,35 @@
      ((=ucs		  . #x616E)	; 慮
       ))
     (=ucs		. #x6AD6)	; 櫖
+    (=jis-x0212		. #x4552)	; &I-JSP-4552; [37-50]
+    (=cns11643-4	. #x5F71)	; &I-C4-5F71; [63-81]
+    (=daikanwa		. 15805)	; &I-M-15805;
+    (=cbeta		. 06256)	; &I-CB06256;
     (->subsumptive
-     ((hanyu-dazidian	  2 1313 9)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
        ((=gt-k		    . 00495)	; &GT-K00495;
 	)
-       ((=ucs@unicode	    . #x616E)	; &AJ1-03968;
-	(=adobe-japan1-0    . 03968)	; &AJ1-03968;
+       ((==ucs@unicode	    . #x616E)	; &g2-AJ1-03968;
+	(==adobe-japan1-0   . 03968)	; &g2-AJ1-03968;
+	))
+      (==ucs@unicode	  . #x6AD6)	; &g2-JSP-4552;
+      (==jis-x0212	  . #x4552)	; &g2-JSP-4552; [37-50]
+      (==daikanwa	  . 15805)	; &g2-JSP-4552;
+      (==cbeta		  . 06256)	; &g2-JSP-4552;
+      (->subsumptive
+       ((===daikanwa	    . 15805)	; &R-M-15805;
+	)
+       ((===jis-x0212	    . #x4552)	; &R-JSP-4552; [37-50]
+	)
+       ((===ucs@unicode	    . #x6AD6)	; &R-UU+6AD6;
+	)
+       ((=hanziku-4	    . #xB667)	; &HZK04-B667;
+	)
+       ((===cbeta	    . 06256)	; &R-CB06256;
 	))
-      (=ucs@unicode	  . #x6AD6)	; &JSP-4552;
-      (=jis-x0212	  . #x4552)	; &JSP-4552; [37-50]
-      (=daikanwa	  . 15805)	; &I-M-15805;
-      (=hanziku-4	  . #xB667)	; &I-HZK04-B667;
-      (=cbeta		  . 06256)	; &I-CB06256;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -35680,9 +36067,11 @@
 	)
        ((=gt-k		    . 00495)	; &GT-K00495;
 	)
-       ((=cns11643-1	    . #x6C65)	; &C1-6C65; [76-69]
+       ((==ucs@cns	    . #x616E)	; &g2-CU+616E;
+	(==cns11643-1	    . #x6C65)	; &g2-CU+616E; [76-69]
 	))
-      (=cns11643-4	  . #x5F71)	; &C4-5F71; [63-81]
+      (==ucs@cns	  . #x6AD6)	; &g2-CU+6AD6;
+      (==cns11643-4	  . #x5F71)	; &g2-CU+6AD6; [63-81]
       ))
     ))
 (define-char
@@ -36312,14 +36701,31 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00495)	; &GT-K00495;
+     ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs@ks		  . #x9069)	; &GT-52561;
-      (=ks-x1001	  . #x6E6A)	; &GT-52561; [78-74]
-      (=daikanwa	  . 39076)	; &I-M-39076;
+     ((=ucs@ks		  . #x9069)	; &AJ1-13946;
+      (=adobe-japan1-4	  . 13946)	; &AJ1-13946;
       ))
     (=daikanwa		. 15825)	; &M-15825;
     (=cbeta		. 03800)	; &I-CB03800;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((==ucs@ks	    . #x9069)	; &g2-GT-52561;
+	(==daikanwa	    . 39076)	; &g2-GT-52561;
+	))
+      (==daikanwa	  . 15825)	; &g2-M-15825;
+      (==cbeta		  . 03800)	; &g2-M-15825;
+      (->subsumptive
+       ((===daikanwa	    . 15825)	; &R-M-15825;
+	)
+       ((===cbeta	    . 03800)	; &R-CB03800;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -36332,11 +36738,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00495)	; &GT-K00495;
+     ((=ucs		  . #x6728)	; 木
       )
      ((=cns11643-1	  . #x6F4B)	; &C1-6F4B; [79-43]
       ))
+    (=ucs@cns		. #x3C05)	; &C3-5A4C;
     (=cns11643-3	. #x5A4C)	; &C3-5A4C; [58-44]
+    (->subsumptive
+     ((==ucs@cns	  . #x3C05)	; &g2-CU+3C05;
+      (==cns11643-3	  . #x5A4C)	; &g2-CU+3C05; [58-44]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -36349,13 +36760,17 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00495)	; &GT-K00495;
+     ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs@unicode	  . #x9069)	; &GT-52472;
-      (=jis-x0208	  . #x452C)	; &GT-52472; [37-12]
-      (=jis-x0213-1	  . #x452C)	; &I-JX1-452C; [37-12]
+     ((=ucs@unicode	  . #x9069)	; &AJ1-03110;
+      (=adobe-japan1-0	  . 03110)	; &AJ1-03110;
       ))
     (=ucs@unicode	. #x3C05)	; &UU+3C05;
+    (=ucs@JP/hanazono	. nil)
+    (->subsumptive
+     ((==ucs@unicode	  . #x3C05)	; &g2-UU+3C05;
+      (==ucs@JP/hanazono  . nil)
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -37818,6 +38233,21 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x9072)	; 遲
+      ))
+    (=>cbeta		. 01849)	; &A-CB01849;
+    ))
+(define-char
+  '((<-denotational
+     ((=>cbeta		  . 01849)	; &A-CB01849;
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 16)
     (total-strokes	 . 20)
     (ideographic-structure
@@ -37826,24 +38256,13 @@
       )
      ((=ucs		  . #x6728)	; 木
       )
-     ((=ucs		  . #x9072)	; 遲
+     ((=ucs@jis		  . #x9072)	; &AJ1-06924;
+      (=ucs@ks		  . #x9072)	; &AJ1-06924;
+      (=adobe-japan1-0	  . 06924)	; &AJ1-06924;
       ))
-    (=>>cbeta		. 01849)	; &G-CB01849;
+    (=cbeta		. 01849)	; &CB01849;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=gt-k		    . 00495)	; &GT-K00495;
-	)
-       ((=ucs@jis	    . #x9072)	; &GT-52644;
-	(=ucs@ks	    . #x9072)	; &GT-52644;
-	(=jis-x0208	    . #x6E2F)	; &GT-52644; [78-15]
-	(=ks-x1001	    . #x7240)	; &I-K0-7240; [82-32]
-	(=jis-x0213-1	    . #x6E2F)	; &I-JX1-6E2F; [78-15]
-	(=daikanwa	    . 39113)	; &I-M-39113;
-	))
-      (=cbeta		  . 01849)	; &CB01849;
+     ((==cbeta		  . 01849)	; &g2-CB01849;
       ))
     ))
 (define-char
@@ -38972,6 +39391,8 @@
 	)
        ((===cns11643-1	    . #x7B62)	; &R-C1-7B62; [91-66]
 	))
+      )
+     ((===hng-khm	  . 00640)	; &HNG011-00640;
       ))
     ))
 (define-char