X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R021-Spoon.el;h=0c2d8003338ce3c4fb9059386ed4998a96ca4322;hb=bb9dd4ee7baaa14e1eba9574da32710a1c8e56c3;hp=2c938e6b6ba8321f9dee02421de2b0aa1606ace8;hpb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R021-Spoon.el b/lisp/utf-2000/Ideograph-R021-Spoon.el
index 2c938e6..0c2d800 100644
--- a/lisp/utf-2000/Ideograph-R021-Spoon.el
+++ b/lisp/utf-2000/Ideograph-R021-Spoon.el
@@ -3,13 +3,16 @@
   '((ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (<-denotational
+     ((=jis-x0208@1997	  . #x5238)	; &J97-5238; [50-24]
+      ))
     (hanyu-dazidian	1 261 15)
     (shinjigen-1	. 783)
     (shinjigen-2	. 783)
     (=ucs		. #x5315)	; 匕
     (=gb2312		. #x5830)	; &I-G0-5830; [56-16]
     (=ks-x1001		. #x5D62)	; &I-K0-5D62; [61-66]
-    (=jis-x0208-1990	. #x5238)	; &I-J90-5238; [50-24]
+    (=jis-x0208@1990	. #x5238)	; &I-J90-5238; [50-24]
     (=cns11643-1	. #x4431)	; &I-C1-4431; [36-17]
     (=big5		. #xA450)	; &I-B-A450;
     (=gt		. 03296)	; &I-GT-03296;
@@ -22,42 +25,91 @@
     (ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
+    (=jis-x0208@1997	. #x5238)	; &J97-5238; [50-24]
+    ))
+(define-char
+  '((ideographic-radical . 21)	; ⼔
+    (ideographic-strokes . 0)
+    (total-strokes	 . 2)
+    (<-denotational
+     ((=ucs		  . #x5315)	; 匕
+      ))
+    (<-ideographic-component-forms
+     ((=ucs		  . #x5315)	; 匕
+      ))
+    (=big5-cdp		. #x895F)	; &CDP-895F;
+    ))
+(define-char
+  '((ideographic-radical . 21)	; ⼔
+    (ideographic-strokes . 0)
+    (total-strokes	 . 2)
+    (<-denotational
+     ((=jis-x0208@1997	  . #x5238)	; &J97-5238; [50-24]
+      ))
     (hanyu-dazidian	1 262 1)
     (=ucs		. #x2090E)	; 𠤎
-    (=jis-x0208-1978	. #x5238)	; &I-J78-5238; [50-24]
-    (=jis-x0208-1983	. #x5238)	; &I-J83-5238; [50-24]
-    (=cns11643-6	. #x212A)	; &I-C6-212A; [01-10]
-    (=big5-cdp		. #x8BBA)	; &I-CDP-8BBA;
-    (=daikanwa		. 02571)	; &I-M-02571;
-    (=jef-china3	. #x45AB)	; &I-JC3-45AB;
+    (->subsumptive
+     ((=big5-cdp	  . #x8BBA)	; &CDP-8BBA;
+      (=daikanwa	  . 02571)	; &I-M-02571;
+      (=jef-china3	  . #x45AB)	; &I-JC3-45AB;
+      (=ucs@iso		  . #x2090E)	; &CDP-8BBA;
+      )
+     ((=jis-x0208@1978	  . #x5238)	; &J83-5238; [50-24]
+      (=jis-x0208@1983	  . #x5238)	; &I-J83-5238; [50-24]
+      )
+     ((=cns11643-6	  . #x212A)	; &C6-212A; [01-10]
+      ))
     ))
 (define-char
   '((ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (=ucs		. #x5316)	; 化
+    (=big5		. #xA4C6)	; &I-B-A4C6;
+    ))
+(define-char
+  '((ideographic-radical . 21)	; ⼔
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (<-denotational
+     ((=ucs		  . #x5316)	; 化
+      ))
     (hanyu-dazidian	1 109 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=jis-x0208@1978    . #x5238)	; &J83-5238; [50-24]
+	(=jis-x0208@1983    . #x5238)	; &I-J83-5238; [50-24]
+	))
+      (shinjigen-1	  . 115)
+      (shinjigen-2	  . 115)
+      (=daikanwa	  . 02572)	; &M-02572;
+      (=jef-china3	  . #x41E4)	; &I-JC3-41E4;
       )
-     ((=ucs		  . #x4EBB)	; 亻
-      )
-     ((=ucs		  . #x2090E)	; 𠤎
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x4EBB)	; 亻
+	)
+       ((=big5-cdp	    . #x8BBA)	; &CDP-8BBA;
+	(=daikanwa	    . 02571)	; &I-M-02571;
+	))
+      (=gb2312		  . #x3B2F)	; &G0-3B2F; [27-15]
+      (=ucs@unicode	  . #x5316)	; &G0-3B2F;
       ))
-    (shinjigen-1	. 115)
-    (shinjigen-2	. 115)
-    (=ucs		. #x5316)	; 化
-    (=gb2312		. #x3B2F)	; &I-G0-3B2F; [27-15]
-    (=big5		. #xA4C6)	; &I-B-A4C6;
-    (=daikanwa		. 02572)	; &I-M-02572;
-    (=jef-china3	. #x41E4)	; &I-JC3-41E4;
     ))
 (define-char
-  '((=>ucs		. #x5316)	; 化
-    (morohashi-daikanwa	2572 0 0)
-    (ideographic-radical . 21)	; ⼔
+  '((ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (<-denotational
+     ((=ucs		  . #x5316)	; 化
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -67,22 +119,18 @@
       )
      ((=ucs		  . #x5315)	; 匕
       ))
-    (shinjigen-1	. 114)
-    (shinjigen-2	. 114)
-    (=jis-x0208		. #x323D)	; &GT-03297; [18-29]
-    (=ks-x1001		. #x7B79)	; &I-K0-7B79; [91-89]
-    (=gt		. 03297)	; &I-GT-03297;
-    (=gt-k		. 00403)	; &I-GT-K00403;
-    (=gt-pj-1		. #x323D)	; &I-GT-03297; [18-29]
-    (=ucs@jis		. #x5316)	; &GT-03297;
-    ))
-(define-char
-  '((=>ucs		. #x5316)	; 化
-    (morohashi-daikanwa	2572 0 1)
-    (ideographic-radical . 21)	; ⼔
-    (ideographic-strokes . 2)
-    (total-strokes	 . 4)
-    (=cns11643-1	. #x4527)	; &C1-4527; [37-07]
+    (->subsumptive
+     ((shinjigen-1	  . 114)
+      (shinjigen-2	  . 114)
+      (=jis-x0208	  . #x323D)	; &GT-03297; [18-29]
+      (=ks-x1001	  . #x7B79)	; &I-K0-7B79; [91-89]
+      (=gt		  . 03297)	; &I-GT-03297;
+      (=gt-k		  . 00403)	; &I-GT-K00403;
+      (=gt-pj-1		  . #x323D)	; &I-GT-03297; [18-29]
+      (=ucs@jis		  . #x5316)	; &GT-03297;
+      )
+     ((=cns11643-1	  . #x4527)	; &C1-4527; [37-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 21)	; ⼔
@@ -130,44 +178,31 @@
   '((ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
-    (hanyu-dazidian	1 262 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=big5-cdp	  . #x8BC5)	; &CDP-8BC5;
-      )
-     ((=ucs		  . #x5315)	; 匕
-      ))
-    (shinjigen-1	. 784)
-    (shinjigen-2	. 784)
     (=ucs		. #x5317)	; 北
-    (=jis-x0208		. #x4B4C)	; &I-J90-4B4C; [43-44]
-    (=gb2312		. #x3131)	; &I-G0-3131; [17-17]
-    (=ks-x1001		. #x5D41)	; &I-K0-5D41; [61-33]
-    (=big5		. #xA55F)	; &I-B-A55F;
-    (=gt		. 03302)	; &I-GT-03302;
-    (=gt-k		. 01003)	; &I-GT-K01003;
-    (=gt-pj-1		. #x4B4C)	; &I-GT-03302; [43-44]
-    (=daikanwa		. 02574)	; &I-M-02574;
-    ))
-(define-char
-  '((=>ucs		. #x5317)	; 北
-    (morohashi-daikanwa	2574 0 0)
-    (ideographic-radical . 21)	; ⼔
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
-    (ideographic-structure
-     (:cdp-combinator	1
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-		 (=ucs		     . #x2FF0)	; â¿°
-		 )
-      )
-     ((=big5-cdp	  . #x8BC5)	; &CDP-8BC5;
+    (->subsumptive
+     ((hanyu-dazidian	  1 262 4)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=big5-cdp	    . #x8BC5)	; &CDP-8BC5;
+	)
+       ((=ucs		    . #x5315)	; 匕
+	))
+      (shinjigen-1	  . 784)
+      (shinjigen-2	  . 784)
+      (=jis-x0208	  . #x4B4C)	; &GT-03302; [43-44]
+      (=gb2312		  . #x3131)	; &I-G0-3131; [17-17]
+      (=ks-x1001	  . #x5D41)	; &I-K0-5D41; [61-33]
+      (=big5		  . #xA55F)	; &I-B-A55F;
+      (=gt		  . 03302)	; &I-GT-03302;
+      (=gt-k		  . 01003)	; &I-GT-K01003;
+      (=gt-pj-1		  . #x4B4C)	; &I-GT-03302; [43-44]
+      (=daikanwa	  . 02574)	; &I-M-02574;
+      (=ucs@unicode	  . #x5317)	; &GT-03302;
       )
-     ((=ucs		  . #x5315)	; 匕
+     ((=cns11643-1	  . #x4621)	; &C1-4621; [38-01]
       ))
-    (=cns11643-1	. #x4621)	; &C1-4621; [38-01]
     ))
 (define-char
   '((ideographic-radical . 21)	; ⼔