X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R018-Knife.el;h=1ff27e140ed12ee7b030f53a3547c9f1f46ab153;hb=ccfbdb2e3e0df18d26d1e78e9c2563164e2401ee;hp=ebbeab6021959e43960ba7a07351340929d37205;hpb=582432e59778b065b3dc0ec8b857f3a9aab28bca;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index ebbeab6..1ff27e1 100644
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -1307,45 +1307,49 @@
     (=daikanwa		. 01910)	; ø¸€¶
     ))
 (define-char
-  '((=>ucs		. #x521D)	; 初
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=jis-x0212	  . #x5C33)	; ø»‹»Œ
-      (=jis-x0213-2-2000  . #x7828)	; ø»¦œ¹
-      (=daikanwa	  . 34092)	; ø¸ˆ”¬
-      )
-     ((=ucs		  . #x5200)	; 刀
-      ))
-    (shinjigen-1	. 612)
-    (shinjigen-2	. 612)
-    (=jis-x0208		. #x3D69)	; ø½Š Œ
-    (=ks-x1001		. #x7478)	; ø»Š•
-    (=gt		. 02490)	; ý¡€€¦º
-    (=gt-k		. 02573)	; ý¡„€¨
-    (=gt-pj-1		. #x3D69)	; ý¡€€¦º
-    (=daikanwa		. 01911)	; ø¸€·
-    (=ucs@jis		. #x521D)	; ø½Š Œ
-    ))
-(define-char
-  '((morohashi-daikanwa	1911 0 0)
-    (ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x8864)	; 衤
+  '((=>daikanwa		. 01911)	; ø½Š Œ
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes@ucs . 5)
+    (total-strokes@ucs	     . 7)
+    (ideographic-strokes@ucs*sources
+     daikanwa)
+    (ideographic-strokes@cns . 6)
+    (total-strokes@cns	     . 8)
+    (=ucs		. #x521D)	; 初
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=jis-x0212	    . #x5C33)	; ø»‹»Œ
+	(=jis-x0213-2-2000  . #x7828)	; ø»¦œ¹
+	(=daikanwa	    . 34092)	; ø¸ˆ”¬
+	)
+       ((=ucs		    . #x5200)	; 刀
+	))
+      (shinjigen-1	  . 612)
+      (shinjigen-2	  . 612)
+      (=jis-x0208	  . #x3D69)	; ø½Š Œ
+      (=ks-x1001	  . #x7478)	; ø»Š•
+      (=big5		  . #xAAEC)	; ý¢€Š«¬
+      (=gt		  . 02490)	; ý¡€€¦º
+      (=gt-k		  . 02573)	; ý¡„€¨
+      (=gt-pj-1		  . #x3D69)	; ý¡€€¦º
+      (=daikanwa	  . 01911)	; ø¸€·
+      (=ucs@jis		  . #x521D)	; ø½Š Œ
       )
-     ((=ucs		  . #x5200)	; 刀
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x8864)	; 衤
+	)
+       ((=ucs		    . #x5200)	; 刀
+	))
+      (=gb2312		  . #x3375)	; ø»„¡´
+      (=cns11643-1	  . #x4F4F)	; ø»’†®
+      (=ucs@unicode	  . #x521D)	; ø»„¡´
       ))
-    (=ucs		. #x521D)	; 初
-    (=gb2312		. #x3375)	; ø»„¡´
     ))
 (define-char
   '((ideographic-radical . 18)	; ⼑
@@ -4600,15 +4604,18 @@
     (=daikanwa		. 02075)	; ø¸€ ›
     ))
 (define-char
-  '((script		JP-Touyou JP-Jouyou Ideograph)
+  '((script		JP Touyou Jouyou Ideograph)
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified-ideograph
-     (:char	((shinjigen-1	     . 653)
-		 (=daikanwa	     . 02228)	; ø¸€¢´
-		 )
-      :sources	(shinjigen-1)))
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 653)
+      (=ucs		  . #x528D)	; 劍
+      (=jis-x0208	  . #x5178)	; ø½Š½³
+      (=daikanwa	  . 02228)	; ø¸€¢´
+      ))
+    (<-simplified@JP/Jouyou*sources
+     songyuan-yilai-suzipu daikanwa shinjigen-1 JP/Jouyou)
     (hanyu-dazidian	1 345 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -4630,19 +4637,20 @@
     (=hanziku-1		. #xECF5)	; ý¢€ž³µ
     ))
 (define-char
-  '((script		JP-Touyou JP-Jouyou Ideograph)
+  '((script		JP Touyou Jouyou Ideograph)
     (=>ucs		. #x5264)	; 剤
     (morohashi-daikanwa	2076 1)
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (<-simplified-ideograph
-     (:sources	(shinjigen-1)
-      :char	((shinjigen-1	     . 659)
-		 (=jis-x0208	     . #x517D)	; ø½Š½¸
-		 (=daikanwa	     . 02241)	; ø¸€£
-		 )
+    (<-simplified@JP/Jouyou
+     ((shinjigen-1	  . 659)
+      (=jis-x0208	  . #x517D)	; ø½Š½¸
+      (=ks-x1001	  . #x7025)	; ø»ŠŽ’
+      (=daikanwa	  . 02241)	; ø¸€£
       ))
+    (<-simplified@JP/Jouyou*sources
+     daikanwa shinjigen-1 JP/Jouyou)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -5298,6 +5306,10 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (<-simplified@JP/Jouyou
+     ((=ucs		  . #x5269)	; 剩
+      (=jis-x0208	  . #x5174)	; ø½Š½¯
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -5348,7 +5360,7 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs		  . #x5294)	; 劔
       ))
     (=jef-china3	. #x44CF)	; øº„“
@@ -5358,7 +5370,7 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=ucs		  . #x5294)	; 劔
       ))
     (ideographic-structure
@@ -5377,7 +5389,7 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (<-simplified-ideograph
+    (<-simplified
      ((=jis-x0208	  . #x5179)	; ø½Š½´
       (=daikanwa	  . 02245)	; ø¸€£…
       ))
@@ -5934,16 +5946,33 @@
     (=daikanwa		. 02133)	; ø¸€¡•
     ))
 (define-char
-  '((=>ucs		. #x202F4)	; 𠋴
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 18)	; ⼑
+    (ideographic-strokes@cns . 10)
+    (ideographic-radical@cns*sources
+     cns11643 daikanwa)
+    (total-strokes	 . 12)
+    (->same
+     ((=ucs		  . #x5013)	; 倓
+      (=daikanwa	  . 00768)	; ø¸€Œ€
+      ))
+    (->same*sources
+     shuowen yunhai-bei daikanwa)
+    (=ucs		. #x202F4)	; 𠋴
+    ))
+(define-char
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (->same-ideograph
+    (->identical
      ((=daikanwa	  . 00938)	; ø¸€Žª
-      )
-     (:char	((=daikanwa	     . 00768)	; ø¸€Œ€
-		 )
-      :sources	(shuowen inkaiho morohashi-daikanwa)))
+      ))
+    (<-denotational
+     ((=ucs		  . #x202F4)	; 𠋴
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -5955,11 +5984,12 @@
     (=daikanwa		. 02134)	; ø¸€¡–
     ))
 (define-char
-  '((=>ucs		. #x202F4)	; 𠋴
-    (morohashi-daikanwa	2134 0 0)
-    (ideographic-radical . 18)	; ⼑
+  '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (<-denotational
+     ((=ucs		  . #x202F4)	; 𠋴
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -7193,10 +7223,11 @@
     (ideographic-radical@cns . 118)	; â½µ
     (ideographic-strokes@cns . 8)
     (total-strokes	 . 14)
-    (->same-ideograph
-     ((=daikanwa	  . 26149)	; ø¸†˜¥
+    (->same
+     ((=ucs		  . #x7B9A)	; 箚
+      (=daikanwa	  . 26149)	; ø¸†˜¥
       ))
-    (->same-ideograph*sources
+    (->same*sources
      kouin kangxi daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7891,15 +7922,18 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
-    (->same-ideograph
-     (:char	((=daikanwa	     . 02228)	; ø¸€¢´
-		 )
-      :sources	(gyokuhen morohashi-daikanwa)))
+    (->same
+     ((=ucs		  . #x528D)	; 劍
+      (=daikanwa	  . 02228)	; ø¸€¢´
+      ))
+    (->same*sources
+     yupian daikanwa)
     (<-ancient-ideograph
-     (:char	((shinjigen-1	     . 653)
-		 (=daikanwa	     . 02228)	; ø¸€¢´
-		 )
-      :sources	(shinjigen-1)))
+     ((shinjigen-1	  . 653)
+      (=daikanwa	  . 02228)	; ø¸€¢´
+      ))
+    (<-ancient-ideograph*sources
+     shinjigen-1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°