X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R033-Scholar.el;h=3533ae8e9e4db08121d1f16883b2d453537c3bab;hb=3d5536f7027e0bc91bd53570b7385f88a73f8981;hp=5bf2bf5e1278606aa2774d4fbb302592fe8b9893;hpb=f8e244d4bc6fd8b2f97759c4eb76da534e8933fa;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R033-Scholar.el b/lisp/utf-2000/Ideograph-R033-Scholar.el
index 5bf2bf5..3533ae8 100644
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -190,8 +190,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 +251,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 +269,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 +280,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 +292,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)	; â¼ 
@@ -486,7 +542,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 +550,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;
@@ -505,6 +570,29 @@
     (=gt-k		. 05308)	; &I-GT-K05308;
     (=gt-pj-2		. #x6465)	; &I-GT-07150; [68-69]
     (=daikanwa		. 05649)	; &I-M-05649;
+    (->subsumptive
+     ((==ucs@unicode	  . #x58F4)	; &g2-AJ1-17467;
+      (==adobe-japan1-5	  . 17467)	; &g2-AJ1-17467;
+      (==cns11643-2	  . #x2960)	; &g2-AJ1-17467; [09-64]
+      (==jis-x0213-2	  . #x2537)	; &g2-AJ1-17467; [05-23]
+      (==gt		  . 07150)	; &g2-AJ1-17467;
+      (==gt-k		  . 05308)	; &g2-AJ1-17467;
+      (==daikanwa	  . 05649)	; &g2-AJ1-17467;
+      (->subsumptive
+       ((===daikanwa	    . 05649)	; &R-M-05649;
+	)
+       ((===jis-x0213-2	    . #x2537)	; &R-JX2-2537; [05-23]
+	)
+       ((===adobe-japan1-5  . 17467)	; &R-AJ1-17467;
+	)
+       ((===cns11643-2	    . #x2960)	; &R-C2-2960; [09-64]
+	)
+       ((===gt		    . 07150)	; &R-GT-07150;
+	(===gt-k	    . 05308)	; &R-GT-07150;
+	)
+       ((===ucs@unicode	    . #x58F4)	; &R-UU+58F4;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -516,8 +604,29 @@
     (=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)	; â¼