X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R033-Scholar.el;h=5c007c4d374893a8e9f267701b5eca9543126d06;hb=e71fa43d3a71a80f54f634d54aa9fc51f593891d;hp=1a43de663ae8398dd2ccd27678476d22b689fa1e;hpb=f45d8c1cd54d57f02993583c069f58917644396e;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index 1a43de6..5c007c4 100644
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -17,6 +17,39 @@
     (=gt-pj-1		. #x3B4E)	; &I-GT-07135; [27-46]
     (=daikanwa		. 05638)	; &I-M-05638;
     (=shinjigen		.  1524)	; 士
+    (->subsumptive
+     ((==ucs@unicode	  . #x58EB)	; &g2-AJ1-02204;
+      (==adobe-japan1-0	  . 02204)	; &g2-AJ1-02204;
+      (==gb2312		  . #x4A3F)	; &g2-AJ1-02204; [42-31]
+      (==ks-x1001	  . #x5E4D)	; &g2-AJ1-02204; [62-45]
+      (==jis-x0208	  . #x3B4E)	; &g2-AJ1-02204; [27-46]
+      (==cns11643-1	  . #x4449)	; &g2-AJ1-02204; [36-41]
+      (==jis-x0213-1	  . #x3B4E)	; &g2-AJ1-02204; [27-46]
+      (==gt		  . 07135)	; &g2-AJ1-02204;
+      (==gt-k		  . 00178)	; &g2-AJ1-02204;
+      (==daikanwa	  . 05638)	; &g2-AJ1-02204;
+      (==shinjigen	  .  1524)	; &g2-AJ1-02204;
+      (->subsumptive
+       ((===daikanwa	    . 05638)	; &R-M-05638;
+	)
+       ((===jis-x0208	    . #x3B4E)	; &R-J0-3B4E; [27-46]
+	(===jis-x0213-1	    . #x3B4E)	; &R-J0-3B4E; [27-46]
+	)
+       ((===adobe-japan1-0  . 02204)	; &R-AJ1-02204;
+	)
+       ((===cns11643-1	    . #x4449)	; &R-C1-4449; [36-41]
+	)
+       ((===gt		    . 07135)	; &R-GT-07135;
+	(===gt-k	    . 00178)	; &R-GT-07135;
+	)
+       ((===ucs@ks	    . #x58EB)	; &R-K0-5E4D;
+	(===ks-x1001	    . #x5E4D)	; &R-K0-5E4D; [62-45]
+	)
+       ((===ucs@unicode	    . #x58EB)	; &R-UU+58EB;
+	))
+      )
+     ((===hng-kar	  . 07070)	; &HNG018-07070;
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -190,8 +223,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((==ucs@unicode	    . #x723F)	; &g2-GT-25375;
-	(==jis-x0208	    . #x602D)	; &g2-GT-25375; [64-13]
+       ((==ucs@unicode	    . #x723F)	; &g2-AJ1-05606;
+	(==adobe-japan1-0   . 05606)	; &g2-AJ1-05606;
 	)
        ((=ucs		    . #x58EB)	; 士
 	))
@@ -251,6 +284,15 @@
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=ucs		. #x58F0)	; 声
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58F0)	; 声
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
     (hanyu-dazidian	1 429 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -260,8 +302,8 @@
       )
      ((=ucs		  . #x200DC)	; 𠃜
       ))
-    (=ucs		. #x58F0)	; 声
-    (=adobe-japan1-0	. 02656)	; &I-AJ1-02656;
+    (=ucs@unicode	. #x58F0)	; &AJ1-02656;
+    (=adobe-japan1-0	. 02656)	; &AJ1-02656;
     (=jis-x0208		. #x403C)	; &I-J90-403C; [32-28]
     (=gb2312		. #x4979)	; &I-G0-4979; [41-89]
     (=cns11643-3	. #x2545)	; &I-C3-2545; [05-37]
@@ -271,7 +313,7 @@
     (=gt-k		. 02590)	; &I-GT-K02590;
     (=gt-pj-1		. #x403C)	; &I-GT-07143; [32-28]
     (=daikanwa		. 05645)	; &I-M-05645;
-    (=shinjigen		.  6398)	; 声
+    (=shinjigen		.  6398)	; &AJ1-02656;
     (<-simplified@CN
      ((=ucs		  . #x8072)	; 聲
       (=gb12345		  . #x4979)	; 聲 [41-89]
@@ -283,6 +325,53 @@
     (<-simplified@ucs
      ((=ucs		  . #x8072)	; 聲
       ))
+    (->subsumptive
+     ((==ucs@unicode	  . #x58F0)	; &g2-AJ1-02656;
+      (==adobe-japan1-0	  . 02656)	; &g2-AJ1-02656;
+      (==gb2312		  . #x4979)	; &g2-AJ1-02656; [41-89]
+      (==jis-x0208	  . #x403C)	; &g2-AJ1-02656; [32-28]
+      (==cns11643-3	  . #x2545)	; &g2-AJ1-02656; [05-37]
+      (==jis-x0213-1	  . #x403C)	; &g2-AJ1-02656; [32-28]
+      (==big5-cdp	  . #x8BE1)	; &g2-AJ1-02656;
+      (==gt		  . 07143)	; &g2-AJ1-02656;
+      (==gt-k		  . 02590)	; &g2-AJ1-02656;
+      (==daikanwa	  . 05645)	; &g2-AJ1-02656;
+      (==shinjigen	  .  6398)	; &g2-AJ1-02656;
+      (->subsumptive
+       ((===daikanwa	    . 05645)	; &R-M-05645;
+	)
+       ((===jis-x0208	    . #x403C)	; &R-J0-403C; [32-28]
+	(===jis-x0213-1	    . #x403C)	; &R-J0-403C; [32-28]
+	)
+       ((===adobe-japan1-0  . 02656)	; &R-AJ1-02656;
+	)
+       ((===big5-cdp	    . #x8BE1)	; &R-CDP-8BE1;
+	)
+       ((===cns11643-3	    . #x2545)	; &R-C3-2545; [05-37]
+	)
+       ((===gt		    . 07143)	; &R-GT-07143;
+	(===gt-k	    . 02590)	; &R-GT-07143;
+	)
+       ((===ucs@unicode	    . #x58F0)	; &R-UU+58F0;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58F0)	; 声
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x571F)	; 土
+      )
+     ((=ucs		  . #x200DC)	; 𠃜
+      ))
+    (=ucs-var-001	. #x58F0)	; &U-v001+58F0;
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -368,7 +457,10 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 33)	; â¼ 
+  '((<-denotational
+     ((==>ucs@bucs	  . #x6BBC)	; &BUCS+6BBC;
+      ))
+    (ideographic-radical . 33)	; â¼ 
     (=ucs		. #x58F3)	; 壳
     ))
 (define-char
@@ -424,6 +516,12 @@
 	)
        ((===cns11643-3	    . #x282D)	; &R-C3-282D; [08-13]
 	))
+      )
+     ((=big5-cdp	  . #x8DA1)	; &CDP-8DA1;
+      (<-formed@component/connect-right
+       ((=ucs@jis	    . #x58F3)	; &AJ1-17466;
+	(=adobe-japan1-5    . 17466)	; &AJ1-17466;
+	))
       ))
     ))
 (define-char
@@ -463,6 +561,10 @@
     (=ucs@unicode	. #x58F3)	; &G0-3F47;
     (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x3F47)	; &G0-3F47; [31-39]
+    (<-simplified@CN
+     ((=ucs		  . #x6BBB)	; æ®»
+      (=gb12345		  . #x3F47)	; æ®» [31-39]
+      ))
     (->subsumptive
      ((==ucs@unicode	  . #x58F3)	; &g2-UU+58F3;
       (==ucs@JP/hanazono  . nil)
@@ -486,7 +588,6 @@
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (hanyu-dazidian	1 439 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -495,9 +596,19 @@
       )
      ((=ucs		  . #x8C46)	; 豆
       ))
-    (sound@ja/on	"syu" "tyu")
     (=ucs		. #x58F4)	; 壴
-    (=adobe-japan1-5	. 17467)	; &I-AJ1-17467;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58F4)	; 壴
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	1 439 6)
+    (sound@ja/on	"syu" "tyu")
+    (=ucs@unicode	. #x58F4)	; &AJ1-17467;
+    (=adobe-japan1-5	. 17467)	; &AJ1-17467;
     (=cns11643-2	. #x2960)	; &I-C2-2960; [09-64]
     (=jis-x0213-2	. #x2537)	; &I-JX2-2537; [05-23]
     (=big5		. #xCE5F)	; &I-B-CE5F;
@@ -539,13 +650,43 @@
     (=gt-k		. 05309)	; &GT-K05309;
     (=gt-pj-k1		. #x347E)	; &GT-K05309; [20-94]
     (<-formed@component/connect-right
+     ((=ucs@unicode	  . #x58F4)	; &AJ1-17467;
+      (=adobe-japan1-5	  . 17467)	; &AJ1-17467;
+      ))
+    ))
+(define-char
+  '((<-denotational
      ((=ucs		  . #x58F4)	; 壴
       ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=mj		. 009392)	; &MJ009392;
+    (=hanyo-denshi/ks	. 058120)	; &MJ009392;
+    (->subsumptive
+     ((==mj		  . 009392)	; &g2-MJ009392;
+      (==hanyo-denshi/ks  . 058120)	; &g2-MJ009392;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 058120)	; &R-HD-KS-058120;
+	(=hanyo-denshi/ks/mf . #x16B4)	; &R-HD-KS-058120;
+	)
+       ((===mj		    . 009392)	; &R-MJ009392;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=ucs		. #x58F5)	; 壵
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58F5)	; 壵
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (hanyu-dazidian	1 437 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -562,10 +703,47 @@
        ((=ucs		    . #x58EB)	; 士
 	))
       ))
-    (=ucs		. #x58F5)	; 壵
-    (=cns11643-3	. #x2B77)	; &I-C3-2B77; [11-87]
+    (=ucs@unicode	. #x58F5)	; &C3-2B77;
+    (=cns11643-3	. #x2B77)	; &C3-2B77; [11-87]
     (=daikanwa		. 05650)	; &I-M-05650;
-    (=hanziku-2		. #xA9F5)	; &I-HZK02-A9F5;
+    (->subsumptive
+     ((==ucs@unicode	  . #x58F5)	; &g2-M-05650;
+      (==cns11643-3	  . #x2B77)	; &g2-M-05650; [11-87]
+      (==daikanwa	  . 05650)	; &g2-M-05650;
+      (->subsumptive
+       ((===daikanwa	    . 05650)	; &R-M-05650;
+	)
+       ((===cns11643-3	    . #x2B77)	; &R-C3-2B77; [11-87]
+	)
+       ((===ucs@unicode	    . #x58F5)	; &R-UU+58F5;
+	)
+       ((=hanziku-2	    . #xA9F5)	; &HZK02-A9F5;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x58F5)	; 壵
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x58EB)	; 士
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x58EB)	; 士
+	)
+       ((=ucs		    . #x571F)	; 土
+	))
+      ))
+    (=ucs-var-002	. #x58F5)	; &U-v002+58F5;
     ))
 (define-char
   '((=>ucs		. #x21522)	; 𡔢
@@ -1021,6 +1199,39 @@
     (=gt-pj-1		. #x5468)	; &I-GT-07184; [52-72]
     (=daikanwa		. 05672)	; &I-M-05672;
     (=shinjigen		.  1534)	; 壽
+    (->subsumptive
+     ((==ucs@unicode	  . #x58FD)	; &g2-AJ1-04537;
+      (==adobe-japan1-0	  . 04537)	; &g2-AJ1-04537;
+      (==ks-x1001	  . #x6178)	; &g2-AJ1-04537; [65-88]
+      (==jis-x0208	  . #x5468)	; &g2-AJ1-04537; [52-72]
+      (==cns11643-1	  . #x6840)	; &g2-AJ1-04537; [72-32]
+      (==jis-x0213-1	  . #x5468)	; &g2-AJ1-04537; [52-72]
+      (==gb12345	  . #x4A59)	; &g2-AJ1-04537; [42-57]
+      (==gt		  . 07184)	; &g2-AJ1-04537;
+      (==gt-k		  . 11196)	; &g2-AJ1-04537;
+      (==daikanwa	  . 05672)	; &g2-AJ1-04537;
+      (==shinjigen	  .  1534)	; &g2-AJ1-04537;
+      (->subsumptive
+       ((===daikanwa	    . 05672)	; &R-M-05672;
+	)
+       ((===jis-x0208	    . #x5468)	; &R-J0-5468; [52-72]
+	(===jis-x0213-1	    . #x5468)	; &R-J0-5468; [52-72]
+	)
+       ((===adobe-japan1-0  . 04537)	; &R-AJ1-04537;
+	)
+       ((===cns11643-1	    . #x6840)	; &R-C1-6840; [72-32]
+	)
+       ((===gt		    . 07184)	; &R-GT-07184;
+	(===gt-k	    . 11196)	; &R-GT-07184;
+	)
+       ((===ucs@ks	    . #x58FD)	; &R-K0-6178;
+	(===ks-x1001	    . #x6178)	; &R-K0-6178; [65-88]
+	)
+       ((===ucs@unicode	    . #x58FD)	; &R-UU+58FD;
+	))
+      )
+     ((===hng-kar	  . 00800)	; &HNG018-00800;
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼