X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R016-Table.el;h=7a5b4a1ce384dda57b8b54a8e2905cba34ef7918;hb=b439bfeea8e0beeed807c58c92e1911a6f19150d;hp=89d622a8aee2c9233469be5ead0dce31bf76d9af;hpb=db0cc7f171f1c1f0e001ad291624a554a12d84e2;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/Ideograph-R016-Table.el b/lisp/utf-2000/Ideograph-R016-Table.el
index 89d622a..7a5b4a1 100644
--- a/lisp/utf-2000/Ideograph-R016-Table.el
+++ b/lisp/utf-2000/Ideograph-R016-Table.el
@@ -2,20 +2,16 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 275)
-    (hanyu-dazidian-char . 19)
+    (hanyu-dazidian	1 275 19)
     (shinjigen-1	. 565)
     (shinjigen-2	. 565)
-    (japanese-jisx0208-1978	. #x515C)	; ø»ƒƒ›
-    (chinese-gb2312		. #x3C38)	; ø»„®…
-    (japanese-jisx0208		. #x515C)	; ø»‡—£
-    (chinese-isoir165		. #x3C38)	; ø»–•
-    (chinese-cns11643-1		. #x442D)	; ø»‘¶‚
-    (japanese-jisx0208-1990	. #x515C)	; ø½Š½—
-    (chinese-big5		. #xA44C)	; ý¢€Š‘Œ
-    (ideograph-daikanwa		. 01737)	; ø¸€›‰
-    (ucs			. #x51E0)	; 几
+    (chinese-gb2312	. #x3C38)	; ø»„®…
+    (=jis-x0208		. #x515C)	; ø½Š½—
+    (chinese-isoir165	. #x3C38)	; ø»–•
+    (chinese-cns11643-1 . #x442D)	; ø»‘¶‚
+    (chinese-big5	. #xA44C)	; ý¢€Š‘Œ
+    (ideograph-daikanwa . 01737)	; ø¸€›‰
+    (ucs		. #x51E0)	; 几
     ))
 (define-char
   '((=>ucs		. #x20627)	; 𠘧
@@ -34,15 +30,12 @@
     (ucs		. #x20627)	; 𠘧
     ))
 (define-char
-  '((ideographic-radical . 16)	; ⼏
-    (ideographic-strokes . 1)
+  '((ideographic-	(:radical	3 ; ⼂
+			 :strokes	2)
+			(:radical	16 ; ⼏
+			 :strokes	1))
     (total-strokes	 . 3)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 276)
-    (hanyu-dazidian-char . 3)
-    (->identical
-     ((chinese-cns11643-1 . #x443B)	; ø»‘¶
-      ))
+    (hanyu-dazidian	1 276 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -53,15 +46,14 @@
       ))
     (shinjigen-1	. 566)
     (shinjigen-2	. 566)
-    (japanese-jisx0208-1978	. #x4B5E)	; ø»‚º©
-    (chinese-gb2312		. #x3732)	; ø»„¦©
-    (japanese-jisx0208		. #x4B5E)	; ø»‡Ž±
-    (korean-ksc5601		. #x5B6D)	; ø»‰°¤
-    (chinese-isoir165		. #x3732)	; ø»Ž¹
-    (japanese-jisx0208-1990	. #x4B5E)	; ø½Š´¥
-    (chinese-big5		. #xA45A)	; ý¢€Š‘š
-    (ideograph-daikanwa		. 01739)	; ø¸€›‹
-    (ucs			. #x51E1)	; 凡
+    (chinese-gb2312	. #x3732)	; ø»„¦©
+    (=jis-x0208		. #x4B5E)	; ø½Š´¥
+    (korean-ksc5601	. #x5B6D)	; ø»‰°¤
+    (chinese-isoir165	. #x3732)	; ø»Ž¹
+    (chinese-cns11643-1 . #x443B)	; ø»‘¶
+    (chinese-big5	. #xA45A)	; ý¢€Š‘š
+    (ideograph-daikanwa . 01739)	; ø¸€›‹
+    (ucs		. #x51E1)	; 凡
     ))
 (define-char
   '((=>ucs		. #x51E1)	; 凡
@@ -70,10 +62,8 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (ideographic-structure
-     (:cdp-combinator	3
-      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-		 (ucs		     . #x2FF5)	; ⿵
-		 )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+      (ucs		  . #x2FF5)	; ⿵
       )
      ((ucs		  . #x51E0)	; 几
       )
@@ -97,8 +87,8 @@
     (japanese-jisx0212		. #x3329)	; ø»Š¾´
     (japanese-jisx0213-1	. #x2E58)	; ø»¢¦¹
     (ideograph-daikanwa		. 01740)	; ø¸€›Œ
-    (china3-jef			. #x41B8)	; øº„†¸
     (ideograph-hanziku-1	. #xDEE9)	; ý¢€»©
+    (china3-jef			. #x41B8)	; øº„†¸
     (ucs			. #x51E2)	; 凢
     ))
 (define-char
@@ -106,6 +96,7 @@
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
+    (hanyu-dazidian	1 276 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -139,6 +130,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
+    (hanyu-dazidian	1 276 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -168,6 +160,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 276 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (ucs		  . #x2FF8)	; ⿸
@@ -179,33 +172,30 @@
     (japanese-jisx0212		. #x332A)	; ø»Š¾µ
     (chinese-cns11643-3		. #x217B)	; ø»•—¾
     (ideograph-daikanwa		. 01744)	; ø¸€›
-    (china3-jef			. #x44AA)	; øº„’ª
     (ideograph-hanziku-1	. #xDEF5)	; ý¢€»µ
+    (china3-jef			. #x44AA)	; øº„’ª
     (ucs			. #x51E5)	; 凥
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
+    (hanyu-dazidian	1 276 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (ucs		  . #x2FFA)	; ⿺
       )
-     ((japanese-jisx0208-1978	  . #x5469)	; ø»ƒˆ‚
-      (japanese-jisx0208	  . #x5469)	; ø»‡œŠ
-      (chinese-cns11643-3	  . #x2139)	; ø»•–¼
-      (ideograph-daikanwa	  . 05691)	; ø¸˜»
+     ((chinese-cns11643-3 . #x2139)	; ø»•–¼
+      (ideograph-daikanwa . 05691)	; ø¸˜»
       )
      ((ucs		  . #x51E0)	; 几
       ))
     (shinjigen-1	. 568)
     (shinjigen-2	. 568)
-    (japanese-jisx0208-1978	. #x3D68)	; ø»‚¦
-    (japanese-jisx0208		. #x3D68)	; ø»†º—
-    (japanese-jisx0208-1990	. #x3D68)	; ø½Š ‹
-    (ideograph-daikanwa		. 01745)	; ø¸€›‘
-    (chinese-big5-cdp		. #x8BE4)	; ý¢€ˆ¯¤
-    (ucs			. #x51E6)	; 処
+    (=jis-x0208		. #x3D68)	; ø½Š ‹
+    (ideograph-daikanwa . 01745)	; ø¸€›‘
+    (chinese-big5-cdp	. #x8BE4)	; ý¢€ˆ¯¤
+    (ucs		. #x51E6)	; 処
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -259,11 +249,9 @@
       ))
     (shinjigen-1	. 571)
     (shinjigen-2	. 571)
-    (japanese-jisx0208-1978	. #x427C)	; ø»‚­¹
-    (japanese-jisx0208		. #x427C)	; ø»‡‚
-    (japanese-jisx0208-1990	. #x427C)	; ø½Š§µ
-    (ideograph-daikanwa		. 01749)	; ø¸€›•
-    (ucs			. #x51E7)	; 凧
+    (=jis-x0208		. #x427C)	; ø½Š§µ
+    (ideograph-daikanwa . 01749)	; ø¸€›•
+    (ucs		. #x51E7)	; 凧
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -344,6 +332,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 277 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -373,11 +362,9 @@
       ))
     (shinjigen-1	. 572)
     (shinjigen-2	. 572)
-    (japanese-jisx0208-1978	. #x515E)	; ø»ƒƒ
-    (japanese-jisx0208		. #x515E)	; ø»‡—¥
-    (japanese-jisx0208-1990	. #x515E)	; ø½Š½™
-    (ideograph-daikanwa		. 01757)	; ø¸€›
-    (ucs			. #x51E9)	; 凩
+    (=jis-x0208		. #x515E)	; ø½Š½™
+    (ideograph-daikanwa . 01757)	; ø¸€›
+    (ucs		. #x51E9)	; 凩
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -394,16 +381,15 @@
       ))
     (shinjigen-1	. 573)
     (shinjigen-2	. 573)
-    (japanese-jisx0208-1978	. #x4664)	; ø»‚³™
-    (japanese-jisx0208		. #x4664)	; ø»‡‡¡
-    (japanese-jisx0208-1990	. #x4664)	; ø½Š­•
-    (ideograph-daikanwa		. 01758)	; ø¸€›ž
-    (ucs			. #x51EA)	; 凪
+    (=jis-x0208		. #x4664)	; ø½Š­•
+    (ideograph-daikanwa . 01758)	; ø¸€›ž
+    (ucs		. #x51EA)	; 凪
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (hanyu-dazidian	1 277 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -480,16 +466,18 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (hanyu-dazidian	1 277 11)
     (chinese-cns11643-3		. #x245B)	; ø»•›¸
     (ideograph-daikanwa		. 01765)	; ø¸€›¥
-    (china3-jef			. #x44AC)	; øº„’¬
     (ideograph-hanziku-1	. #xDF53)	; ý¢€½“
+    (china3-jef			. #x44AC)	; øº„’¬
     (ucs			. #x51EC)	; 凬
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 277 22)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -500,19 +488,32 @@
       ))
     (shinjigen-1	. 574)
     (shinjigen-2	. 574)
-    (japanese-jisx0208-1978	. #x515F)	; ø»ƒƒž
     (chinese-gb2312		. #x463E)	; ø»„¼·
-    (japanese-jisx0208		. #x515F)	; ø»‡—¦
+    (=jis-x0208			. #x515F)	; ø½Š½š
     (chinese-isoir165		. #x463E)	; ø»¥‡
-    (chinese-cns11643-3		. #x2759)	; ø»• 
-    (japanese-jisx0208-1990	. #x515F)	; ø½Š½š
     (ideograph-daikanwa		. 01766)	; ø¸€›¦
-    (china3-jef			. #x82B8)	; øºˆŠ¸
     (ideograph-cbeta		. 00285)	; ø¸ „
     (ideograph-hanziku-1	. #xDF5E)	; ý¢€½ž
+    (china3-jef			. #x82B8)	; øºˆŠ¸
     (ucs			. #x51ED)	; 凭
     ))
 (define-char
+  '((=>ucs		. #x51ED)	; 凭
+    (morohashi-daikanwa	1766 0 1)
+    (ideographic-radical . 16)	; ⼏
+    (ideographic-strokes . 6)
+    (total-strokes	 . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs		  . #x2FF1)	; ⿱
+      )
+     ((chinese-cns11643-1 . #x4736)	; ø»‘º¥
+      )
+     ((ucs		  . #x51E0)	; 几
+      ))
+    (chinese-cns11643-3 . #x2759)	; ø»• 
+    ))
+(define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
@@ -606,6 +607,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	8 9 26)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -619,14 +621,15 @@
     (chinese-cns11643-4		. #x2545)	; ø»—§„
     (japanese-jisx0213-1	. #x2E59)	; ø»¢¦º
     (ideograph-daikanwa		. 01776)	; ø¸€›°
-    (china3-jef			. #x44A8)	; øº„’¨
     (ideograph-hanziku-12	. #xEBA9)	; ý¢ƒŽ®©
+    (china3-jef			. #x44A8)	; øº„’¨
     (ucs			. #x51EE)	; 凮
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
+    (hanyu-dazidian	1 277 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
@@ -710,9 +713,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 278)
-    (hanyu-dazidian-char . 10)
+    (hanyu-dazidian	1 278 10)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -724,16 +725,14 @@
       ))
     (shinjigen-1	. 576)
     (shinjigen-2	. 576)
-    (japanese-jisx0208-1978	. #x5160)	; ø»ƒƒŸ
-    (chinese-gb2312		. #x3B4B)	; ø»„¬º
-    (japanese-jisx0208		. #x5160)	; ø»‡—§
-    (korean-ksc5601		. #x7C45)	; ø»Š š
-    (chinese-isoir165		. #x3B4B)	; ø»•Š
-    (chinese-cns11643-1		. #x5929)	; ø»’”´
-    (japanese-jisx0208-1990	. #x5160)	; ø½Š½›
-    (chinese-big5		. #xB0C4)	; ý¢€‹ƒ„
-    (ideograph-daikanwa		. 01784)	; ø¸€›¸
-    (ucs			. #x51F0)	; 凰
+    (chinese-gb2312	. #x3B4B)	; ø»„¬º
+    (=jis-x0208		. #x5160)	; ø½Š½›
+    (korean-ksc5601	. #x7C45)	; ø»Š š
+    (chinese-isoir165	. #x3B4B)	; ø»•Š
+    (chinese-cns11643-1 . #x5929)	; ø»’”´
+    (chinese-big5	. #xB0C4)	; ý¢€‹ƒ„
+    (ideograph-daikanwa . 01784)	; ø¸€›¸
+    (ucs		. #x51F0)	; 凰
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
@@ -813,9 +812,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 278)
-    (hanyu-dazidian-char . 13)
+    (hanyu-dazidian	1 278 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (ucs		  . #x2FF0)	; â¿°
@@ -826,15 +823,13 @@
       ))
     (shinjigen-1	. 577)
     (shinjigen-2	. 577)
-    (japanese-jisx0208-1978	. #x332E)	; ø»‚–©
-    (japanese-jisx0208		. #x332E)	; ø»†ª±
-    (korean-ksc5601		. #x4B42)	; ø»‰˜™
-    (chinese-cns11643-1		. #x5E33)	; ø»’œ”
-    (japanese-jisx0208-1990	. #x332E)	; ø½Š¥
-    (chinese-gb12345		. #x3F2D)	; 凱
-    (chinese-big5		. #xB3CD)	; ý¢€‹
-    (ideograph-daikanwa		. 01790)	; ø¸€›¾
-    (ucs			. #x51F1)	; 凱
+    (=jis-x0208		. #x332E)	; ø½Š¥
+    (korean-ksc5601	. #x4B42)	; ø»‰˜™
+    (chinese-cns11643-1 . #x5E33)	; ø»’œ”
+    (chinese-gb12345	. #x3F2D)	; 凱
+    (chinese-big5	. #xB3CD)	; ý¢€‹
+    (ideograph-daikanwa . 01790)	; ø¸€›¾
+    (ucs		. #x51F1)	; 凱
     ))
 (define-char
   '((=>ucs		. #x2065F)	; 𠙟
@@ -858,6 +853,7 @@
     (ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (hanyu-dazidian	1 278 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (ucs		  . #x2FF5)	; ⿵
@@ -870,8 +866,8 @@
     (japanese-jisx0212		. #x332C)	; ø»Š¾·
     (chinese-cns11643-6		. #x4665)	; ø»œ¬Š
     (ideograph-daikanwa		. 01792)	; ø¸€œ€
-    (china3-jef			. #x44A9)	; øº„’©
     (ideograph-hanziku-1	. #xDF76)	; ý¢€½¶
+    (china3-jef			. #x44A9)	; øº„’©
     ))
 (define-char
   '((morohashi-daikanwa	1792 0 2)
@@ -945,9 +941,7 @@
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 278)
-    (hanyu-dazidian-char . 20)
+    (hanyu-dazidian	1 278 20)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -963,12 +957,15 @@
     (japanese-jisx0213-2	. #x2333)	; ø»¤ Ž
     (chinese-big5		. #xB9B9)	; ý¢€‹¦¹
     (ideograph-daikanwa		. 01797)	; ø¸€œ…
+    (china3-jef			. #x98DF)	; øº‰£Ÿ
+    (mojikyo			. 001797)	; ý €€œ…
     (ucs			. #x51F3)	; 凳
     ))
 (define-char
   '((ideographic-radical . 16)	; ⼏
     (ideographic-strokes . 12)
     (total-strokes	 . 14)
+    (hanyu-dazidian	1 278 19)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (ucs		  . #x2FF1)	; ⿱
@@ -981,9 +978,9 @@
     (chinese-cns11643-3		. #x457A)	; ø»–Œµ
     (japanese-jisx0213-2	. #x2334)	; ø»¤ 
     (ideograph-daikanwa		. 01798)	; ø¸€œ†
-    (china3-jef			. #x44AB)	; øº„’«
     (ideograph-cbeta		. 06316)	; ø¸¡¢¬
     (ideograph-hanziku-1	. #xDF7B)	; ý¢€½»
+    (china3-jef			. #x44AB)	; øº„’«
     (ucs			. #x51F4)	; 凴
     ))
 (define-char