X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R072-Sun.el;h=7daa6ded99ebd1bac4a3937bffb273f062f1f5ea;hb=4089c0ad94fb93e9e6a7c8532deb3b341437b95d;hp=328e233c159dac3ad5d94e8f7eecab073880a02d;hpb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 328e233..7daa6de 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -67,49 +67,43 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (shinjigen-1	. 3267)
-    (shinjigen-2	. 3267)
     (=ucs		. #x65E8)	; 旨
-    (=jis-x0208		. #x3B5D)	; &I-J90-3B5D; [27-61]
-    (=gb2312		. #x563C)	; &I-G0-563C; [54-28]
-    (=ks-x1001		. #x7229)	; &I-K0-7229; [82-09]
-    (=big5		. #xA6AE)	; &I-B-A6AE;
-    (=gt		. 17370)	; &I-GT-17370;
-    (=gt-k		. 01619)	; &I-GT-K01619;
-    (=gt-pj-1		. #x3B5D)	; &I-GT-17370; [27-61]
-    (=daikanwa		. 13738)	; &I-M-13738;
-    ))
-(define-char
-  '((=>ucs		. #x65E8)	; 旨
-    (morohashi-daikanwa	13738 0 0)
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (=cns11643-1	. #x482F)	; &C1-482F; [40-15]
+    (->subsumptive
+     ((shinjigen-1	  . 3267)
+      (shinjigen-2	  . 3267)
+      (=jis-x0208	  . #x3B5D)	; &GT-17370; [27-61]
+      (=gb2312		  . #x563C)	; &I-G0-563C; [54-28]
+      (=ks-x1001	  . #x7229)	; &I-K0-7229; [82-09]
+      (=big5		  . #xA6AE)	; &I-B-A6AE;
+      (=gt		  . 17370)	; &I-GT-17370;
+      (=gt-k		  . 01619)	; &I-GT-K01619;
+      (=gt-pj-1		  . #x3B5D)	; &I-GT-17370; [27-61]
+      (=daikanwa	  . 13738)	; &I-M-13738;
+      (=ucs@unicode	  . #x65E8)	; &GT-17370;
+      )
+     ((=cns11643-1	  . #x482F)	; &C1-482F; [40-15]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x65E5)	; 日
+    (=ucs		. #x3AD0)	; 㫐
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x65E5)	; 日
+	)
+       ((=ucs		    . #x5315)	; 匕
+	))
+      (=daikanwa	  . 13741)	; &M-13741;
+      (=cbeta		  . 03796)	; &I-CB03796;
+      (=ucs@unicode	  . #x3AD0)	; &M-13741;
       )
-     ((=ucs		  . #x5315)	; 匕
+     ((=cns11643-4	  . #x2278)	; &C4-2278; [02-88]
       ))
-    (=ucs		. #x3AD0)	; 㫐
-    (=daikanwa		. 13741)	; &I-M-13741;
-    (=cbeta		. 03796)	; &I-CB03796;
-    ))
-(define-char
-  '((=>ucs		. #x3AD0)	; 㫐
-    (morohashi-daikanwa	13741 0 0)
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 2)
-    (total-strokes	 . 6)
-    (=cns11643-4	. #x2278)	; &C4-2278; [02-88]
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -376,13 +370,11 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x3AD5)	; 㫕
-    ))
-(define-char
-  '((=>ucs		. #x3AD5)	; 㫕
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 3)
-    (total-strokes	 . 7)
-    (=cns11643-3	. #x263E)	; &C3-263E; [06-30]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3AD5)	; &UU+3AD5;
+      )
+     ((=cns11643-3	  . #x263E)	; &C3-263E; [06-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -390,8 +382,10 @@
     (total-strokes	 . 7)
     (<-vulgar
      ((shinjigen-1	  . 3267)
-      (=ucs		  . #x65E8)	; 旨
-      (=jis-x0208	  . #x3B5D)	; &I-J90-3B5D; [27-61]
+      (=jis-x0208	  . #x3B5D)	; &GT-17370; [27-61]
+      (=gb2312		  . #x563C)	; &I-G0-563C; [54-28]
+      (=ks-x1001	  . #x7229)	; &I-K0-7229; [82-09]
+      (=daikanwa	  . 13738)	; &I-M-13738;
       ))
     (<-vulgar*sources
      shinjigen-1)
@@ -1791,6 +1785,12 @@
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (<-same
+     ((=ucs		  . #x25055)	; 𥁕
+      (=daikanwa	  . 22978)	; &I-M-22978;
+      ))
+    (<-same*sources
+     guangyun daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1799,6 +1799,7 @@
       )
      ((=ucs		  . #x76BF)	; 皿
       ))
+    (shinjigen-1	. 5235)
     (=ucs		. #x6637)	; 昷
     (=jis-x0212		. #x4230)	; &I-JSP-4230; [34-16]
     (=cns11643-3	. #x2D24)	; &I-C3-2D24; [13-04]
@@ -1811,8 +1812,13 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x6638)	; 昸
-    (=cns11643-3	. #x2D25)	; &I-C3-2D25; [13-05]
-    (=daikanwa		. 13875)	; &I-M-13875;
+    (->subsumptive
+     ((=daikanwa	  . 13875)	; &M-13875;
+      )
+     ((=ucs@unicode	  . #x6638)	; &UU+6638;
+      )
+     ((=cns11643-3	  . #x2D25)	; &C3-2D25; [13-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -2332,17 +2338,17 @@
       ))
     (->confusing*sources
      daikanwa)
-    (->same
-     ((=ucs		  . #x26618)	; 𦘘
-      (=daikanwa	  . 29223)	; &I-M-29223;
-      ))
-    (->same*sources
-     daikanwa)
     (<-Large-Seal
      ((=daikanwa	  . 13948)	; &I-M-13948;
       ))
     (<-Large-Seal*sources
      shuowen daikanwa)
+    (<-same
+     ((=ucs		  . #x26618)	; 𦘘
+      (=daikanwa	  . 29223)	; &I-M-29223;
+      ))
+    (<-same*sources
+     daikanwa)
     (=ucs		. #x2F8CC)	; 書
     (=cns11643-6	. #x3836)	; &I-C6-3836; [24-22]
     (=daikanwa		. 13928)	; &I-M-13928;
@@ -3477,7 +3483,7 @@
     (=ks-x1001		. #x4F7C)	; &M-14005; [47-92]
     (=jis-x0212		. #x4247)	; &I-JSP-4247; [34-39]
     (=daikanwa		. 14005)	; &I-M-14005;
-    (=ucs@jis-1990	. #x6677)	; &M-14005;
+    (=ucs@jis/1990	. #x6677)	; &M-14005;
     (=ucs@ks		. #x6677)	; &M-14005;
     ))
 (define-char
@@ -3500,7 +3506,7 @@
     (=big5		. #xB4BE)	; &I-B-B4BE;
     (=jef-china3	. #x51A7)	; &I-JC3-51A7;
     (=ucs@cns		. #x6677)	; &JX1-7540;
-    (=ucs@jis-2000	. #x6677)	; &JX1-7540;
+    (=ucs@jis/2000	. #x6677)	; &JX1-7540;
     (=ucs@big5		. #x6677)	; &JX1-7540;
     ))
 (define-char
@@ -5246,39 +5252,46 @@
     (=daikanwa		. 14130)	; &I-M-14130;
     ))
 (define-char
-  '((=>ucs		. #x66B1)	; 暱
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=daikanwa		. 14132)	; &M-14132;
-    (=jef-china3	. #x51EA)	; &I-JC3-51EA;
-    ))
-(define-char
-  '((morohashi-daikanwa	14132 0 1)
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (<-original-ideograph
-     ((shinjigen-1	  . 3299)
-      (=jis-x0208	  . #x5A63)	; &I-J90-5A63; [58-67]
-      (=daikanwa	  . 13866)	; &I-M-13866;
-      ))
-    (<-original-ideograph*sources
-     shinjigen-1)
-    (shinjigen-1	. 3300)
-    (shinjigen-2	. 3300)
+  '((ideographic-radical . 72)	; ⽇
     (=ucs		. #x66B1)	; 暱
-    (=jis-x0212		. #x425A)	; &I-JSP-425A; [34-58]
-    (=jis-x0213-2-2000	. #x2E30)	; &I-JX2-2E30; [14-16]
-    (=big5		. #xBCCA)	; &I-B-BCCA;
-    ))
-(define-char
-  '((=>ucs		. #x66B1)	; 暱
-    (morohashi-daikanwa	14132 0 2)
-    (ideographic-radical . 72)	; ⽇
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6D34)	; &C1-6D34; [77-20]
+    (->subsumptive
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 15)
+      (->synonyms
+       ((=daikanwa	    . 00279)	; &I-M-00279;
+	))
+      (->synonyms*sources
+       shuowen-tongxun-dingsheng daikanwa)
+      (<-same
+       ((=ucs		    . #x6635)	; 昵
+	(=daikanwa	    . 13866)	; &I-M-13866;
+	))
+      (<-same*sources
+       shuowen daikanwa)
+      (=daikanwa	  . 14132)	; &M-14132;
+      (=jef-china3	  . #x51EA)	; &I-JC3-51EA;
+      )
+     ((ideographic-strokes . 10)
+      (total-strokes	   . 14)
+      (ideographic-strokes@jisx0213 . 11)
+      (=jis-x0212	  . #x425A)	; &JX2-2E30; [34-58]
+      (=jis-x0213-2-2000  . #x2E30)	; &I-JX2-2E30; [14-16]
+      (=big5		  . #xBCCA)	; &I-B-BCCA;
+      (=ucs@unicode	  . #x66B1)	; &JX2-2E30;
+      )
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 15)
+      (<-original
+       ((shinjigen-1	    . 3299)
+	(=ucs		    . #x6635)	; 昵
+	(=jis-x0208	    . #x5A63)	; &I-J90-5A63; [58-67]
+	))
+      (<-original*sources
+       shinjigen-1)
+      (shinjigen-1	  . 3300)
+      (shinjigen-2	  . 3300)
+      (=cns11643-1	  . #x6D34)	; &C1-6D34; [77-20]
+      ))
     ))
 (define-char
   '((=>ucs		. #x66B2)	; 暲