X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R060-Step.el;h=455fa12e05af9f93f15baf712979f38606390af3;hb=29ca9db4a955ea5e67758e3edacfc78afc52d4d2;hp=e45bd187db80a2203326c29485b9b0b5b6e4bc77;hpb=ef4118b7380b3f929ff8b6ff5c4edc766eef92c5;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index e45bd18..455fa12 100644
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -906,8 +906,8 @@
      ((=daikanwa	  . 10104)	; &M-10104;
       (=jef-china3	  . #x4DB3)	; &I-JC3-4DB3;
       (<-same
-       ((=ucs@jis	    . #x4F5F)	; &M-00522;
-	(=jis-x0212	    . #x3070)	; &M-00522; [16-80]
+       ((=ucs@jis	    . #x4F5F)	; 佟󠄀
+	(=jis-x0212	    . #x3070)	; 佟󠄀 [16-80]
 	(=jis-x0213-1	    . #x2E31)	; &I-JX1-2E31; [14-17]
 	(=daikanwa	    . 00522)	; &I-M-00522;
 	))
@@ -986,13 +986,40 @@
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
+    (=ucs		. #x5F8F)	; 徏
+    (=>jis-x0213-2	. #x2C36)	; 徏 [12-22]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F8F)	; 徏
+      ))
+    (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x5F8F)	; 徏
-    (=jis-x0212		. #x3D2B)	; &I-JSP-3D2B; [29-11]
-    (=cns11643-3	. #x3072)	; &I-C3-3072; [16-82]
-    (=jis-x0213-2	. #x2C36)	; &I-JX2-2C36; [12-22]
-    (=daikanwa		. 10109)	; &I-M-10109;
+    (=>>ucs@unicode	. #x5F8F)	; &G-JX2-2C36;
+    (=>>jis-x0213-2	. #x2C36)	; &G-JX2-2C36; [12-22]
+    (=>>daikanwa	. 10109)	; &G-JX2-2C36;
+    (->subsumptive
+     ((=>>>ucs@jis	  . #x5F8F)	; &M-10109;
+      (=ucs@jis		  . #x5F8F)	; &M-10109;
+      (=jis-x0212	  . #x3D2B)	; &M-10109; [29-11]
+      (=jis-x0213-2	  . #x2C36)	; &I-JX2-2C36; [12-22]
+      (=daikanwa	  . 10109)	; &I-M-10109;
+      (=hanyo-denshi/jb	  . #x3D2B)	; &I-HD-JB-3D2B; [29-11]
+      )
+     ((=>>>ucs@unicode	  . #x5F8F)	; &C3-3072;
+      (=ucs@unicode	  . #x5F8F)	; &C3-3072;
+      (=cns11643-3	  . #x3072)	; &C3-3072; [16-82]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5F8F)	; 徏
+      ))
+    (ideographic-radical . 60)	; â¼»
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=hanyo-denshi/ib	. #x3245)	; &HD-IB-3245; [18-37]
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -2347,59 +2374,141 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x22533)	; 𢔳
-    (=cns11643-5	. #x3F2C)	; &I-C5-3F2C; [31-12]
-    (=daikanwa		. 10198)	; &I-M-10198;
+    (->subsumptive
+     ((=ucs@iso		  . #x22533)	; &M-10198;
+      (=daikanwa	  . 10198)	; &M-10198;
+      )
+     ((=cns11643-5	  . #x3F2C)	; &C5-3F2C; [31-12]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x38EF)	; 㣯
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 10199)	; &M-10199;
+    (=ucs		. #x38EF)	; 㣯
     ))
 (define-char
-  '((morohashi-daikanwa	10199 0 3)
+  '((<-denotational
+     ((=ucs		  . #x38EF)	; 㣯
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x38EF)	; 㣯
-    (=cns11643-4	. #x3D33)	; &I-C4-3D33; [29-19]
+    (=daikanwa		. 10199)	; &M-10199;
     ))
 (define-char
-  '((=>ucs		. #x5FAC)	; 徬
+  '((<-denotational
+     ((=ucs		  . #x38EF)	; 㣯
+      ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs@jis		. #x5FAC)	; &M-10200;
-    (=ucs@big5		. #x5FAC)	; &M-10200;
-    (=jis-x0212		. #x3D33)	; &M-10200; [29-19]
-    (=big5		. #xB74B)	; &I-B-B74B;
-    (=daikanwa		. 10200)	; &I-M-10200;
+    (=>>ucs@unicode	. #x38EF)	; &G-UU+38EF;
+    (->subsumptive
+     ((=ucs@unicode	  . #x38EF)	; &UU+38EF;
+      )
+     ((=cns11643-4	  . #x3D33)	; &C4-3D33; [29-19]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	10200 0 0)
-    (ideographic-radical . 60)	; â¼»
+  '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5FAC)	; 徬
-    (=iso-ir165		. #x2E3B)	; &I-EGB-2E3B; [14-27]
-    (=cns11643-1	. #x6371)	; &I-C1-6371; [67-81]
-    (=jef-china3	. #x4DBC)	; &I-JC3-4DBC;
+    (=big5		. #xB74B)	; &I-B-B74B;
+    (->subsumptive
+     ((=ucs@jis		  . #x5FAC)	; &M-10200;
+      (=jis-x0212	  . #x3D33)	; &M-10200; [29-19]
+      (=daikanwa	  . 10200)	; &I-M-10200;
+      (=jef-china3	  . #x4DBC)	; &I-JC3-4DBC;
+      )
+     ((=ucs@unicode	  . #x5FAC)	; &C1-6371;
+      (=iso-ir165	  . #x2E3B)	; &C1-6371; [14-27]
+      (=cns11643-1	  . #x6371)	; &I-C1-6371; [67-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F73)	; å½³
+      )
+     ((=ucs		  . #x4343)	; 䍃
+      ))
     (=ucs		. #x5FAD)	; å¾­
-    (=jis-x0208		. #x5754)	; &I-J90-5754; [55-52]
-    (=gb2312		. #x6166)	; &I-G0-6166; [65-70]
-    (=cns11643-2	. #x426A)	; &I-C2-426A; [34-74]
-    (=jis-x0213-1	. #x5754)	; &I-JX1-5754; [55-52]
-    (=big5		. #xDD64)	; &I-B-DD64;
-    (=gt		. 12875)	; &I-GT-12875;
-    (=gt-pj-1		. #x5754)	; &I-GT-12875; [55-52]
-    (=daikanwa		. 10201)	; &I-M-10201;
-    (=shinjigen@rev	.  2379)	; å¾­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5FAD)	; å¾­
+      ))
+    (ideographic-radical . 60)	; â¼»
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F73)	; å½³
+      )
+     ((=>>jis-x0213-2	  . #x7461)	; &G-JX2-7461; [84-65]
+      ))
+    (=>>ucs@jis		. #x5FAD)	; &G-GT-12875;
+    (=>>ucs@cns		. #x5FAD)	; &G-GT-12875;
+    (=big5		. #xDD64)	; &G-GT-12875;
+    (=>>gt		. 12875)	; &G-GT-12875;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5F73)	; å½³
+	)
+       ((=ucs@jis	    . #x4343)	; &M-28120;
+	(=jis-x0213-2	    . #x7461)	; &M-28120; [84-65]
+	(=daikanwa	    . 28120)	; &I-M-28120;
+	))
+      (=ucs@jis		  . #x5FAD)	; &GT-12875;
+      (=jis-x0208	  . #x5754)	; &GT-12875; [55-52]
+      (=jis-x0213-1	  . #x5754)	; &I-JX1-5754; [55-52]
+      (=gt		  . 12875)	; &I-GT-12875;
+      (=gt-pj-1		  . #x5754)	; &I-GT-12875; [55-52]
+      (=daikanwa	  . 10201)	; &I-M-10201;
+      (=shinjigen	  .  2379)	; &GT-12875;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x5F73)	; å½³
+	)
+       ((=cns11643-4	    . #x2F29)	; &CDP-8CDA; [15-09]
+	))
+      (=ucs@cns		  . #x5FAD)	; &C2-426A;
+      (=cns11643-2	  . #x426A)	; &C2-426A; [34-74]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5FAD)	; å¾­
+      ))
+    (ideographic-radical . 60)	; â¼»
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F73)	; å½³
+      )
+     ((=ucs@unicode	  . #x4343)	; &GT-K07393;
+      (=gt-k		  . 07393)	; &GT-K07393;
+      ))
+    (=ucs@unicode	. #x5FAD)	; &G0-6166;
+    (=gb2312		. #x6166)	; &G0-6166; [65-70]
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -2931,8 +3040,8 @@
       (=gt-k		  . 11152)	; &I-GT-K11152;
       (=gt-pj-1		  . #x4427)	; &I-GT-12893; [36-07]
       (<-simplified@JP/Jouyou
-       ((=ucs@jis	    . #x5FB5)	; &JX1-7444;
-	(=cns11643-1	    . #x6C62)	; &JX1-7444; [76-66]
+       ((=ucs@jis	    . #x5FB5)	; 徵󠄂
+	(=cns11643-1	    . #x6C62)	; 徵󠄂 [76-66]
 	(=jis-x0213-1	    . #x7444)	; &I-JX1-7444; [84-36]
 	))
       )
@@ -2957,10 +3066,12 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=>>ucs@unicode	. #x5FB5)	; &G-UU+5FB5;
     (->subsumptive
      ((=ks-x1001	  . #x7323)	; &M-10239; [83-03]
       (=daikanwa	  . 10239)	; &I-M-10239;
       (=jef-china3	  . #x4DBF)	; &I-JC3-4DBF;
+      (=hanyo-denshi/ip	  . #x5FB5)	; &I-HD-IP-5FB5;
       )
      ((=ucs@unicode	  . #x5FB5)	; &G0-6167;
       (=gb2312		  . #x6167)	; &G0-6167; [65-71]
@@ -2973,9 +3084,15 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs@jis		. #x5FB5)	; &JX1-7444;
-    (=cns11643-1	. #x6C62)	; &JX1-7444; [76-66]
+    (=decomposition@hanyo-denshi
+     ((=ucs		  . #x5FB5)	; å¾µ
+      )
+     ((=ucs		  . #xE0102)	; 󠄂
+      ))
+    (=ucs@jis		. #x5FB5)	; 徵󠄂
+    (=cns11643-1	. #x6C62)	; 徵󠄂 [76-66]
     (=jis-x0213-1	. #x7444)	; &I-JX1-7444; [84-36]
+    (=hanyo-denshi/jc	. #x7444)	; &I-HD-JC-7444; [84-36]
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -3018,6 +3135,7 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (=>>ucs@unicode	. #x5FB6)	; &G-UU+5FB6;
     (->subsumptive
      ((=ucs@unicode	  . #x5FB6)	; &UU+5FB6;
       )
@@ -3037,6 +3155,7 @@
     (=daikanwa		. 10243)	; &I-M-10243;
     (=shinjigen@1ed	.  2385)	; å¾·
     (=jef-china3	. #x4DC0)	; &I-JC3-4DC0;
+    (=adobe-japan1-2	. 08452)	; &I-AJ1-08452;
     ))
 (define-char
   '((=>ucs		. #x5FB8)	; 徸
@@ -3057,36 +3176,34 @@
     (=cns11643-3	. #x4B72)	; &I-C3-4B72; [43-82]
     ))
 (define-char
-  '((=>ucs		. #x5FB9)	; å¾¹
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs@jis		. #x5FB9)	; &GT-12920;
-    (=jis-x0208		. #x4530)	; &GT-12920; [37-16]
-    (=ks-x1001		. #x744B)	; &I-K0-744B; [84-43]
-    (=jis-x0213-1	. #x4530)	; &I-JX1-4530; [37-16]
-    (=big5		. #xB9FD)	; &I-B-B9FD;
-    (=gt		. 12920)	; &I-GT-12920;
-    (=gt-k		. 11929)	; &I-GT-K11929;
-    (=gt-pj-1		. #x4530)	; &I-GT-12920; [37-16]
-    (=daikanwa		. 10245)	; &I-M-10245;
-    (=shinjigen@rev	.  2387)	; &GT-12920;
-    ))
-(define-char
-  '((morohashi-daikanwa	10245 0 0)
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
+  '((ideographic-radical . 60)	; â¼»
     (=ucs		. #x5FB9)	; å¾¹
-    (=gb12345		. #x3339)	; å¾¹ [19-25]
-    ))
-(define-char
-  '((=>ucs		. #x5FB9)	; å¾¹
-    (morohashi-daikanwa	10245 0 1)
-    (ideographic-radical . 60)	; â¼»
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6865)	; &C1-6865; [72-69]
+    (=big5		. #xB9FD)	; &I-B-B9FD;
+    (->subsumptive
+     ((ideographic-strokes . 12)
+      (total-strokes	   . 15)
+      (=>>>ucs@unicode	  . #x5FB9)	; &g2-J0-4530;
+      (=>>>jis-x0208	  . #x4530)	; &g2-J0-4530; [37-16]
+      (=>>>jis-x0213-1	  . #x4530)	; &g2-J0-4530; [37-16]
+      (->subsumptive
+       ((=ucs@jis	    . #x5FB9)	; &GT-12920;
+	(=jis-x0208	    . #x4530)	; &GT-12920; [37-16]
+	(=ks-x1001	    . #x744B)	; &I-K0-744B; [84-43]
+	(=jis-x0213-1	    . #x4530)	; &I-JX1-4530; [37-16]
+	(=gt		    . 12920)	; &I-GT-12920;
+	(=gt-k		    . 11929)	; &I-GT-K11929;
+	(=gt-pj-1	    . #x4530)	; &I-GT-12920; [37-16]
+	(=daikanwa	    . 10245)	; &I-M-10245;
+	(=shinjigen	    .  2387)	; &GT-12920;
+	)
+       ((=ucs@unicode	    . #x5FB9)	; &UU+5FB9;
+	(=gb12345	    . #x3339)	; &UU+5FB9; [19-25]
+	))
+      )
+     ((ideographic-strokes . 11)
+      (total-strokes	   . 14)
+      (=cns11643-1	  . #x6865)	; &C1-6865; [72-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
@@ -3381,7 +3498,8 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=big5		. #xC0B2)	; &B-C0B2;
+    (=>>ucs@unicode	. #x5FBD)	; &G-UU+5FBD;
+    (=big5		. #xC0B2)	; &G-UU+5FBD;
     (->subsumptive
      ((=ucs@jis/2004	  . #x5FBD)	; &M-10267;
       (=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
@@ -3389,6 +3507,7 @@
       (=cns11643-1	  . #x735B)	; &I-C1-735B; [83-59]
       (=jis-x0213-1@2004  . #x352B)	; &I-JX3-352B; [21-11]
       (=daikanwa	  . 10267)	; &I-M-10267;
+      (=hanyo-denshi/ft	  . #x316B)	; &I-HD-FT-316B; [17-75]
       )
      ((=ucs@unicode	  . #x5FBD)	; &G0-3B55;
       (=gb2312		  . #x3B55)	; &G0-3B55; [27-53]