X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R001-One.el;h=663dde1c98b8099d685106c595425b3cbe90b5e6;hb=1f7826eee589a462144c3772b3c5712c6e92e745;hp=caf59659b18bb65969fb9f4d8ff0f852fc45d1a7;hpb=6180cb7c4a65968a5a98cac6b019bb6f46d09e05;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index caf5965..663dde1 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -288,25 +288,25 @@
     (sound@ja/on/go	"dyAu")
     (sound@ja/on/kan	"tyAu")
     (=ucs		. #x4E08)	; 丈
+    (=big5		. #xA456)	; &I-B-A456;
+    (=jis-x0208@1997	. #x3E66)	; 丈 [30-70]
     (->subsumptive
      ((shinjigen-1	  . 10)
       (shinjigen-2	  . 10)
-      (=jis-x0208-1978	  . #x3E66)	; &GT-00018; [30-70]
-      (=jis-x0208-1983	  . #x3E66)	; &I-J83-3E66; [30-70]
+      (=jis-x0208@1978	  . #x3E66)	; &GT-00018; [30-70]
+      (=jis-x0208@1983	  . #x3E66)	; &I-J83-3E66; [30-70]
       (=ks-x1001	  . #x6D5B)	; &I-K0-6D5B; [77-59]
-      (=big5		  . #xA456)	; &I-B-A456;
       (=gt		  . 00018)	; &I-GT-00018;
       (=gt-k		  . 00189)	; &I-GT-K00189;
       (=gt-pj-2		  . #x3027)	; &I-GT-00018; [16-07]
       (=daikanwa	  . 00011)	; &I-M-00011;
       (=jef-china3	  . #x41A5)	; &I-JC3-41A5;
-      (=ucs@big5	  . #x4E08)	; &GT-00018;
       )
      ((hanyu-dazidian	  1 9 2)
       (shinjigen-1	  . 9)
       (shinjigen-2	  . 9)
       (=gb2312		  . #x5549)	; &GT-00020; [53-41]
-      (=jis-x0208-1990	  . #x3E66)	; &I-J90-3E66; [30-70]
+      (=jis-x0208@1990	  . #x3E66)	; &I-J90-3E66; [30-70]
       (=cns11643-1	  . #x4437)	; &I-C1-4437; [36-23]
       (=gt		  . 00020)	; &I-GT-00020;
       (=gt-pj-1		  . #x3E66)	; &I-GT-00020; [30-70]
@@ -675,8 +675,8 @@
     (=ucs		. #x2000B)	; 𠀋
     (->subsumptive
      ((<-vulgar
-       ((=jis-x0208-1978    . #x3E66)	; &GT-00018; [30-70]
-	(=jis-x0208-1983    . #x3E66)	; &I-J83-3E66; [30-70]
+       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
+	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
 	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
 	(=daikanwa	    . 00011)	; &I-M-00011;
 	))
@@ -686,8 +686,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
 	(=ucs		    . #x2FFA)	; ⿺
 	)
-       ((=jis-x0208-1978    . #x3E66)	; &GT-00018; [30-70]
-	(=jis-x0208-1983    . #x3E66)	; &I-J83-3E66; [30-70]
+       ((=jis-x0208@1978    . #x3E66)	; &GT-00018; [30-70]
+	(=jis-x0208@1983    . #x3E66)	; &I-J83-3E66; [30-70]
 	(=ks-x1001	    . #x6D5B)	; &I-K0-6D5B; [77-59]
 	(=daikanwa	    . 00011)	; &I-M-00011;
 	)
@@ -702,7 +702,7 @@
      ((<-vulgar
        ((shinjigen-1	    . 9)
 	(=gb2312	    . #x5549)	; &GT-00020; [53-41]
-	(=jis-x0208-1990    . #x3E66)	; &I-J90-3E66; [30-70]
+	(=jis-x0208@1990    . #x3E66)	; &I-J90-3E66; [30-70]
 	(=cns11643-1	    . #x4437)	; &I-C1-4437; [36-23]
 	))
       (<-vulgar*sources
@@ -835,6 +835,23 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (<-denotational
+     ((=ucs		  . #x25605)	; 𥘅
+      ))
+    (<-ideographic-component-forms
+     ((=cns11643-6	  . #x2227)	; &GT-31487; [02-07]
+      (=daikanwa	  . 24624)	; &I-M-24624;
+      )
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
+      ))
+    (hanyu-dazidian	1 11 2)
+    (=big5-cdp		. #x88C7)	; &CDP-88C7;
+    ))
+(define-char
+  '((ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
     (=gt		. 00025)	; &GT-00025;
     (=gt-pj-9		. #x3C43)	; &GT-00025; [28-35]
     ))
@@ -842,8 +859,45 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
-    (hanyu-dazidian	1 11 2)
-    (=big5-cdp		. #x88C7)	; &CDP-88C7;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+	(=ucs		    . #x2FF5)	; ⿵
+	)
+       ((=ucs		    . #x5182)	; 冂
+	)
+       ((=ucs		    . #x4E00)	; 一
+	))
+      ))
+    (=gt-k		. 00615)	; &GT-K00615;
+    (=gt-pj-k1		. #x3E25)	; &GT-K00615; [30-05]
+    ))
+(define-char
+  '((ideographic-radical . 1)	; ⼀
+    (ideographic-strokes . 3)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+	(=ucs		    . #x2FF5)	; ⿵
+	)
+       ((=ucs		    . #x5182)	; 冂
+	)
+       ((=ucs		    . #x4E36)	; 丶
+	))
+      ))
+    (=gt-k		. 00616)	; &GT-K00616;
+    (=gt-pj-k1		. #x3E29)	; &GT-K00616; [30-09]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
@@ -1631,50 +1685,53 @@
     (=gt-pj-11		. #x4B6C)	; &GT-00060; [43-76]
     ))
 (define-char
-  '((=>ucs		. #x20022)	; 𠀢
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 6)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 19 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((=ucs		  . #x6B64)	; æ­¤
-      ))
-    (=gt		. 00070)	; &GT-00070;
-    (=gt-pj-2		. #x3040)	; &GT-00070; [16-32]
-    (=daikanwa		. 00047)	; &I-M-00047;
-    (=hanziku-1		. #xA7F6)	; &I-HZK01-A7F6;
-    ))
-(define-char
-  '((morohashi-daikanwa	47 0 1)
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
+    (=ucs		. #x20022)	; 𠀢
+    (->subsumptive
+     ((hanyu-dazidian	  1 19 12)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=jis-x0208	    . #x3A21)	; &GT-20888; [26-01]
+	(=gb2312	    . #x344B)	; &I-G0-344B; [20-43]
+	(=ks-x1001	    . #x732E)	; &I-K0-732E; [83-14]
+	(=daikanwa	    . 16259)	; &I-M-16259;
+	))
+      (=gt		  . 00070)	; &GT-00070;
+      (=gt-pj-2		  . #x3040)	; &GT-00070; [16-32]
+      (=daikanwa	  . 00047)	; &I-M-00047;
+      (=hanziku-1	  . #xA7F6)	; &I-HZK01-A7F6;
       )
-     ((=cns11643-1	  . #x483A)	; &C1-483A; [40-26]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=cns11643-1	    . #x483A)	; &C1-483A; [40-26]
+	))
+      (=cns11643-5	  . #x232F)	; &C5-232F; [03-15]
+      (=ucs@iso		  . #x20022)	; &C5-232F;
       ))
-    (=ucs		. #x20022)	; 𠀢
-    (=cns11643-5	. #x232F)	; &I-C5-232F; [03-15]
     ))
 (define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
+    (->mistakable
+     ((=daikanwa	  . 11708)	; &I-M-11708;
+      ))
     (<-ancient
-     (:sources	(morohashi-daikanwa)
-      :char	((=daikanwa	     . 39763)	; &I-M-39763;
-		 )
+     ((=ucs		  . #x9149)	; 酉
+      (=daikanwa	  . 39763)	; &I-M-39763;
       ))
-    (comment		. "M-11708 is different character.")
+    (<-ancient*sources
+     daikanwa)
     (hanyu-dazidian	1 21 6)
     (=ucs		. #x4E23)	; 丣
     (=jis-x0212		. #x3027)	; &I-JSP-3027; [16-07]
@@ -1973,19 +2030,48 @@
     (=hanziku-1		. #xA950)	; &I-HZK01-A950;
     ))
 (define-char
-  '((=>ucs		. #x4E3D)	; 丽
-    (ideographic-radical . 1)	; ⼀
+  '((ideographic-radical@daikanwa . 3)	; ⼂
+    (ideographic-strokes@daikanwa . 7)
+    (total-strokes@daikanwa	  . 8)
+    (ideographic-radical@daikanwa*sources
+     daikanwa gt)
+    (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
+  '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
-    (->same
-     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
-      (=daikanwa	  . 00104)	; &I-M-00104;
-      ))
     (<-ancient
-     ((=daikanwa	  . 47663)	; &I-M-47663;
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
       ))
     (<-ancient*sources
      daikanwa)
+    (<-denotational
+     ((=ucs		  . #x4E3D)	; 丽
+      ))
+    (<-same
+     ((=cns11643-3	  . #x2740)	; &GT-00145; [07-32]
+      (=daikanwa	  . 00104)	; &I-M-00104;
+      ))
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
+      )
+     ((=gt-k		  . 00615)	; &GT-K00615;
+      ))
     (=cns11643-6	. #x2936)	; &GT-00087; [09-22]
     (=gt		. 00087)	; &I-GT-00087;
     (=gt-pj-2		. #x304B)	; &I-GT-00087; [16-43]
@@ -2012,22 +2098,6 @@
 (define-char
   '((ideographic-radical@daikanwa . 3)	; ⼂
     (ideographic-strokes@daikanwa . 7)
-    (total-strokes@daikanwa	  . 8)
-    (ideographic-radical@daikanwa*sources
-     daikanwa gt)
-    (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
-  '((ideographic-radical@daikanwa . 3)	; ⼂
-    (ideographic-strokes@daikanwa . 7)
     (ideographic-radical@daikanwa*sources
      daikanwa gt)
     (ideographic-radical@cns . 1)	; ⼀
@@ -2035,54 +2105,29 @@
     (ideographic-radical@cns*sources
      cns11643)
     (total-strokes	 . 8)
-    (->same
-     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
-      (=daikanwa	  . 00059)	; &I-M-00059;
-      ))
     (<-ancient
-     ((=daikanwa	  . 47663)	; &I-M-47663;
+     ((=jis-x0208@1978	  . #x4E6F)	; &GT-64844; [46-79]
+      (=jis-x0208@1983	  . #x4E6F)	; &I-J83-4E6F; [46-79]
+      (=ks-x1001	  . #x5572)	; &I-K0-5572; [53-82]
+      (=daikanwa	  . 47663)	; &I-M-47663;
       ))
     (<-ancient*sources
      daikanwa)
     (<-denotational
      ((=ucs		  . #x4E3D)	; 丽
       ))
+    (<-same
+     ((=cns11643-6	  . #x2936)	; &GT-00087; [09-22]
+      (=daikanwa	  . 00059)	; &I-M-00059;
+      ))
     (hanyu-dazidian	1 24 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
-	))
+     ((=gt-k		  . 00616)	; &GT-K00616;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-	  (=ucs		      . #x2FF5)	; ⿵
-	  )
-	 ((=ucs		      . #x5182)	; 冂
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
-	))
+     ((=gt-k		  . 00616)	; &GT-K00616;
       ))
     (=cns11643-3	. #x2740)	; &GT-00145; [07-32]
     (=big5-cdp		. #x8CB7)	; &I-CDP-8CB7;
@@ -2432,7 +2477,7 @@
 			(:radical	1 ; ⼀
 			 :strokes	11))
     (total-strokes	 . 12)
-    (->same
+    (<-same
      ((=cns11643-6	  . #x472D)	; &C6-472D; [39-13]
       ))
     (hanyu-dazidian	1 26 11)