X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R033-Scholar.el;h=fe1ce0bc7a99bbfe1009322df15eaf5923103803;hb=2897861e5e88d7ae9b1c314a8d5970f3868e35a1;hp=b59eab2571a3305d596470fbdee62f23f722c547;hpb=ff3773ea38909f7f900ed070d506adfa8c3d7101;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 b59eab2..fe1ce0b 100644
--- a/lisp/utf-2000/Ideograph-R033-Scholar.el
+++ b/lisp/utf-2000/Ideograph-R033-Scholar.el
@@ -208,8 +208,8 @@
       (->subsumptive
        ((===daikanwa	    . 05643)	; &R-M-05643;
 	)
-       ((===jis-x0208	    . #x5463)	; &R-J90-5463; [52-67]
-	(===jis-x0213-1	    . #x5463)	; &R-J90-5463; [52-67]
+       ((===jis-x0208	    . #x5463)	; &R-J0-5463; [52-67]
+	(===jis-x0213-1	    . #x5463)	; &R-J0-5463; [52-67]
 	)
        ((===adobe-japan1-0  . 04532)	; &R-AJ1-04532;
 	)
@@ -245,7 +245,10 @@
     (=daikanwa		. 05644)	; &I-M-05644;
     ))
 (define-char
-  '((ideographic-radical . 33)	; â¼ 
+  '((<-denotational
+     ((==>ucs@bucs	  . #x8072)	; &BUCS+8072;
+      ))
+    (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 429 1)
@@ -270,14 +273,12 @@
     (=daikanwa		. 05645)	; &I-M-05645;
     (=shinjigen		.  6398)	; 声
     (<-simplified@CN
-     ((=ucs@unicode	  . #x8072)	; &UU+8072;
-      (=gb12345		  . #x4979)	; &UU+8072; [41-89]
+     ((=ucs		  . #x8072)	; 聲
+      (=gb12345		  . #x4979)	; 聲 [41-89]
       ))
     (<-simplified@JP/Jouyou
-     ((=ucs@jis		  . #x8072)	; &J90-6661;
-      (=jis-x0208	  . #x6661)	; &J90-6661; [70-65]
-      (=ks-x1001	  . #x6122)	; &I-K0-6122; [65-02]
-      (=jis-x0213-1	  . #x6661)	; &I-JX1-6661; [70-65]
+     ((=ucs		  . #x8072)	; 聲
+      (=jis-x0208	  . #x6661)	; &I-J90-6661; [70-65]
       ))
     (<-simplified@ucs
      ((=ucs		  . #x8072)	; 聲
@@ -377,11 +378,6 @@
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=decomposition@cid
-     ((=ucs		  . #x58F3)	; 壳
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -405,6 +401,30 @@
     (=cns11643-3	. #x282D)	; &I-C3-282D; [08-13]
     (=jis-x0213-2	. #x2536)	; &I-JX2-2536; [05-22]
     (=daikanwa		. 05648)	; &I-M-05648;
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x58F3)	; 壳
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@cns	  . #x58F3)	; &g2-AJ1-17466;
+      (==ucs@jis	  . #x58F3)	; &g2-AJ1-17466;
+      (==adobe-japan1-5	  . 17466)	; &g2-AJ1-17466;
+      (==jis-x0212	  . #x385E)	; &g2-AJ1-17466; [24-62]
+      (==cns11643-3	  . #x282D)	; &g2-AJ1-17466; [08-13]
+      (==jis-x0213-2	  . #x2536)	; &g2-AJ1-17466; [05-22]
+      (==daikanwa	  . 05648)	; &g2-AJ1-17466;
+      (->subsumptive
+       ((===daikanwa	    . 05648)	; &R-M-05648;
+	)
+       ((===jis-x0212	    . #x385E)	; &R-JX2-2536; [24-62]
+	(===jis-x0213-2	    . #x2536)	; &R-JX2-2536; [05-22]
+	)
+       ((===adobe-japan1-5  . 17466)	; &R-AJ1-17466;
+	)
+       ((===cns11643-3	    . #x282D)	; &R-C3-282D; [08-13]
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -413,7 +433,6 @@
     (ideographic-radical . 33)	; â¼ 
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (hanyu-dazidian	1 428 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -422,9 +441,38 @@
       )
      ((=ucs		  . #x5197)	; 冗
       ))
+    (=>ucs@unicode	. #x58F3)	; &A-UU+58F3;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@unicode	  . #x58F3)	; &A-UU+58F3;
+      ))
+    (ideographic-radical . 33)	; â¼ 
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (hanyu-dazidian	1 428 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x58EB)	; 士
+      )
+     ((=ucs@unicode	  . #x5197)	; &MJ007329;
+      (=mj		  . 007329)	; &MJ007329;
+      ))
     (=ucs@unicode	. #x58F3)	; &G0-3F47;
+    (=ucs@JP/hanazono	. nil)
     (=gb2312		. #x3F47)	; &G0-3F47; [31-39]
-    (=hanziku-2		. #xA850)	; &I-HZK02-A850;
+    (->subsumptive
+     ((==ucs@unicode	  . #x58F3)	; &g2-UU+58F3;
+      (==ucs@JP/hanazono  . nil)
+      (==gb2312		  . #x3F47)	; &g2-UU+58F3; [31-39]
+      (->subsumptive
+       ((===ucs@unicode	    . #x58F3)	; &R-UU+58F3;
+	)
+       ((=hanziku-2	    . #xA850)	; &HZK02-A850;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 33)	; â¼ 
@@ -980,10 +1028,18 @@
     (ideographic-radical@cns . 41)	; ⼨
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (hanyu-dazidian	1 490 1)
     (=ucs		. #x5900)	; 夀
+    (=cns11643-6	. #x5C2F)	; &I-C6-5C2F; [60-15]
+    (=daikanwa		. 07459)	; &I-M-07459;
+    (<-same
+     ((=ucs		  . #x58FD)	; 壽
+      (=daikanwa	  . 05672)	; &I-M-05672;
+      ))
+    (<-same*sources
+     cihai daikanwa)
     (->subsumptive
-     ((hanyu-dazidian	  1 490 1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -991,11 +1047,23 @@
 	)
        ((=ucs		    . #x540B)	; 吋
 	))
-      (=ucs@unicode	  . #x5900)	; &M-07459;
-      (=daikanwa	  . 07459)	; &M-07459;
-      (=hanziku-2	  . #xB4D5)	; &I-HZK02-B4D5;
+      (==ucs@unicode	  . #x5900)	; &g2-M-07459;
+      (==daikanwa	  . 07459)	; &g2-M-07459;
+      (->subsumptive
+       ((===daikanwa	    . 07459)	; &R-M-07459;
+	)
+       ((===ucs@unicode	    . #x5900)	; &R-UU+5900;
+	)
+       ((=hanziku-2	    . #xB4D5)	; &HZK02-B4D5;
+	))
       )
-     ((=cns11643-6	  . #x5C2F)	; &C6-5C2F; [60-15]
+     ((==ucs@cns	  . #x5900)	; &g2-CU+5900;
+      (==cns11643-6	  . #x5C2F)	; &g2-CU+5900; [60-15]
+      (->subsumptive
+       ((===cns11643-6	    . #x5C2F)	; &R-C6-5C2F; [60-15]
+	)
+       ((===hng-khi	    . 03240)	; &HNG010-03240;
+	))
       ))
     ))
 (define-char