X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=c565824330b6527389f4ed8036a6c6a5635288d4;hb=ef4ff3c04b54a7ae2cd57f6ac37a25702dd96479;hp=f048aa5c30db5ae568941f69da562a8456d11443;hpb=361295940dc45fa28e5934ef18d37824d1a04222;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index f048aa5..c565824 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -453,6 +453,49 @@
     (=daikanwa		. 02503)	; &I-M-02503;
     (=shinjigen		.  0768)	; 匂
     (=cbeta		. 00141)	; &I-CB00141;
+    (->subsumptive
+     ((==ucs@unicode	  . #x5302)	; &g2-AJ1-03279;
+      (==adobe-japan1-0	  . 03279)	; &g2-AJ1-03279;
+      (==jis-x0208	  . #x4677)	; &g2-AJ1-03279; [38-87]
+      (==jis-x0213-1	  . #x4677)	; &g2-AJ1-03279; [38-87]
+      (==gt		  . 03209)	; &g2-AJ1-03279;
+      (==gt-k		  . 00471)	; &g2-AJ1-03279;
+      (==daikanwa	  . 02503)	; &g2-AJ1-03279;
+      (==shinjigen	  .  0768)	; &g2-AJ1-03279;
+      (==cbeta		  . 00141)	; &g2-AJ1-03279;
+      (->subsumptive
+       ((===daikanwa	    . 02503)	; &R-M-02503;
+	)
+       ((===jis-x0208	    . #x4677)	; &R-J0-4677; [38-87]
+	(===jis-x0213-1	    . #x4677)	; &R-J0-4677; [38-87]
+	)
+       ((===adobe-japan1-0  . 03279)	; &R-AJ1-03279;
+	)
+       ((===gt		    . 03209)	; &R-GT-03209;
+	(===gt-k	    . 00471)	; &R-GT-03209;
+	)
+       ((===ucs@unicode	    . #x5302)	; &R-UU+5302;
+	)
+       ((===cbeta	    . 00141)	; &R-CB00141;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x5338)	; 匸
+      ))
+    (=ucs-itaiji-001	. #x5302)	; &U-i001+5302;
+    (<-formed
+     ((=ucs		  . #x5302)	; 匂
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1072,6 +1115,7 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 259 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
       (=ucs		  . #x2FF9)	; ⿹
@@ -1081,21 +1125,39 @@
      ((=ucs		  . #x7C73)	; ç±³
       ))
     (=ucs		. #x530A)	; 匊
+    (=adobe-japan1-4	. 14364)	; &I-AJ1-14364;
+    (=jis-x0212		. #x337D)	; &I-JSP-337D; [19-93]
+    (=iso-ir165		. #x2E29)	; &I-EGB-2E29; [14-09]
+    (=cns11643-2	. #x2556)	; &I-C2-2556; [05-54]
+    (=jis-x0213-2	. #x234C)	; &I-JX2-234C; [03-44]
     (=big5		. #xCBD6)	; &I-B-CBD6;
+    (=daikanwa		. 02523)	; &I-M-02523;
+    (=jef-china3	. #x45A6)	; &I-JC3-45A6;
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x530A)	; 匊
 	)
        ((=ucs		    . #xE0100)	; 󠄀
 	))
-      (hanyu-dazidian	  1 259 1)
-      (=ucs@unicode	  . #x530A)	; &AJ1-14364;
-      (=adobe-japan1-4	  . 14364)	; &AJ1-14364;
-      (=jis-x0212	  . #x337D)	; &I-JSP-337D; [19-93]
-      (=iso-ir165	  . #x2E29)	; &I-EGB-2E29; [14-09]
-      (=jis-x0213-2	  . #x234C)	; &I-JX2-234C; [03-44]
-      (=daikanwa	  . 02523)	; &I-M-02523;
-      (=jef-china3	  . #x45A6)	; &I-JC3-45A6;
+      (==ucs@unicode	  . #x530A)	; &g2-AJ1-14364;
+      (==adobe-japan1-4	  . 14364)	; &g2-AJ1-14364;
+      (==jis-x0212	  . #x337D)	; &g2-AJ1-14364; [19-93]
+      (==iso-ir165	  . #x2E29)	; &g2-AJ1-14364; [14-09]
+      (==jis-x0213-2	  . #x234C)	; &g2-AJ1-14364; [03-44]
+      (==daikanwa	  . 02523)	; &g2-AJ1-14364;
+      (==jef-china3	  . #x45A6)	; &g2-AJ1-14364;
+      (->subsumptive
+       ((===daikanwa	    . 02523)	; &R-M-02523;
+	)
+       ((===jis-x0212	    . #x337D)	; &R-JX2-234C; [19-93]
+	(===jis-x0213-2	    . #x234C)	; &R-JX2-234C; [03-44]
+	)
+       ((===adobe-japan1-4  . 14364)	; &R-AJ1-14364;
+	)
+       ((===ucs@unicode	    . #x530A)	; &R-UU+530A;
+	)
+       ((===jef-china3	    . #x45A6)	; &R-JC3-45A6;
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -1103,16 +1165,26 @@
 	)
        ((=ucs		    . #x52F9)	; 勹
 	)
-       ((=cns11643-1	    . #x484D)	; &C1-484D; [40-45]
+       ((==ucs@cns	    . #x7C73)	; &g2-CU+7C73;
+	(==cns11643-1	    . #x484D)	; &g2-CU+7C73; [40-45]
 	))
-      (=ucs@cns		  . #x530A)	; &C2-2556;
-      (=cns11643-2	  . #x2556)	; &C2-2556; [05-54]
+      (==ucs@cns	  . #x530A)	; &g2-CU+530A;
+      (==cns11643-2	  . #x2556)	; &g2-CU+530A; [05-54]
       ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (=ucs		. #x530B)	; 匋
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x530B)	; 匋
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
     (hanyu-dazidian	1 258 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
@@ -1122,17 +1194,42 @@
       )
      ((=ucs		  . #x7F36)	; 缶
       ))
-    (=ucs		. #x530B)	; 匋
-    (=adobe-japan1-4	. 14365)	; &I-AJ1-14365;
+    (=ucs@unicode	. #x530B)	; &AJ1-14365;
+    (=adobe-japan1-4	. 14365)	; &AJ1-14365;
     (=jis-x0212		. #x337E)	; &I-JSP-337E; [19-94]
     (=cns11643-2	. #x2557)	; &I-C2-2557; [05-55]
     (=jis-x0213-2	. #x234D)	; &I-JX2-234D; [03-45]
     (=big5		. #xCBD7)	; &I-B-CBD7;
     (=daikanwa		. 02524)	; &I-M-02524;
-    (=shinjigen		.  6226)	; 匋
+    (=shinjigen		.  6226)	; &AJ1-14365;
     (=jef-china3	. #x5FE5)	; &I-JC3-5FE5;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x530B)	; 匋
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x26222)	; 𦈢
+      ))
+    (=>mj		. 057082)	; &A-MJ057082;
+    (->subsumptive
+     ((=mj		  . 057082)	; &MJ057082;
+      (=koseki		  . 029330)	; &MJ057082;
+      (->subsumptive
+       ((==mj		    . 057082)	; &g2-MJ057082;
+	(==koseki	    . 029330)	; &g2-MJ057082;
+	))
+      ))
+    ))
+(define-char
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
@@ -1164,31 +1261,45 @@
     (ideographic-radical@ucs/compat . 159)	; ⾞
     (ideographic-strokes@ucs/compat . 2)
     (ideographic-radical@ucs/compat*sources
-     daikanwa=38180 cns11643-6=345D)
+     daikanwa=38180 cns11643-6=345D shinjigen)
     (ideographic-strokes@ucs/compat*sources
      daikanwa=38180)
     (total-strokes	 . 9)
     (sound@ja/on	"guN")
     (=ucs		. #x208DE)	; 𠣞
+    (=cns11643-6	. #x2F2A)	; &I-C6-2F2A; [15-10]
+    (=shinjigen		.  8114)	; 𠣞
     (<-original
      ((=ucs		  . #x8ECD)	; 軍
+      (=jis-x0208	  . #x3733)	; &I-J90-3733; [23-19]
       (=daikanwa	  . 38179)	; &I-M-38179;
+      (=shinjigen	  .  8113)	; 軍
       ))
     (<-original*sources
-     zhengzitong daikanwa)
+     zhengzitong daikanwa shinjigen)
     (->subsumptive
-     ((ideographic-radical . 20)	; ⼓
-      (ideographic-strokes . 7)
-      (=ucs@cns		  . #x208DE)	; &C6-2F2A;
-      (=cns11643-6	  . #x2F2A)	; &C6-2F2A; [15-10]
-      (=daikanwa	  . 02526)	; &I-M-02526;
-      )
-     ((=>ucs*		  . #x208DE)	; 𠣞
-      (ideographic-radical . 159)	; ⾞
-      (ideographic-strokes . 2)
-      (=ucs		  . #x2F9DD)	; 𠣞
-      (=cns11643-6	  . #x345D)	; &I-C6-345D; [20-61]
-      (=daikanwa	  . 38180)	; &I-M-38180;
+     ((==ucs@iso	  . #x208DE)	; &g2-IU-000208DE;
+      (==cns11643-6	  . #x2F2A)	; &g2-IU-000208DE; [15-10]
+      (==shinjigen	  .  8114)	; &g2-IU-000208DE;
+      (->subsumptive
+       ((ideographic-radical . 20)	; ⼓
+	(ideographic-strokes . 7)
+	(=daikanwa	    . 02526)	; &M-02526;
+	(->subsumptive
+	 ((===daikanwa	      . 02526)	; &R-M-02526;
+	  )
+	 ((===cns11643-6      . #x2F2A)	; &R-C6-2F2A; [15-10]
+	  )
+	 ((===ucs@iso	      . #x208DE)	; &R-U-000208DE;
+	  ))
+	)
+       ((=>ucs*		    . #x208DE)	; 𠣞
+	(ideographic-radical . 159)	; ⾞
+	(ideographic-strokes . 2)
+	(=ucs		    . #x2F9DD)	; 𠣞
+	(=cns11643-6	    . #x345D)	; &I-C6-345D; [20-61]
+	(=daikanwa	    . 38180)	; &I-M-38180;
+	))
       ))
     ))
 (define-char
@@ -1552,13 +1663,10 @@
 	)
        ((=ucs		    . #x52F9)	; 勹
 	)
-       ((=ucs@jis	    . #x8EAC)	; &GT-50812;
-	(=ucs@ks	    . #x8EAC)	; &GT-50812;
-	(=jis-x0208	    . #x6D3B)	; &GT-50812; [77-27]
-	(=ks-x1001	    . #x4F65)	; &I-K0-4F65; [47-69]
-	(=cns11643-1	    . #x5845)	; &I-C1-5845; [56-37]
-	(=jis-x0213-1	    . #x6D3B)	; &I-JX1-6D3B; [77-27]
-	(=daikanwa	    . 38038)	; &I-M-38038;
+       ((==ucs@cns	    . #x8EAC)	; &g2-AJ1-06842;
+	(==ucs@jis	    . #x8EAC)	; &g2-AJ1-06842;
+	(==ucs@ks	    . #x8EAC)	; &g2-AJ1-06842;
+	(==adobe-japan1-0   . 06842)	; &g2-AJ1-06842;
 	))
       (==ucs@cns	  . #x5311)	; &g2-AJ1-19202;
       (==ucs@jis	  . #x5311)	; &g2-AJ1-19202;
@@ -1582,8 +1690,7 @@
 	)
        ((=ucs		    . #x52F9)	; 勹
 	)
-       ((=ucs@unicode	    . #x8EAC)	; &G0-392A;
-	(=gb2312	    . #x392A)	; &G0-392A; [25-10]
+       ((==ucs@unicode	    . #x8EAC)	; &g2-UU+8EAC;
 	))
       (==ucs@unicode	  . #x5311)	; &g2-UU+5311;
       (==ucs@JP/hanazono  . nil)
@@ -1656,12 +1763,16 @@
       )
      ((=ucs		  . #x52F9)	; 勹
       )
-     ((=ucs@unicode	  . #x8345)	; &GT-40184;
-      (=jis-x0208	  . #x6829)	; &GT-40184; [72-09]
-      (=iso-ir165	  . #x7E3E)	; &I-EGB-7E3E; [94-30]
-      (=jis-x0213-1	  . #x6829)	; &I-JX1-6829; [72-09]
+     ((=ucs@unicode	  . #x8345)	; &AJ1-06354;
+      (=adobe-japan1-0	  . 06354)	; &AJ1-06354;
       ))
     (=ucs@unicode	. #x5312)	; &UU+5312;
+    (->subsumptive
+     ((==ucs@unicode	  . #x5312)	; &g2-UU+5312;
+      (->subsumptive
+       ((===ucs@unicode	    . #x5312)	; &R-UU+5312;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓