X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R007-Two.el;h=60f67be8b4478800d9db2831ffec3a209db5b81c;hb=3a88cccf85e0fda6a950fa3fd868e10030c1ed43;hp=0135b2a847e296f93b221f6f1502e59bde1f68e3;hpb=54f331f288f973e23422d48f91d5b34da992a158;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R007-Two.el b/lisp/utf-2000/Ideograph-R007-Two.el
index 0135b2a..60f67be 100644
--- a/lisp/utf-2000/Ideograph-R007-Two.el
+++ b/lisp/utf-2000/Ideograph-R007-Two.el
@@ -858,6 +858,8 @@
        ((===hng-wan	    . 01700)	; &HNG049-01700;
 	)
        ((===hng-okd	    . 01550)	; &HNG050-01550;
+	)
+       ((===hng-kkd	    . 00010)	; &HNG079-00010;
 	))
       ))
     ))
@@ -982,21 +984,106 @@
     (total-strokes	 . 4)
     (hanyu-dazidian	1 12 4)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x4E8C)	; 二
       )
      ((=ucs		  . #x3405)	; 㐅
-      )
-     ((=ucs		  . #x4E00)	; 一
       ))
     (=ucs		. #x20121)	; 𠄡
     (=cns11643-6	. #x214A)	; &I-C6-214A; [01-42]
     (=gt		. 00339)	; &I-GT-00339;
     (=gt-pj-2		. #x3233)	; &I-GT-00339; [18-19]
     (=daikanwa		. 00260)	; &I-M-00260;
-    (=hanziku-1		. #xA6AB)	; &I-HZK01-A6AB;
+    (->subsumptive
+     ((==ucs@iso	  . #x20121)	; &g2-GT-00339;
+      (==cns11643-6	  . #x214A)	; &g2-GT-00339; [01-42]
+      (==gt		  . 00339)	; &g2-GT-00339;
+      (==daikanwa	  . 00260)	; &g2-GT-00339;
+      (->subsumptive
+       ((===daikanwa	    . 00260)	; &R-M-00260;
+	)
+       ((===cns11643-6	    . #x214A)	; &R-C6-214A; [01-42]
+	)
+       ((===gt		    . 00339)	; &R-GT-00339;
+	)
+       ((===ucs@iso	    . #x20121)	; &R-U-00020121;
+	)
+       ((=hanziku-1	    . #xA6AB)	; &HZK01-A6AB;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 7)	; ⼆
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (=>big5-cdp@component . #x89AE)	; &A-compCDP-89AE;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>big5-cdp@component . #x89AE)	; &A-compCDP-89AE;
+      ))
+    (ideographic-radical . 7)	; ⼆
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x20120)	; 𠄠
+      )
+     ((=ucs		  . #x20120)	; 𠄠
+      ))
+    (=gt-k		. 00691)	; &GT-K00691;
+    (=gt-pj-k1		. #x3665)	; &GT-K00691; [22-69]
+    (->subsumptive
+     ((==gt-k		  . 00691)	; &g2-GT-K00691;
+      (==gt-pj-k1	  . #x3665)	; &g2-GT-K00691; [22-69]
+      ))
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>big5-cdp@component . #x89AE)	; &A-compCDP-89AE;
+      ))
+    (ideographic-radical . 7)	; ⼆
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=big5-cdp	  . #x8971)	; &CDP-8971;
+      )
+     ((=big5-cdp	  . #x8971)	; &CDP-8971;
+      ))
+    (=gt-k		. 00866)	; &GT-K00866;
+    (=gt-pj-k1		. #x377B)	; &GT-K00866; [23-91]
+    (->subsumptive
+     ((==gt-k		  . 00866)	; &g2-GT-K00866;
+      (==gt-pj-k1	  . #x377B)	; &g2-GT-K00866; [23-91]
+      ))
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>big5-cdp@component . #x89AE)	; &A-compCDP-89AE;
+      ))
+    (ideographic-radical . 7)	; ⼆
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (=big5-cdp		. #x89AE)	; &CDP-89AE;
+    (=gt-k		. 00830)	; &I-GT-K00830;
+    (=gt-pj-k1		. #x376E)	; &CDP-89AE; [23-78]
+    (->subsumptive
+     ((==big5-cdp	  . #x89AE)	; &g2-CDP-89AE;
+      (==gt-k		  . 00830)	; &g2-CDP-89AE;
+      (==gt-pj-k1	  . #x376E)	; &g2-CDP-89AE; [23-78]
+      (->subsumptive
+       ((===big5-cdp	    . #x89AE)	; &R-CDP-89AE;
+	)
+       ((===gt-k	    . 00830)	; &R-GT-K00830;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -1463,7 +1550,6 @@
      ((==>daijiten	  . 00144)	; &A2-DJT-00144;
       ))
     (ideographic-radical . 7)	; ⼆
-    (hanyu-dazidian	2 1441 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -1473,9 +1559,34 @@
      ((=ucs		  . #x4E8C)	; 二
       ))
     (sound@ja/kun	"isasa-ka")
-    (sound@ja/on/go	"sa")
+    (sound@ja/on/conventional "sa")
+    (sound@ja/on/go	"sya" "sa" "sai")
+    (sound@ja/on/kan	"sya" "sa" "sei")
     (=ucs		. #x4E9B)	; 些
-    (=adobe-japan1-0	. 02083)	; &I-AJ1-02083;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4E9B)	; 些
+      ))
+    (ideographic-radical . 7)	; ⼆
+    (ideographic-strokes@ucs . 5)
+    (total-strokes@ucs	     . 7)
+    (ideographic-strokes@ucs*sources
+     daikanwa)
+    (ideographic-strokes@cns . 6)
+    (total-strokes@cns	     . 8)
+    (hanyu-dazidian	2 1441 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs@unicode	  . #x6B64)	; &AJ1-02065;
+      (=adobe-japan1-0	  . 02065)	; &AJ1-02065;
+      )
+     ((=ucs		  . #x4E8C)	; 二
+      ))
+    (=ucs@unicode	. #x4E9B)	; &AJ1-02083;
+    (=adobe-japan1-0	. 02083)	; &AJ1-02083;
     (=jis-x0208		. #x3A33)	; &I-J90-3A33; [26-19]
     (=gb2312		. #x5029)	; &I-G0-5029; [48-09]
     (=ks-x1001		. #x5E41)	; &I-K0-5E41; [62-33]
@@ -1487,7 +1598,16 @@
     (=gt-pj-1		. #x3A33)	; &I-GT-00360; [26-19]
     (=daikanwa		. 00268)	; &I-M-00268;
     (=daijiten		. 00144)	; &I-DJT-00144;
-    (=shinjigen		.  0086)	; 些
+    (=shinjigen		.  0086)	; &AJ1-02083;
+    (->formed
+     ((=ucs@unicode	  . #x5470)	; &AJ1-04356;
+      (=adobe-japan1-0	  . 04356)	; &AJ1-04356;
+      (=daikanwa	  . 03452)	; &I-M-03452;
+      ))
+    (->formed$_1*sources
+     jiyun daikanwa)
+    (->formed*sources
+     jiyun daikanwa)
     (->subsumptive
      ((ideographic-strokes . 5)
       (total-strokes	   . 7)
@@ -1496,15 +1616,6 @@
 	)
        ((=ucs		    . #xE0100)	; 󠄀
 	))
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((==ucs@unicode	    . #x6B64)	; &g2-AJ1-02065;
-	(==adobe-japan1-0   . 02065)	; &g2-AJ1-02065;
-	)
-       ((=ucs		    . #x4E8C)	; 二
-	))
       (==ucs@unicode	  . #x4E9B)	; &g2-AJ1-02083;
       (==adobe-japan1-0	  . 02083)	; &g2-AJ1-02083;
       (==gb2312		  . #x5029)	; &g2-AJ1-02083; [48-09]
@@ -1537,15 +1648,6 @@
       )
      ((ideographic-strokes . 6)
       (total-strokes	   . 8)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((==ucs@cns	    . #x6B64)	; &g2-CU+6B64;
-	(==cns11643-1	    . #x483A)	; &g2-CU+6B64; [40-26]
-	)
-       ((=ucs		    . #x4E8C)	; 二
-	))
       (==ucs@cns	  . #x4E9B)	; &g2-CU+4E9B;
       (==cns11643-1	  . #x4B68)	; &g2-CU+4E9B; [43-72]
       ))
@@ -1937,30 +2039,67 @@
   '((ideographic-radical . 7)	; ⼆
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
-    (hanyu-dazidian	1 25 3)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=ucs		  . #x4E00)	; 一
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x5E7A)	; 幺
-	)
-       ((=ucs		    . #x5E7A)	; 幺
-	))
+     ((=>ucs@component	  . #x4E8C)	; &A-compU+4E8C;
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((=ucs		  . #x221B6)	; 𢆶
       ))
+    (sound@ja/on/go	"ma")
+    (sound@ja/on/kan	"ba")
     (=ucs		. #x2012E)	; 𠄮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2012E)	; 𠄮
+      ))
+    (ideographic-radical . 7)	; ⼆
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (hanyu-dazidian	1 25 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+      (=ucs		  . #x2FF4)	; â¿´
+      )
+     ((=ucs		  . #x4E8C)	; 二
+      )
+     ((=ucs@iso		  . #x221B6)	; &C4-2267;
+      (=cns11643-4	  . #x2267)	; &C4-2267; [02-71]
+      (=daikanwa	  . 09196)	; &I-M-09196;
+      ))
+    (=ucs@iso		. #x2012E)	; &MJ030475;
+    (=mj		. 030475)	; &MJ030475;
     (=cns11643-4	. #x2532)	; &I-C4-2532; [05-18]
+    (=koseki		. 003290)	; &MJ030475;
     (=gt		. 00364)	; &I-GT-00364;
     (=gt-pj-2		. #x323D)	; &I-GT-00364; [18-29]
     (=daikanwa		. 00275)	; &I-M-00275;
-    (=hanziku-1		. #xA951)	; &I-HZK01-A951;
+    (->subsumptive
+     ((==ucs@cns	  . #x2012E)	; &g2-MJ030475;
+      (==mj		  . 030475)	; &g2-MJ030475;
+      (==cns11643-4	  . #x2532)	; &g2-MJ030475; [05-18]
+      (==koseki		  . 003290)	; &g2-MJ030475;
+      (==gt		  . 00364)	; &g2-MJ030475;
+      (==daikanwa	  . 00275)	; &g2-MJ030475;
+      (->subsumptive
+       ((===daikanwa	    . 00275)	; &R-M-00275;
+	)
+       ((===mj		    . 030475)	; &R-MJ030475;
+	)
+       ((===cns11643-4	    . #x2532)	; &R-C4-2532; [05-18]
+	)
+       ((===gt		    . 00364)	; &R-GT-00364;
+	))
+      )
+     ((==ucs@iso	  . #x2012E)	; &g2-IU-0002012E;
+      (->subsumptive
+       ((===ucs@iso	    . #x2012E)	; &R-U-0002012E;
+	)
+       ((=hanziku-1	    . #xA951)	; &HZK01-A951;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆
@@ -2184,14 +2323,70 @@
     (ideographic-radical@cns . 7)	; ⼆
     (ideographic-strokes@cns . 8)
     (total-strokes	 . 10)
-    (hanyu-dazidian	1 387 18)
     (=ucs		. #x20AFC)	; ð «¼
-    (=cns11643-6	. #x352E)	; &I-C6-352E; [21-14]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20AFC)	; ð «¼
+      ))
+    (ideographic-radical@ucs . 28)	; ⼛
+    (ideographic-strokes@ucs . 8)
+    (ideographic-radical@cns . 7)	; ⼆
+    (ideographic-strokes@cns . 8)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	1 387 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x53BD)	; 厽
+      )
+     ((=big5-cdp	  . #x89C6)	; &CDP-89C6;
+      ))
+    (=ucs@iso		. #x20AFC)	; &GT-00368;
+    (=cns11643-6	. #x352E)	; &GT-00368; [21-14]
     (=gt		. 00368)	; &I-GT-00368;
     (=gt-k		. 06658)	; &I-GT-K06658;
     (=gt-pj-2		. #x3244)	; &I-GT-00368; [18-36]
     (=daikanwa		. 00283)	; &I-M-00283;
-    (=hanziku-1		. #xF5BE)	; &I-HZK01-F5BE;
+    (->subsumptive
+     ((==ucs@iso	  . #x20AFC)	; &g2-GT-00368;
+      (==cns11643-6	  . #x352E)	; &g2-GT-00368; [21-14]
+      (==gt		  . 00368)	; &g2-GT-00368;
+      (==gt-k		  . 06658)	; &g2-GT-00368;
+      (==daikanwa	  . 00283)	; &g2-GT-00368;
+      (->subsumptive
+       ((===daikanwa	    . 00283)	; &R-M-00283;
+	)
+       ((===cns11643-6	    . #x352E)	; &R-C6-352E; [21-14]
+	)
+       ((===gt		    . 00368)	; &R-GT-00368;
+	(===gt-k	    . 06658)	; &R-GT-00368;
+	)
+       ((===ucs@iso	    . #x20AFC)	; &R-U-00020AFC;
+	)
+       ((=hanziku-1	    . #xF5BE)	; &HZK01-F5BE;
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20AFC)	; ð «¼
+      ))
+    (ideographic-radical@ucs . 28)	; ⼛
+    (ideographic-strokes@ucs . 8)
+    (ideographic-radical@cns . 7)	; ⼆
+    (ideographic-strokes@cns . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (=ucs		  . #x2FF5)	; ⿵
+      )
+     ((=ucs-itaiji-001	  . #x20AF8)	; &U-i001+20AF8;
+      )
+     ((=ucs		  . #x4E8C)	; 二
+      ))
+    (=ucs-var-001	. #x20AFC)	; &U-v001+20AFC;
     ))
 (define-char
   '((ideographic-radical . 7)	; ⼆