X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R070-Square.el;h=8fb40fd224504f9a780b61629afffc334aed2a6d;hb=133a3b4eefe6e2bc1a8fa5f860e4f25d9011b10b;hp=ab572c7a94ca6028673e6b99b9a9f7846af4e5e7;hpb=b00849f0c1a0341aafc94a0e26428150db35cc55;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index ab572c7..8fb40fd 100644
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -47,6 +47,10 @@
        ((===cns11643-1	    . #x4549)	; &R-C1-4549; [37-41]
 	)
        ((===hng-khi	    . 04090)	; &HNG010-04090;
+	)
+       ((===hng-khm	    . 03610)	; &HNG011-03610;
+	)
+       ((===hng-kar	    . 09330)	; &HNG018-09330;
 	))
       ))
     ))
@@ -54,27 +58,88 @@
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65B9)	; 方
+      )
+     ((=ucs		  . #x4EBA)	; 人
+      ))
     (=ucs		. #x3AC3)	; 㫃
-    (->subsumptive
-     ((=big5-cdp	  . #x8A7E)	; &CDP-8A7E;
-      (=daikanwa	  . 13621)	; &I-M-13621;
-      (=cbeta		  . 08182)	; &I-CB08182;
+    (=mj		. 001565)	; &I-MJ001565;
+    (=cns11643-3	. #x2371)	; &I-C3-2371; [03-81]
+    (=big5-cdp		. #x8A7E)	; &I-CDP-8A7E;
+    (=koseki		. 152830)	; 㫃
+    (=daikanwa		. 13621)	; &I-M-13621;
+    (=cbeta		. 08182)	; &I-CB08182;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3AC3)	; &g2-MJ001565;
+      (==mj		  . 001565)	; &g2-MJ001565;
+      (==cns11643-3	  . #x2371)	; &g2-MJ001565; [03-81]
+      (==big5-cdp	  . #x8A7E)	; &g2-MJ001565;
+      (==koseki		  . 152830)	; &g2-MJ001565;
+      (==daikanwa	  . 13621)	; &g2-MJ001565;
+      (==cbeta		  . 08182)	; &g2-MJ001565;
+      (->subsumptive
+       ((===daikanwa	    . 13621)	; &R-M-13621;
+	)
+       ((===mj		    . 001565)	; &R-MJ001565;
+	)
+       ((===big5-cdp	    . #x8A7E)	; &R-CDP-8A7E;
+	)
+       ((===cbeta	    . 08182)	; &R-CB08182;
+	)
+       ((===cns11643-3	    . #x2371)	; &R-C3-2371; [03-81]
+	)
+       ((===ucs@unicode	    . #x3AC3)	; &R-UU+3AC3;
+	))
       )
-     ((=ucs@unicode	  . #x3AC3)	; &C3-2371;
-      (=cns11643-3	  . #x2371)	; &C3-2371; [03-81]
+     ((=cbeta		  . 09247)	; &CB09247;
+      (<-identical@component/surround-from-upper-left
+       ((=ucs		    . #x3AC3)	; 㫃
+	))
       ))
     ))
 (define-char
-  '((<-denotational
+  '((ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 2)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x65B9)	; 方
+      )
+     ((name*		  . "ideographic component person for top")
+      (=ucs		  . #x20089)	; 𠂉
+      ))
+    (=cbeta		. 12073)	; &U-i001+3AC3;
+    (=ucs-itaiji-001	. #x3AC3)	; &U-i001+3AC3;
+    (<-formed@component/surround-from-upper-left
      ((=ucs		  . #x3AC3)	; 㫃
       ))
-    (ideographic-radical . 70)	; ⽅
+    (->subsumptive
+     ((==cbeta		  . 12073)	; &g2-CB12073;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (=cbeta		. 09247)	; &CB09247;
-    (<-formed@component
-     ((=big5-cdp	  . #x8A7E)	; &CDP-8A7E;
-      (=daikanwa	  . 13621)	; &I-M-13621;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x52F9)	; 勹
+      )
+     ((=ucs		  . #x65B9)	; 方
+      ))
+    (=gt-k		. 02058)	; &GT-K02058;
+    (=gt-pj-k2		. #x403A)	; &GT-K02058; [32-26]
+    (->subsumptive
+     ((==gt-k		  . 02058)	; &g2-GT-K02058;
+      (==gt-pj-k2	  . #x403A)	; &g2-GT-K02058; [32-26]
       ))
     ))
 (define-char
@@ -150,6 +215,15 @@
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=>ucs@component	  . #x4EA0)	; &A-compU+4EA0;
+      (=>iwds-1		  .  0062)	; &A-compU+4EA0;
+      )
+     ((=gt-k		  . 02058)	; &GT-K02058;
+      ))
     (=ucs		. #x3AC4)	; 㫄
     ))
 (define-char
@@ -159,6 +233,14 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E8C)	; 二
+      )
+     ((=gt-k		  . 02058)	; &GT-K02058;
+      ))
     (=ucs@unicode	. #x3AC4)	; &AJ1-20135;
     (=adobe-japan1-5	. 20135)	; &AJ1-20135;
     (=cns11643-6	. #x2B70)	; &I-C6-2B70; [11-80]
@@ -195,7 +277,21 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=hanziku-6		. #xBFE2)	; &HZK06-BFE2;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=gt-k		  . 02058)	; &GT-K02058;
+      ))
+    (=ucs-var-002	. #x3AC4)	; &U-v002+3AC4;
+    (->subsumptive
+     ((==ucs-var-002	  . #x3AC4)	; &g2-U-v002+3AC4;
+      (->subsumptive
+       ((=hanziku-6	    . #xBFE2)	; &HZK06-BFE2;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -244,8 +340,12 @@
 	  )
 	 ((===cns11643-1      . #x4D75)	; &R-C1-4D75; [45-85]
 	  ))
+	)
+       ((===hng-khm	    . 03620)	; &HNG011-03620;
 	))
       )
+     ((===hng-kar	  . 09300)	; &HNG018-09300;
+      )
      ((===hng-khi	  . 04100)	; &HNG010-04100;
       ))
     ))
@@ -311,6 +411,8 @@
        ((===cns11643-1	    . #x514C)	; &R-C1-514C; [49-44]
 	)
        ((===hng-khi	    . 04110)	; &HNG010-04110;
+	)
+       ((===hng-kar	    . 09340)	; &HNG018-09340;
 	))
       ))
     ))
@@ -606,6 +708,27 @@
     (=gt-pj-1		. #x5A53)	; &I-GT-17237; [58-51]
     (=daikanwa		. 13640)	; &I-M-13640;
     (=shinjigen		.  3242)	; &AJ1-05080;
+    (->subsumptive
+     ((==ucs@jis	  . #x65C3)	; &g2-AJ1-05080;
+      (==adobe-japan1-0	  . 05080)	; &g2-AJ1-05080;
+      (==jis-x0208	  . #x5A53)	; &g2-AJ1-05080; [58-51]
+      (==jis-x0213-1	  . #x5A53)	; &g2-AJ1-05080; [58-51]
+      (==gt		  . 17237)	; &g2-AJ1-05080;
+      (==gt-k		  . 06596)	; &g2-AJ1-05080;
+      (==daikanwa	  . 13640)	; &g2-AJ1-05080;
+      (==shinjigen	  .  3242)	; &g2-AJ1-05080;
+      (->subsumptive
+       ((===daikanwa	    . 13640)	; &R-M-13640;
+	)
+       ((===jis-x0208	    . #x5A53)	; &R-J0-5A53; [58-51]
+	(===jis-x0213-1	    . #x5A53)	; &R-J0-5A53; [58-51]
+	)
+       ((===adobe-japan1-0  . 05080)	; &R-AJ1-05080;
+	)
+       ((===gt		    . 17237)	; &R-GT-17237;
+	(===gt-k	    . 06596)	; &R-GT-17237;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -759,11 +882,6 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x65C5)	; 旅
-      )
-     ((=ucs		  . #xE0102)	; 󠄂
-      ))
     (=ucs@jis		. #x65C5)	; &AJ1-03969;
     (=adobe-japan1-0	. 03969)	; &AJ1-03969;
     (=jis-x0208		. #x4E39)	; &I-J90-4E39; [46-25]
@@ -773,6 +891,32 @@
     (=gt-k		. 06561)	; &I-GT-K06561;
     (=gt-pj-1		. #x4E39)	; &I-GT-17248; [46-25]
     (=shinjigen		.  3250)	; &AJ1-03969;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x65C5)	; 旅
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==ucs@jis	  . #x65C5)	; &g2-AJ1-03969;
+      (==adobe-japan1-0	  . 03969)	; &g2-AJ1-03969;
+      (==jis-x0208	  . #x4E39)	; &g2-AJ1-03969; [46-25]
+      (==jis-x0213-1	  . #x4E39)	; &g2-AJ1-03969; [46-25]
+      (==hanyo-denshi/ja  . #x4E39)	; &g2-AJ1-03969; [46-25]
+      (==gt		  . 17248)	; &g2-AJ1-03969;
+      (==gt-k		  . 06561)	; &g2-AJ1-03969;
+      (==shinjigen	  .  3250)	; &g2-AJ1-03969;
+      (->subsumptive
+       ((===jis-x0208	    . #x4E39)	; &R-J0-4E39; [46-25]
+	(===jis-x0213-1	    . #x4E39)	; &R-J0-4E39; [46-25]
+	)
+       ((===adobe-japan1-0  . 03969)	; &R-AJ1-03969;
+	)
+       ((===gt		    . 17248)	; &R-GT-17248;
+	(===gt-k	    . 06561)	; &R-GT-17248;
+	))
+      )
+     ((===hng-kar	  . 01650)	; &HNG018-01650;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -900,10 +1044,30 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (->subsumptive
-     ((=daikanwa	  . 13649)	; &M-13649;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=big5-cdp	  . #x86FC)	; &CDP-86FC;
       )
-     ((=ucs@iso		  . #x230EA)	; &U-000230EA;
+     ((=ucs		  . #x65B9)	; 方
+      ))
+    (=ucs@iso		. #x230EA)	; &M-13649;
+    (=daikanwa		. 13649)	; &M-13649;
+    (<-same
+     ((=ucs		  . #x6EC2)	; 滂
+      (=daikanwa	  . 18003)	; &I-M-18003;
+      ))
+    (<-same*sources
+     pianhai-leibian daikanwa)
+    (->subsumptive
+     ((==ucs@iso	  . #x230EA)	; &g2-M-13649;
+      (==daikanwa	  . 13649)	; &g2-M-13649;
+      (->subsumptive
+       ((===daikanwa	    . 13649)	; &R-M-13649;
+	)
+       ((===ucs@iso	    . #x230EA)	; &R-U-000230EA;
+	))
       ))
     ))
 (define-char
@@ -913,7 +1077,20 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x86FC)	; &CDP-86FC;
+      )
+     ((=ucs		  . #x65B9)	; 方
+      ))
+    (=ucs@cns		. #x230EA)	; &C6-3835;
     (=cns11643-6	. #x3835)	; &C6-3835; [24-21]
+    (->subsumptive
+     ((==ucs@cns	  . #x230EA)	; &g2-CU+230EA;
+      (==cns11643-6	  . #x3835)	; &g2-CU+230EA; [24-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -979,6 +1156,14 @@
   '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x752B)	; 甫
+      )
+     ((=ucs		  . #x65B9)	; 方
+      ))
     (=ucs		. #x65C9)	; 旉
     ))
 (define-char
@@ -988,11 +1173,21 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x752B)	; &AJ1-03635;
+      (=adobe-japan1-0	  . 03635)	; &AJ1-03635;
+      )
+     ((=ucs		  . #x65B9)	; 方
+      ))
     (=ucs@unicode	. #x65C9)	; &AJ1-17729;
     (=adobe-japan1-5	. 17729)	; &AJ1-17729;
     (=jis-x0212		. #x4167)	; &I-JSP-4167; [33-71]
     (=cns11643-3	. #x363F)	; &I-C3-363F; [22-31]
     (=jis-x0213-2	. #x2D6F)	; &I-JX2-2D6F; [13-79]
+    (=big5-cdp		. #x8DCE)	; &I-CDP-8DCE;
     (=hanyo-denshi/jb	. #x4167)	; &I-HD-JB-4167; [33-71]
     (=daikanwa		. 13654)	; &I-M-13654;
     (=jef-china3	. #x50E9)	; &I-JC3-50E9;
@@ -1023,8 +1218,14 @@
        ((===ucs@unicode	    . #x65C9)	; &R-UU+65C9;
 	))
       )
-     ((==ucs@cns	  . #x65C9)	; &g2-CU+65C9;
-      (==cns11643-3	  . #x363F)	; &g2-CU+65C9; [22-31]
+     ((==ucs@cns	  . #x65C9)	; &g2-CDP-8DCE;
+      (==cns11643-3	  . #x363F)	; &g2-CDP-8DCE; [22-31]
+      (==big5-cdp	  . #x8DCE)	; &g2-CDP-8DCE;
+      (->subsumptive
+       ((===big5-cdp	    . #x8DCE)	; &R-CDP-8DCE;
+	)
+       ((===cns11643-3	    . #x363F)	; &R-C3-363F; [22-31]
+	))
       ))
     ))
 (define-char
@@ -1034,12 +1235,23 @@
     (ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=decomposition@hanyo-denshi
-     ((=ucs		  . #x65C9)	; 旉
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs		  . #xE0102)	; 󠄂
+     ((=gt-k		  . 03345)	; &GT-K03345;
+      )
+     ((=ucs		  . #x65B9)	; 方
       ))
     (=hanyo-denshi/jt	. #xB274)	; &HD-JT-B274;
+    (->subsumptive
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x65C9)	; 旉
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (==hanyo-denshi/jt  . #xB274)	; &g2-HD-JT-B274;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
@@ -1922,12 +2134,8 @@
        ((==ucs@unicode	    . #x65B9)	; &g2-AJ1-03661;
 	(==adobe-japan1-0   . 03661)	; &g2-AJ1-03661;
 	)
-       ((=ucs@unicode	    . #x756A)	; &GT-28068;
-	(=jis-x0208	    . #x4856)	; &GT-28068; [40-54]
-	(=gb2312	    . #x372C)	; &I-G0-372C; [23-12]
-	(=ks-x1001	    . #x5B63)	; &I-K0-5B63; [59-67]
-	(=jis-x0213-1	    . #x4856)	; &I-JX1-4856; [40-54]
-	(=daikanwa	    . 21858)	; &I-M-21858;
+       ((==ucs@unicode	    . #x756A)	; &g2-AJ1-03434;
+	(==adobe-japan1-0   . 03434)	; &g2-AJ1-03434;
 	))
       (==ucs@unicode	  . #x65D9)	; &g2-AJ1-05087;
       (==adobe-japan1-0	  . 05087)	; &g2-AJ1-05087;
@@ -1992,6 +2200,23 @@
     ))
 (define-char
   '((ideographic-radical . 70)	; ⽅
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=cbeta		  . 12073)	; &U-i001+3AC3;
+      )
+     ((=ucs		  . #x7568)	; 畨
+      ))
+    (=ucs-itaiji-001	. #x65DB)	; &U-i001+65DB;
+    (<-formed
+     ((=ucs		  . #x65DB)	; 旛
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 70)	; ⽅
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=ucs		. #x2311E)	; 𣄞