X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R001-One.el;h=a19956cdb4da0233fa98a5976c6da2ca730ff308;hb=c17f21f4cc9fd196a4433709e74f0ea00acede7e;hp=fc30fa4eff9c1178a55099122862acd2ab2a3a17;hpb=10c1357015b135d575d03b991e5c95e70b74071d;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index fc30fa4..a19956c 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -839,9 +839,11 @@
      ((=ucs		  . #x25605)	; 𥘅
       ))
     (<-ideographic-component-forms
-     ((=daikanwa	  . 24624)	; &I-M-24624;
+     ((=cns11643-6	  . #x2227)	; &GT-31487; [02-07]
+      (=daikanwa	  . 24624)	; &I-M-24624;
       )
-     ((=daikanwa	  . 24623)	; &I-M-24623;
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
       ))
     (hanyu-dazidian	1 11 2)
     (=big5-cdp		. #x88C7)	; &CDP-88C7;
@@ -1122,25 +1124,24 @@
     (=hanziku-1		. #xA7B0)	; &I-HZK01-A7B0;
     ))
 (define-char
-  '((=>ucs		. #x200E0)	; 𠃠
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
-    (=gt		. 00049)	; &GT-00049;
-    (=gt-pj-2		. #x3038)	; &GT-00049; [16-24]
-    (=daikanwa		. 00038)	; &I-M-00038;
-    ))
-(define-char
-  '((morohashi-daikanwa	38 0 0)
-    (ideographic-	(:radical	1 ; ⼀
-			 :strokes	4)
-			(:radical	5 ; ⼄
-			 :strokes	4))
-    (total-strokes	 . 5)
-    (hanyu-dazidian	1 52 9)
+  '((total-strokes	 . 5)
     (=ucs		. #x200E0)	; 𠃠
-    (=cns11643-6	. #x222A)	; &I-C6-222A; [02-10]
-    (=big5-cdp		. #x87CF)	; &I-CDP-87CF;
+    (->subsumptive
+     ((ideographic-radical . 1)	; ⼀
+      (ideographic-strokes . 4)
+      (=gt		  . 00049)	; &GT-00049;
+      (=gt-pj-2		  . #x3038)	; &GT-00049; [16-24]
+      (=daikanwa	  . 00038)	; &I-M-00038;
+      )
+     ((ideographic-radical@ucs . 5)	; ⼄
+      (ideographic-strokes@ucs . 4)
+      (ideographic-radical@cns . 1)	; ⼀
+      (ideographic-strokes@cns . 4)
+      (hanyu-dazidian	  1 52 9)
+      (=cns11643-6	  . #x222A)	; &CDP-87CF; [02-10]
+      (=big5-cdp	  . #x87CF)	; &I-CDP-87CF;
+      (=ucs@iso		  . #x200E0)	; &CDP-87CF;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1421,65 +1422,70 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 19 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x20AD4)	; 𠫔
+    (=ucs		. #x2001A)	; 𠀚
+    (->subsumptive
+     ((hanyu-dazidian	  1 19 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x20AD4)	; 𠫔
+	)
+       ((=big5-cdp	    . #x8665)	; &CDP-8665;
+	))
+      (=gt		  . 00064)	; &GT-00064;
+      (=gt-pj-2		  . #x303E)	; &GT-00064; [16-30]
+      (=daikanwa	  . 00044)	; &I-M-00044;
+      (=hanziku-1	  . #xA7F3)	; &I-HZK01-A7F3;
+      (=ucs@iso		  . #x2001A)	; &GT-00064;
       )
-     ((=big5-cdp	  . #x8665)	; &CDP-8665;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x20AD4)	; 𠫔
+	)
+       ((=ucs		    . #x5C0F)	; 小
+	))
+      (=cns11643-6	  . #x233F)	; &C6-233F; [03-31]
       ))
-    (=ucs		. #x2001A)	; 𠀚
-    (=gt		. 00064)	; &I-GT-00064;
-    (=gt-pj-2		. #x303E)	; &I-GT-00064; [16-30]
-    (=daikanwa		. 00044)	; &I-M-00044;
-    (=hanziku-1		. #xA7F3)	; &I-HZK01-A7F3;
-    ))
-(define-char
-  '((=>ucs		. #x2001A)	; 𠀚
-    (morohashi-daikanwa	44 0 9)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=cns11643-6	. #x233F)	; &C6-233F; [03-31]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 17 11)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x5317)	; 北
-      )
-     ((=ucs		  . #x4E00)	; 一
-      ))
     (=ucs		. #x4E20)	; 丠
-    (=gt		. 00058)	; &I-GT-00058;
-    (=gt-k		. 02006)	; &I-GT-K02006;
-    (=gt-pj-2		. #x303F)	; &I-GT-00058; [16-31]
-    (=daikanwa		. 00045)	; &I-M-00045;
-    (=hanziku-1		. #xA7B5)	; &I-HZK01-A7B5;
-    ))
-(define-char
-  '((=>ucs		. #x4E20)	; 丠
-    (morohashi-daikanwa	45 0 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x4621)	; &C1-4621; [38-01]
+    (->subsumptive
+     ((hanyu-dazidian	  1 17 11)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=jis-x0208	    . #x4B4C)	; &GT-03302; [43-44]
+	(=gb2312	    . #x3131)	; &I-G0-3131; [17-17]
+	(=ks-x1001	    . #x5D41)	; &I-K0-5D41; [61-33]
+	(=daikanwa	    . 02574)	; &I-M-02574;
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      (=gt		  . 00058)	; &GT-00058;
+      (=gt-k		  . 02006)	; &I-GT-K02006;
+      (=gt-pj-2		  . #x303F)	; &GT-00058; [16-31]
+      (=daikanwa	  . 00045)	; &I-M-00045;
+      (=hanziku-1	  . #xA7B5)	; &I-HZK01-A7B5;
+      (=ucs@unicode	  . #x4E20)	; &GT-00058;
       )
-     ((=ucs		  . #x4E00)	; 一
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x4621)	; &C1-4621; [38-01]
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      (=cns11643-3	  . #x2262)	; &C3-2262; [02-66]
+      (=ucs@cns		  . #x4E20)	; &C3-2262;
       ))
-    (=cns11643-3	. #x2262)	; &C3-2262; [02-66]
-    (=ucs@cns		. #x4E20)	; &C3-2262;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1527,10 +1533,36 @@
     (=jef-china3	. #x41BA)	; &I-JC3-41BA;
     ))
 (define-char
-  '((ideographic-	(:radical	1 ; ⼀
-			 :strokes	5)
-			(:radical	55 ; ⼶
-			 :strokes	3))
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@daikanwa . 37)	; ⼤
+    (ideographic-strokes@daikanwa . 3)
+    (total-strokes	 . 6)
+    (=ucs		. #x2001B)	; 𠀛
+    (->subsumptive
+     ((=daikanwa	  . 05861)	; &M-05861;
+      )
+     ((hanyu-dazidian	  1 17 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=ucs@iso	    . #x215DA)	; &U-000215DA;
+	))
+      (=big5-cdp	  . #x87EE)	; &CDP-87EE;
+      (=hanziku-1	  . #xA7B3)	; &I-HZK01-A7B3;
+      (=ucs@iso		  . #x2001B)	; &CDP-87EE;
+      ))
+    ))
+(define-char
+  '((ideographic-radical@ucs . 1)	; ⼀
+    (ideographic-strokes@ucs . 5)
+    (ideographic-radical@cns . 55)	; ⼶
+    (ideographic-strokes@cns . 3)
+    (ideographic-radical@cns*sources
+     cns11643 daikanwa)
     (total-strokes	 . 6)
     (hanyu-dazidian	1 17 12)
     (ideographic-structure
@@ -1547,39 +1579,20 @@
     (=hanziku-1		. #xA7B6)	; &I-HZK01-A7B6;
     ))
 (define-char
-  '((=>ucs		. #x3402)	; 㐂
-    (morohashi-daikanwa	ho 1)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=gt		. 00057)	; &GT-00057;
-    (=gt-pj-11		. #x526E)	; &GT-00057; [50-78]
-    ))
-(define-char
-  '((morohashi-daikanwa	ho 1 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 5)
-    (total-strokes	 . 6)
-    (=ucs		. #x3402)	; 㐂
-    (=jis-x0213-1-2000	. #x2E23)	; &I-JX1-2E23; [14-03]
-    (=gt		. 00056)	; &I-GT-00056;
-    (=gt-pj-9		. #x3B2A)	; &I-GT-00056; [27-10]
-    ))
-(define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
-    (hanyu-dazidian	1 17 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
+    (=ucs		. #x3402)	; 㐂
+    (->subsumptive
+     ((morohashi-daikanwa	ho 1)
+      (=gt		  . 00057)	; &GT-00057;
+      (=gt-pj-11	  . #x526E)	; &GT-00057; [50-78]
       )
-     ((=big5-cdp	  . #x877C)	; &CDP-877C;
+     ((=jis-x0213-1-2000  . #x2E23)	; &GT-00056; [14-03]
+      (=gt		  . 00056)	; &I-GT-00056;
+      (=gt-pj-9		  . #x3B2A)	; &I-GT-00056; [27-10]
+      (=ucs@unicode	  . #x3402)	; &GT-00056;
       ))
-    (=ucs		. #x2001B)	; 𠀛
-    (=hanziku-1		. #xA7B3)	; &I-HZK01-A7B3;
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1725,8 +1738,7 @@
      ((=daikanwa	  . 11708)	; &I-M-11708;
       ))
     (<-ancient
-     ((=ucs		  . #x9149)	; 酉
-      (=daikanwa	  . 39763)	; &I-M-39763;
+     ((=daikanwa	  . 39763)	; &M-39763;
       ))
     (<-ancient*sources
      daikanwa)
@@ -1891,21 +1903,23 @@
     (=gt-pj-9		. #x3B41)	; &GT-00074; [27-33]
     ))
 (define-char
-  '((=>ucs		. #x4E26)	; 並
+  '((=>ucs*		. #x4E26)	; 並
     (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes	 . 8)
-    (shinjigen-1	. 5733)
-    (=daikanwa		. 00053)	; &M-00053;
-    ))
-(define-char
-  '((morohashi-daikanwa	53 0 0)
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 8)
-    (total-strokes	 . 9)
-    (=gt		. 00089)	; &GT-00089;
-    (=gt-k		. 06059)	; &I-GT-K06059;
-    (=gt-pj-2		. #x3046)	; &GT-00089; [16-38]
+    (ideographic-strokes@daikanwa . 7)
+    (total-strokes@daikanwa	  . 8)
+    (ideographic-strokes@gt . 8)
+    (total-strokes@gt	    . 9)
+    (=ucs		. #xFA70)	; ï©°
+    (->subsumptive
+     ((shinjigen-1	  . 5733)
+      (=gt		  . 00089)	; &GT-00089;
+      (=gt-k		  . 06059)	; &I-GT-K06059;
+      (=gt-pj-2		  . #x3046)	; &GT-00089; [16-38]
+      (=daikanwa	  . 00053)	; &I-M-00053;
+      (=ucs@JP		  . #xFA70)	; &GT-00089;
+      )
+     ((=ucs@unicode	  . #xFA70)	; &UU+FA70;
+      ))
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -2028,19 +2042,10 @@
     (=hanziku-1		. #xA950)	; &I-HZK01-A950;
     ))
 (define-char
-  '((ideographic-radical@daikanwa . 3)	; ⼂
-    (ideographic-strokes@daikanwa . 7)
-    (total-strokes@daikanwa	  . 8)
-    (ideographic-radical@daikanwa*sources
-     daikanwa gt)
+  '((ideographic-radical@ucs . 3)	; ⼂
+    (ideographic-radical@ucs*sources
+     daikanwa gt ucs)
     (ideographic-radical@cns . 1)	; ⼀
-    (ideographic-strokes@cns . 7)
-    (total-strokes@cns	     . 8)
-    (ideographic-radical@cns*sources
-     cns11643)
-    (ideographic-radical@unicode . 3)
-    (ideographic-strokes@unicode . 6)
-    (total-strokes@unicode . 7)
     (=ucs		. #x4E3D)	; 丽
     ))
 (define-char
@@ -2076,21 +2081,28 @@
     (=daikanwa		. 00059)	; &I-M-00059;
     ))
 (define-char
-  '((total-strokes	 . 8)
+  '((ideographic-radical@cns . 55)	; ⼶
+    (ideographic-strokes@cns . 5)
+    (ideographic-radical@cns*sources
+     daikanwa=09608 cns11643)
+    (ideographic-radical@gt . 1)	; ⼀
+    (ideographic-strokes@gt . 7)
+    (ideographic-radical@gt*sources
+     daikanwa=00060 gt)
+    (total-strokes	 . 8)
     (=ucs		. #x2233D)	; 𢌽
+    (=cns11643-5	. #x262E)	; &I-C5-262E; [06-14]
+    (=gt		. 00083)	; &I-GT-00083;
+    (=gt-pj-2		. #x304C)	; &I-GT-00083; [16-44]
+    (=jef-china3	. #x8EF3)	; &I-JC3-8EF3;
     (->subsumptive
      ((ideographic-radical . 1)	; ⼀
       (ideographic-strokes . 7)
-      (=gt		  . 00083)	; &GT-00083;
-      (=gt-pj-2		  . #x304C)	; &GT-00083; [16-44]
-      (=daikanwa	  . 00060)	; &I-M-00060;
-      (=jef-china3	  . #x8EF3)	; &I-JC3-8EF3;
+      (=daikanwa	  . 00060)	; &M-00060;
       )
      ((ideographic-radical . 55)	; ⼶
       (ideographic-strokes . 5)
-      (=cns11643-5	  . #x262E)	; &M-09608; [06-14]
-      (=daikanwa	  . 09608)	; &I-M-09608;
-      (=ucs@iso		  . #x2233D)	; &M-09608;
+      (=daikanwa	  . 09608)	; &M-09608;
       ))
     ))
 (define-char