X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R012-Eight.el;h=70d622b50eccfa134d348b3bb9e6085d11947e8f;hb=e8496ecae8934d50db9e150ba51a2cc1aad70836;hp=1462de67ce935b71be8599d1d1859b39c85de444;hpb=58808129dfc2c65e10559f81c9c66dc6f5145c62;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 1462de6..70d622b 100644
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -73,6 +73,8 @@
        ((===hng-khi	    . 02670)	; &HNG010-02670;
 	)
        ((===hng-khm	    . 02100)	; &HNG011-02100;
+	)
+       ((===hng-wad	    . 00300)	; &HNG054-00300;
 	))
       )
      ((=decomposition@cid
@@ -363,6 +365,8 @@
 	 ((===hng-khm	      . 02070)	; &HNG011-02070;
 	  )
 	 ((===hng-kak	      . 00200)	; &HNG017-00200;
+	  )
+	 ((===hng-wad	      . 00310)	; &HNG054-00310;
 	  ))
 	))
       ))
@@ -637,6 +641,13 @@
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
+    (=ucs		. #x5171)	; 共
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5171)	; 共
+      ))
+    (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 243 2)
@@ -648,8 +659,8 @@
       )
      ((=gt-k		  . 00059)	; &GT-K00059;
       ))
-    (=ucs		. #x5171)	; 共
-    (=adobe-japan1-0	. 01694)	; &I-AJ1-01694;
+    (=ucs@unicode	. #x5171)	; &AJ1-01694;
+    (=adobe-japan1-0	. 01694)	; &AJ1-01694;
     (=jis-x0208		. #x3626)	; &I-J90-3626; [22-06]
     (=gb2312		. #x3932)	; &I-G0-3932; [25-18]
     (=ks-x1001		. #x4D6C)	; &I-K0-4D6C; [45-76]
@@ -660,9 +671,14 @@
     (=gt-k		. 01591)	; &I-GT-K01591;
     (=gt-pj-1		. #x3626)	; &I-GT-01898; [22-06]
     (=daikanwa		. 01458)	; &I-M-01458;
-    (=shinjigen		.  0496)	; 共
+    (=shinjigen		.  0496)	; &AJ1-01694;
     (->subsumptive
-     ((==ucs@unicode	  . #x5171)	; &g2-AJ1-01694;
+     ((=decomposition@cid
+       ((=ucs		    . #x5171)	; 共
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5171)	; &g2-AJ1-01694;
       (==adobe-japan1-0	  . 01694)	; &g2-AJ1-01694;
       (==gb2312		  . #x3932)	; &g2-AJ1-01694; [25-18]
       (==ks-x1001	  . #x4D6C)	; &g2-AJ1-01694; [45-76]
@@ -694,10 +710,31 @@
        ((===hng-khi	    . 02650)	; &HNG010-02650;
 	)
        ((===hng-khm	    . 02080)	; &HNG011-02080;
+	)
+       ((===hng-wad	    . 00320)	; &HNG054-00320;
 	))
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5171)	; 共
+      ))
+    (ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x535D)	; 卝
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=gt-k		  . 00059)	; &GT-K00059;
+      ))
+    (=ucs-var-001	. #x5171)	; &U-v001+5171;
+    ))
+(define-char
   '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
@@ -718,56 +755,42 @@
       )
      ((=ucs		  . #x5929)	; 天
       ))
-    (=+>ucs@cns		. #x5173)	; &o-CU+5173;
+    (=ucs@cns		. #x5173)	; &MJ007283;
+    (=mj		. 007283)	; &MJ007283;
+    (=cns11643-4	. #x2234)	; &I-C4-2234; [02-20]
+    (=hanyo-denshi/ks	. 017040)	; &MJ007283;
+    (=daikanwa		. 01459)	; &I-M-01459;
     (->subsumptive
-     ((ideographic-structure
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x5173)	; 关
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x516B)	; 八
+       ((==ucs@jis	    . #x516B)	; &g2-MJ007273;
+	(==ucs@ks	    . #x516B)	; &g2-MJ007273;
+	(==mj		    . 007273)	; &g2-MJ007273;
 	)
-       ((=ucs@unicode	    . #x5929)	; &C1-4532;
-	(=gb2312	    . #x4C6C)	; &C1-4532; [44-76]
-	(=cns11643-1	    . #x4532)	; &I-C1-4532; [37-18]
+       ((==ucs@unicode	    . #x5929)	; &GT-K00468;
+	(=gt-k		    . 00468)	; &GT-K00468;
 	))
-      (=ucs@cns		  . #x5173)	; &MJ007283;
-      (=mj		  . 007283)	; &MJ007283;
-      (=cns11643-4	  . #x2234)	; &I-C4-2234; [02-20]
-      (=hanyo-denshi/ks	  . 017040)	; &MJ007283;
-      (=daikanwa	  . 01459)	; &I-M-01459;
+      (==mj		  . 007283)	; &g2-MJ007283;
+      (==hanyo-denshi/ks  . 017040)	; &g2-MJ007283;
+      (==daikanwa	  . 01459)	; &g2-MJ007283;
       (->subsumptive
-       ((=decomposition@hanyo-denshi
-	 ((=ucs		      . #x5173)	; 关
-	  )
-	 ((=ucs		      . #xE0102)	; 󠄂
-	  ))
-	(ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	  (=ucs		      . #x2FF1)	; ⿱
-	  )
-	 ((==ucs@jis	      . #x516B)	; &g2-MJ007273;
-	  (==ucs@ks	      . #x516B)	; &g2-MJ007273;
-	  (==mj		      . 007273)	; &g2-MJ007273;
-	  )
-	 ((=ucs@unicode	      . #x5929)	; &C1-4532;
-	  (=gb2312	      . #x4C6C)	; &C1-4532; [44-76]
-	  (=cns11643-1	      . #x4532)	; &I-C1-4532; [37-18]
-	  ))
-	(==mj		    . 007283)	; &g2-MJ007283;
-	(==hanyo-denshi/ks  . 017040)	; &g2-MJ007283;
-	(==daikanwa	    . 01459)	; &g2-MJ007283;
-	(->subsumptive
-	 ((===daikanwa	      . 01459)	; &R-M-01459;
-	  )
-	 ((===hanyo-denshi/ks . 017040)	; &R-HD-KS-017040;
-	  (=hanyo-denshi/ks/mf . #x06A8)	; &R-HD-KS-017040;
-	  )
-	 ((===mj	      . 007283)	; &R-MJ007283;
-	  ))
+       ((===daikanwa	    . 01459)	; &R-M-01459;
 	)
-       ((==ucs@cns	    . #x5173)	; &g2-CU+5173;
-	(==cns11643-4	    . #x2234)	; &g2-CU+5173; [02-20]
+       ((===hanyo-denshi/ks . 017040)	; &R-HD-KS-017040;
+	(=hanyo-denshi/ks/mf . #x06A8)	; &R-HD-KS-017040;
+	)
+       ((===mj		    . 007283)	; &R-MJ007283;
 	))
+      )
+     ((==ucs@cns	  . #x5173)	; &g2-CU+5173;
+      (==cns11643-4	  . #x2234)	; &g2-CU+5173; [02-20]
       ))
     ))
 (define-char
@@ -777,6 +800,7 @@
     (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 242 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -785,9 +809,18 @@
       )
      ((=ucs		  . #x5929)	; 天
       ))
-    (=+>ucs@unicode	. #x5173)	; &o-AJ1-17300;
-    (=+>adobe-japan1-5	. 17300)	; &o-AJ1-17300;
-    (=+>gt		. 07389)	; &o-AJ1-17300;
+    (=ucs@unicode	. #x5173)	; &MJ007284;
+    (=mj		. 007284)	; &MJ007284;
+    (=adobe-japan1-5	. 17300)	; &I-AJ1-17300;
+    (=gb2312		. #x3958)	; &I-G0-3958; [25-56]
+    (=jis-x0213-2	. #x2328)	; &I-JX2-2328; [03-08]
+    (=big5-cdp		. #x8C63)	; &I-CDP-8C63;
+    (=hanyo-denshi/jd	. #x2328)	; &I-HD-JD-2328; [03-08]
+    (=gt		. 07389)	; &I-GT-07389;
+    (=gt-k		. 02287)	; &I-GT-K02287;
+    (=gt-pj-11		. #x4B39)	; &I-GT-07389; [43-25]
+    (=cbeta		. 00659)	; &I-CB00659;
+    (=jef-china3	. #x90EC)	; &I-JC3-90EC;
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x5173)	; 关
@@ -799,29 +832,45 @@
 	)
        ((=ucs		    . #xE0101)	; 󠄁
 	))
-      (hanyu-dazidian	  1 242 7)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
        ((=ucs		    . #x4E37)	; 丷
 	)
-       ((=ucs@unicode	    . #x5929)	; &C1-4532;
-	(=gb2312	    . #x4C6C)	; &C1-4532; [44-76]
-	(=cns11643-1	    . #x4532)	; &I-C1-4532; [37-18]
+       ((==ucs@unicode	    . #x5929)	; &GT-K00468;
+	(=gt-k		    . 00468)	; &GT-K00468;
+	))
+      (==ucs@unicode	  . #x5173)	; &g2-MJ007284;
+      (==mj		  . 007284)	; &g2-MJ007284;
+      (==adobe-japan1-5	  . 17300)	; &g2-MJ007284;
+      (==gb2312		  . #x3958)	; &g2-MJ007284; [25-56]
+      (==jis-x0213-2	  . #x2328)	; &g2-MJ007284; [03-08]
+      (==big5-cdp	  . #x8C63)	; &g2-MJ007284;
+      (==hanyo-denshi/jd  . #x2328)	; &g2-MJ007284; [03-08]
+      (==gt		  . 07389)	; &g2-MJ007284;
+      (==gt-k		  . 02287)	; &g2-MJ007284;
+      (==cbeta		  . 00659)	; &g2-MJ007284;
+      (==jef-china3	  . #x90EC)	; &g2-MJ007284;
+      (->subsumptive
+       ((===jis-x0213-2	    . #x2328)	; &R-JX2-2328; [03-08]
+	(===hanyo-denshi/jd . #x2328)	; &R-JX2-2328; [03-08]
+	)
+       ((===adobe-japan1-5  . 17300)	; &R-AJ1-17300;
+	)
+       ((===mj		    . 007284)	; &R-MJ007284;
+	)
+       ((===big5-cdp	    . #x8C63)	; &R-CDP-8C63;
+	)
+       ((===ucs@unicode	    . #x5173)	; &R-UU+5173;
+	)
+       ((===cbeta	    . 00659)	; &R-CB00659;
+	)
+       ((===gt		    . 07389)	; &R-GT-07389;
+	(===gt-k	    . 02287)	; &R-GT-07389;
+	)
+       ((===jef-china3	    . #x90EC)	; &R-JC3-90EC;
 	))
-      (=ucs@unicode	  . #x5173)	; &MJ007284;
-      (=mj		  . 007284)	; &MJ007284;
-      (=adobe-japan1-5	  . 17300)	; &I-AJ1-17300;
-      (=gb2312		  . #x3958)	; &I-G0-3958; [25-56]
-      (=jis-x0213-2	  . #x2328)	; &I-JX2-2328; [03-08]
-      (=big5-cdp	  . #x8C63)	; &I-CDP-8C63;
-      (=hanyo-denshi/jd	  . #x2328)	; &I-HD-JD-2328; [03-08]
-      (=gt		  . 07389)	; &I-GT-07389;
-      (=gt-k		  . 02287)	; &I-GT-K02287;
-      (=gt-pj-11	  . #x4B39)	; &I-GT-07389; [43-25]
-      (=cbeta		  . 00659)	; &I-CB00659;
-      (=jef-china3	  . #x90EC)	; &I-JC3-90EC;
       ))
     ))
 (define-char
@@ -1008,7 +1057,12 @@
     (=daikanwa		. 01462)	; &I-M-01462;
     (=shinjigen		.  0497)	; 兵
     (->subsumptive
-     ((==ucs@unicode	  . #x5175)	; &g2-AJ1-03596;
+     ((=decomposition@cid
+       ((=ucs		    . #x5175)	; 兵
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5175)	; &g2-AJ1-03596;
       (==adobe-japan1-0	  . 03596)	; &g2-AJ1-03596;
       (==gb2312		  . #x3178)	; &g2-AJ1-03596; [17-88]
       (==ks-x1001	  . #x5C32)	; &g2-AJ1-03596; [60-18]
@@ -1201,7 +1255,12 @@
     (=daikanwa		. 01472)	; &I-M-01472;
     (=shinjigen		.  0498)	; 其
     (->subsumptive
-     ((==ucs@unicode	  . #x5176)	; &g2-AJ1-02838;
+     ((=decomposition@cid
+       ((=ucs		    . #x5176)	; 其
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5176)	; &g2-AJ1-02838;
       (==adobe-japan1-0	  . 02838)	; &g2-AJ1-02838;
       (==gb2312		  . #x4664)	; &g2-AJ1-02838; [38-68]
       (==ks-x1001	  . #x506C)	; &g2-AJ1-02838; [48-76]
@@ -1449,7 +1508,12 @@
     (=daikanwa		. 01474)	; &I-M-01474;
     (=shinjigen		.  0501)	; 典
     (->subsumptive
-     ((==ucs@unicode	  . #x5178)	; &g2-AJ1-03119;
+     ((=decomposition@cid
+       ((=ucs		    . #x5178)	; 典
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@unicode	  . #x5178)	; &g2-AJ1-03119;
       (==adobe-japan1-0	  . 03119)	; &g2-AJ1-03119;
       (==gb2312		  . #x3564)	; &g2-AJ1-03119; [21-68]
       (==ks-x1001	  . #x6E70)	; &g2-AJ1-03119; [78-80]
@@ -1860,13 +1924,6 @@
      ((=ucs		  . #x517C)	; 兼
       ))
     (ideographic-radical . 12)	; ⼋
-    (===hng-khi		. 02660)	; &HNG010-02660;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x517C)	; 兼
-      ))
-    (ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=decomposition@hanyo-denshi
@@ -2008,6 +2065,79 @@
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	(=ucs		    . #x2FF2)	; ⿲
+	)
+       ((name		    . "HANGZHOU NUMERAL TWO")
+	(=ucs		    . #x3022)	; 〢
+	)
+       ((=ucs		    . #x4E0E)	; 与
+	)
+       ((=gt-k		    . 00308)	; &GT-K00308;
+	))
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x516B)	; 八
+      ))
+    (=ucs		. #x2B930)	; 𫤰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2B930)	; 𫤰
+      ))
+    (ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x2B930)	; &U-0002B930;
+    ))
+(define-char
+  '((ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+	(=ucs		    . #x2FF2)	; ⿲
+	)
+       ((=big5-cdp	    . #x8BC0)	; &CDP-8BC0;
+	)
+       ((=ucs@unicode	    . #x4E0E)	; &MJ006311;
+	(=mj		    . 006311)	; &MJ006311;
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+	  (=ucs		      . #x2FF9)	; ⿹
+	  )
+	 ((=ucs		      . #x200CC)	; 𠃌
+	  )
+	 ((=ucs		      . #x4E28)	; 丨
+	  ))
+	))
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=ucs		  . #x516B)	; 八
+      ))
+    (===hng-khi		. 05370)	; &HNG010-05370;
+    (<-formed
+     ((=ucs		  . #x2B930)	; 𫤰
+      )
+     ((=ucs		  . #x8207)	; 與
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 250 9)
@@ -2075,7 +2205,6 @@
     (=ucs@iso		. #x20525)	; &C6-465B;
     (=cns11643-6	. #x465B)	; &C6-465B; [38-59]
     (=daikanwa		. 01493)	; &I-M-01493;
-    (=hanziku-1		. #xD9C0)	; &I-HZK01-D9C0;
     (->subsumptive
      ((==daikanwa	  . 01493)	; &g2-M-01493;
       )
@@ -2083,6 +2212,40 @@
       (==cns11643-6	  . #x465B)	; &g2-CU+20525; [38-59]
       )
      ((==ucs@iso	  . #x20525)	; &g2-IU-00020525;
+      )
+     ((=hanziku-1	  . #xD9C0)	; &HZK01-D9C0;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20525)	; 𠔥
+      ))
+    (ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 10)
+    (total-strokes	 . 12)
+    (=mj		. 031011)	; &MJ031011;
+    (=hanyo-denshi/ks	. 017600)	; &MJ031011;
+    (=koseki		. 017600)	; &MJ031011;
+    (<-formed
+     ((=ucs		  . #x517C)	; 兼
+      ))
+    (->subsumptive
+     ((==mj		  . 031011)	; &g2-MJ031011;
+      (==hanyo-denshi/ks  . 017600)	; &g2-MJ031011;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 017600)	; &R-HD-KS-017600;
+	(=hanyo-denshi/ks/mf . #x06E0)	; &R-HD-KS-017600;
+	)
+       ((===mj		    . 031011)	; &R-MJ031011;
+	))
+      )
+     ((==koseki		  . 017600)	; &g2-KOSEKI-017600;
+      (->subsumptive
+       ((===hng-khi	    . 02660)	; &HNG010-02660;
+	(<-formed
+	 ((=ucs		      . #x517C)	; 兼
+	  ))
+	))
       ))
     ))
 (define-char