X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R016-Table.el;h=64c8f8fb5db40b073c9d2ecf158a9596cbf66ad7;hp=891b3629c97bd6b8569b430888732533b44a87c8;hb=528ca5c9afc87d2d698ce64b29cc9b069d09894f;hpb=3389ebad87a147493b75a0f71ef6f42e7e6ee825

diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index 891b362..64c8f8f 100644
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -3,16 +3,16 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (=>ucs@component	. #x51E0)	; &IWDS1-119;
-    (=>iwds-1		.  0119)	; &IWDS1-119;
+    (=>ucs@component	. #x51E0)	; &A-compU+51E0;
+    (=>iwds-1		.  0119)	; &A-compU+51E0;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x51E0)	; &IWDS1-119;
-      (=>iwds-1		  .  0119)	; &IWDS1-119;
+     ((=>ucs@component	  . #x51E0)	; &A-compU+51E0;
+      (=>iwds-1		  .  0119)	; &A-compU+51E0;
       )
-     ((=>ucs@component	  . #x5140)	; &IWDS1-214;
-      (=>iwds-1		  .  0214)	; &IWDS1-214;
+     ((=>ucs@component	  . #x5140)	; &A-compU+5140;
+      (=>iwds-1		  .  0214)	; &A-compU+5140;
       ))
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 0)
@@ -30,6 +30,33 @@
     (=gt-pj-1		. #x515C)	; &I-GT-02282; [49-60]
     (=daikanwa		. 01737)	; &I-M-01737;
     (=shinjigen		.  0565)	; 几
+    (->subsumptive
+     ((==ucs@unicode	  . #x51E0)	; &g2-AJ1-04243;
+      (==adobe-japan1-0	  . 04243)	; &g2-AJ1-04243;
+      (==gb2312		  . #x3C38)	; &g2-AJ1-04243; [28-24]
+      (==jis-x0208	  . #x515C)	; &g2-AJ1-04243; [49-60]
+      (==cns11643-1	  . #x442D)	; &g2-AJ1-04243; [36-13]
+      (==jis-x0213-1	  . #x515C)	; &g2-AJ1-04243; [49-60]
+      (==gt		  . 02282)	; &g2-AJ1-04243;
+      (==gt-k		  . 00084)	; &g2-AJ1-04243;
+      (==daikanwa	  . 01737)	; &g2-AJ1-04243;
+      (==shinjigen	  .  0565)	; &g2-AJ1-04243;
+      (->subsumptive
+       ((===daikanwa	    . 01737)	; &R-M-01737;
+	)
+       ((===jis-x0208	    . #x515C)	; &R-J0-515C; [49-60]
+	(===jis-x0213-1	    . #x515C)	; &R-J0-515C; [49-60]
+	)
+       ((===adobe-japan1-0  . 04243)	; &R-AJ1-04243;
+	)
+       ((===cns11643-1	    . #x442D)	; &R-C1-442D; [36-13]
+	)
+       ((===gt		    . 02282)	; &R-GT-02282;
+	(===gt-k	    . 00084)	; &R-GT-02282;
+	)
+       ((===ucs@unicode	    . #x51E0)	; &R-UU+51E0;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -98,19 +125,23 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 16)	; ⼏
+  '((<-denotational@component
+     ((=>ucs@iwds-1	  . #x51E1)	; &A-IWDSU+51E1;
+      (=>iwds-1		  .  55346)	; &A-IWDSU+51E1;
+      ))
+    (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
-    (=>ucs@component	. #x51E1)	; &IWDS1-346;
-    (=>iwds-1		.  0346)	; &IWDS1-346;
+    (=>ucs@component	. #x51E1)	; &A-compU+51E1;
+    (=>iwds-1		.  0346)	; &A-compU+51E1;
     ))
 (define-char
   '((<-denotational@component
-     ((=>ucs@component	  . #x5342)	; &IWDS1-055;
-      (=>iwds-1		  .  0055)	; &IWDS1-055;
+     ((=>ucs@iwds-1	  . #x5342)	; &A-IWDSU+5342;
+      (=>iwds-1		  .  0055)	; &A-IWDSU+5342;
       )
-     ((=>ucs@component	  . #x51E1)	; &IWDS1-346;
-      (=>iwds-1		  .  0346)	; &IWDS1-346;
+     ((=>ucs@component	  . #x51E1)	; &A-compU+51E1;
+      (=>iwds-1		  .  0346)	; &A-compU+51E1;
       ))
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
@@ -243,6 +274,23 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x51E0)	; 几
+      )
+     ((=ucs		  . #x4E36)	; 丶
+      ))
+    (=ucs-var-001	. #x51E1)	; &U-v001+51E1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51E1)	; 凡
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs		  . #x2FF5)	; ⿵
       )
@@ -977,9 +1025,35 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 277 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x53B8)	; 厸
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
     (=ucs		. #x20643)	; 𠙃
     (=daikanwa/ho	.  0046)	; 𠙃
-    (=hanziku-1		. #xDF57)	; &I-HZK01-DF57;
+    (<-ancient
+     ((=ucs		  . #x5155)	; 兕
+      (=daikanwa	  . 01369)	; &I-M-01369;
+      ))
+    (<-ancient*sources
+     longkanshoujian daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x20643)	; &g2-M-H0046;
+      (==daikanwa/ho	  .  0046)	; &g2-M-H0046;
+      (->subsumptive
+       ((===daikanwa/ho	    .  0046)	; &R-M-H0046;
+	)
+       ((===ucs@iso	    . #x20643)	; &R-U-00020643;
+	)
+       ((=hanziku-1	    . #xDF57)	; &HZK01-DF57;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -1244,7 +1318,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=adobe-japan1-4	  . 13834)	; &AJ1-13834;
+     ((=ucs		  . #x2D544)	; 𭕄
       )
      ((=gt-k		  . 01457)	; &GT-K01457;
       ))
@@ -1256,6 +1330,35 @@
     (=gt-k		. 03927)	; &I-GT-K03927;
     (=gt-pj-1		. #x736B)	; &I-GT-12984; [83-75]
     (=daikanwa/ho	.  0047)	; 鼡
+    (<-vulgar
+     ((=ucs@unicode	  . #x9F20)	; &AJ1-02767;
+      (=adobe-japan1-0	  . 02767)	; &AJ1-02767;
+      (=daikanwa	  . 48390)	; &I-M-48390;
+      ))
+    (<-vulgar*sources
+     daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x9F21)	; &g2-AJ1-07454;
+      (==adobe-japan1-0	  . 07454)	; &g2-AJ1-07454;
+      (==jis-x0208	  . #x736B)	; &g2-AJ1-07454; [83-75]
+      (==jis-x0213-1	  . #x736B)	; &g2-AJ1-07454; [83-75]
+      (==gt		  . 12984)	; &g2-AJ1-07454;
+      (==gt-k		  . 03927)	; &g2-AJ1-07454;
+      (==daikanwa/ho	  .  0047)	; &g2-AJ1-07454;
+      (->subsumptive
+       ((===daikanwa/ho	    .  0047)	; &R-M-H0047;
+	)
+       ((===jis-x0208	    . #x736B)	; &R-J0-736B; [83-75]
+	(===jis-x0213-1	    . #x736B)	; &R-J0-736B; [83-75]
+	)
+       ((===adobe-japan1-0  . 07454)	; &R-AJ1-07454;
+	)
+       ((===gt		    . 12984)	; &R-GT-12984;
+	(===gt-k	    . 03927)	; &R-GT-12984;
+	)
+       ((===ucs@unicode	    . #x9F21)	; &R-UU+9F21;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -1368,41 +1471,52 @@
       )
      ((=ucs		  . #x4EA0)	; 亠
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x5902)	; 夂
-	)
-       ((=ucs		    . #x3404)	; 㐄
-	))
+     ((=ucs-itaiji-007	  . #x821B)	; &U-i007+821B;
       )
      ((=ucs		  . #x51E0)	; 几
       ))
-    (=>>daikanwa	. 00314)	; &G-M-00314;
+    (=mj		. 030497)	; &MJ030497;
     (->subsumptive
-     ((ideographic-radical . 8)	; ⼇
-      (=daikanwa	  . 00314)	; &M-00314;
-      (<-ancient
-       ((=ucs		    . #x4E58)	; 乘
-	(=daikanwa	    . 00154)	; &I-M-00154;
+     ((=>>mj		  . 030497)	; &KOSEKI-021040;
+      (=koseki		  . 021040)	; &KOSEKI-021040;
+      (->subsumptive
+       ((==mj		    . 030497)	; &g2-MJ030497;
+	(==koseki	    . 021040)	; &g2-MJ030497;
+	(->subsumptive
+	 ((ideographic-radical . 16)	; ⼏
+	  (=daikanwa	      . 01783)	; &M-01783;
+	  (<-formed
+	   ((=ucs		. #x4E58)	; 乘
+	    ))
+	  (<-formed*sources
+	   jiyun)
+	  (<-same
+	   ((=ucs		. #x4E58)	; 乘
+	    (=daikanwa		. 00154)	; &I-M-00154;
+	    ))
+	  (<-same*sources
+	   jiyun daikanwa)
+	  )
+	 ((ideographic-radical . 8)	; ⼇
+	  (=daikanwa	      . 00314)	; &M-00314;
+	  (<-ancient
+	   ((=ucs		. #x4E58)	; 乘
+	    (=daikanwa		. 00154)	; &I-M-00154;
+	    ))
+	  (<-ancient*sources
+	   jiyun daikanwa)
+	  )
+	 ((===mj	      . 030497)	; &R-MJ030497;
+	  ))
 	))
-      (<-ancient*sources
-       jiyun daikanwa)
       )
-     ((ideographic-radical . 16)	; ⼏
-      (=daikanwa	  . 01783)	; &M-01783;
-      (<-formed
-       ((=ucs		    . #x4E58)	; 乘
-	))
-      (<-formed*sources
-       jiyun)
-      (<-same
-       ((=ucs		    . #x4E58)	; 乘
-	(=daikanwa	    . 00154)	; &I-M-00154;
+     ((ideographic-radical . 8)	; ⼇
+      (=mj		  . 030496)	; &MJ030496;
+      (=koseki		  . 003890)	; &MJ030496;
+      (->subsumptive
+       ((==mj		    . 030496)	; &g2-MJ030496;
+	(==koseki	    . 003890)	; &g2-MJ030496;
 	))
-      (<-same*sources
-       jiyun daikanwa)
       ))
     ))
 (define-char
@@ -1488,7 +1602,71 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (=daikanwa		. 01788)	; &M-01788;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x8981)	; 要
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (sound@ja/on	"kWaku")
+    (=ucs		. #x2065E)	; 𠙞
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2065E)	; 𠙞
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=daikanwa	  . 34768)	; &M-34768;
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (=gt		. 02335)	; &GT-02335;
+    (=gt-pj-2		. #x3F59)	; &GT-02335; [31-57]
+    (=daikanwa		. 01788)	; &I-M-01788;
+    (->subsumptive
+     ((==gt		  . 02335)	; &g2-GT-02335;
+      (==daikanwa	  . 01788)	; &g2-GT-02335;
+      (->subsumptive
+       ((===daikanwa	    . 01788)	; &R-M-01788;
+	)
+       ((===gt		    . 02335)	; &R-GT-02335;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2065E)	; 𠙞
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 278 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x8981)	; &AJ1-03905;
+      (=adobe-japan1-0	  . 03905)	; &AJ1-03905;
+      )
+     ((=ucs		  . #x51E0)	; 几
+      ))
+    (=ucs@iso		. #x2065E)	; &U-0002065E;
+    (->subsumptive
+     ((==ucs@iso	  . #x2065E)	; &g2-IU-0002065E;
+      (->subsumptive
+       ((===ucs@iso	    . #x2065E)	; &R-U-0002065E;
+	)
+       ((=hanziku-1	    . #xDF6F)	; &HZK01-DF6F;
+	))
+      ))
     ))
 (define-char
   '((=>ucs		. #x2065A)	; 𠙚
@@ -1509,6 +1687,25 @@
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp-var-001  . #x85E4)	; &CDP-v001-85E4;
+      )
+     ((=ucs		  . #x20633)	; 𠘳
+      ))
+    (=ucs		. #x2D0B5)	; 𭂵
+    (=cbeta		. 03094)	; &I-CB03094;
+    (->subsumptive
+     ((==ucs@JP/hanazono  . #x2D0B5)	; &g2-CB03094;
+      (==cbeta		  . 03094)	; &g2-CB03094;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 16)	; ⼏
     (==>ucs@bucs	. #x51F1)	; &BUCS+51F1;
     ))
 (define-char
@@ -1616,6 +1813,15 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 278 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((name		  . "CJK RADICAL TABLE")
+      (=ucs		  . #x2E87)	; ⺇
+      )
+     ((=mj		  . 056985)	; &MJ056985;
+      ))
     (=ucs@jis		. #x51F2)	; &AJ1-21189;
     (=adobe-japan1-6	. 21189)	; &AJ1-21189;
     (=jis-x0212		. #x332C)	; &I-JSP-332C; [19-12]
@@ -1635,7 +1841,7 @@
        ((name		    . "CJK RADICAL TABLE")
 	(=ucs		    . #x2E87)	; ⺇
 	)
-       ((=gt		    . 01936)	; &GT-01936;
+       ((==mj		    . 056985)	; &g2-MJ056985;
 	))
       (==ucs@jis	  . #x51F2)	; &g2-AJ1-21189;
       (==adobe-japan1-6	  . 21189)	; &g2-AJ1-21189;
@@ -1664,6 +1870,16 @@
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((name		  . "CJK RADICAL TABLE")
+      (=ucs		  . #x2E87)	; ⺇
+      )
+     ((=ucs@unicode	  . #x517C)	; &MJ007297;
+      (=mj		  . 007297)	; &MJ007297;
+      ))
     (=ucs@unicode	. #x51F2)	; &UU+51F2;
     (=ucs@JP/hanazono	. nil)
     (->subsumptive
@@ -1739,6 +1955,24 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x767B)	; 登
+      )
+     ((=>ucs@component	  . #x51E0)	; &A-compU+51E0;
+      (=>iwds-1		  .  0119)	; &A-compU+51E0;
+      ))
+    (=ucs		. #x51F3)	; 凳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x51F3)	; 凳
+      ))
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 12)
+    (total-strokes	 . 14)
     (hanyu-dazidian	1 278 20)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1748,8 +1982,8 @@
       )
      ((=ucs		  . #x51E0)	; 几
       ))
-    (=ucs		. #x51F3)	; 凳
-    (=adobe-japan1-5	. 17309)	; &I-AJ1-17309;
+    (=ucs@unicode	. #x51F3)	; &AJ1-17309;
+    (=adobe-japan1-5	. 17309)	; &AJ1-17309;
     (=gb2312		. #x354A)	; &I-G0-354A; [21-42]
     (=jis-x0212		. #x332D)	; &I-JSP-332D; [19-13]
     (=cns11643-1	. #x6821)	; &I-C1-6821; [72-01]
@@ -1829,12 +2063,6 @@
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
-    (hanyu-dazidian	1 278 7)
-    (=ucs		. #x2065E)	; 𠙞
-    (=hanziku-1		. #xDF6F)	; &I-HZK01-DF6F;
-    ))
-(define-char
-  '((ideographic-radical . 16)	; ⼏
     (hanyu-dazidian	8 10 1)
     (=ucs		. #x20665)	; 𠙥
     (=hanziku-12	. #xEBAB)	; &I-HZK12-EBAB;