X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R020-Wrap.el;h=8a0ca04c1f56262acd41f20086838de99a88b6aa;hb=f5b965b0c909423e72d107770687bedb754458d0;hp=2a375ea712e338e1685473650362743a966e8efe;hpb=0b7ad79d077bf82e3020b4b258566cf73cf30f99;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index 2a375ea..8a0ca04 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -371,6 +371,8 @@
        ((===hng-khi	    . 02810)	; &HNG010-02810;
 	)
        ((===hng-khm	    . 02260)	; &HNG011-02260;
+	)
+       ((===hng-kar	    . 06170)	; &HNG018-06170;
 	))
       ))
     ))
@@ -453,6 +455,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)	; ⼓
@@ -652,6 +697,8 @@
 	)
        ((===ucs@unicode	    . #x5305)	; &R-UU+5305;
 	))
+      )
+     ((===hng-kar	  . 00470)	; &HNG018-00470;
       ))
     ))
 (define-char
@@ -662,16 +709,6 @@
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (=decomposition@cid
-     ((=ucs		  . #x5305)	; 包
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x5305)	; 包
-      )
-     ((=ucs		  . #xE0102)	; 󠄂
-      ))
     (ideographic-structure
      ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs		  . #x2FFB)	; â¿»
@@ -693,6 +730,47 @@
     (=gt-pj-1		. #x4A71)	; &I-GT-03223; [42-81]
     (=daikanwa/+p	. 02506)	; 包
     (=shinjigen		.  0775)	; 包
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x5305)	; 包
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (=decomposition@hanyo-denshi
+       ((=ucs		    . #x5305)	; 包
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@iso	  . #x2F829)	; &g2-MJ007758;
+      (==ucs@jis	  . #x5305)	; &g2-MJ007758;
+      (==mj		  . 007758)	; &g2-MJ007758;
+      (==adobe-japan1-0	  . 03649)	; &g2-MJ007758;
+      (==jis-x0208	  . #x4A71)	; &g2-MJ007758; [42-81]
+      (==cns11643-6	  . #x2246)	; &g2-MJ007758; [02-38]
+      (==jis-x0213-1	  . #x4A71)	; &g2-MJ007758; [42-81]
+      (==hanyo-denshi/ja  . #x4A71)	; &g2-MJ007758; [42-81]
+      (==gt		  . 03223)	; &g2-MJ007758;
+      (==gt-k		  . 01001)	; &g2-MJ007758;
+      (==daikanwa/+p	  . 02506)	; &g2-MJ007758;
+      (==shinjigen	  .  0775)	; &g2-MJ007758;
+      (->subsumptive
+       ((===daikanwa/+p	    . 02506)	; &R-M-p02506;
+	)
+       ((===jis-x0208	    . #x4A71)	; &R-J0-4A71; [42-81]
+	(===jis-x0213-1	    . #x4A71)	; &R-J0-4A71; [42-81]
+	)
+       ((===adobe-japan1-0  . 03649)	; &R-AJ1-03649;
+	)
+       ((===mj		    . 007758)	; &R-MJ007758;
+	)
+       ((===cns11643-6	    . #x2246)	; &R-C6-2246; [02-38]
+	)
+       ((===gt		    . 03223)	; &R-GT-03223;
+	(===gt-k	    . 01001)	; &R-GT-03223;
+	)
+       ((===ucs@iso	    . #x2F829)	; &R-U-0002F829;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓
@@ -1133,6 +1211,15 @@
   '((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")
@@ -1142,17 +1229,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)
@@ -1184,31 +1296,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
@@ -1415,7 +1541,6 @@
   '((ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 542 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1425,25 +1550,88 @@
      ((=ucs		  . #x5305)	; 包
       ))
     (=ucs		. #x530F)	; 匏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x530F)	; 匏
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 542 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5938)	; 夸
+      )
+     ((=ucs@unicode	  . #x5305)	; &MJ007757;
+      (=mj		  . 007757)	; &MJ007757;
+      ))
+    (=ucs@unicode	. #x530F)	; &AJ1-04300;
+    (=adobe-japan1-0	. 04300)	; &AJ1-04300;
+    (=jis-x0208		. #x5237)	; &I-J90-5237; [50-23]
+    (=gb2312		. #x5E4B)	; &I-G0-5E4B; [62-43]
+    (=ks-x1001		. #x7852)	; &I-K0-7852; [88-50]
+    (=cns11643-1	. #x5931)	; &I-C1-5931; [57-17]
+    (=jis-x0213-1	. #x5237)	; &I-JX1-5237; [50-23]
+    (=big5		. #xB0CC)	; &I-B-B0CC;
+    (=gt		. 03267)	; &I-GT-03267;
+    (=gt-pj-1		. #x5237)	; &I-GT-03267; [50-23]
+    (=daikanwa		. 02544)	; &I-M-02544;
+    (=shinjigen		.  0781)	; &AJ1-04300;
     (->subsumptive
      ((=decomposition@cid
        ((=ucs		    . #x530F)	; 匏
 	)
        ((=ucs		    . #xE0100)	; 󠄀
 	))
-      (=ucs@unicode	  . #x530F)	; &AJ1-04300;
-      (=adobe-japan1-0	  . 04300)	; &AJ1-04300;
-      (=jis-x0208	  . #x5237)	; &I-J90-5237; [50-23]
-      (=gb2312		  . #x5E4B)	; &I-G0-5E4B; [62-43]
-      (=ks-x1001	  . #x7852)	; &I-K0-7852; [88-50]
-      (=cns11643-1	  . #x5931)	; &I-C1-5931; [57-17]
-      (=jis-x0213-1	  . #x5237)	; &I-JX1-5237; [50-23]
-      (=big5		  . #xB0CC)	; &I-B-B0CC;
-      (=gt		  . 03267)	; &I-GT-03267;
-      (=gt-pj-1		  . #x5237)	; &I-GT-03267; [50-23]
-      (=daikanwa	  . 02544)	; &I-M-02544;
-      (=shinjigen	  .  0781)	; &AJ1-04300;
+      (==ucs@unicode	  . #x530F)	; &g2-AJ1-04300;
+      (==adobe-japan1-0	  . 04300)	; &g2-AJ1-04300;
+      (==gb2312		  . #x5E4B)	; &g2-AJ1-04300; [62-43]
+      (==ks-x1001	  . #x7852)	; &g2-AJ1-04300; [88-50]
+      (==jis-x0208	  . #x5237)	; &g2-AJ1-04300; [50-23]
+      (==cns11643-1	  . #x5931)	; &g2-AJ1-04300; [57-17]
+      (==jis-x0213-1	  . #x5237)	; &g2-AJ1-04300; [50-23]
+      (==gt		  . 03267)	; &g2-AJ1-04300;
+      (==daikanwa	  . 02544)	; &g2-AJ1-04300;
+      (==shinjigen	  .  0781)	; &g2-AJ1-04300;
+      (->subsumptive
+       ((===daikanwa	    . 02544)	; &R-M-02544;
+	)
+       ((===jis-x0208	    . #x5237)	; &R-J0-5237; [50-23]
+	(===jis-x0213-1	    . #x5237)	; &R-J0-5237; [50-23]
+	)
+       ((===adobe-japan1-0  . 04300)	; &R-AJ1-04300;
+	)
+       ((===cns11643-1	    . #x5931)	; &R-C1-5931; [57-17]
+	)
+       ((===gt		    . 03267)	; &R-GT-03267;
+	)
+       ((===ucs@ks	    . #x530F)	; &R-K0-7852;
+	(===ks-x1001	    . #x7852)	; &R-K0-7852; [88-50]
+	)
+       ((===ucs@unicode	    . #x530F)	; &R-UU+530F;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x530F)	; 匏
+      ))
+    (ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=mj		  . 009469)	; &MJ009469;
+      )
+     ((=ucs@unicode	  . #x5305)	; &MJ007757;
+      (=mj		  . 007757)	; &MJ007757;
       ))
+    (===hng-kar		. 00460)	; &HNG018-00460;
     ))
 (define-char
   '((ideographic-radical . 20)	; ⼓